From: "Marek Behún" <kabel@kernel•org>
To: netdev@vger•kernel.org
Cc: davem@davemloft•net, "Marek Behún" <kabel@kernel•org>,
"Andrew Lunn" <andrew@lunn•ch>,
"Russell King" <rmk+kernel@armlinux•org.uk>
Subject: [PATCH net-next 3/5] net: sfp: configure/destroy I2C mdiobus on transceiver plug/unplug
Date: Wed, 28 Oct 2020 23:14:25 +0100 [thread overview]
Message-ID: <20201028221427.22968-4-kabel@kernel.org> (raw)
In-Reply-To: <20201028221427.22968-1-kabel@kernel.org>
Instead of configuring the I2C mdiobus when SFP driver is probed,
configure/destroy the mdiobus when SFP transceiver is plugged/unplugged.
This way we can tell the mdio-i2c code which protocol to use for each
SFP transceiver.
Signed-off-by: Marek Behún <kabel@kernel•org>
Cc: Andrew Lunn <andrew@lunn•ch>
Cc: Russell King <rmk+kernel@armlinux•org.uk>
---
drivers/net/phy/sfp.c | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index b1f9fc3a5584..a392d5fc6ab4 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -399,9 +399,6 @@ static int sfp_i2c_write(struct sfp *sfp, bool a2, u8 dev_addr, void *buf,
static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
{
- struct mii_bus *i2c_mii;
- int ret;
-
if (!i2c_check_functionality(i2c, I2C_FUNC_I2C))
return -EINVAL;
@@ -409,7 +406,15 @@ static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
sfp->read = sfp_i2c_read;
sfp->write = sfp_i2c_write;
- i2c_mii = mdio_i2c_alloc(sfp->dev, i2c, MDIO_I2C_DEFAULT);
+ return 0;
+}
+
+static int sfp_i2c_mdiobus_configure(struct sfp *sfp, enum mdio_i2c_type type)
+{
+ struct mii_bus *i2c_mii;
+ int ret;
+
+ i2c_mii = mdio_i2c_alloc(sfp->dev, sfp->i2c, type);
if (IS_ERR(i2c_mii))
return PTR_ERR(i2c_mii);
@@ -427,6 +432,12 @@ static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
return 0;
}
+static void sfp_i2c_mdiobus_destroy(struct sfp *sfp)
+{
+ mdiobus_unregister(sfp->i2c_mii);
+ sfp->i2c_mii = NULL;
+}
+
/* Interface */
static int sfp_read(struct sfp *sfp, bool a2, u8 addr, void *buf, size_t len)
{
@@ -1768,6 +1779,11 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool report)
else
sfp->module_t_start_up = T_START_UP;
+ /* Configure mdiobus */
+ ret = sfp_i2c_mdiobus_configure(sfp, MDIO_I2C_DEFAULT);
+ if (ret < 0)
+ return ret;
+
return 0;
}
@@ -1778,6 +1794,8 @@ static void sfp_sm_mod_remove(struct sfp *sfp)
sfp_hwmon_remove(sfp);
+ sfp_i2c_mdiobus_destroy(sfp);
+
memset(&sfp->id, 0, sizeof(sfp->id));
sfp->module_power_mW = 0;
--
2.26.2
next prev parent reply other threads:[~2020-10-28 22:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 22:14 [PATCH net-next 0/5] Support for RollBall 10G copper SFP modules Marek Behún
2020-10-28 22:14 ` [PATCH net-next 1/5] net: phy: mdio-i2c: support I2C MDIO protocol for RollBall " Marek Behún
2020-10-29 12:41 ` Russell King - ARM Linux admin
2020-10-29 12:54 ` Andrew Lunn
2020-10-29 13:41 ` Russell King - ARM Linux admin
2020-10-29 22:53 ` Jakub Kicinski
2020-10-29 22:55 ` Marek Behún
2020-10-29 16:46 ` Marek Behún
2020-10-28 22:14 ` [PATCH net-next 2/5] net: phylink: allow attaching phy for SFP modules on 802.3z mode Marek Behún
2020-10-29 12:08 ` Russell King - ARM Linux admin
2020-10-28 22:14 ` Marek Behún [this message]
2020-10-29 13:21 ` [PATCH net-next 3/5] net: sfp: configure/destroy I2C mdiobus on transceiver plug/unplug Russell King - ARM Linux admin
2020-10-28 22:14 ` [PATCH net-next 4/5] net: phy: marvell10g: change MACTYPE if underlying MAC does not support it Marek Behún
2020-10-29 13:21 ` Russell King - ARM Linux admin
2020-10-28 22:14 ` [PATCH net-next 5/5] net: sfp: add support for multigig RollBall transceivers Marek Behún
2020-10-29 13:38 ` Russell King - ARM Linux admin
2020-10-29 16:49 ` Marek Behún
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=20201028221427.22968-4-kabel@kernel.org \
--to=kabel@kernel$(echo .)org \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rmk+kernel@armlinux$(echo .)org.uk \
/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