Messages in this thread | | | Date | Tue, 14 Jun 2022 11:15:23 +0300 | From | Vladimir Oltean <> | Subject | Re: [RFC Patch net-next v2 10/15] net: dsa: microchip: move the setup, get_phy_flags & mtu to ksz_common |
| |
On Mon, May 30, 2022 at 04:12:52PM +0530, Arun Ramadoss wrote: > This patch assigns the .setup, get_phy_flags & mtu hook of ksz8795 and > ksz9477 in dsa_switch_ops to ksz_common. And the individual switches > setup implementations are called based on the ksz_dev_ops. For > get_phy_flags hooks,checks whether the chip is ksz8863/kss8793 then it > returns error for port1. > > Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com> > --- > drivers/net/dsa/microchip/ksz8795.c | 17 ++------- > drivers/net/dsa/microchip/ksz9477.c | 14 ++++---- > drivers/net/dsa/microchip/ksz_common.c | 50 ++++++++++++++++++++++++++ > drivers/net/dsa/microchip/ksz_common.h | 7 ++++ > 4 files changed, 68 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c > index 528de481b319..1058b6883caa 100644 > --- a/drivers/net/dsa/microchip/ksz8795.c > +++ b/drivers/net/dsa/microchip/ksz8795.c > @@ -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; > @@ -1476,8 +1464,8 @@ 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, > - .setup = ksz8_setup, > + .get_phy_flags = ksz_get_phy_flags, > + .setup = ksz_setup, > .phy_read = ksz_phy_read16, > .phy_write = ksz_phy_write16, > .phylink_get_caps = ksz_phylink_get_caps, > @@ -1544,6 +1532,7 @@ static void ksz8_switch_exit(struct ksz_device *dev) > } > > static const struct ksz_dev_ops ksz8_dev_ops = { > + .setup = ksz8_setup, > .get_port_addr = ksz8_get_port_addr, > .cfg_port_member = ksz8_cfg_port_member, > .flush_dyn_mac_table = ksz8_flush_dyn_mac_table, > diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c > index d70e0c32b309..d7474d9d4384 100644 > --- a/drivers/net/dsa/microchip/ksz9477.c > +++ b/drivers/net/dsa/microchip/ksz9477.c > @@ -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; > } > @@ -1296,7 +1295,7 @@ 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, > + .setup = ksz_setup, > .phy_read = ksz_phy_read16, > .phy_write = ksz_phy_write16, > .phylink_mac_link_down = ksz_mac_link_down, > @@ -1320,8 +1319,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) > @@ -1382,6 +1381,7 @@ static void ksz9477_switch_exit(struct ksz_device *dev) > } > > static const struct ksz_dev_ops ksz9477_dev_ops = { > + .setup = ksz9477_setup, > .get_port_addr = ksz9477_get_port_addr, > .cfg_port_member = ksz9477_cfg_port_member, > .flush_dyn_mac_table = ksz9477_flush_dyn_mac_table, > @@ -1405,6 +1405,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, > diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c > index 8f79ff1ac648..19f8e492d3aa 100644 > --- a/drivers/net/dsa/microchip/ksz_common.c > +++ b/drivers/net/dsa/microchip/ksz_common.c > @@ -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> > > @@ -593,6 +594,14 @@ static void ksz_update_port_member(struct ksz_device *dev, int port) > dev->dev_ops->cfg_port_member(dev, port, port_member | cpu_port); > } > > +int ksz_setup(struct dsa_switch *ds) > +{ > + struct ksz_device *dev = ds->priv; > + > + return dev->dev_ops->setup(ds); > +} > +EXPORT_SYMBOL_GPL(ksz_setup);
I see these changes as being of questionable value if you do not plan to actually share some code between ->setup implementations. What would be desirable is if ksz_common.c decides what to do, and ksz8795.c / ksz9477.c only offer the implementations for fine-grained dev_ops. Currently there is code that can be reused between the setup functions of the 2 drivers, but also there is some divergence in configuration which doesn't have its place (10% rate limit for broadcast storm protection in ksz8795?). The goal should be for individual switch drivers to not apply configuration behind the curtains as much as possible.
> + > static void port_r_cnt(struct ksz_device *dev, int port) > { > struct ksz_port_mib *mib = &dev->ports[port].mib; > @@ -692,6 +701,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) > { > @@ -981,6 +1007,30 @@ 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; > + int ret = -EOPNOTSUPP; > + > + if (dev->dev_ops->change_mtu) > + ret = dev->dev_ops->change_mtu(dev, port, mtu); > + > + return ret; > +} > +EXPORT_SYMBOL_GPL(ksz_change_mtu); > + > +int ksz_max_mtu(struct dsa_switch *ds, int port) > +{ > + struct ksz_device *dev = ds->priv; > + int ret = -EOPNOTSUPP; > + > + if (dev->dev_ops->max_mtu) > + ret = dev->dev_ops->max_mtu(dev, port); > + > + return ret; > +} > +EXPORT_SYMBOL_GPL(ksz_max_mtu); > + > static int ksz_switch_detect(struct ksz_device *dev) > { > u8 id1, id2; > diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h > index 133b1a257868..f7275c4f633a 100644 > --- a/drivers/net/dsa/microchip/ksz_common.h > +++ b/drivers/net/dsa/microchip/ksz_common.h > @@ -161,6 +161,7 @@ struct alu_struct { > }; > > struct ksz_dev_ops { > + int (*setup)(struct dsa_switch *ds); > u32 (*get_port_addr)(int port, int offset); > void (*cfg_port_member)(struct ksz_device *dev, int port, u8 member); > void (*flush_dyn_mac_table)(struct ksz_device *dev, int port); > @@ -207,6 +208,8 @@ struct ksz_dev_ops { > int (*get_stp_reg)(void); > 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); > @@ -232,8 +235,10 @@ extern const struct ksz_chip_data ksz_switch_chips[]; > > /* Common DSA access functions */ > > +int ksz_setup(struct dsa_switch *ds); > 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); > @@ -274,6 +279,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 */ > > -- > 2.36.1 >
| |