From: Jeremy Linton <jeremy.linton@arm.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, andrew@lunn.ch, f.fainelli@gmail.com,
hkallweit1@gmail.com, linux@armlinux.org.uk,
madalin.bucur@oss.nxp.com, calvin.johnson@oss.nxp.com,
linux-kernel@vger.kernel.org,
Jeremy Linton <jeremy.linton@arm.com>
Subject: [RFC 03/11] net: phy: refactor c45 phy identification sequence
Date: Fri, 22 May 2020 16:30:51 -0500 [thread overview]
Message-ID: <20200522213059.1535892-4-jeremy.linton@arm.com> (raw)
In-Reply-To: <20200522213059.1535892-1-jeremy.linton@arm.com>
Lets factor out the phy id logic, and make it generic
so that it can be used for c22 and c45.
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
drivers/net/phy/phy_device.c | 65 +++++++++++++++++++-----------------
1 file changed, 35 insertions(+), 30 deletions(-)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 7746c07b97fe..f0761fa5e40b 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -695,6 +695,29 @@ static int get_phy_c45_devs_in_pkg(struct mii_bus *bus, int addr, int dev_addr,
return 0;
}
+static int _get_phy_id(struct mii_bus *bus, int addr, int dev_addr,
+ u32 *phy_id, bool c45)
+{
+ int phy_reg, reg_addr;
+
+ int reg_base = c45 ? (MII_ADDR_C45 | dev_addr << 16) : 0;
+
+ reg_addr = reg_base | MII_PHYSID1;
+ phy_reg = mdiobus_read(bus, addr, reg_addr);
+ if (phy_reg < 0)
+ return -EIO;
+
+ *phy_id = phy_reg << 16;
+
+ reg_addr = reg_base | MII_PHYSID2;
+ phy_reg = mdiobus_read(bus, addr, reg_addr);
+ if (phy_reg < 0)
+ return -EIO;
+ *phy_id |= phy_reg;
+
+ return 0;
+}
+
static bool valid_phy_id(int val)
{
return (val > 0 && ((val & 0x1fffffff) != 0x1fffffff));
@@ -715,17 +738,17 @@ static bool valid_phy_id(int val)
*/
static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
struct phy_c45_device_ids *c45_ids) {
- int phy_reg;
- int i, reg_addr;
+ int ret;
+ int i;
const int num_ids = ARRAY_SIZE(c45_ids->device_ids);
u32 *devs = &c45_ids->devices_in_package;
/* Find first non-zero Devices In package. Device zero is reserved
* for 802.3 c45 complied PHYs, so don't probe it at first.
*/
- for (i = 1; i < num_ids && *devs == 0; i++) {
- phy_reg = get_phy_c45_devs_in_pkg(bus, addr, i, devs);
- if (phy_reg < 0)
+ for (i = 0; i < num_ids && *devs == 0; i++) {
+ ret = get_phy_c45_devs_in_pkg(bus, addr, i, devs);
+ if (ret < 0)
return -EIO;
if ((*devs & 0x1fffffff) == 0x1fffffff) {
@@ -752,17 +775,9 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
if (!(c45_ids->devices_in_package & (1 << i)))
continue;
- reg_addr = MII_ADDR_C45 | i << 16 | MII_PHYSID1;
- phy_reg = mdiobus_read(bus, addr, reg_addr);
- if (phy_reg < 0)
- return -EIO;
- c45_ids->device_ids[i] = phy_reg << 16;
-
- reg_addr = MII_ADDR_C45 | i << 16 | MII_PHYSID2;
- phy_reg = mdiobus_read(bus, addr, reg_addr);
- if (phy_reg < 0)
- return -EIO;
- c45_ids->device_ids[i] |= phy_reg;
+ ret = _get_phy_id(bus, addr, i, &c45_ids->device_ids[i], true);
+ if (ret < 0)
+ return ret;
}
*phy_id = 0;
return 0;
@@ -787,27 +802,17 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
bool is_c45, struct phy_c45_device_ids *c45_ids)
{
- int phy_reg;
+ int ret;
if (is_c45)
return get_phy_c45_ids(bus, addr, phy_id, c45_ids);
- /* Grab the bits from PHYIR1, and put them in the upper half */
- phy_reg = mdiobus_read(bus, addr, MII_PHYSID1);
- if (phy_reg < 0) {
+ ret = _get_phy_id(bus, addr, 0, phy_id, false);
+ if (ret < 0) {
/* returning -ENODEV doesn't stop bus scanning */
- return (phy_reg == -EIO || phy_reg == -ENODEV) ? -ENODEV : -EIO;
+ return (ret == -EIO || ret == -ENODEV) ? -ENODEV : -EIO;
}
- *phy_id = phy_reg << 16;
-
- /* Grab the bits from PHYIR2, and put them in the lower half */
- phy_reg = mdiobus_read(bus, addr, MII_PHYSID2);
- if (phy_reg < 0)
- return -EIO;
-
- *phy_id |= phy_reg;
-
return 0;
}
--
2.26.2
next prev parent reply other threads:[~2020-05-22 21:32 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 21:30 [RFC 00/11] Make C45 autoprobe more robust Jeremy Linton
2020-05-22 21:30 ` [RFC 01/11] net: phy: Don't report success if devices weren't found Jeremy Linton
2020-05-23 18:20 ` Russell King - ARM Linux admin
2020-05-25 2:46 ` Jeremy Linton
2020-05-25 9:45 ` Russell King - ARM Linux admin
2020-05-25 21:02 ` Jeremy Linton
2020-05-25 21:07 ` Russell King - ARM Linux admin
2020-05-25 21:59 ` Jeremy Linton
2020-05-22 21:30 ` [RFC 02/11] net: phy: Simplify MMD device list termination Jeremy Linton
2020-05-23 18:36 ` Russell King - ARM Linux admin
2020-05-25 2:48 ` Jeremy Linton
2020-05-25 8:09 ` Russell King - ARM Linux admin
2020-05-22 21:30 ` Jeremy Linton [this message]
2020-05-23 15:28 ` [RFC 03/11] net: phy: refactor c45 phy identification sequence Andrew Lunn
2020-05-23 17:16 ` Jeremy Linton
2020-05-23 17:32 ` Jeremy Linton
2020-05-23 19:12 ` Russell King - ARM Linux admin
2020-05-23 18:30 ` Russell King - ARM Linux admin
2020-05-23 19:51 ` Andrew Lunn
2020-05-23 20:01 ` Russell King - ARM Linux admin
2020-05-25 2:37 ` Jeremy Linton
2020-05-22 21:30 ` [RFC 04/11] net: phy: Handle c22 regs presence better Jeremy Linton
2020-05-23 18:37 ` Russell King - ARM Linux admin
2020-05-25 3:34 ` Jeremy Linton
2020-05-25 9:53 ` Russell King - ARM Linux admin
2020-05-25 10:06 ` Russell King - ARM Linux admin
2020-05-25 21:51 ` Jeremy Linton
2020-05-25 22:01 ` Russell King - ARM Linux admin
2020-05-25 22:22 ` Jeremy Linton
2020-05-25 23:09 ` Russell King - ARM Linux admin
2020-05-25 23:22 ` Jeremy Linton
2020-05-25 23:33 ` Russell King - ARM Linux admin
2020-05-25 23:42 ` Jeremy Linton
2020-05-25 23:46 ` Andrew Lunn
2020-05-25 23:57 ` Russell King - ARM Linux admin
2020-05-25 23:16 ` Jeremy Linton
2020-05-25 23:30 ` Russell King - ARM Linux admin
2020-05-25 22:06 ` Andrew Lunn
2020-05-25 22:17 ` Jeremy Linton
2020-05-25 23:06 ` Andrew Lunn
2020-05-25 23:07 ` Russell King - ARM Linux admin
2020-05-25 23:12 ` Andrew Lunn
2020-05-25 23:46 ` Jeremy Linton
2020-05-25 23:47 ` Andrew Lunn
2020-05-22 21:30 ` [RFC 05/11] net: phy: Scan the entire MMD device space Jeremy Linton
2020-05-22 21:30 ` [RFC 06/11] net: phy: Hoist no phy detected state Jeremy Linton
2020-05-22 21:30 ` [RFC 07/11] net: phy: reset invalid phy reads of 0 back to 0xffffffff Jeremy Linton
2020-05-23 18:44 ` Russell King - ARM Linux admin
2020-05-25 4:20 ` Jeremy Linton
2020-05-25 8:20 ` Russell King - ARM Linux admin
2020-05-22 21:30 ` [RFC 08/11] net: phy: Allow mdio buses to auto-probe c45 devices Jeremy Linton
2020-05-24 14:44 ` Andrew Lunn
2020-05-25 4:28 ` Jeremy Linton
2020-05-25 8:25 ` Russell King - ARM Linux admin
2020-05-25 13:43 ` Andrew Lunn
2020-05-25 22:09 ` Jeremy Linton
2020-05-25 22:41 ` Russell King - ARM Linux admin
2020-05-22 21:30 ` [RFC 09/11] net: phy: Refuse to consider phy_id=0 a valid phy Jeremy Linton
2020-05-22 21:30 ` [RFC 10/11] net: example acpize xgmac_mdio Jeremy Linton
2020-05-23 18:48 ` Russell King - ARM Linux admin
2020-05-22 21:30 ` [RFC 11/11] net: example xgmac enable extended scanning Jeremy Linton
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=20200522213059.1535892-4-jeremy.linton@arm.com \
--to=jeremy.linton@arm.com \
--cc=andrew@lunn.ch \
--cc=calvin.johnson@oss.nxp.com \
--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=madalin.bucur@oss.nxp.com \
--cc=netdev@vger.kernel.org \
/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).