| Message ID | 20240823031059.32579-6-lihuisong@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add some features and bugfix for kunpeng_hccs | expand |
On Fri, 23 Aug 2024 11:10:58 +0800 Huisong Li <lihuisong@huawei.com> wrote: > Current, to find which HCC types are used on the platform the user needs > to scan the type attribute of all ports, which is unfriendly to the user. > So add the sysfs to show all HCCS types used on the platform. Really minor point, but it might be nice to add a little info here on the sort of changes that occur in the interface between versions? Even if that's just a reference to next patch which shows that the HCCS-V2 has power control that original version didn't. That will help motivate the patch. Also good to argue why it is worth aggregating this info in one attribute rather than just letting user space search for it in the topology below this point. (Something about global controls I guess?) Also, for future, the hcc_unregister_pcc_channel() would be nicely handled with a devm_add_action_or_reset() removing the need for the various gotos in probe. Similar applied to hcc_remove_top_dirs and remove() callback can go away entirely which would be an added bonus. Jonathan > > Signed-off-by: Huisong Li <lihuisong@huawei.com> > --- > .../sysfs-devices-platform-kunpeng_hccs | 8 ++ > drivers/soc/hisilicon/kunpeng_hccs.c | 102 +++++++++++++++++- > drivers/soc/hisilicon/kunpeng_hccs.h | 15 +++ > 3 files changed, 124 insertions(+), 1 deletion(-) > > diff --git a/Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs b/Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs > index 1666340820f7..d4c355e0e0bb 100644 > --- a/Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs > +++ b/Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs > @@ -79,3 +79,11 @@ Description: > indicates a lane. > crc_err_cnt: (RO) CRC err count on this port. > ============= ==== ============================================= > + > +What: /sys/devices/platform/HISI04Bx:00/used_types > +Date: August 2024 > +KernelVersion: 6.12 > +Contact: Huisong Li <lihuisong@huawei.com> > +Description: > + This interface is used to show all HCCS types used on the > + platform, like, HCCS-v1, HCCS-v2 and so on. > diff --git a/drivers/soc/hisilicon/kunpeng_hccs.c b/drivers/soc/hisilicon/kunpeng_hccs.c > index 418e4ee5d9e5..623e7b7ed39a 100644 > --- a/drivers/soc/hisilicon/kunpeng_hccs.c > +++ b/drivers/soc/hisilicon/kunpeng_hccs.c > @@ -21,11 +21,14 @@ > * - if all enabled ports are in linked > * - if all linked ports are in full lane > * - CRC error count sum > + * > + * - Retrieve all HCCS types used on the platform. > */ > #include <linux/acpi.h> > #include <linux/iopoll.h> > #include <linux/platform_device.h> > #include <linux/sysfs.h> > +#include <linux/types.h> > > #include <acpi/pcc.h> > > @@ -53,6 +56,15 @@ static struct hccs_chip_info *kobj_to_chip_info(struct kobject *k) > return container_of(k, struct hccs_chip_info, kobj); > } > > +static struct hccs_dev *device_kobj_to_hccs_dev(struct kobject *k) > +{ > + struct device *dev = container_of(k, struct device, kobj); > + struct platform_device *pdev = > + container_of(dev, struct platform_device, dev); > + > + return platform_get_drvdata(pdev); > +} > + > struct hccs_register_ctx { > struct device *dev; > u8 chan_id; > @@ -670,6 +682,55 @@ static int hccs_get_hw_info(struct hccs_dev *hdev) > return 0; > } > > +static u16 hccs_calc_used_type_num(struct hccs_dev *hdev, > + unsigned long *hccs_ver) > +{ > + struct hccs_chip_info *chip; > + struct hccs_port_info *port; > + struct hccs_die_info *die; > + u16 used_type_num = 0; > + u16 i, j, k; > + > + for (i = 0; i < hdev->chip_num; i++) { > + chip = &hdev->chips[i]; > + for (j = 0; j < chip->die_num; j++) { > + die = &chip->dies[j]; > + for (k = 0; k < die->port_num; k++) { > + port = &die->ports[k]; > + set_bit(port->port_type, hccs_ver); > + } > + } > + } > + > + for_each_set_bit(i, hccs_ver, HCCS_IP_MAX + 1) > + used_type_num++; > + > + return used_type_num; > +} > + > +static int hccs_init_type_name_maps(struct hccs_dev *hdev) > +{ > + DECLARE_BITMAP(hccs_ver, HCCS_IP_MAX + 1) = {}; > + unsigned int i; > + u16 idx = 0; > + > + hdev->used_type_num = hccs_calc_used_type_num(hdev, hccs_ver); > + hdev->type_name_maps = devm_kcalloc(hdev->dev, hdev->used_type_num, > + sizeof(struct hccs_type_name_map), > + GFP_KERNEL); > + if (!hdev->type_name_maps) > + return -ENOMEM; > + > + for_each_set_bit(i, hccs_ver, HCCS_IP_MAX + 1) { > + hdev->type_name_maps[idx].type = i; > + sprintf(hdev->type_name_maps[idx].name, > + "%s%u", HCCS_IP_PREFIX, i); > + idx++; > + } > + > + return 0; > +} > + > static int hccs_query_port_link_status(struct hccs_dev *hdev, > const struct hccs_port_info *port, > struct hccs_link_status *link_status) > @@ -830,7 +891,7 @@ static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, > { > const struct hccs_port_info *port = kobj_to_port_info(kobj); > > - return sysfs_emit(buf, "HCCS-v%u\n", port->port_type); > + return sysfs_emit(buf, "%s%u\n", HCCS_IP_PREFIX, port->port_type); > } > static struct kobj_attribute hccs_type_attr = __ATTR_RO(type); > > @@ -1134,6 +1195,33 @@ static const struct kobj_type hccs_chip_type = { > .default_groups = hccs_chip_default_groups, > }; > > + > +static ssize_t used_types_show(struct kobject *kobj, > + struct kobj_attribute *attr, char *buf) > +{ > + struct hccs_dev *hdev = device_kobj_to_hccs_dev(kobj); > + int len = 0; > + u16 i; > + > + for (i = 0; i < hdev->used_type_num - 1; i++) > + len += sysfs_emit(&buf[len], "%s ", hdev->type_name_maps[i].name); > + len += sysfs_emit(&buf[len], "%s\n", hdev->type_name_maps[i].name); > + > + return len; > +} > +static struct kobj_attribute used_types_attr = > + __ATTR(used_types, 0444, used_types_show, NULL); > + > +static void hccs_remove_misc_sysfs(struct hccs_dev *hdev) > +{ > + sysfs_remove_file(&hdev->dev->kobj, &used_types_attr.attr); > +} > + > +static int hccs_add_misc_sysfs(struct hccs_dev *hdev) > +{ > + return sysfs_create_file(&hdev->dev->kobj, &used_types_attr.attr); > +} > + > static void hccs_remove_die_dir(struct hccs_die_info *die) > { > struct hccs_port_info *port; > @@ -1168,6 +1256,8 @@ static void hccs_remove_topo_dirs(struct hccs_dev *hdev) > > for (i = 0; i < hdev->chip_num; i++) > hccs_remove_chip_dir(&hdev->chips[i]); > + > + hccs_remove_misc_sysfs(hdev); > } > > static int hccs_create_hccs_dir(struct hccs_dev *hdev, > @@ -1263,6 +1353,12 @@ static int hccs_create_topo_dirs(struct hccs_dev *hdev) > } > } > > + ret = hccs_add_misc_sysfs(hdev); > + if (ret) { > + dev_err(hdev->dev, "create misc sysfs interface failed, ret = %d\n", ret); > + goto err; > + } > + > return 0; > err: > for (k = 0; k < id; k++) > @@ -1313,6 +1409,10 @@ static int hccs_probe(struct platform_device *pdev) > if (rc) > goto unregister_pcc_chan; > > + rc = hccs_init_type_name_maps(hdev); > + if (rc) > + goto unregister_pcc_chan; > + > rc = hccs_create_topo_dirs(hdev); > if (rc) > goto unregister_pcc_chan; > diff --git a/drivers/soc/hisilicon/kunpeng_hccs.h b/drivers/soc/hisilicon/kunpeng_hccs.h > index 5e12a1e1474e..401df4694aec 100644 > --- a/drivers/soc/hisilicon/kunpeng_hccs.h > +++ b/drivers/soc/hisilicon/kunpeng_hccs.h > @@ -10,6 +10,19 @@ > * | P0 | P1 | P2 | P3 | P0 | P1 | P2 | P3 | P0 | P1 | P2 | P3 |P0 | P1 | P2 | P3 | > */ > > +enum hccs_port_type { > + HCCS_V1 = 1, > + HCCS_V2, > +}; > + > +#define HCCS_IP_PREFIX "HCCS-v" > +#define HCCS_IP_MAX 255 > +#define HCCS_NAME_MAX_LEN 9 > +struct hccs_type_name_map { > + u8 type; > + char name[HCCS_NAME_MAX_LEN + 1]; > +}; > + > /* > * This value cannot be 255, otherwise the loop of the multi-BD communication > * case cannot end. > @@ -74,6 +87,8 @@ struct hccs_dev { > u64 caps; > u8 chip_num; > struct hccs_chip_info *chips; > + u16 used_type_num; > + struct hccs_type_name_map *type_name_maps; > u8 chan_id; > struct mutex lock; > struct hccs_mbox_client_info cl_info;
在 2024/8/23 16:47, Jonathan Cameron 写道: > On Fri, 23 Aug 2024 11:10:58 +0800 > Huisong Li <lihuisong@huawei.com> wrote: > >> Current, to find which HCC types are used on the platform the user needs >> to scan the type attribute of all ports, which is unfriendly to the user. >> So add the sysfs to show all HCCS types used on the platform. > Really minor point, but it might be nice to add a little info here on > the sort of changes that occur in the interface between versions? > Even if that's just a reference to next patch which shows that the > HCCS-V2 has power control that original version didn't. Yes, you are right. I will add some words like this. > > That will help motivate the patch. > > Also good to argue why it is worth aggregating this info in one attribute > rather than just letting user space search for it in the topology below > this point. (Something about global controls I guess?) Good point. Thanks. > > Also, for future, the hcc_unregister_pcc_channel() would be nicely > handled with a devm_add_action_or_reset() removing the need > for the various gotos in probe. > > Similar applied to hcc_remove_top_dirs and remove() callback can > go away entirely which would be an added bonus. The devm_add action or reset you proposed is good way to keep simply code. It is more recommanded if we add new code. I like it. The current removing way is a traditional one and also understand easier. So I'm not very motivated to modify it. Thanks for your suggestion.
diff --git a/Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs b/Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs index 1666340820f7..d4c355e0e0bb 100644 --- a/Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs +++ b/Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs @@ -79,3 +79,11 @@ Description: indicates a lane. crc_err_cnt: (RO) CRC err count on this port. ============= ==== ============================================= + +What: /sys/devices/platform/HISI04Bx:00/used_types +Date: August 2024 +KernelVersion: 6.12 +Contact: Huisong Li <lihuisong@huawei.com> +Description: + This interface is used to show all HCCS types used on the + platform, like, HCCS-v1, HCCS-v2 and so on. diff --git a/drivers/soc/hisilicon/kunpeng_hccs.c b/drivers/soc/hisilicon/kunpeng_hccs.c index 418e4ee5d9e5..623e7b7ed39a 100644 --- a/drivers/soc/hisilicon/kunpeng_hccs.c +++ b/drivers/soc/hisilicon/kunpeng_hccs.c @@ -21,11 +21,14 @@ * - if all enabled ports are in linked * - if all linked ports are in full lane * - CRC error count sum + * + * - Retrieve all HCCS types used on the platform. */ #include <linux/acpi.h> #include <linux/iopoll.h> #include <linux/platform_device.h> #include <linux/sysfs.h> +#include <linux/types.h> #include <acpi/pcc.h> @@ -53,6 +56,15 @@ static struct hccs_chip_info *kobj_to_chip_info(struct kobject *k) return container_of(k, struct hccs_chip_info, kobj); } +static struct hccs_dev *device_kobj_to_hccs_dev(struct kobject *k) +{ + struct device *dev = container_of(k, struct device, kobj); + struct platform_device *pdev = + container_of(dev, struct platform_device, dev); + + return platform_get_drvdata(pdev); +} + struct hccs_register_ctx { struct device *dev; u8 chan_id; @@ -670,6 +682,55 @@ static int hccs_get_hw_info(struct hccs_dev *hdev) return 0; } +static u16 hccs_calc_used_type_num(struct hccs_dev *hdev, + unsigned long *hccs_ver) +{ + struct hccs_chip_info *chip; + struct hccs_port_info *port; + struct hccs_die_info *die; + u16 used_type_num = 0; + u16 i, j, k; + + for (i = 0; i < hdev->chip_num; i++) { + chip = &hdev->chips[i]; + for (j = 0; j < chip->die_num; j++) { + die = &chip->dies[j]; + for (k = 0; k < die->port_num; k++) { + port = &die->ports[k]; + set_bit(port->port_type, hccs_ver); + } + } + } + + for_each_set_bit(i, hccs_ver, HCCS_IP_MAX + 1) + used_type_num++; + + return used_type_num; +} + +static int hccs_init_type_name_maps(struct hccs_dev *hdev) +{ + DECLARE_BITMAP(hccs_ver, HCCS_IP_MAX + 1) = {}; + unsigned int i; + u16 idx = 0; + + hdev->used_type_num = hccs_calc_used_type_num(hdev, hccs_ver); + hdev->type_name_maps = devm_kcalloc(hdev->dev, hdev->used_type_num, + sizeof(struct hccs_type_name_map), + GFP_KERNEL); + if (!hdev->type_name_maps) + return -ENOMEM; + + for_each_set_bit(i, hccs_ver, HCCS_IP_MAX + 1) { + hdev->type_name_maps[idx].type = i; + sprintf(hdev->type_name_maps[idx].name, + "%s%u", HCCS_IP_PREFIX, i); + idx++; + } + + return 0; +} + static int hccs_query_port_link_status(struct hccs_dev *hdev, const struct hccs_port_info *port, struct hccs_link_status *link_status) @@ -830,7 +891,7 @@ static ssize_t type_show(struct kobject *kobj, struct kobj_attribute *attr, { const struct hccs_port_info *port = kobj_to_port_info(kobj); - return sysfs_emit(buf, "HCCS-v%u\n", port->port_type); + return sysfs_emit(buf, "%s%u\n", HCCS_IP_PREFIX, port->port_type); } static struct kobj_attribute hccs_type_attr = __ATTR_RO(type); @@ -1134,6 +1195,33 @@ static const struct kobj_type hccs_chip_type = { .default_groups = hccs_chip_default_groups, }; + +static ssize_t used_types_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct hccs_dev *hdev = device_kobj_to_hccs_dev(kobj); + int len = 0; + u16 i; + + for (i = 0; i < hdev->used_type_num - 1; i++) + len += sysfs_emit(&buf[len], "%s ", hdev->type_name_maps[i].name); + len += sysfs_emit(&buf[len], "%s\n", hdev->type_name_maps[i].name); + + return len; +} +static struct kobj_attribute used_types_attr = + __ATTR(used_types, 0444, used_types_show, NULL); + +static void hccs_remove_misc_sysfs(struct hccs_dev *hdev) +{ + sysfs_remove_file(&hdev->dev->kobj, &used_types_attr.attr); +} + +static int hccs_add_misc_sysfs(struct hccs_dev *hdev) +{ + return sysfs_create_file(&hdev->dev->kobj, &used_types_attr.attr); +} + static void hccs_remove_die_dir(struct hccs_die_info *die) { struct hccs_port_info *port; @@ -1168,6 +1256,8 @@ static void hccs_remove_topo_dirs(struct hccs_dev *hdev) for (i = 0; i < hdev->chip_num; i++) hccs_remove_chip_dir(&hdev->chips[i]); + + hccs_remove_misc_sysfs(hdev); } static int hccs_create_hccs_dir(struct hccs_dev *hdev, @@ -1263,6 +1353,12 @@ static int hccs_create_topo_dirs(struct hccs_dev *hdev) } } + ret = hccs_add_misc_sysfs(hdev); + if (ret) { + dev_err(hdev->dev, "create misc sysfs interface failed, ret = %d\n", ret); + goto err; + } + return 0; err: for (k = 0; k < id; k++) @@ -1313,6 +1409,10 @@ static int hccs_probe(struct platform_device *pdev) if (rc) goto unregister_pcc_chan; + rc = hccs_init_type_name_maps(hdev); + if (rc) + goto unregister_pcc_chan; + rc = hccs_create_topo_dirs(hdev); if (rc) goto unregister_pcc_chan; diff --git a/drivers/soc/hisilicon/kunpeng_hccs.h b/drivers/soc/hisilicon/kunpeng_hccs.h index 5e12a1e1474e..401df4694aec 100644 --- a/drivers/soc/hisilicon/kunpeng_hccs.h +++ b/drivers/soc/hisilicon/kunpeng_hccs.h @@ -10,6 +10,19 @@ * | P0 | P1 | P2 | P3 | P0 | P1 | P2 | P3 | P0 | P1 | P2 | P3 |P0 | P1 | P2 | P3 | */ +enum hccs_port_type { + HCCS_V1 = 1, + HCCS_V2, +}; + +#define HCCS_IP_PREFIX "HCCS-v" +#define HCCS_IP_MAX 255 +#define HCCS_NAME_MAX_LEN 9 +struct hccs_type_name_map { + u8 type; + char name[HCCS_NAME_MAX_LEN + 1]; +}; + /* * This value cannot be 255, otherwise the loop of the multi-BD communication * case cannot end. @@ -74,6 +87,8 @@ struct hccs_dev { u64 caps; u8 chip_num; struct hccs_chip_info *chips; + u16 used_type_num; + struct hccs_type_name_map *type_name_maps; u8 chan_id; struct mutex lock; struct hccs_mbox_client_info cl_info;
Current, to find which HCC types are used on the platform the user needs to scan the type attribute of all ports, which is unfriendly to the user. So add the sysfs to show all HCCS types used on the platform. Signed-off-by: Huisong Li <lihuisong@huawei.com> --- .../sysfs-devices-platform-kunpeng_hccs | 8 ++ drivers/soc/hisilicon/kunpeng_hccs.c | 102 +++++++++++++++++- drivers/soc/hisilicon/kunpeng_hccs.h | 15 +++ 3 files changed, 124 insertions(+), 1 deletion(-)