From: Luiz Angelo Daros de Luca <luizluca@gmail•com>
To: netdev@vger•kernel.org
Cc: linus.walleij@linaro•org, andrew@lunn•ch,
vivien.didelot@gmail•com, f.fainelli@gmail•com,
olteanv@gmail•com, alsi@bang-olufsen•dk, arinc.unal@arinc9•com,
frank-w@public-files•de, davem@davemloft•net, kuba@kernel•org,
Luiz Angelo Daros de Luca <luizluca@gmail•com>
Subject: [PATCH net-next v6 04/13] net: dsa: realtek: remove direct calls to realtek-smi
Date: Fri, 28 Jan 2022 03:05:00 -0300 [thread overview]
Message-ID: <20220128060509.13800-5-luizluca@gmail.com> (raw)
In-Reply-To: <20220128060509.13800-1-luizluca@gmail.com>
Remove the only two direct calls from subdrivers to realtek-smi.
Now they are called from realtek_priv. Subdrivers can now be
linked independently from realtek-smi.
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail•com>
Reviewed-by: Alvin Šipraga <alsi@bang-olufsen•dk>
Reviewed-by: Linus Walleij <linus.walleij@linaro•org>
Reviewed-by: Florian Fainelli <f.fainelli@gmail•com>
---
drivers/net/dsa/realtek/realtek-smi-core.c | 16 +++++++++-------
drivers/net/dsa/realtek/realtek.h | 7 ++-----
drivers/net/dsa/realtek/rtl8365mb.c | 15 ++++++++-------
drivers/net/dsa/realtek/rtl8366rb.c | 14 ++++++++------
4 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/drivers/net/dsa/realtek/realtek-smi-core.c b/drivers/net/dsa/realtek/realtek-smi-core.c
index 7dfd86a99c24..5fb86ae2339c 100644
--- a/drivers/net/dsa/realtek/realtek-smi-core.c
+++ b/drivers/net/dsa/realtek/realtek-smi-core.c
@@ -292,12 +292,10 @@ static int realtek_smi_write_reg(struct realtek_priv *priv,
* is when issueing soft reset. Since the device reset as soon as we write
* that bit, no ACK will come back for natural reasons.
*/
-int realtek_smi_write_reg_noack(struct realtek_priv *priv, u32 addr,
- u32 data)
+static int realtek_smi_write_reg_noack(void *ctx, u32 reg, u32 val)
{
- return realtek_smi_write_reg(priv, addr, data, false);
+ return realtek_smi_write_reg(ctx, reg, val, false);
}
-EXPORT_SYMBOL_GPL(realtek_smi_write_reg_noack);
/* Regmap accessors */
@@ -342,8 +340,9 @@ static int realtek_smi_mdio_write(struct mii_bus *bus, int addr, int regnum,
return priv->ops->phy_write(priv, addr, regnum, val);
}
-int realtek_smi_setup_mdio(struct realtek_priv *priv)
+static int realtek_smi_setup_mdio(struct dsa_switch *ds)
{
+ struct realtek_priv *priv = ds->priv;
struct device_node *mdio_np;
int ret;
@@ -363,10 +362,10 @@ int realtek_smi_setup_mdio(struct realtek_priv *priv)
priv->slave_mii_bus->read = realtek_smi_mdio_read;
priv->slave_mii_bus->write = realtek_smi_mdio_write;
snprintf(priv->slave_mii_bus->id, MII_BUS_ID_SIZE, "SMI-%d",
- priv->ds->index);
+ ds->index);
priv->slave_mii_bus->dev.of_node = mdio_np;
priv->slave_mii_bus->parent = priv->dev;
- priv->ds->slave_mii_bus = priv->slave_mii_bus;
+ ds->slave_mii_bus = priv->slave_mii_bus;
ret = devm_of_mdiobus_register(priv->dev, priv->slave_mii_bus, mdio_np);
if (ret) {
@@ -413,6 +412,9 @@ static int realtek_smi_probe(struct platform_device *pdev)
priv->cmd_write = var->cmd_write;
priv->ops = var->ops;
+ priv->setup_interface = realtek_smi_setup_mdio;
+ priv->write_reg_noack = realtek_smi_write_reg_noack;
+
dev_set_drvdata(dev, priv);
spin_lock_init(&priv->lock);
diff --git a/drivers/net/dsa/realtek/realtek.h b/drivers/net/dsa/realtek/realtek.h
index 6e8d385d628c..4152eba851be 100644
--- a/drivers/net/dsa/realtek/realtek.h
+++ b/drivers/net/dsa/realtek/realtek.h
@@ -66,6 +66,8 @@ struct realtek_priv {
struct rtl8366_mib_counter *mib_counters;
const struct realtek_ops *ops;
+ int (*setup_interface)(struct dsa_switch *ds);
+ int (*write_reg_noack)(void *ctx, u32 addr, u32 data);
int vlan_enabled;
int vlan4k_enabled;
@@ -115,11 +117,6 @@ struct realtek_variant {
size_t chip_data_sz;
};
-/* SMI core calls */
-int realtek_smi_write_reg_noack(struct realtek_priv *priv, u32 addr,
- u32 data);
-int realtek_smi_setup_mdio(struct realtek_priv *priv);
-
/* RTL8366 library helpers */
int rtl8366_mc_is_used(struct realtek_priv *priv, int mc_index, int *used);
int rtl8366_set_vlan(struct realtek_priv *priv, int vid, u32 member,
diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c
index 6b8797ba80c6..a50cae28b7ae 100644
--- a/drivers/net/dsa/realtek/rtl8365mb.c
+++ b/drivers/net/dsa/realtek/rtl8365mb.c
@@ -1767,9 +1767,8 @@ static int rtl8365mb_reset_chip(struct realtek_priv *priv)
{
u32 val;
- realtek_smi_write_reg_noack(priv, RTL8365MB_CHIP_RESET_REG,
- FIELD_PREP(RTL8365MB_CHIP_RESET_HW_MASK,
- 1));
+ priv->write_reg_noack(priv, RTL8365MB_CHIP_RESET_REG,
+ FIELD_PREP(RTL8365MB_CHIP_RESET_HW_MASK, 1));
/* Realtek documentation says the chip needs 1 second to reset. Sleep
* for 100 ms before accessing any registers to prevent ACK timeouts.
@@ -1849,10 +1848,12 @@ static int rtl8365mb_setup(struct dsa_switch *ds)
if (ret)
goto out_teardown_irq;
- ret = realtek_smi_setup_mdio(priv);
- if (ret) {
- dev_err(priv->dev, "could not set up MDIO bus\n");
- goto out_teardown_irq;
+ if (priv->setup_interface) {
+ ret = priv->setup_interface(ds);
+ if (ret) {
+ dev_err(priv->dev, "could not set up MDIO bus\n");
+ goto out_teardown_irq;
+ }
}
/* Start statistics counter polling */
diff --git a/drivers/net/dsa/realtek/rtl8366rb.c b/drivers/net/dsa/realtek/rtl8366rb.c
index fa222a6dac87..b301408028ef 100644
--- a/drivers/net/dsa/realtek/rtl8366rb.c
+++ b/drivers/net/dsa/realtek/rtl8366rb.c
@@ -1030,10 +1030,12 @@ static int rtl8366rb_setup(struct dsa_switch *ds)
if (ret)
dev_info(priv->dev, "no interrupt support\n");
- ret = realtek_smi_setup_mdio(priv);
- if (ret) {
- dev_info(priv->dev, "could not set up MDIO bus\n");
- return -ENODEV;
+ if (priv->setup_interface) {
+ ret = priv->setup_interface(ds);
+ if (ret) {
+ dev_err(priv->dev, "could not set up MDIO bus\n");
+ return -ENODEV;
+ }
}
return 0;
@@ -1707,8 +1709,8 @@ static int rtl8366rb_reset_chip(struct realtek_priv *priv)
u32 val;
int ret;
- realtek_smi_write_reg_noack(priv, RTL8366RB_RESET_CTRL_REG,
- RTL8366RB_CHIP_CTRL_RESET_HW);
+ priv->write_reg_noack(priv, RTL8366RB_RESET_CTRL_REG,
+ RTL8366RB_CHIP_CTRL_RESET_HW);
do {
usleep_range(20000, 25000);
ret = regmap_read(priv->map, RTL8366RB_RESET_CTRL_REG, &val);
--
2.34.1
next prev parent reply other threads:[~2022-01-28 6:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 6:04 [PATCH net-next v6 00/13] net: dsa: realtek: MDIO interface and RTL8367S,RTL8367RB-VB Luiz Angelo Daros de Luca
2022-01-28 6:04 ` [PATCH net-next v6 01/13] net: dsa: realtek-smi: fix kdoc warnings Luiz Angelo Daros de Luca
2022-01-28 16:04 ` Florian Fainelli
2022-01-28 6:04 ` [PATCH net-next v6 02/13] net: dsa: realtek-smi: move to subdirectory Luiz Angelo Daros de Luca
2022-01-28 6:04 ` [PATCH net-next v6 03/13] net: dsa: realtek: rename realtek_smi to realtek_priv Luiz Angelo Daros de Luca
2022-01-28 6:05 ` Luiz Angelo Daros de Luca [this message]
2022-01-28 6:05 ` [PATCH net-next v6 05/13] net: dsa: realtek: convert subdrivers into modules Luiz Angelo Daros de Luca
2022-02-04 1:58 ` Jakub Kicinski
2022-02-04 7:57 ` Arınç ÜNAL
2022-02-04 15:53 ` Jakub Kicinski
2022-01-28 6:05 ` [PATCH net-next v6 06/13] net: dsa: realtek: add new mdio interface for drivers Luiz Angelo Daros de Luca
2022-01-28 6:05 ` [PATCH net-next v6 07/13] net: dsa: realtek: rtl8365mb: rename extport to extint Luiz Angelo Daros de Luca
2022-01-28 6:05 ` [PATCH net-next v6 08/13] net: dsa: realtek: rtl8365mb: use GENMASK(n-1,0) instead of BIT(n)-1 Luiz Angelo Daros de Luca
2022-01-28 6:05 ` [PATCH net-next v6 09/13] net: dsa: realtek: rtl8365mb: use DSA CPU port Luiz Angelo Daros de Luca
2022-01-28 6:05 ` [PATCH net-next v6 10/13] net: dsa: realtek: rtl8365mb: add RTL8367S support Luiz Angelo Daros de Luca
2022-01-28 6:05 ` [PATCH net-next v6 11/13] net: dsa: realtek: rtl8365mb: add RTL8367RB-VB support Luiz Angelo Daros de Luca
2022-01-28 9:44 ` Arınç ÜNAL
2022-01-28 15:57 ` Luiz Angelo Daros de Luca
2022-01-28 6:05 ` [PATCH net-next v6 12/13] net: dsa: realtek: rtl8365mb: allow non-cpu extint ports Luiz Angelo Daros de Luca
2022-01-28 6:05 ` [PATCH net-next v6 13/13] net: dsa: realtek: rtl8365mb: fix trap_door > 7 Luiz Angelo Daros de Luca
2022-01-28 15:10 ` [PATCH net-next v6 00/13] net: dsa: realtek: MDIO interface and RTL8367S,RTL8367RB-VB patchwork-bot+netdevbpf
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=20220128060509.13800-5-luizluca@gmail.com \
--to=luizluca@gmail$(echo .)com \
--cc=alsi@bang-olufsen$(echo .)dk \
--cc=andrew@lunn$(echo .)ch \
--cc=arinc.unal@arinc9$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=frank-w@public-files$(echo .)de \
--cc=kuba@kernel$(echo .)org \
--cc=linus.walleij@linaro$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=olteanv@gmail$(echo .)com \
--cc=vivien.didelot@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox