net: dsa: mv88e6xxx: Avoid devlink resource IDs collision with PARENT_TOP

The devlink resource ID for ATU collides with the sentinel
DEVLINK_RESOURCE_ID_PARENT_TOP (0). As a result, ATU_bin_* are
registered as in fact registered as top-level siblings, not as children
of ATU.

Whether intentional or unintentional, clarify it by keeping the real
resource IDs starting at 1. Unfortunately ATU_bin_* are already
registered at top-level, so keep their parent to PARENT_TOP.

Signed-off-by: David Yang <mmyangfl@gmail.com>
Link: https://patch.msgid.link/20260611070856.889700-5-mmyangfl@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/mv88e6xxx/devlink.c b/drivers/net/dsa/mv88e6xxx/devlink.c
index 0f84bffc8ef1f188b4962cfe876f3cb5e4de36c2..6f034841883c6f3f78e9f5ec65243623bde6f9e1 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/devlink.c
+++ b/drivers/net/dsa/mv88e6xxx/devlink.c
@@ -91,6 +91,7 @@ void mv88e6xxx_teardown_devlink_params(struct dsa_switch *ds)
 }
 
 enum mv88e6xxx_devlink_resource_id {
+       MV88E6XXX_RESOURCE_ID_NONE,  /* DEVLINK_RESOURCE_ID_PARENT_TOP */
        MV88E6XXX_RESOURCE_ID_ATU,
        MV88E6XXX_RESOURCE_ID_ATU_BIN_0,
        MV88E6XXX_RESOURCE_ID_ATU_BIN_1,
@@ -200,7 +201,7 @@ int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds)
        err = dsa_devlink_resource_register(ds, "ATU_bin_0",
                                            mv88e6xxx_num_macs(chip) / 4,
                                            MV88E6XXX_RESOURCE_ID_ATU_BIN_0,
-                                           MV88E6XXX_RESOURCE_ID_ATU,
+                                           DEVLINK_RESOURCE_ID_PARENT_TOP,
                                            &size_params);
        if (err)
                goto out;
@@ -208,7 +209,7 @@ int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds)
        err = dsa_devlink_resource_register(ds, "ATU_bin_1",
                                            mv88e6xxx_num_macs(chip) / 4,
                                            MV88E6XXX_RESOURCE_ID_ATU_BIN_1,
-                                           MV88E6XXX_RESOURCE_ID_ATU,
+                                           DEVLINK_RESOURCE_ID_PARENT_TOP,
                                            &size_params);
        if (err)
                goto out;
@@ -216,7 +217,7 @@ int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds)
        err = dsa_devlink_resource_register(ds, "ATU_bin_2",
                                            mv88e6xxx_num_macs(chip) / 4,
                                            MV88E6XXX_RESOURCE_ID_ATU_BIN_2,
-                                           MV88E6XXX_RESOURCE_ID_ATU,
+                                           DEVLINK_RESOURCE_ID_PARENT_TOP,
                                            &size_params);
        if (err)
                goto out;
@@ -224,7 +225,7 @@ int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds)
        err = dsa_devlink_resource_register(ds, "ATU_bin_3",
                                            mv88e6xxx_num_macs(chip) / 4,
                                            MV88E6XXX_RESOURCE_ID_ATU_BIN_3,
-                                           MV88E6XXX_RESOURCE_ID_ATU,
+                                           DEVLINK_RESOURCE_ID_PARENT_TOP,
                                            &size_params);
        if (err)
                goto out;