* [PATCH net-next v2 14/15] net: stmmac: qcom-ethqos: correct prg_rclk_dly comment
From: Russell King (Oracle) @ 2026-03-27 8:44 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
The comment for calculating the prg_rclk_dly value is incorrect as it
omits the brackets around the divisor. Add the brackets to allow the
reader to correctly evaluate the value. Validated with the values given
in the driver.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 9dae40c27903..667676c29a95 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -450,8 +450,10 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
rgmii_setmask(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN,
SDCC_HC_REG_DDR_CONFIG);
} else {
- /* PRG_RCLK_DLY = TCXO period * TCXO_CYCLES_CNT / 2 * RX delay ns,
- * in practice this becomes PRG_RCLK_DLY = 52 * 4 / 2 * RX delay ns
+ /* PRG_RCLK_DLY = TCXO period * TCXO_CYCLES_CNT /
+ * (2 * RX delay ns),
+ * in practice this becomes PRG_RCLK_DLY = 52 * 4 /
+ * (2 * RX delay ns)
*/
if (ethqos->has_emac_ge_3) {
/* 0.9 ns */
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 15/15] net: stmmac: qcom-ethqos: move phase_shift to register update site
From: Russell King (Oracle) @ 2026-03-27 8:44 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
Move the determination of the phase shift enable alongside the register
update, and make "phase_shift" unsigned.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 667676c29a95..ad3a983d2a08 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -375,14 +375,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
{
struct device *dev = ðqos->pdev->dev;
unsigned int prg_rclk_dly, loopback;
- int phase_shift;
-
- /* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */
- if (ethqos->phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
- ethqos->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID)
- phase_shift = 0;
- else
- phase_shift = RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN;
+ unsigned int phase_shift;
/* Disable loopback mode */
rgmii_clrmask(ethqos, RGMII_CONFIG2_TX_TO_RX_LOOPBACK_EN,
@@ -416,6 +409,14 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
rgmii_clrmask(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL,
RGMII_IO_MACRO_CONFIG2);
+
+ /* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */
+ if (ethqos->phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
+ ethqos->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID)
+ phase_shift = 0;
+ else
+ phase_shift = RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN;
+
rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN, phase_shift,
RGMII_IO_MACRO_CONFIG2);
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 13/15] net: stmmac: qcom-ethqos: move loopback decision next to reg update
From: Russell King (Oracle) @ 2026-03-27 8:44 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
Move the loopback decision next to the register update, and make the
local variable unsigned. As a result, there is now no need for the
comment referring to the programming being later.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 580deec1dc30..9dae40c27903 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -374,9 +374,8 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
{
struct device *dev = ðqos->pdev->dev;
- unsigned int prg_rclk_dly;
+ unsigned int prg_rclk_dly, loopback;
int phase_shift;
- int loopback;
/* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */
if (ethqos->phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
@@ -389,12 +388,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
rgmii_clrmask(ethqos, RGMII_CONFIG2_TX_TO_RX_LOOPBACK_EN,
RGMII_IO_MACRO_CONFIG2);
- /* Determine if this platform wants loopback enabled after programming */
- if (ethqos->rgmii_config_loopback_en)
- loopback = RGMII_CONFIG_LOOPBACK_EN;
- else
- loopback = 0;
-
/* Select RGMII, write 0 to interface select */
rgmii_clrmask(ethqos, RGMII_CONFIG_INTF_SEL, RGMII_IO_MACRO_CONFIG);
@@ -476,6 +469,11 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
SDCC_HC_REG_DDR_CONFIG);
}
+ if (ethqos->rgmii_config_loopback_en)
+ loopback = RGMII_CONFIG_LOOPBACK_EN;
+ else
+ loopback = 0;
+
rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN, loopback,
RGMII_IO_MACRO_CONFIG);
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 12/15] net: stmmac: qcom-ethqos: simplify prg_rclk_dly programming
From: Russell King (Oracle) @ 2026-03-27 8:44 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
Rather than coding the entire register update twice with different
values, use a local variable to specify the value and have one
register update statement that uses this local variable. This results
in neater code.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 7690ae0bb008..580deec1dc30 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -374,6 +374,7 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
{
struct device *dev = ðqos->pdev->dev;
+ unsigned int prg_rclk_dly;
int phase_shift;
int loopback;
@@ -461,16 +462,16 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
*/
if (ethqos->has_emac_ge_3) {
/* 0.9 ns */
- rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY,
- FIELD_PREP(SDCC_DDR_CONFIG_PRG_RCLK_DLY,
- 115), SDCC_HC_REG_DDR_CONFIG);
+ prg_rclk_dly = 115;
} else {
/* 1.8 ns */
- rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY,
- FIELD_PREP(SDCC_DDR_CONFIG_PRG_RCLK_DLY,
- 57), SDCC_HC_REG_DDR_CONFIG);
+ prg_rclk_dly = 57;
}
+ rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY,
+ FIELD_PREP(SDCC_DDR_CONFIG_PRG_RCLK_DLY,
+ prg_rclk_dly), SDCC_HC_REG_DDR_CONFIG);
+
rgmii_setmask(ethqos, SDCC_DDR_CONFIG_PRG_DLY_EN,
SDCC_HC_REG_DDR_CONFIG);
}
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 11/15] net: stmmac: qcom-ethqos: finally eliminate the switch
From: Russell King (Oracle) @ 2026-03-27 8:44 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
Move the RCLK delay configuration out of the switch, which just leaves
the RGMII_CONFIG_LOOPBACK_EN setting in all three paths. This makes it
trivial to eliminate the switch.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../stmicro/stmmac/dwmac-qcom-ethqos.c | 47 +++++++------------
1 file changed, 16 insertions(+), 31 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index b4c61cb24e1d..7690ae0bb008 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -444,8 +444,18 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
rgmii_clrmask(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
RGMII_IO_MACRO_CONFIG2);
- switch (speed) {
- case SPEED_1000:
+ if (speed != SPEED_1000) {
+ /* Write 0x5 to PRG_RCLK_DLY_CODE */
+ rgmii_updatel(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE,
+ FIELD_PREP(SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE,
+ 5), SDCC_HC_REG_DDR_CONFIG);
+
+ rgmii_setmask(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY,
+ SDCC_HC_REG_DDR_CONFIG);
+
+ rgmii_setmask(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN,
+ SDCC_HC_REG_DDR_CONFIG);
+ } else {
/* PRG_RCLK_DLY = TCXO period * TCXO_CYCLES_CNT / 2 * RX delay ns,
* in practice this becomes PRG_RCLK_DLY = 52 * 4 / 2 * RX delay ns
*/
@@ -460,39 +470,14 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
FIELD_PREP(SDCC_DDR_CONFIG_PRG_RCLK_DLY,
57), SDCC_HC_REG_DDR_CONFIG);
}
- rgmii_setmask(ethqos, SDCC_DDR_CONFIG_PRG_DLY_EN,
- SDCC_HC_REG_DDR_CONFIG);
- rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN,
- loopback, RGMII_IO_MACRO_CONFIG);
- break;
-
- case SPEED_100:
- /* Write 0x5 to PRG_RCLK_DLY_CODE */
- rgmii_updatel(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE,
- FIELD_PREP(SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE,
- 5), SDCC_HC_REG_DDR_CONFIG);
- rgmii_setmask(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY,
- SDCC_HC_REG_DDR_CONFIG);
- rgmii_setmask(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN,
- SDCC_HC_REG_DDR_CONFIG);
- rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN,
- loopback, RGMII_IO_MACRO_CONFIG);
- break;
- case SPEED_10:
- /* Write 0x5 to PRG_RCLK_DLY_CODE */
- rgmii_updatel(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE,
- FIELD_PREP(SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE,
- 5), SDCC_HC_REG_DDR_CONFIG);
- rgmii_setmask(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY,
- SDCC_HC_REG_DDR_CONFIG);
- rgmii_setmask(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN,
+ rgmii_setmask(ethqos, SDCC_DDR_CONFIG_PRG_DLY_EN,
SDCC_HC_REG_DDR_CONFIG);
- rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN,
- loopback, RGMII_IO_MACRO_CONFIG);
- break;
}
+ rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN, loopback,
+ RGMII_IO_MACRO_CONFIG);
+
return 0;
}
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 10/15] net: stmmac: qcom-ethqos: move RGMII_CONFIG2_RX_PROG_SWAP
From: Russell King (Oracle) @ 2026-03-27 8:44 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
Move RGMII_CONFIG2_RX_PROG_SWAP out of the switch. 1G speed always
sets this field. 100M and 10M sets it for has_emac_ge_3 devices,
otherwise it is cleared.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../stmicro/stmmac/dwmac-qcom-ethqos.c | 21 ++++++-------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 13f4df0a90d7..b4c61cb24e1d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -437,11 +437,15 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
rgmii_clrmask(ethqos, RGMII_CONFIG2_RSVD_CONFIG15,
RGMII_IO_MACRO_CONFIG2);
- switch (speed) {
- case SPEED_1000:
+ if (speed == SPEED_1000 || ethqos->has_emac_ge_3)
rgmii_setmask(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
RGMII_IO_MACRO_CONFIG2);
+ else
+ rgmii_clrmask(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
+ RGMII_IO_MACRO_CONFIG2);
+ switch (speed) {
+ case SPEED_1000:
/* PRG_RCLK_DLY = TCXO period * TCXO_CYCLES_CNT / 2 * RX delay ns,
* in practice this becomes PRG_RCLK_DLY = 52 * 4 / 2 * RX delay ns
*/
@@ -463,13 +467,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_100:
- if (ethqos->has_emac_ge_3)
- rgmii_setmask(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
- RGMII_IO_MACRO_CONFIG2);
- else
- rgmii_clrmask(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
- RGMII_IO_MACRO_CONFIG2);
-
/* Write 0x5 to PRG_RCLK_DLY_CODE */
rgmii_updatel(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE,
FIELD_PREP(SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE,
@@ -483,12 +480,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_10:
- if (ethqos->has_emac_ge_3)
- rgmii_setmask(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
- RGMII_IO_MACRO_CONFIG2);
- else
- rgmii_clrmask(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
- RGMII_IO_MACRO_CONFIG2);
/* Write 0x5 to PRG_RCLK_DLY_CODE */
rgmii_updatel(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE,
FIELD_PREP(SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE,
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 09/15] net: stmmac: qcom-ethqos: move RGMII_CONFIG2_RSVD_CONFIG15 out
From: Russell King (Oracle) @ 2026-03-27 8:44 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
All paths through the switch clear the RGMII_CONFIG2_RSVD_CONFIG15
field. move it out of the switch statement.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 2751def922df..13f4df0a90d7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -434,10 +434,11 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
FIELD_PREP(RGMII_CONFIG_MAX_SPD_PRG_9, 19),
RGMII_IO_MACRO_CONFIG);
+ rgmii_clrmask(ethqos, RGMII_CONFIG2_RSVD_CONFIG15,
+ RGMII_IO_MACRO_CONFIG2);
+
switch (speed) {
case SPEED_1000:
- rgmii_clrmask(ethqos, RGMII_CONFIG2_RSVD_CONFIG15,
- RGMII_IO_MACRO_CONFIG2);
rgmii_setmask(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
RGMII_IO_MACRO_CONFIG2);
@@ -462,9 +463,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_100:
- rgmii_clrmask(ethqos, RGMII_CONFIG2_RSVD_CONFIG15,
- RGMII_IO_MACRO_CONFIG2);
-
if (ethqos->has_emac_ge_3)
rgmii_setmask(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
RGMII_IO_MACRO_CONFIG2);
@@ -485,8 +483,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_10:
- rgmii_clrmask(ethqos, RGMII_CONFIG2_RSVD_CONFIG15,
- RGMII_IO_MACRO_CONFIG2);
if (ethqos->has_emac_ge_3)
rgmii_setmask(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
RGMII_IO_MACRO_CONFIG2);
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 08/15] net: stmmac: qcom-ethqos: move 100M/10M speed programming
From: Russell King (Oracle) @ 2026-03-27 8:44 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
Move the speed programming for 100M and 10M out of the switch. There
is no programming done for 1G speed.
It looks like there are two fields, 7:6 which are programemd to '1'
to select a /2 divisor for 100M, and bits 16:8 which are programmed
to '19' to select a /20 divisor.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index ab6554f58214..2751def922df 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -425,6 +425,15 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN, phase_shift,
RGMII_IO_MACRO_CONFIG2);
+ if (speed == SPEED_100)
+ rgmii_updatel(ethqos, RGMII_CONFIG_MAX_SPD_PRG_2,
+ FIELD_PREP(RGMII_CONFIG_MAX_SPD_PRG_2, 1),
+ RGMII_IO_MACRO_CONFIG);
+ else if (speed == SPEED_10)
+ rgmii_updatel(ethqos, RGMII_CONFIG_MAX_SPD_PRG_9,
+ FIELD_PREP(RGMII_CONFIG_MAX_SPD_PRG_9, 19),
+ RGMII_IO_MACRO_CONFIG);
+
switch (speed) {
case SPEED_1000:
rgmii_clrmask(ethqos, RGMII_CONFIG2_RSVD_CONFIG15,
@@ -453,9 +462,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_100:
- rgmii_updatel(ethqos, RGMII_CONFIG_MAX_SPD_PRG_2,
- FIELD_PREP(RGMII_CONFIG_MAX_SPD_PRG_2, 1),
- RGMII_IO_MACRO_CONFIG);
rgmii_clrmask(ethqos, RGMII_CONFIG2_RSVD_CONFIG15,
RGMII_IO_MACRO_CONFIG2);
@@ -479,9 +485,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_10:
- rgmii_updatel(ethqos, RGMII_CONFIG_MAX_SPD_PRG_9,
- FIELD_PREP(RGMII_CONFIG_MAX_SPD_PRG_9, 19),
- RGMII_IO_MACRO_CONFIG);
rgmii_clrmask(ethqos, RGMII_CONFIG2_RSVD_CONFIG15,
RGMII_IO_MACRO_CONFIG2);
if (ethqos->has_emac_ge_3)
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 07/15] net: stmmac: qcom-ethqos: move two more RGMII_IO_MACRO_CONFIG2 out
From: Russell King (Oracle) @ 2026-03-27 8:43 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL is always cleared, and
RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN is always updated with the phase
shift in each path through the switch, so these are independent of
the speed. Move them out.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../stmicro/stmmac/dwmac-qcom-ethqos.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index e9d8c8a7146a..ab6554f58214 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -420,13 +420,13 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
RGMII_IO_MACRO_CONFIG);
}
+ rgmii_clrmask(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL,
+ RGMII_IO_MACRO_CONFIG2);
+ rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN, phase_shift,
+ RGMII_IO_MACRO_CONFIG2);
+
switch (speed) {
case SPEED_1000:
- rgmii_clrmask(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL,
- RGMII_IO_MACRO_CONFIG2);
-
- rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN,
- phase_shift, RGMII_IO_MACRO_CONFIG2);
rgmii_clrmask(ethqos, RGMII_CONFIG2_RSVD_CONFIG15,
RGMII_IO_MACRO_CONFIG2);
rgmii_setmask(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
@@ -453,10 +453,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_100:
- rgmii_clrmask(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL,
- RGMII_IO_MACRO_CONFIG2);
- rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN,
- phase_shift, RGMII_IO_MACRO_CONFIG2);
rgmii_updatel(ethqos, RGMII_CONFIG_MAX_SPD_PRG_2,
FIELD_PREP(RGMII_CONFIG_MAX_SPD_PRG_2, 1),
RGMII_IO_MACRO_CONFIG);
@@ -483,10 +479,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_10:
- rgmii_clrmask(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL,
- RGMII_IO_MACRO_CONFIG2);
- rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN,
- phase_shift, RGMII_IO_MACRO_CONFIG2);
rgmii_updatel(ethqos, RGMII_CONFIG_MAX_SPD_PRG_9,
FIELD_PREP(RGMII_CONFIG_MAX_SPD_PRG_9, 19),
RGMII_IO_MACRO_CONFIG);
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 06/15] net: stmmac: qcom-ethqos: move 1G vs 100M/10M RGMII settings
From: Russell King (Oracle) @ 2026-03-27 8:43 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
Move RGMII_CONFIG_BYPASS_TX_ID_EN, RGMII_CONFIG_POS_NEG_DATA_SEL and
RGMII_CONFIG_PROG_SWAP. There are two states for these: one group for
1G, and the logical inversion for 100M and 10M. Move this out of the
switch into an if-else clause.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../stmicro/stmmac/dwmac-qcom-ethqos.c | 26 +++++++++----------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 34d9a6b2d023..e9d8c8a7146a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -404,14 +404,24 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
rgmii_setmask(ethqos, RGMII_CONFIG_DDR_MODE, RGMII_IO_MACRO_CONFIG);
- switch (speed) {
- case SPEED_1000:
+ if (speed == SPEED_1000) {
rgmii_clrmask(ethqos, RGMII_CONFIG_BYPASS_TX_ID_EN,
RGMII_IO_MACRO_CONFIG);
rgmii_setmask(ethqos, RGMII_CONFIG_POS_NEG_DATA_SEL,
RGMII_IO_MACRO_CONFIG);
rgmii_setmask(ethqos, RGMII_CONFIG_PROG_SWAP,
RGMII_IO_MACRO_CONFIG);
+ } else {
+ rgmii_setmask(ethqos, RGMII_CONFIG_BYPASS_TX_ID_EN,
+ RGMII_IO_MACRO_CONFIG);
+ rgmii_clrmask(ethqos, RGMII_CONFIG_POS_NEG_DATA_SEL,
+ RGMII_IO_MACRO_CONFIG);
+ rgmii_clrmask(ethqos, RGMII_CONFIG_PROG_SWAP,
+ RGMII_IO_MACRO_CONFIG);
+ }
+
+ switch (speed) {
+ case SPEED_1000:
rgmii_clrmask(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL,
RGMII_IO_MACRO_CONFIG2);
@@ -443,12 +453,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_100:
- rgmii_setmask(ethqos, RGMII_CONFIG_BYPASS_TX_ID_EN,
- RGMII_IO_MACRO_CONFIG);
- rgmii_clrmask(ethqos, RGMII_CONFIG_POS_NEG_DATA_SEL,
- RGMII_IO_MACRO_CONFIG);
- rgmii_clrmask(ethqos, RGMII_CONFIG_PROG_SWAP,
- RGMII_IO_MACRO_CONFIG);
rgmii_clrmask(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL,
RGMII_IO_MACRO_CONFIG2);
rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN,
@@ -479,12 +483,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_10:
- rgmii_setmask(ethqos, RGMII_CONFIG_BYPASS_TX_ID_EN,
- RGMII_IO_MACRO_CONFIG);
- rgmii_clrmask(ethqos, RGMII_CONFIG_POS_NEG_DATA_SEL,
- RGMII_IO_MACRO_CONFIG);
- rgmii_clrmask(ethqos, RGMII_CONFIG_PROG_SWAP,
- RGMII_IO_MACRO_CONFIG);
rgmii_clrmask(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL,
RGMII_IO_MACRO_CONFIG2);
rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN,
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 05/15] net: stmmac: qcom-ethqos: move RGMII_CONFIG_DDR_MODE
From: Russell King (Oracle) @ 2026-03-27 8:43 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
RGMII_CONFIG_DDR_MODE is always set irrespective of the speed. Move
this out of the switch.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index d19331067459..34d9a6b2d023 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -402,10 +402,10 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
return -EINVAL;
}
+ rgmii_setmask(ethqos, RGMII_CONFIG_DDR_MODE, RGMII_IO_MACRO_CONFIG);
+
switch (speed) {
case SPEED_1000:
- rgmii_setmask(ethqos, RGMII_CONFIG_DDR_MODE,
- RGMII_IO_MACRO_CONFIG);
rgmii_clrmask(ethqos, RGMII_CONFIG_BYPASS_TX_ID_EN,
RGMII_IO_MACRO_CONFIG);
rgmii_setmask(ethqos, RGMII_CONFIG_POS_NEG_DATA_SEL,
@@ -443,8 +443,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_100:
- rgmii_setmask(ethqos, RGMII_CONFIG_DDR_MODE,
- RGMII_IO_MACRO_CONFIG);
rgmii_setmask(ethqos, RGMII_CONFIG_BYPASS_TX_ID_EN,
RGMII_IO_MACRO_CONFIG);
rgmii_clrmask(ethqos, RGMII_CONFIG_POS_NEG_DATA_SEL,
@@ -481,8 +479,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
break;
case SPEED_10:
- rgmii_setmask(ethqos, RGMII_CONFIG_DDR_MODE,
- RGMII_IO_MACRO_CONFIG);
rgmii_setmask(ethqos, RGMII_CONFIG_BYPASS_TX_ID_EN,
RGMII_IO_MACRO_CONFIG);
rgmii_clrmask(ethqos, RGMII_CONFIG_POS_NEG_DATA_SEL,
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 04/15] net: stmmac: qcom-ethqos: move detection of invalid RGMII speed
From: Russell King (Oracle) @ 2026-03-27 8:43 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
Move detection of invalid RGMII speeds (which will never be triggered)
before the switch() to allow register modifications that are common to
all speeds to be moved out of the switch.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index f7e3a2b8803f..d19331067459 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -397,6 +397,11 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
/* Select RGMII, write 0 to interface select */
rgmii_clrmask(ethqos, RGMII_CONFIG_INTF_SEL, RGMII_IO_MACRO_CONFIG);
+ if (speed != SPEED_1000 && speed != SPEED_100 && speed != SPEED_10) {
+ dev_err(dev, "Invalid speed %d\n", speed);
+ return -EINVAL;
+ }
+
switch (speed) {
case SPEED_1000:
rgmii_setmask(ethqos, RGMII_CONFIG_DDR_MODE,
@@ -510,9 +515,6 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN,
loopback, RGMII_IO_MACRO_CONFIG);
break;
- default:
- dev_err(dev, "Invalid speed %d\n", speed);
- return -EINVAL;
}
return 0;
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 03/15] net: stmmac: qcom-ethqos: eliminate configure_func
From: Russell King (Oracle) @ 2026-03-27 8:43 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
Since ethqos_fix_mac_speed() is called via a function pointer, and only
indirects via the configure_func function pointer, eliminate this
unnecessary indirection.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../stmicro/stmmac/dwmac-qcom-ethqos.c | 35 ++++++++-----------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index b9cfcf32cebc..f7e3a2b8803f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -100,9 +100,6 @@ struct ethqos_emac_driver_data {
struct qcom_ethqos {
struct platform_device *pdev;
void __iomem *rgmii_base;
- void (*configure_func)(struct qcom_ethqos *ethqos,
- phy_interface_t interface, int speed);
-
struct clk *link_clk;
struct phy *serdes_phy;
phy_interface_t phy_mode;
@@ -521,13 +518,17 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
return 0;
}
-static void ethqos_configure_rgmii(struct qcom_ethqos *ethqos,
- phy_interface_t interface, int speed)
+static void ethqos_fix_mac_speed_rgmii(void *bsp_priv,
+ phy_interface_t interface, int speed,
+ unsigned int mode)
{
- struct device *dev = ðqos->pdev->dev;
+ struct qcom_ethqos *ethqos = bsp_priv;
+ struct device *dev;
unsigned int i;
u32 val;
+ dev = ðqos->pdev->dev;
+
/* Reset to POR values and enable clk */
for (i = 0; i < ethqos->num_rgmii_por; i++)
rgmii_writel(ethqos, ethqos->rgmii_por[i].value,
@@ -601,9 +602,12 @@ static void ethqos_pcs_set_inband(struct qcom_ethqos *ethqos, bool enable)
/* On interface toggle MAC registers gets reset.
* Configure MAC block for SGMII on ethernet phy link up
*/
-static void ethqos_configure_sgmii(struct qcom_ethqos *ethqos,
- phy_interface_t interface, int speed)
+static void ethqos_fix_mac_speed_sgmii(void *bsp_priv,
+ phy_interface_t interface, int speed,
+ unsigned int mode)
{
+ struct qcom_ethqos *ethqos = bsp_priv;
+
switch (speed) {
case SPEED_2500:
case SPEED_1000:
@@ -623,14 +627,6 @@ static void ethqos_configure_sgmii(struct qcom_ethqos *ethqos,
ethqos_pcs_set_inband(ethqos, interface == PHY_INTERFACE_MODE_SGMII);
}
-static void ethqos_fix_mac_speed(void *priv, phy_interface_t interface,
- int speed, unsigned int mode)
-{
- struct qcom_ethqos *ethqos = priv;
-
- ethqos->configure_func(ethqos, interface, speed);
-}
-
static int qcom_ethqos_serdes_powerup(struct net_device *ndev, void *priv)
{
struct qcom_ethqos *ethqos = priv;
@@ -687,7 +683,7 @@ static int ethqos_clks_config(void *priv, bool enabled)
/* Enable functional clock to prevent DMA reset to timeout due
* to lacking PHY clock after the hardware block has been power
* cycled. The actual configuration will be adjusted once
- * ethqos_fix_mac_speed() is invoked.
+ * ethqos' fix_mac_speed() method is invoked.
*/
qcom_ethqos_set_sgmii_loopback(ethqos, true);
ethqos_set_func_clk_en(ethqos);
@@ -753,11 +749,11 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
case PHY_INTERFACE_MODE_RGMII_ID:
case PHY_INTERFACE_MODE_RGMII_RXID:
case PHY_INTERFACE_MODE_RGMII_TXID:
- ethqos->configure_func = ethqos_configure_rgmii;
+ plat_dat->fix_mac_speed = ethqos_fix_mac_speed_rgmii;
break;
case PHY_INTERFACE_MODE_2500BASEX:
case PHY_INTERFACE_MODE_SGMII:
- ethqos->configure_func = ethqos_configure_sgmii;
+ plat_dat->fix_mac_speed = ethqos_fix_mac_speed_sgmii;
plat_dat->mac_finish = ethqos_mac_finish_serdes;
break;
default:
@@ -805,7 +801,6 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
plat_dat->bsp_priv = ethqos;
plat_dat->set_clk_tx_rate = ethqos_set_clk_tx_rate;
- plat_dat->fix_mac_speed = ethqos_fix_mac_speed;
plat_dat->dump_debug_regs = rgmii_dump;
plat_dat->ptp_clk_freq_config = ethqos_ptp_clk_freq_config;
plat_dat->core_type = DWMAC_CORE_GMAC4;
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 02/15] net: stmmac: qcom-ethqos: pass ethqos to ethqos_pcs_set_inband()
From: Russell King (Oracle) @ 2026-03-27 8:43 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
Rather than getting the stmmac_priv pointer in
ethqos_configure_sgmii(), move it into ethqos_pcs_set_inband() and pass
the struct qcom_ethqos pointer instead.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 502f2b184a87..b9cfcf32cebc 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -590,8 +590,11 @@ static void ethqos_configure_rgmii(struct qcom_ethqos *ethqos,
ethqos_rgmii_macro_init(ethqos, speed);
}
-static void ethqos_pcs_set_inband(struct stmmac_priv *priv, bool enable)
+static void ethqos_pcs_set_inband(struct qcom_ethqos *ethqos, bool enable)
{
+ struct net_device *dev = platform_get_drvdata(ethqos->pdev);
+ struct stmmac_priv *priv = netdev_priv(dev);
+
stmmac_pcs_ctrl_ane(priv, enable, 0);
}
@@ -601,9 +604,6 @@ static void ethqos_pcs_set_inband(struct stmmac_priv *priv, bool enable)
static void ethqos_configure_sgmii(struct qcom_ethqos *ethqos,
phy_interface_t interface, int speed)
{
- struct net_device *dev = platform_get_drvdata(ethqos->pdev);
- struct stmmac_priv *priv = netdev_priv(dev);
-
switch (speed) {
case SPEED_2500:
case SPEED_1000:
@@ -620,7 +620,7 @@ static void ethqos_configure_sgmii(struct qcom_ethqos *ethqos,
break;
}
- ethqos_pcs_set_inband(priv, interface == PHY_INTERFACE_MODE_SGMII);
+ ethqos_pcs_set_inband(ethqos, interface == PHY_INTERFACE_MODE_SGMII);
}
static void ethqos_fix_mac_speed(void *priv, phy_interface_t interface,
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 01/15] net: stmmac: qcom-ethqos: remove ethqos_configure()
From: Russell King (Oracle) @ 2026-03-27 8:43 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
In-Reply-To: <acZDEg9wdjhBTHlL@shell.armlinux.org.uk>
ethqos_configure() does nothing more than indirect via
ethqos->configure_func, and is only called from ethqos_fix_mac_speed()
just below. Move the indirect call into ethqos_fix_mac_speed().
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 3ccf20fdf52a..502f2b184a87 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -623,18 +623,12 @@ static void ethqos_configure_sgmii(struct qcom_ethqos *ethqos,
ethqos_pcs_set_inband(priv, interface == PHY_INTERFACE_MODE_SGMII);
}
-static void ethqos_configure(struct qcom_ethqos *ethqos,
- phy_interface_t interface, int speed)
-{
- return ethqos->configure_func(ethqos, interface, speed);
-}
-
static void ethqos_fix_mac_speed(void *priv, phy_interface_t interface,
int speed, unsigned int mode)
{
struct qcom_ethqos *ethqos = priv;
- ethqos_configure(ethqos, interface, speed);
+ ethqos->configure_func(ethqos, interface, speed);
}
static int qcom_ethqos_serdes_powerup(struct net_device *ndev, void *priv)
--
2.47.3
^ permalink raw reply related
* [PATCH net-next v2 00/15] net: stmmac: qcom-ethqos: more cleanups
From: Russell King (Oracle) @ 2026-03-27 8:42 UTC (permalink / raw)
To: Andrew Lunn
Cc: Alexandre Torgue, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, linux-arm-kernel, linux-arm-msm, linux-stm32,
Mohd Ayaan Anwar, netdev, Paolo Abeni
Further cleanups to qcom-ethqos, mainly concentrating on the RGMII
code, making it clearer what the differences are for each speed, thus
making the code more readable.
I'm still not really happy with this. The speed specific configuration
remains split between ethqos_fix_mac_speed_rgmii() and
ethqos_rgmii_macro_init(), where the latter is only ever called from
the former. So, I think further work is needed here - maybe it needs
restructuring into the various componenet parts of the RGMII block?
v2:
- patch 2: fix typo in commit message
- patch 3: fix ethqos_fix_mac_speed() comment
.../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 220 ++++++++-------------
1 file changed, 87 insertions(+), 133 deletions(-)
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
^ permalink raw reply
* Re: [PATCH net] net/x25: Fix overflow when accumulating packets
From: Martin Schiller @ 2026-03-27 8:36 UTC (permalink / raw)
To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
Cc: Yiming Qian, linux-x25, netdev, linux-kernel, security
In-Reply-To: <20260327-x25_fraglen-v1-1-9fc751d4f754@dev.tdt.de>
On 2026-03-27 09:30, Martin Schiller wrote:
> Add a check to ensure that `x25_sock.fraglen` does not overflow.
>
> The `fraglen` also needs to be resetted when purging `fragment_queue`
> in
> `x25_clear_queues()`.
>
> Reported-by: Yiming Qian <yimingqian591@gmail.com>
> Signed-off-by: Martin Schiller <ms@dev.tdt.de>
> ---
> net/x25/x25_in.c | 6 ++++++
> net/x25/x25_subr.c | 1 +
> 2 files changed, 7 insertions(+)
>
> diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
> index
> b981a4828d08c2e6676749a06035910eab01e6cd..1603238d6fff73090ef10b5fd11387b3e7f017a2
> 100644
> --- a/net/x25/x25_in.c
> +++ b/net/x25/x25_in.c
> @@ -34,6 +34,12 @@ static int x25_queue_rx_frame(struct sock *sk,
> struct sk_buff *skb, int more)
> struct sk_buff *skbo, *skbn = skb;
> struct x25_sock *x25 = x25_sk(sk);
>
> + /* make sure we don't overflow */
> + if (x25->fraglen + skb->len > sizeof(x25->fraglen)) {
Please ignore this patch. I'll send a V2 without that
"sizeof()" nonsense in a moment.
> + kfree_skb(skb);
> + return 1;
> + }
> +
> if (more) {
> x25->fraglen += skb->len;
> skb_queue_tail(&x25->fragment_queue, skb);
> diff --git a/net/x25/x25_subr.c b/net/x25/x25_subr.c
> index
> 0285aaa1e93c17233748d38eef6d8b5c6059b67a..159708d9ad20cb2e6db24ead67daf1e9d6258f64
> 100644
> --- a/net/x25/x25_subr.c
> +++ b/net/x25/x25_subr.c
> @@ -40,6 +40,7 @@ void x25_clear_queues(struct sock *sk)
> skb_queue_purge(&x25->interrupt_in_queue);
> skb_queue_purge(&x25->interrupt_out_queue);
> skb_queue_purge(&x25->fragment_queue);
> + x25->fraglen = 0;
> }
>
>
>
> ---
> base-commit: 4ae97cae07e15d41e5c0ebabba64c6eefdeb0bbe
> change-id: 20260325-x25_fraglen-8fc240d1edd3
>
> Best regards,
^ permalink raw reply
* Re: [PATCH net-next] net: add sysctl to toggle napi_consume_skb() alien skb defer
From: Jason Xing @ 2026-03-27 8:34 UTC (permalink / raw)
To: Stanislav Fomichev; +Cc: davem, edumazet, kuba, pabeni, horms, netdev
In-Reply-To: <acYD8JT16b3_htIz@mini-arch>
On Fri, Mar 27, 2026 at 12:13 PM Stanislav Fomichev
<stfomichev@gmail.com> wrote:
>
> On 03/26, Jason Xing wrote:
> > Commit e20dfbad8aab ("net: fix napi_consume_skb() with alien skbs")
> > defers freeing of alien SKBs (alloc_cpu != current cpu) via
> > skb_attempt_defer_free() on the TX completion path to reduce cross-NUMA
> > SLUB spinlock contention to improve multi-queue UDP workloads.
> >
> > However, this unconditionally impacts the napi_skb_cache fast recycle
> > path for single-flow / few-flow workloads (e.g. AF_XDP benchmarks[1]):
> > when the TX completion NAPI CPU differs from the SKB allocation CPU,
> > SKBs are deferred instead of being returned to the local napi_skb_cache,
> > forcing RX allocations back to the slow slab path.
> >
> > The existing net.core.skb_defer_max=0 could disable this, but it is a
> > global switch that also disables the defer mechanism in TCP/UDP/MPTCP
> > recvmsg paths, losing its positive SLUB locality benefits there. AF_XDP
> > can co-exist with other protocols. That's the reason why I gave up
> > reusing skb_defer_disable_key. Besides, if the defer path is disabled,
> > that means TCP/UDP/MPTCP in process path will trigger directly freeing
> > skb with enabling/disabling bottom half(in kfree_skb_napi_cache())
> > which could affect others. So my thinking is not to touch this path.
> >
> > Add a dedicated sysctl net.core.napi_consume_skb_defer backed by a
> > static key to selectively control the alien skb defer feature. Let
> > users decide which is the best fit for their own requirements.
>
> For a non-zc path adding a userspace knob feels like too much. And there
> is zero documentation for users to decide which mode to use.
AF_XDP is the only one case that I use to exemplify. Reusing defer max
is not flexible and good enough as I've mentioned in the commit.
Please note that the knob is applicable for single or few flows
regardless of what kinds of protocols/tunnels, which brings 6.6%
improvement back that is not trivial/negligible.
You're right about the doc. Will add the following one, thanks.
diff --git a/Documentation/admin-guide/sysctl/net.rst
b/Documentation/admin-guide/sysctl/net.rst
index 0724a793798f..42e06f93306f 100644
--- a/Documentation/admin-guide/sysctl/net.rst
+++ b/Documentation/admin-guide/sysctl/net.rst
@@ -368,6 +368,19 @@ by the cpu which allocated them.
Default: 128
+napi_consume_skb_defer
+----------------------
+When set to 1 (default), napi_consume_skb() defers freeing SKBs whose
+allocation CPU differs from the current CPU via skb_attempt_defer_free().
+This reduces cross-NUMA SLUB spinlock contention for multi-queue workloads.
+
+Setting this to 0 disables the defer path in napi_consume_skb() only,
+allowing SKBs to be returned to the local napi_skb_cache immediately.
+This can benefit single-flow or few-flow workloads (e.g. AF_XDP TX)
+where the defer detour hurts the fast recycle path.
+
+Default: 1
+
optmem_max
----------
Thanks,
Jason
^ permalink raw reply related
* [net-next PATCH v2 00/13] net: renesas: rswitch: R-Car S4 add VLAN aware switching
From: Michael Dege @ 2026-03-27 8:27 UTC (permalink / raw)
To: Yoshihiro Shimoda, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni
Cc: netdev, linux-renesas-soc, linux-kernel, Michael Dege
Hello!
The current R-Car S4 rswitch driver only supports basic HW offloading
for L2 switching/bridgeing. This patchset extends the driver with
support for VLAN aware switching.
1. For every port mode change from configuration to operation and
vice-versa you need to change to disabled mode first. The
functions rswitch_<port>_change_mode now take care of this.
2. In upcomming changes for adding vlan support struct net_device
will not be available in all cases, therefore use struct device
instead.
3. Fix typo in register define macro and remove duplicate macro.
4. Add register definitions needed fo vlan support.
5. Add exception path for packets with unknown destitination MAC
addresses.
6. Make the helper functions rswitch_reg_wait(),
rswitch_etha_change_mode() and rswitch_etha_change_mode()
available to the whole driver.
7. Add basic start-up time initialization needed to support VLANs.
8. Update ETHA and GWCA port HW initializations.
9. Clean up is_rdev() rswitch_device checking.
10. Provide struct rswitch_private to notifiers.
11. Add handler for FDB notifications to configure bridge MAC address
to GWCA registers and update static MAC table entry.
12. Add vlan support to L2 HW bridge.
Configuration example:
ip link add name br0 type bridge vlan_filtering 1
ip link set dev tsn0 master br0
ip link set dev tsn1 master br0
ip link set dev br0 up
ip link set dev tsn0 up
ip link set dev tsn1 up
bridge vlan add dev tsn0 vid 4
bridge vlan add dev tsn1 vid 4
bridge vlan add dev br0 vid 4 self
ip a a 192.168.1.20/24 dev br0
ip l a link br0 name br0.1 type vlan id 1
ip l a link br0 name br0.4 type vlan id 4
ip a a 192.168.2.20/24 dev br0.1
ip a a 192.168.4.20/24 dev br0.4
ip link set dev br0.1 up
ip link set dev br0.4 up
Signed-off-by: Michael Dege <michael.dege@renesas.com>
---
Changes in v2:
- Reworked reswitch_update_l2_hw_forwarding_gwca() as suggested.
- Fixed missing initialization found by test robot.
- Link to v1: https://lore.kernel.org/r/20260317-rswitch_add_vlans-v1-0-3a57bfa0f2d1@renesas.com
---
Michael Dege (13):
net: renesas: rswitch: improve port change mode functions
net: renesas: rswitch: use device instead of net_device
net: renesas: rswitch: fix FWPC2 register access macros
net: renesas: rswitch: add register definitions for vlan support
net: renesas: rswitch: add exception path for packets with unknown dst MAC
net: renesas: rswitch: add forwarding rules for gwca
net: renesas: rswitch: make helper functions available to whole driver
net: renesas: rswitch: add basic vlan init to rswitch_fwd_init
net: renesas: rswitch: update port HW init
net: renesas: rswitch: clean up is_rdev rswitch_device checking
net: renesas: rswitch: add passing of rswitch_private into notifiers
net: renesas: rswitch: add handler for FDB notification
net: renesas: rswitch: add vlan aware switching
drivers/net/ethernet/renesas/rswitch.h | 181 +++++++-
drivers/net/ethernet/renesas/rswitch_l2.c | 637 ++++++++++++++++++++++++----
drivers/net/ethernet/renesas/rswitch_l2.h | 6 +-
drivers/net/ethernet/renesas/rswitch_main.c | 203 ++++++---
4 files changed, 871 insertions(+), 156 deletions(-)
---
base-commit: 1f318b96cc84d7c2ab792fcc0bfd42a7ca890681
change-id: 20260120-rswitch_add_vlans-39488bfb296c
Best regards,
--
Michael Dege <michael.dege@renesas.com>
^ permalink raw reply
* Re: [PATCH net-next v8 4/4] tun/tap & vhost-net: avoid ptr_ring tail-drop when a qdisc is present
From: Simon Schippers @ 2026-03-27 8:31 UTC (permalink / raw)
To: Jason Wang
Cc: willemdebruijn.kernel, andrew+netdev, davem, edumazet, kuba,
pabeni, mst, eperezma, leiyang, stephen, jon, tim.gebauer, netdev,
linux-kernel, kvm, virtualization
In-Reply-To: <CACGkMEsUag4zNZG+aYipHv_PirbKb_rs7DzSOr-NF8ckhUaJOQ@mail.gmail.com>
On 3/27/26 02:13, Jason Wang wrote:
> On Thu, Mar 26, 2026 at 11:31 PM Simon Schippers
> <simon.schippers@tu-dortmund.de> wrote:
>>
>> On 3/26/26 03:41, Jason Wang wrote:
>>> On Wed, Mar 25, 2026 at 10:48 PM Simon Schippers
>>> <simon.schippers@tu-dortmund.de> wrote:
>>>>
>>>> On 3/24/26 11:14, Simon Schippers wrote:
>>>>> On 3/24/26 02:47, Jason Wang wrote:
>>>>>> On Thu, Mar 12, 2026 at 9:07 PM Simon Schippers
>>>>>> <simon.schippers@tu-dortmund.de> wrote:
>>>>>>>
>>>>>>> This commit prevents tail-drop when a qdisc is present and the ptr_ring
>>>>>>> becomes full. Once an entry is successfully produced and the ptr_ring
>>>>>>> reaches capacity, the netdev queue is stopped instead of dropping
>>>>>>> subsequent packets.
>>>>>>>
>>>>>>> If producing an entry fails anyways due to a race, tun_net_xmit returns
>>>>>>> NETDEV_TX_BUSY, again avoiding a drop. Such races are expected because
>>>>>>> LLTX is enabled and the transmit path operates without the usual locking.
>>>>>>>
>>>>>>> The existing __tun_wake_queue() function wakes the netdev queue. Races
>>>>>>> between this wakeup and the queue-stop logic could leave the queue
>>>>>>> stopped indefinitely. To prevent this, a memory barrier is enforced
>>>>>>> (as discussed in a similar implementation in [1]), followed by a recheck
>>>>>>> that wakes the queue if space is already available.
>>>>>>>
>>>>>>> If no qdisc is present, the previous tail-drop behavior is preserved.
>>>>>>
>>>>>> I wonder if we need a dedicated TUN flag to enable this. With this new
>>>>>> flag, we can even prevent TUN from using noqueue (not sure if it's
>>>>>> possible or not).
>>>>>>
>>>>>
>>>>> Except of the slight regressions because of this patchset I do not see
>>>>> a reason for such a flag.
>>>>>
>>>>> I have never seen that the driver prevents noqueue. For example you can
>>>>> set noqueue to your ethernet interface and under load you soon get
>>>>>
>>>>> net_crit_ratelimited("Virtual device %s asks to queue packet!\n",
>>>>> dev->name);
>>>>>
>>>>> followed by a -ENETDOWN. And this is not prevented even though it is
>>>>> clearly not something a user wants.
>>>>>
>>>>>>>
>>>>>>> Benchmarks:
>>>>>>> The benchmarks show a slight regression in raw transmission performance,
>>>>>>> though no packets are lost anymore.
>>>>>>>
>>>>>>> The previously introduced threshold to only wake after the queue stopped
>>>>>>> and half of the ring was consumed showed to be a descent choice:
>>>>>>> Waking the queue whenever a consume made space in the ring strongly
>>>>>>> degrades performance for tap, while waking only when the ring is empty
>>>>>>> is too late and also hurts throughput for tap & tap+vhost-net.
>>>>>>> Other ratios (3/4, 7/8) showed similar results (not shown here), so
>>>>>>> 1/2 was chosen for the sake of simplicity for both tun/tap and
>>>>>>> tun/tap+vhost-net.
>>>>>>>
>>>>>>> Test setup:
>>>>>>> AMD Ryzen 5 5600X at 4.3 GHz, 3200 MHz RAM, isolated QEMU threads;
>>>>>>> Average over 20 runs @ 100,000,000 packets. SRSO and spectre v2
>>>>>>> mitigations disabled.
>>>>>>>
>>>>>>> Note for tap+vhost-net:
>>>>>>> XDP drop program active in VM -> ~2.5x faster, slower for tap due to
>>>>>>> more syscalls (high utilization of entry_SYSRETQ_unsafe_stack in perf)
>>>>>>>
>>>>>>> +--------------------------+--------------+----------------+----------+
>>>>>>> | 1 thread | Stock | Patched with | diff |
>>>>>>> | sending | | fq_codel qdisc | |
>>>>>>> +------------+-------------+--------------+----------------+----------+
>>>>>>> | TAP | Transmitted | 1.151 Mpps | 1.139 Mpps | -1.1% |
>>>>>>> | +-------------+--------------+----------------+----------+
>>>>>>> | | Lost/s | 3.606 Mpps | 0 pps | |
>>>>>>> +------------+-------------+--------------+----------------+----------+
>>>>>>> | TAP | Transmitted | 3.948 Mpps | 3.738 Mpps | -5.3% |
>>>>>>> | +-------------+--------------+----------------+----------+
>>>>>>> | +vhost-net | Lost/s | 496.5 Kpps | 0 pps | |
>>>>>>> +------------+-------------+--------------+----------------+----------+
>>>>>>>
>>>>>>> +--------------------------+--------------+----------------+----------+
>>>>>>> | 2 threads | Stock | Patched with | diff |
>>>>>>> | sending | | fq_codel qdisc | |
>>>>>>> +------------+-------------+--------------+----------------+----------+
>>>>>>> | TAP | Transmitted | 1.133 Mpps | 1.109 Mpps | -2.1% |
>>>>>>> | +-------------+--------------+----------------+----------+
>>>>>>> | | Lost/s | 8.269 Mpps | 0 pps | |
>>>>>>> +------------+-------------+--------------+----------------+----------+
>>>>>>> | TAP | Transmitted | 3.820 Mpps | 3.513 Mpps | -8.0% |
>>>>>>> | +-------------+--------------+----------------+----------+
>>>>>>> | +vhost-net | Lost/s | 4.961 Mpps | 0 pps | |
>>>>>>> +------------+-------------+--------------+----------------+----------+
>>>>>>>
>>>>>>> [1] Link: https://lore.kernel.org/all/20250424085358.75d817ae@kernel.org/
>>>>>>>
>>>>>>> Co-developed-by: Tim Gebauer <tim.gebauer@tu-dortmund.de>
>>>>>>> Signed-off-by: Tim Gebauer <tim.gebauer@tu-dortmund.de>
>>>>>>> Signed-off-by: Simon Schippers <simon.schippers@tu-dortmund.de>
>>>>>>> ---
>>>>>>> drivers/net/tun.c | 30 ++++++++++++++++++++++++++++--
>>>>>>> 1 file changed, 28 insertions(+), 2 deletions(-)
>>>>>>>
>>>>>>> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
>>>>>>> index b86582cc6cb6..9b7daec69acd 100644
>>>>>>> --- a/drivers/net/tun.c
>>>>>>> +++ b/drivers/net/tun.c
>>>>>>> @@ -1011,6 +1011,8 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
>>>>>>> struct netdev_queue *queue;
>>>>>>> struct tun_file *tfile;
>>>>>>> int len = skb->len;
>>>>>>> + bool qdisc_present;
>>>>>>> + int ret;
>>>>>>>
>>>>>>> rcu_read_lock();
>>>>>>> tfile = rcu_dereference(tun->tfiles[txq]);
>>>>>>> @@ -1063,13 +1065,37 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
>>>>>>>
>>>>>>> nf_reset_ct(skb);
>>>>>>>
>>>>>>> - if (ptr_ring_produce(&tfile->tx_ring, skb)) {
>>>>>>> + queue = netdev_get_tx_queue(dev, txq);
>>>>>>> + qdisc_present = !qdisc_txq_has_no_queue(queue);
>>>>>>> +
>>>>>>> + spin_lock(&tfile->tx_ring.producer_lock);
>>>>>>> + ret = __ptr_ring_produce(&tfile->tx_ring, skb);
>>>>>>> + if (__ptr_ring_produce_peek(&tfile->tx_ring) && qdisc_present) {
>>>>>>
>>>>>> So, it's possible that the administrator is switching between noqueue
>>>>>> and another qdisc. So ptr_ring_produce() can fail here, do we need to
>>>>>> check that or not?
>>>>>>
>>>>>
>>>>> Do you mean that? My thoughts:
>>>>>
>>>>> Switching from noqueue to some qdisc can cause a
>>>>>
>>>>> net_crit_ratelimited("Virtual device %s asks to queue packet!\n",
>>>>> dev->name);
>>>>>
>>>>> followed by a return of -ENETDOWN in __dev_queue_xmit().
>>>>> This is because tun_net_xmit detects some qdisc with
>>>>>
>>>>> qdisc_present = !qdisc_txq_has_no_queue(queue);
>>>>>
>>>>> and returns NETDEV_TX_BUSY even though __dev_queue_xmit() did still
>>>>> detect noqueue.
>>>>>
>>>>> I am not sure how to solve this/if this has to be solved.
>>>>> I do not see a proper way to avoid parallel execution of ndo_start_xmit
>>>>> and a qdisc change (dev_graft_qdisc only takes qdisc_skb_head lock).
>>>>>
>>>>> And from my understanding the veth implementation faces the same issue.
>>>>
>>>> How about rechecking if a qdisc is connected?
>>>> This would avoid -ENETDOWN.
>>>>
>>>> diff --git a/net/core/dev.c b/net/core/dev.c
>>>> index f48dc299e4b2..2731a1a70732 100644
>>>> --- a/net/core/dev.c
>>>> +++ b/net/core/dev.c
>>>> @@ -4845,10 +4845,17 @@ int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)
>>>> if (is_list)
>>>> rc = NETDEV_TX_OK;
>>>> }
>>>> + bool qdisc_present = !qdisc_txq_has_no_queue(txq);
>>>> HARD_TX_UNLOCK(dev, txq);
>>>> if (!skb) /* xmit completed */
>>>> goto out;
>>>>
>>>> + /* Maybe a qdisc was connected in the meantime */
>>>> + if (qdisc_present) {
>>>> + kfree_skb(skb);
>>>> + goto out;
>>>> + }
>>>> +
>>>> net_crit_ratelimited("Virtual device %s asks to queue packet!\n",
>>>> dev->name);
>>>> /* NETDEV_TX_BUSY or queue was stopped */
>>>>
>>>
>>> Probably not, and we likely won't hit this warning because qdisc could
>>> not be changed during ndo_start_xmit().
>>
>> Okay.
>>
>>>
>>> I meant something like this:
>>>
>>> 1) set noqueue to tuntap
>>> 2) produce packets so tuntap is full
>>> 3) set e.g fq_codel to tuntap
>>> 4) then we can hit the failure of __ptr_ring_produce()
>>>
>>> Rethink of the code, it looks just fine.
>>
>> Yes, in this case it just returns NETDEV_TX_BUSY which is fine with a
>> qdisc attached.
>>
>>>
>>>>
>>>>>
>>>>>
>>>>> Switching from some qdisc to noqueue is no problem I think.
>>>>>
>>>>>>> + netif_tx_stop_queue(queue);
>>>>>>> + /* Avoid races with queue wake-ups in __tun_wake_queue by
>>>>>>> + * waking if space is available in a re-check.
>>>>>>> + * The barrier makes sure that the stop is visible before
>>>>>>> + * we re-check.
>>>>>>> + */
>>>>>>> + smp_mb__after_atomic();
>>>>>>
>>>>>> Let's document which barrier is paired with this.
>>>>>>
>>>>>
>>>>> I am basically copying the (old) logic of veth [1] proposed by
>>>>> Jakub Kicinski. I must admit I am not 100% sure what it pairs with.
>>>>>
>>>>> [1] Link: https://lore.kernel.org/all/20250424085358.75d817ae@kernel.org/
>>>
>>> So it looks like it implicitly tries to pair with tun_ring_consume():
>>>
>>> 1) spinlock(consumer_lock)
>>> 2) store NULL to ptr_ring // STORE
>>> 3) spinunlock(consumer_lock) // RELEASE
>>> 4) spinlock(consumer_lock) // ACQURE
>>> 5) check empty
>>> 6) spinunlock(consumer_lock)
>>> 7) netif_wakeup_queue() // test_and_set() which is an RMW
>>>
>>> RELEASE + ACQUIRE implies a full barrier
>>
>> Thanks.
>>
>>>
>>> I see several problems
>>>
>>> 1) Due to batch consumption, we may get spurious wakeups under heavy
>>> load (we can try disabling batch consuming to see if it helps).
>>
>> I assume that you mean the waking in the recheck of the producer happens
>> too often and then wakes too often. But this would just take slightly
>> more producer cpu as the SOFTIRQ runs on the producer cpu and not slow
>> down the consumer?
>>
>> Why would disabling batch consume help here?
>
> We could end up with.
>
> 1) consumer wakes up the producer but the slot is not cleaned
Ah okay.. I guess MST will not like this:
From now on I assume that by "batch consumption" you mean that
__ptr_ring_zero_tail() is only called after consuming ring.batch
elements. And you want to disable it so __ptr_ring_zero_tail() is
called after each consumption.
(And I assume that you do not mean ptr_ring_consume_batched() in
vhost_net_buf_produce() as that does not make sense to me.)
I think my current implementation works fine with that:
The consumer only wakes after consuming >= ring.size/2.
And this is for TAP and TAP+vhost-net.
And ring.size/2 is always bigger than a single ring.batch (see
__ptr_ring_set_size() ), which ensures that __ptr_ring_zero_tail()
is called and the slot is cleaned before waking.
Waking on ptr_ring_empty() also ensures that __ptr_ring_zero_tail()
is called and the slot is cleaned before waking.
> 2) producer is woken up but see the ring is full, so it need to drop the packet
>
> This probably defeat the goal of zero packet loss.
No then NETDEV_TX_BUSY is returned (noticeable as qdisc requeue).
And this happened very rarely for me in my benchmarks.
Here the average of the 20 runs @ 100.000.000 packets each:
TAP single queue: 23.6 requeues
TAP 2 queues: 35.5 requeues
TAP+vhost-net single queue: 1.9 requeues
TAP+vhost-net 2 queues: 12.1 requeues
>
>> Wouldn't it just decrease the consumer speed?
>
> Not sure, we probably need a benchmark.
>
>>
>> Apart from that I do not see a different method to do this recheck.
>> The ring producer is only safely able to do a !produce_peek (so a check
>> for !full).
>>
>> The normal waking (after consuming half of the ring) should be fine IMO.
>>
>>> 2) So the barriers don't help but would slow down the consuming
>>> 3) Two spinlocks were used instead of one, this is another reason we
>>> will see a performance regression
>>
>> You are right, I can change it to a single spin_lock. Apart from that
>> I do not see how the barriers/locking could be reduced further.
>>
>>> 4) Tricky code that needs to be understood or at least requires a comment tweak.
>>>
>>> Note that due to ~IFF_TX_SKB_SHARING, pktgen can't clone skbs, so we
>>> may not notice the real degradation.
>>
>> So run pktgen with pg_set SHARED?
>
> Probably (as a workaround).
>
Okay, for future benchmarks I will add this command to my benchmark
scripts.
>> I am pretty sure that the vhost
>> thread was always at 100% CPU so pktgen was not the bottleneck. And when
>> I had perf enabled I always saw that in my patched version not the
>> creation of SKB's took most CPU in pktgen but a different unnamed
>> function (I assume this is a waiting function).
>
> Let's try and see.
>
> Thanks
>
>>
>>
>> Thank you!
>>
>>>
>>>>>
>>>>>>> + if (!__ptr_ring_produce_peek(&tfile->tx_ring))
>>>>>>> + netif_tx_wake_queue(queue);
>>>>>>> + }
>>>>>>> + spin_unlock(&tfile->tx_ring.producer_lock);
>>>>>>> +
>>>>>>> + if (ret) {
>>>>>>> + /* If a qdisc is attached to our virtual device,
>>>>>>> + * returning NETDEV_TX_BUSY is allowed.
>>>>>>> + */
>>>>>>> + if (qdisc_present) {
>>>>>>> + rcu_read_unlock();
>>>>>>> + return NETDEV_TX_BUSY;
>>>>>>> + }
>>>>>>> drop_reason = SKB_DROP_REASON_FULL_RING;
>>>>>>> goto drop;
>>>>>>> }
>>>>>>>
>>>>>>> /* dev->lltx requires to do our own update of trans_start */
>>>>>>> - queue = netdev_get_tx_queue(dev, txq);
>>>>>>> txq_trans_cond_update(queue);
>>>>>>>
>>>>>>> /* Notify and wake up reader process */
>>>>>>> --
>>>>>>> 2.43.0
>>>>>>>
>>>>>>
>>>>>> Thanks
>>>>>>
>>>>
>>>
>>> Thanks
>>>
>>
>
^ permalink raw reply
* [PATCH net-next v2 13/13] net: renesas: rswitch: add vlan aware switching
From: Michael Dege @ 2026-03-27 8:27 UTC (permalink / raw)
To: Yoshihiro Shimoda, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni
Cc: netdev, linux-renesas-soc, linux-kernel, Michael Dege
In-Reply-To: <20260327-rswitch_add_vlans-v2-0-d7f4358ca57a@renesas.com>
Add vlan support to L2 HW bridge.
On R-Car S4 there is limited vlan support, which is not fully
802.1Q compliant. The aim of this driver addition is to get as
close as possible to the correct behavior. Limitations are:
- all ports should be in the same default vlan
- default vlans are not stripped on egress.
Signed-off-by: Michael Dege <michael.dege@renesas.com>
---
drivers/net/ethernet/renesas/rswitch_l2.c | 406 ++++++++++++++++++++++++++----
1 file changed, 357 insertions(+), 49 deletions(-)
diff --git a/drivers/net/ethernet/renesas/rswitch_l2.c b/drivers/net/ethernet/renesas/rswitch_l2.c
index ea95a87ed234..ebd9d8d71a53 100644
--- a/drivers/net/ethernet/renesas/rswitch_l2.c
+++ b/drivers/net/ethernet/renesas/rswitch_l2.c
@@ -7,6 +7,7 @@
#include <linux/err.h>
#include <linux/etherdevice.h>
#include <linux/if_bridge.h>
+#include <linux/if_vlan.h>
#include <linux/kernel.h>
#include <net/switchdev.h>
@@ -173,22 +174,6 @@ static void rswitch_port_update_brdev(struct net_device *ndev,
rswitch_update_offload_brdev(rdev->priv);
}
-static int rswitch_port_update_stp_state(struct net_device *ndev, u8 stp_state)
-{
- struct rswitch_device *rdev;
-
- if (!is_rdev(ndev))
- return -ENODEV;
-
- rdev = netdev_priv(ndev);
- rdev->learning_requested = (stp_state == BR_STATE_LEARNING ||
- stp_state == BR_STATE_FORWARDING);
- rdev->forwarding_requested = (stp_state == BR_STATE_FORWARDING);
- rswitch_update_l2_offload(rdev->priv);
-
- return 0;
-}
-
static int rswitch_netdevice_event(struct notifier_block *nb,
unsigned long event,
void *ptr)
@@ -212,61 +197,395 @@ static int rswitch_netdevice_event(struct notifier_block *nb,
return NOTIFY_OK;
}
-static int rswitch_update_ageing_time(struct net_device *ndev, clock_t time)
+static int rswitch_port_update_stp_state(struct net_device *ndev, u8 stp_state)
{
- struct rswitch_device *rdev = netdev_priv(ndev);
- u32 reg_val;
+ struct rswitch_device *rdev;
if (!is_rdev(ndev))
return -ENODEV;
+ rdev = netdev_priv(ndev);
+ rdev->learning_requested = (stp_state == BR_STATE_LEARNING ||
+ stp_state == BR_STATE_FORWARDING);
+ rdev->forwarding_requested = (stp_state == BR_STATE_FORWARDING);
+ rswitch_update_l2_offload(rdev->priv);
+
+ return 0;
+}
+
+static int rswitch_update_ageing_time(struct rswitch_private *priv, clock_t time)
+{
+ u32 reg_val;
+
if (!FIELD_FIT(FWMACAGC_MACAGT, time))
return -EINVAL;
reg_val = FIELD_PREP(FWMACAGC_MACAGT, time);
reg_val |= FWMACAGC_MACAGE | FWMACAGC_MACAGSL;
- iowrite32(reg_val, rdev->priv->addr + FWMACAGC);
+ iowrite32(reg_val, priv->addr + FWMACAGC);
return 0;
}
-static int rswitch_port_attr_set(struct net_device *ndev, const void *ctx,
- const struct switchdev_attr *attr,
- struct netlink_ext_ack *extack)
+static void rswitch_update_vlan_filtering(struct rswitch_private *priv,
+ bool vlan_filtering)
{
+ if (vlan_filtering)
+ rswitch_modify(priv->addr, FWPC0(AGENT_INDEX_GWCA),
+ 0, FWPC0_VLANSA | FWPC0_VLANRU);
+ else
+ rswitch_modify(priv->addr, FWPC0(AGENT_INDEX_GWCA),
+ FWPC0_VLANSA | FWPC0_VLANRU, 0);
+}
+
+static int rswitch_handle_port_attr_set(struct net_device *ndev,
+ struct notifier_block *nb,
+ struct switchdev_notifier_port_attr_info *info)
+{
+ const struct switchdev_attr *attr = info->attr;
+ struct rswitch_private *priv;
+ int err = 0;
+
+ priv = container_of(nb, struct rswitch_private, rswitch_switchdev_blocking_nb);
+
switch (attr->id) {
case SWITCHDEV_ATTR_ID_PORT_STP_STATE:
- return rswitch_port_update_stp_state(ndev, attr->u.stp_state);
+ err = rswitch_port_update_stp_state(ndev, attr->u.stp_state);
+
+ break;
case SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME:
- return rswitch_update_ageing_time(ndev, attr->u.ageing_time);
+ err = rswitch_update_ageing_time(priv, attr->u.ageing_time);
+
+ break;
+ case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING:
+ rswitch_update_vlan_filtering(priv, attr->u.vlan_filtering);
+
+ break;
+ case SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED:
+
+ break;
default:
return -EOPNOTSUPP;
}
+
+ if (err < 0)
+ return err;
+
+ info->handled = true;
+
+ return NOTIFY_DONE;
+}
+
+static int rswitch_read_vlan_table(struct rswitch_private *priv, u16 vid,
+ u32 *vlanslvs, u32 *vlandvs)
+{
+ int err;
+
+ iowrite32(FIELD_PREP(VLANVIDS, vid), priv->addr + FWVLANTS);
+ err = rswitch_reg_wait(priv->addr, FWVLANTSR0, VLANTS, 0);
+ if (err < 0)
+ return err;
+
+ /* check if vlans are present in table */
+ if (!(ioread32(priv->addr + FWVLANTSR0) & VLANSNF)) {
+ *vlanslvs = (ioread32(priv->addr + FWVLANTSR1) & VLANSLVS);
+ *vlandvs = (ioread32(priv->addr + FWVLANTSR3) & VLANDVS);
+ }
+
+ return 0;
+}
+
+static int rswitch_write_vlan_table(struct rswitch_private *priv, u16 vid, u32 index)
+{
+ u32 vlancsdl = priv->gwca.l2_shared_rx_queue->index;
+ u32 vlanslvs = 0, vlandvs = 0;
+ int err;
+
+ err = rswitch_read_vlan_table(priv, vid, &vlanslvs, &vlandvs);
+ if (err < 0)
+ return err;
+
+ rswitch_modify(priv->addr, FWVLANTL0, VLANED, 0);
+ iowrite32(FIELD_PREP(VLANVIDL, vid), priv->addr + FWVLANTL1);
+
+ vlanslvs |= BIT(index);
+ vlandvs |= BIT(index);
+ iowrite32(FIELD_PREP(VLANSLVL, vlanslvs), priv->addr + FWVLANTL2);
+ iowrite32(FIELD_PREP(VLANCSDL, vlancsdl), priv->addr + FWVLANTL3(GWCA_INDEX));
+ iowrite32(FIELD_PREP(VLANDVL, vlandvs), priv->addr + FWVLANTL4);
+
+ return rswitch_reg_wait(priv->addr, FWVLANTLR, VLANTL, 0);
+}
+
+static int rswitch_erase_vlan_table(struct rswitch_private *priv, u16 vid, u32 index)
+{
+ u32 vlanslvs = 0, vlandvs = 0;
+ int err;
+
+ err = rswitch_read_vlan_table(priv, vid, &vlanslvs, &vlandvs);
+ if (err < 0)
+ return err;
+
+ vlanslvs &= ~BIT(index);
+ vlandvs &= ~BIT(index);
+
+ /* only erase empty vlan table entries */
+ if (vlanslvs == 0)
+ rswitch_modify(priv->addr, FWVLANTL0, 0, VLANED);
+
+ iowrite32(FIELD_PREP(VLANVIDL, vid), priv->addr + FWVLANTL1);
+ iowrite32(FIELD_PREP(VLANSLVL, vlanslvs), priv->addr + FWVLANTL2);
+ iowrite32(FIELD_PREP(VLANDVL, vlandvs), priv->addr + FWVLANTL4);
+
+ return rswitch_reg_wait(priv->addr, FWVLANTLR, VLANTL, 0);
+}
+
+static int rswitch_port_set_vlan_tag(struct rswitch_etha *etha,
+ struct switchdev_obj_port_vlan *p_vlan,
+ bool delete)
+{
+ u32 err, vem_val;
+
+ err = rswitch_etha_change_mode(etha, EAMC_OPC_CONFIG);
+ if (err < 0)
+ return err;
+
+ rswitch_modify(etha->addr, EAVCC, VIM, 0);
+
+ if (((ioread32(etha->addr + EAVTC) & CTV) == p_vlan->vid) && delete) {
+ rswitch_modify(etha->addr, EAVTC, CTV, 0);
+ rswitch_modify(etha->addr, EAVCC, VEM, 0);
+ } else if (!delete) {
+ if ((p_vlan->flags & BRIDGE_VLAN_INFO_PVID) &&
+ (p_vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED))
+ vem_val = FIELD_PREP(VEM, C_TAG_VLAN);
+ else if (p_vlan->flags & BRIDGE_VLAN_INFO_PVID)
+ vem_val = FIELD_PREP(VEM, HW_C_TAG_VLAN);
+ else
+ vem_val = 0;
+ rswitch_modify(etha->addr, EAVCC, VEM, vem_val);
+ rswitch_modify(etha->addr, EAVTC, CTV, FIELD_PREP(CTV, p_vlan->vid));
+ }
+
+ return rswitch_etha_change_mode(etha, EAMC_OPC_OPERATION);
+}
+
+static int rswitch_gwca_set_vlan_tag(struct rswitch_private *priv,
+ struct switchdev_obj_port_vlan *p_vlan,
+ bool delete)
+{
+ u32 err, vem_val;
+
+ err = rswitch_gwca_change_mode(priv, GWMC_OPC_CONFIG);
+ if (err < 0)
+ return err;
+
+ rswitch_modify(priv->addr, GWVCC, VIM, 0);
+
+ if (((ioread32(priv->addr + GWVTC) & CTV) == p_vlan->vid) && delete) {
+ rswitch_modify(priv->addr, GWVTC, CTV, 0);
+ rswitch_modify(priv->addr, GWVCC, VEM, 0);
+ } else if (!delete) {
+ if ((p_vlan->flags & BRIDGE_VLAN_INFO_PVID) &&
+ (p_vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED))
+ vem_val = FIELD_PREP(VEM, C_TAG_VLAN);
+ else if (p_vlan->flags & BRIDGE_VLAN_INFO_PVID)
+ vem_val = FIELD_PREP(VEM, HW_C_TAG_VLAN);
+ else
+ vem_val = 0;
+ rswitch_modify(priv->addr, GWVCC, VEM, vem_val);
+ rswitch_modify(priv->addr, GWVTC, CTV, FIELD_PREP(CTV, p_vlan->vid));
+ }
+
+ return rswitch_gwca_change_mode(priv, GWMC_OPC_OPERATION);
+}
+
+static int rswitch_port_obj_do_add(struct net_device *ndev,
+ struct switchdev_obj_port_vlan *p_vlan)
+{
+ struct rswitch_device *rdev = netdev_priv(ndev);
+ struct rswitch_private *priv = rdev->priv;
+ struct rswitch_etha *etha = rdev->etha;
+ int err;
+
+ /* Set Rswitch VLAN mode */
+ iowrite32(br_vlan_enabled(rdev->brdev) ? FIELD_PREP(FWGC_SVM, C_TAG) : 0,
+ priv->addr + FWGC);
+
+ err = rswitch_write_vlan_table(priv, p_vlan->vid, etha->index);
+ if (err < 0)
+ return err;
+
+ /* If the default vlan for this port has been set, don't overwrite it. */
+ if (ioread32(etha->addr + EAVCC))
+ return NOTIFY_DONE;
+
+ if (br_vlan_enabled(rdev->brdev))
+ rswitch_modify(priv->addr, FWPC0(etha->index), 0, FWPC0_VLANSA | FWPC0_VLANRU);
+
+ rswitch_modify(priv->addr, FWPC2(AGENT_INDEX_GWCA),
+ FIELD_PREP(FWPC2_LTWFW, BIT(etha->index)),
+ 0);
+
+ return rswitch_port_set_vlan_tag(etha, p_vlan, false);
+}
+
+static int rswitch_port_obj_do_add_gwca(struct net_device *ndev,
+ struct rswitch_private *priv,
+ struct switchdev_obj_port_vlan *p_vlan)
+{
+ int err;
+
+ if (!(p_vlan->flags & BRIDGE_VLAN_INFO_BRENTRY))
+ return NOTIFY_DONE;
+
+ /* Set Rswitch VLAN mode */
+ iowrite32(br_vlan_enabled(ndev) ? FIELD_PREP(FWGC_SVM, C_TAG) : 0, priv->addr + FWGC);
+
+ err = rswitch_write_vlan_table(priv, p_vlan->vid, AGENT_INDEX_GWCA);
+ if (err < 0)
+ return err;
+
+ /* If the default vlan for this port has been set, don't overwrite it. */
+ if (ioread32(priv->addr + GWVCC))
+ return NOTIFY_DONE;
+
+ return rswitch_gwca_set_vlan_tag(priv, p_vlan, false);
+}
+
+static int rswitch_port_obj_do_del(struct net_device *ndev,
+ struct switchdev_obj_port_vlan *p_vlan)
+{
+ struct rswitch_device *rdev = netdev_priv(ndev);
+ struct rswitch_private *priv = rdev->priv;
+ struct rswitch_etha *etha = rdev->etha;
+ u32 err;
+
+ err = rswitch_port_set_vlan_tag(etha, p_vlan, true);
+ if (err < 0)
+ return err;
+
+ rswitch_modify(priv->addr, FWPC0(etha->index), FWPC0_VLANSA | FWPC0_VLANRU, 0);
+ rswitch_modify(priv->addr, FWPC2(AGENT_INDEX_GWCA), 0,
+ FIELD_PREP(FWPC2_LTWFW, BIT(etha->index)));
+ rswitch_modify(priv->addr, FWPC2(rdev->port),
+ 0, FIELD_PREP(FWPC2_LTWFW, GENMASK(RSWITCH_NUM_AGENTS - 1, 0)));
+
+ return rswitch_erase_vlan_table(priv, p_vlan->vid, etha->index);
+}
+
+static int rswitch_port_obj_do_del_gwca(struct net_device *ndev,
+ struct rswitch_private *priv,
+ struct switchdev_obj_port_vlan *p_vlan)
+{
+ int err;
+
+ err = rswitch_gwca_set_vlan_tag(priv, p_vlan, true);
+ if (err < 0)
+ return err;
+
+ rswitch_modify(priv->addr, FWPC0(AGENT_INDEX_GWCA),
+ FWPC0_VLANSA | FWPC0_VLANRU,
+ 0);
+
+ return rswitch_erase_vlan_table(priv, p_vlan->vid, AGENT_INDEX_GWCA);
+}
+
+static int rswitch_handle_port_obj_add(struct net_device *ndev,
+ struct notifier_block *nb,
+ struct switchdev_notifier_port_obj_info *info)
+{
+ struct switchdev_obj_port_vlan *p_vlan = SWITCHDEV_OBJ_PORT_VLAN(info->obj);
+ struct rswitch_private *priv;
+ int err;
+
+ priv = container_of(nb, struct rswitch_private, rswitch_switchdev_blocking_nb);
+
+ if ((p_vlan->flags & BRIDGE_VLAN_INFO_MASTER) ||
+ (p_vlan->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) ||
+ (p_vlan->flags & BRIDGE_VLAN_INFO_RANGE_END) ||
+ (p_vlan->flags & BRIDGE_VLAN_INFO_ONLY_OPTS))
+ return NOTIFY_DONE;
+
+ switch (info->obj->id) {
+ case SWITCHDEV_OBJ_ID_PORT_VLAN:
+ if (!is_rdev(ndev))
+ err = rswitch_port_obj_do_add_gwca(ndev, priv, p_vlan);
+ else
+ err = rswitch_port_obj_do_add(ndev, p_vlan);
+
+ if (err < 0)
+ return err;
+
+ break;
+ default:
+ return -EOPNOTSUPP;
+ }
+
+ info->handled = true;
+
+ return NOTIFY_DONE;
+}
+
+static int rswitch_handle_port_obj_del(struct net_device *ndev,
+ struct notifier_block *nb,
+ struct switchdev_notifier_port_obj_info *info)
+{
+ struct switchdev_obj_port_vlan *p_vlan = SWITCHDEV_OBJ_PORT_VLAN(info->obj);
+ struct rswitch_private *priv;
+ int err;
+
+ priv = container_of(nb, struct rswitch_private, rswitch_switchdev_blocking_nb);
+
+ if ((p_vlan->flags & BRIDGE_VLAN_INFO_MASTER) ||
+ (p_vlan->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) ||
+ (p_vlan->flags & BRIDGE_VLAN_INFO_RANGE_END) ||
+ (p_vlan->flags & BRIDGE_VLAN_INFO_ONLY_OPTS))
+ return NOTIFY_DONE;
+
+ switch (info->obj->id) {
+ case SWITCHDEV_OBJ_ID_PORT_VLAN:
+ if (!is_rdev(ndev))
+ err = rswitch_port_obj_do_del_gwca(ndev, priv, p_vlan);
+ else
+ err = rswitch_port_obj_do_del(ndev, p_vlan);
+
+ if (err < 0)
+ return err;
+
+ break;
+ default:
+ return -EOPNOTSUPP;
+ }
+
+ info->handled = true;
+
+ return NOTIFY_DONE;
}
static int rswitch_switchdev_blocking_event(struct notifier_block *nb,
- unsigned long event, void *ptr)
+ unsigned long event,
+ void *ptr)
{
struct net_device *ndev = switchdev_notifier_info_to_dev(ptr);
- int ret;
+ int err;
switch (event) {
case SWITCHDEV_PORT_OBJ_ADD:
- return -EOPNOTSUPP;
+ err = rswitch_handle_port_obj_add(ndev, nb, ptr);
+
+ return notifier_from_errno(err);
case SWITCHDEV_PORT_OBJ_DEL:
- return -EOPNOTSUPP;
+ err = rswitch_handle_port_obj_del(ndev, nb, ptr);
+
+ return notifier_from_errno(err);
case SWITCHDEV_PORT_ATTR_SET:
- ret = switchdev_handle_port_attr_set(ndev, ptr,
- is_rdev,
- rswitch_port_attr_set);
- break;
- default:
- if (!is_rdev(ndev))
- return NOTIFY_DONE;
- ret = -EOPNOTSUPP;
+ err = rswitch_handle_port_attr_set(ndev, nb, ptr);
+
+ return notifier_from_errno(err);
}
- return notifier_from_errno(ret);
+ return NOTIFY_DONE;
}
static int rswitch_gwca_write_mac_address(struct rswitch_private *priv, const u8 *mac)
@@ -389,7 +708,6 @@ static int rswitch_switchdev_event(struct notifier_block *nb,
struct switchdev_notifier_fdb_info *fdb_info;
struct switchdev_notifier_info *info = ptr;
struct rswitch_private *priv;
- int err;
priv = container_of(nb, struct rswitch_private, rswitch_switchdev_nb);
@@ -424,16 +742,6 @@ static int rswitch_switchdev_event(struct notifier_block *nb,
queue_work(system_long_wq, &switchdev_work->work);
break;
- case SWITCHDEV_PORT_ATTR_SET:
- err = switchdev_handle_port_attr_set(ndev, ptr,
- is_rdev,
- rswitch_port_attr_set);
- return notifier_from_errno(err);
-
- if (!is_rdev(ndev))
- return NOTIFY_DONE;
-
- return notifier_from_errno(-EOPNOTSUPP);
}
return NOTIFY_DONE;
--
2.43.0
^ permalink raw reply related
* [PATCH net-next v2 12/13] net: renesas: rswitch: add handler for FDB notification
From: Michael Dege @ 2026-03-27 8:27 UTC (permalink / raw)
To: Yoshihiro Shimoda, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni
Cc: netdev, linux-renesas-soc, linux-kernel, Michael Dege
In-Reply-To: <20260327-rswitch_add_vlans-v2-0-d7f4358ca57a@renesas.com>
The SWITCHDEV_FDB_ADD_TO_DEVICE notification writes the bridge MAC address
to the GWCA and adds a static rule to the MAC table.
The SWITCHDEV_FDB_DEL_TO_DEVICE removes the static rule from the MAC table.
Signed-off-by: Michael Dege <michael.dege@renesas.com>
---
drivers/net/ethernet/renesas/rswitch.h | 8 ++
drivers/net/ethernet/renesas/rswitch_l2.c | 205 ++++++++++++++++++++++++++----
2 files changed, 190 insertions(+), 23 deletions(-)
diff --git a/drivers/net/ethernet/renesas/rswitch.h b/drivers/net/ethernet/renesas/rswitch.h
index 6dfc53c6b985..443fc4e49602 100644
--- a/drivers/net/ethernet/renesas/rswitch.h
+++ b/drivers/net/ethernet/renesas/rswitch.h
@@ -1217,6 +1217,14 @@ struct rswitch_private {
enum hwtstamp_rx_filters tstamp_rx_ctrl;
};
+struct rswitch_switchdev_event_work {
+ struct work_struct work;
+ struct switchdev_notifier_fdb_info fdb_info;
+ struct net_device *ndev;
+ struct rswitch_private *priv;
+ unsigned long event;
+};
+
bool is_rdev(const struct net_device *ndev);
void rswitch_modify(void __iomem *addr, enum rswitch_reg reg, u32 clear, u32 set);
int rswitch_reg_wait(void __iomem *addr, u32 offs, u32 mask, u32 expected);
diff --git a/drivers/net/ethernet/renesas/rswitch_l2.c b/drivers/net/ethernet/renesas/rswitch_l2.c
index f1c5c96027ba..ea95a87ed234 100644
--- a/drivers/net/ethernet/renesas/rswitch_l2.c
+++ b/drivers/net/ethernet/renesas/rswitch_l2.c
@@ -23,7 +23,8 @@ static bool rdev_for_l2_offload(struct rswitch_device *rdev)
static void rswitch_change_l2_hw_offloading(struct rswitch_device *rdev,
bool start, bool learning)
{
- u32 bits = learning ? FWPC0_MACSSA | FWPC0_MACHLA | FWPC0_MACHMA : FWPC0_MACDSA;
+ u32 bits = learning ? FWPC0_MACSSA | FWPC0_MACHLA | FWPC0_MACHMA | FWPC0_MACRUDA :
+ FWPC0_MACDSA;
u32 clear = start ? 0 : bits;
u32 set = start ? bits : 0;
@@ -82,8 +83,9 @@ static void rswitch_update_l2_hw_forwarding(struct rswitch_private *priv)
*
* Do not allow L2 forwarding to self for hw port.
*/
- iowrite32(FIELD_PREP(FWPC2_LTWFW, fwd_mask | BIT(rdev->port)),
- priv->addr + FWPC2(rdev->port));
+ rswitch_modify(priv->addr, FWPC2(rdev->port),
+ FIELD_PREP(FWPC2_LTWFW, ~(fwd_mask | BIT(rdev->port))),
+ 0);
}
if (new_forwarding_offload && !rdev->forwarding_offloaded)
@@ -188,7 +190,8 @@ static int rswitch_port_update_stp_state(struct net_device *ndev, u8 stp_state)
}
static int rswitch_netdevice_event(struct notifier_block *nb,
- unsigned long event, void *ptr)
+ unsigned long event,
+ void *ptr)
{
struct net_device *ndev = netdev_notifier_info_to_dev(ptr);
struct netdev_notifier_changeupper_info *info;
@@ -241,25 +244,6 @@ static int rswitch_port_attr_set(struct net_device *ndev, const void *ctx,
}
}
-static int rswitch_switchdev_event(struct notifier_block *nb,
- unsigned long event, void *ptr)
-{
- struct net_device *ndev = switchdev_notifier_info_to_dev(ptr);
- int ret;
-
- if (event == SWITCHDEV_PORT_ATTR_SET) {
- ret = switchdev_handle_port_attr_set(ndev, ptr,
- is_rdev,
- rswitch_port_attr_set);
- return notifier_from_errno(ret);
- }
-
- if (!is_rdev(ndev))
- return NOTIFY_DONE;
-
- return notifier_from_errno(-EOPNOTSUPP);
-}
-
static int rswitch_switchdev_blocking_event(struct notifier_block *nb,
unsigned long event, void *ptr)
{
@@ -285,6 +269,181 @@ static int rswitch_switchdev_blocking_event(struct notifier_block *nb,
return notifier_from_errno(ret);
}
+static int rswitch_gwca_write_mac_address(struct rswitch_private *priv, const u8 *mac)
+{
+ int err;
+
+ err = rswitch_gwca_change_mode(priv, GWMC_OPC_CONFIG);
+ if (err < 0)
+ return err;
+
+ iowrite32((mac[0] << 8) | mac[1], priv->addr + GWMAC0);
+ iowrite32((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5],
+ priv->addr + GWMAC1);
+
+ return rswitch_gwca_change_mode(priv, GWMC_OPC_OPERATION);
+}
+
+static int rswitch_add_addr_to_mactable(struct rswitch_private *priv, const u8 *mac)
+{
+ u32 index = priv->gwca.l2_shared_rx_queue->index;
+ int err;
+
+ rswitch_modify(priv->addr, FWMACTL0, FWMACTL0_ED, 0);
+ iowrite32((mac[0] << 8) | mac[1], priv->addr + FWMACTL1);
+ iowrite32((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5],
+ priv->addr + FWMACTL2);
+ iowrite32(FWMACTL3_DSLV | FWMACTL3_SSLV,
+ priv->addr + FWMACTL3);
+ iowrite32(FIELD_PREP(FWMACTL4_CSDL, index),
+ priv->addr + FWMACTL4(GWCA_INDEX));
+ iowrite32(FIELD_PREP(FWMACTL5_DV, BIT(AGENT_INDEX_GWCA)),
+ priv->addr + FWMACTL5);
+
+ err = rswitch_reg_wait(priv->addr, FWMACTLR, FWMACTLR_L, 0);
+ if (err < 0)
+ return err;
+
+ if (ioread32(priv->addr + FWMACTLR))
+ return NOTIFY_BAD;
+
+ return NOTIFY_DONE;
+}
+
+static int rswitch_del_addr_from_mactable(struct rswitch_private *priv, const u8 *mac)
+{
+ int err;
+
+ rswitch_modify(priv->addr, FWMACTL0, 0, FWMACTL0_ED);
+ iowrite32((mac[0] << 8) | mac[1], priv->addr + FWMACTL1);
+ iowrite32((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5],
+ priv->addr + FWMACTL2);
+ iowrite32(FWMACTL3_DSLV | FWMACTL3_SSLV,
+ priv->addr + FWMACTL3);
+ iowrite32(FIELD_PREP(FWMACTL4_CSDL, BIT(0)),
+ priv->addr + FWMACTL4(GWCA_INDEX));
+ iowrite32(FIELD_PREP(FWMACTL5_DV, BIT(AGENT_INDEX_GWCA)),
+ priv->addr + FWMACTL5);
+
+ err = rswitch_reg_wait(priv->addr, FWMACTLR, FWMACTLR_L, 0);
+ if (err < 0)
+ return err;
+
+ err = ioread32(priv->addr + FWMACTLR);
+ if (err)
+ return NOTIFY_BAD;
+
+ return NOTIFY_DONE;
+}
+
+static void rswitch_switchdev_bridge_fdb_event_work(struct work_struct *work)
+{
+ struct rswitch_switchdev_event_work *switchdev_work;
+ struct rswitch_device *rdev;
+ struct net_device *ndev;
+
+ switchdev_work = container_of(work, struct rswitch_switchdev_event_work, work);
+ ndev = switchdev_work->ndev;
+
+ rtnl_lock();
+
+ /* Unfortunately all net_device members point to br0, there is no simple way to check
+ * if the event was triggered by a port device setting.
+ */
+ rswitch_for_all_ports(switchdev_work->priv, rdev) {
+ if (ether_addr_equal(rdev->ndev->dev_addr, switchdev_work->fdb_info.addr))
+ goto out;
+ }
+
+ /* Handle only bridge device */
+ if (is_rdev(ndev))
+ goto out;
+
+ switch (switchdev_work->event) {
+ case SWITCHDEV_FDB_ADD_TO_DEVICE:
+ rswitch_gwca_write_mac_address(switchdev_work->priv, switchdev_work->fdb_info.addr);
+ rswitch_add_addr_to_mactable(switchdev_work->priv, switchdev_work->fdb_info.addr);
+ break;
+ case SWITCHDEV_FDB_DEL_TO_DEVICE:
+ rswitch_del_addr_from_mactable(switchdev_work->priv, switchdev_work->fdb_info.addr);
+ break;
+ default:
+ break;
+ }
+
+out:
+ rtnl_unlock();
+
+ kfree(switchdev_work->fdb_info.addr);
+ kfree(switchdev_work);
+ dev_put(ndev);
+}
+
+/* called under rcu_read_lock() */
+static int rswitch_switchdev_event(struct notifier_block *nb,
+ unsigned long event,
+ void *ptr)
+{
+ struct net_device *ndev = switchdev_notifier_info_to_dev(ptr);
+ struct rswitch_switchdev_event_work *switchdev_work;
+ struct switchdev_notifier_fdb_info *fdb_info;
+ struct switchdev_notifier_info *info = ptr;
+ struct rswitch_private *priv;
+ int err;
+
+ priv = container_of(nb, struct rswitch_private, rswitch_switchdev_nb);
+
+ switch (event) {
+ case SWITCHDEV_FDB_ADD_TO_DEVICE:
+ fallthrough;
+ case SWITCHDEV_FDB_DEL_TO_DEVICE:
+ switchdev_work = kzalloc(sizeof(*switchdev_work), GFP_ATOMIC);
+
+ if (!switchdev_work)
+ return NOTIFY_BAD;
+
+ switchdev_work->ndev = info->dev;
+ switchdev_work->priv = priv;
+ switchdev_work->event = event;
+
+ fdb_info = container_of(info,
+ struct switchdev_notifier_fdb_info,
+ info);
+
+ INIT_WORK(&switchdev_work->work, rswitch_switchdev_bridge_fdb_event_work);
+
+ memcpy(&switchdev_work->fdb_info, ptr, sizeof(switchdev_work->fdb_info));
+
+ switchdev_work->fdb_info.addr = kzalloc(ETH_ALEN, GFP_ATOMIC);
+ if (!switchdev_work->fdb_info.addr)
+ goto err_addr_alloc;
+
+ ether_addr_copy((u8 *)switchdev_work->fdb_info.addr,
+ fdb_info->addr);
+ dev_hold(ndev);
+ queue_work(system_long_wq, &switchdev_work->work);
+
+ break;
+ case SWITCHDEV_PORT_ATTR_SET:
+ err = switchdev_handle_port_attr_set(ndev, ptr,
+ is_rdev,
+ rswitch_port_attr_set);
+ return notifier_from_errno(err);
+
+ if (!is_rdev(ndev))
+ return NOTIFY_DONE;
+
+ return notifier_from_errno(-EOPNOTSUPP);
+ }
+
+ return NOTIFY_DONE;
+
+err_addr_alloc:
+ kfree(switchdev_work);
+
+ return NOTIFY_BAD;
+}
+
int rswitch_register_notifiers(struct rswitch_private *priv)
{
int err;
--
2.43.0
^ permalink raw reply related
* [PATCH net-next v2 11/13] net: renesas: rswitch: add passing of rswitch_private into notifiers
From: Michael Dege @ 2026-03-27 8:27 UTC (permalink / raw)
To: Yoshihiro Shimoda, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni
Cc: netdev, linux-renesas-soc, linux-kernel, Michael Dege
In-Reply-To: <20260327-rswitch_add_vlans-v2-0-d7f4358ca57a@renesas.com>
Provide struct rswitch_private to notifiers. This will be needed
to access the HW in the notification handlers.
Signed-off-by: Michael Dege <michael.dege@renesas.com>
---
drivers/net/ethernet/renesas/rswitch.h | 5 ++++
drivers/net/ethernet/renesas/rswitch_l2.c | 45 ++++++++++++-----------------
drivers/net/ethernet/renesas/rswitch_l2.h | 6 ++--
drivers/net/ethernet/renesas/rswitch_main.c | 4 +--
4 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/drivers/net/ethernet/renesas/rswitch.h b/drivers/net/ethernet/renesas/rswitch.h
index 42c8bbafa27d..6dfc53c6b985 100644
--- a/drivers/net/ethernet/renesas/rswitch.h
+++ b/drivers/net/ethernet/renesas/rswitch.h
@@ -1199,6 +1199,11 @@ struct rswitch_private {
struct rswitch_etha etha[RSWITCH_NUM_PORTS];
struct rswitch_mfwd mfwd;
+ /* Notifiers */
+ struct notifier_block rswitch_netdevice_nb;
+ struct notifier_block rswitch_switchdev_nb;
+ struct notifier_block rswitch_switchdev_blocking_nb;
+
struct list_head port_list;
spinlock_t lock; /* lock interrupt registers' control */
diff --git a/drivers/net/ethernet/renesas/rswitch_l2.c b/drivers/net/ethernet/renesas/rswitch_l2.c
index ae3857ef9af6..f1c5c96027ba 100644
--- a/drivers/net/ethernet/renesas/rswitch_l2.c
+++ b/drivers/net/ethernet/renesas/rswitch_l2.c
@@ -285,48 +285,39 @@ static int rswitch_switchdev_blocking_event(struct notifier_block *nb,
return notifier_from_errno(ret);
}
-static struct notifier_block rswitch_netdevice_nb = {
- .notifier_call = rswitch_netdevice_event,
-};
-
-static struct notifier_block rswitch_switchdev_nb = {
- .notifier_call = rswitch_switchdev_event,
-};
-
-static struct notifier_block rswitch_switchdev_blocking_nb = {
- .notifier_call = rswitch_switchdev_blocking_event,
-};
-
-int rswitch_register_notifiers(void)
+int rswitch_register_notifiers(struct rswitch_private *priv)
{
- int ret;
+ int err;
- ret = register_netdevice_notifier(&rswitch_netdevice_nb);
- if (ret)
+ priv->rswitch_netdevice_nb.notifier_call = rswitch_netdevice_event;
+ err = register_netdevice_notifier(&priv->rswitch_netdevice_nb);
+ if (err)
goto register_netdevice_notifier_failed;
- ret = register_switchdev_notifier(&rswitch_switchdev_nb);
- if (ret)
+ priv->rswitch_switchdev_nb.notifier_call = rswitch_switchdev_event;
+ err = register_switchdev_notifier(&priv->rswitch_switchdev_nb);
+ if (err)
goto register_switchdev_notifier_failed;
- ret = register_switchdev_blocking_notifier(&rswitch_switchdev_blocking_nb);
- if (ret)
+ priv->rswitch_switchdev_blocking_nb.notifier_call = rswitch_switchdev_blocking_event;
+ err = register_switchdev_blocking_notifier(&priv->rswitch_switchdev_blocking_nb);
+ if (err)
goto register_switchdev_blocking_notifier_failed;
return 0;
register_switchdev_blocking_notifier_failed:
- unregister_switchdev_notifier(&rswitch_switchdev_nb);
+ unregister_switchdev_notifier(&priv->rswitch_switchdev_nb);
register_switchdev_notifier_failed:
- unregister_netdevice_notifier(&rswitch_netdevice_nb);
+ unregister_netdevice_notifier(&priv->rswitch_netdevice_nb);
register_netdevice_notifier_failed:
- return ret;
+ return err;
}
-void rswitch_unregister_notifiers(void)
+void rswitch_unregister_notifiers(struct rswitch_private *priv)
{
- unregister_switchdev_blocking_notifier(&rswitch_switchdev_blocking_nb);
- unregister_switchdev_notifier(&rswitch_switchdev_nb);
- unregister_netdevice_notifier(&rswitch_netdevice_nb);
+ unregister_switchdev_blocking_notifier(&priv->rswitch_switchdev_blocking_nb);
+ unregister_switchdev_notifier(&priv->rswitch_switchdev_nb);
+ unregister_netdevice_notifier(&priv->rswitch_netdevice_nb);
}
diff --git a/drivers/net/ethernet/renesas/rswitch_l2.h b/drivers/net/ethernet/renesas/rswitch_l2.h
index 57050ede8f31..af9780c63c9a 100644
--- a/drivers/net/ethernet/renesas/rswitch_l2.h
+++ b/drivers/net/ethernet/renesas/rswitch_l2.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Renesas Ethernet Switch device driver
*
- * Copyright (C) 2025 Renesas Electronics Corporation
+ * Copyright (C) 2025 - 2026 Renesas Electronics Corporation
*/
#ifndef __RSWITCH_L2_H__
@@ -9,7 +9,7 @@
void rswitch_update_l2_offload(struct rswitch_private *priv);
-int rswitch_register_notifiers(void);
-void rswitch_unregister_notifiers(void);
+int rswitch_register_notifiers(struct rswitch_private *priv);
+void rswitch_unregister_notifiers(struct rswitch_private *priv);
#endif /* #ifndef __RSWITCH_L2_H__ */
diff --git a/drivers/net/ethernet/renesas/rswitch_main.c b/drivers/net/ethernet/renesas/rswitch_main.c
index da984027239c..4e0a481ef403 100644
--- a/drivers/net/ethernet/renesas/rswitch_main.c
+++ b/drivers/net/ethernet/renesas/rswitch_main.c
@@ -2272,7 +2272,7 @@ static int renesas_eth_sw_probe(struct platform_device *pdev)
if (list_empty(&priv->port_list))
dev_warn(&pdev->dev, "could not initialize any ports\n");
- ret = rswitch_register_notifiers();
+ ret = rswitch_register_notifiers(priv);
if (ret) {
dev_err(&pdev->dev, "could not register notifiers\n");
return ret;
@@ -2311,7 +2311,7 @@ static void renesas_eth_sw_remove(struct platform_device *pdev)
{
struct rswitch_private *priv = platform_get_drvdata(pdev);
- rswitch_unregister_notifiers();
+ rswitch_unregister_notifiers(priv);
rswitch_deinit(priv);
pm_runtime_put(&pdev->dev);
--
2.43.0
^ permalink raw reply related
* [PATCH net-next v2 10/13] net: renesas: rswitch: clean up is_rdev rswitch_device checking
From: Michael Dege @ 2026-03-27 8:27 UTC (permalink / raw)
To: Yoshihiro Shimoda, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni
Cc: netdev, linux-renesas-soc, linux-kernel, Michael Dege
In-Reply-To: <20260327-rswitch_add_vlans-v2-0-d7f4358ca57a@renesas.com>
Add null pointer checking for ndev and remove unnecessay
rswitch_port_check() wrapper function.
Signed-off-by: Michael Dege <michael.dege@renesas.com>
---
drivers/net/ethernet/renesas/rswitch_l2.c | 15 +++++----------
drivers/net/ethernet/renesas/rswitch_main.c | 2 +-
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/renesas/rswitch_l2.c b/drivers/net/ethernet/renesas/rswitch_l2.c
index cabf1f92ad0c..ae3857ef9af6 100644
--- a/drivers/net/ethernet/renesas/rswitch_l2.c
+++ b/drivers/net/ethernet/renesas/rswitch_l2.c
@@ -158,11 +158,6 @@ static void rswitch_update_offload_brdev(struct rswitch_private *priv)
rswitch_update_l2_offload(priv);
}
-static bool rswitch_port_check(const struct net_device *ndev)
-{
- return is_rdev(ndev);
-}
-
static void rswitch_port_update_brdev(struct net_device *ndev,
struct net_device *brdev)
{
@@ -199,7 +194,7 @@ static int rswitch_netdevice_event(struct notifier_block *nb,
struct netdev_notifier_changeupper_info *info;
struct net_device *brdev;
- if (!rswitch_port_check(ndev))
+ if (!is_rdev(ndev))
return NOTIFY_DONE;
if (event != NETDEV_CHANGEUPPER)
return NOTIFY_DONE;
@@ -254,12 +249,12 @@ static int rswitch_switchdev_event(struct notifier_block *nb,
if (event == SWITCHDEV_PORT_ATTR_SET) {
ret = switchdev_handle_port_attr_set(ndev, ptr,
- rswitch_port_check,
+ is_rdev,
rswitch_port_attr_set);
return notifier_from_errno(ret);
}
- if (!rswitch_port_check(ndev))
+ if (!is_rdev(ndev))
return NOTIFY_DONE;
return notifier_from_errno(-EOPNOTSUPP);
@@ -278,11 +273,11 @@ static int rswitch_switchdev_blocking_event(struct notifier_block *nb,
return -EOPNOTSUPP;
case SWITCHDEV_PORT_ATTR_SET:
ret = switchdev_handle_port_attr_set(ndev, ptr,
- rswitch_port_check,
+ is_rdev,
rswitch_port_attr_set);
break;
default:
- if (!rswitch_port_check(ndev))
+ if (!is_rdev(ndev))
return NOTIFY_DONE;
ret = -EOPNOTSUPP;
}
diff --git a/drivers/net/ethernet/renesas/rswitch_main.c b/drivers/net/ethernet/renesas/rswitch_main.c
index d1be588fb625..da984027239c 100644
--- a/drivers/net/ethernet/renesas/rswitch_main.c
+++ b/drivers/net/ethernet/renesas/rswitch_main.c
@@ -1962,7 +1962,7 @@ static const struct net_device_ops rswitch_netdev_ops = {
bool is_rdev(const struct net_device *ndev)
{
- return (ndev->netdev_ops == &rswitch_netdev_ops);
+ return ndev && (ndev->netdev_ops == &rswitch_netdev_ops);
}
static int rswitch_get_ts_info(struct net_device *ndev, struct kernel_ethtool_ts_info *info)
--
2.43.0
^ permalink raw reply related
* [PATCH net-next v2 09/13] net: renesas: rswitch: update port HW init
From: Michael Dege @ 2026-03-27 8:27 UTC (permalink / raw)
To: Yoshihiro Shimoda, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni
Cc: netdev, linux-renesas-soc, linux-kernel, Michael Dege
In-Reply-To: <20260327-rswitch_add_vlans-v2-0-d7f4358ca57a@renesas.com>
Certain Ethernet and cpu port settings need to be updated for vlan
support.
Signed-off-by: Michael Dege <michael.dege@renesas.com>
---
drivers/net/ethernet/renesas/rswitch.h | 4 ----
drivers/net/ethernet/renesas/rswitch_main.c | 15 ++++++++++++---
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/renesas/rswitch.h b/drivers/net/ethernet/renesas/rswitch.h
index ff2a84057f01..42c8bbafa27d 100644
--- a/drivers/net/ethernet/renesas/rswitch.h
+++ b/drivers/net/ethernet/renesas/rswitch.h
@@ -766,8 +766,6 @@ enum vlan_egress_mode {
HW_SC_TAG_VLAN,
};
-#define EAVCC_VEM_SC_TAG (0x3 << 16)
-
#define MPIC_PIS GENMASK(2, 0)
#define MPIC_PIS_GMII 2
#define MPIC_PIS_XGMII 4
@@ -806,8 +804,6 @@ enum rswitch_gwca_mode {
#define GWMTIRM_MTIOG BIT(0)
#define GWMTIRM_MTR BIT(1)
-#define GWVCC_VEM_SC_TAG (0x3 << 16)
-
#define GWARIRM_ARIOG BIT(0)
#define GWARIRM_ARR BIT(1)
diff --git a/drivers/net/ethernet/renesas/rswitch_main.c b/drivers/net/ethernet/renesas/rswitch_main.c
index ac87175b918e..d1be588fb625 100644
--- a/drivers/net/ethernet/renesas/rswitch_main.c
+++ b/drivers/net/ethernet/renesas/rswitch_main.c
@@ -735,8 +735,11 @@ static int rswitch_gwca_hw_init(struct rswitch_private *priv)
if (err < 0)
return err;
- iowrite32(GWVCC_VEM_SC_TAG, priv->addr + GWVCC);
- iowrite32(0, priv->addr + GWTTFC);
+ iowrite32(0, priv->addr + GWIRC);
+ iowrite32(FIELD_PREP(DQD, DES_RAM_DP), priv->addr + GWRDQDC0);
+ /* Drop frames with unknown tags */
+ iowrite32(UT, priv->addr + GWTTFC);
+
iowrite32(lower_32_bits(priv->gwca.linkfix_table_dma), priv->addr + GWDCBAC1);
iowrite32(upper_32_bits(priv->gwca.linkfix_table_dma), priv->addr + GWDCBAC0);
iowrite32(lower_32_bits(priv->gwca.ts_queue.ring_dma), priv->addr + GWTDCAC10);
@@ -878,6 +881,7 @@ static bool rswitch_rx(struct net_device *ndev, int *quota)
limit = boguscnt;
desc = &gq->rx_ring[gq->cur];
+
while ((desc->desc.die_dt & DT_MASK) != DT_FEMPTY) {
dma_rmb();
skb = rswitch_rx_handle_desc(ndev, gq, desc);
@@ -1267,7 +1271,12 @@ static int rswitch_etha_hw_init(struct rswitch_etha *etha, const u8 *mac)
if (err < 0)
return err;
- iowrite32(EAVCC_VEM_SC_TAG, etha->addr + EAVCC);
+ iowrite32(0, etha->addr + EAIRC);
+ iowrite32(FIELD_PREP(DQD, DES_RAM_DP), etha->addr + EATDQDC0);
+
+ /* Drop frames with unknown tags */
+ iowrite32(UT, etha->addr + EARTFC);
+
rswitch_rmac_setting(etha, mac);
rswitch_etha_enable_mii(etha);
--
2.43.0
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox