| Message ID | a979ac70-de91-aa66-f401-e61d31d04183@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2,net-next] r8169: work around an irq coalescing related tx timeout | expand |
From: Heiner Kallweit <hkallweit1@gmail.com> Date: Mon, 18 May 2020 22:47:16 +0200 > In [0] a user reported reproducible tx timeouts on RTL8168f except > PktCntrDisable is set and irq coalescing is enabled. > Realtek told me that they are not aware of any related hw issue on > this chip version, therefore root cause is still unknown. It's not > clear whether the issue affects one or more chip versions in general, > or whether issue is specific to reporter's system. > Due to this level of uncertainty, and due to the fact that I'm aware > of this one report only, let's apply the workaround on net-next only. > After this change setting irq coalescing via ethtool can reliably > avoid the issue on the affected system. > > [0] https://bugzilla.kernel.org/show_bug.cgi?id=207205 > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > - remove orphaned Reported-by from commit message Applied.
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 23f150092..79817d4ff 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -1871,6 +1871,15 @@ static int rtl_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec) RTL_W16(tp, IntrMitigate, w); + /* Meaning of PktCntrDisable bit changed from RTL8168e-vl */ + if (rtl_is_8168evl_up(tp)) { + if (!rx_fr && !tx_fr) + /* disable packet counter */ + tp->cp_cmd |= PktCntrDisable; + else + tp->cp_cmd &= ~PktCntrDisable; + } + tp->cp_cmd = (tp->cp_cmd & ~INTT_MASK) | cp01; RTL_W16(tp, CPlusCmd, tp->cp_cmd); rtl_pci_commit(tp);
In [0] a user reported reproducible tx timeouts on RTL8168f except PktCntrDisable is set and irq coalescing is enabled. Realtek told me that they are not aware of any related hw issue on this chip version, therefore root cause is still unknown. It's not clear whether the issue affects one or more chip versions in general, or whether issue is specific to reporter's system. Due to this level of uncertainty, and due to the fact that I'm aware of this one report only, let's apply the workaround on net-next only. After this change setting irq coalescing via ethtool can reliably avoid the issue on the affected system. [0] https://bugzilla.kernel.org/show_bug.cgi?id=207205 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- - remove orphaned Reported-by from commit message --- drivers/net/ethernet/realtek/r8169_main.c | 9 +++++++++ 1 file changed, 9 insertions(+)