From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 831CEC35247 for ; Mon, 3 Feb 2020 16:36:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D6B92087E for ; Mon, 3 Feb 2020 16:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580747810; bh=k1u6+l4ImzTwBq1QY2DMDIFsiPThilxBmkl8gjpHXcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mNjSvGn9GsdqqkDY81y8OvaVavp3BZWCbWdL62lmHagLtiZXSMAxuzAZsr252O1u9 N6+WLPtPb5yo719drFDBbg+fjrpHBOFp9Q619C/J0xQUP5Dxp5ILfkMvui5w5Jy9Vi /vB0p6fg37cIqDEAM5o0aHFZGYMEcnuXf5i5vRQU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731230AbgBCQgt (ORCPT ); Mon, 3 Feb 2020 11:36:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:52178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730911AbgBCQgr (ORCPT ); Mon, 3 Feb 2020 11:36:47 -0500 Received: from localhost (unknown [104.132.45.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3F62A20721; Mon, 3 Feb 2020 16:36:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580747806; bh=k1u6+l4ImzTwBq1QY2DMDIFsiPThilxBmkl8gjpHXcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PFMDNelNFEQPWclazUN5nHRle+mO6Yl06mTpXwdtJrEPDQzlbP/HMnh8hcq/COYP/ T404B1dOCaDt+spjTNoBcN6IrJvD71WPeruY6grcggB5uSirK/T7gsFg62t1OkxDmm 9qLVDXs8EMmCNh7g74WL2pE0r7zR5IyG0+6g42U0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hayes Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 78/90] r8152: disable test IO for RTL8153B Date: Mon, 3 Feb 2020 16:20:21 +0000 Message-Id: <20200203161926.755377982@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200203161917.612554987@linuxfoundation.org> References: <20200203161917.612554987@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hayes Wang [ Upstream commit d7f1b59655efb5a285d227c8f9853a98eab5c2fd ] For RTL8153B with QFN32, disable test IO. Otherwise, it may cause abnormal behavior for the device randomly. Signed-off-by: Hayes Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/r8152.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 2d3374a373f83..1f61859baa531 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -298,6 +298,7 @@ /* PLA_PHY_PWR */ #define TX_10M_IDLE_EN 0x0080 #define PFM_PWM_SWITCH 0x0040 +#define TEST_IO_OFF BIT(4) /* PLA_MAC_PWR_CTRL */ #define D3_CLK_GATED_EN 0x00004000 @@ -4540,6 +4541,15 @@ static void r8153b_init(struct r8152 *tp) ocp_data &= ~PLA_MCU_SPDWN_EN; ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3, ocp_data); + if (tp->version == RTL_VER_09) { + /* Disable Test IO for 32QFN */ + if (ocp_read_byte(tp, MCU_TYPE_PLA, 0xdc00) & BIT(5)) { + ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR); + ocp_data |= TEST_IO_OFF; + ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data); + } + } + set_bit(GREEN_ETHERNET, &tp->flags); /* rx aggregation */ -- 2.20.1