net: dsa: microchip: refactor the ksz switch init function
v2 cover net: dsa: microchip: refactor the ksz switch init function
During the ksz_switch_register function, it calls the individual switches init functions (ksz8795.c and ksz9477.c). Both these functions have few things in common like, copying the chip specific data to struct ksz_dev, allocating ksz_port memory and mib_names memory & cnt. And to add the new LAN937x series switch, these allocations has to be replicated.
Based on the review feedback of LAN937x part support patch, refactored the switch init function to move allocations to switch register.
Changes in RFC v2
- Fixed the compilation issue
Arun Ramadoss (8):
net: dsa: microchip: ksz8795: update the port_cnt value in
ksz_chip_data
net: dsa: microchip: move ksz_chip_data to ksz_common
net: dsa: microchip: perform the compatibility check for dev probed
net: dsa: microchip: move port memory allocation to ksz_common
net: dsa: microchip: move struct mib_names to ksz_chip_data
net: dsa: microchip: move get_strings to ksz_common
net: dsa: microchip: add the phylink get_caps
net: dsa: microchip: remove unused members in ksz_device
Prasanna Vengateshan (1):
net: dsa: move mib->cnt_ptr reset code to ksz_common.c
drivers/net/dsa/microchip/ksz8795.c | 252 +----------- drivers/net/dsa/microchip/ksz8795_spi.c | 37 +- drivers/net/dsa/microchip/ksz9477.c | 200 ++-------- drivers/net/dsa/microchip/ksz9477_i2c.c | 30 +- drivers/net/dsa/microchip/ksz9477_spi.c | 30 +- drivers/net/dsa/microchip/ksz_common.c | 485 +++++++++++++++++++++++- drivers/net/dsa/microchip/ksz_common.h | 63 ++- 7 files changed, 642 insertions(+), 455 deletions(-)
Signature · 1 line
2.33.0
RFC PATCH v2 1/9 net: dsa: microchip: ksz8795: update the port_cnt value in ksz_chip_data
The port_cnt value in the structure is not used in the switch_init. Instead it uses the fls(chip->cpu_port), this is due to one of port in the ksz8794 unavailable. The cpu_port for the 8794 is 0x10, fls(0x10) = 5, hence updating it directly in the ksz_chip_data structure in order to same with all the other switches in ksz8795.c and ksz9477.c files.
--- drivers/net/dsa/microchip/ksz8795.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +3 -2
@@ -1607,6 +1607,7 @@ static const struct ksz_chip_data ksz8_switch_chips[] = {* KSZ8794 0,1,2 4 * KSZ8795 0,1,2,3 4 * KSZ8765 0,1,2,3 4 +* port_cnt is configured as 5, even though it is 4 */ .chip_id = 0x8794, .dev_name = "KSZ8794",
@@ -1614,7 +1615,7 @@ static const struct ksz_chip_data ksz8_switch_chips[] = { .num_alus = 0, .num_statics = 8, .cpu_ports = 0x10, /* can be configured as cpu port */ - .port_cnt = 4, /* total cpu and user ports */ + .port_cnt = 5, /* total cpu and user ports */ .ksz87xx_eee_link_erratum = true, }, {
@@ -1653,7 +1654,7 @@ static int ksz8_switch_init(struct ksz_device *dev) dev->num_vlans = chip->num_vlans; dev->num_alus = chip->num_alus; dev->num_statics = chip->num_statics; - dev->port_cnt =fls (chip->cpu_ports); + dev->port_cnt = chip->port_cnt; dev->cpu_port =fls (chip->cpu_ports) -1 ; dev->phy_port_cnt = dev->port_cnt -1 ; dev->cpu_ports = chip->cpu_ports;
Signature · 1 line
2.33.0
Re: [RFC Patch net-next v2 1/9] net: dsa: microchip: ksz8795: update the port_cnt value in ksz_chip_data
Quoted 8 lines · Arun Ramadoss
The
port_cntvalue in the structure is not used in theswitch_init. Instead it uses thefls(chip->cpu_port), this is due to one of port in the ksz8794 unavailable. Thecpu_portfor the 8794 is0x10, fls(0x10) = 5, hence updating it directly in theksz_chip_datastructure in order to same with all the other switches inksz8795.candksz9477.cfiles.Signed-off-by Arun Ramadoss <[email protected]>---
Sounds like a straightforward transformation based on a valid observation.
Quoted 36 lines
drivers/net/dsa/microchip/ksz8795.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/net/dsa/microchip/ksz8795.c +3
-2@@ -1607,6 +1607,7 @@ static const struct ksz_chip_data ksz8_switch_chips[] = {* KSZ8794 0,1,2 4 * KSZ8795 0,1,2,3 4 * KSZ8765 0,1,2,3 4 +* port_cnt is configured as 5, even though it is 4 */ .chip_id = 0x8794, .dev_name = "KSZ8794",@@ -1614,7 +1615,7 @@ static const struct ksz_chip_data ksz8_switch_chips[] = { .num_alus = 0, .num_statics = 8, .cpu_ports = 0x10, /* can be configured as cpu port */ - .port_cnt = 4, /* total cpu and user ports */ + .port_cnt = 5, /* total cpu and user ports */ .ksz87xx_eee_link_erratum = true, }, {@@ -1653,7 +1654,7 @@ static int ksz8_switch_init(struct ksz_device *dev) dev->num_vlans = chip->num_vlans; dev->num_alus = chip->num_alus; dev->num_statics = chip->num_statics; - dev->port_cnt =fls (chip->cpu_ports); + dev->port_cnt = chip->port_cnt; dev->cpu_port =fls (chip->cpu_ports) -1 ; dev->phy_port_cnt = dev->port_cnt -1 ; dev->cpu_ports = chip->cpu_ports;Signature · 1 line
2.33.0
Re: [RFC Patch net-next v2 1/9] net: dsa: microchip: ksz8795: update the port_cnt value in ksz_chip_data
In reply to Arun RamadossQuoted 7 lines · Arun Ramadoss
The
port_cntvalue in the structure is not used in theswitch_init. Instead it uses thefls(chip->cpu_port), this is due to one of port in the ksz8794 unavailable. Thecpu_portfor the 8794 is0x10, fls(0x10) = 5, hence updating it directly in theksz_chip_datastructure in order to same with all the other switches inksz8795.candksz9477.cfiles.Signed-off-by Arun Ramadoss <[email protected]>
Signature · 1 line
Florian
RFC PATCH v2 2/9 net: dsa: microchip: move ksz_chip_data to ksz_common
In reply to Arun RamadossThis patch moves the ksz_chip_data in ksz8795 and ksz9477 to ksz_common. At present, the dev->chip_id is iterated with the ksz_chip_data and then copy its value to the ksz_dev structure. These values are declared as constant.
Instead of copying the values and referencing it, this patch update the dev->info to the ksz_chip_data based on the chip_id in the init function. And also update the ksz_chip_data values for the LAN937x based switches.
--- drivers/net/dsa/microchip/ksz8795.c | 114 ++------------- drivers/net/dsa/microchip/ksz9477.c | 108 +++----------- drivers/net/dsa/microchip/ksz_common.c | 190 +++++++++++++++++++++++-- drivers/net/dsa/microchip/ksz_common.h | 37 ++++- 4 files changed, 243 insertions(+), 206 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +13 -101
@@ -1036,13 +1036,13 @@ static void ksz8_flush_dyn_mac_table(struct ksz_device *dev, int port)int first, index, cnt;struct ksz_port *p; -if ((uint )port < dev->port_cnt) { +if ((uint )port < dev->info->port_cnt) { first = port; cnt = port +1 ; }else {/* Flush all ports. */ first =0 ; - cnt = dev->port_cnt; + cnt = dev->info->port_cnt; }for (index = first; index < cnt; index++) { p = &dev->ports[index];
@@ -1118,7 +1118,7 @@ static int ksz8_port_vlan_add(struct dsa_switch *ds, int port,* Remove Tag flag to be changed, unless there are no * other VLANs currently configured. */ -for (vid =1 ; vid < dev->num_vlans; ++vid) { +for (vid =1 ; vid < dev->info->num_vlans; ++vid) {/* Skip the VID we are going to add or reconfigure */ if (vid == vlan->vid)continue ;
@@ -1389,7 +1389,7 @@ static int ksz8_handle_global_errata(struct dsa_switch *ds)* KSZ879x/KSZ877x/KSZ876x and some EEE link partners may result in * the link dropping. */ -if (dev->ksz87xx_eee_link_erratum) +if (dev->info->ksz87xx_eee_link_erratum) ret =ksz8_ind_write8 (dev,TABLE_EEE ,REG_IND_EEE_GLOB2_HI ,0 );return ret;
@@ -1402,7 +1402,7 @@ static int ksz8_setup(struct dsa_switch *ds)int i, ret =0 ; dev->vlan_cache =devm_kcalloc (dev->dev,sizeof (struct vlan_table ), - dev->num_vlans,GFP_KERNEL ); + dev->info->num_vlans,GFP_KERNEL );if (!dev->vlan_cache)return -ENOMEM ;
@@ -1446,7 +1446,7 @@ static int ksz8_setup(struct dsa_switch *ds) (BROADCAST_STORM_VALUE * BROADCAST_STORM_PROT_RATE) / 100); -for (i =0 ; i < (dev->num_vlans /4 ); i++) +for (i =0 ; i < (dev->info->num_vlans /4 ); i++)ksz8_r_vlan_entries (dev, i);/* Setup STP address for STP operation. */
@@ -1571,74 +1571,6 @@ static int ksz8_switch_detect(struct ksz_device *dev)return 0 ; } -struct ksz_chip_data { -u16 chip_id; -const char *dev_name; -int num_vlans; -int num_alus; -int num_statics; -int cpu_ports; -int port_cnt; -bool ksz87xx_eee_link_erratum; -}; - -static const struct ksz_chip_data ksz8_switch_chips[] = { - { - .chip_id =0x8795 , - .dev_name ="KSZ8795" , - .num_vlans =4096 , - .num_alus =0 , - .num_statics =8 , - .cpu_ports =0x10 ,/* can be configured as cpu port */ - .port_cnt =5 ,/* total cpu and user ports */ - .ksz87xx_eee_link_erratum = true, - }, - { -/* -* WARNING -* ======= -* KSZ8794 is similar to KSZ8795, except the port map -* contains a gap between external and CPU ports, the -* port map is NOT continuous. The per-port register -* map is shifted accordingly too, i.e. registers at -* offset 0x40 are NOT used on KSZ8794 and they ARE -* used on KSZ8795 for external port 3. -* external cpu -* KSZ8794 0,1,2 4 -* KSZ8795 0,1,2,3 4 -* KSZ8765 0,1,2,3 4 -* port_cnt is configured as 5, even though it is 4 -*/ - .chip_id =0x8794 , - .dev_name ="KSZ8794" , - .num_vlans =4096 , - .num_alus =0 , - .num_statics =8 , - .cpu_ports =0x10 ,/* can be configured as cpu port */ - .port_cnt =5 ,/* total cpu and user ports */ - .ksz87xx_eee_link_erratum = true, - }, - { - .chip_id =0x8765 , - .dev_name ="KSZ8765" , - .num_vlans =4096 , - .num_alus =0 , - .num_statics =8 , - .cpu_ports =0x10 ,/* can be configured as cpu port */ - .port_cnt =5 ,/* total cpu and user ports */ - .ksz87xx_eee_link_erratum = true, - }, - { - .chip_id =0x8830 , - .dev_name ="KSZ8863/KSZ8873" , - .num_vlans =16 , - .num_alus =0 , - .num_statics =8 , - .cpu_ports =0x4 ,/* can be configured as cpu port */ - .port_cnt =3 , - }, -}; -static int ksz8_switch_init (struct ksz_device *dev) {struct ksz8 *ksz8 = dev->priv;
@@ -1646,30 +1578,10 @@ static int ksz8_switch_init(struct ksz_device *dev) dev->ds->ops = &ksz8_switch_ops; -for (i =0 ; i <ARRAY_SIZE (ksz8_switch_chips); i++) { -const struct ksz_chip_data *chip = &ksz8_switch_chips[i]; - -if (dev->chip_id == chip->chip_id) { - dev->name = chip->dev_name; - dev->num_vlans = chip->num_vlans; - dev->num_alus = chip->num_alus; - dev->num_statics = chip->num_statics; - dev->port_cnt = chip->port_cnt; - dev->cpu_port =fls (chip->cpu_ports) -1 ; - dev->phy_port_cnt = dev->port_cnt -1 ; - dev->cpu_ports = chip->cpu_ports; - dev->host_mask = chip->cpu_ports; - dev->port_mask = (BIT (dev->phy_port_cnt) -1 ) | - chip->cpu_ports; - dev->ksz87xx_eee_link_erratum = - chip->ksz87xx_eee_link_erratum; -break ; - } - } - -/* no switch found */ -if (!dev->cpu_ports) -return -ENODEV ; + dev->cpu_port =fls (dev->info->cpu_ports) -1 ; + dev->host_mask = dev->info->cpu_ports; + dev->phy_port_cnt = dev->info->port_cnt -1 ; + dev->port_mask = (BIT (dev->phy_port_cnt) -1 ) | dev->info->cpu_ports;if (ksz_is_ksz88x3 (dev)) { ksz8->regs = ksz8863_regs;
@@ -1688,11 +1600,11 @@ static int ksz8_switch_init(struct ksz_device *dev) dev->reg_mib_cnt =MIB_COUNTER_NUM ; dev->ports =devm_kzalloc (dev->dev, - dev->port_cnt *sizeof (struct ksz_port ), + dev->info->port_cnt *sizeof (struct ksz_port ),GFP_KERNEL );if (!dev->ports)return -ENOMEM ; -for (i =0 ; i < dev->port_cnt; i++) { +for (i =0 ; i < dev->info->port_cnt; i++) {mutex_init (&dev->ports[i].mib.cnt_mutex); dev->ports[i].mib.counters = devm_kzalloc(dev->dev,
@@ -1704,7 +1616,7 @@ static int ksz8_switch_init(struct ksz_device *dev) }/* set the real number of ports */ - dev->ds->num_ports = dev->port_cnt; + dev->ds->num_ports = dev->info->port_cnt;/* We rely on software untagging on the CPU port, so that we * can support both tagged and untagged VLANs
drivers/net/dsa/microchip/ksz9477.c +18 -90
206 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.c +182 -8
253 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.h +30 -7
@@ -26,6 +26,18 @@ struct ksz_port_mib {struct spinlock stats64_lock; }; +struct ksz_chip_data { +u32 chip_id; +const char *dev_name; +int num_vlans; +int num_alus; +int num_statics; +int cpu_ports; +int port_cnt; +bool phy_errata_9477; +bool ksz87xx_eee_link_erratum; +}; +struct ksz_port {bool remove_tag;/* Remove Tag flag set, for ksz8795 only */ int stp_state;
@@ -48,6 +60,7 @@ struct ksz_device {struct dsa_switch *ds;struct ksz_platform_data *pdata;const char *name; +const struct ksz_chip_data *info;struct mutex dev_mutex;/* device access */ struct mutex regmap_mutex;/* regmap access */
@@ -64,20 +77,13 @@ struct ksz_device {/* chip specific data */ u32 chip_id; -int num_vlans; -int num_alus; -int num_statics;int cpu_port;/* port connected to CPU */ -int cpu_ports;/* port bitmap can be cpu port */ int phy_port_cnt; -int port_cnt;u8 reg_mib_cnt;int mib_cnt;const struct mib_names *mib_names;phy_interface_t compat_interface;u32 regs_size; -bool phy_errata_9477; -bool ksz87xx_eee_link_erratum;bool synclko_125;bool synclko_disable;
@@ -94,6 +100,23 @@ struct ksz_device {u16 port_mask; }; +/* List of supported models */ +enum ksz_model { +KSZ8795 , +KSZ8794 , +KSZ8765 , +KSZ8830 , +KSZ9477 , +KSZ9897 , +KSZ9893 , +KSZ9567 , +LAN9370 , +LAN9371 , +LAN9372 , +LAN9373 , +LAN9374 , +}; +struct alu_struct {/* entry 1 */ u8 is_static:1 ;
Signature · 1 line
2.33.0
Re: [RFC Patch net-next v2 2/9] net: dsa: microchip: move ksz_chip_data to ksz_common
Quoted 11 lines · Arun Ramadoss
This patch moves the
ksz_chip_datain ksz8795 and ksz9477 toksz_common. At present, thedev->chip_idis iterated with theksz_chip_dataand then copy its value to theksz_devstructure. These values are declared as constant.
Instead of copying the values and referencing it, this patch update thedev->infoto theksz_chip_databased on thechip_idin the init function. And also update theksz_chip_datavalues for the LAN937x based switches.Signed-off-by Arun Ramadoss <[email protected]>---
Thanks, this looks good. I see that dev->info is assigned in ksz_switch_register and I had to look to see whether there is any dev->info dereference from before the call to ksz_switch_register(), and it looks like we're ok.
Re: [RFC Patch net-next v2 2/9] net: dsa: microchip: move ksz_chip_data to ksz_common
In reply to Arun RamadossQuoted 10 lines · Arun Ramadoss
This patch moves the
ksz_chip_datain ksz8795 and ksz9477 toksz_common. At present, thedev->chip_idis iterated with theksz_chip_dataand then copy its value to theksz_devstructure. These values are declared as constant.
Instead of copying the values and referencing it, this patch update thedev->infoto theksz_chip_databased on thechip_idin the init function. And also update theksz_chip_datavalues for the LAN937x based switches.Signed-off-by Arun Ramadoss <[email protected]>
Signature · 1 line
Florian
RFC PATCH v2 3/9 net: dsa: microchip: perform the compatibility check for dev probed
In reply to Arun RamadossThis patch perform the compatibility check for the device after the chip detect is done. It is to prevent the mismatch between the device compatible specified in the device tree and actual device found during the detect. The ksz9477 device doesn't use any .data in the of_device_id. But the ksz8795 uses .data for assigning the regmap between 8830 family and 87xx family switch. Changed the regmap assignment based on the chip_id from the .data.
--- drivers/net/dsa/microchip/ksz8795_spi.c | 37 ++++++++++++++++++++----- drivers/net/dsa/microchip/ksz9477_i2c.c | 30 ++++++++++++++++---- drivers/net/dsa/microchip/ksz9477_spi.c | 30 ++++++++++++++++---- drivers/net/dsa/microchip/ksz_common.c | 25 ++++++++++++++++- drivers/net/dsa/microchip/ksz_common.h | 1 + 5 files changed, 103 insertions(+), 20 deletions(-)
drivers/net/dsa/microchip/ksz8795_spi.c +30 -7
@@ -31,9 +31,12 @@ KSZ_REGMAP_TABLE(ksz8795, 16, KSZ8795_SPI_ADDR_SHIFT,KSZ_REGMAP_TABLE (ksz8863,16 ,KSZ8863_SPI_ADDR_SHIFT ,KSZ8863_SPI_TURNAROUND_SHIFT ,KSZ8863_SPI_ADDR_ALIGN ); +#define KSZ_88X3_FAMILY 0x8830 +static int ksz8795_spi_probe (struct spi_device *spi) {const struct regmap_config *regmap_config; +const struct ksz_chip_data *chip;struct device *ddev = &spi->dev;struct regmap_config rc;struct ksz_device *dev;
@@ -50,10 +53,15 @@ static int ksz8795_spi_probe(struct spi_device *spi)if (!dev)return -ENOMEM ; - regmap_config =device_get_match_data (ddev); -if (!regmap_config) + chip =device_get_match_data (ddev); +if (!chip)return -EINVAL ; +if (chip->chip_id ==KSZ_88X3_FAMILY ) + regmap_config = ksz8863_regmap_config; +else + regmap_config = ksz8795_regmap_config; +for (i =0 ; i <ARRAY_SIZE (ksz8795_regmap_config); i++) { rc = regmap_config[i]; rc.lock_arg = &dev->regmap_mutex;
@@ -113,11 +121,26 @@ static void ksz8795_spi_shutdown(struct spi_device *spi) }static const struct of_device_id ksz8795_dt_ids[] = { - { .compatible ="microchip,ksz8765" , .data = &ksz8795_regmap_config }, - { .compatible ="microchip,ksz8794" , .data = &ksz8795_regmap_config }, - { .compatible ="microchip,ksz8795" , .data = &ksz8795_regmap_config }, - { .compatible ="microchip,ksz8863" , .data = &ksz8863_regmap_config }, - { .compatible ="microchip,ksz8873" , .data = &ksz8863_regmap_config }, + { + .compatible ="microchip,ksz8765" , + .data = &ksz_switch_chips[KSZ8765 ] + }, + { + .compatible ="microchip,ksz8794" , + .data = &ksz_switch_chips[KSZ8794 ] + }, + { + .compatible ="microchip,ksz8795" , + .data = &ksz_switch_chips[KSZ8795 ] + }, + { + .compatible ="microchip,ksz8863" , + .data = &ksz_switch_chips[KSZ8830 ] + }, + { + .compatible ="microchip,ksz8873" , + .data = &ksz_switch_chips[KSZ8830 ] + }, {}, };MODULE_DEVICE_TABLE (of, ksz8795_dt_ids);
drivers/net/dsa/microchip/ksz9477_i2c.c +24 -6
@@ -87,12 +87,30 @@ static const struct i2c_device_id ksz9477_i2c_id[] = {MODULE_DEVICE_TABLE (i2c, ksz9477_i2c_id);static const struct of_device_id ksz9477_dt_ids[] = { - { .compatible ="microchip,ksz9477" }, - { .compatible ="microchip,ksz9897" }, - { .compatible ="microchip,ksz9893" }, - { .compatible ="microchip,ksz9563" }, - { .compatible ="microchip,ksz9567" }, - { .compatible ="microchip,ksz8563" }, + { + .compatible ="microchip,ksz9477" , + .data = &ksz_switch_chips[KSZ9477 ] + }, + { + .compatible ="microchip,ksz9897" , + .data = &ksz_switch_chips[KSZ9897 ] + }, + { + .compatible ="microchip,ksz9893" , + .data = &ksz_switch_chips[KSZ9893 ] + }, + { + .compatible ="microchip,ksz9563" , + .data = &ksz_switch_chips[KSZ9893 ] + }, + { + .compatible ="microchip,ksz8563" , + .data = &ksz_switch_chips[KSZ9893 ] + }, + { + .compatible ="microchip,ksz9567" , + .data = &ksz_switch_chips[KSZ9567 ] + }, {}, };MODULE_DEVICE_TABLE (of, ksz9477_dt_ids);
drivers/net/dsa/microchip/ksz9477_spi.c +24 -6
@@ -86,12 +86,30 @@ static void ksz9477_spi_shutdown(struct spi_device *spi) }static const struct of_device_id ksz9477_dt_ids[] = { - { .compatible ="microchip,ksz9477" }, - { .compatible ="microchip,ksz9897" }, - { .compatible ="microchip,ksz9893" }, - { .compatible ="microchip,ksz9563" }, - { .compatible ="microchip,ksz8563" }, - { .compatible ="microchip,ksz9567" }, + { + .compatible ="microchip,ksz9477" , + .data = &ksz_switch_chips[KSZ9477 ] + }, + { + .compatible ="microchip,ksz9897" , + .data = &ksz_switch_chips[KSZ9897 ] + }, + { + .compatible ="microchip,ksz9893" , + .data = &ksz_switch_chips[KSZ9893 ] + }, + { + .compatible ="microchip,ksz9563" , + .data = &ksz_switch_chips[KSZ9893 ] + }, + { + .compatible ="microchip,ksz8563" , + .data = &ksz_switch_chips[KSZ9893 ] + }, + { + .compatible ="microchip,ksz9567" , + .data = &ksz_switch_chips[KSZ9567 ] + }, {}, };MODULE_DEVICE_TABLE (of, ksz9477_dt_ids);
drivers/net/dsa/microchip/ksz_common.c +24 -1
@@ -14,6 +14,7 @@#include <linux/phy.h> #include <linux/etherdevice.h> #include <linux/if_bridge.h> +#include <linux/of_device.h> #include <linux/of_net.h> #include <net/dsa.h> #include <net/switchdev.h>
@@ -59,7 +60,7 @@ struct ksz_stats_raw {u64 tx_discards; }; -static const struct ksz_chip_data ksz_switch_chips[] = { +const struct ksz_chip_data ksz_switch_chips[] = { [KSZ8795 ] = { .chip_id =0x8795 , .dev_name ="KSZ8795" ,
@@ -210,6 +211,7 @@ static const struct ksz_chip_data ksz_switch_chips[] = { .port_cnt = 8, /* total physical port count */ }, }; +EXPORT_SYMBOL_GPL (ksz_switch_chips);static const struct ksz_chip_data *ksz_lookup_info (unsigned int prod_num) {
@@ -225,6 +227,23 @@ static const struct ksz_chip_data *ksz_lookup_info(unsigned int prod_num)return NULL ; } +static int ksz_check_device_id (struct ksz_device *dev) +{ +const struct ksz_chip_data *dt_chip_data; + + dt_chip_data =of_device_get_match_data (dev->dev); + +/* Check for Device Tree and Chip ID */ +if (dt_chip_data->chip_id != dev->chip_id) { +dev_err (dev->dev, +"Device tree specifies chip %s but found %s, please fix it!\n" , + dt_chip_data->dev_name, dev->info->dev_name); +return -ENODEV ; + } + +return 0 ; +} +void ksz_r_mib_stats64 (struct ksz_device *dev,int port) {struct rtnl_link_stats64 *stats;
@@ -741,6 +760,10 @@ int ksz_switch_register(struct ksz_device *dev,/* Update the compatible info with the probed one */ dev->info = info; + ret =ksz_check_device_id (dev); +if (ret) +return ret; + ret = dev->dev_ops->init (dev);if (ret)return ret;
drivers/net/dsa/microchip/ksz_common.h +1 -0
@@ -177,6 +177,7 @@ void ksz_init_mib_timer(struct ksz_device *dev);void ksz_r_mib_stats64 (struct ksz_device *dev,int port);void ksz_get_stats64 (struct dsa_switch *ds,int port,struct rtnl_link_stats64 *s); +extern const struct ksz_chip_data ksz_switch_chips[];/* Common DSA access functions */
Signature · 1 line
2.33.0
Vladimir Oltean
maintainerRe: [RFC Patch net-next v2 3/9] net: dsa: microchip: perform the compatibility check for dev probed
Quoted 22 lines · Arun Ramadoss
This patch perform the compatibility check for the device after the chip detect is done. It is to prevent the mismatch between the device compatible specified in the device tree and actual device found during the detect. The ksz9477 device doesn't use any .data in the
of_device_id. But the ksz8795 uses .data for assigning the regmap between 8830 family and 87xx family switch. Changed the regmap assignment based on thechip_idfrom the .data.Signed-off-by Arun Ramadoss <[email protected]>--- drivers/net/dsa/microchip/ksz8795_spi.c | 37 ++++++++++++++++++++----- drivers/net/dsa/microchip/ksz9477_i2c.c | 30 ++++++++++++++++---- drivers/net/dsa/microchip/ksz9477_spi.c | 30 ++++++++++++++++---- drivers/net/dsa/microchip/ksz_common.c | 25 ++++++++++++++++- drivers/net/dsa/microchip/ksz_common.h | 1 + 5 files changed, 103 insertions(+), 20 deletions(-)drivers/net/dsa/microchip/ksz8795_spi.c +0
-0
drivers/net/dsa/microchip/ksz8795_spi.c KSZ_REGMAP_TABLE(ksz8795, 16, KSZ8795_SPI_ADDR_SHIFT, · line 35
Quoted 5 lines
drivers/net/dsa/microchip/ksz8795_spi.c +2
-0@@ -31,9 +31,12 @@ KSZ_REGMAP_TABLE(ksz8795, 16, KSZ8795_SPI_ADDR_SHIFT,KSZ_REGMAP_TABLE (ksz8863,16 ,KSZ8863_SPI_ADDR_SHIFT ,KSZ8863_SPI_TURNAROUND_SHIFT ,KSZ8863_SPI_ADDR_ALIGN ); +#define KSZ_88X3_FAMILY 0x8830 +
Can we have this macro defined in ksz_common.h and used in the chip_id of the ksz_chip_data structure as well? It makes things easier to follow by pattern matching. And for symmetry, it would probably be good to have such a macro for all chip ids.
Vladimir Oltean
maintainerRe: [RFC Patch net-next v2 3/9] net: dsa: microchip: perform the compatibility check for dev probed
In reply to Arun Ramadossdrivers/net/dsa/microchip/ksz_common.c static const struct ksz_chip_data *ksz_lookup_info(unsigned int prod_num) · line 234
Quoted 5 lines · Arun Ramadoss
drivers/net/dsa/microchip/ksz_common.c +5
-0+static int ksz_check_device_id (struct ksz_device *dev) +{ +const struct ksz_chip_data *dt_chip_data; + + dt_chip_data =of_device_get_match_data (dev->dev);
And one other comment. You haven't converted ksz8863_smi.c to put anything in struct of_device_id :: data, so that driver will dereference NULL here.
Quoted 11 lines
drivers/net/dsa/microchip/ksz_common.c +11
-0+ +/* Check for Device Tree and Chip ID */ +if (dt_chip_data->chip_id != dev->chip_id) { +dev_err (dev->dev, +"Device tree specifies chip %s but found %s, please fix it!\n" , + dt_chip_data->dev_name, dev->info->dev_name); +return -ENODEV ; + } + +return 0 ; +}
RFC PATCH v2 4/9 net: dsa: microchip: move port memory allocation to ksz_common
In reply to Arun Ramadossksz8795 and ksz9477 init function initializes the memory to dev->ports and assigns the ds real number of ports. Since both the routines are same, moved the allocation of port memory to ksz_switch_register after init.
--- drivers/net/dsa/microchip/ksz8795.c | 8 -------- drivers/net/dsa/microchip/ksz9477.c | 8 -------- drivers/net/dsa/microchip/ksz_common.c | 9 +++++++++ 3 files changed, 9 insertions(+), 16 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +0 -8
@@ -1599,11 +1599,6 @@ static int ksz8_switch_init(struct ksz_device *dev) dev->reg_mib_cnt =MIB_COUNTER_NUM ; - dev->ports =devm_kzalloc (dev->dev, - dev->info->port_cnt *sizeof (struct ksz_port ), -GFP_KERNEL ); -if (!dev->ports) -return -ENOMEM ;for (i =0 ; i < dev->info->port_cnt; i++) {mutex_init (&dev->ports[i].mib.cnt_mutex); dev->ports[i].mib.counters =
@@ -1615,9 +1610,6 @@ static int ksz8_switch_init(struct ksz_device *dev)return -ENOMEM ; } -/* set the real number of ports */ - dev->ds->num_ports = dev->info->port_cnt; -/* We rely on software untagging on the CPU port, so that we * can support both tagged and untagged VLANs */
drivers/net/dsa/microchip/ksz9477.c +0 -8
@@ -1482,11 +1482,6 @@ static int ksz9477_switch_init(struct ksz_device *dev) dev->reg_mib_cnt =SWITCH_COUNTER_NUM ; dev->mib_cnt =TOTAL_SWITCH_COUNTER_NUM ; - dev->ports =devm_kzalloc (dev->dev, - dev->info->port_cnt *sizeof (struct ksz_port ), -GFP_KERNEL ); -if (!dev->ports) -return -ENOMEM ;for (i =0 ; i < dev->info->port_cnt; i++) {spin_lock_init (&dev->ports[i].mib.stats64_lock);mutex_init (&dev->ports[i].mib.cnt_mutex);
@@ -1499,9 +1494,6 @@ static int ksz9477_switch_init(struct ksz_device *dev)return -ENOMEM ; } -/* set the real number of ports */ - dev->ds->num_ports = dev->info->port_cnt; -return 0 ; }
drivers/net/dsa/microchip/ksz_common.c +9 -0
@@ -768,6 +768,15 @@ int ksz_switch_register(struct ksz_device *dev,if (ret)return ret; + dev->ports =devm_kzalloc (dev->dev, + dev->info->port_cnt *sizeof (struct ksz_port ), +GFP_KERNEL ); +if (!dev->ports) +return -ENOMEM ; + +/* set the real number of ports */ + dev->ds->num_ports = dev->info->port_cnt; +/* Host port interface will be self detected, or specifically set in * device tree. */
Signature · 1 line
2.33.0
Vladimir Oltean
maintainerRe: [RFC Patch net-next v2 4/9] net: dsa: microchip: move port memory allocation to ksz_common
Quoted 7 lines · Arun Ramadoss
ksz8795 and ksz9477 init function initializes the memory to
dev->portsand assigns the ds real number of ports. Since both the routines are same, moved the allocation of port memory toksz_switch_registerafter init.Signed-off-by Arun Ramadoss <[email protected]>---
Does this actually work? ksz8_switch_init() and ksz9477_switch_init() still dereference dev->ports. They are called from dev->dev_ops->init() from ksz_switch_register(). You have moved the devm_kzalloc() to _after_ the dev->dev_ops->init() call. So these functions are accessing memory behind a not-yet-allocated pointer.
Quoted 80 lines
drivers/net/dsa/microchip/ksz8795.c | 8 -------- drivers/net/dsa/microchip/ksz9477.c | 8 -------- drivers/net/dsa/microchip/ksz_common.c | 9 +++++++++ 3 files changed, 9 insertions(+), 16 deletions(-)drivers/net/dsa/microchip/ksz8795.c +0
-8@@ -1599,11 +1599,6 @@ static int ksz8_switch_init(struct ksz_device *dev) dev->reg_mib_cnt =MIB_COUNTER_NUM ; - dev->ports =devm_kzalloc (dev->dev, - dev->info->port_cnt *sizeof (struct ksz_port ), -GFP_KERNEL ); -if (!dev->ports) -return -ENOMEM ;for (i =0 ; i < dev->info->port_cnt; i++) {mutex_init (&dev->ports[i].mib.cnt_mutex); dev->ports[i].mib.counters =@@ -1615,9 +1610,6 @@ static int ksz8_switch_init(struct ksz_device *dev)return -ENOMEM ; } -/* set the real number of ports */ - dev->ds->num_ports = dev->info->port_cnt; -/* We rely on software untagging on the CPU port, so that we * can support both tagged and untagged VLANs */ drivers/net/dsa/microchip/ksz9477.c +0
-8@@ -1482,11 +1482,6 @@ static int ksz9477_switch_init(struct ksz_device *dev) dev->reg_mib_cnt =SWITCH_COUNTER_NUM ; dev->mib_cnt =TOTAL_SWITCH_COUNTER_NUM ; - dev->ports =devm_kzalloc (dev->dev, - dev->info->port_cnt *sizeof (struct ksz_port ), -GFP_KERNEL ); -if (!dev->ports) -return -ENOMEM ;for (i =0 ; i < dev->info->port_cnt; i++) {spin_lock_init (&dev->ports[i].mib.stats64_lock);mutex_init (&dev->ports[i].mib.cnt_mutex);@@ -1499,9 +1494,6 @@ static int ksz9477_switch_init(struct ksz_device *dev)return -ENOMEM ; } -/* set the real number of ports */ - dev->ds->num_ports = dev->info->port_cnt; -return 0 ; }drivers/net/dsa/microchip/ksz_common.c +9
-0@@ -768,6 +768,15 @@ int ksz_switch_register(struct ksz_device *dev,if (ret)return ret; + dev->ports =devm_kzalloc (dev->dev, + dev->info->port_cnt *sizeof (struct ksz_port ), +GFP_KERNEL ); +if (!dev->ports) +return -ENOMEM ; + +/* set the real number of ports */ + dev->ds->num_ports = dev->info->port_cnt; +/* Host port interface will be self detected, or specifically set in * device tree. */ Signature · 1 line
2.33.0
RFC PATCH v2 5/9 net: dsa: microchip: move struct mib_names to ksz_chip_data
In reply to Arun RamadossThe ksz88xx family has one set of mib_names. The ksz87xx, ksz9477, LAN937x based switches has one set of mib_names. In order to remove redundant declaration, moved the struct mib_names to ksz_chip_data structure. And allocated the mib memory in switch_register instead of individual switch_init function.
--- drivers/net/dsa/microchip/ksz8795.c | 116 ++------------------ drivers/net/dsa/microchip/ksz9477.c | 70 ++---------- drivers/net/dsa/microchip/ksz_common.c | 143 +++++++++++++++++++++++-- drivers/net/dsa/microchip/ksz_common.h | 11 +- 4 files changed, 159 insertions(+), 181 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +9 -107
@@ -126,86 +126,6 @@ static u8 ksz8863_shifts[] = { [DYNAMIC_MAC_SRC_PORT] = 20, }; -struct mib_names { -char string[ETH_GSTRING_LEN ]; -}; - -static const struct mib_names ksz87xx_mib_names[] = { - {"rx_hi" }, - {"rx_undersize" }, - {"rx_fragments" }, - {"rx_oversize" }, - {"rx_jabbers" }, - {"rx_symbol_err" }, - {"rx_crc_err" }, - {"rx_align_err" }, - {"rx_mac_ctrl" }, - {"rx_pause" }, - {"rx_bcast" }, - {"rx_mcast" }, - {"rx_ucast" }, - {"rx_64_or_less" }, - {"rx_65_127" }, - {"rx_128_255" }, - {"rx_256_511" }, - {"rx_512_1023" }, - {"rx_1024_1522" }, - {"rx_1523_2000" }, - {"rx_2001" }, - {"tx_hi" }, - {"tx_late_col" }, - {"tx_pause" }, - {"tx_bcast" }, - {"tx_mcast" }, - {"tx_ucast" }, - {"tx_deferred" }, - {"tx_total_col" }, - {"tx_exc_col" }, - {"tx_single_col" }, - {"tx_mult_col" }, - {"rx_total" }, - {"tx_total" }, - {"rx_discards" }, - {"tx_discards" }, -}; - -static const struct mib_names ksz88xx_mib_names[] = { - {"rx" }, - {"rx_hi" }, - {"rx_undersize" }, - {"rx_fragments" }, - {"rx_oversize" }, - {"rx_jabbers" }, - {"rx_symbol_err" }, - {"rx_crc_err" }, - {"rx_align_err" }, - {"rx_mac_ctrl" }, - {"rx_pause" }, - {"rx_bcast" }, - {"rx_mcast" }, - {"rx_ucast" }, - {"rx_64_or_less" }, - {"rx_65_127" }, - {"rx_128_255" }, - {"rx_256_511" }, - {"rx_512_1023" }, - {"rx_1024_1522" }, - {"tx" }, - {"tx_hi" }, - {"tx_late_col" }, - {"tx_pause" }, - {"tx_bcast" }, - {"tx_mcast" }, - {"tx_ucast" }, - {"tx_deferred" }, - {"tx_total_col" }, - {"tx_exc_col" }, - {"tx_single_col" }, - {"tx_mult_col" }, - {"rx_discards" }, - {"tx_discards" }, -}; -static bool ksz_is_ksz88x3 (struct ksz_device *dev) {return dev->chip_id ==0x8830 ;
@@ -306,7 +226,7 @@ static void ksz8_r_mib_cnt(struct ksz_device *dev, int port, u16 addr, u64 *cnt) masks = ksz8->masks; regs = ksz8->regs; - ctrl_addr = addr + dev->reg_mib_cnt * port; + ctrl_addr = addr + dev->info->reg_mib_cnt * port; ctrl_addr |=IND_ACC_TABLE (TABLE_MIB |TABLE_READ );mutex_lock (&dev->alu_mutex);
@@ -343,7 +263,7 @@ static void ksz8795_r_mib_pkt(struct ksz_device *dev, int port, u16 addr, masks = ksz8->masks; regs = ksz8->regs; - addr -= dev->reg_mib_cnt; + addr -= dev->info->reg_mib_cnt; ctrl_addr = (KSZ8795_MIB_TOTAL_RX_1 -KSZ8795_MIB_TOTAL_RX_0 ) * port; ctrl_addr += addr +KSZ8795_MIB_TOTAL_RX_0 ; ctrl_addr |=IND_ACC_TABLE (TABLE_MIB |TABLE_READ );
@@ -392,7 +312,7 @@ static void ksz8863_r_mib_pkt(struct ksz_device *dev, int port, u16 addr,u32 data;u32 cur; - addr -= dev->reg_mib_cnt; + addr -= dev->info->reg_mib_cnt; ctrl_addr = addr ?KSZ8863_MIB_PACKET_DROPPED_TX_0 :KSZ8863_MIB_PACKET_DROPPED_RX_0 ; ctrl_addr += port;
@@ -453,23 +373,23 @@ static void ksz8_port_init_cnt(struct ksz_device *dev, int port) mib->cnt_ptr =0 ;/* Some ports may not have MIB counters before SWITCH_COUNTER_NUM. */ -while (mib->cnt_ptr < dev->reg_mib_cnt) { +while (mib->cnt_ptr < dev->info->reg_mib_cnt) { dev->dev_ops->r_mib_cnt (dev, port, mib->cnt_ptr, &mib->counters[mib->cnt_ptr]); ++mib->cnt_ptr; }/* last one in storage */ - dropped = &mib->counters[dev->mib_cnt]; + dropped = &mib->counters[dev->info->mib_cnt];/* Some ports may not have MIB counters after SWITCH_COUNTER_NUM. */ -while (mib->cnt_ptr < dev->mib_cnt) { +while (mib->cnt_ptr < dev->info->mib_cnt) { dev->dev_ops->r_mib_pkt (dev, port, mib->cnt_ptr, dropped, &mib->counters[mib->cnt_ptr]); ++mib->cnt_ptr; } mib->cnt_ptr =0 ; -memset (mib->counters,0 , dev->mib_cnt *sizeof (u64)); +memset (mib->counters,0 , dev->info->mib_cnt *sizeof (u64)); }static void ksz8_r_table (struct ksz_device *dev,int table,u16 addr,u64 *data)
@@ -1009,9 +929,9 @@ static void ksz8_get_strings(struct dsa_switch *ds, int port,struct ksz_device *dev = ds->priv;int i; -for (i =0 ; i < dev->mib_cnt; i++) { +for (i =0 ; i < dev->info->mib_cnt; i++) {memcpy (buf + i *ETH_GSTRING_LEN , - dev->mib_names[i].string,ETH_GSTRING_LEN ); + dev->info->mib_names[i].string,ETH_GSTRING_LEN ); } }
@@ -1574,7 +1494,6 @@ static int ksz8_switch_detect(struct ksz_device *dev)static int ksz8_switch_init (struct ksz_device *dev) {struct ksz8 *ksz8 = dev->priv; -int i; dev->ds->ops = &ksz8_switch_ops;
@@ -1587,27 +1506,10 @@ static int ksz8_switch_init(struct ksz_device *dev) ksz8->regs = ksz8863_regs; ksz8->masks = ksz8863_masks; ksz8->shifts = ksz8863_shifts; - dev->mib_cnt =ARRAY_SIZE (ksz88xx_mib_names); - dev->mib_names = ksz88xx_mib_names; }else { ksz8->regs = ksz8795_regs; ksz8->masks = ksz8795_masks; ksz8->shifts = ksz8795_shifts; - dev->mib_cnt =ARRAY_SIZE (ksz87xx_mib_names); - dev->mib_names = ksz87xx_mib_names; - } - - dev->reg_mib_cnt =MIB_COUNTER_NUM ; - -for (i =0 ; i < dev->info->port_cnt; i++) { -mutex_init (&dev->ports[i].mib.cnt_mutex); - dev->ports[i].mib.counters = -devm_kzalloc (dev->dev, -sizeof (u64) * - (dev->mib_cnt +1 ), -GFP_KERNEL ); -if (!dev->ports[i].mib.counters) -return -ENOMEM ; }/* We rely on software untagging on the CPU port, so that we
drivers/net/dsa/microchip/ksz9477.c +6 -64
109 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.c +136 -7
278 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.h +8 -3
@@ -26,6 +26,11 @@ struct ksz_port_mib {struct spinlock stats64_lock; }; +struct ksz_mib_names { +int index; +char string[ETH_GSTRING_LEN ]; +}; +struct ksz_chip_data {u32 chip_id;const char *dev_name;
@@ -36,6 +41,9 @@ struct ksz_chip_data {int port_cnt;bool phy_errata_9477;bool ksz87xx_eee_link_erratum; +const struct ksz_mib_names *mib_names; +int mib_cnt; +u8 reg_mib_cnt; };struct ksz_port {
@@ -79,9 +87,6 @@ struct ksz_device {u32 chip_id;int cpu_port;/* port connected to CPU */ int phy_port_cnt; -u8 reg_mib_cnt; -int mib_cnt; -const struct mib_names *mib_names;phy_interface_t compat_interface;u32 regs_size;bool synclko_125;
Signature · 1 line
2.33.0
Vladimir Oltean
maintainerRe: [RFC Patch net-next v2 5/9] net: dsa: microchip: move struct mib_names to ksz_chip_data
Quoted 21 lines · Arun Ramadoss
The ksz88xx family has one set of
mib_names. The ksz87xx, ksz9477, LAN937x based switches has one set ofmib_names. In order to remove redundant declaration, moved the structmib_namestoksz_chip_datastructure. And allocated the mib memory inswitch_registerinstead of individualswitch_initfunction.Signed-off-by Arun Ramadoss <[email protected]>---
static intksz9477_switch_init(struct ksz_device *dev){drivers/net/dsa/microchip/ksz9477.c +0
-7-int i; - dev->ds->ops = &ksz9477_switch_ops; dev->port_mask = (1 << dev->info->port_cnt) -1 ; - dev->reg_mib_cnt =SWITCH_COUNTER_NUM ; - dev->mib_cnt =TOTAL_SWITCH_COUNTER_NUM ; - -for (i =0 ; i < dev->info->port_cnt; i++) { -spin_lock_init (&dev->ports[i].mib.stats64_lock);
drivers/net/dsa/microchip/ksz9477.c static int ksz9477_switch_detect(struct ksz_device *dev) · line 1496
Quoted 10 lines
drivers/net/dsa/microchip/ksz9477.c +0
-10-mutex_init (&dev->ports[i].mib.cnt_mutex); - dev->ports[i].mib.counters = -devm_kzalloc (dev->dev, -sizeof (u64) * - (TOTAL_SWITCH_COUNTER_NUM +1 ), -GFP_KERNEL ); -if (!dev->ports[i].mib.counters) -return -ENOMEM ; - } -
This fixes the NULL pointer dereference on probe that was introduced in the previous patch, but please make sure that this does not happen in the first place, for bisectability purposes.
Quoted 2 lines
return 0;
}
RFC PATCH v2 6/9 net: dsa: microchip: move get_strings to ksz_common
In reply to Arun Ramadossksz8795 and ksz9477 uses the same algorithm for copying the ethtool strings. Hence moved to ksz_common to remove the redundant code.
--- drivers/net/dsa/microchip/ksz8795.c | 14 +------------- drivers/net/dsa/microchip/ksz9477.c | 17 +---------------- drivers/net/dsa/microchip/ksz_common.c | 16 ++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 2 ++ 4 files changed, 20 insertions(+), 29 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +1 -13
@@ -923,18 +923,6 @@ static u32 ksz8_sw_get_phy_flags(struct dsa_switch *ds, int port)return 0 ; } -static void ksz8_get_strings (struct dsa_switch *ds,int port, -u32 stringset,uint8_t *buf) -{ -struct ksz_device *dev = ds->priv; -int i; - -for (i =0 ; i < dev->info->mib_cnt; i++) { -memcpy (buf + i *ETH_GSTRING_LEN , - dev->info->mib_names[i].string,ETH_GSTRING_LEN ); - } -} -static void ksz8_cfg_port_member (struct ksz_device *dev,int port,u8 member) {u8 data;
@@ -1424,7 +1412,7 @@ static const struct dsa_switch_ops ksz8_switch_ops = { .phylink_get_caps = ksz8_get_caps, .phylink_mac_link_down = ksz_mac_link_down, .port_enable = ksz_enable_port, - .get_strings = ksz8_get_strings, + .get_strings = ksz_get_strings, .get_ethtool_stats = ksz_get_ethtool_stats, .get_sset_count = ksz_sset_count, .port_bridge_join = ksz_port_bridge_join,
drivers/net/dsa/microchip/ksz9477.c +1 -16
@@ -358,21 +358,6 @@ static int ksz9477_phy_write16(struct dsa_switch *ds, int addr, int reg,return 0 ; } -static void ksz9477_get_strings (struct dsa_switch *ds,int port, -u32 stringset,uint8_t *buf) -{ -struct ksz_device *dev = ds->priv; -int i; - -if (stringset !=ETH_SS_STATS ) -return ; - -for (i =0 ; i < dev->info->mib_cnt; i++) { -memcpy (buf + i *ETH_GSTRING_LEN , - dev->info->mib_names[i].string,ETH_GSTRING_LEN ); - } -} -static void ksz9477_cfg_port_member (struct ksz_device *dev,int port,u8 member) {
@@ -1341,7 +1326,7 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { .phy_write = ksz9477_phy_write16, .phylink_mac_link_down = ksz_mac_link_down, .port_enable = ksz_enable_port, - .get_strings = ksz9477_get_strings, + .get_strings = ksz_get_strings, .get_ethtool_stats = ksz_get_ethtool_stats, .get_sset_count = ksz_sset_count, .port_bridge_join = ksz_port_bridge_join,
drivers/net/dsa/microchip/ksz_common.c +16 -0
@@ -418,6 +418,22 @@ void ksz_get_stats64(struct dsa_switch *ds, int port, }EXPORT_SYMBOL_GPL (ksz_get_stats64); +void ksz_get_strings (struct dsa_switch *ds,int port, +u32 stringset,uint8_t *buf) +{ +struct ksz_device *dev = ds->priv; +int i; + +if (stringset !=ETH_SS_STATS ) +return ; + +for (i =0 ; i < dev->info->mib_cnt; i++) { +memcpy (buf + i *ETH_GSTRING_LEN , + dev->info->mib_names[i].string,ETH_GSTRING_LEN ); + } +} +EXPORT_SYMBOL_GPL (ksz_get_strings); +void ksz_update_port_member (struct ksz_device *dev,int port) {struct ksz_port *p = &dev->ports[port];
drivers/net/dsa/microchip/ksz_common.h +2 -0
@@ -209,6 +209,8 @@ int ksz_port_mdb_del(struct dsa_switch *ds, int port,const struct switchdev_obj_port_mdb *mdb, struct dsa_db db);int ksz_enable_port (struct dsa_switch *ds,int port,struct phy_device *phy); +void ksz_get_strings (struct dsa_switch *ds,int port, +u32 stringset,uint8_t *buf);/* Common register access functions */
Signature · 1 line
2.33.0
Re: [RFC Patch net-next v2 6/9] net: dsa: microchip: move get_strings to ksz_common
Quoted 5 lines · Arun Ramadoss
ksz8795 and ksz9477 uses the same algorithm for copying the ethtool strings. Hence moved to
ksz_commonto remove the redundant code.Signed-off-by Arun Ramadoss <[email protected]>---
Re: [RFC Patch net-next v2 6/9] net: dsa: microchip: move get_strings to ksz_common
In reply to Arun RamadossQuoted 4 lines · Arun Ramadoss
ksz8795 and ksz9477 uses the same algorithm for copying the ethtool strings. Hence moved to
ksz_commonto remove the redundant code.Signed-off-by Arun Ramadoss <[email protected]>
Signature · 1 line
Florian
RFC PATCH v2 7/9 net: dsa: move mib->cnt_ptr reset code to ksz_common.c
In reply to Arun RamadossFrom: Prasanna Vengateshan <[email protected]>
mib->cnt_ptr resetting is handled in multiple places as part of port_init_cnt(). Hence moved mib->cnt_ptr code to ksz common layer and removed from individual product files.
--- drivers/net/dsa/microchip/ksz8795.c | 2 -- drivers/net/dsa/microchip/ksz9477.c | 3 --- drivers/net/dsa/microchip/ksz_common.c | 8 +++++++- 3 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +0 -2
@@ -388,8 +388,6 @@ static void ksz8_port_init_cnt(struct ksz_device *dev, int port) dropped, &mib->counters[mib->cnt_ptr]); ++mib->cnt_ptr; } - mib->cnt_ptr =0 ; -memset (mib->counters,0 , dev->info->mib_cnt *sizeof (u64)); }static void ksz8_r_table (struct ksz_device *dev,int table,u16 addr,u64 *data)
drivers/net/dsa/microchip/ksz9477.c +0 -3
@@ -274,9 +274,6 @@ static void ksz9477_port_init_cnt(struct ksz_device *dev, int port)ksz_write8 (dev,REG_SW_MAC_CTRL_6 ,SW_MIB_COUNTER_FLUSH );ksz_pwrite32 (dev, port,REG_PORT_MIB_CTRL_STAT__4 ,0 );mutex_unlock (&mib->cnt_mutex); - - mib->cnt_ptr =0 ; -memset (mib->counters,0 , dev->info->mib_cnt *sizeof (u64)); } static enum dsa_tag_protocol ksz9477_get_tag_protocol(struct dsa_switch *ds,
drivers/net/dsa/microchip/ksz_common.c +7 -1
@@ -560,8 +560,14 @@ void ksz_init_mib_timer(struct ksz_device *dev)INIT_DELAYED_WORK (&dev->mib_read, ksz_mib_read_work); -for (i =0 ; i < dev->info->port_cnt; i++) +for (i =0 ; i < dev->info->port_cnt; i++) { +struct ksz_port_mib *mib = &dev->ports[i].mib; + dev->dev_ops->port_init_cnt (dev, i); + + mib->cnt_ptr =0 ; +memset (mib->counters,0 , dev->info->mib_cnt *sizeof (u64)); + } }EXPORT_SYMBOL_GPL (ksz_init_mib_timer);
Signature · 1 line
2.33.0
Re: [RFC Patch net-next v2 7/9] net: dsa: move mib->cnt_ptr reset code to ksz_common.c
Quoted 9 lines · Arun Ramadoss
From: Prasanna Vengateshan <[email protected]>
mib->cnt_ptrresetting is handled in multiple places as part ofport_init_cnt(). Hence movedmib->cnt_ptrcode to ksz common layer and removed from individual product files.Signed-off-by Prasanna Vengateshan <[email protected]>Signed-off-by Arun Ramadoss <[email protected]>---
Re: [RFC Patch net-next v2 7/9] net: dsa: move mib->cnt_ptr reset code to ksz_common.c
In reply to Arun RamadossQuoted 8 lines · Arun Ramadoss
From: Prasanna Vengateshan <[email protected]>
mib->cnt_ptrresetting is handled in multiple places as part ofport_init_cnt(). Hence movedmib->cnt_ptrcode to ksz common layer and removed from individual product files.Signed-off-by Prasanna Vengateshan <[email protected]>Signed-off-by Arun Ramadoss <[email protected]>
Signature · 1 line
Florian
RFC PATCH v2 8/9 net: dsa: microchip: add the phylink get_caps
In reply to Arun RamadossThis patch add the support for phylink_get_caps for ksz8795 and ksz9477 series switch. It updates the struct ksz_switch_chip with the details of the internal phys and xmii interface. Then during the get_caps based on the bits set in the structure, corresponding phy mode is set.
--- drivers/net/dsa/microchip/ksz8795.c | 10 +-- drivers/net/dsa/microchip/ksz9477.c | 10 +++ drivers/net/dsa/microchip/ksz_common.c | 98 ++++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 8 +++ 4 files changed, 117 insertions(+), 9 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +1 -9
@@ -1376,15 +1376,7 @@ static void ksz8_get_caps(struct dsa_switch *ds, int port, {struct ksz_device *dev = ds->priv; -if (port == dev->cpu_port) { -__set_bit (PHY_INTERFACE_MODE_RMII , - config->supported_interfaces); -__set_bit (PHY_INTERFACE_MODE_MII , - config->supported_interfaces); - }else { -__set_bit (PHY_INTERFACE_MODE_INTERNAL , - config->supported_interfaces); - } +ksz_phylink_get_caps (ds, port, config); config->mac_capabilities =MAC_10 |MAC_100 ;
drivers/net/dsa/microchip/ksz9477.c +10 -0
@@ -1097,6 +1097,15 @@ static void ksz9477_phy_errata_setup(struct ksz_device *dev, int port)ksz9477_port_mmd_write (dev, port,0x1c ,0x20 ,0xeeee ); } +static void ksz9477_get_caps (struct dsa_switch *ds,int port, +struct phylink_config *config) +{ +ksz_phylink_get_caps (ds, port, config); + + config->mac_capabilities =MAC_10 |MAC_100 |MAC_1000FD | +MAC_ASYM_PAUSE |MAC_SYM_PAUSE ; +} +static void ksz9477_port_setup (struct ksz_device *dev,int port,bool cpu_port) {struct ksz_port *p = &dev->ports[port];
@@ -1322,6 +1331,7 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { .phy_read = ksz9477_phy_read16, .phy_write = ksz9477_phy_write16, .phylink_mac_link_down = ksz_mac_link_down, + .phylink_get_caps = ksz9477_get_caps, .port_enable = ksz_enable_port, .get_strings = ksz_get_strings, .get_ethtool_stats = ksz_get_ethtool_stats,
drivers/net/dsa/microchip/ksz_common.c +98 -0
182 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.h +8 -0
@@ -14,6 +14,8 @@#include <linux/regmap.h> #include <net/dsa.h> +#define KSZ_MAX_NUM_PORTS 8 +struct vlan_table {u32 table[3 ]; };
@@ -44,6 +46,10 @@ struct ksz_chip_data {const struct ksz_mib_names *mib_names;int mib_cnt;u8 reg_mib_cnt; +bool supports_mii[KSZ_MAX_NUM_PORTS ]; +bool supports_rmii[KSZ_MAX_NUM_PORTS ]; +bool supports_rgmii[KSZ_MAX_NUM_PORTS ]; +bool internal_phy[KSZ_MAX_NUM_PORTS ]; };struct ksz_port {
@@ -182,6 +188,8 @@ void ksz_init_mib_timer(struct ksz_device *dev);void ksz_r_mib_stats64 (struct ksz_device *dev,int port);void ksz_get_stats64 (struct dsa_switch *ds,int port,struct rtnl_link_stats64 *s); +void ksz_phylink_get_caps (struct dsa_switch *ds,int port, +struct phylink_config *config);extern const struct ksz_chip_data ksz_switch_chips[];/* Common DSA access functions */
Signature · 1 line
2.33.0
Re: [RFC Patch net-next v2 8/9] net: dsa: microchip: add the phylink get_caps
Quoted 7 lines · Arun Ramadoss
This patch add the support for
phylink_get_capsfor ksz8795 and ksz9477 series switch. It updates the structksz_switch_chipwith the details of the internal phys and xmii interface. Then during theget_capsbased on the bits set in the structure, corresponding phy mode is set.Signed-off-by Arun Ramadoss <[email protected]>---
Looks good, although I haven't verified the exact compatibility matrix for all switches. Just one comment below.
Quoted 33 lines
drivers/net/dsa/microchip/ksz_common.c +11
-0@@ -179,6 +183,10 @@ const struct ksz_chip_data ksz_switch_chips[] = { .mib_names = ksz9477_mib_names, .mib_cnt = ARRAY_SIZE(ksz9477_mib_names), .reg_mib_cnt = MIB_COUNTER_NUM, + .supports_mii = {false, false, false, false, true}, + .supports_rmii = {false, false, false, false, true}, + .supports_rgmii = {false, false, false, false, true}, + .internal_phy = {true, true, true, false, false}, }, [KSZ8765] = {@@ -193,6 +201,10 @@ const struct ksz_chip_data ksz_switch_chips[] = { .mib_names = ksz9477_mib_names, .mib_cnt = ARRAY_SIZE(ksz9477_mib_names), .reg_mib_cnt = MIB_COUNTER_NUM, + .supports_mii = {false, false, false, false, true}, + .supports_rmii = {false, false, false, false, true}, + .supports_rgmii = {false, false, false, false, true}, + .internal_phy = {true, true, true, true, false}, }, [KSZ8830] = {@@ -206,6 +218,9 @@ const struct ksz_chip_data ksz_switch_chips[] = { .mib_names = ksz88xx_mib_names, .mib_cnt = ARRAY_SIZE(ksz88xx_mib_names), .reg_mib_cnt = MIB_COUNTER_NUM, + .supports_mii = {false, false, true}, + .supports_rmii = {false, false, true}, + .internal_phy = {true, true, false}, }, [KSZ9477] = {
drivers/net/dsa/microchip/ksz_common.c const struct ksz_chip_data ksz_switch_chips[] = { · line 243
Quoted 9 lines
drivers/net/dsa/microchip/ksz_common.c +6
-0@@ -220,6 +235,14 @@ const struct ksz_chip_data ksz_switch_chips[] = { .mib_names = ksz9477_mib_names, .mib_cnt = ARRAY_SIZE(ksz9477_mib_names), .reg_mib_cnt = MIB_COUNTER_NUM, + .supports_mii = {false, false, false, false, + false, true, false}, + .supports_rmii = {false, false, false, false, + false, true, false}, + .supports_rgmii = {false, false, false, false, + false, true, false},
Please fix indentation here and for KSZ9897 and KSZ9567.
Quoted 3 lines
drivers/net/dsa/microchip/ksz_common.c +2
-0+ .internal_phy = {true, true, true, true, + true, false, false}, },
Re: [RFC Patch net-next v2 8/9] net: dsa: microchip: add the phylink get_caps
In reply to Arun RamadossQuoted 6 lines · Arun Ramadoss
This patch add the support for
phylink_get_capsfor ksz8795 and ksz9477 series switch. It updates the structksz_switch_chipwith the details of the internal phys and xmii interface. Then during theget_capsbased on the bits set in the structure, corresponding phy mode is set.Signed-off-by Arun Ramadoss <[email protected]>
Many ways to skin a cat^w report what a given port can do to phylink, I would have probably used a bitmask for each type of interface, but this works as well.
Signature · 1 line
Florian
RFC PATCH v2 9/9 net: dsa: microchip: remove unused members in ksz_device
In reply to Arun RamadossThe name, regs_size and overrides members in struct ksz_device are unused. Hence remove it.
And host_mask is used in only place of ksz8795.c file, which can be replaced by dev->info->cpu_ports
--- drivers/net/dsa/microchip/ksz8795.c | 3 +-- drivers/net/dsa/microchip/ksz_common.h | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +1 -2
@@ -1360,7 +1360,7 @@ static int ksz8_setup(struct dsa_switch *ds)ether_addr_copy (alu.mac, eth_stp_addr); alu.is_static = true; alu.is_override = true; - alu.port_forward = dev->host_mask; + alu.port_forward = dev->info->cpu_ports;ksz8_w_sta_mac_table (dev,0 , &alu);
@@ -1476,7 +1476,6 @@ static int ksz8_switch_init(struct ksz_device *dev) dev->ds->ops = &ksz8_switch_ops; dev->cpu_port =fls (dev->info->cpu_ports) -1 ; - dev->host_mask = dev->info->cpu_ports; dev->phy_port_cnt = dev->info->port_cnt -1 ; dev->port_mask = (BIT (dev->phy_port_cnt) -1 ) | dev->info->cpu_ports;
drivers/net/dsa/microchip/ksz_common.h +0 -4
@@ -73,7 +73,6 @@ struct ksz_port {struct ksz_device {struct dsa_switch *ds;struct ksz_platform_data *pdata; -const char *name;const struct ksz_chip_data *info;struct mutex dev_mutex;/* device access */
@@ -94,7 +93,6 @@ struct ksz_device {int cpu_port;/* port connected to CPU */ int phy_port_cnt;phy_interface_t compat_interface; -u32 regs_size;bool synclko_125;bool synclko_disable;
@@ -106,8 +104,6 @@ struct ksz_device {u16 mirror_rx;u16 mirror_tx;u32 features;/* chip specific features */ -u32 overrides;/* chip functions set by user */ -u16 host_mask;u16 port_mask; };
Signature · 1 line
2.33.0
Re: [RFC Patch net-next v2 9/9] net: dsa: microchip: remove unused members in ksz_device
Quoted 7 lines · Arun Ramadoss
The name,
regs_sizeand overrides members in structksz_deviceare unused. Hence remove it.
Andhost_maskis used in only place ofksz8795.cfile, which can be replaced bydev->info->cpu_portsSigned-off-by Arun Ramadoss <[email protected]>---
Re: [RFC Patch net-next v2 9/9] net: dsa: microchip: remove unused members in ksz_device
In reply to Arun RamadossQuoted 6 lines · Arun Ramadoss
The name,
regs_sizeand overrides members in structksz_deviceare unused. Hence remove it.
Andhost_maskis used in only place ofksz8795.cfile, which can be replaced bydev->info->cpu_portsSigned-off-by Arun Ramadoss <[email protected]>
Signature · 1 line
Florian