Commit a19bcbc3 authored Dec 07, 2023 by Chengchang Tang Committed by Juan Zhou Feb 05, 2024

RDMA/hns: Rename the interrupts

mainline inclusion
from mainline-v6.8-rc1
commit 95f6b40082aaf37fd0553828982402af36f81685
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I90X3R
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=95f6b40082aaf37fd0553828982402af36f81685



----------------------------------------------------------------------

Now, different devices may have the same interrupt name, which
makes it difficult for users to distinguish between these
interrupts.

Modify the naming style to be consistent with our network devices.
Before:
"hns-aeq-0"
"hns-ceq-0"
...

Now:
"hns-0000:35:00.0-aeq-0"
"hns-0000:35:00.0-ceq-0"
...

Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
Link: https://lore.kernel.org/r/20231207114231.2872104-2-huangjunxian6@hisilicon.com


Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Juan Zhou <zhoujuan51@h-partners.com>

parent db90f001

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -6478,15 +6478,16 @@ static int __hns_roce_request_irq(struct hns_roce_dev *hr_dev, int irq_num,
		/* irq contains: abnormal + AEQ + CEQ */
		for (j = 0; j < other_num; j++)
		snprintf((char *)hr_dev->irq_names[j], HNS_ROCE_INT_NAME_LEN,
		"hns-abn-%d", j);
		"hns-%s-abn-%d", pci_name(hr_dev->pci_dev), j);

		for (j = other_num; j < (other_num + aeq_num); j++)
		snprintf((char *)hr_dev->irq_names[j], HNS_ROCE_INT_NAME_LEN,
		"hns-aeq-%d", j - other_num);
		"hns-%s-aeq-%d", pci_name(hr_dev->pci_dev), j - other_num);

		for (j = (other_num + aeq_num); j < irq_num; j++)
		snprintf((char *)hr_dev->irq_names[j], HNS_ROCE_INT_NAME_LEN,
		"hns-ceq-%d", j - other_num - aeq_num);
		"hns-%s-ceq-%d", pci_name(hr_dev->pci_dev),
		j - other_num - aeq_num);

		for (j = 0; j < irq_num; j++) {
		if (j < other_num)