redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

net: dsa: microchip: ksz8795: align port_cnt usage with other microchip drivers 

The ksz8795 driver is using port_cnt differently to the other microchip
DSA drivers. It sets it to the external physical port count, than the
whole port count (including the cpu port). This patch is aligning the
variables purpose with the other microchip drivers.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
zero-sugar-mainline-defconfig
Michael Grzeschik 2020-12-01 21:45:03 +01:00 committed by Jakub Kicinski
parent 557d1a1fba
commit 94374dd162
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/dsa/microchip/ksz8795.c
View File

@ -1184,7 +1184,7 @@ static const struct ksz_chip_data ksz8795_switch_chips[] = {
.num_alus = 0,
.num_statics = 8,
.cpu_ports = 0x10, /* can be configured as cpu port */
.port_cnt = 4, /* total physical port count */
.port_cnt = 5, /* total cpu and user ports */
},
{
.chip_id = 0x8794,
@ -1193,7 +1193,7 @@ static const struct ksz_chip_data ksz8795_switch_chips[] = {
.num_alus = 0,
.num_statics = 8,
.cpu_ports = 0x10, /* can be configured as cpu port */
.port_cnt = 3, /* total physical port count */
.port_cnt = 4, /* total cpu and user ports */
},
{
.chip_id = 0x8765,
@ -1202,7 +1202,7 @@ static const struct ksz_chip_data ksz8795_switch_chips[] = {
.num_alus = 0,
.num_statics = 8,
.cpu_ports = 0x10, /* can be configured as cpu port */
.port_cnt = 4, /* total physical port count */
.port_cnt = 5, /* total cpu and user ports */
},
};
@ -1238,7 +1238,7 @@ static int ksz8795_switch_init(struct ksz_device *dev)
dev->mib_cnt = ARRAY_SIZE(mib_names);
dev->mib_port_cnt = TOTAL_PORT_NUM;
dev->phy_port_cnt = dev->port_cnt;
dev->phy_port_cnt = dev->port_cnt - 1;
dev->cpu_port = dev->mib_port_cnt - 1;
dev->host_mask = BIT(dev->cpu_port);
@ -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 + 1;
dev->ds->num_ports = dev->port_cnt;
return 0;
}