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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 0CB86C282C0 for ; Wed, 23 Jan 2019 19:47:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB91C2184C for ; Wed, 23 Jan 2019 19:47:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GnJOb5+d" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726249AbfAWTri (ORCPT ); Wed, 23 Jan 2019 14:47:38 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:37060 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726197AbfAWTri (ORCPT ); Wed, 23 Jan 2019 14:47:38 -0500 Received: by mail-wm1-f68.google.com with SMTP id g67so629473wmd.2 for ; Wed, 23 Jan 2019 11:47:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=/qkCjwDeu8XI3L2gHtbt3DQvszxbJtmYIbo9QZ+xkw4=; b=GnJOb5+dLnfsAWek7Dc/vFTXAO6fbleNMHhCqeg9eMTaH/Ok3gpbdho6DLL+WSC/vb 6rkaN6C9QBPHriodmWJYoZAXl7hBTzNj2ReEZ53Fl1G2hNi8w36JJbahp/Pyy5L2SrYS HJ9LRrEWCjnnJVOKJCQsy4A2Hax9greqGIEtNJxZ6jxLcX2kS3ASOuSiQsFWEReU+8d3 9JFvxDsm9WTpAmvvsshqMoG6IA04TybNEfl1i1rqbVE3RzR8RdwqxlTl1UyGJSBw5afI lKkWOcEZEJGAKoFQNFpY64uhU3+QfxOttd3h06a20AxJiA/0I2d79y6loIGh6dT+V+Vh BmmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=/qkCjwDeu8XI3L2gHtbt3DQvszxbJtmYIbo9QZ+xkw4=; b=CnpTEral69PmfVKwt6ICyqkUgxSGtKn934kwCb0IoFzIiOrBHLoJbS5iIT8aUpkuKm aFA9ZVxs5OZSuuvzGLImqpX8iWGuaIVJKls5/HPhPVpnAikeXWm5EMkneXjnQaeBZBYn iPW5Gak3ORQPNf2lIfMP41WZi2wJtFakeeU+xhVb/1hkM4hWQWDmUQ+U7Ava23rWm3cx suGlcN4zcWvs5hwlGvO384eZB3K5LL/+rzu+GuugJb0p5a0BmaaSq3uDl5eG5dujd9i/ esf8798LBiasLJsF09N9Rs2vn4YRR6ncYs9nUIPuCqMwBfjR5NlA4XcxnIOUz+kOiuBh Fw7g== X-Gm-Message-State: AJcUukfRTZZqHlGZGeVUnin2SLMDRZjCQXchWNLPI/6R7n427WEriNLF uN7cteHlQEirnbDerRR4v8gQnUeb X-Google-Smtp-Source: ALg8bN626AKJT+WOscuQOwmxTkmkfKhJePQqiqLgGS94BHJaB5uD6euSac84UsHuKMJWpZzU+RI/NA== X-Received: by 2002:a1c:7fca:: with SMTP id a193mr4030241wmd.36.1548272856235; Wed, 23 Jan 2019 11:47:36 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:4d69:8b83:be4c:d941? (p200300EA8BF1E2004D698B83BE4CD941.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:4d69:8b83:be4c:d941]) by smtp.googlemail.com with ESMTPSA id a12sm107408652wro.18.2019.01.23.11.47.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jan 2019 11:47:35 -0800 (PST) To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH net-next] r8169: factor out PHY init sequence adjusting 10M and ALDPS Message-ID: Date: Wed, 23 Jan 2019 20:47:30 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Few chip versions use the same sequence to adjust 10M and ALDPS, so let's factor it out. This patch also fixes a (most likely) typo in rtl8168g_1_hw_phy_config. There bit 8 in reg 0x14 on page 0x0bcc was set and not cleared. According to the vendor driver this bit needs to be cleared in all cases. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 49 ++++++++++++---------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 8666ec095..99fd5c1d7 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -3372,6 +3372,24 @@ static void rtl8168g_disable_aldps(struct rtl8169_private *tp) phy_clear_bits(tp->phydev, 0x10, BIT(2)); } +static void rtl8168g_phy_adjust_10m_aldps(struct rtl8169_private *tp) +{ + struct phy_device *phydev = tp->phydev; + + phy_write(phydev, 0x1f, 0x0bcc); + phy_clear_bits(phydev, 0x14, BIT(8)); + + phy_write(phydev, 0x1f, 0x0a44); + phy_set_bits(phydev, 0x11, BIT(7) | BIT(6)); + + phy_write(phydev, 0x1f, 0x0a43); + phy_write(phydev, 0x13, 0x8084); + phy_clear_bits(phydev, 0x14, BIT(14) | BIT(13)); + phy_set_bits(phydev, 0x10, BIT(12) | BIT(1) | BIT(0)); + + phy_write(phydev, 0x1f, 0x0000); +} + static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp) { rtl_apply_firmware(tp); @@ -3398,14 +3416,7 @@ static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp) rtl_writephy(tp, 0x1f, 0x0a44); rtl_w0w1_phy(tp, 0x11, 0x000c, 0x0000); - rtl_writephy(tp, 0x1f, 0x0bcc); - rtl_w0w1_phy(tp, 0x14, 0x0100, 0x0000); - rtl_writephy(tp, 0x1f, 0x0a44); - rtl_w0w1_phy(tp, 0x11, 0x00c0, 0x0000); - rtl_writephy(tp, 0x1f, 0x0a43); - rtl_writephy(tp, 0x13, 0x8084); - rtl_w0w1_phy(tp, 0x14, 0x0000, 0x6000); - rtl_w0w1_phy(tp, 0x10, 0x1003, 0x0000); + rtl8168g_phy_adjust_10m_aldps(tp); /* EEE auto-fallback function */ rtl_writephy(tp, 0x1f, 0x0a4b); @@ -3624,16 +3635,7 @@ static void rtl8168ep_1_hw_phy_config(struct rtl8169_private *tp) rtl_w0w1_phy(tp, 0x11, 0x000c, 0x0000); rtl_writephy(tp, 0x1f, 0x0000); - /* patch 10M & ALDPS */ - rtl_writephy(tp, 0x1f, 0x0bcc); - rtl_w0w1_phy(tp, 0x14, 0x0000, 0x0100); - rtl_writephy(tp, 0x1f, 0x0a44); - rtl_w0w1_phy(tp, 0x11, 0x00c0, 0x0000); - rtl_writephy(tp, 0x1f, 0x0a43); - rtl_writephy(tp, 0x13, 0x8084); - rtl_w0w1_phy(tp, 0x14, 0x0000, 0x6000); - rtl_w0w1_phy(tp, 0x10, 0x1003, 0x0000); - rtl_writephy(tp, 0x1f, 0x0000); + rtl8168g_phy_adjust_10m_aldps(tp); /* Enable EEE auto-fallback function */ rtl_writephy(tp, 0x1f, 0x0a4b); @@ -3658,16 +3660,7 @@ static void rtl8168ep_1_hw_phy_config(struct rtl8169_private *tp) static void rtl8168ep_2_hw_phy_config(struct rtl8169_private *tp) { - /* patch 10M & ALDPS */ - rtl_writephy(tp, 0x1f, 0x0bcc); - rtl_w0w1_phy(tp, 0x14, 0x0000, 0x0100); - rtl_writephy(tp, 0x1f, 0x0a44); - rtl_w0w1_phy(tp, 0x11, 0x00c0, 0x0000); - rtl_writephy(tp, 0x1f, 0x0a43); - rtl_writephy(tp, 0x13, 0x8084); - rtl_w0w1_phy(tp, 0x14, 0x0000, 0x6000); - rtl_w0w1_phy(tp, 0x10, 0x1003, 0x0000); - rtl_writephy(tp, 0x1f, 0x0000); + rtl8168g_phy_adjust_10m_aldps(tp); /* Enable UC LPF tune function */ rtl_writephy(tp, 0x1f, 0x0a43); -- 2.20.1