diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 06b8be8dc4db..3f5b9592794d 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1225,6 +1225,7 @@ int b53_get_sset_count(struct dsa_switch *ds, int port, int sset) EXPORT_SYMBOL(b53_get_sset_count); enum b53_devlink_resource_id { + B53_DEVLINK_PARAM_ID_NONE, /* DEVLINK_RESOURCE_ID_PARENT_TOP */ B53_DEVLINK_PARAM_ID_VLAN_TABLE, }; diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c index 7058faf23592..0e35e9841b9b 100644 --- a/drivers/net/dsa/dsa_loop.c +++ b/drivers/net/dsa/dsa_loop.c @@ -75,6 +75,7 @@ static struct phy_device *phydevs[PHY_MAX_ADDR]; static struct mdio_device *switch_mdiodev; enum dsa_loop_devlink_resource_id { + DSA_LOOP_DEVLINK_PARAM_ID_NONE, /* DEVLINK_RESOURCE_ID_PARENT_TOP */ DSA_LOOP_DEVLINK_PARAM_ID_VTU, }; diff --git a/drivers/net/dsa/hirschmann/hellcreek.h b/drivers/net/dsa/hirschmann/hellcreek.h index 851822adb09e..b8b59f3b10e1 100644 --- a/drivers/net/dsa/hirschmann/hellcreek.h +++ b/drivers/net/dsa/hirschmann/hellcreek.h @@ -311,6 +311,7 @@ struct hellcreek { /* Devlink resources */ enum hellcreek_devlink_resource_id { + HELLCREEK_DEVLINK_PARAM_ID_NONE, /* DEVLINK_RESOURCE_ID_PARENT_TOP */ HELLCREEK_DEVLINK_PARAM_ID_VLAN_TABLE, HELLCREEK_DEVLINK_PARAM_ID_FDB_TABLE, }; diff --git a/drivers/net/dsa/mv88e6xxx/devlink.c b/drivers/net/dsa/mv88e6xxx/devlink.c index 0f84bffc8ef1..6f034841883c 100644 --- 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; diff --git a/net/devlink/resource.c b/net/devlink/resource.c index 3d2f42bc2fb5..574108ccfe5d 100644 --- a/net/devlink/resource.c +++ b/net/devlink/resource.c @@ -486,6 +486,8 @@ __devl_resource_register(struct devlink *devlink, struct list_head *resource_list; bool top_hierarchy; + WARN_ON(resource_id == DEVLINK_RESOURCE_ID_PARENT_TOP); + lockdep_assert_held(&devlink->lock); top_hierarchy = parent_resource_id == DEVLINK_RESOURCE_ID_PARENT_TOP;