From: Michael Walle <michael@walle.cc>
To: Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: "David S . Miller" <davem@davemloft.net>,
Xu Liang <lxu@maxlinear.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Florian Fainelli <f.fainelli@gmail.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Michael Walle <michael@walle.cc>
Subject: [PATCH RFC net-next v2 3/8] net: phy: add error checks in __phy_mmd_indirect() and export it
Date: Fri, 25 Mar 2022 22:35:13 +0100 [thread overview]
Message-ID: <20220325213518.2668832-4-michael@walle.cc> (raw)
In-Reply-To: <20220325213518.2668832-1-michael@walle.cc>
Add missing error checks and export it so it can be reused. Rename the
function to have the common "phy_" prefix.
Signed-off-by: Michael Walle <michael@walle.cc>
---
drivers/net/phy/phy-core.c | 34 ++++++++++++++++++++++++++--------
include/linux/phy.h | 2 ++
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index 2001f3329133..dd9b6b64757d 100644
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -437,19 +437,37 @@ int phy_speed_down_core(struct phy_device *phydev)
return 0;
}
-static void mmd_phy_indirect(struct mii_bus *bus, int phy_addr, int devad,
- u16 regnum)
+/**
+ * __phy_mmd_indirect - prepare an indirect C45 register access
+ *
+ * @bus: the target MII bus
+ * @phy_addr: PHY address on the MII bus
+ * @devad: The target MMD (0..31)
+ * @regnum: The target register on the MMD (0..65535)
+ *
+ * Prepare an indirect C45 read or write transfer using the MII_MMD_CTRL and
+ * MII_MMD_DATA registers in C22 space.
+ */
+int __phy_mmd_indirect(struct mii_bus *bus, int phy_addr, int devad,
+ u16 regnum)
{
+ int ret;
+
/* Write the desired MMD Devad */
- __mdiobus_write(bus, phy_addr, MII_MMD_CTRL, devad);
+ ret = __mdiobus_write(bus, phy_addr, MII_MMD_CTRL, devad);
+ if (ret)
+ return ret;
/* Write the desired MMD register address */
- __mdiobus_write(bus, phy_addr, MII_MMD_DATA, regnum);
+ ret = __mdiobus_write(bus, phy_addr, MII_MMD_DATA, regnum);
+ if (ret)
+ return ret;
/* Select the Function : DATA with no post increment */
- __mdiobus_write(bus, phy_addr, MII_MMD_CTRL,
- devad | MII_MMD_CTRL_NOINCR);
+ return __mdiobus_write(bus, phy_addr, MII_MMD_CTRL,
+ devad | MII_MMD_CTRL_NOINCR);
}
+EXPORT_SYMBOL(__phy_mmd_indirect);
/**
* __phy_read_mmd - Convenience function for reading a register
@@ -476,7 +494,7 @@ int __phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum)
struct mii_bus *bus = phydev->mdio.bus;
int phy_addr = phydev->mdio.addr;
- mmd_phy_indirect(bus, phy_addr, devad, regnum);
+ __phy_mmd_indirect(bus, phy_addr, devad, regnum);
/* Read the content of the MMD's selected register */
val = __mdiobus_read(bus, phy_addr, MII_MMD_DATA);
@@ -532,7 +550,7 @@ int __phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val)
struct mii_bus *bus = phydev->mdio.bus;
int phy_addr = phydev->mdio.addr;
- mmd_phy_indirect(bus, phy_addr, devad, regnum);
+ __phy_mmd_indirect(bus, phy_addr, devad, regnum);
/* Write the data into MMD's selected register */
__mdiobus_write(bus, phy_addr, MII_MMD_DATA, val);
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 36ca2b5c2253..c81c209d4abd 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1110,6 +1110,8 @@ int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum);
__ret; \
})
+int __phy_mmd_indirect(struct mii_bus *bus, int phy_addr, int devad,
+ u16 regnum);
/*
* __phy_read_mmd - Convenience function for reading a register
* from an MMD on a given PHY.
--
2.30.2
next prev parent reply other threads:[~2022-03-25 21:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-25 21:35 [PATCH RFC net-next v2 0/8] net: phy: C45-over-C22 access Michael Walle
2022-03-25 21:35 ` [PATCH RFC net-next v2 1/8] net: phy: mscc-miim: reject clause 45 register accesses Michael Walle
2022-03-25 21:35 ` [PATCH RFC net-next v2 2/8] net: phy: mscc-miim: add probe_capabilities Michael Walle
2022-03-25 21:35 ` Michael Walle [this message]
2022-03-25 21:35 ` [PATCH RFC net-next v2 4/8] net: phy: add error handling for __phy_{read,write}_mmd Michael Walle
2022-03-25 21:35 ` [PATCH RFC net-next v2 5/8] net: phy: support indirect c45 access in get_phy_c45_ids() Michael Walle
2022-03-25 21:35 ` [PATCH RFC net-next v2 6/8] net: phy: add support for C45-over-C22 transfers Michael Walle
2022-03-25 21:35 ` [PATCH RFC net-next v2 7/8] phy: net: introduce phy_promote_to_c45() Michael Walle
2022-03-25 21:35 ` [PATCH RFC net-next v2 8/8] net: phy: mxl-gpy: remove unneeded ops 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=20220325213518.2668832-4-michael@walle.cc \
--to=michael@walle.cc \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=lxu@maxlinear.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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).