2020-09-16 10:13:37

by Matthias Schiffer

Subject: [PATCH net] net: dsa: microchip: ksz8795: really set the correct number of ports

The KSZ9477 and KSZ8795 use the port_cnt field differently: For the
KSZ9477, it includes the CPU port(s), while for the KSZ8795, it doesn't.

It would be a good cleanup to make the handling of both drivers match,
but as a first step, fix the recently broken assignment of num_ports in
the KSZ8795 driver (which completely broke probing, as the CPU port
index was always failing the num_ports check).

Fixes: af199a1a9cb0 ("net: dsa: microchip: set the correct number of
ports")
Signed-off-by: Matthias Schiffer <[email protected]>
---
drivers/net/dsa/microchip/ksz8795.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index f7d59d7b2cbe..f5779e152377 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -1260,7 +1260,7 @@ static int ksz8795_switch_init(struct ksz_device *dev)
}

/* set the real number of ports */
- dev->ds->num_ports = dev->port_cnt;
+ dev->ds->num_ports = dev->port_cnt + 1;

return 0;
}
--
2.17.1

2020-09-17 00:49:04

by David Miller

Subject: Re: [PATCH net] net: dsa: microchip: ksz8795: really set the correct number of ports

From: Matthias Schiffer <[email protected]>
Date: Wed, 16 Sep 2020 12:08:39 +0200

> The KSZ9477 and KSZ8795 use the port_cnt field differently: For the
> KSZ9477, it includes the CPU port(s), while for the KSZ8795, it doesn't.
>
> It would be a good cleanup to make the handling of both drivers match,
> but as a first step, fix the recently broken assignment of num_ports in
> the KSZ8795 driver (which completely broke probing, as the CPU port
> index was always failing the num_ports check).
>
> Fixes: af199a1a9cb0 ("net: dsa: microchip: set the correct number of
> ports")

Please do not a tag into multiple lines. Especially do not do this
with Fixes tags as people will do string matching on it.

> Signed-off-by: Matthias Schiffer <[email protected]>

Applied and queued up for -stable.

Thanks.