From: Michael Walle <michael@walle.cc>
To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc: Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
"David S . Miller" <davem@davemloft.net>,
Vladimir Oltean <vladimir.oltean@nxp.com>,
Michael Walle <michael@walle.cc>
Subject: [RFC PATCH net-next 2/3] net: phy: bcm54140: use phy_package_shared
Date: Tue, 21 Apr 2020 01:26:23 +0200 [thread overview]
Message-ID: <20200420232624.9127-2-michael@walle.cc> (raw)
In-Reply-To: <20200420232624.9127-1-michael@walle.cc>
Use the new phy_package_shared common storage to ease the package
initialization and to access the global registers.
Signed-off-by: Michael Walle <michael@walle.cc>
---
drivers/net/phy/bcm54140.c | 57 ++++++++------------------------------
1 file changed, 11 insertions(+), 46 deletions(-)
diff --git a/drivers/net/phy/bcm54140.c b/drivers/net/phy/bcm54140.c
index aa854477e06a..97b9e1c763da 100644
--- a/drivers/net/phy/bcm54140.c
+++ b/drivers/net/phy/bcm54140.c
@@ -122,7 +122,6 @@ struct bcm54140_priv {
int port;
int base_addr;
#if IS_ENABLED(CONFIG_HWMON)
- bool pkg_init;
/* protect the alarm bits */
struct mutex alarm_lock;
u16 alarm;
@@ -395,36 +394,6 @@ static int bcm54140_enable_monitoring(struct phy_device *phydev)
return bcm_phy_modify_rdb(phydev, BCM54140_RDB_MON_CTRL, mask, set);
}
-/* Check if one PHY has already done the init of the parts common to all PHYs
- * in the Quad PHY package.
- */
-static bool bcm54140_is_pkg_init(struct phy_device *phydev)
-{
- struct bcm54140_priv *priv = phydev->priv;
- struct mii_bus *bus = phydev->mdio.bus;
- int base_addr = priv->base_addr;
- struct phy_device *phy;
- int i;
-
- /* Quad PHY */
- for (i = 0; i < 4; i++) {
- phy = mdiobus_get_phy(bus, base_addr + i);
- if (!phy)
- continue;
-
- if ((phy->phy_id & phydev->drv->phy_id_mask) !=
- (phydev->drv->phy_id & phydev->drv->phy_id_mask))
- continue;
-
- priv = phy->priv;
-
- if (priv && priv->pkg_init)
- return true;
- }
-
- return false;
-}
-
static int bcm54140_probe_once(struct phy_device *phydev)
{
struct device *hwmon;
@@ -445,38 +414,34 @@ static int bcm54140_probe_once(struct phy_device *phydev)
static int bcm54140_base_read_rdb(struct phy_device *phydev, u16 rdb)
{
- struct bcm54140_priv *priv = phydev->priv;
- struct mii_bus *bus = phydev->mdio.bus;
int ret;
- mutex_lock(&bus->mdio_lock);
- ret = __mdiobus_write(bus, priv->base_addr, MII_BCM54XX_RDB_ADDR, rdb);
+ phy_lock_mdio_bus(phydev);
+ ret = __phy_package_write(phydev, MII_BCM54XX_RDB_ADDR, rdb);
if (ret < 0)
goto out;
- ret = __mdiobus_read(bus, priv->base_addr, MII_BCM54XX_RDB_DATA);
+ ret = __phy_package_read(phydev, MII_BCM54XX_RDB_DATA);
out:
- mutex_unlock(&bus->mdio_lock);
+ phy_unlock_mdio_bus(phydev);
return ret;
}
static int bcm54140_base_write_rdb(struct phy_device *phydev,
u16 rdb, u16 val)
{
- struct bcm54140_priv *priv = phydev->priv;
- struct mii_bus *bus = phydev->mdio.bus;
int ret;
- mutex_lock(&bus->mdio_lock);
- ret = __mdiobus_write(bus, priv->base_addr, MII_BCM54XX_RDB_ADDR, rdb);
+ phy_lock_mdio_bus(phydev);
+ ret = __phy_package_write(phydev, MII_BCM54XX_RDB_ADDR, rdb);
if (ret < 0)
goto out;
- ret = __mdiobus_write(bus, priv->base_addr, MII_BCM54XX_RDB_DATA, val);
+ ret = __phy_package_write(phydev, MII_BCM54XX_RDB_DATA, val);
out:
- mutex_unlock(&bus->mdio_lock);
+ phy_unlock_mdio_bus(phydev);
return ret;
}
@@ -606,16 +571,16 @@ static int bcm54140_probe(struct phy_device *phydev)
if (ret)
return ret;
+ devm_phy_package_join(&phydev->mdio.dev, phydev, priv->base_addr);
+
#if IS_ENABLED(CONFIG_HWMON)
mutex_init(&priv->alarm_lock);
- if (!bcm54140_is_pkg_init(phydev)) {
+ if (phy_package_init_once(phydev)) {
ret = bcm54140_probe_once(phydev);
if (ret)
return ret;
}
-
- priv->pkg_init = true;
#endif
phydev_dbg(phydev, "probed (port %d, base PHY address %d)\n",
--
2.20.1
next prev parent reply other threads:[~2020-04-20 23:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-20 23:26 [RFC PATCH net-next 1/3] net: phy: add concept of shared storage for PHYs Michael Walle
2020-04-20 23:26 ` Michael Walle [this message]
2020-04-20 23:26 ` [RFC PATCH net-next 3/3] net: phy: mscc: use phy_package_shared Michael Walle
2020-04-23 12:27 ` Vladimir Oltean
2020-04-21 14:34 ` [RFC PATCH net-next 1/3] net: phy: add concept of shared storage for PHYs Andrew Lunn
2020-04-21 14:43 ` Russell King - ARM Linux admin
2020-04-21 14:52 ` Andrew Lunn
2020-04-21 15:20 ` Michael Walle
2020-04-21 15:25 ` Michael Walle
2020-04-21 15:50 ` Andrew Lunn
2020-04-21 19:08 ` Michael Walle
2020-04-21 19:30 ` Andrew Lunn
2020-04-21 19:38 ` Russell King - ARM Linux admin
2020-04-21 21:19 ` Michael Walle
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=20200420232624.9127-2-michael@walle.cc \
--to=michael@walle.cc \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=vladimir.oltean@nxp.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).