net: dsa: microchip: common spi probe for the ksz series switches - part 1
cover net: dsa: microchip: common spi probe for the ksz series switches - part 1
This patch series aims to refactor the ksz_switch_register routine to have the common flow for the ksz series switch. At present ksz8795.c & ksz9477.c have its own dsa_switch_ops and switch detect functionality.
In ksz_switch_register, ksz_dev_ops is assigned based on the function parameter passed by the individual ksz8/ksz9477 switch register function. And then switch detect is performed based on the ksz_dev_ops.detect hook. This patch modifies the ksz_switch_register such a way that switch detect is performed first, based on the chip ksz_dev_ops is assigned to ksz_device structure. It ensures the common flow for the existing as well as LAN937x switches.
In the next series of patch, it will move ksz_dsa_ops and dsa_switch_ops from ksz8795.c and ksz9477.c to ksz_common.c and have the common spi probe all the ksz based switches.
Changes in v1
- Splitted the patch series into two.
- Replaced all occurrence of REG_PORT_STATUS_0 and PORT_FIBER_MODE to KSZ8_PORT_STATUS_0 and KSZ8_PORT_FIBER_MODE.
- Separated the tag protocol and phy read/write patch into two.
- Assigned the DSA_TAG_PROTO_NONE as the default value for get_tag_protocol hook.
- Reduced the indentation level by using the if(!dev->dev_ops->mirror_add).
- Added the stp_ctrl_reg as a member in ksz_chip_data and removed the member in ksz_dev_ops.
- Removed the r_dyn_mac_table, r_sta_mac_table and w_sta_mac_table from the ksz_dev_ops since it is used only in the ksz8795.c.
Changes in RFC v2
- Fixed the compilation issue.
- Reduced the patch set to 15.
Arun Ramadoss (11):
net: dsa: microchip: ksz9477: cleanup the ksz9477_switch_detect
net: dsa: microchip: move switch chip_id detection to ksz_common
net: dsa: microchip: move tag_protocol to ksz_common
net: dsa: microchip: ksz9477: use ksz_read_phy16 & ksz_write_phy16
net: dsa: microchip: move vlan functionality to ksz_common
net: dsa: microchip: move the port mirror to ksz_common
net: dsa: microchip: get P_STP_CTRL in ksz_port_stp_state by
ksz_dev_ops
net: dsa: microchip: update the ksz_phylink_get_caps
net: dsa: microchip: update the ksz_port_mdb_add/del
net: dsa: microchip: update fdb add/del/dump in ksz_common
net: dsa: microchip: move get_phy_flags & mtu to ksz_common
drivers/net/dsa/microchip/ksz8795.c | 233 ++++++++-------- drivers/net/dsa/microchip/ksz8795_reg.h | 16 -- drivers/net/dsa/microchip/ksz9477.c | 181 +++++-------- drivers/net/dsa/microchip/ksz9477_reg.h | 1 - drivers/net/dsa/microchip/ksz_common.c | 342 ++++++++++++++++++------ drivers/net/dsa/microchip/ksz_common.h | 80 +++++- 6 files changed, 517 insertions(+), 336 deletions(-)
base-commit: e8b03391b6a7353368d0d2d6ed2b5f03e0c6112f
Signature · 1 line
2.36.1
PATCH 1/11 net: dsa: microchip: ksz9477: cleanup the ksz9477_switch_detect
The ksz9477_switch_detect performs the detecting the chip id from the location 0x00 and also check gigabit compatibility check & number of ports based on the register global_options0. To prepare the common ksz switch detect function, routine other than chip id read is moved to ksz9477_switch_init.
--- drivers/net/dsa/microchip/ksz9477.c | 48 +++++++++++++---------------- 1 file changed, 22 insertions(+), 26 deletions(-)
drivers/net/dsa/microchip/ksz9477.c +22 -26
@@ -1362,12 +1362,30 @@ static u32 ksz9477_get_port_addr(int port, int offset)static int ksz9477_switch_detect (struct ksz_device *dev) { -u8 data8; -u8 id_hi; -u8 id_lo;u32 id32;int ret; +/* read chip id */ + ret =ksz_read32 (dev,REG_CHIP_ID0__1 , &id32); +if (ret) +return ret; + +dev_dbg (dev->dev,"Switch detect: ID=%08x\n" , id32); + + dev->chip_id = id32 &0x00FFFF00 ; + +return 0 ; +} + +static int ksz9477_switch_init (struct ksz_device *dev) +{ +u8 data8; +int ret; + + dev->ds->ops = &ksz9477_switch_ops; + + dev->port_mask = (1 << dev->info->port_cnt) -1 ; +/* turn off SPI DO Edge select */ ret =ksz_read8 (dev,REG_SW_GLOBAL_SERIAL_CTRL_0 , &data8);if (ret)
@@ -1378,10 +1396,6 @@ static int ksz9477_switch_detect(struct ksz_device *dev)if (ret)return ret; -/* read chip id */ - ret =ksz_read32 (dev,REG_CHIP_ID0__1 , &id32); -if (ret) -return ret; ret =ksz_read8 (dev,REG_GLOBAL_OPTIONS , &data8);if (ret)return ret;
@@ -1392,10 +1406,7 @@ static int ksz9477_switch_detect(struct ksz_device *dev)/* Default capability is gigabit capable. */ dev->features =GBIT_SUPPORT ; -dev_dbg (dev->dev,"Switch detect: ID=%08x%02x\n" , id32, data8); - id_hi = (u8)(id32 >>16 ); - id_lo = (u8)(id32 >>8 ); -if ((id_lo &0xf ) ==3 ) { +if (dev->chip_id ==KSZ9893_CHIP_ID ) {/* Chip is from KSZ9893 design. */ dev_info (dev->dev,"Found KSZ9893\n" ); dev->features |=IS_9893 ;
@@ -1413,21 +1424,6 @@ static int ksz9477_switch_detect(struct ksz_device *dev)if (!(data8 &SW_GIGABIT_ABLE )) dev->features &= ~GBIT_SUPPORT ; } - -/* Change chip id to known ones so it can be matched against them. */ - id32 = (id_hi <<16 ) | (id_lo <<8 ); - - dev->chip_id = id32; - -return 0 ; -} - -static int ksz9477_switch_init (struct ksz_device *dev) -{ - dev->ds->ops = &ksz9477_switch_ops; - - dev->port_mask = (1 << dev->info->port_cnt) -1 ; -return 0 ; }
Signature · 1 line
2.36.1
PATCH 2/11 net: dsa: microchip: move switch chip_id detection to ksz_common
In reply to Arun RamadossKSZ87xx and KSZ88xx have chip_id representation at reg location 0. And KSZ9477 compatible switch and LAN937x switch have same chip_id detection at location 0x01 and 0x02. To have the common switch detect functionality for ksz switches, ksz_switch_detect function is introduced.
--- drivers/net/dsa/microchip/ksz8795.c | 48 +-------------- drivers/net/dsa/microchip/ksz8795_reg.h | 16 ----- drivers/net/dsa/microchip/ksz9477.c | 21 ------- drivers/net/dsa/microchip/ksz9477_reg.h | 1 - drivers/net/dsa/microchip/ksz_common.c | 78 +++++++++++++++++++++++-- drivers/net/dsa/microchip/ksz_common.h | 19 +++++- 6 files changed, 93 insertions(+), 90 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +1 -47
@@ -1272,7 +1272,7 @@ static void ksz8_config_cpu_port(struct dsa_switch *ds)continue ;if (!ksz_is_ksz88x3 (dev)) {ksz_pread8 (dev, i, regs[P_REMOTE_STATUS ], &remote); -if (remote &PORT_FIBER_MODE ) +if (remote &KSZ8_PORT_FIBER_MODE ) p->fiber =1 ; }if (p->fiber)
@@ -1424,51 +1424,6 @@ static u32 ksz8_get_port_addr(int port, int offset)return PORT_CTRL_ADDR (port, offset); } -static int ksz8_switch_detect (struct ksz_device *dev) -{ -u8 id1, id2; -u16 id16; -int ret; - -/* read chip id */ - ret =ksz_read16 (dev,REG_CHIP_ID0 , &id16); -if (ret) -return ret; - - id1 = id16 >>8 ; - id2 = id16 &SW_CHIP_ID_M ; - -switch (id1) { -case KSZ87_FAMILY_ID : -if ((id2 !=CHIP_ID_94 && id2 !=CHIP_ID_95 )) -return -ENODEV ; - -if (id2 ==CHIP_ID_95 ) { -u8 val; - - id2 =0x95 ; -ksz_read8 (dev,REG_PORT_STATUS_0 , &val); -if (val &PORT_FIBER_MODE ) - id2 =0x65 ; - }else if (id2 ==CHIP_ID_94 ) { - id2 =0x94 ; - } -break ; -case KSZ88_FAMILY_ID : -if (id2 !=CHIP_ID_63 ) -return -ENODEV ; -break ; -default : -dev_err (dev->dev,"invalid family id: %d\n" , id1); -return -ENODEV ; - } - id16 &= ~0xff ; - id16 |= id2; - dev->chip_id = id16; - -return 0 ; -} -static int ksz8_switch_init (struct ksz_device *dev) {struct ksz8 *ksz8 = dev->priv;
@@ -1522,7 +1477,6 @@ static const struct ksz_dev_ops ksz8_dev_ops = { .freeze_mib = ksz8_freeze_mib, .port_init_cnt = ksz8_port_init_cnt, .shutdown = ksz8_reset_switch, - .detect = ksz8_switch_detect, .init = ksz8_switch_init, .exit = ksz8_switch_exit, };
drivers/net/dsa/microchip/ksz8795_reg.h +0 -16
@@ -14,23 +14,10 @@#define KS_PRIO_M 0x3#define KS_PRIO_S 2 -#define REG_CHIP_ID0 0x00 - -#define KSZ87_FAMILY_ID 0x87 -#define KSZ88_FAMILY_ID 0x88 - -#define REG_CHIP_ID1 0x01 - -#define SW_CHIP_ID_M 0xF0 -#define SW_CHIP_ID_S 4#define SW_REVISION_M 0x0E#define SW_REVISION_S 1#define SW_START 0x01 -#define CHIP_ID_94 0x60 -#define CHIP_ID_95 0x90 -#define CHIP_ID_63 0x30 -#define KSZ8863_REG_SW_RESET 0x43#define KSZ8863_GLOBAL_SOFTWARE_RESET BIT(4)
@@ -217,8 +204,6 @@#define REG_PORT_4_STATUS_0 0x48/* For KSZ8765. */ -#define PORT_FIBER_MODE BIT(7) -#define PORT_REMOTE_ASYM_PAUSE BIT(5)#define PORT_REMOTE_SYM_PAUSE BIT(4)#define PORT_REMOTE_100BTX_FD BIT(3)
@@ -322,7 +307,6 @@#define REG_PORT_CTRL_5 0x05 -#define REG_PORT_STATUS_0 0x08#define REG_PORT_STATUS_1 0x09#define REG_PORT_LINK_MD_CTRL 0x0A#define REG_PORT_LINK_MD_RESULT 0x0B
drivers/net/dsa/microchip/ksz9477.c +0 -21
@@ -1360,23 +1360,6 @@ static u32 ksz9477_get_port_addr(int port, int offset)return PORT_CTRL_ADDR (port, offset); } -static int ksz9477_switch_detect (struct ksz_device *dev) -{ -u32 id32; -int ret; - -/* read chip id */ - ret =ksz_read32 (dev,REG_CHIP_ID0__1 , &id32); -if (ret) -return ret; - -dev_dbg (dev->dev,"Switch detect: ID=%08x\n" , id32); - - dev->chip_id = id32 &0x00FFFF00 ; - -return 0 ; -} -static int ksz9477_switch_init (struct ksz_device *dev) {u8 data8;
@@ -1407,8 +1390,6 @@ static int ksz9477_switch_init(struct ksz_device *dev) dev->features =GBIT_SUPPORT ;if (dev->chip_id ==KSZ9893_CHIP_ID ) { -/* Chip is from KSZ9893 design. */ -dev_info (dev->dev,"Found KSZ9893\n" ); dev->features |=IS_9893 ;/* Chip does not support gigabit. */
@@ -1416,7 +1397,6 @@ static int ksz9477_switch_init(struct ksz_device *dev) dev->features &= ~GBIT_SUPPORT ; dev->phy_port_cnt =2 ; }else { -dev_info (dev->dev,"Found KSZ9477 or compatible\n" );/* Chip uses new XMII register definitions. */ dev->features |=NEW_XMII ;
@@ -1443,7 +1423,6 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { .freeze_mib = ksz9477_freeze_mib, .port_init_cnt = ksz9477_port_init_cnt, .shutdown = ksz9477_reset_switch, - .detect = ksz9477_switch_detect, .init = ksz9477_switch_init, .exit = ksz9477_switch_exit, };
drivers/net/dsa/microchip/ksz9477_reg.h +0 -1
@@ -25,7 +25,6 @@#define REG_CHIP_ID2__1 0x0002 -#define CHIP_ID_63 0x63#define CHIP_ID_66 0x66#define CHIP_ID_67 0x67#define CHIP_ID_77 0x77
drivers/net/dsa/microchip/ksz_common.c +74 -4
100 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.h +18 -1
@@ -90,6 +90,7 @@ struct ksz_device {/* chip specific data */ u32 chip_id; +u8 chip_rev;int cpu_port;/* port connected to CPU */ int phy_port_cnt;phy_interface_t compat_interface;
@@ -182,7 +183,6 @@ struct ksz_dev_ops {void (*freeze_mib)(struct ksz_device *dev,int port,bool freeze);void (*port_init_cnt)(struct ksz_device *dev,int port);int (*shutdown)(struct ksz_device *dev); -int (*detect)(struct ksz_device *dev);int (*init)(struct ksz_device *dev);void (*exit)(struct ksz_device *dev); };
@@ -353,6 +353,23 @@ static inline void ksz_regmap_unlock(void *__mtx)#define PORT_RX_ENABLE BIT(1)#define PORT_LEARN_DISABLE BIT(0) +/* Switch ID Defines */ +#define REG_CHIP_ID0 0x00 + +#define SW_FAMILY_ID_M GENMASK(15, 8) +#define KSZ87_FAMILY_ID 0x87 +#define KSZ88_FAMILY_ID 0x88 + +#define KSZ8_PORT_STATUS_0 0x08 +#define KSZ8_PORT_FIBER_MODE BIT(7) + +#define SW_CHIP_ID_M GENMASK(7, 4) +#define KSZ87_CHIP_ID_94 0x6 +#define KSZ87_CHIP_ID_95 0x9 +#define KSZ88_CHIP_ID_63 0x3 + +#define SW_REV_ID_M GENMASK(7, 4) +/* Regmap tables generation */ #define KSZ_SPI_OP_RD 3#define KSZ_SPI_OP_WR 2
Signature · 1 line
2.36.1
PATCH 3/11 net: dsa: microchip: move tag_protocol to ksz_common
In reply to Arun RamadossThis patch move the dsa hook get_tag_protocol to ksz_common file. And the tag_protocol is returned based on the dev->chip_id.
--- drivers/net/dsa/microchip/ksz8795.c | 13 +------------ drivers/net/dsa/microchip/ksz9477.c | 14 +------------- drivers/net/dsa/microchip/ksz_common.c | 24 ++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 2 ++ 4 files changed, 28 insertions(+), 25 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +1 -12
@@ -898,17 +898,6 @@ static void ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val) } } -static enum dsa_tag_protocol ksz8_get_tag_protocol (struct dsa_switch *ds, -int port, -enum dsa_tag_protocol mp) -{ -struct ksz_device *dev = ds->priv; - -/* ksz88x3 uses the same tag schema as KSZ9893 */ -return ksz_is_ksz88x3 (dev) ? -DSA_TAG_PROTO_KSZ9893 :DSA_TAG_PROTO_KSZ8795 ; -} -static u32 ksz8_sw_get_phy_flags (struct dsa_switch *ds,int port) {/* Silicon Errata Sheet (DS80000830A):
@@ -1394,7 +1383,7 @@ static void ksz8_get_caps(struct dsa_switch *ds, int port, }static const struct dsa_switch_ops ksz8_switch_ops = { - .get_tag_protocol = ksz8_get_tag_protocol, + .get_tag_protocol = ksz_get_tag_protocol, .get_phy_flags = ksz8_sw_get_phy_flags, .setup = ksz8_setup, .phy_read = ksz_phy_read16,
drivers/net/dsa/microchip/ksz9477.c +1 -13
@@ -276,18 +276,6 @@ static void ksz9477_port_init_cnt(struct ksz_device *dev, int port)mutex_unlock (&mib->cnt_mutex); } -static enum dsa_tag_protocol ksz9477_get_tag_protocol (struct dsa_switch *ds, -int port, -enum dsa_tag_protocol mp) -{ -enum dsa_tag_protocol proto =DSA_TAG_PROTO_KSZ9477 ; -struct ksz_device *dev = ds->priv; - -if (dev->features &IS_9893 ) - proto =DSA_TAG_PROTO_KSZ9893 ; -return proto; -} -static int ksz9477_phy_read16 (struct dsa_switch *ds,int addr,int reg) {struct ksz_device *dev = ds->priv;
@@ -1326,7 +1314,7 @@ static int ksz9477_setup(struct dsa_switch *ds) }static const struct dsa_switch_ops ksz9477_switch_ops = { - .get_tag_protocol = ksz9477_get_tag_protocol, + .get_tag_protocol = ksz_get_tag_protocol, .setup = ksz9477_setup, .phy_read = ksz9477_phy_read16, .phy_write = ksz9477_phy_write16,
drivers/net/dsa/microchip/ksz_common.c +24 -0
@@ -930,6 +930,30 @@ void ksz_port_stp_state_set(struct dsa_switch *ds, int port, }EXPORT_SYMBOL_GPL (ksz_port_stp_state_set); +enum dsa_tag_protocol ksz_get_tag_protocol (struct dsa_switch *ds, +int port,enum dsa_tag_protocol mp) +{ +struct ksz_device *dev = ds->priv; +enum dsa_tag_protocol proto =DSA_TAG_PROTO_NONE ; + +if (dev->chip_id ==KSZ8795_CHIP_ID || + dev->chip_id ==KSZ8794_CHIP_ID || + dev->chip_id ==KSZ8765_CHIP_ID ) + proto =DSA_TAG_PROTO_KSZ8795 ; + +if (dev->chip_id ==KSZ8830_CHIP_ID || + dev->chip_id ==KSZ9893_CHIP_ID ) + proto =DSA_TAG_PROTO_KSZ9893 ; + +if (dev->chip_id ==KSZ9477_CHIP_ID || + dev->chip_id ==KSZ9897_CHIP_ID || + dev->chip_id ==KSZ9567_CHIP_ID ) + proto =DSA_TAG_PROTO_KSZ9477 ; + +return proto; +} +EXPORT_SYMBOL_GPL (ksz_get_tag_protocol); +static int ksz_switch_detect (struct ksz_device *dev) {u8 id1, id2;
drivers/net/dsa/microchip/ksz_common.h +2 -0
@@ -231,6 +231,8 @@ int ksz_port_mdb_del(struct dsa_switch *ds, int port,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); +enum dsa_tag_protocol ksz_get_tag_protocol (struct dsa_switch *ds, +int port,enum dsa_tag_protocol mp);/* Common register access functions */
Signature · 1 line
2.36.1
PATCH 4/11 net: dsa: microchip: ksz9477: use ksz_read_phy16 & ksz_write_phy16
In reply to Arun Ramadossksz8795 and ksz9477 implementation on phy read/write hooks are different. This patch modifies the ksz9477 implementation same as ksz8795 by updating the ksz9477_dev_ops structure.
--- drivers/net/dsa/microchip/ksz9477.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/net/dsa/microchip/ksz9477.c +10 -13
@@ -276,9 +276,8 @@ static void ksz9477_port_init_cnt(struct ksz_device *dev, int port)mutex_unlock (&mib->cnt_mutex); } -static int ksz9477_phy_read16 (struct dsa_switch *ds,int addr,int reg) +static void ksz9477_r_phy (struct ksz_device *dev,u16 addr,u16 reg,u16 *data) { -struct ksz_device *dev = ds->priv;u16 val =0xffff ;/* No real PHY after this. Simulate the PHY.
@@ -323,24 +322,20 @@ static int ksz9477_phy_read16(struct dsa_switch *ds, int addr, int reg)ksz_pread16 (dev, addr,0x100 + (reg <<1 ), &val); } -return val; + *data = val; } -static int ksz9477_phy_write16 (struct dsa_switch *ds,int addr,int reg, -u16 val) +static void ksz9477_w_phy (struct ksz_device *dev,u16 addr,u16 reg,u16 val) { -struct ksz_device *dev = ds->priv; -/* No real PHY after this. */ if (addr >= dev->phy_port_cnt) -return 0 ; +return ;/* No gigabit support. Do not write to this register. */ if (!(dev->features &GBIT_SUPPORT ) && reg ==MII_CTRL1000 ) -return 0 ; -ksz_pwrite16 (dev, addr,0x100 + (reg <<1 ), val); +return ; -return 0 ; +ksz_pwrite16 (dev, addr,0x100 + (reg <<1 ), val); } static void ksz9477_cfg_port_member(struct ksz_device *dev, int port,
@@ -1316,8 +1311,8 @@ static int ksz9477_setup(struct dsa_switch *ds)static const struct dsa_switch_ops ksz9477_switch_ops = { .get_tag_protocol = ksz_get_tag_protocol, .setup = ksz9477_setup, - .phy_read = ksz9477_phy_read16, - .phy_write = ksz9477_phy_write16, + .phy_read = ksz_phy_read16, + .phy_write = ksz_phy_write16, .phylink_mac_link_down = ksz_mac_link_down, .phylink_get_caps = ksz9477_get_caps, .port_enable = ksz_enable_port,
@@ -1405,6 +1400,8 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { .cfg_port_member = ksz9477_cfg_port_member, .flush_dyn_mac_table = ksz9477_flush_dyn_mac_table, .port_setup = ksz9477_port_setup, + .r_phy = ksz9477_r_phy, + .w_phy = ksz9477_w_phy, .r_mib_cnt = ksz9477_r_mib_cnt, .r_mib_pkt = ksz9477_r_mib_pkt, .r_mib_stat64 = ksz_r_mib_stats64,
Signature · 1 line
2.36.1
PATCH 5/11 net: dsa: microchip: move vlan functionality to ksz_common
In reply to Arun RamadossThis patch moves the vlan dsa_switch_ops such as vlan_add, vlan_del and vlan_filtering from the individual files ksz8795.c, ksz9477.c to ksz_common.c file.
--- drivers/net/dsa/microchip/ksz8795.c | 19 +++++++------ drivers/net/dsa/microchip/ksz9477.c | 19 +++++++------ drivers/net/dsa/microchip/ksz_common.c | 37 ++++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 14 ++++++++++ 4 files changed, 69 insertions(+), 20 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +9 -10
@@ -958,11 +958,9 @@ static void ksz8_flush_dyn_mac_table(struct ksz_device *dev, int port) } } -static int ksz8_port_vlan_filtering (struct dsa_switch *ds,int port,bool flag, +static int ksz8_port_vlan_filtering (struct ksz_device *dev,int port,bool flag,struct netlink_ext_ack *extack) { -struct ksz_device *dev = ds->priv; -if (ksz_is_ksz88x3 (dev))return -ENOTSUPP ;
@@ -987,12 +985,11 @@ static void ksz8_port_enable_pvid(struct ksz_device *dev, int port, bool state) } } -static int ksz8_port_vlan_add (struct dsa_switch *ds,int port, +static int ksz8_port_vlan_add (struct ksz_device *dev,int port,const struct switchdev_obj_port_vlan *vlan,struct netlink_ext_ack *extack) {bool untagged = vlan->flags &BRIDGE_VLAN_INFO_UNTAGGED ; -struct ksz_device *dev = ds->priv;struct ksz_port *p = &dev->ports[port];u16 data, new_pvid =0 ;u8 fid, member, valid;
@@ -1060,10 +1057,9 @@ static int ksz8_port_vlan_add(struct dsa_switch *ds, int port,return 0 ; } -static int ksz8_port_vlan_del (struct dsa_switch *ds,int port, +static int ksz8_port_vlan_del (struct ksz_device *dev,int port,const struct switchdev_obj_port_vlan *vlan) { -struct ksz_device *dev = ds->priv;u16 data, pvid;u8 fid, member, valid;
@@ -1398,9 +1394,9 @@ static const struct dsa_switch_ops ksz8_switch_ops = { .port_bridge_leave = ksz_port_bridge_leave, .port_stp_state_set = ksz8_port_stp_state_set, .port_fast_age = ksz_port_fast_age, - .port_vlan_filtering = ksz8_port_vlan_filtering, - .port_vlan_add = ksz8_port_vlan_add, - .port_vlan_del = ksz8_port_vlan_del, + .port_vlan_filtering = ksz_port_vlan_filtering, + .port_vlan_add = ksz_port_vlan_add, + .port_vlan_del = ksz_port_vlan_del, .port_fdb_dump = ksz_port_fdb_dump, .port_mdb_add = ksz_port_mdb_add, .port_mdb_del = ksz_port_mdb_del,
@@ -1465,6 +1461,9 @@ static const struct ksz_dev_ops ksz8_dev_ops = { .r_mib_pkt = ksz8_r_mib_pkt, .freeze_mib = ksz8_freeze_mib, .port_init_cnt = ksz8_port_init_cnt, + .vlan_filtering = ksz8_port_vlan_filtering, + .vlan_add = ksz8_port_vlan_add, + .vlan_del = ksz8_port_vlan_del, .shutdown = ksz8_reset_switch, .init = ksz8_switch_init, .exit = ksz8_switch_exit,
drivers/net/dsa/microchip/ksz9477.c +9 -10
@@ -372,12 +372,10 @@ static void ksz9477_flush_dyn_mac_table(struct ksz_device *dev, int port) } } -static int ksz9477_port_vlan_filtering (struct dsa_switch *ds,int port, +static int ksz9477_port_vlan_filtering (struct ksz_device *dev,int port,bool flag,struct netlink_ext_ack *extack) { -struct ksz_device *dev = ds->priv; -if (flag) {ksz_port_cfg (dev, port,REG_PORT_LUE_CTRL ,PORT_VLAN_LOOKUP_VID_0 , true);
@@ -391,11 +389,10 @@ static int ksz9477_port_vlan_filtering(struct dsa_switch *ds, int port,return 0 ; } -static int ksz9477_port_vlan_add (struct dsa_switch *ds,int port, +static int ksz9477_port_vlan_add (struct ksz_device *dev,int port,const struct switchdev_obj_port_vlan *vlan,struct netlink_ext_ack *extack) { -struct ksz_device *dev = ds->priv;u32 vlan_table[3 ];bool untagged = vlan->flags &BRIDGE_VLAN_INFO_UNTAGGED ;int err;
@@ -428,10 +425,9 @@ static int ksz9477_port_vlan_add(struct dsa_switch *ds, int port,return 0 ; } -static int ksz9477_port_vlan_del (struct dsa_switch *ds,int port, +static int ksz9477_port_vlan_del (struct ksz_device *dev,int port,const struct switchdev_obj_port_vlan *vlan) { -struct ksz_device *dev = ds->priv;bool untagged = vlan->flags &BRIDGE_VLAN_INFO_UNTAGGED ;u32 vlan_table[3 ];u16 pvid;
@@ -1323,9 +1319,9 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { .port_bridge_leave = ksz_port_bridge_leave, .port_stp_state_set = ksz9477_port_stp_state_set, .port_fast_age = ksz_port_fast_age, - .port_vlan_filtering = ksz9477_port_vlan_filtering, - .port_vlan_add = ksz9477_port_vlan_add, - .port_vlan_del = ksz9477_port_vlan_del, + .port_vlan_filtering = ksz_port_vlan_filtering, + .port_vlan_add = ksz_port_vlan_add, + .port_vlan_del = ksz_port_vlan_del, .port_fdb_dump = ksz9477_port_fdb_dump, .port_fdb_add = ksz9477_port_fdb_add, .port_fdb_del = ksz9477_port_fdb_del,
@@ -1407,6 +1403,9 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { .r_mib_stat64 = ksz_r_mib_stats64, .freeze_mib = ksz9477_freeze_mib, .port_init_cnt = ksz9477_port_init_cnt, + .vlan_filtering = ksz9477_port_vlan_filtering, + .vlan_add = ksz9477_port_vlan_add, + .vlan_del = ksz9477_port_vlan_del, .shutdown = ksz9477_reset_switch, .init = ksz9477_switch_init, .exit = ksz9477_switch_exit,
drivers/net/dsa/microchip/ksz_common.c +37 -0
@@ -954,6 +954,43 @@ enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds, }EXPORT_SYMBOL_GPL (ksz_get_tag_protocol); +int ksz_port_vlan_filtering (struct dsa_switch *ds,int port, +bool flag,struct netlink_ext_ack *extack) +{ +struct ksz_device *dev = ds->priv; + +if (!dev->dev_ops->vlan_filtering) +return -EOPNOTSUPP ; + +return dev->dev_ops->vlan_filtering (dev, port, flag, extack); +} +EXPORT_SYMBOL_GPL (ksz_port_vlan_filtering); + +int ksz_port_vlan_add (struct dsa_switch *ds,int port, +const struct switchdev_obj_port_vlan *vlan, +struct netlink_ext_ack *extack) +{ +struct ksz_device *dev = ds->priv; + +if (!dev->dev_ops->vlan_add) +return -EOPNOTSUPP ; + +return dev->dev_ops->vlan_add (dev, port, vlan, extack); +} +EXPORT_SYMBOL_GPL (ksz_port_vlan_add); + +int ksz_port_vlan_del (struct dsa_switch *ds,int port, +const struct switchdev_obj_port_vlan *vlan) +{ +struct ksz_device *dev = ds->priv; + +if (!dev->dev_ops->vlan_del) +return -EOPNOTSUPP ; + +return dev->dev_ops->vlan_del (dev, port, vlan); +} +EXPORT_SYMBOL_GPL (ksz_port_vlan_del); +static int ksz_switch_detect (struct ksz_device *dev) {u8 id1, id2;
drivers/net/dsa/microchip/ksz_common.h +14 -0
@@ -180,6 +180,13 @@ struct ksz_dev_ops {void (*r_mib_pkt)(struct ksz_device *dev,int port,u16 addr,u64 *dropped,u64 *cnt);void (*r_mib_stat64)(struct ksz_device *dev,int port); +int (*vlan_filtering)(struct ksz_device *dev,int port, +bool flag,struct netlink_ext_ack *extack); +int (*vlan_add)(struct ksz_device *dev,int port, +const struct switchdev_obj_port_vlan *vlan, +struct netlink_ext_ack *extack); +int (*vlan_del)(struct ksz_device *dev,int port, +const struct switchdev_obj_port_vlan *vlan);void (*freeze_mib)(struct ksz_device *dev,int port,bool freeze);void (*port_init_cnt)(struct ksz_device *dev,int port);int (*shutdown)(struct ksz_device *dev);
@@ -233,6 +240,13 @@ void ksz_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *buf);enum dsa_tag_protocol ksz_get_tag_protocol (struct dsa_switch *ds,int port,enum dsa_tag_protocol mp); +int ksz_port_vlan_filtering (struct dsa_switch *ds,int port, +bool flag,struct netlink_ext_ack *extack); +int ksz_port_vlan_add (struct dsa_switch *ds,int port, +const struct switchdev_obj_port_vlan *vlan, +struct netlink_ext_ack *extack); +int ksz_port_vlan_del (struct dsa_switch *ds,int port, +const struct switchdev_obj_port_vlan *vlan);/* Common register access functions */
Signature · 1 line
2.36.1
PATCH 6/11 net: dsa: microchip: move the port mirror to ksz_common
In reply to Arun RamadossThis patch updates the common port mirror add/del dsa_switch_ops in ksz_common.c. The individual switches implementation is executed based on the ksz_dev_ops function pointers.
--- drivers/net/dsa/microchip/ksz8795.c | 13 ++++++------- drivers/net/dsa/microchip/ksz9477.c | 12 ++++++------ drivers/net/dsa/microchip/ksz_common.c | 23 +++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 10 ++++++++++ 4 files changed, 45 insertions(+), 13 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +6 -7
@@ -1089,12 +1089,10 @@ static int ksz8_port_vlan_del(struct ksz_device *dev, int port,return 0 ; } -static int ksz8_port_mirror_add (struct dsa_switch *ds,int port, +static int ksz8_port_mirror_add (struct ksz_device *dev,int port,struct dsa_mall_mirror_tc_entry *mirror,bool ingress,struct netlink_ext_ack *extack) { -struct ksz_device *dev = ds->priv; -if (ingress) {ksz_port_cfg (dev, port,P_MIRROR_CTRL ,PORT_MIRROR_RX , true); dev->mirror_rx |=BIT (port);
@@ -1113,10 +1111,9 @@ static int ksz8_port_mirror_add(struct dsa_switch *ds, int port,return 0 ; } -static void ksz8_port_mirror_del (struct dsa_switch *ds,int port, +static void ksz8_port_mirror_del (struct ksz_device *dev,int port,struct dsa_mall_mirror_tc_entry *mirror) { -struct ksz_device *dev = ds->priv;u8 data;if (mirror->ingress) {
@@ -1400,8 +1397,8 @@ static const struct dsa_switch_ops ksz8_switch_ops = { .port_fdb_dump = ksz_port_fdb_dump, .port_mdb_add = ksz_port_mdb_add, .port_mdb_del = ksz_port_mdb_del, - .port_mirror_add = ksz8_port_mirror_add, - .port_mirror_del = ksz8_port_mirror_del, + .port_mirror_add = ksz_port_mirror_add, + .port_mirror_del = ksz_port_mirror_del, };static u32 ksz8_get_port_addr (int port,int offset)
@@ -1464,6 +1461,8 @@ static const struct ksz_dev_ops ksz8_dev_ops = { .vlan_filtering = ksz8_port_vlan_filtering, .vlan_add = ksz8_port_vlan_add, .vlan_del = ksz8_port_vlan_del, + .mirror_add = ksz8_port_mirror_add, + .mirror_del = ksz8_port_mirror_del, .shutdown = ksz8_reset_switch, .init = ksz8_switch_init, .exit = ksz8_switch_exit,
drivers/net/dsa/microchip/ksz9477.c +6 -6
@@ -811,11 +811,10 @@ static int ksz9477_port_mdb_del(struct dsa_switch *ds, int port,return ret; } -static int ksz9477_port_mirror_add (struct dsa_switch *ds,int port, +static int ksz9477_port_mirror_add (struct ksz_device *dev,int port,struct dsa_mall_mirror_tc_entry *mirror,bool ingress,struct netlink_ext_ack *extack) { -struct ksz_device *dev = ds->priv;u8 data;int p;
@@ -851,10 +850,9 @@ static int ksz9477_port_mirror_add(struct dsa_switch *ds, int port,return 0 ; } -static void ksz9477_port_mirror_del (struct dsa_switch *ds,int port, +static void ksz9477_port_mirror_del (struct ksz_device *dev,int port,struct dsa_mall_mirror_tc_entry *mirror) { -struct ksz_device *dev = ds->priv;bool in_use = false;u8 data;int p;
@@ -1327,8 +1325,8 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { .port_fdb_del = ksz9477_port_fdb_del, .port_mdb_add = ksz9477_port_mdb_add, .port_mdb_del = ksz9477_port_mdb_del, - .port_mirror_add = ksz9477_port_mirror_add, - .port_mirror_del = ksz9477_port_mirror_del, + .port_mirror_add = ksz_port_mirror_add, + .port_mirror_del = ksz_port_mirror_del, .get_stats64 = ksz_get_stats64, .port_change_mtu = ksz9477_change_mtu, .port_max_mtu = ksz9477_max_mtu,
@@ -1406,6 +1404,8 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { .vlan_filtering = ksz9477_port_vlan_filtering, .vlan_add = ksz9477_port_vlan_add, .vlan_del = ksz9477_port_vlan_del, + .mirror_add = ksz9477_port_mirror_add, + .mirror_del = ksz9477_port_mirror_del, .shutdown = ksz9477_reset_switch, .init = ksz9477_switch_init, .exit = ksz9477_switch_exit,
drivers/net/dsa/microchip/ksz_common.c +23 -0
@@ -991,6 +991,29 @@ int ksz_port_vlan_del(struct dsa_switch *ds, int port, }EXPORT_SYMBOL_GPL (ksz_port_vlan_del); +int ksz_port_mirror_add (struct dsa_switch *ds,int port, +struct dsa_mall_mirror_tc_entry *mirror, +bool ingress,struct netlink_ext_ack *extack) +{ +struct ksz_device *dev = ds->priv; + +if (!dev->dev_ops->mirror_add) +return -EOPNOTSUPP ; + +return dev->dev_ops->mirror_add (dev, port, mirror, ingress, extack); +} +EXPORT_SYMBOL_GPL (ksz_port_mirror_add); + +void ksz_port_mirror_del (struct dsa_switch *ds,int port, +struct dsa_mall_mirror_tc_entry *mirror) +{ +struct ksz_device *dev = ds->priv; + +if (dev->dev_ops->mirror_del) + dev->dev_ops->mirror_del (dev, port, mirror); +} +EXPORT_SYMBOL_GPL (ksz_port_mirror_del); +static int ksz_switch_detect (struct ksz_device *dev) {u8 id1, id2;
drivers/net/dsa/microchip/ksz_common.h +10 -0
@@ -187,6 +187,11 @@ struct ksz_dev_ops { struct netlink_ext_ack *extack);int (*vlan_del)(struct ksz_device *dev,int port,const struct switchdev_obj_port_vlan *vlan); +int (*mirror_add)(struct ksz_device *dev,int port, +struct dsa_mall_mirror_tc_entry *mirror, +bool ingress,struct netlink_ext_ack *extack); +void (*mirror_del)(struct ksz_device *dev,int port, +struct dsa_mall_mirror_tc_entry *mirror);void (*freeze_mib)(struct ksz_device *dev,int port,bool freeze);void (*port_init_cnt)(struct ksz_device *dev,int port);int (*shutdown)(struct ksz_device *dev);
@@ -247,6 +252,11 @@ int ksz_port_vlan_add(struct dsa_switch *ds, int port, struct netlink_ext_ack *extack);int ksz_port_vlan_del (struct dsa_switch *ds,int port,const struct switchdev_obj_port_vlan *vlan); +int ksz_port_mirror_add (struct dsa_switch *ds,int port, +struct dsa_mall_mirror_tc_entry *mirror, +bool ingress,struct netlink_ext_ack *extack); +void ksz_port_mirror_del (struct dsa_switch *ds,int port, +struct dsa_mall_mirror_tc_entry *mirror);/* Common register access functions */
Signature · 1 line
2.36.1
Re: [Patch net-next 06/11] net: dsa: microchip: move the port mirror to ksz_common
Quoted 6 lines · Arun Ramadoss
This patch updates the common port mirror add/del
dsa_switch_opsinksz_common.c. The individual switches implementation is executed based on theksz_dev_opsfunction pointers.Signed-off-by Arun Ramadoss <[email protected]>Reviewed-by Vladimir Oltean <[email protected]>
Signature · 1 line
Florian
PATCH 7/11 net: dsa: microchip: get P_STP_CTRL in ksz_port_stp_state by ksz_dev_ops
In reply to Arun RamadossAt present, P_STP_CTRL register value is passed as parameter to ksz_port_stp_state from the individual dsa_switch_ops hooks. This patch update the function to retrieve the register value through the ksz_chip_data member.
And add the static to ksz_update_port_member since it is not called outside the ksz_common.
--- drivers/net/dsa/microchip/ksz8795.c | 9 ++------- drivers/net/dsa/microchip/ksz9477.c | 10 ++-------- drivers/net/dsa/microchip/ksz_common.c | 22 ++++++++++++++++++---- drivers/net/dsa/microchip/ksz_common.h | 5 ++--- 4 files changed, 24 insertions(+), 22 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +2 -7
@@ -920,11 +920,6 @@ static void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member)ksz_pwrite8 (dev, port,P_MIRROR_CTRL , data); } -static void ksz8_port_stp_state_set (struct dsa_switch *ds,int port,u8 state) -{ -ksz_port_stp_state_set (ds, port, state,P_STP_CTRL ); -} -static void ksz8_flush_dyn_mac_table (struct ksz_device *dev,int port) {u8 learn[DSA_MAX_PORTS ];
@@ -1240,7 +1235,7 @@ static void ksz8_config_cpu_port(struct dsa_switch *ds)for (i =0 ; i < dev->phy_port_cnt; i++) { p = &dev->ports[i]; -ksz8_port_stp_state_set (ds, i,BR_STATE_DISABLED ); +ksz_port_stp_state_set (ds, i,BR_STATE_DISABLED );/* Last port may be disabled. */ if (i == dev->phy_port_cnt)
@@ -1389,7 +1384,7 @@ static const struct dsa_switch_ops ksz8_switch_ops = { .get_sset_count = ksz_sset_count, .port_bridge_join = ksz_port_bridge_join, .port_bridge_leave = ksz_port_bridge_leave, - .port_stp_state_set = ksz8_port_stp_state_set, + .port_stp_state_set = ksz_port_stp_state_set, .port_fast_age = ksz_port_fast_age, .port_vlan_filtering = ksz_port_vlan_filtering, .port_vlan_add = ksz_port_vlan_add,
drivers/net/dsa/microchip/ksz9477.c +2 -8
@@ -344,12 +344,6 @@ static void ksz9477_cfg_port_member(struct ksz_device *dev, int port,ksz_pwrite32 (dev, port,REG_PORT_VLAN_MEMBERSHIP__4 , member); } -static void ksz9477_port_stp_state_set (struct dsa_switch *ds,int port, -u8 state) -{ -ksz_port_stp_state_set (ds, port, state,P_STP_CTRL ); -} -static void ksz9477_flush_dyn_mac_table (struct ksz_device *dev,int port) {u8 data;
@@ -1237,7 +1231,7 @@ static void ksz9477_config_cpu_port(struct dsa_switch *ds)continue ; p = &dev->ports[i]; -ksz9477_port_stp_state_set (ds, i,BR_STATE_DISABLED ); +ksz_port_stp_state_set (ds, i,BR_STATE_DISABLED ); p->on =1 ;if (i < dev->phy_port_cnt) p->phy =1 ;
@@ -1315,7 +1309,7 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { .get_sset_count = ksz_sset_count, .port_bridge_join = ksz_port_bridge_join, .port_bridge_leave = ksz_port_bridge_leave, - .port_stp_state_set = ksz9477_port_stp_state_set, + .port_stp_state_set = ksz_port_stp_state_set, .port_fast_age = ksz_port_fast_age, .port_vlan_filtering = ksz_port_vlan_filtering, .port_vlan_add = ksz_port_vlan_add,
drivers/net/dsa/microchip/ksz_common.c +18 -4
@@ -151,6 +151,7 @@ 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, + .stp_ctrl_reg = 0x02, .supports_mii = {false, false, false, false, true}, .supports_rmii = {false, false, false, false, true}, .supports_rgmii = {false, false, false, false, true},
@@ -183,6 +184,7 @@ 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, + .stp_ctrl_reg = 0x02, .supports_mii = {false, false, false, false, true}, .supports_rmii = {false, false, false, false, true}, .supports_rgmii = {false, false, false, false, true},
@@ -201,6 +203,7 @@ 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, + .stp_ctrl_reg = 0x02, .supports_mii = {false, false, false, false, true}, .supports_rmii = {false, false, false, false, true}, .supports_rgmii = {false, false, false, false, true},
@@ -218,6 +221,7 @@ 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, + .stp_ctrl_reg = 0x02, .supports_mii = {false, false, true}, .supports_rmii = {false, false, true}, .internal_phy = {true, true, false},
@@ -235,6 +239,7 @@ 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, + .stp_ctrl_reg = 0x0B04, .supports_mii = {false, false, false, false, false, true, false}, .supports_rmii = {false, false, false, false,
@@ -257,6 +262,7 @@ 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, + .stp_ctrl_reg = 0x0B04, .supports_mii = {false, false, false, false, false, true, true}, .supports_rmii = {false, false, false, false,
@@ -278,6 +284,7 @@ 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, + .stp_ctrl_reg = 0x0B04, .supports_mii = {false, false, true}, .supports_rmii = {false, false, true}, .supports_rgmii = {false, false, true},
@@ -296,6 +303,7 @@ 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, + .stp_ctrl_reg = 0x0B04, .supports_mii = {false, false, false, false, false, true, true}, .supports_rmii = {false, false, false, false,
@@ -317,6 +325,7 @@ 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, + .stp_ctrl_reg = 0x0B04, .supports_mii = {false, false, false, false, true}, .supports_rmii = {false, false, false, false, true}, .supports_rgmii = {false, false, false, false, true},
@@ -334,6 +343,7 @@ 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, + .stp_ctrl_reg = 0x0B04, .supports_mii = {false, false, false, false, true, true}, .supports_rmii = {false, false, false, false, true, true}, .supports_rgmii = {false, false, false, false, true, true},
@@ -351,6 +361,7 @@ 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, + .stp_ctrl_reg = 0x0B04, .supports_mii = {false, false, false, false, true, true, false, false}, .supports_rmii = {false, false, false, false,
@@ -372,6 +383,7 @@ 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, + .stp_ctrl_reg = 0x0B04, .supports_mii = {false, false, false, false, true, true, false, false}, .supports_rmii = {false, false, false, false,
@@ -393,6 +405,7 @@ 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, + .stp_ctrl_reg = 0x0B04, .supports_mii = {false, false, false, false, true, true, false, false}, .supports_rmii = {false, false, false, false,
@@ -532,7 +545,7 @@ void ksz_get_strings(struct dsa_switch *ds, int port, }EXPORT_SYMBOL_GPL (ksz_get_strings); -void ksz_update_port_member (struct ksz_device *dev,int port) +static void ksz_update_port_member (struct ksz_device *dev,int port) {struct ksz_port *p = &dev->ports[port];struct dsa_switch *ds = dev->ds;
@@ -589,7 +602,6 @@ void ksz_update_port_member(struct ksz_device *dev, int port) dev->dev_ops->cfg_port_member (dev, port, port_member | cpu_port); } -EXPORT_SYMBOL_GPL (ksz_update_port_member);static void port_r_cnt (struct ksz_device *dev,int port) {
@@ -890,12 +902,14 @@ int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy) }EXPORT_SYMBOL_GPL (ksz_enable_port); -void ksz_port_stp_state_set (struct dsa_switch *ds,int port, -u8 state,int reg) +void ksz_port_stp_state_set (struct dsa_switch *ds,int port,u8 state) {struct ksz_device *dev = ds->priv;struct ksz_port *p;u8 data; +int reg; + + reg = dev->info->stp_ctrl_reg;ksz_pread8 (dev, port, reg, &data); data &= ~(PORT_TX_ENABLE |PORT_RX_ENABLE |PORT_LEARN_DISABLE );
drivers/net/dsa/microchip/ksz_common.h +2 -3
@@ -46,6 +46,7 @@ struct ksz_chip_data {const struct ksz_mib_names *mib_names;int mib_cnt;u8 reg_mib_cnt; +int stp_ctrl_reg;bool supports_mii[KSZ_MAX_NUM_PORTS ];bool supports_rmii[KSZ_MAX_NUM_PORTS ];bool supports_rgmii[KSZ_MAX_NUM_PORTS ];
@@ -207,7 +208,6 @@ void ksz_switch_remove(struct ksz_device *dev);int ksz8_switch_register (struct ksz_device *dev);int ksz9477_switch_register (struct ksz_device *dev); -void ksz_update_port_member (struct ksz_device *dev,int port);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,
@@ -229,8 +229,7 @@ int ksz_port_bridge_join(struct dsa_switch *ds, int port, struct netlink_ext_ack *extack);void ksz_port_bridge_leave (struct dsa_switch *ds,int port,struct dsa_bridge bridge); -void ksz_port_stp_state_set (struct dsa_switch *ds,int port, -u8 state,int reg); +void ksz_port_stp_state_set (struct dsa_switch *ds,int port,u8 state);void ksz_port_fast_age (struct dsa_switch *ds,int port);int ksz_port_fdb_dump (struct dsa_switch *ds,int port,dsa_fdb_dump_cb_t *cb,void *data);
Signature · 1 line
2.36.1
PATCH 8/11 net: dsa: microchip: update the ksz_phylink_get_caps
In reply to Arun RamadossThis patch assigns the phylink_get_caps in ksz8795 and ksz9477 to ksz_phylink_get_caps. And update their mac_capabilities in the respective ksz_dev_ops.
--- drivers/net/dsa/microchip/ksz8795.c | 9 +++------ drivers/net/dsa/microchip/ksz9477.c | 7 +++---- drivers/net/dsa/microchip/ksz_common.c | 3 +++ drivers/net/dsa/microchip/ksz_common.h | 2 ++ 4 files changed, 11 insertions(+), 10 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +3 -6
@@ -1348,13 +1348,9 @@ static int ksz8_setup(struct dsa_switch *ds)return ksz8_handle_global_errata (ds); } -static void ksz8_get_caps (struct dsa_switch *ds,int port, +static void ksz8_get_caps (struct ksz_device *dev,int port,struct phylink_config *config) { -struct ksz_device *dev = ds->priv; - -ksz_phylink_get_caps (ds, port, config); - config->mac_capabilities =MAC_10 |MAC_100 ;/* Silicon Errata Sheet (DS80000830A):
@@ -1376,7 +1372,7 @@ static const struct dsa_switch_ops ksz8_switch_ops = { .setup = ksz8_setup, .phy_read = ksz_phy_read16, .phy_write = ksz_phy_write16, - .phylink_get_caps = ksz8_get_caps, + .phylink_get_caps = ksz_phylink_get_caps, .phylink_mac_link_down = ksz_mac_link_down, .port_enable = ksz_enable_port, .get_strings = ksz_get_strings,
@@ -1458,6 +1454,7 @@ static const struct ksz_dev_ops ksz8_dev_ops = { .vlan_del = ksz8_port_vlan_del, .mirror_add = ksz8_port_mirror_add, .mirror_del = ksz8_port_mirror_del, + .get_caps = ksz8_get_caps, .shutdown = ksz8_reset_switch, .init = ksz8_switch_init, .exit = ksz8_switch_exit,
drivers/net/dsa/microchip/ksz9477.c +3 -4
@@ -1068,11 +1068,9 @@ 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, +static void ksz9477_get_caps (struct ksz_device *dev,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 ; }
@@ -1302,7 +1300,7 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { .phy_read = ksz_phy_read16, .phy_write = ksz_phy_write16, .phylink_mac_link_down = ksz_mac_link_down, - .phylink_get_caps = ksz9477_get_caps, + .phylink_get_caps = ksz_phylink_get_caps, .port_enable = ksz_enable_port, .get_strings = ksz_get_strings, .get_ethtool_stats = ksz_get_ethtool_stats,
@@ -1400,6 +1398,7 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { .vlan_del = ksz9477_port_vlan_del, .mirror_add = ksz9477_port_mirror_add, .mirror_del = ksz9477_port_mirror_del, + .get_caps = ksz9477_get_caps, .shutdown = ksz9477_reset_switch, .init = ksz9477_switch_init, .exit = ksz9477_switch_exit,
drivers/net/dsa/microchip/ksz_common.c +3 -0
@@ -469,6 +469,9 @@ void ksz_phylink_get_caps(struct dsa_switch *ds, int port,if (dev->info->internal_phy[port])__set_bit (PHY_INTERFACE_MODE_INTERNAL , config->supported_interfaces); + +if (dev->dev_ops->get_caps) + dev->dev_ops->get_caps (dev, port, config); }EXPORT_SYMBOL_GPL (ksz_phylink_get_caps);
drivers/net/dsa/microchip/ksz_common.h +2 -0
@@ -193,6 +193,8 @@ struct ksz_dev_ops { bool ingress, struct netlink_ext_ack *extack);void (*mirror_del)(struct ksz_device *dev,int port,struct dsa_mall_mirror_tc_entry *mirror); +void (*get_caps)(struct ksz_device *dev,int port, +struct phylink_config *config);void (*freeze_mib)(struct ksz_device *dev,int port,bool freeze);void (*port_init_cnt)(struct ksz_device *dev,int port);int (*shutdown)(struct ksz_device *dev);
Signature · 1 line
2.36.1
PATCH 9/11 net: dsa: microchip: update the ksz_port_mdb_add/del
In reply to Arun Ramadossksz_mdb_add/del in ksz_common.c is specific for the ksz8795.c file. The ksz9477 has its separate ksz9477_port_mdb_add/del functions. This patch moves the ksz8795 specific mdb functionality from ksz_common to ksz8795. And this dsa_switch_ops hooks for ksz8795/ksz9477 are invoked through the ksz_port_mdb_add/del.
--- drivers/net/dsa/microchip/ksz8795.c | 76 ++++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz9477.c | 20 +++---- drivers/net/dsa/microchip/ksz_common.c | 64 ++-------------------- drivers/net/dsa/microchip/ksz_common.h | 6 ++ 4 files changed, 98 insertions(+), 68 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +76 -0
@@ -953,6 +953,80 @@ static void ksz8_flush_dyn_mac_table(struct ksz_device *dev, int port) } } +static int ksz8_mdb_add (struct ksz_device *dev,int port, +const struct switchdev_obj_port_mdb *mdb, +struct dsa_db db) +{ +struct alu_struct alu; +int index; +int empty =0 ; + + alu.port_forward =0 ; +for (index =0 ; index < dev->info->num_statics; index++) { +if (!dev->dev_ops->r_sta_mac_table (dev, index, &alu)) { +/* Found one already in static MAC table. */ +if (!memcmp (alu.mac, mdb->addr,ETH_ALEN ) && + alu.fid == mdb->vid) +break ; +/* Remember the first empty entry. */ + }else if (!empty) { + empty = index +1 ; + } + } + +/* no available entry */ +if (index == dev->info->num_statics && !empty) +return -ENOSPC ; + +/* add entry */ +if (index == dev->info->num_statics) { + index = empty -1 ; +memset (&alu,0 ,sizeof (alu)); +memcpy (alu.mac, mdb->addr,ETH_ALEN ); + alu.is_static = true; + } + alu.port_forward |=BIT (port); +if (mdb->vid) { + alu.is_use_fid = true; + +/* Need a way to map VID to FID. */ + alu.fid = mdb->vid; + } + dev->dev_ops->w_sta_mac_table (dev, index, &alu); + +return 0 ; +} + +static int ksz8_mdb_del (struct ksz_device *dev,int port, +const struct switchdev_obj_port_mdb *mdb, +struct dsa_db db) +{ +struct alu_struct alu; +int index; + +for (index =0 ; index < dev->info->num_statics; index++) { +if (!dev->dev_ops->r_sta_mac_table (dev, index, &alu)) { +/* Found one already in static MAC table. */ +if (!memcmp (alu.mac, mdb->addr,ETH_ALEN ) && + alu.fid == mdb->vid) +break ; + } + } + +/* no available entry */ +if (index == dev->info->num_statics) + goto exit; + +/* clear port */ + alu.port_forward &= ~BIT (port); +if (!alu.port_forward) + alu.is_static = false; + dev->dev_ops->w_sta_mac_table (dev, index, &alu); + +exit: +return 0 ; +} +static int ksz8_port_vlan_filtering (struct ksz_device *dev,int port,bool flag,struct netlink_ext_ack *extack) {
@@ -1449,6 +1523,8 @@ static const struct ksz_dev_ops ksz8_dev_ops = { .r_mib_pkt = ksz8_r_mib_pkt, .freeze_mib = ksz8_freeze_mib, .port_init_cnt = ksz8_port_init_cnt, + .mdb_add = ksz8_mdb_add, + .mdb_del = ksz8_mdb_del, .vlan_filtering = ksz8_port_vlan_filtering, .vlan_add = ksz8_port_vlan_add, .vlan_del = ksz8_port_vlan_del,
drivers/net/dsa/microchip/ksz9477.c +10 -10
@@ -653,11 +653,10 @@ static int ksz9477_port_fdb_dump(struct dsa_switch *ds, int port,return ret; } -static int ksz9477_port_mdb_add (struct dsa_switch *ds,int port, -const struct switchdev_obj_port_mdb *mdb, -struct dsa_db db) +static int ksz9477_mdb_add (struct ksz_device *dev,int port, +const struct switchdev_obj_port_mdb *mdb, +struct dsa_db db) { -struct ksz_device *dev = ds->priv;u32 static_table[4 ];u32 data;int index;
@@ -729,11 +728,10 @@ static int ksz9477_port_mdb_add(struct dsa_switch *ds, int port,return err; } -static int ksz9477_port_mdb_del (struct dsa_switch *ds,int port, -const struct switchdev_obj_port_mdb *mdb, -struct dsa_db db) +static int ksz9477_mdb_del (struct ksz_device *dev,int port, +const struct switchdev_obj_port_mdb *mdb, +struct dsa_db db) { -struct ksz_device *dev = ds->priv;u32 static_table[4 ];u32 data;int index;
@@ -1315,8 +1313,8 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { .port_fdb_dump = ksz9477_port_fdb_dump, .port_fdb_add = ksz9477_port_fdb_add, .port_fdb_del = ksz9477_port_fdb_del, - .port_mdb_add = ksz9477_port_mdb_add, - .port_mdb_del = ksz9477_port_mdb_del, + .port_mdb_add = ksz_port_mdb_add, + .port_mdb_del = ksz_port_mdb_del, .port_mirror_add = ksz_port_mirror_add, .port_mirror_del = ksz_port_mirror_del, .get_stats64 = ksz_get_stats64,
@@ -1399,6 +1397,8 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { .mirror_add = ksz9477_port_mirror_add, .mirror_del = ksz9477_port_mirror_del, .get_caps = ksz9477_get_caps, + .mdb_add = ksz9477_mdb_add, + .mdb_del = ksz9477_mdb_del, .shutdown = ksz9477_reset_switch, .init = ksz9477_switch_init, .exit = ksz9477_switch_exit,
drivers/net/dsa/microchip/ksz_common.c +6 -58
80 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.h +6 -0
@@ -193,6 +193,12 @@ struct ksz_dev_ops { bool ingress, struct netlink_ext_ack *extack);void (*mirror_del)(struct ksz_device *dev,int port,struct dsa_mall_mirror_tc_entry *mirror); +int (*mdb_add)(struct ksz_device *dev,int port, +const struct switchdev_obj_port_mdb *mdb, +struct dsa_db db); +int (*mdb_del)(struct ksz_device *dev,int port, +const struct switchdev_obj_port_mdb *mdb, +struct dsa_db db);void (*get_caps)(struct ksz_device *dev,int port,struct phylink_config *config);void (*freeze_mib)(struct ksz_device *dev,int port,bool freeze);
Signature · 1 line
2.36.1
PATCH 10/11 net: dsa: microchip: update fdb add/del/dump in ksz_common
In reply to Arun RamadossThis patch makes the dsa_switch_hook for fdbs to use ksz_common.c file. And from ksz_common, individual switches fdb functions are called using the dev->dev_ops. And removed the r_dyn_mac_table, r_sta_mac_table and w_sta_mac_table from ksz_dev_ops as it is used only in ksz8795.c
--- drivers/net/dsa/microchip/ksz8795.c | 40 ++++++++++++++++---- drivers/net/dsa/microchip/ksz9477.c | 28 +++++++------- drivers/net/dsa/microchip/ksz_common.c | 51 ++++++++++++++------------ drivers/net/dsa/microchip/ksz_common.h | 17 +++++---- 4 files changed, 85 insertions(+), 51 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +33 -7
@@ -953,6 +953,34 @@ static void ksz8_flush_dyn_mac_table(struct ksz_device *dev, int port) } } +static int ksz8_fdb_dump (struct ksz_device *dev,int port, +dsa_fdb_dump_cb_t *cb,void *data) +{ +int ret =0 ; +u16 i =0 ; +u16 entries =0 ; +u8 timestamp =0 ; +u8 fid; +u8 member; +struct alu_struct alu; + +do { + alu.is_static = false; + ret =ksz8_r_dyn_mac_table (dev, i, alu.mac, &fid, &member, + ×tamp, &entries); +if (!ret && (member &BIT (port))) { + ret =cb (alu.mac, alu.fid, alu.is_static, data); +if (ret) +break ; + } + i++; + }while (i < entries); +if (i >= entries) + ret =0 ; + +return ret; +} +static int ksz8_mdb_add (struct ksz_device *dev,int port,const struct switchdev_obj_port_mdb *mdb,struct dsa_db db)
@@ -963,7 +991,7 @@ static int ksz8_mdb_add(struct ksz_device *dev, int port, alu.port_forward =0 ;for (index =0 ; index < dev->info->num_statics; index++) { -if (!dev->dev_ops->r_sta_mac_table (dev, index, &alu)) { +if (!ksz8_r_sta_mac_table (dev, index, &alu)) {/* Found one already in static MAC table. */ if (!memcmp (alu.mac, mdb->addr,ETH_ALEN ) && alu.fid == mdb->vid)
@@ -992,7 +1020,7 @@ static int ksz8_mdb_add(struct ksz_device *dev, int port,/* Need a way to map VID to FID. */ alu.fid = mdb->vid; } - dev->dev_ops->w_sta_mac_table (dev, index, &alu); +ksz8_w_sta_mac_table (dev, index, &alu);return 0 ; }
@@ -1005,7 +1033,7 @@ static int ksz8_mdb_del(struct ksz_device *dev, int port,int index;for (index =0 ; index < dev->info->num_statics; index++) { -if (!dev->dev_ops->r_sta_mac_table (dev, index, &alu)) { +if (!ksz8_r_sta_mac_table (dev, index, &alu)) {/* Found one already in static MAC table. */ if (!memcmp (alu.mac, mdb->addr,ETH_ALEN ) && alu.fid == mdb->vid)
@@ -1021,7 +1049,7 @@ static int ksz8_mdb_del(struct ksz_device *dev, int port, alu.port_forward &= ~BIT (port);if (!alu.port_forward) alu.is_static = false; - dev->dev_ops->w_sta_mac_table (dev, index, &alu); +ksz8_w_sta_mac_table (dev, index, &alu); exit:return 0 ;
@@ -1516,13 +1544,11 @@ static const struct ksz_dev_ops ksz8_dev_ops = { .port_setup = ksz8_port_setup, .r_phy = ksz8_r_phy, .w_phy = ksz8_w_phy, - .r_dyn_mac_table = ksz8_r_dyn_mac_table, - .r_sta_mac_table = ksz8_r_sta_mac_table, - .w_sta_mac_table = ksz8_w_sta_mac_table, .r_mib_cnt = ksz8_r_mib_cnt, .r_mib_pkt = ksz8_r_mib_pkt, .freeze_mib = ksz8_freeze_mib, .port_init_cnt = ksz8_port_init_cnt, + .fdb_dump = ksz8_fdb_dump, .mdb_add = ksz8_mdb_add, .mdb_del = ksz8_mdb_del, .vlan_filtering = ksz8_port_vlan_filtering,
drivers/net/dsa/microchip/ksz9477.c +14 -14
@@ -452,11 +452,10 @@ static int ksz9477_port_vlan_del(struct ksz_device *dev, int port,return 0 ; } -static int ksz9477_port_fdb_add (struct dsa_switch *ds,int port, -const unsigned char *addr,u16 vid, -struct dsa_db db) +static int ksz9477_fdb_add (struct ksz_device *dev,int port, +const unsigned char *addr,u16 vid, +struct dsa_db db) { -struct ksz_device *dev = ds->priv;u32 alu_table[4 ];u32 data;int ret =0 ;
@@ -510,11 +509,10 @@ static int ksz9477_port_fdb_add(struct dsa_switch *ds, int port,return ret; } -static int ksz9477_port_fdb_del (struct dsa_switch *ds,int port, -const unsigned char *addr,u16 vid, -struct dsa_db db) +static int ksz9477_fdb_del (struct ksz_device *dev,int port, +const unsigned char *addr,u16 vid, +struct dsa_db db) { -struct ksz_device *dev = ds->priv;u32 alu_table[4 ];u32 data;int ret =0 ;
@@ -601,10 +599,9 @@ static void ksz9477_convert_alu(struct alu_struct *alu, u32 *alu_table) alu->mac[5 ] = alu_table[3 ] &0xFF ; } -static int ksz9477_port_fdb_dump (struct dsa_switch *ds,int port, -dsa_fdb_dump_cb_t *cb,void *data) +static int ksz9477_fdb_dump (struct ksz_device *dev,int port, +dsa_fdb_dump_cb_t *cb,void *data) { -struct ksz_device *dev = ds->priv;int ret =0 ;u32 ksz_data;u32 alu_table[4 ];
@@ -1310,9 +1307,9 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { .port_vlan_filtering = ksz_port_vlan_filtering, .port_vlan_add = ksz_port_vlan_add, .port_vlan_del = ksz_port_vlan_del, - .port_fdb_dump = ksz9477_port_fdb_dump, - .port_fdb_add = ksz9477_port_fdb_add, - .port_fdb_del = ksz9477_port_fdb_del, + .port_fdb_dump = ksz_port_fdb_dump, + .port_fdb_add = ksz_port_fdb_add, + .port_fdb_del = ksz_port_fdb_del, .port_mdb_add = ksz_port_mdb_add, .port_mdb_del = ksz_port_mdb_del, .port_mirror_add = ksz_port_mirror_add,
@@ -1397,6 +1394,9 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { .mirror_add = ksz9477_port_mirror_add, .mirror_del = ksz9477_port_mirror_del, .get_caps = ksz9477_get_caps, + .fdb_dump = ksz9477_fdb_dump, + .fdb_add = ksz9477_fdb_add, + .fdb_del = ksz9477_fdb_del, .mdb_add = ksz9477_mdb_add, .mdb_del = ksz9477_mdb_del, .shutdown = ksz9477_reset_switch,
drivers/net/dsa/microchip/ksz_common.c +28 -23
62 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_common.h +10 -7
@@ -169,13 +169,6 @@ struct ksz_dev_ops {void (*port_setup)(struct ksz_device *dev,int port,bool cpu_port);void (*r_phy)(struct ksz_device *dev,u16 phy,u16 reg,u16 *val);void (*w_phy)(struct ksz_device *dev,u16 phy,u16 reg,u16 val); -int (*r_dyn_mac_table)(struct ksz_device *dev,u16 addr,u8 *mac_addr, -u8 *fid,u8 *src_port,u8 *timestamp, -u16 *entries); -int (*r_sta_mac_table)(struct ksz_device *dev,u16 addr, -struct alu_struct *alu); -void (*w_sta_mac_table)(struct ksz_device *dev,u16 addr, -struct alu_struct *alu);void (*r_mib_cnt)(struct ksz_device *dev,int port,u16 addr,u64 *cnt); void (*r_mib_pkt)(struct ksz_device *dev, int port, u16 addr,
@@ -193,6 +186,12 @@ struct ksz_dev_ops { bool ingress, struct netlink_ext_ack *extack);void (*mirror_del)(struct ksz_device *dev,int port,struct dsa_mall_mirror_tc_entry *mirror); +int (*fdb_add)(struct ksz_device *dev,int port, +const unsigned char *addr,u16 vid,struct dsa_db db); +int (*fdb_del)(struct ksz_device *dev,int port, +const unsigned char *addr,u16 vid,struct dsa_db db); +int (*fdb_dump)(struct ksz_device *dev,int port, +dsa_fdb_dump_cb_t *cb,void *data);int (*mdb_add)(struct ksz_device *dev,int port,const struct switchdev_obj_port_mdb *mdb,struct dsa_db db);
@@ -239,6 +238,10 @@ void ksz_port_bridge_leave(struct dsa_switch *ds, int port, struct dsa_bridge bridge);void ksz_port_stp_state_set (struct dsa_switch *ds,int port,u8 state);void ksz_port_fast_age (struct dsa_switch *ds,int port); +int ksz_port_fdb_add (struct dsa_switch *ds,int port, +const unsigned char *addr,u16 vid,struct dsa_db db); +int ksz_port_fdb_del (struct dsa_switch *ds,int port, +const unsigned char *addr,u16 vid,struct dsa_db db);int ksz_port_fdb_dump (struct dsa_switch *ds,int port,dsa_fdb_dump_cb_t *cb,void *data); int ksz_port_mdb_add(struct dsa_switch *ds, int port,
Signature · 1 line
2.36.1
PATCH 11/11 net: dsa: microchip: move get_phy_flags & mtu to ksz_common
In reply to Arun RamadossThis patch assigns the get_phy_flags & mtu hook of ksz8795 and ksz9477 in dsa_switch_ops to ksz_common. For get_phy_flags hooks,checks whether the chip is ksz8863/kss8793 then it returns error for port1.
--- drivers/net/dsa/microchip/ksz8795.c | 14 +-------- drivers/net/dsa/microchip/ksz9477.c | 11 +++---- drivers/net/dsa/microchip/ksz_common.c | 40 ++++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 5 ++++ 4 files changed, 52 insertions(+), 18 deletions(-)
drivers/net/dsa/microchip/ksz8795.c +1 -13
@@ -898,18 +898,6 @@ static void ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val) } } -static u32 ksz8_sw_get_phy_flags (struct dsa_switch *ds,int port) -{ -/* Silicon Errata Sheet (DS80000830A): -* Port 1 does not work with LinkMD Cable-Testing. -* Port 1 does not respond to received PAUSE control frames. -*/ -if (!port) -return MICREL_KSZ8_P1_ERRATA ; - -return 0 ; -} -static void ksz8_cfg_port_member (struct ksz_device *dev,int port,u8 member) {u8 data;
@@ -1470,7 +1458,7 @@ static void ksz8_get_caps(struct ksz_device *dev, int port,static const struct dsa_switch_ops ksz8_switch_ops = { .get_tag_protocol = ksz_get_tag_protocol, - .get_phy_flags = ksz8_sw_get_phy_flags, + .get_phy_flags = ksz_get_phy_flags, .setup = ksz8_setup, .phy_read = ksz_phy_read16, .phy_write = ksz_phy_write16,
drivers/net/dsa/microchip/ksz9477.c +6 -5
@@ -47,9 +47,8 @@ static void ksz9477_port_cfg32(struct ksz_device *dev, int port, int offset, bits, set ? bits : 0); } -static int ksz9477_change_mtu (struct dsa_switch *ds,int port,int mtu) +static int ksz9477_change_mtu (struct ksz_device *dev,int port,int mtu) { -struct ksz_device *dev = ds->priv;u16 frame_size, max_frame =0 ;int i;
@@ -65,7 +64,7 @@ static int ksz9477_change_mtu(struct dsa_switch *ds, int port, int mtu) REG_SW_MTU_MASK, max_frame); } -static int ksz9477_max_mtu (struct dsa_switch *ds,int port) +static int ksz9477_max_mtu (struct ksz_device *dev,int port) {return KSZ9477_MAX_FRAME_SIZE -VLAN_ETH_HLEN -ETH_FCS_LEN ; }
@@ -1315,8 +1314,8 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { .port_mirror_add = ksz_port_mirror_add, .port_mirror_del = ksz_port_mirror_del, .get_stats64 = ksz_get_stats64, - .port_change_mtu = ksz9477_change_mtu, - .port_max_mtu = ksz9477_max_mtu, + .port_change_mtu = ksz_change_mtu, + .port_max_mtu = ksz_max_mtu, };static u32 ksz9477_get_port_addr (int port,int offset)
@@ -1399,6 +1398,8 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { .fdb_del = ksz9477_fdb_del, .mdb_add = ksz9477_mdb_add, .mdb_del = ksz9477_mdb_del, + .change_mtu = ksz9477_change_mtu, + .max_mtu = ksz9477_max_mtu, .shutdown = ksz9477_reset_switch, .init = ksz9477_switch_init, .exit = ksz9477_switch_exit,
drivers/net/dsa/microchip/ksz_common.c +40 -0
@@ -16,6 +16,7 @@#include <linux/if_bridge.h> #include <linux/of_device.h> #include <linux/of_net.h> +#include <linux/micrel_phy.h> #include <net/dsa.h> #include <net/switchdev.h>
@@ -705,6 +706,23 @@ int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val) }EXPORT_SYMBOL_GPL (ksz_phy_write16); +u32 ksz_get_phy_flags (struct dsa_switch *ds,int port) +{ +struct ksz_device *dev = ds->priv; + +if (dev->chip_id ==KSZ8830_CHIP_ID ) { +/* Silicon Errata Sheet (DS80000830A): +* Port 1 does not work with LinkMD Cable-Testing. +* Port 1 does not respond to received PAUSE control frames. +*/ +if (!port) +return MICREL_KSZ8_P1_ERRATA ; + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (ksz_get_phy_flags); +void ksz_mac_link_down (struct dsa_switch *ds,int port,unsigned int mode,phy_interface_t interface) {
@@ -984,6 +1002,28 @@ void ksz_port_mirror_del(struct dsa_switch *ds, int port, }EXPORT_SYMBOL_GPL (ksz_port_mirror_del); +int ksz_change_mtu (struct dsa_switch *ds,int port,int mtu) +{ +struct ksz_device *dev = ds->priv; + +if (!dev->dev_ops->change_mtu) +return -EOPNOTSUPP ; + +return dev->dev_ops->change_mtu (dev, port, mtu); +} +EXPORT_SYMBOL_GPL (ksz_change_mtu); + +int ksz_max_mtu (struct dsa_switch *ds,int port) +{ +struct ksz_device *dev = ds->priv; + +if (!dev->dev_ops->max_mtu) +return -EOPNOTSUPP ; + +return dev->dev_ops->max_mtu (dev, port); +} +EXPORT_SYMBOL_GPL (ksz_max_mtu); +static int ksz_switch_detect (struct ksz_device *dev) {u8 id1, id2;
drivers/net/dsa/microchip/ksz_common.h +5 -0
@@ -200,6 +200,8 @@ struct ksz_dev_ops { struct dsa_db db);void (*get_caps)(struct ksz_device *dev,int port,struct phylink_config *config); +int (*change_mtu)(struct ksz_device *dev,int port,int mtu); +int (*max_mtu)(struct ksz_device *dev,int port);void (*freeze_mib)(struct ksz_device *dev,int port,bool freeze);void (*port_init_cnt)(struct ksz_device *dev,int port);int (*shutdown)(struct ksz_device *dev);
@@ -227,6 +229,7 @@ extern const struct ksz_chip_data ksz_switch_chips[];int ksz_phy_read16 (struct dsa_switch *ds,int addr,int reg);int ksz_phy_write16 (struct dsa_switch *ds,int addr,int reg,u16 val); +u32 ksz_get_phy_flags (struct dsa_switch *ds,int port);void ksz_mac_link_down (struct dsa_switch *ds,int port,unsigned int mode,phy_interface_t interface);int ksz_sset_count (struct dsa_switch *ds,int port,int sset);
@@ -267,6 +270,8 @@ int ksz_port_mirror_add(struct dsa_switch *ds, int port, bool ingress, struct netlink_ext_ack *extack);void ksz_port_mirror_del (struct dsa_switch *ds,int port,struct dsa_mall_mirror_tc_entry *mirror); +int ksz_change_mtu (struct dsa_switch *ds,int port,int mtu); +int ksz_max_mtu (struct dsa_switch *ds,int port);/* Common register access functions */
Signature · 1 line
2.36.1
Quoted 25 lines · Arun Ramadoss
This patch series aims to refactor the
ksz_switch_registerroutine to have the common flow for the ksz series switch. At presentksz8795.c&ksz9477.chave its owndsa_switch_opsand switch detect functionality.
Inksz_switch_register,ksz_dev_opsis assigned based on the function parameter passed by the individual ksz8/ksz9477 switch register function. And then switch detect is performed based on the ksz_dev_ops.detect hook. This patch modifies theksz_switch_registersuch a way that switch detect is performed first, based on the chipksz_dev_opsis assigned toksz_devicestructure. It ensures the common flow for the existing as well as LAN937x switches.
In the next series of patch, it will moveksz_dsa_opsanddsa_switch_opsfromksz8795.candksz9477.ctoksz_common.cand have the common spi probe all the ksz based switches.Changes in v1
- Splitted the patch series into two.
- Replaced all occurrence ofREG_PORT_STATUS_0andPORT_FIBER_MODEtoKSZ8_PORT_STATUS_0andKSZ8_PORT_FIBER_MODE.
- Separated the tag protocol and phy read/write patch into two.
- Assigned theDSA_TAG_PROTO_NONEas the default value forget_tag_protocolhook.
- Reduced the indentation level by using theif(!dev->dev_ops->mirror_add).
- Added thestp_ctrl_regas a member inksz_chip_dataand removed the member inksz_dev_ops.
- Removed ther_dyn_mac_table,r_sta_mac_tableandw_sta_mac_tablefrom theksz_dev_opssince it is used only in theksz8795.c.
Quoted 3 lines
Changes in RFC v2
- Fixed the compilation issue.
- Reduced the patch set to 15.
For the series:
This series was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Quoted 13 lines · On Fri, 17 Jun 2022 14:12:44 +0530 you wrote:
This patch series aims to refactor the
ksz_switch_registerroutine to have the common flow for the ksz series switch. At presentksz8795.c&ksz9477.chave its owndsa_switch_opsand switch detect functionality.
Inksz_switch_register,ksz_dev_opsis assigned based on the function parameter passed by the individual ksz8/ksz9477 switch register function. And then switch detect is performed based on the ksz_dev_ops.detect hook. This patch modifies theksz_switch_registersuch a way that switch detect is performed first, based on the chipksz_dev_opsis assigned toksz_devicestructure. It ensures the common flow for the existing as well as LAN937x switches.
In the next series of patch, it will moveksz_dsa_opsanddsa_switch_opsfromksz8795.candksz9477.ctoksz_common.cand have the common spi probe all the ksz based switches.
Quoted 1 line
[...]
Here is the summary with links:
- [net-next,01/11] net: dsa: microchip: ksz9477: cleanup the ksz9477_switch_detect
https://git.kernel.org/netdev/net-next/c/27faa0aa85f6 - [net-next,02/11] net: dsa: microchip: move switch chip_id detection to ksz_common https://git.kernel.org/netdev/net-next/c/91a98917a883 - [net-next,03/11] net: dsa: microchip: move tag_protocol to ksz_common https://git.kernel.org/netdev/net-next/c/534a0431e9e6 - [net-next,04/11] net: dsa: microchip: ksz9477: use ksz_read_phy16 & ksz_write_phy16 https://git.kernel.org/netdev/net-next/c/930e579083d7 - [net-next,05/11] net: dsa: microchip: move vlan functionality to ksz_common https://git.kernel.org/netdev/net-next/c/f0d997e31bb3 - [net-next,06/11] net: dsa: microchip: move the port mirror to ksz_common https://git.kernel.org/netdev/net-next/c/00a298bbc238 - [net-next,07/11] net: dsa: microchip: get P_STP_CTRL in ksz_port_stp_state by ksz_dev_ops https://git.kernel.org/netdev/net-next/c/e593df51ffe8 - [net-next,08/11] net: dsa: microchip: update the ksz_phylink_get_caps https://git.kernel.org/netdev/net-next/c/7012033ce10e - [net-next,09/11] net: dsa: microchip: update the ksz_port_mdb_add/del https://git.kernel.org/netdev/net-next/c/980c7d171d3a - [net-next,10/11] net: dsa: microchip: update fdb add/del/dump in ksz_common https://git.kernel.org/netdev/net-next/c/e587be759e6e - [net-next,11/11] net: dsa: microchip: move get_phy_flags & mtu to ksz_common https://git.kernel.org/netdev/net-next/c/1fe94f542e66
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html