* [PATCH net-next 1/4] r8169: add helper r8168g_wait_ll_share_fifo_ready
2020-05-08 21:28 [PATCH net-next 0/4] r8169: sync few functionalities with vendor driver Heiner Kallweit
@ 2020-05-08 21:30 ` Heiner Kallweit
2020-05-08 21:30 ` [PATCH net-next 2/4] r8169: add helper rtl_enable_rxdvgate Heiner Kallweit
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Heiner Kallweit @ 2020-05-08 21:30 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: 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 <hkallweit1@gmail.com>
---
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)
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH net-next 2/4] r8169: add helper rtl_enable_rxdvgate
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
2020-05-08 21:31 ` [PATCH net-next 3/4] r8169: add helper rtl_wait_txrx_fifo_empty Heiner Kallweit
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Heiner Kallweit @ 2020-05-08 21:30 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: 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 <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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH net-next 3/4] r8169: add helper rtl_wait_txrx_fifo_empty
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 ` [PATCH net-next 2/4] r8169: add helper rtl_enable_rxdvgate Heiner Kallweit
@ 2020-05-08 21:31 ` 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
4 siblings, 0 replies; 6+ messages in thread
From: Heiner Kallweit @ 2020-05-08 21:31 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: 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 <hkallweit1@gmail.com>
---
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);
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH net-next 4/4] r8169: improve reset handling for chips from RTL8168g
2020-05-08 21:28 [PATCH net-next 0/4] r8169: sync few functionalities with vendor driver Heiner Kallweit
` (2 preceding siblings ...)
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 ` Heiner Kallweit
2020-05-09 5:44 ` [PATCH net-next 0/4] r8169: sync few functionalities with vendor driver Jakub Kicinski
4 siblings, 0 replies; 6+ messages in thread
From: Heiner Kallweit @ 2020-05-08 21:32 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: netdev@vger.kernel.org
Sync the reset preparation for chips from RTL8168g with the r8168 and
r8125 vendor drivers.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
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);
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH net-next 0/4] r8169: sync few functionalities with vendor driver
2020-05-08 21:28 [PATCH net-next 0/4] r8169: sync few functionalities with vendor driver Heiner Kallweit
` (3 preceding siblings ...)
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 ` Jakub Kicinski
4 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2020-05-09 5:44 UTC (permalink / raw)
To: Heiner Kallweit
Cc: Realtek linux nic maintainers, David Miller,
netdev@vger.kernel.org
On Fri, 8 May 2020 23:28:51 +0200 Heiner Kallweit wrote:
> Add few helpers (with names copied from vendor drivers) to make clearer
> what the respective code is doing. In addition improve reset preparation
> for chips from RTL8168g.
Applied, thank you!
^ permalink raw reply [flat|nested] 6+ messages in thread