Skip to content

Commit 98b1e3b

Browse files
IronShenkuba-moo
authored andcommitted
net: hns3: don't auto enable misc vector
Currently, there is a time window between misc irq enabled and service task inited. If an interrupte is reported at this time, it will cause warning like below: [ 16.324639] Call trace: [ 16.324641] __queue_delayed_work+0xb8/0xe0 [ 16.324643] mod_delayed_work_on+0x78/0xd0 [ 16.324655] hclge_errhand_task_schedule+0x58/0x90 [hclge] [ 16.324662] hclge_misc_irq_handle+0x168/0x240 [hclge] [ 16.324666] __handle_irq_event_percpu+0x64/0x1e0 [ 16.324667] handle_irq_event+0x80/0x170 [ 16.324670] handle_fasteoi_edge_irq+0x110/0x2bc [ 16.324671] __handle_domain_irq+0x84/0xfc [ 16.324673] gic_handle_irq+0x88/0x2c0 [ 16.324674] el1_irq+0xb8/0x140 [ 16.324677] arch_cpu_idle+0x18/0x40 [ 16.324679] default_idle_call+0x5c/0x1bc [ 16.324682] cpuidle_idle_call+0x18c/0x1c4 [ 16.324684] do_idle+0x174/0x17c [ 16.324685] cpu_startup_entry+0x30/0x6c [ 16.324687] secondary_start_kernel+0x1a4/0x280 [ 16.324688] ---[ end trace 6aa0bff672a964aa ]--- So don't auto enable misc vector when request irq.. Fixes: 7be1b9f ("net: hns3: make hclge_service use delayed workqueue") Signed-off-by: Jian Shen <[email protected]> Signed-off-by: Jijie Shao <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 5191a8d commit 98b1e3b

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <linux/etherdevice.h>
77
#include <linux/init.h>
88
#include <linux/interrupt.h>
9+
#include <linux/irq.h>
910
#include <linux/kernel.h>
1011
#include <linux/module.h>
1112
#include <linux/netdevice.h>
@@ -3770,7 +3771,7 @@ static int hclge_misc_irq_init(struct hclge_dev *hdev)
37703771
snprintf(hdev->misc_vector.name, HNAE3_INT_NAME_LEN, "%s-misc-%s",
37713772
HCLGE_NAME, pci_name(hdev->pdev));
37723773
ret = request_irq(hdev->misc_vector.vector_irq, hclge_misc_irq_handle,
3773-
0, hdev->misc_vector.name, hdev);
3774+
IRQF_NO_AUTOEN, hdev->misc_vector.name, hdev);
37743775
if (ret) {
37753776
hclge_free_vector(hdev, 0);
37763777
dev_err(&hdev->pdev->dev, "request misc irq(%d) fail\n",
@@ -11906,9 +11907,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
1190611907

1190711908
hclge_init_rxd_adv_layout(hdev);
1190811909

11909-
/* Enable MISC vector(vector0) */
11910-
hclge_enable_vector(&hdev->misc_vector, true);
11911-
1191211910
ret = hclge_init_wol(hdev);
1191311911
if (ret)
1191411912
dev_warn(&pdev->dev,
@@ -11921,6 +11919,10 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
1192111919
hclge_state_init(hdev);
1192211920
hdev->last_reset_time = jiffies;
1192311921

11922+
/* Enable MISC vector(vector0) */
11923+
enable_irq(hdev->misc_vector.vector_irq);
11924+
hclge_enable_vector(&hdev->misc_vector, true);
11925+
1192411926
dev_info(&hdev->pdev->dev, "%s driver initialization finished.\n",
1192511927
HCLGE_DRIVER_NAME);
1192611928

@@ -12326,7 +12328,7 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
1232612328

1232712329
/* Disable MISC vector(vector0) */
1232812330
hclge_enable_vector(&hdev->misc_vector, false);
12329-
synchronize_irq(hdev->misc_vector.vector_irq);
12331+
disable_irq(hdev->misc_vector.vector_irq);
1233012332

1233112333
/* Disable all hw interrupts */
1233212334
hclge_config_mac_tnl_int(hdev, false);

0 commit comments

Comments
 (0)