From 9b8e732e66b2001dfe40672d01c91327d4d7db98 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Tue, 5 Nov 2024 05:19:50 -0500 Subject: [PATCH] Drop net-hns3-don-t-auto-enable-misc-vector.patch Signed-off-by: Sasha Levin --- ...t-hns3-don-t-auto-enable-misc-vector.patch | 97 ------------------- queue-6.11/series | 1 - ...t-hns3-don-t-auto-enable-misc-vector.patch | 97 ------------------- queue-6.6/series | 1 - 4 files changed, 196 deletions(-) delete mode 100644 queue-6.11/net-hns3-don-t-auto-enable-misc-vector.patch delete mode 100644 queue-6.6/net-hns3-don-t-auto-enable-misc-vector.patch diff --git a/queue-6.11/net-hns3-don-t-auto-enable-misc-vector.patch b/queue-6.11/net-hns3-don-t-auto-enable-misc-vector.patch deleted file mode 100644 index b0e43a5281c..00000000000 --- a/queue-6.11/net-hns3-don-t-auto-enable-misc-vector.patch +++ /dev/null @@ -1,97 +0,0 @@ -From e3c9ddb035062a6ea334b5a0b660b1e074f51a7d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:35 +0800 -Subject: net: hns3: don't auto enable misc vector - -From: Jian Shen - -[ Upstream commit 5f62009ff10826fefa215da68831f42b0c36b6fb ] - -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: 7be1b9f3e99f ("net: hns3: make hclge_service use delayed workqueue") -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - .../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c -index 116098033dfba..83a6cb9ceb020 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -3779,7 +3780,7 @@ static int hclge_misc_irq_init(struct hclge_dev *hdev) - 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, hdev->misc_vector.name, hdev); -+ IRQ_NOAUTOEN, hdev->misc_vector.name, hdev); - if (ret) { - hclge_free_vector(hdev, 0); - dev_err(&hdev->pdev->dev, "request misc irq(%d) fail\n", -@@ -11917,9 +11918,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) - - hclge_init_rxd_adv_layout(hdev); - -- /* Enable MISC vector(vector0) */ -- hclge_enable_vector(&hdev->misc_vector, true); -- - ret = hclge_init_wol(hdev); - if (ret) - dev_warn(&pdev->dev, -@@ -11932,6 +11930,10 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) - hclge_state_init(hdev); - hdev->last_reset_time = jiffies; - -+ /* Enable MISC vector(vector0) */ -+ enable_irq(hdev->misc_vector.vector_irq); -+ hclge_enable_vector(&hdev->misc_vector, true); -+ - dev_info(&hdev->pdev->dev, "%s driver initialization finished.\n", - HCLGE_DRIVER_NAME); - -@@ -12337,7 +12339,7 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev) - - /* Disable MISC vector(vector0) */ - hclge_enable_vector(&hdev->misc_vector, false); -- synchronize_irq(hdev->misc_vector.vector_irq); -+ disable_irq(hdev->misc_vector.vector_irq); - - /* Disable all hw interrupts */ - hclge_config_mac_tnl_int(hdev, false); --- -2.43.0 - diff --git a/queue-6.11/series b/queue-6.11/series index 8dc9a02a52b..6d2cbbeaaca 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -56,7 +56,6 @@ netfilter-nft_payload-sanitize-offset-and-length-bef.patch net-hns3-fixed-reset-failure-issues-caused-by-the-in.patch net-hns3-fix-missing-features-due-to-dev-features-co.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch -net-hns3-don-t-auto-enable-misc-vector.patch net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch net-hns3-fixed-hclge_fetch_pf_reg-accesses-bar-space.patch net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch diff --git a/queue-6.6/net-hns3-don-t-auto-enable-misc-vector.patch b/queue-6.6/net-hns3-don-t-auto-enable-misc-vector.patch deleted file mode 100644 index 1150623b66b..00000000000 --- a/queue-6.6/net-hns3-don-t-auto-enable-misc-vector.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 80c7685e460fbbfea9421d394c40603b07bce9eb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:35 +0800 -Subject: net: hns3: don't auto enable misc vector - -From: Jian Shen - -[ Upstream commit 5f62009ff10826fefa215da68831f42b0c36b6fb ] - -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: 7be1b9f3e99f ("net: hns3: make hclge_service use delayed workqueue") -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - .../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c -index 9650ce594e2fd..72f8f0de10792 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -3713,7 +3714,7 @@ static int hclge_misc_irq_init(struct hclge_dev *hdev) - 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, hdev->misc_vector.name, hdev); -+ IRQ_NOAUTOEN, hdev->misc_vector.name, hdev); - if (ret) { - hclge_free_vector(hdev, 0); - dev_err(&hdev->pdev->dev, "request misc irq(%d) fail\n", -@@ -11805,9 +11806,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) - - hclge_init_rxd_adv_layout(hdev); - -- /* Enable MISC vector(vector0) */ -- hclge_enable_vector(&hdev->misc_vector, true); -- - ret = hclge_init_wol(hdev); - if (ret) - dev_warn(&pdev->dev, -@@ -11820,6 +11818,10 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) - hclge_state_init(hdev); - hdev->last_reset_time = jiffies; - -+ /* Enable MISC vector(vector0) */ -+ enable_irq(hdev->misc_vector.vector_irq); -+ hclge_enable_vector(&hdev->misc_vector, true); -+ - dev_info(&hdev->pdev->dev, "%s driver initialization finished.\n", - HCLGE_DRIVER_NAME); - -@@ -12223,7 +12225,7 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev) - - /* Disable MISC vector(vector0) */ - hclge_enable_vector(&hdev->misc_vector, false); -- synchronize_irq(hdev->misc_vector.vector_irq); -+ disable_irq(hdev->misc_vector.vector_irq); - - /* Disable all hw interrupts */ - hclge_config_mac_tnl_int(hdev, false); --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 41d160070aa..61bd79d6e5a 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -39,7 +39,6 @@ mlxsw-spectrum_ipip-fix-memory-leak-when-changing-re.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch net-hns3-fix-missing-features-due-to-dev-features-co.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch -net-hns3-don-t-auto-enable-misc-vector.patch net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch net-hns3-fixed-hclge_fetch_pf_reg-accesses-bar-space.patch net-hns3-fix-kernel-crash-when-1588-is-sent-on-hip08.patch -- 2.47.3