| Message ID | 20220508153049.427227-10-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: mdio: Start separating C22 and C45 | expand |
Hi Andrew,
I love your patch! Yet something to improve:
[auto build test ERROR on net-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Andrew-Lunn/net-mdio-Start-separating-C22-and-C45/20220508-233302
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 8fc0b6992a06998404321f26a57ea54522659b64
config: parisc-randconfig-r023-20220508 (https://download.01.org/0day-ci/archive/20220509/202205090111.Nnl7VN9a-lkp@intel.com/config)
compiler: hppa-linux-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/643c2f1541edcf0c2cb0f91e3e1981a8691894a0
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Andrew-Lunn/net-mdio-Start-separating-C22-and-C45/20220508-233302
git checkout 643c2f1541edcf0c2cb0f91e3e1981a8691894a0
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=parisc SHELL=/bin/bash drivers/net/dsa/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/net/dsa/mt7530.c: In function 'mt7530_phy_read_c45':
>> drivers/net/dsa/mt7530.c:622:16: error: implicit declaration of function 'mdiobus_c45_read_nested'; did you mean 'mdiobus_read_nested'? [-Werror=implicit-function-declaration]
622 | return mdiobus_c45_read_nested(priv->bus, port, devad, regnum);
| ^~~~~~~~~~~~~~~~~~~~~~~
| mdiobus_read_nested
drivers/net/dsa/mt7530.c: In function 'mt7530_phy_write_c45':
>> drivers/net/dsa/mt7530.c:628:16: error: implicit declaration of function 'mdiobus_c45_write_nested'; did you mean 'mdiobus_write_nested'? [-Werror=implicit-function-declaration]
628 | return mdiobus_c45_write_nested(priv->bus, port, devad, regnum, val);
| ^~~~~~~~~~~~~~~~~~~~~~~~
| mdiobus_write_nested
cc1: some warnings being treated as errors
vim +622 drivers/net/dsa/mt7530.c
618
619 static int mt7530_phy_read_c45(struct mt7530_priv *priv, int port,
620 int devad, int regnum)
621 {
> 622 return mdiobus_c45_read_nested(priv->bus, port, devad, regnum);
623 }
624
625 static int mt7530_phy_write_c45(struct mt7530_priv *priv, int port, int devad,
626 int regnum, u16 val)
627 {
> 628 return mdiobus_c45_write_nested(priv->bus, port, devad, regnum, val);
629 }
630
Hi Andrew,
I love your patch! Yet something to improve:
[auto build test ERROR on net-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Andrew-Lunn/net-mdio-Start-separating-C22-and-C45/20220508-233302
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 8fc0b6992a06998404321f26a57ea54522659b64
config: hexagon-randconfig-r041-20220509 (https://download.01.org/0day-ci/archive/20220509/202205090359.Jw8AQHKW-lkp@intel.com/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project a385645b470e2d3a1534aae618ea56b31177639f)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/643c2f1541edcf0c2cb0f91e3e1981a8691894a0
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Andrew-Lunn/net-mdio-Start-separating-C22-and-C45/20220508-233302
git checkout 643c2f1541edcf0c2cb0f91e3e1981a8691894a0
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash drivers/net/dsa/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/net/dsa/mt7530.c:622:9: error: call to undeclared function 'mdiobus_c45_read_nested'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
return mdiobus_c45_read_nested(priv->bus, port, devad, regnum);
^
drivers/net/dsa/mt7530.c:622:9: note: did you mean 'mdiobus_read_nested'?
include/linux/mdio.h:419:5: note: 'mdiobus_read_nested' declared here
int mdiobus_read_nested(struct mii_bus *bus, int addr, u32 regnum);
^
>> drivers/net/dsa/mt7530.c:628:9: error: call to undeclared function 'mdiobus_c45_write_nested'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
return mdiobus_c45_write_nested(priv->bus, port, devad, regnum, val);
^
drivers/net/dsa/mt7530.c:628:9: note: did you mean 'mdiobus_write_nested'?
include/linux/mdio.h:421:5: note: 'mdiobus_write_nested' declared here
int mdiobus_write_nested(struct mii_bus *bus, int addr, u32 regnum, u16 val);
^
2 errors generated.
vim +/mdiobus_c45_read_nested +622 drivers/net/dsa/mt7530.c
618
619 static int mt7530_phy_read_c45(struct mt7530_priv *priv, int port,
620 int devad, int regnum)
621 {
> 622 return mdiobus_c45_read_nested(priv->bus, port, devad, regnum);
623 }
624
625 static int mt7530_phy_write_c45(struct mt7530_priv *priv, int port, int devad,
626 int regnum, u16 val)
627 {
> 628 return mdiobus_c45_write_nested(priv->bus, port, devad, regnum, val);
629 }
630
On Sun, May 08, 2022 at 05:30:48PM +0200, Andrew Lunn wrote: > By adding _c45 function pointers to the dsa_switch_op structure, the > dsa core can register an MDIO bus with C45 accessors. > > The dsa-loop driver could in theory provide such accessors, since it > just passed requests to the MDIO bus it is on, but it seems unlikely > to be useful at the moment. It can however be added later. > > mt7530 does support C45, but its uses a mix of registering its MDIO > bus and using the DSA core provided bus. This makes the change a bit > more complex. mt7530/mt7531 don't request the DSA core to provide a bus (they don't populate dsa_switch_ops :: phy_read). They just populate ds->slave_mii_bus in order to have the non-OF based phy_connect. > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > --- > drivers/net/dsa/mt7530.c | 92 ++++++++++++++++++++++------------------ > drivers/net/dsa/mt7530.h | 15 +++++-- > include/net/dsa.h | 4 ++ > net/dsa/slave.c | 35 +++++++++++++-- > 4 files changed, 96 insertions(+), 50 deletions(-) > > diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c > index 2b02d823d497..8121cb6342d3 100644 > --- a/drivers/net/dsa/mt7530.c > +++ b/drivers/net/dsa/mt7530.c > @@ -605,17 +605,29 @@ mt7530_mib_reset(struct dsa_switch *ds) > mt7530_write(priv, MT7530_MIB_CCR, CCR_MIB_ACTIVATE); > } > > -static int mt7530_phy_read(struct mt7530_priv *priv, int port, int regnum) > +static int mt7530_phy_read_c22(struct mt7530_priv *priv, int port, int regnum) > { > return mdiobus_read_nested(priv->bus, port, regnum); > } > > -static int mt7530_phy_write(struct mt7530_priv *priv, int port, int regnum, > - u16 val) > +static int mt7530_phy_write_c22(struct mt7530_priv *priv, int port, int regnum, > + u16 val) > { > return mdiobus_write_nested(priv->bus, port, regnum, val); > } > > +static int mt7530_phy_read_c45(struct mt7530_priv *priv, int port, > + int devad, int regnum) > +{ > + return mdiobus_c45_read_nested(priv->bus, port, devad, regnum); > +} > + > +static int mt7530_phy_write_c45(struct mt7530_priv *priv, int port, int devad, > + int regnum, u16 val) > +{ > + return mdiobus_c45_write_nested(priv->bus, port, devad, regnum, val); > +} > + > static int > mt7531_ind_c45_phy_read(struct mt7530_priv *priv, int port, int devad, > int regnum) > @@ -667,7 +679,7 @@ mt7531_ind_c45_phy_read(struct mt7530_priv *priv, int port, int devad, > > static int > mt7531_ind_c45_phy_write(struct mt7530_priv *priv, int port, int devad, > - int regnum, u32 data) > + int regnum, u16 data) > { > struct mii_bus *bus = priv->bus; > struct mt7530_dummy_poll p; > @@ -790,55 +802,43 @@ mt7531_ind_c22_phy_write(struct mt7530_priv *priv, int port, int regnum, > } > > static int > -mt7531_ind_phy_read(struct mt7530_priv *priv, int port, int regnum) > +mt753x_phy_read_c22(struct mii_bus *bus, int port, int regnum) > { > - int devad; > - int ret; > - > - if (regnum & MII_ADDR_C45) { > - devad = (regnum >> MII_DEVADDR_C45_SHIFT) & 0x1f; > - ret = mt7531_ind_c45_phy_read(priv, port, devad, > - regnum & MII_REGADDR_C45_MASK); > - } else { > - ret = mt7531_ind_c22_phy_read(priv, port, regnum); > - } > + struct mt7530_priv *priv = bus->priv; > > - return ret; > + return priv->info->phy_read_c22(priv, port, regnum); > } > > static int > -mt7531_ind_phy_write(struct mt7530_priv *priv, int port, int regnum, > - u16 data) > +mt753x_phy_read_c45(struct mii_bus *bus, int port, int devad, int regnum) > { > - int devad; > - int ret; > + struct mt7530_priv *priv = bus->priv; > > - if (regnum & MII_ADDR_C45) { > - devad = (regnum >> MII_DEVADDR_C45_SHIFT) & 0x1f; > - ret = mt7531_ind_c45_phy_write(priv, port, devad, > - regnum & MII_REGADDR_C45_MASK, > - data); > - } else { > - ret = mt7531_ind_c22_phy_write(priv, port, regnum, data); > - } > + if (priv->info->phy_read_c45) > + return priv->info->phy_read_c45(priv, port, devad, regnum); All switches provide phy_read_c45 and phy_write_c45, so the conditional can be removed. > > - return ret; > + return -EOPNOTSUPP; > } > > static int > -mt753x_phy_read(struct mii_bus *bus, int port, int regnum) > +mt753x_phy_write_c22(struct mii_bus *bus, int port, int regnum, u16 val) > { > struct mt7530_priv *priv = bus->priv; > > - return priv->info->phy_read(priv, port, regnum); > + return priv->info->phy_write_c22(priv, port, regnum, val); > } > > static int > -mt753x_phy_write(struct mii_bus *bus, int port, int regnum, u16 val) > +mt753x_phy_write_c45(struct mii_bus *bus, int port, int devad, int regnum, > + u16 val) > { > struct mt7530_priv *priv = bus->priv; > > - return priv->info->phy_write(priv, port, regnum, val); > + if (priv->info->phy_write_c45) > + return priv->info->phy_write_c45(priv, port, devad, regnum, > + val); > + > + return -EOPNOTSUPP; > } > > static void > @@ -2076,8 +2076,10 @@ mt7530_setup_mdio(struct mt7530_priv *priv) > bus->priv = priv; > bus->name = KBUILD_MODNAME "-mii"; > snprintf(bus->id, MII_BUS_ID_SIZE, KBUILD_MODNAME "-%d", idx++); > - bus->read = mt753x_phy_read; > - bus->write = mt753x_phy_write; > + bus->read = mt753x_phy_read_c22; > + bus->write = mt753x_phy_write_c22; > + bus->read_c45 = mt753x_phy_read_c45; > + bus->write_c45 = mt753x_phy_write_c45; > bus->parent = dev; > bus->phy_mask = ~ds->phys_mii_mask; > > @@ -3130,8 +3132,10 @@ static const struct mt753x_info mt753x_table[] = { > .id = ID_MT7621, > .pcs_ops = &mt7530_pcs_ops, > .sw_setup = mt7530_setup, > - .phy_read = mt7530_phy_read, > - .phy_write = mt7530_phy_write, > + .phy_read_c22 = mt7530_phy_read_c22, > + .phy_write_c22 = mt7530_phy_write_c22, > + .phy_read_c45 = mt7530_phy_read_c45, > + .phy_write_c45 = mt7530_phy_write_c45, > .pad_setup = mt7530_pad_clk_setup, > .mac_port_get_caps = mt7530_mac_port_get_caps, > .mac_port_config = mt7530_mac_config, > @@ -3140,8 +3144,10 @@ static const struct mt753x_info mt753x_table[] = { > .id = ID_MT7530, > .pcs_ops = &mt7530_pcs_ops, > .sw_setup = mt7530_setup, > - .phy_read = mt7530_phy_read, > - .phy_write = mt7530_phy_write, > + .phy_read_c22 = mt7530_phy_read_c22, > + .phy_write_c22 = mt7530_phy_write_c22, > + .phy_read_c45 = mt7530_phy_read_c45, > + .phy_write_c45 = mt7530_phy_write_c45, > .pad_setup = mt7530_pad_clk_setup, > .mac_port_get_caps = mt7530_mac_port_get_caps, > .mac_port_config = mt7530_mac_config, > @@ -3150,8 +3156,10 @@ static const struct mt753x_info mt753x_table[] = { > .id = ID_MT7531, > .pcs_ops = &mt7531_pcs_ops, > .sw_setup = mt7531_setup, > - .phy_read = mt7531_ind_phy_read, > - .phy_write = mt7531_ind_phy_write, > + .phy_read_c22 = mt7531_ind_c22_phy_read, > + .phy_write_c22 = mt7531_ind_c22_phy_write, > + .phy_read_c45 = mt7531_ind_c45_phy_read, > + .phy_write_c45 = mt7531_ind_c45_phy_write, > .pad_setup = mt7531_pad_setup, > .cpu_port_config = mt7531_cpu_port_config, > .mac_port_get_caps = mt7531_mac_port_get_caps, > @@ -3211,7 +3219,7 @@ mt7530_probe(struct mdio_device *mdiodev) > * properly. > */ > if (!priv->info->sw_setup || !priv->info->pad_setup || > - !priv->info->phy_read || !priv->info->phy_write || > + !priv->info->phy_read_c22 || !priv->info->phy_write_c22 || > !priv->info->mac_port_get_caps || > !priv->info->mac_port_config) > return -EINVAL; > diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h > index 71e36b69b96d..1b14146a1f08 100644 > --- a/drivers/net/dsa/mt7530.h > +++ b/drivers/net/dsa/mt7530.h > @@ -750,8 +750,10 @@ struct mt753x_pcs { > /* struct mt753x_info - This is the main data structure for holding the specific > * part for each supported device > * @sw_setup: Holding the handler to a device initialization > - * @phy_read: Holding the way reading PHY port > - * @phy_write: Holding the way writing PHY port > + * @phy_read_c22: Holding the way reading PHY port using C22 > + * @phy_write_c22: Holding the way writing PHY port using C22 > + * @phy_read_c45: Holding the way reading PHY port using C45 > + * @phy_write_c45: Holding the way writing PHY port using C45 > * @pad_setup: Holding the way setting up the bus pad for a certain > * MAC port > * @phy_mode_supported: Check if the PHY type is being supported on a certain > @@ -767,8 +769,13 @@ struct mt753x_info { > const struct phylink_pcs_ops *pcs_ops; > > int (*sw_setup)(struct dsa_switch *ds); > - int (*phy_read)(struct mt7530_priv *priv, int port, int regnum); > - int (*phy_write)(struct mt7530_priv *priv, int port, int regnum, u16 val); > + int (*phy_read_c22)(struct mt7530_priv *priv, int port, int regnum); > + int (*phy_write_c22)(struct mt7530_priv *priv, int port, int regnum, > + u16 val); > + int (*phy_read_c45)(struct mt7530_priv *priv, int port, int devad, > + int regnum); > + int (*phy_write_c45)(struct mt7530_priv *priv, int port, int devad, > + int regnum, u16 val); > int (*pad_setup)(struct dsa_switch *ds, phy_interface_t interface); > int (*cpu_port_config)(struct dsa_switch *ds, int port); > void (*mac_port_get_caps)(struct dsa_switch *ds, int port, > diff --git a/include/net/dsa.h b/include/net/dsa.h > index 934958fda962..64e36eb33879 100644 > --- a/include/net/dsa.h > +++ b/include/net/dsa.h > @@ -820,6 +820,10 @@ struct dsa_switch_ops { > int (*phy_read)(struct dsa_switch *ds, int port, int regnum); > int (*phy_write)(struct dsa_switch *ds, int port, > int regnum, u16 val); > + int (*phy_read_c45)(struct dsa_switch *ds, int port, int devad, > + int regnum); > + int (*phy_write_c45)(struct dsa_switch *ds, int port, int devad, > + int regnum, u16 val); Therefore it's unlikely that this is useful at this stage. mt7530 does not go through dsa_slave_phy_write_c45, but directly through mt753x_phy_write(). I think this patch could avoid touching the DSA core. > > /* > * Link state adjustment (called from libphy) > diff --git a/net/dsa/slave.c b/net/dsa/slave.c > index 5ee0aced9410..a8976a67a8c0 100644 > --- a/net/dsa/slave.c > +++ b/net/dsa/slave.c > @@ -165,7 +165,7 @@ static int dsa_slave_unsync_mc(struct net_device *dev, > } > > /* slave mii_bus handling ***************************************************/ > -static int dsa_slave_phy_read(struct mii_bus *bus, int addr, int reg) > +static int dsa_slave_phy_read_c22(struct mii_bus *bus, int addr, int reg) > { > struct dsa_switch *ds = bus->priv; > > @@ -175,7 +175,19 @@ static int dsa_slave_phy_read(struct mii_bus *bus, int addr, int reg) > return 0xffff; > } > > -static int dsa_slave_phy_write(struct mii_bus *bus, int addr, int reg, u16 val) > +static int dsa_slave_phy_read_c45(struct mii_bus *bus, int addr, int devad, > + int reg) > +{ > + struct dsa_switch *ds = bus->priv; > + > + if (ds->phys_mii_mask & (1 << addr)) > + return ds->ops->phy_read_c45(ds, addr, devad, reg); > + > + return 0xffff; > +} > + > +static int dsa_slave_phy_write_c22(struct mii_bus *bus, int addr, int reg, > + u16 val) > { > struct dsa_switch *ds = bus->priv; > > @@ -185,12 +197,27 @@ static int dsa_slave_phy_write(struct mii_bus *bus, int addr, int reg, u16 val) > return 0; > } > > +static int dsa_slave_phy_write_c45(struct mii_bus *bus, int addr, int reg, > + int devad, u16 val) > +{ > + struct dsa_switch *ds = bus->priv; > + > + if (ds->phys_mii_mask & (1 << addr)) > + return ds->ops->phy_write_c45(ds, addr, devad, reg, val); > + > + return 0; > +} > + > void dsa_slave_mii_bus_init(struct dsa_switch *ds) > { > ds->slave_mii_bus->priv = (void *)ds; > ds->slave_mii_bus->name = "dsa slave smi"; > - ds->slave_mii_bus->read = dsa_slave_phy_read; > - ds->slave_mii_bus->write = dsa_slave_phy_write; > + ds->slave_mii_bus->read = dsa_slave_phy_read_c22; > + ds->slave_mii_bus->write = dsa_slave_phy_write_c22; > + if (ds->ops->phy_read_c45 && ds->ops->phy_write_c45) { > + ds->slave_mii_bus->read_c45 = dsa_slave_phy_read_c45; > + ds->slave_mii_bus->write_c45 = dsa_slave_phy_write_c45; > + } > snprintf(ds->slave_mii_bus->id, MII_BUS_ID_SIZE, "dsa-%d.%d", > ds->dst->index, ds->index); > ds->slave_mii_bus->parent = ds->dev; > -- > 2.36.0 >
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 2b02d823d497..8121cb6342d3 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -605,17 +605,29 @@ mt7530_mib_reset(struct dsa_switch *ds) mt7530_write(priv, MT7530_MIB_CCR, CCR_MIB_ACTIVATE); } -static int mt7530_phy_read(struct mt7530_priv *priv, int port, int regnum) +static int mt7530_phy_read_c22(struct mt7530_priv *priv, int port, int regnum) { return mdiobus_read_nested(priv->bus, port, regnum); } -static int mt7530_phy_write(struct mt7530_priv *priv, int port, int regnum, - u16 val) +static int mt7530_phy_write_c22(struct mt7530_priv *priv, int port, int regnum, + u16 val) { return mdiobus_write_nested(priv->bus, port, regnum, val); } +static int mt7530_phy_read_c45(struct mt7530_priv *priv, int port, + int devad, int regnum) +{ + return mdiobus_c45_read_nested(priv->bus, port, devad, regnum); +} + +static int mt7530_phy_write_c45(struct mt7530_priv *priv, int port, int devad, + int regnum, u16 val) +{ + return mdiobus_c45_write_nested(priv->bus, port, devad, regnum, val); +} + static int mt7531_ind_c45_phy_read(struct mt7530_priv *priv, int port, int devad, int regnum) @@ -667,7 +679,7 @@ mt7531_ind_c45_phy_read(struct mt7530_priv *priv, int port, int devad, static int mt7531_ind_c45_phy_write(struct mt7530_priv *priv, int port, int devad, - int regnum, u32 data) + int regnum, u16 data) { struct mii_bus *bus = priv->bus; struct mt7530_dummy_poll p; @@ -790,55 +802,43 @@ mt7531_ind_c22_phy_write(struct mt7530_priv *priv, int port, int regnum, } static int -mt7531_ind_phy_read(struct mt7530_priv *priv, int port, int regnum) +mt753x_phy_read_c22(struct mii_bus *bus, int port, int regnum) { - int devad; - int ret; - - if (regnum & MII_ADDR_C45) { - devad = (regnum >> MII_DEVADDR_C45_SHIFT) & 0x1f; - ret = mt7531_ind_c45_phy_read(priv, port, devad, - regnum & MII_REGADDR_C45_MASK); - } else { - ret = mt7531_ind_c22_phy_read(priv, port, regnum); - } + struct mt7530_priv *priv = bus->priv; - return ret; + return priv->info->phy_read_c22(priv, port, regnum); } static int -mt7531_ind_phy_write(struct mt7530_priv *priv, int port, int regnum, - u16 data) +mt753x_phy_read_c45(struct mii_bus *bus, int port, int devad, int regnum) { - int devad; - int ret; + struct mt7530_priv *priv = bus->priv; - if (regnum & MII_ADDR_C45) { - devad = (regnum >> MII_DEVADDR_C45_SHIFT) & 0x1f; - ret = mt7531_ind_c45_phy_write(priv, port, devad, - regnum & MII_REGADDR_C45_MASK, - data); - } else { - ret = mt7531_ind_c22_phy_write(priv, port, regnum, data); - } + if (priv->info->phy_read_c45) + return priv->info->phy_read_c45(priv, port, devad, regnum); - return ret; + return -EOPNOTSUPP; } static int -mt753x_phy_read(struct mii_bus *bus, int port, int regnum) +mt753x_phy_write_c22(struct mii_bus *bus, int port, int regnum, u16 val) { struct mt7530_priv *priv = bus->priv; - return priv->info->phy_read(priv, port, regnum); + return priv->info->phy_write_c22(priv, port, regnum, val); } static int -mt753x_phy_write(struct mii_bus *bus, int port, int regnum, u16 val) +mt753x_phy_write_c45(struct mii_bus *bus, int port, int devad, int regnum, + u16 val) { struct mt7530_priv *priv = bus->priv; - return priv->info->phy_write(priv, port, regnum, val); + if (priv->info->phy_write_c45) + return priv->info->phy_write_c45(priv, port, devad, regnum, + val); + + return -EOPNOTSUPP; } static void @@ -2076,8 +2076,10 @@ mt7530_setup_mdio(struct mt7530_priv *priv) bus->priv = priv; bus->name = KBUILD_MODNAME "-mii"; snprintf(bus->id, MII_BUS_ID_SIZE, KBUILD_MODNAME "-%d", idx++); - bus->read = mt753x_phy_read; - bus->write = mt753x_phy_write; + bus->read = mt753x_phy_read_c22; + bus->write = mt753x_phy_write_c22; + bus->read_c45 = mt753x_phy_read_c45; + bus->write_c45 = mt753x_phy_write_c45; bus->parent = dev; bus->phy_mask = ~ds->phys_mii_mask; @@ -3130,8 +3132,10 @@ static const struct mt753x_info mt753x_table[] = { .id = ID_MT7621, .pcs_ops = &mt7530_pcs_ops, .sw_setup = mt7530_setup, - .phy_read = mt7530_phy_read, - .phy_write = mt7530_phy_write, + .phy_read_c22 = mt7530_phy_read_c22, + .phy_write_c22 = mt7530_phy_write_c22, + .phy_read_c45 = mt7530_phy_read_c45, + .phy_write_c45 = mt7530_phy_write_c45, .pad_setup = mt7530_pad_clk_setup, .mac_port_get_caps = mt7530_mac_port_get_caps, .mac_port_config = mt7530_mac_config, @@ -3140,8 +3144,10 @@ static const struct mt753x_info mt753x_table[] = { .id = ID_MT7530, .pcs_ops = &mt7530_pcs_ops, .sw_setup = mt7530_setup, - .phy_read = mt7530_phy_read, - .phy_write = mt7530_phy_write, + .phy_read_c22 = mt7530_phy_read_c22, + .phy_write_c22 = mt7530_phy_write_c22, + .phy_read_c45 = mt7530_phy_read_c45, + .phy_write_c45 = mt7530_phy_write_c45, .pad_setup = mt7530_pad_clk_setup, .mac_port_get_caps = mt7530_mac_port_get_caps, .mac_port_config = mt7530_mac_config, @@ -3150,8 +3156,10 @@ static const struct mt753x_info mt753x_table[] = { .id = ID_MT7531, .pcs_ops = &mt7531_pcs_ops, .sw_setup = mt7531_setup, - .phy_read = mt7531_ind_phy_read, - .phy_write = mt7531_ind_phy_write, + .phy_read_c22 = mt7531_ind_c22_phy_read, + .phy_write_c22 = mt7531_ind_c22_phy_write, + .phy_read_c45 = mt7531_ind_c45_phy_read, + .phy_write_c45 = mt7531_ind_c45_phy_write, .pad_setup = mt7531_pad_setup, .cpu_port_config = mt7531_cpu_port_config, .mac_port_get_caps = mt7531_mac_port_get_caps, @@ -3211,7 +3219,7 @@ mt7530_probe(struct mdio_device *mdiodev) * properly. */ if (!priv->info->sw_setup || !priv->info->pad_setup || - !priv->info->phy_read || !priv->info->phy_write || + !priv->info->phy_read_c22 || !priv->info->phy_write_c22 || !priv->info->mac_port_get_caps || !priv->info->mac_port_config) return -EINVAL; diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h index 71e36b69b96d..1b14146a1f08 100644 --- a/drivers/net/dsa/mt7530.h +++ b/drivers/net/dsa/mt7530.h @@ -750,8 +750,10 @@ struct mt753x_pcs { /* struct mt753x_info - This is the main data structure for holding the specific * part for each supported device * @sw_setup: Holding the handler to a device initialization - * @phy_read: Holding the way reading PHY port - * @phy_write: Holding the way writing PHY port + * @phy_read_c22: Holding the way reading PHY port using C22 + * @phy_write_c22: Holding the way writing PHY port using C22 + * @phy_read_c45: Holding the way reading PHY port using C45 + * @phy_write_c45: Holding the way writing PHY port using C45 * @pad_setup: Holding the way setting up the bus pad for a certain * MAC port * @phy_mode_supported: Check if the PHY type is being supported on a certain @@ -767,8 +769,13 @@ struct mt753x_info { const struct phylink_pcs_ops *pcs_ops; int (*sw_setup)(struct dsa_switch *ds); - int (*phy_read)(struct mt7530_priv *priv, int port, int regnum); - int (*phy_write)(struct mt7530_priv *priv, int port, int regnum, u16 val); + int (*phy_read_c22)(struct mt7530_priv *priv, int port, int regnum); + int (*phy_write_c22)(struct mt7530_priv *priv, int port, int regnum, + u16 val); + int (*phy_read_c45)(struct mt7530_priv *priv, int port, int devad, + int regnum); + int (*phy_write_c45)(struct mt7530_priv *priv, int port, int devad, + int regnum, u16 val); int (*pad_setup)(struct dsa_switch *ds, phy_interface_t interface); int (*cpu_port_config)(struct dsa_switch *ds, int port); void (*mac_port_get_caps)(struct dsa_switch *ds, int port, diff --git a/include/net/dsa.h b/include/net/dsa.h index 934958fda962..64e36eb33879 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -820,6 +820,10 @@ struct dsa_switch_ops { int (*phy_read)(struct dsa_switch *ds, int port, int regnum); int (*phy_write)(struct dsa_switch *ds, int port, int regnum, u16 val); + int (*phy_read_c45)(struct dsa_switch *ds, int port, int devad, + int regnum); + int (*phy_write_c45)(struct dsa_switch *ds, int port, int devad, + int regnum, u16 val); /* * Link state adjustment (called from libphy) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 5ee0aced9410..a8976a67a8c0 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -165,7 +165,7 @@ static int dsa_slave_unsync_mc(struct net_device *dev, } /* slave mii_bus handling ***************************************************/ -static int dsa_slave_phy_read(struct mii_bus *bus, int addr, int reg) +static int dsa_slave_phy_read_c22(struct mii_bus *bus, int addr, int reg) { struct dsa_switch *ds = bus->priv; @@ -175,7 +175,19 @@ static int dsa_slave_phy_read(struct mii_bus *bus, int addr, int reg) return 0xffff; } -static int dsa_slave_phy_write(struct mii_bus *bus, int addr, int reg, u16 val) +static int dsa_slave_phy_read_c45(struct mii_bus *bus, int addr, int devad, + int reg) +{ + struct dsa_switch *ds = bus->priv; + + if (ds->phys_mii_mask & (1 << addr)) + return ds->ops->phy_read_c45(ds, addr, devad, reg); + + return 0xffff; +} + +static int dsa_slave_phy_write_c22(struct mii_bus *bus, int addr, int reg, + u16 val) { struct dsa_switch *ds = bus->priv; @@ -185,12 +197,27 @@ static int dsa_slave_phy_write(struct mii_bus *bus, int addr, int reg, u16 val) return 0; } +static int dsa_slave_phy_write_c45(struct mii_bus *bus, int addr, int reg, + int devad, u16 val) +{ + struct dsa_switch *ds = bus->priv; + + if (ds->phys_mii_mask & (1 << addr)) + return ds->ops->phy_write_c45(ds, addr, devad, reg, val); + + return 0; +} + void dsa_slave_mii_bus_init(struct dsa_switch *ds) { ds->slave_mii_bus->priv = (void *)ds; ds->slave_mii_bus->name = "dsa slave smi"; - ds->slave_mii_bus->read = dsa_slave_phy_read; - ds->slave_mii_bus->write = dsa_slave_phy_write; + ds->slave_mii_bus->read = dsa_slave_phy_read_c22; + ds->slave_mii_bus->write = dsa_slave_phy_write_c22; + if (ds->ops->phy_read_c45 && ds->ops->phy_write_c45) { + ds->slave_mii_bus->read_c45 = dsa_slave_phy_read_c45; + ds->slave_mii_bus->write_c45 = dsa_slave_phy_write_c45; + } snprintf(ds->slave_mii_bus->id, MII_BUS_ID_SIZE, "dsa-%d.%d", ds->dst->index, ds->index); ds->slave_mii_bus->parent = ds->dev;
By adding _c45 function pointers to the dsa_switch_op structure, the dsa core can register an MDIO bus with C45 accessors. The dsa-loop driver could in theory provide such accessors, since it just passed requests to the MDIO bus it is on, but it seems unlikely to be useful at the moment. It can however be added later. mt7530 does support C45, but its uses a mix of registering its MDIO bus and using the DSA core provided bus. This makes the change a bit more complex. Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- drivers/net/dsa/mt7530.c | 92 ++++++++++++++++++++++------------------ drivers/net/dsa/mt7530.h | 15 +++++-- include/net/dsa.h | 4 ++ net/dsa/slave.c | 35 +++++++++++++-- 4 files changed, 96 insertions(+), 50 deletions(-)