Commit f97c4d82 authored by Yonglong Liu's avatar Yonglong Liu Committed by David S. Miller
Browse files

net: hns3: modify the IRQ name of misc vectors 



The misc IRQ of all the devices have the same name, so it's
hard to find the right misc IRQ of the device.

This patch modifies the misc IRQ names as "hclge/hclgevf"-misc-
"pci name". And now the IRQ name is not related to net device
name anymore, so change the HNAE3_INT_NAME_LEN to 32 bytes, and
that is enough.

Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7ab2b53e

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+1 −2
Original line number Diff line number Diff line
@@ -575,8 +575,7 @@ struct hnae3_ae_algo { 
	const struct pci_device_id *pdev_id_table;

};



#define HNAE3_INT_NAME_EXT_LEN    32	 /* Max extra information length */

#define HNAE3_INT_NAME_LEN        (IFNAMSIZ + HNAE3_INT_NAME_EXT_LEN)

#define HNAE3_INT_NAME_LEN        32

#define HNAE3_ITR_COUNTDOWN_START 100



struct hnae3_tc_info {

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/types.h>

#include <linux/io.h>

#include <linux/etherdevice.h>

#include "hnae3.h"



#define HCLGE_CMDQ_TX_TIMEOUT		30000

#define HCLGE_DESC_DATA_LEN		6
@@ -63,6 +64,7 @@ enum hclge_cmd_status { 
struct hclge_misc_vector {

	u8 __iomem *addr;

	int vector_irq;

	char name[HNAE3_INT_NAME_LEN];

};



struct hclge_cmq {

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+3 −1
Original line number Diff line number Diff line
@@ -3177,8 +3177,10 @@ static int hclge_misc_irq_init(struct hclge_dev *hdev) 
	hclge_get_misc_vector(hdev);



	/* this would be explicitly freed in the end */

	snprintf(hdev->misc_vector.name, HNAE3_INT_NAME_LEN, "%s-misc-%s",

		 HCLGE_NAME, pci_name(hdev->pdev));

	ret = request_irq(hdev->misc_vector.vector_irq, hclge_misc_irq_handle,

			  0, "hclge_misc", hdev);

			  0, hdev->misc_vector.name, hdev);

	if (ret) {

		hclge_free_vector(hdev, 0);

		dev_err(&hdev->pdev->dev, "request misc irq(%d) fail\n",

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+3 −1
Original line number Diff line number Diff line
@@ -2376,8 +2376,10 @@ static int hclgevf_misc_irq_init(struct hclgevf_dev *hdev) 


	hclgevf_get_misc_vector(hdev);



	snprintf(hdev->misc_vector.name, HNAE3_INT_NAME_LEN, "%s-misc-%s",

		 HCLGEVF_NAME, pci_name(hdev->pdev));

	ret = request_irq(hdev->misc_vector.vector_irq, hclgevf_misc_irq_handle,

			  0, "hclgevf_cmd", hdev);

			  0, hdev->misc_vector.name, hdev);

	if (ret) {

		dev_err(&hdev->pdev->dev, "VF failed to request misc irq(%d)\n",

			hdev->misc_vector.vector_irq);

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ struct hclgevf_rss_cfg { 
struct hclgevf_misc_vector {

	u8 __iomem *addr;

	int vector_irq;

	char name[HNAE3_INT_NAME_LEN];

};



struct hclgevf_rst_stats {

CRA Git | Maintained and supported by SUSTech CRA and CCSE