Re: [PATCH net-next v4 05/11] net: dsa: realtek: use phy_read in ds->ops

["Alvin Šipraga" <ALSI@bang-olufsen.dk>]

Luiz Angelo Daros de Luca <luizluca@gmail.com> writes:

> The ds->ops->phy_read will only be used if the ds->slave_mii_bus
> was not initialized. Calling realtek_smi_setup_mdio will create a
> ds->slave_mii_bus, making ds->ops->phy_read dormant.
>
> Using ds->ops->phy_read will allow switches connected through non-SMI
> interfaces (like mdio) to let ds allocate slave_mii_bus and reuse the
> same code.
>
> Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
> Tested-by: Arınç ÜNAL <arinc.unal@arinc9.com>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk>

> ---
>  drivers/net/dsa/realtek/realtek-smi.c |  6 ++++--
>  drivers/net/dsa/realtek/realtek.h     |  3 ---
>  drivers/net/dsa/realtek/rtl8365mb.c   | 10 ++++++----
>  drivers/net/dsa/realtek/rtl8366rb.c   | 10 ++++++----
>  4 files changed, 16 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/dsa/realtek/realtek-smi.c b/drivers/net/dsa/realtek/realtek-smi.c
> index 5514fe81d64f..1f024e2520a6 100644
> --- a/drivers/net/dsa/realtek/realtek-smi.c
> +++ b/drivers/net/dsa/realtek/realtek-smi.c
> @@ -329,16 +329,18 @@ static const struct regmap_config realtek_smi_mdio_regmap_config = {
>  static int realtek_smi_mdio_read(struct mii_bus *bus, int addr, int regnum)
>  {
>  	struct realtek_priv *priv = bus->priv;
> +	struct dsa_switch *ds = priv->ds;
>  
> -	return priv->ops->phy_read(priv, addr, regnum);
> +	return ds->ops->phy_read(ds, addr, regnum);
>  }
>  
>  static int realtek_smi_mdio_write(struct mii_bus *bus, int addr, int regnum,
>  				  u16 val)
>  {
>  	struct realtek_priv *priv = bus->priv;
> +	struct dsa_switch *ds = priv->ds;
>  
> -	return priv->ops->phy_write(priv, addr, regnum, val);
> +	return ds->ops->phy_write(ds, addr, regnum, val);
>  }
>  
>  static int realtek_smi_setup_mdio(struct dsa_switch *ds)
> diff --git a/drivers/net/dsa/realtek/realtek.h b/drivers/net/dsa/realtek/realtek.h
> index 58814de563a2..a03de15c4a94 100644
> --- a/drivers/net/dsa/realtek/realtek.h
> +++ b/drivers/net/dsa/realtek/realtek.h
> @@ -103,9 +103,6 @@ struct realtek_ops {
>  	int	(*enable_vlan)(struct realtek_priv *priv, bool enable);
>  	int	(*enable_vlan4k)(struct realtek_priv *priv, bool enable);
>  	int	(*enable_port)(struct realtek_priv *priv, int port, bool enable);
> -	int	(*phy_read)(struct realtek_priv *priv, int phy, int regnum);
> -	int	(*phy_write)(struct realtek_priv *priv, int phy, int regnum,
> -			     u16 val);
>  };
>  
>  struct realtek_variant {
> diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c
> index b52bb987027c..11a985900c57 100644
> --- a/drivers/net/dsa/realtek/rtl8365mb.c
> +++ b/drivers/net/dsa/realtek/rtl8365mb.c
> @@ -674,8 +674,9 @@ static int rtl8365mb_phy_ocp_write(struct realtek_priv *priv, int phy,
>  	return 0;
>  }
>  
> -static int rtl8365mb_phy_read(struct realtek_priv *priv, int phy, int regnum)
> +static int rtl8365mb_phy_read(struct dsa_switch *ds, int phy, int regnum)
>  {
> +	struct realtek_priv *priv = ds->priv;
>  	u32 ocp_addr;
>  	u16 val;
>  	int ret;
> @@ -702,9 +703,10 @@ static int rtl8365mb_phy_read(struct realtek_priv *priv, int phy, int regnum)
>  	return val;
>  }
>  
> -static int rtl8365mb_phy_write(struct realtek_priv *priv, int phy, int regnum,
> +static int rtl8365mb_phy_write(struct dsa_switch *ds, int phy, int regnum,
>  			       u16 val)
>  {
> +	struct realtek_priv *priv = (struct realtek_priv *)ds->priv;
>  	u32 ocp_addr;
>  	int ret;
>  
> @@ -1958,6 +1960,8 @@ static const struct dsa_switch_ops rtl8365mb_switch_ops = {
>  	.get_tag_protocol = rtl8365mb_get_tag_protocol,
>  	.setup = rtl8365mb_setup,
>  	.teardown = rtl8365mb_teardown,
> +	.phy_read = rtl8365mb_phy_read,
> +	.phy_write = rtl8365mb_phy_write,
>  	.phylink_validate = rtl8365mb_phylink_validate,
>  	.phylink_mac_config = rtl8365mb_phylink_mac_config,
>  	.phylink_mac_link_down = rtl8365mb_phylink_mac_link_down,
> @@ -1974,8 +1978,6 @@ static const struct dsa_switch_ops rtl8365mb_switch_ops = {
>  
>  static const struct realtek_ops rtl8365mb_ops = {
>  	.detect = rtl8365mb_detect,
> -	.phy_read = rtl8365mb_phy_read,
> -	.phy_write = rtl8365mb_phy_write,
>  };
>  
>  const struct realtek_variant rtl8365mb_variant = {
> diff --git a/drivers/net/dsa/realtek/rtl8366rb.c b/drivers/net/dsa/realtek/rtl8366rb.c
> index ff607608dead..4576f9b797c5 100644
> --- a/drivers/net/dsa/realtek/rtl8366rb.c
> +++ b/drivers/net/dsa/realtek/rtl8366rb.c
> @@ -1641,8 +1641,9 @@ static int rtl8366rb_enable_vlan4k(struct realtek_priv *priv, bool enable)
>  				  enable ? RTL8366RB_SGCR_EN_VLAN_4KTB : 0);
>  }
>  
> -static int rtl8366rb_phy_read(struct realtek_priv *priv, int phy, int regnum)
> +static int rtl8366rb_phy_read(struct dsa_switch *ds, int phy, int regnum)
>  {
> +	struct realtek_priv *priv = ds->priv;
>  	u32 val;
>  	u32 reg;
>  	int ret;
> @@ -1675,9 +1676,10 @@ static int rtl8366rb_phy_read(struct realtek_priv *priv, int phy, int regnum)
>  	return val;
>  }
>  
> -static int rtl8366rb_phy_write(struct realtek_priv *priv, int phy, int regnum,
> +static int rtl8366rb_phy_write(struct dsa_switch *ds, int phy, int regnum,
>  			       u16 val)
>  {
> +	struct realtek_priv *priv = ds->priv;
>  	u32 reg;
>  	int ret;
>  
> @@ -1769,6 +1771,8 @@ static int rtl8366rb_detect(struct realtek_priv *priv)
>  static const struct dsa_switch_ops rtl8366rb_switch_ops = {
>  	.get_tag_protocol = rtl8366_get_tag_protocol,
>  	.setup = rtl8366rb_setup,
> +	.phy_read = rtl8366rb_phy_read,
> +	.phy_write = rtl8366rb_phy_write,
>  	.phylink_mac_link_up = rtl8366rb_mac_link_up,
>  	.phylink_mac_link_down = rtl8366rb_mac_link_down,
>  	.get_strings = rtl8366_get_strings,
> @@ -1801,8 +1805,6 @@ static const struct realtek_ops rtl8366rb_ops = {
>  	.is_vlan_valid	= rtl8366rb_is_vlan_valid,
>  	.enable_vlan	= rtl8366rb_enable_vlan,
>  	.enable_vlan4k	= rtl8366rb_enable_vlan4k,
> -	.phy_read	= rtl8366rb_phy_read,
> -	.phy_write	= rtl8366rb_phy_write,
>  };
>  
>  const struct realtek_variant rtl8366rb_variant = {