diff mbox series

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

Message ID 20200916100839.843-1-matthias.schiffer@ew.tq-group.com
State New
Headers show
Series [net] net: dsa: microchip: ksz8795: really set the correct number of ports | expand

Commit Message

Matthias Schiffer Sept. 16, 2020, 10:08 a.m. UTC
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 <matthias.schiffer@ew.tq-group.com>
---
 drivers/net/dsa/microchip/ksz8795.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Codrin Ciubotariu Sept. 16, 2020, 10:33 a.m. UTC | #1
On 16.09.2020 13:08, Matthias Schiffer wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

> 

> 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 <matthias.schiffer@ew.tq-group.com>

> ---


Sorry about this. I assumed consistency between the two drivers.

Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
David Miller Sept. 17, 2020, 12:47 a.m. UTC | #2
From: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
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 <matthias.schiffer@ew.tq-group.com>

Applied and queued up for -stable.

Thanks.
diff mbox series

Patch

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;
 }