diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2020-05-08 23:31:46 +0200 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2020-05-08 22:41:55 -0700 |
| commit | 6f9395c69e62e0ffefaaddf97f32d7690e00f791 (patch) | |
| tree | 452497245c8bc13f960661fa2f80ec9ff42676b4 /drivers/net/ethernet/realtek/r8169_main.c | |
| parent | r8169: add helper rtl_enable_rxdvgate (diff) | |
| download | linux-dev-6f9395c69e62e0ffefaaddf97f32d7690e00f791.tar.xz linux-dev-6f9395c69e62e0ffefaaddf97f32d7690e00f791.zip | |
r8169: add helper rtl_wait_txrx_fifo_empty
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 <hkallweit1@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 5b389d3e7c9a..47ff514aec39 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2494,10 +2494,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) @@ -5066,11 +5087,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; @@ -5139,12 +5155,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); @@ -5160,9 +5170,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); |