From: Heiner Kallweit <hkallweit1@gmail.com>
To: Realtek linux nic maintainers <nic_swsd@realtek.com>,
David Miller <davem@davemloft.net>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH net-next 2/4] r8169: add helper rtl_enable_rxdvgate
Date: Fri, 8 May 2020 23:30:43 +0200 [thread overview]
Message-ID: <f66cf5f2-da23-0ce9-671f-c540ec5f88c3@gmail.com> (raw)
In-Reply-To: <ae5fb819-26e4-d796-2783-2ed5212d0146@gmail.com>
Add a helper for setting RXDV_GATED_EN, the 2ms delay is copied from
the vendor driver.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
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;
--
2.26.2
next prev parent reply other threads:[~2020-05-08 21:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 21:28 [PATCH net-next 0/4] r8169: sync few functionalities with vendor driver Heiner Kallweit
2020-05-08 21:30 ` [PATCH net-next 1/4] r8169: add helper r8168g_wait_ll_share_fifo_ready Heiner Kallweit
2020-05-08 21:30 ` Heiner Kallweit [this message]
2020-05-08 21:31 ` [PATCH net-next 3/4] r8169: add helper rtl_wait_txrx_fifo_empty Heiner Kallweit
2020-05-08 21:32 ` [PATCH net-next 4/4] r8169: improve reset handling for chips from RTL8168g Heiner Kallweit
2020-05-09 5:44 ` [PATCH net-next 0/4] r8169: sync few functionalities with vendor driver Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f66cf5f2-da23-0ce9-671f-c540ec5f88c3@gmail.com \
--to=hkallweit1@gmail.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).