Re: [PATCH net] net: dsa: microchip: Fix KSZ9477 HSR port setup issue
From: Łukasz Majewski
Date: Tue Aug 19 2025 - 03:24:52 EST
On Mon, 18 Aug 2025 18:04:57 -0700
<Tristram.Ha@xxxxxxxxxxxxx> wrote:
> From: Tristram Ha <tristram.ha@xxxxxxxxxxxxx>
>
> ksz9477_hsr_join() is called once to setup the HSR port membership,
> but the port can be enabled later, or disabled and enabled back and
> the port membership is not set correctly inside
> ksz_update_port_member(). The added code always use the correct HSR
> port membership for HSR port that is enabled.
>
> Fixes: 2d61298fdd7b ("net: dsa: microchip: Enable HSR offloading for
> KSZ9477") Reported-by: Frieder Schrempf <frieder.schrempf@xxxxxxxxxx>
> Signed-off-by: Tristram Ha <tristram.ha@xxxxxxxxxxxxx>
> ---
> drivers/net/dsa/microchip/ksz_common.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/net/dsa/microchip/ksz_common.c
> b/drivers/net/dsa/microchip/ksz_common.c index
> 4cb14288ff0f..9568cc391fe3 100644 ---
> a/drivers/net/dsa/microchip/ksz_common.c +++
> b/drivers/net/dsa/microchip/ksz_common.c @@ -2457,6 +2457,12 @@
> static void ksz_update_port_member(struct ksz_device *dev, int port)
> dev->dev_ops->cfg_port_member(dev, i, val | cpu_port); }
>
> + /* HSR ports are setup once so need to use the assigned
> membership
> + * when the port is enabled.
> + */
> + if (!port_member && p->stp_state == BR_STATE_FORWARDING &&
> + (dev->hsr_ports & BIT(port)))
> + port_member = dev->hsr_ports;
> dev->dev_ops->cfg_port_member(dev, port, port_member |
> cpu_port); }
>
Reviewed-by: Łukasz Majewski <lukma@xxxxxxxxxxxx>
--
Best regards,
Lukasz Majewski
--
Nabla Software Engineering GmbH
HRB 40522 Augsburg
Phone: +49 821 45592596
E-Mail: office@xxxxxxxxxxxx
Geschftsfhrer : Stefano Babic