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 BE1E5C61CE8 for ; Sat, 19 Jan 2019 21:07:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D0F52084C for ; Sat, 19 Jan 2019 21:07:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lNxjXJPe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729503AbfASVHw (ORCPT ); Sat, 19 Jan 2019 16:07:52 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:51516 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729288AbfASVHv (ORCPT ); Sat, 19 Jan 2019 16:07:51 -0500 Received: by mail-wm1-f66.google.com with SMTP id b11so7538179wmj.1 for ; Sat, 19 Jan 2019 13:07:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=I53QQbgILyrhM1/0UTFVguIAWc/IWz4RF84b6k+aQI0=; b=lNxjXJPey0K5dtMUaKsb5MwSr4TgxZP+KG0shOkDBsdD4V7/2FIFkrPEhKO0lxe84N r1YAp5p0g4w6Qjj+YPv3rbQrjkZ3UIcam3+OgzS7iqyGfwcXf8sooRXzq1Wcu7zBL/ZF MuCo73IokFm+TpRup0q0C0FNn5yY+/HKzIp1gP8PQFd965UpwCkC6c5ctUhbOSxE+2Ka m8Ucf1R9Djm5uMwK3CmICCxoApajz1fm0LsIM//OAyu5q63TpC3hNTEa42SGcyV2Pd2Q tsHSrsxhbp/Ov/Au1eF+u+msT5LtqGlIU+OZG4K6dihVXo4MuH1xOtwcM/fgQZF7M6tH qOZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=I53QQbgILyrhM1/0UTFVguIAWc/IWz4RF84b6k+aQI0=; b=Smvv0xhE5V3XjyZ2q4AS2rJ29Bw43/YW9NIDKe/FhhgVjCQ79M6HBgTI6MAQQVu7IF qNZoBeEoX3cizF49hLePYzX38m6hB5YnV+/w7sdCG62bfJ9Z587VGAeMRAt+jbZW3Z8I fnGsiEdfNHi6RW8x4iqxA2zfIB1bGzlc1McEeAmcMmKz/vex8zrwn7ifiXCFIZUkJ8a9 kMTBnAe0eBqDfrA2dNggXsLiFNHjlr+iGKfo2eIhBh92OuTnmZINb2MQqDG+kyHyCn7w cw7+7jFc9H+qlSo86t2ve5L/exfGOLoklbSVAKB6s4P7ioL1tcBOTXefGVE91uSHrzbk dwQA== X-Gm-Message-State: AJcUukecluQF5ra+A8cSPJkeBGX5i8/lzCYEQDCforEziDyd+LD2iiu/ USQoGnxg5DuC6BpWwwoyAk+bUv3s X-Google-Smtp-Source: ALg8bN5oe6G8ae28WDLT9YufmFQSJGGqTVxIVoLipDn2FQ06wv1p1FbQuqkWtIBGDg2UBhwLAkGe2Q== X-Received: by 2002:a1c:b70b:: with SMTP id h11mr20395590wmf.72.1547932069096; Sat, 19 Jan 2019 13:07:49 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd? (p200300EA8BF1E200E8778D0CCDF081FD.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd]) by smtp.googlemail.com with ESMTPSA id n5sm86342879wrr.94.2019.01.19.13.07.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 13:07:48 -0800 (PST) Subject: [PATCH net-next v2 4/8] r8169: improve rtl_pcie_state_l2l3_enable From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: Message-ID: <7feffb93-d903-e0f7-6d89-111b687dc00b@gmail.com> Date: Sat, 19 Jan 2019 22:05:14 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: 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 All calls to this function have the enable parameter set to false. So we can replace the function with a disable-only version. v2: - fixed copy & paste error Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index c4d53bc6a..df3d2633f 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4691,18 +4691,10 @@ static void rtl_enable_clock_request(struct rtl8169_private *tp) PCI_EXP_LNKCTL_CLKREQ_EN); } -static void rtl_pcie_state_l2l3_enable(struct rtl8169_private *tp, bool enable) +static void rtl_pcie_state_l2l3_disable(struct rtl8169_private *tp) { - u8 data; - - data = RTL_R8(tp, Config3); - - if (enable) - data |= Rdy_to_L23; - else - data &= ~Rdy_to_L23; - - RTL_W8(tp, Config3, data); + /* work around an issue when PCI reset occurs during L2/L3 state */ + RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Rdy_to_L23); } static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable) @@ -5023,7 +5015,7 @@ static void rtl_hw_start_8411(struct rtl8169_private *tp) }; rtl_hw_start_8168f(tp); - rtl_pcie_state_l2l3_enable(tp, false); + rtl_pcie_state_l2l3_disable(tp); rtl_ephy_init(tp, e_info_8168f_1, ARRAY_SIZE(e_info_8168f_1)); @@ -5057,7 +5049,7 @@ static void rtl_hw_start_8168g(struct rtl8169_private *tp) rtl_w0w1_eri(tp, 0x2fc, ERIAR_MASK_0001, 0x01, 0x06, ERIAR_EXGMAC); rtl_w0w1_eri(tp, 0x1b0, ERIAR_MASK_0011, 0x0000, 0x1000, ERIAR_EXGMAC); - rtl_pcie_state_l2l3_enable(tp, false); + rtl_pcie_state_l2l3_disable(tp); } static void rtl_hw_start_8168g_1(struct rtl8169_private *tp) @@ -5163,7 +5155,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp) rtl_w0w1_eri(tp, 0x1b0, ERIAR_MASK_0011, 0x0000, 0x1000, ERIAR_EXGMAC); - rtl_pcie_state_l2l3_enable(tp, false); + rtl_pcie_state_l2l3_disable(tp); rtl_writephy(tp, 0x1f, 0x0c42); rg_saw_cnt = (rtl_readphy(tp, 0x13) & 0x3fff); @@ -5240,7 +5232,7 @@ static void rtl_hw_start_8168ep(struct rtl8169_private *tp) RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) & ~TX_10M_PS_EN); - rtl_pcie_state_l2l3_enable(tp, false); + rtl_pcie_state_l2l3_disable(tp); } static void rtl_hw_start_8168ep_1(struct rtl8169_private *tp) @@ -5511,7 +5503,7 @@ static void rtl_hw_start_8105e_1(struct rtl8169_private *tp) rtl_ephy_init(tp, e_info_8105e_1, ARRAY_SIZE(e_info_8105e_1)); - rtl_pcie_state_l2l3_enable(tp, false); + rtl_pcie_state_l2l3_disable(tp); } static void rtl_hw_start_8105e_2(struct rtl8169_private *tp) @@ -5546,7 +5538,7 @@ static void rtl_hw_start_8402(struct rtl8169_private *tp) rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000, ERIAR_EXGMAC); rtl_w0w1_eri(tp, 0x0d4, ERIAR_MASK_0011, 0x0e00, 0xff00, ERIAR_EXGMAC); - rtl_pcie_state_l2l3_enable(tp, false); + rtl_pcie_state_l2l3_disable(tp); } static void rtl_hw_start_8106(struct rtl8169_private *tp) @@ -5560,7 +5552,7 @@ static void rtl_hw_start_8106(struct rtl8169_private *tp) RTL_W8(tp, MCU, RTL_R8(tp, MCU) | EN_NDP | EN_OOB_RESET); RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) & ~PFM_EN); - rtl_pcie_state_l2l3_enable(tp, false); + rtl_pcie_state_l2l3_disable(tp); rtl_hw_aspm_clkreq_enable(tp, true); } -- 2.20.1