From: Vladimir Oltean <olteanv@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>
Cc: netdev <netdev@vger.kernel.org>,
Sean Wang <sean.wang@mediatek.com>,
Landen Chao <Landen.Chao@mediatek.com>,
DENG Qingfang <dqfext@gmail.com>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Joakim Zhang <qiangqing.zhang@nxp.com>,
Sergey Shtylyov <s.shtylyov@omp.ru>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Tobias Waldekranz <tobias@waldekranz.com>,
Marcin Wojtas <mw@semihalf.com>,
Calvin Johnson <calvin.johnson@oss.nxp.com>,
Markus Koch <markus@notsyncing.net>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Yang Yingliang <yangyingliang@huawei.com>,
Hao Chen <chenhao288@hisilicon.com>
Subject: Re: [PATCH net-next 09/10] net: dsa: Separate C22 and C45 MDIO bus transaction methods
Date: Tue, 10 May 2022 22:05:16 +0300 [thread overview]
Message-ID: <20220510190516.rbrpkfe3rfvodcn2@skbuf> (raw)
In-Reply-To: <20220508153049.427227-10-andrew@lunn.ch>
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
>
next prev parent reply other threads:[~2022-05-10 19:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-08 15:30 [PATCH net-next 00/10] net: mdio: Start separating C22 and C45 Andrew Lunn
2022-05-08 15:30 ` [PATCH net-next 01/10] net: mdio: Add dedicated C45 API to MDIO bus drivers Andrew Lunn
2022-05-08 15:30 ` [PATCH net-next 02/10] net: mdio: mdiobus_register: Update validation test Andrew Lunn
2022-05-09 7:49 ` Sergey Shtylyov
2022-05-08 15:30 ` [PATCH net-next 03/10] net: mdio: C22 is now optional, EOPNOTSUPP if not provided Andrew Lunn
2022-05-08 15:30 ` [PATCH net-next 04/10] net: mdio: Move mdiobus_c45_addr() next to users Andrew Lunn
2022-05-08 15:30 ` [PATCH net-next 05/10] net: mdio: mdio-bitbang: Separate C22 and C45 transactions Andrew Lunn
2022-05-09 7:52 ` Geert Uytterhoeven
2022-05-08 15:30 ` [PATCH net-next 06/10] net: mdio: mvmdio: Convert XSMI bus to new API Andrew Lunn
2022-05-08 15:30 ` [PATCH net-next 07/10] net: ethernet: freescale: xgmac: Separate C22 and C45 transactions for xgmac Andrew Lunn
2022-05-10 18:28 ` Vladimir Oltean
2022-05-10 19:01 ` Andrew Lunn
2022-05-10 19:09 ` Vladimir Oltean
2022-05-08 15:30 ` [PATCH net-next 08/10] net: ethernet: freescale: fec: " Andrew Lunn
2022-05-10 18:30 ` Vladimir Oltean
2022-05-08 15:30 ` [PATCH net-next 09/10] net: dsa: Separate C22 and C45 MDIO bus transaction methods Andrew Lunn
2022-05-08 17:36 ` kernel test robot
2022-05-08 19:19 ` kernel test robot
2022-05-10 19:05 ` Vladimir Oltean [this message]
2022-05-08 15:30 ` [PATCH net-next 10/10] net: dsa: mv88e6xxx: Separate C22 and C45 transactions Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220510190516.rbrpkfe3rfvodcn2@skbuf \
--to=olteanv@gmail.com \
--cc=Landen.Chao@mediatek.com \
--cc=andrew@lunn.ch \
--cc=calvin.johnson@oss.nxp.com \
--cc=chenhao288@hisilicon.com \
--cc=dqfext@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=geert+renesas@glider.be \
--cc=hkallweit1@gmail.com \
--cc=linux@armlinux.org.uk \
--cc=markus@notsyncing.net \
--cc=matthias.bgg@gmail.com \
--cc=mw@semihalf.com \
--cc=netdev@vger.kernel.org \
--cc=qiangqing.zhang@nxp.com \
--cc=s.shtylyov@omp.ru \
--cc=sean.wang@mediatek.com \
--cc=tobias@waldekranz.com \
--cc=vivien.didelot@gmail.com \
--cc=yangyingliang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.