net: phy: Add c45_phy_ids sysfs directory entry

The phy_id field only shows the PHY ID of the C22 device, and the C45
device did not store its PHY ID in this field.

Add a new phy_mmd_group, and export the mmd<n>_device_id for the C45
device. These files are invisible to the C22 device.

Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250613131903.2961-1-yajun.deng@linux.dev
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/Documentation/ABI/testing/sysfs-class-net-phydev b/Documentation/ABI/testing/sysfs-class-net-phydev
index ac722dd5e69431d0df3c1e567fad2ace11fe44c9..31615c59bff9082d6bfa8882be417c20a26ba5fc 100644 (file)
--- a/Documentation/ABI/testing/sysfs-class-net-phydev
+++ b/Documentation/ABI/testing/sysfs-class-net-phydev
@@ -26,6 +26,16 @@ Description:
                This ID is used to match the device with the appropriate
                driver.
 
+What:          /sys/class/mdio_bus/<bus>/<device>/c45_phy_ids/mmd<n>_device_id
+Date:          June 2025
+KernelVersion: 6.17
+Contact:       netdev@vger.kernel.org
+Description:
+               This attribute contains the 32-bit PHY Identifier as reported
+               by the device during bus enumeration, encoded in hexadecimal.
+               These C45 IDs are used to match the device with the appropriate
+               driver. These files are invisible to the C22 device.
+
 What:          /sys/class/mdio_bus/<bus>/<device>/phy_interface
 Date:          February 2014
 KernelVersion: 3.15

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 1c3a27b73d7bc4235ce4de10608a4b36b9555ddf..90951681523c7578dcb34d512ef4dd001416e4f1 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -652,11 +652,119 @@ static struct attribute *phy_dev_attrs[] = {
        &dev_attr_phy_dev_flags.attr,
        NULL,
 };
-ATTRIBUTE_GROUPS(phy_dev);
+
+static const struct attribute_group phy_dev_group = {
+       .attrs = phy_dev_attrs,
+};
+
+#define MMD_DEVICE_ID_ATTR(n) \
+static ssize_t mmd##n##_device_id_show(struct device *dev, \
+                               struct device_attribute *attr, char *buf) \
+{ \
+       struct phy_device *phydev = to_phy_device(dev); \
+       return sysfs_emit(buf, "0x%.8lx\n", \
+                        (unsigned long)phydev->c45_ids.device_ids[n]); \
+} \
+static DEVICE_ATTR_RO(mmd##n##_device_id)
+
+MMD_DEVICE_ID_ATTR(1);
+MMD_DEVICE_ID_ATTR(2);
+MMD_DEVICE_ID_ATTR(3);
+MMD_DEVICE_ID_ATTR(4);
+MMD_DEVICE_ID_ATTR(5);
+MMD_DEVICE_ID_ATTR(6);
+MMD_DEVICE_ID_ATTR(7);
+MMD_DEVICE_ID_ATTR(8);
+MMD_DEVICE_ID_ATTR(9);
+MMD_DEVICE_ID_ATTR(10);
+MMD_DEVICE_ID_ATTR(11);
+MMD_DEVICE_ID_ATTR(12);
+MMD_DEVICE_ID_ATTR(13);
+MMD_DEVICE_ID_ATTR(14);
+MMD_DEVICE_ID_ATTR(15);
+MMD_DEVICE_ID_ATTR(16);
+MMD_DEVICE_ID_ATTR(17);
+MMD_DEVICE_ID_ATTR(18);
+MMD_DEVICE_ID_ATTR(19);
+MMD_DEVICE_ID_ATTR(20);
+MMD_DEVICE_ID_ATTR(21);
+MMD_DEVICE_ID_ATTR(22);
+MMD_DEVICE_ID_ATTR(23);
+MMD_DEVICE_ID_ATTR(24);
+MMD_DEVICE_ID_ATTR(25);
+MMD_DEVICE_ID_ATTR(26);
+MMD_DEVICE_ID_ATTR(27);
+MMD_DEVICE_ID_ATTR(28);
+MMD_DEVICE_ID_ATTR(29);
+MMD_DEVICE_ID_ATTR(30);
+MMD_DEVICE_ID_ATTR(31);
+
+static struct attribute *phy_mmd_attrs[] = {
+       &dev_attr_mmd1_device_id.attr,
+       &dev_attr_mmd2_device_id.attr,
+       &dev_attr_mmd3_device_id.attr,
+       &dev_attr_mmd4_device_id.attr,
+       &dev_attr_mmd5_device_id.attr,
+       &dev_attr_mmd6_device_id.attr,
+       &dev_attr_mmd7_device_id.attr,
+       &dev_attr_mmd8_device_id.attr,
+       &dev_attr_mmd9_device_id.attr,
+       &dev_attr_mmd10_device_id.attr,
+       &dev_attr_mmd11_device_id.attr,
+       &dev_attr_mmd12_device_id.attr,
+       &dev_attr_mmd13_device_id.attr,
+       &dev_attr_mmd14_device_id.attr,
+       &dev_attr_mmd15_device_id.attr,
+       &dev_attr_mmd16_device_id.attr,
+       &dev_attr_mmd17_device_id.attr,
+       &dev_attr_mmd18_device_id.attr,
+       &dev_attr_mmd19_device_id.attr,
+       &dev_attr_mmd20_device_id.attr,
+       &dev_attr_mmd21_device_id.attr,
+       &dev_attr_mmd22_device_id.attr,
+       &dev_attr_mmd23_device_id.attr,
+       &dev_attr_mmd24_device_id.attr,
+       &dev_attr_mmd25_device_id.attr,
+       &dev_attr_mmd26_device_id.attr,
+       &dev_attr_mmd27_device_id.attr,
+       &dev_attr_mmd28_device_id.attr,
+       &dev_attr_mmd29_device_id.attr,
+       &dev_attr_mmd30_device_id.attr,
+       &dev_attr_mmd31_device_id.attr,
+       NULL
+};
+
+static umode_t phy_mmd_is_visible(struct kobject *kobj,
+                                 struct attribute *attr, int index)
+{
+       struct device *dev = kobj_to_dev(kobj);
+       struct phy_device *phydev = to_phy_device(dev);
+       const int i = index + 1;
+
+       if (!phydev->is_c45)
+               return 0;
+       if (i >= ARRAY_SIZE(phydev->c45_ids.device_ids) ||
+           phydev->c45_ids.device_ids[i] == 0xffffffff)
+               return 0;
+
+       return attr->mode;
+}
+
+static const struct attribute_group phy_mmd_group = {
+       .name = "c45_phy_ids",
+       .attrs = phy_mmd_attrs,
+       .is_visible = phy_mmd_is_visible,
+};
+
+static const struct attribute_group *phy_device_groups[] = {
+       &phy_dev_group,
+       &phy_mmd_group,
+       NULL,
+};
 
 static const struct device_type mdio_bus_phy_type = {
        .name = "PHY",
-       .groups = phy_dev_groups,
+       .groups = phy_device_groups,
        .release = phy_device_release,
        .pm = pm_ptr(&mdio_bus_phy_pm_ops),
 };