patch 'net/r8169: fix crash during RTL8168 init' has been queued to stable release 25.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 25.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/01/26. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/7d1b4b07b38e37a0d80dc2f4449e07b38dfe261d

Thanks.

Kevin

---
>From 7d1b4b07b38e37a0d80dc2f4449e07b38dfe261d Mon Sep 17 00:00:00 2001
From: Howard Wang <howard_wang at realsil.com.cn>
Date: Thu, 11 Jun 2026 16:28:33 +0800
Subject: [PATCH] net/r8169: fix crash during RTL8168 init

[ upstream commit 26dd130eb94ed4413b72e1da4b5c857955bed0b6 ]

In rtl_rx_init(), the configuration of RSS control and RX queue number
(which are specific to RTL8125) was incorrectly executed for all MAC
versions. Accessing RTL8125-specific registers (e.g., RSS_CTRL_8125)
on RTL8168 hardware causes a segmentation fault.

This patch fixes the issue by moving the RTL8125-specific RSS and VMQ
configurations into the existing `if (rtl_is_8125(hw))` block, ensuring
they are only executed on the correct hardware.

Fixes: 25e19d532b4b ("net/r8169: support multi-queues for 8126 and 8127")

Signed-off-by: Howard Wang <howard_wang at realsil.com.cn>
---
 drivers/net/r8169/r8169_rxtx.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/net/r8169/r8169_rxtx.c b/drivers/net/r8169/r8169_rxtx.c
index 37f4c4da80..5cd1a37d5d 100644
--- a/drivers/net/r8169/r8169_rxtx.c
+++ b/drivers/net/r8169/r8169_rxtx.c
@@ -673,5 +673,16 @@ rtl_rx_init(struct rte_eth_dev *dev)
 	rtl_enable_cfg9346_write(hw);
 
-	if (!rtl_is_8125(hw)) {
+	if (rtl_is_8125(hw)) {
+		/* RSS_control_0 */
+		if (hw->EnableRss) {
+			rtl_init_rss(hw, nb_rx_queues);
+			rtl8125_config_rss(hw, nb_rx_queues);
+		} else {
+			RTL_W32(hw, RSS_CTRL_8125, 0x00);
+		}
+
+		/* VMQ_control */
+		rtl8125_set_rx_q_num(hw, nb_rx_queues);
+	} else {
 		/* RX ftr mcu enable */
 		csi_tmp = rtl_eri_read(hw, 0xDC, 1, ERIAR_ExGMAC);
@@ -701,15 +712,4 @@ rtl_rx_init(struct rte_eth_dev *dev)
 		rtl_clear_rdu = rtl8168_clear_rdu;
 
-	/* RSS_control_0 */
-	if (hw->EnableRss) {
-		rtl_init_rss(hw, nb_rx_queues);
-		rtl8125_config_rss(hw, nb_rx_queues);
-	} else {
-		RTL_W32(hw, RSS_CTRL_8125, 0x00);
-	}
-
-	/* VMQ_control */
-	rtl8125_set_rx_q_num(hw, nb_rx_queues);
-
 	RTL_W8(hw, ChipCmd, RTL_R8(hw, ChipCmd) | CmdRxEnb);
 
-- 
2.55.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-07-28 16:54:53.156026721 +0100
+++ 0081-net-r8169-fix-crash-during-RTL8168-init.patch	2026-07-28 16:54:50.836571942 +0100
@@ -1 +1 @@
-From 26dd130eb94ed4413b72e1da4b5c857955bed0b6 Mon Sep 17 00:00:00 2001
+From 7d1b4b07b38e37a0d80dc2f4449e07b38dfe261d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 26dd130eb94ed4413b72e1da4b5c857955bed0b6 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index e0154b7741..00de0471f4 100644
+index 37f4c4da80..5cd1a37d5d 100644