Skip to content

Commit a2ad125

Browse files
IronShenjfvogel
authored andcommitted
net: hns3: don't auto enable misc vector
[ Upstream commit 98b1e3b ] 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]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit bcf430d3bb5525fc89a92a0c451c725ba1aa4306) Signed-off-by: Jack Vogel <[email protected]>
1 parent ccde4de commit a2ad125

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>
@@ -3780,7 +3781,7 @@ static int hclge_misc_irq_init(struct hclge_dev *hdev)
37803781
snprintf(hdev->misc_vector.name, HNAE3_INT_NAME_LEN, "%s-misc-%s",
37813782
HCLGE_NAME, pci_name(hdev->pdev));
37823783
ret = request_irq(hdev->misc_vector.vector_irq, hclge_misc_irq_handle,
3783-
0, hdev->misc_vector.name, hdev);
3784+
IRQF_NO_AUTOEN, hdev->misc_vector.name, hdev);
37843785
if (ret) {
37853786
hclge_free_vector(hdev, 0);
37863787
dev_err(&hdev->pdev->dev, "request misc irq(%d) fail\n",
@@ -11916,9 +11917,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
1191611917

1191711918
hclge_init_rxd_adv_layout(hdev);
1191811919

11919-
/* Enable MISC vector(vector0) */
11920-
hclge_enable_vector(&hdev->misc_vector, true);
11921-
1192211920
ret = hclge_init_wol(hdev);
1192311921
if (ret)
1192411922
dev_warn(&pdev->dev,
@@ -11931,6 +11929,10 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
1193111929
hclge_state_init(hdev);
1193211930
hdev->last_reset_time = jiffies;
1193311931

11932+
/* Enable MISC vector(vector0) */
11933+
enable_irq(hdev->misc_vector.vector_irq);
11934+
hclge_enable_vector(&hdev->misc_vector, true);
11935+
1193411936
dev_info(&hdev->pdev->dev, "%s driver initialization finished.\n",
1193511937
HCLGE_DRIVER_NAME);
1193611938

@@ -12336,7 +12338,7 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
1233612338

1233712339
/* Disable MISC vector(vector0) */
1233812340
hclge_enable_vector(&hdev->misc_vector, false);
12339-
synchronize_irq(hdev->misc_vector.vector_irq);
12341+
disable_irq(hdev->misc_vector.vector_irq);
1234012342

1234112343
/* Disable all hw interrupts */
1234212344
hclge_config_mac_tnl_int(hdev, false);

0 commit comments

Comments
 (0)