| 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: <20230620-feature-c45-over-c22-v3-7-9eb37edf7be0@kernel.org>
Date: Wed, 12 Jul 2023 17:07:07 +0200
From: Michael Walle <mwalle@...nel.org>
To: Andrew Lunn <andrew@...n.ch>, Heiner Kallweit <hkallweit1@...il.com>,
Russell King <linux@...linux.org.uk>,
"David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
Yisen Zhuang <yisen.zhuang@...wei.com>,
Salil Mehta <salil.mehta@...wei.com>,
Florian Fainelli <florian.fainelli@...adcom.com>,
Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>,
Marek Behún <kabel@...nel.org>,
Xu Liang <lxu@...linear.com>
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
Simon Horman <simon.horman@...igine.com>, Michael Walle <mwalle@...nel.org>
Subject: [PATCH net-next v3 07/11] net: phy: introduce
phy_mdiobus_read_mmd()
Factor out the low-level MDIO bus access code in
__phy_{read,write}_mmd() into individual helper functions. These can
then be used without a struct phy_device, which is needed in the PHY
probing code.
To decide which access - direct or indirect - is used, move away from
phy_has_c45_registers(). That function only indicates whether the PHY
has C45 registers, but not how they are accessed. Instead look at the
access_mode property.
Export a locked variant of the read for the PHY probing code.
Signed-off-by: Michael Walle <mwalle@...nel.org>
---
v3:
- new patch
---
drivers/net/phy/phy-core.c | 109 +++++++++++++++++++++++++++++++--------------
include/linux/phy.h | 3 ++
2 files changed, 78 insertions(+), 34 deletions(-)
diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index 598023610ee5..4863a85f8385 100644
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -546,6 +546,73 @@ static int mmd_phy_indirect(struct mii_bus *bus, int phy_addr, int devad,
return check_rc ? ret : 0;
}
+static int __phy_mdiobus_read_mmd(struct mii_bus *bus, int phy_addr,
+ enum phy_access_mode access_mode,
+ int devad, u32 regnum)
+{
+ switch (access_mode) {
+ case PHY_ACCESS_C45:
+ return __mdiobus_c45_read(bus, phy_addr, devad, regnum);
+ case PHY_ACCESS_C22:
+ /* ignore return value for legacy reasons */
+ mmd_phy_indirect(bus, phy_addr, devad, regnum, false);
+
+ /* Read the content of the MMD's selected register */
+ return __mdiobus_read(bus, phy_addr, MII_MMD_DATA);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+/**
+ * phy_mdiobus_read_mmd - low-level function for reading a register
+ *
+ * @bus: the target MII bus
+ * @phy_addr: PHY address on the MII bus
+ * @mode: Access mode of the PHY
+ * @devad: The target MMD (0..31)
+ * @regnum: The target register on the MMD (0..65535)
+ *
+ * Similar to phy_read_mmd() except that it can be used without a phydev and
+ * operates on the MII bus.
+ */
+int phy_mdiobus_read_mmd(struct mii_bus *bus, int phy_addr,
+ enum phy_access_mode mode,
+ int devad, u32 regnum)
+{
+ int ret;
+
+ if (regnum > (u16)~0 || devad > 32)
+ return -EINVAL;
+
+ mutex_lock(&bus->mdio_lock);
+ ret = __phy_mdiobus_read_mmd(bus, phy_addr, mode, devad, regnum);
+ mutex_unlock(&bus->mdio_lock);
+
+ return ret;
+}
+EXPORT_SYMBOL(phy_mdiobus_read_mmd);
+
+static int __phy_mdiobus_write_mmd(struct mii_bus *bus, int phy_addr,
+ enum phy_access_mode mode,
+ int devad, u32 regnum, u16 val)
+{
+ switch (mode) {
+ case PHY_ACCESS_C45:
+ return __mdiobus_c45_write(bus, phy_addr, devad, regnum, val);
+ case PHY_ACCESS_C22:
+ /* ignore return value for legacy reasons */
+ mmd_phy_indirect(bus, phy_addr, devad, regnum, false);
+
+ /* Write the data into MMD's selected register */
+ __mdiobus_write(bus, phy_addr, MII_MMD_DATA, val);
+
+ return 0;
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
/**
* __phy_read_mmd - Convenience function for reading a register
* from an MMD on a given PHY.
@@ -557,26 +624,14 @@ static int mmd_phy_indirect(struct mii_bus *bus, int phy_addr, int devad,
*/
int __phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum)
{
- int val;
-
if (regnum > (u16)~0 || devad > 32)
return -EINVAL;
- if (phydev->drv && phydev->drv->read_mmd) {
- val = phydev->drv->read_mmd(phydev, devad, regnum);
- } else if (phy_has_c45_registers(phydev)) {
- val = __mdiobus_c45_read(phydev->mdio.bus, phydev->mdio.addr,
- devad, regnum);
- } else {
- struct mii_bus *bus = phydev->mdio.bus;
- int phy_addr = phydev->mdio.addr;
-
- mmd_phy_indirect(bus, phy_addr, devad, regnum, false);
+ if (phydev->drv && phydev->drv->read_mmd)
+ return phydev->drv->read_mmd(phydev, devad, regnum);
- /* Read the content of the MMD's selected register */
- val = __mdiobus_read(bus, phy_addr, MII_MMD_DATA);
- }
- return val;
+ return __phy_mdiobus_read_mmd(phydev->mdio.bus, phydev->mdio.addr,
+ phydev->access_mode, devad, regnum);
}
EXPORT_SYMBOL(__phy_read_mmd);
@@ -613,28 +668,14 @@ EXPORT_SYMBOL(phy_read_mmd);
*/
int __phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val)
{
- int ret;
-
if (regnum > (u16)~0 || devad > 32)
return -EINVAL;
- if (phydev->drv && phydev->drv->write_mmd) {
- ret = phydev->drv->write_mmd(phydev, devad, regnum, val);
- } else if (phy_has_c45_registers(phydev)) {
- ret = __mdiobus_c45_write(phydev->mdio.bus, phydev->mdio.addr,
- devad, regnum, val);
- } else {
- struct mii_bus *bus = phydev->mdio.bus;
- int phy_addr = phydev->mdio.addr;
-
- mmd_phy_indirect(bus, phy_addr, devad, regnum, false);
-
- /* Write the data into MMD's selected register */
- __mdiobus_write(bus, phy_addr, MII_MMD_DATA, val);
+ if (phydev->drv && phydev->drv->write_mmd)
+ return phydev->drv->write_mmd(phydev, devad, regnum, val);
- ret = 0;
- }
- return ret;
+ return __phy_mdiobus_write_mmd(phydev->mdio.bus, phydev->mdio.addr,
+ phydev->access_mode, devad, regnum, val);
}
EXPORT_SYMBOL(__phy_write_mmd);
diff --git a/include/linux/phy.h b/include/linux/phy.h
index cd67887a7289..a482696a17a6 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1337,6 +1337,9 @@ int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum);
__ret; \
})
+int phy_mdiobus_read_mmd(struct mii_bus *bus, int phy_addr,
+ enum phy_access_mode mode,
+ int devad, u32 regnum);
/*
* __phy_read_mmd - Convenience function for reading a register
* from an MMD on a given PHY.
--
2.39.2
Powered by blists - more mailing lists