From: Sasha Levin Date: Tue, 5 Nov 2024 10:20:41 +0000 (-0500) Subject: Drop net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch X-Git-Tag: v4.19.323~88 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff45acd4b8e047647399ce31ae96619ff1e96ff2;p=thirdparty%2Fkernel%2Fstable-queue.git Drop net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch b/queue-5.10/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch deleted file mode 100644 index 4363d6f4d1a..00000000000 --- a/queue-5.10/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1b4a6bf40081430f300cb3a05009f0dab61c5213 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:36 +0800 -Subject: net: hns3: initialize reset_timer before hclgevf_misc_irq_init() - -From: Jian Shen - -[ Upstream commit d1c2e2961ab460ac2433ff8ad46000582abc573c ] - -Currently the misc irq is initialized before reset_timer setup. But -it will access the reset_timer in the irq handler. So initialize -the reset_timer earlier. - -Fixes: ff200099d271 ("net: hns3: remove unnecessary work in hclgevf_main") -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -index 755935f9efc81..8193c5afe6106 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -@@ -2656,6 +2656,7 @@ static void hclgevf_state_init(struct hclgevf_dev *hdev) - clear_bit(HCLGEVF_STATE_RST_FAIL, &hdev->state); - - INIT_DELAYED_WORK(&hdev->service_task, hclgevf_service_task); -+ timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - mutex_init(&hdev->mbx_resp.mbx_mutex); - sema_init(&hdev->reset_sem, 1); -@@ -3279,7 +3280,6 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev) - HCLGEVF_DRIVER_NAME); - - hclgevf_task_schedule(hdev, round_jiffies_relative(HZ)); -- timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - return 0; - --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 8740eb89ef9..a8539668ffa 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -75,7 +75,6 @@ bpf-fix-out-of-bounds-write-in-trie_get_next_key.patch net-support-ip-generic-csum-processing-in-skb_csum_h.patch net-skip-offload-for-netif_f_ipv6_csum-if-ipv6-heade.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch -net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch compiler-gcc-be-consistent-with-underscores-use-for-.patch compiler-gcc-remove-attribute-support-check-for-__no.patch kasan-fix-software-tag-based-kasan-with-gcc.patch diff --git a/queue-5.15/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch b/queue-5.15/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch deleted file mode 100644 index 2a5e70f3d2a..00000000000 --- a/queue-5.15/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a5698ef1a3ab2e4f5c290f2d667d4331e2de9fe7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:36 +0800 -Subject: net: hns3: initialize reset_timer before hclgevf_misc_irq_init() - -From: Jian Shen - -[ Upstream commit d1c2e2961ab460ac2433ff8ad46000582abc573c ] - -Currently the misc irq is initialized before reset_timer setup. But -it will access the reset_timer in the irq handler. So initialize -the reset_timer earlier. - -Fixes: ff200099d271 ("net: hns3: remove unnecessary work in hclgevf_main") -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -index 5b861a2a3e73e..b011df3a684f0 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -@@ -2793,6 +2793,7 @@ static void hclgevf_state_init(struct hclgevf_dev *hdev) - clear_bit(HCLGEVF_STATE_RST_FAIL, &hdev->state); - - INIT_DELAYED_WORK(&hdev->service_task, hclgevf_service_task); -+ timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - mutex_init(&hdev->mbx_resp.mbx_mutex); - sema_init(&hdev->reset_sem, 1); -@@ -3488,7 +3489,6 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev) - HCLGEVF_DRIVER_NAME); - - hclgevf_task_schedule(hdev, round_jiffies_relative(HZ)); -- timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - return 0; - --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index e53b27ff1be..f6db221ce75 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -26,7 +26,6 @@ netfilter-fix-use-after-free-in-get_info.patch net-skip-offload-for-netif_f_ipv6_csum-if-ipv6-heade.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch -net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch firmware-arm_sdei-fix-the-input-parameter-of-cpuhp_r.patch acpi-cppc-make-rmw_lock-a-raw_spin_lock.patch fs-ntfs3-check-if-more-than-chunk-size-bytes-are-wri.patch diff --git a/queue-6.1/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch b/queue-6.1/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch deleted file mode 100644 index fb009f00038..00000000000 --- a/queue-6.1/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 031973d2e484f28df0f0fcc8c6082a183b0a4266 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:36 +0800 -Subject: net: hns3: initialize reset_timer before hclgevf_misc_irq_init() - -From: Jian Shen - -[ Upstream commit d1c2e2961ab460ac2433ff8ad46000582abc573c ] - -Currently the misc irq is initialized before reset_timer setup. But -it will access the reset_timer in the irq handler. So initialize -the reset_timer earlier. - -Fixes: ff200099d271 ("net: hns3: remove unnecessary work in hclgevf_main") -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -index aebb104f4c290..89560484bf463 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -@@ -2307,6 +2307,7 @@ static void hclgevf_state_init(struct hclgevf_dev *hdev) - clear_bit(HCLGEVF_STATE_RST_FAIL, &hdev->state); - - INIT_DELAYED_WORK(&hdev->service_task, hclgevf_service_task); -+ timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - mutex_init(&hdev->mbx_resp.mbx_mutex); - sema_init(&hdev->reset_sem, 1); -@@ -3005,7 +3006,6 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev) - HCLGEVF_DRIVER_NAME); - - hclgevf_task_schedule(hdev, round_jiffies_relative(HZ)); -- timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - return 0; - --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 8799f807d4c..0b5d288bc76 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -36,7 +36,6 @@ mlxsw-spectrum_ipip-rename-spectrum-2-ip6gre-operati.patch mlxsw-spectrum_ipip-fix-memory-leak-when-changing-re.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch -net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch iomap-convert-iomap_unshare_iter-to-use-large-folios.patch iomap-improve-shared-block-detection-in-iomap_unshar.patch iomap-don-t-bother-unsharing-delalloc-extents.patch diff --git a/queue-6.11/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch b/queue-6.11/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch deleted file mode 100644 index 2d733b4ab98..00000000000 --- a/queue-6.11/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 99dc677d4e8dc5524b5ea00653f2ac7e99eab74f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:36 +0800 -Subject: net: hns3: initialize reset_timer before hclgevf_misc_irq_init() - -From: Jian Shen - -[ Upstream commit d1c2e2961ab460ac2433ff8ad46000582abc573c ] - -Currently the misc irq is initialized before reset_timer setup. But -it will access the reset_timer in the irq handler. So initialize -the reset_timer earlier. - -Fixes: ff200099d271 ("net: hns3: remove unnecessary work in hclgevf_main") -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -index ab54e6155e933..896f1eb172d30 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -@@ -2315,6 +2315,7 @@ static void hclgevf_state_init(struct hclgevf_dev *hdev) - clear_bit(HCLGEVF_STATE_RST_FAIL, &hdev->state); - - INIT_DELAYED_WORK(&hdev->service_task, hclgevf_service_task); -+ timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - mutex_init(&hdev->mbx_resp.mbx_mutex); - sema_init(&hdev->reset_sem, 1); -@@ -3014,7 +3015,6 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev) - HCLGEVF_DRIVER_NAME); - - hclgevf_task_schedule(hdev, round_jiffies_relative(HZ)); -- timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - return 0; - --- -2.43.0 - diff --git a/queue-6.11/series b/queue-6.11/series index 1eebafc8d7c..0644855ba25 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -54,7 +54,6 @@ mlxsw-spectrum_ipip-fix-memory-leak-when-changing-re.patch net-ethernet-mtk_wed-fix-path-of-mt7988-wo-firmware.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch -net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch bpf-test_run-fix-live_frame-frame-update-after-a-pag.patch iomap-improve-shared-block-detection-in-iomap_unshar.patch iomap-don-t-bother-unsharing-delalloc-extents.patch diff --git a/queue-6.6/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch b/queue-6.6/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch deleted file mode 100644 index e0feb14ea03..00000000000 --- a/queue-6.6/net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 54f78b1c59a5d8084b6993c71b01ffce688b4a10 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Oct 2024 17:29:36 +0800 -Subject: net: hns3: initialize reset_timer before hclgevf_misc_irq_init() - -From: Jian Shen - -[ Upstream commit d1c2e2961ab460ac2433ff8ad46000582abc573c ] - -Currently the misc irq is initialized before reset_timer setup. But -it will access the reset_timer in the irq handler. So initialize -the reset_timer earlier. - -Fixes: ff200099d271 ("net: hns3: remove unnecessary work in hclgevf_main") -Signed-off-by: Jian Shen -Signed-off-by: Jijie Shao -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -index affdd9d70549a..46163c2d7c7cd 100644 ---- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c -@@ -2252,6 +2252,7 @@ static void hclgevf_state_init(struct hclgevf_dev *hdev) - clear_bit(HCLGEVF_STATE_RST_FAIL, &hdev->state); - - INIT_DELAYED_WORK(&hdev->service_task, hclgevf_service_task); -+ timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - mutex_init(&hdev->mbx_resp.mbx_mutex); - sema_init(&hdev->reset_sem, 1); -@@ -2948,7 +2949,6 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev) - HCLGEVF_DRIVER_NAME); - - hclgevf_task_schedule(hdev, round_jiffies_relative(HZ)); -- timer_setup(&hdev->reset_timer, hclgevf_reset_timer, 0); - - return 0; - --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 0de121e2a76..440e98c6c14 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -38,7 +38,6 @@ mlxsw-spectrum_ptp-add-missing-verification-before-p.patch mlxsw-spectrum_ipip-fix-memory-leak-when-changing-re.patch netfilter-nft_payload-sanitize-offset-and-length-bef.patch net-hns3-resolved-the-issue-that-the-debugfs-query-r.patch -net-hns3-initialize-reset_timer-before-hclgevf_misc_.patch bpf-test_run-fix-live_frame-frame-update-after-a-pag.patch iomap-improve-shared-block-detection-in-iomap_unshar.patch iomap-don-t-bother-unsharing-delalloc-extents.patch