[PATCH net-next] r8169: reconfigure rx unconditionally before chip reset when resuming

[PATCH net-next] r8169: reconfigure rx unconditionally before chip reset when resuming

[Heiner Kallweit]

There's a good chance that more chip versions suffer from the same
hw issue. So let's reconfigure rx unconditionally before the chip reset
when resuming. This shouldn't have any side effect on unaffected chip
versions.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/ethernet/realtek/r8169_main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index d18734fe1..2a4d9b548 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -4995,9 +4995,7 @@ static int rtl8169_resume(struct device *device)
 		clk_prepare_enable(tp->clk);
 
 	/* Some chip versions may truncate packets without this initialization */
-	if (tp->mac_version == RTL_GIGA_MAC_VER_37 ||
-	    tp->mac_version == RTL_GIGA_MAC_VER_46)
-		rtl_init_rxcfg(tp);
+	rtl_init_rxcfg(tp);
 
 	return rtl8169_runtime_resume(device);
 }
-- 
2.51.0

Re: [PATCH net-next] r8169: reconfigure rx unconditionally before chip reset when resuming

[Simon Horman]

On Wed, Oct 15, 2025 at 10:12:44PM +0200, Heiner Kallweit wrote:
> There's a good chance that more chip versions suffer from the same
> hw issue. So let's reconfigure rx unconditionally before the chip reset
> when resuming. This shouldn't have any side effect on unaffected chip
> versions.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

Hi Heiner,

This patch looks good to me. But I think it needs to be reposted - so that
it applies to net-next - one net has been merged into net-next so the
following patch is present.

commit 70f92ab97042 ("r8169: fix packet truncation after S4 resume on RTL8168H/RTL8111H")

Please feel free to add.

Reviewed-by: Simon Horman <horms@kernel.org>

-- 
pw-bot: deferred

Re: [PATCH net-next] r8169: reconfigure rx unconditionally before chip reset when resuming

[Heiner Kallweit]

On 10/16/2025 2:28 PM, Simon Horman wrote:
> On Wed, Oct 15, 2025 at 10:12:44PM +0200, Heiner Kallweit wrote:
>> There's a good chance that more chip versions suffer from the same
>> hw issue. So let's reconfigure rx unconditionally before the chip reset
>> when resuming. This shouldn't have any side effect on unaffected chip
>> versions.
>>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> 
> Hi Heiner,
> 
> This patch looks good to me. But I think it needs to be reposted - so that
> it applies to net-next - one net has been merged into net-next so the
> following patch is present.
> 
Thanks for the review. Right, I was under the impression that net was
already merged back. I'll resubmit.

> commit 70f92ab97042 ("r8169: fix packet truncation after S4 resume on RTL8168H/RTL8111H")
> 
> Please feel free to add.
> 
> Reviewed-by: Simon Horman <horms@kernel.org>
>