From patchwork Fri May 8 21:30:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1286463 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=uIJrSGXk; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49Jk8T083Xz9sSG for ; Sat, 9 May 2020 07:33:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727950AbgEHVdH (ORCPT ); Fri, 8 May 2020 17:33:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727778AbgEHVdF (ORCPT ); Fri, 8 May 2020 17:33:05 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E770C05BD09 for ; Fri, 8 May 2020 14:33:05 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id y3so3597294wrt.1 for ; Fri, 08 May 2020 14:33:05 -0700 (PDT) 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=83rsyD8e8CTJY9Kn3RzBWp5R9SEw+FYfUFuMgUNzd5w=; b=uIJrSGXkgYY+NSkwjPpbgn1XpTZLkixNrH5n79qLBDSYFvgrsr2Hl/HGQVwtwKM7Cb /kI+UCTdW5T3hwkOX4MZi49pE5DBJvgAdV0coRepo6CqKEQHhGcZTeOert8QBQg9VJqU Ha+EMIyUcgTUrQGG8mzElk+/JuCW1Vox+aD1tojRbnZEQ5h+bqrM+Wu3vIUFGhO1Xjy3 RrQh9kSdm4mFw76oMj2BAdw7WhncskEBJAeR9rejWNZzhnwIMHUCky5WlPISeZsFvNlj D5HlH/49TL3tqU7fSJpj8ljqaKM6uvwgIqzE8khQPU7laJMFvR15Zy5erKb/94p50+2m XHLw== 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=83rsyD8e8CTJY9Kn3RzBWp5R9SEw+FYfUFuMgUNzd5w=; b=cpBusLcxmGMHxLjVRM00Z3xeVV74D8ssQ86F6xED8sxMQN5aQjSMda2maMBE5Y8RU+ rT5z9QRMicQ8uItwg1wy+P2hI13kxxlLUC6Ky1b8kTAnWrkCbX1a8bq9KuHvtApLjGup MytHJ0rKo0nSoDMHfM8TJC6n6Y1ua74zaAgbsqfkRbTslCNnhm3xckLFz54lycszX9Lp ZTsgjJjpzQomp5goEotxf0SAycYXXynPIDTHH7svlK+DZAtxVA5ox+7fZqnb9+rsEIwO +Eb2EafBs8t/FlwrqkAp53NGZ6j2yQ2o67ZS7nkk0e41klBkhrIZHGa1uMgdiNUAsFJc kcLQ== X-Gm-Message-State: AGi0PubExpjyNhPxL8Qt9Hs2Go3Q/9yO0Ym5ZRr5geejlH/n3R96zzoH eHBeePexqTxaEMa42W0TT+Uz16ce X-Google-Smtp-Source: APiQypIfvP+OQ4iKBBNdn8UsU0YQn4zJ0f9FQJEUEUzTAQfL9OjaoK1O4WpAIuXs9uAjZKa7pHUJZQ== X-Received: by 2002:adf:e7cb:: with SMTP id e11mr4797228wrn.145.1588973581798; Fri, 08 May 2020 14:33:01 -0700 (PDT) Received: from ?IPv6:2003:ea:8f28:5200:b9ec:f867:184c:fa95? (p200300EA8F285200B9ECF867184CFA95.dip0.t-ipconnect.de. [2003:ea:8f28:5200:b9ec:f867:184c:fa95]) by smtp.googlemail.com with ESMTPSA id 77sm5167831wrc.6.2020.05.08.14.33.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 08 May 2020 14:33:01 -0700 (PDT) Subject: [PATCH net-next 1/4] r8169: add helper r8168g_wait_ll_share_fifo_ready From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: <933ef712-66e8-c7b4-8abb-55a537681217@gmail.com> Date: Fri, 8 May 2020 23:30:02 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Create a helper for this waiting function, name of the helper is borrowed from the vendor driver. In addition don't return in the two hw_init functions if the first wait runs into a timeout, there's no benefit in doing so. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 8c41f6848..1c96fc219 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5057,6 +5057,11 @@ DECLARE_RTL_COND(rtl_link_list_ready_cond) return RTL_R8(tp, MCU) & LINK_LIST_RDY; } +static void r8168g_wait_ll_share_fifo_ready(struct rtl8169_private *tp) +{ + rtl_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42); +} + DECLARE_RTL_COND(rtl_rxtx_empty_cond) { return (RTL_R8(tp, MCU) & RXTX_EMPTY) == RXTX_EMPTY; @@ -5141,13 +5146,10 @@ static void rtl_hw_init_8168g(struct rtl8169_private *tp) RTL_W8(tp, MCU, RTL_R8(tp, MCU) & ~NOW_IS_OOB); r8168_mac_ocp_modify(tp, 0xe8de, BIT(14), 0); - - if (!rtl_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42)) - return; + r8168g_wait_ll_share_fifo_ready(tp); r8168_mac_ocp_modify(tp, 0xe8de, 0, BIT(15)); - - rtl_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42); + r8168g_wait_ll_share_fifo_ready(tp); } static void rtl_hw_init_8125(struct rtl8169_private *tp) @@ -5162,15 +5164,12 @@ static void rtl_hw_init_8125(struct rtl8169_private *tp) RTL_W8(tp, MCU, RTL_R8(tp, MCU) & ~NOW_IS_OOB); r8168_mac_ocp_modify(tp, 0xe8de, BIT(14), 0); - - if (!rtl_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42)) - return; + r8168g_wait_ll_share_fifo_ready(tp); r8168_mac_ocp_write(tp, 0xc0aa, 0x07d0); r8168_mac_ocp_write(tp, 0xc0a6, 0x0150); r8168_mac_ocp_write(tp, 0xc01e, 0x5555); - - rtl_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42); + r8168g_wait_ll_share_fifo_ready(tp); } static void rtl_hw_initialize(struct rtl8169_private *tp) From patchwork Fri May 8 21:30:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1286464 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=C2fwbwAw; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49Jk8T3CX3z9sSc for ; Sat, 9 May 2020 07:33:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728051AbgEHVdI (ORCPT ); Fri, 8 May 2020 17:33:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727778AbgEHVdH (ORCPT ); Fri, 8 May 2020 17:33:07 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 888C9C05BD43 for ; Fri, 8 May 2020 14:33:05 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id v12so3561421wrp.12 for ; Fri, 08 May 2020 14:33:05 -0700 (PDT) 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=h0YY9K796cNtOZD49R7JElFJhFwjstrWlkVjt8km85U=; b=C2fwbwAwHlfHYeAoLkENpgHYUl+gvLVvsMDyT5u3rfgW9YW125Pu69azXylNi3RYoU H6QagiKYpQhAXtmFSywBzVgMV/Lq0Wh49+I0C6J/4DZrBGrdIgz/vgv/VulJOl2EpiKx 91zCkcU4V4pJmdTghtlkQODLiWkDkgETbEZ38EL8lylkLUMqVNVocb3Z1xlxtRMjaMD7 p7rjcPF8+ni3/X45kNSQ8rIxoijqz/Kfxwsuub3WnKkQcLHITF97gC1ByvTphnhge6p0 NlqHuIhd9RZebhHNIq7Nhw09uyJRowUKWzH/DU8fiZ7hO294lHk9QrfXFzkVm6Q46zBQ Mv2w== 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=h0YY9K796cNtOZD49R7JElFJhFwjstrWlkVjt8km85U=; b=GWpcGAdvQt3tuuKYZ9J3eiRG91MrMns4c6revoKlisrqGlR9Bj4+iewGYUJhqLD1Jm murnu6qqCx9h+6qyo5FZCFhCdF3psfe1dq8EJ1QVEZr5Nv6g+rbnavctvqj23eaO1pxS RBef8INf4CBjxXk92IMx+xtwYgoI/ybzIg6A/ulTXINeXx7NVnGHba72ejUnebbi2UGp 9+Rc9lOHDnkQ6Y/gcyUylseKm7UurP/jcFuO5U4ymdG7JiK8jt5rMC4yOogeq4ZNYMrP ubGDHljE0C/RlFPQV1xmKk7Q2c/BSXwSyxdGTWXT+Im6HNjyM1to6Ox7/h1Ww2+gWvkA SLRA== X-Gm-Message-State: AGi0Pua2cqnuzlvzxZh+95TDl8rRh0zB8JUw2bQfYQB4p/oV0O1buRuA dSC0TtXnx9swcDXxJk+Dtdd8I78H X-Google-Smtp-Source: APiQypKT5ZjWh9tOC71T/GVVyeiXCZ+PX49J+qdUJ6hbUgqjITrj3AYD5UDHqG8rSRNlYkp22+aOAQ== X-Received: by 2002:a5d:408b:: with SMTP id o11mr4706097wrp.97.1588973582840; Fri, 08 May 2020 14:33:02 -0700 (PDT) Received: from ?IPv6:2003:ea:8f28:5200:b9ec:f867:184c:fa95? (p200300EA8F285200B9ECF867184CFA95.dip0.t-ipconnect.de. [2003:ea:8f28:5200:b9ec:f867:184c:fa95]) by smtp.googlemail.com with ESMTPSA id z7sm4903012wrl.88.2020.05.08.14.33.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 08 May 2020 14:33:02 -0700 (PDT) Subject: [PATCH net-next 2/4] r8169: add helper rtl_enable_rxdvgate From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Fri, 8 May 2020 23:30:43 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add a helper for setting RXDV_GATED_EN, the 2ms delay is copied from the vendor driver. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 1c96fc219..eb26c3477 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2496,6 +2496,12 @@ DECLARE_RTL_COND(rtl_txcfg_empty_cond) return RTL_R32(tp, TxConfig) & TXCFG_EMPTY; } +static void rtl_enable_rxdvgate(struct rtl8169_private *tp) +{ + RTL_W32(tp, MISC, RTL_R32(tp, MISC) | RXDV_GATED_EN); + fsleep(2000); +} + static void rtl8169_hw_reset(struct rtl8169_private *tp) { /* Disable interrupts */ @@ -5133,7 +5139,7 @@ static int r8169_mdio_register(struct rtl8169_private *tp) static void rtl_hw_init_8168g(struct rtl8169_private *tp) { - RTL_W32(tp, MISC, RTL_R32(tp, MISC) | RXDV_GATED_EN); + rtl_enable_rxdvgate(tp); if (!rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 42)) return; @@ -5154,7 +5160,7 @@ static void rtl_hw_init_8168g(struct rtl8169_private *tp) static void rtl_hw_init_8125(struct rtl8169_private *tp) { - RTL_W32(tp, MISC, RTL_R32(tp, MISC) | RXDV_GATED_EN); + rtl_enable_rxdvgate(tp); if (!rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42)) return; From patchwork Fri May 8 21:31:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1286466 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=DQx+vA+u; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49Jk8V1FP1z9sSG for ; Sat, 9 May 2020 07:33:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727912AbgEHVdG (ORCPT ); Fri, 8 May 2020 17:33:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726811AbgEHVdF (ORCPT ); Fri, 8 May 2020 17:33:05 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C760C061A0C for ; Fri, 8 May 2020 14:33:05 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id z8so3588413wrw.3 for ; Fri, 08 May 2020 14:33:05 -0700 (PDT) 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=HnexJduuyxX/q1yelru7QeqBQyTSFXqwvFwr4ShZP2A=; b=DQx+vA+uihRr/LmzZ/cBFFfuo4DTxSIX8VryqlExMgNcPn0XPbE+tFkeLzHAo12+WU R8ZVd/J+xqeMgUr+eSSnxYbOFsxw9pE2gKWm/dJeqfzTggiXvzda3vj1P+DWt2bbtEQu A/v3VdvXgUAta67HbsqrGYqTSE8gY6LippFw8GnP1W8EvKcGMSSHChMpuJi3Y5nse32o UHh77tMORFuJUEZ6/BT6lZAjQTN55hp2jOPhoUxzDVu92MBhhrZnlI54MjYf+nopgwIh rgf3cgohrWBNDcc+tL3P4dpo+BCdsXpWwkOqiHawhf8sBDDdeRFViCUHo3Ge2y9pVaXM UqFg== 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=HnexJduuyxX/q1yelru7QeqBQyTSFXqwvFwr4ShZP2A=; b=e2qEgIsK/Q3ynbHrsIhJv6MsxPrY5v47lqv/78lsLKAElVUd1F030aCrY5hKD4+WP8 5G07yZBWrlnf029B5CbNofesSbZ8p8kKQn24bCPiQCCH4JlEiu1xnevejIrLHipRvM5f Vl/7ok2Zzm21cubUJHwaVrxsd09xeSgk3tx8ZKRb1p/b6AtNwQsLxxgyTO3WHhJyRd24 ZcY7ixm3JZA6ISxUWszFQioFDkcvmbV6uHfPUzjB12Jl0dDwi0j/lGuqajwleklXj9KU 4jgKMOeQCsket9c+vgBLW19UUmghuktIFUG0EZ0qEWR7UThcaCPDlsubNViGitE5iFd+ O7LQ== X-Gm-Message-State: AGi0PuZDnBb0HUe3kFA9dwbfSJqe+qN3uP/ZHgSDvildp3JCCqjw3eNk F8972sSilkcg+OTNOuCqyPGv317O X-Google-Smtp-Source: APiQypLhtdwAbtic5BQHucR5GBphADxhf1kjjXTJ8kzSxXcuuZA18TboCQyQGf7N2aBHC8bCUklIjQ== X-Received: by 2002:adf:e586:: with SMTP id l6mr5030158wrm.184.1588973583858; Fri, 08 May 2020 14:33:03 -0700 (PDT) Received: from ?IPv6:2003:ea:8f28:5200:b9ec:f867:184c:fa95? (p200300EA8F285200B9ECF867184CFA95.dip0.t-ipconnect.de. [2003:ea:8f28:5200:b9ec:f867:184c:fa95]) by smtp.googlemail.com with ESMTPSA id p14sm4948742wmg.36.2020.05.08.14.33.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 08 May 2020 14:33:03 -0700 (PDT) Subject: [PATCH net-next 3/4] r8169: add helper rtl_wait_txrx_fifo_empty From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: <6cb4dbe3-ae7f-ef56-39d9-149a2802832a@gmail.com> Date: Fri, 8 May 2020 23:31:46 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add a helper for waiting for FIFO's to be empty, again the name is borrowed from the vendor driver. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 35 ++++++++++++++--------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index eb26c3477..7ea58bd9b 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2496,10 +2496,31 @@ DECLARE_RTL_COND(rtl_txcfg_empty_cond) return RTL_R32(tp, TxConfig) & TXCFG_EMPTY; } +DECLARE_RTL_COND(rtl_rxtx_empty_cond) +{ + return (RTL_R8(tp, MCU) & RXTX_EMPTY) == RXTX_EMPTY; +} + +static void rtl_wait_txrx_fifo_empty(struct rtl8169_private *tp) +{ + switch (tp->mac_version) { + case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_52: + rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 42); + rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42); + break; + case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_61: + rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42); + break; + default: + break; + } +} + static void rtl_enable_rxdvgate(struct rtl8169_private *tp) { RTL_W32(tp, MISC, RTL_R32(tp, MISC) | RXDV_GATED_EN); fsleep(2000); + rtl_wait_txrx_fifo_empty(tp); } static void rtl8169_hw_reset(struct rtl8169_private *tp) @@ -5068,11 +5089,6 @@ static void r8168g_wait_ll_share_fifo_ready(struct rtl8169_private *tp) rtl_loop_wait_high(tp, &rtl_link_list_ready_cond, 100, 42); } -DECLARE_RTL_COND(rtl_rxtx_empty_cond) -{ - return (RTL_R8(tp, MCU) & RXTX_EMPTY) == RXTX_EMPTY; -} - static int r8169_mdio_read_reg(struct mii_bus *mii_bus, int phyaddr, int phyreg) { struct rtl8169_private *tp = mii_bus->priv; @@ -5141,12 +5157,6 @@ static void rtl_hw_init_8168g(struct rtl8169_private *tp) { rtl_enable_rxdvgate(tp); - if (!rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 42)) - return; - - if (!rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42)) - return; - RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) & ~(CmdTxEnb | CmdRxEnb)); msleep(1); RTL_W8(tp, MCU, RTL_R8(tp, MCU) & ~NOW_IS_OOB); @@ -5162,9 +5172,6 @@ static void rtl_hw_init_8125(struct rtl8169_private *tp) { rtl_enable_rxdvgate(tp); - if (!rtl_loop_wait_high(tp, &rtl_rxtx_empty_cond, 100, 42)) - return; - RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) & ~(CmdTxEnb | CmdRxEnb)); msleep(1); RTL_W8(tp, MCU, RTL_R8(tp, MCU) & ~NOW_IS_OOB); From patchwork Fri May 8 21:32:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1286465 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=khfMGIxp; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49Jk8T5nLrz9sSd for ; Sat, 9 May 2020 07:33:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728055AbgEHVdJ (ORCPT ); Fri, 8 May 2020 17:33:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726811AbgEHVdG (ORCPT ); Fri, 8 May 2020 17:33:06 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69476C05BD0A for ; Fri, 8 May 2020 14:33:06 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id k1so3589414wrx.4 for ; Fri, 08 May 2020 14:33:06 -0700 (PDT) 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=Aca/976qWiqzQz319I/1ZeKQgri8fptuMZ4rzXYLtiM=; b=khfMGIxp7o/hGvcG6CwyGcMR9bk9/eSoAIl631d0LdHTX9to+lGbXYVzdvJ30nU+8s JZtZXdYEupiy2UOW1/N3wqE1Np0k00F8rCFzpP6Y7jiCfHJvwui+oqk+xl/oytIDDXUl fVD2v9SeC60PlaHMCHoGvKjwtuXTR9TsT7MQotpPiVmtWq4lNz692+/5wcSHiFuzD2km XoXPVczQ89UlqV5Dhgd69FXT5n324rr1I+s/7mQ1/uhOJBxh8JHky7OpE9l4bpWadpk0 LtF2XlwHSoPLx5zHQ9MgN81007Yp9ONHAFmK8OH8tUA3gj+1m6K5VtaPekQpl9qhkA6q MIyQ== 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=Aca/976qWiqzQz319I/1ZeKQgri8fptuMZ4rzXYLtiM=; b=eJoBwtN9pLVIfj4958+68xHkq2fd/4Kkoa0I9zVZChWD0wrebeXZmZSgfjrDpv4h39 WYCsHRcrb9ZzEtjQUwILPvVEBSsPln2WkxdW7b60nHX9nHQvDq3oI0PlJwhagJ33hHMT sH90yZUG7eY8kZHvSX+ra4DHIWC9kbDCFycHQ48DYgKXQvCryrlRAlRcnTELAGaV1I66 xZfQ3PUVHrmH5Y1jJEXXMLPaR4cZWa8n3SHlg95UMuc7rSvMIh1qGt6NFSGrTDN3WS2a ZBH85rbFThLZnSID36xqSI/VC016oPaHPtQlY2dq6x3q8nWT5oe1u820n2sZ6DiIOV0k GwDQ== X-Gm-Message-State: AGi0PuZdg2FqwNx23RvwBnDUjL7lV0LRvDYhlX1Vqik7eKOFdJ7V420Y 3HyfjbMT+fFZ87GXU+J5yJMHdEE5 X-Google-Smtp-Source: APiQypL4ovWRo4TnYTGp6zXAmCumNk1XjbcgbaK8okQ91GCuGWPIKE8/vBAh1kc1mPiBUk4B9CWn0w== X-Received: by 2002:adf:e802:: with SMTP id o2mr4986057wrm.110.1588973584890; Fri, 08 May 2020 14:33:04 -0700 (PDT) Received: from ?IPv6:2003:ea:8f28:5200:b9ec:f867:184c:fa95? (p200300EA8F285200B9ECF867184CFA95.dip0.t-ipconnect.de. [2003:ea:8f28:5200:b9ec:f867:184c:fa95]) by smtp.googlemail.com with ESMTPSA id d13sm15226679wmb.39.2020.05.08.14.33.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 08 May 2020 14:33:04 -0700 (PDT) Subject: [PATCH net-next 4/4] r8169: improve reset handling for chips from RTL8168g From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Fri, 8 May 2020 23:32:49 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sync the reset preparation for chips from RTL8168g with the r8168 and r8125 vendor drivers. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 7ea58bd9b..0e96d0de2 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2537,10 +2537,13 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp) rtl_loop_wait_low(tp, &rtl_npq_cond, 20, 2000); break; case RTL_GIGA_MAC_VER_34 ... RTL_GIGA_MAC_VER_38: - case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_52: RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) | StopReq); rtl_loop_wait_high(tp, &rtl_txcfg_empty_cond, 100, 666); break; + case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_61: + rtl_enable_rxdvgate(tp); + fsleep(2000); + break; default: RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) | StopReq); udelay(100);