| Message ID | 73ee1d68-2a27-aee9-d8b5-79ba3eda8187@maciej.szmigiero.name |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | r8169: set RX_MULTI_EN bit in RxConfig for 8168F-family chips | expand |
On 11.10.2018 16:02, Maciej S. Szmigiero wrote: > It has been reported that since > commit 05212ba8132b42 ("r8169: set RxConfig after tx/rx is enabled for RTL8169sb/8110sb devices") > at least RTL_GIGA_MAC_VER_38 NICs work erratically after a resume from > suspend. > The problem has been traced to a missing RX_MULTI_EN bit in the RxConfig > register. > We already set this bit for RTL_GIGA_MAC_VER_35 NICs of the same 8168F > chip family so let's do it also for its other siblings: RTL_GIGA_MAC_VER_36 > and RTL_GIGA_MAC_VER_38. > > Curiously, the NIC seems to work fine after a system boot without having > this bit set as long as the system isn't suspended and resumed. > > Fixes: 05212ba8132b42 ("r8169: set RxConfig after tx/rx is enabled for RTL8169sb/8110sb devices") > Reported-by: Chris Clayton <chris2553@googlemail.com> > Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> > --- > drivers/net/ethernet/realtek/r8169.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c > index 7d3f671e1bb3..b68e32186d67 100644 > --- a/drivers/net/ethernet/realtek/r8169.c > +++ b/drivers/net/ethernet/realtek/r8169.c > @@ -4269,8 +4269,8 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp) > RTL_W32(tp, RxConfig, RX_FIFO_THRESH | RX_DMA_BURST); > break; > case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_24: > - case RTL_GIGA_MAC_VER_34: > - case RTL_GIGA_MAC_VER_35: > + case RTL_GIGA_MAC_VER_34 ... RTL_GIGA_MAC_VER_36: > + case RTL_GIGA_MAC_VER_38: > RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST); > break; > case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51: > Patch should have been flagged as "net". Apart from that: Reviewed-by: Heiner Kallweit <hkallweit1@gmail.com>
On 11/10/2018 15:02, Maciej S. Szmigiero wrote: > It has been reported that since > commit 05212ba8132b42 ("r8169: set RxConfig after tx/rx is enabled for RTL8169sb/8110sb devices") > at least RTL_GIGA_MAC_VER_38 NICs work erratically after a resume from > suspend. > The problem has been traced to a missing RX_MULTI_EN bit in the RxConfig > register. > We already set this bit for RTL_GIGA_MAC_VER_35 NICs of the same 8168F > chip family so let's do it also for its other siblings: RTL_GIGA_MAC_VER_36 > and RTL_GIGA_MAC_VER_38. > > Curiously, the NIC seems to work fine after a system boot without having > this bit set as long as the system isn't suspended and resumed. > > Fixes: 05212ba8132b42 ("r8169: set RxConfig after tx/rx is enabled for RTL8169sb/8110sb devices") > Reported-by: Chris Clayton <chris2553@googlemail.com> > Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> > --- > drivers/net/ethernet/realtek/r8169.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c > index 7d3f671e1bb3..b68e32186d67 100644 > --- a/drivers/net/ethernet/realtek/r8169.c > +++ b/drivers/net/ethernet/realtek/r8169.c > @@ -4269,8 +4269,8 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp) > RTL_W32(tp, RxConfig, RX_FIFO_THRESH | RX_DMA_BURST); > break; > case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_24: > - case RTL_GIGA_MAC_VER_34: > - case RTL_GIGA_MAC_VER_35: > + case RTL_GIGA_MAC_VER_34 ... RTL_GIGA_MAC_VER_36: > + case RTL_GIGA_MAC_VER_38: > RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST); > break; > case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51: > Once this is merged in 4.19, a backport for 4.18 stable will be needed because the same problem was introduced at 4.18.8. Tested-by: Chris Clayton <chris2553@googlemail.com>
From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name> Date: Thu, 11 Oct 2018 16:02:10 +0200 > It has been reported that since > commit 05212ba8132b42 ("r8169: set RxConfig after tx/rx is enabled for RTL8169sb/8110sb devices") > at least RTL_GIGA_MAC_VER_38 NICs work erratically after a resume from > suspend. > The problem has been traced to a missing RX_MULTI_EN bit in the RxConfig > register. > We already set this bit for RTL_GIGA_MAC_VER_35 NICs of the same 8168F > chip family so let's do it also for its other siblings: RTL_GIGA_MAC_VER_36 > and RTL_GIGA_MAC_VER_38. > > Curiously, the NIC seems to work fine after a system boot without having > this bit set as long as the system isn't suspended and resumed. > > Fixes: 05212ba8132b42 ("r8169: set RxConfig after tx/rx is enabled for RTL8169sb/8110sb devices") > Reported-by: Chris Clayton <chris2553@googlemail.com> > Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> Applied and queued up for -stable.
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 7d3f671e1bb3..b68e32186d67 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4269,8 +4269,8 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp) RTL_W32(tp, RxConfig, RX_FIFO_THRESH | RX_DMA_BURST); break; case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_24: - case RTL_GIGA_MAC_VER_34: - case RTL_GIGA_MAC_VER_35: + case RTL_GIGA_MAC_VER_34 ... RTL_GIGA_MAC_VER_36: + case RTL_GIGA_MAC_VER_38: RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST); break; case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51:
It has been reported that since commit 05212ba8132b42 ("r8169: set RxConfig after tx/rx is enabled for RTL8169sb/8110sb devices") at least RTL_GIGA_MAC_VER_38 NICs work erratically after a resume from suspend. The problem has been traced to a missing RX_MULTI_EN bit in the RxConfig register. We already set this bit for RTL_GIGA_MAC_VER_35 NICs of the same 8168F chip family so let's do it also for its other siblings: RTL_GIGA_MAC_VER_36 and RTL_GIGA_MAC_VER_38. Curiously, the NIC seems to work fine after a system boot without having this bit set as long as the system isn't suspended and resumed. Fixes: 05212ba8132b42 ("r8169: set RxConfig after tx/rx is enabled for RTL8169sb/8110sb devices") Reported-by: Chris Clayton <chris2553@googlemail.com> Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> --- drivers/net/ethernet/realtek/r8169.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)