| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20211216201342.25587-6-luizluca@gmail.com>
Date: Thu, 16 Dec 2021 17:13:34 -0300
From: luizluca@...il.com
To: netdev@...r.kernel.org
Cc: linus.walleij@...aro.org, andrew@...n.ch, vivien.didelot@...il.com,
f.fainelli@...il.com, olteanv@...il.com, alsi@...g-olufsen.dk,
arinc.unal@...nc9.com,
Luiz Angelo Daros de Luca <luizluca@...il.com>
Subject: [PATCH net-next 05/13] net: dsa: realtek: use phy_read in ds->ops
From: Luiz Angelo Daros de Luca <luizluca@...il.com>
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.
Tested-by: Arınç ÜNAL <arinc.unal@...nc9.com>
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@...il.com>
---
drivers/net/dsa/realtek/realtek-smi.c | 8 ++++----
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(+), 15 deletions(-)
diff --git a/drivers/net/dsa/realtek/realtek-smi.c b/drivers/net/dsa/realtek/realtek-smi.c
index 11447096c8dc..f10acd7d3636 100644
--- a/drivers/net/dsa/realtek/realtek-smi.c
+++ b/drivers/net/dsa/realtek/realtek-smi.c
@@ -328,17 +328,17 @@ 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 = ((struct realtek_priv *)bus->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 = ((struct realtek_priv *)bus->priv)->ds;
- return priv->ops->phy_write(priv, addr, regnum, val);
+ return ds->ops->phy_write(ds, addr, regnum, val);
}
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 766e79151a6c..daca0c0b7ea2 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 d6054f63f204..488b17a68226 100644
--- a/drivers/net/dsa/realtek/rtl8365mb.c
+++ b/drivers/net/dsa/realtek/rtl8365mb.c
@@ -674,11 +674,12 @@ 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)
{
u32 ocp_addr;
u16 val;
int ret;
+ struct realtek_priv *priv = ds->priv;
if (phy > RTL8365MB_PHYADDRMAX)
return -EINVAL;
@@ -702,11 +703,12 @@ 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)
{
u32 ocp_addr;
int ret;
+ struct realtek_priv *priv = (struct realtek_priv *)ds->priv;
if (phy > RTL8365MB_PHYADDRMAX)
return -EINVAL;
@@ -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 31f1a949c8e7..27f08a5f53d4 100644
--- a/drivers/net/dsa/realtek/rtl8366rb.c
+++ b/drivers/net/dsa/realtek/rtl8366rb.c
@@ -1639,11 +1639,12 @@ 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)
{
u32 val;
u32 reg;
int ret;
+ struct realtek_priv *priv = ds->priv;
if (phy > RTL8366RB_PHY_NO_MAX)
return -EINVAL;
@@ -1673,11 +1674,12 @@ 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)
{
u32 reg;
int ret;
+ struct realtek_priv *priv = ds->priv;
if (phy > RTL8366RB_PHY_NO_MAX)
return -EINVAL;
@@ -1767,6 +1769,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,
@@ -1799,8 +1803,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 = {
--
2.34.0
Powered by blists - more mailing lists