From: Greg Kroah-Hartman Date: Mon, 7 Mar 2022 15:18:02 +0000 (+0100) Subject: drop queue-5.10/ibmvnic-define-flush_reset_queue-helper.patch X-Git-Tag: v4.9.305~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88e29d31ee94119b66a1a3cf01ff0e97f4f40046;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/ibmvnic-define-flush_reset_queue-helper.patch --- diff --git a/queue-5.10/ibmvnic-complete-init_done-on-transport-events.patch b/queue-5.10/ibmvnic-complete-init_done-on-transport-events.patch index 4a38cee4933..cd26d300c30 100644 --- a/queue-5.10/ibmvnic-complete-init_done-on-transport-events.patch +++ b/queue-5.10/ibmvnic-complete-init_done-on-transport-events.patch @@ -16,14 +16,12 @@ Signed-off-by: Sukadev Bhattiprolu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- - drivers/net/ethernet/ibm/ibmvnic.c | 7 +++++++ + drivers/net/ethernet/ibm/ibmvnic.c | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c -index f07468316656..1afb31c9ed7b 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c -@@ -4931,6 +4931,13 @@ static void ibmvnic_handle_crq(union ibmvnic_crq *crq, +@@ -4923,6 +4923,13 @@ static void ibmvnic_handle_crq(union ibm adapter->fw_done_rc = -EIO; complete(&adapter->fw_done); } @@ -37,6 +35,3 @@ index f07468316656..1afb31c9ed7b 100644 if (!completion_done(&adapter->stats_done)) complete(&adapter->stats_done); if (test_bit(0, &adapter->resetting)) --- -2.34.1 - diff --git a/queue-5.10/ibmvnic-define-flush_reset_queue-helper.patch b/queue-5.10/ibmvnic-define-flush_reset_queue-helper.patch deleted file mode 100644 index cf2eb1385ee..00000000000 --- a/queue-5.10/ibmvnic-define-flush_reset_queue-helper.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a4c55cbb79a10a5c450aa507df02a70f1264f554 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 24 Feb 2022 22:23:53 -0800 -Subject: ibmvnic: define flush_reset_queue helper - -From: Sukadev Bhattiprolu - -[ Upstream commit 83da53f7e4bd86dca4b2edc1e2bb324fb3c033a1 ] - -Define and use a helper to flush the reset queue. - -Fixes: 2770a7984db5 ("ibmvnic: Introduce hard reset recovery") -Signed-off-by: Sukadev Bhattiprolu -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/ibm/ibmvnic.c | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) - -diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c -index de58824f4c18..f07468316656 100644 ---- a/drivers/net/ethernet/ibm/ibmvnic.c -+++ b/drivers/net/ethernet/ibm/ibmvnic.c -@@ -2304,12 +2304,23 @@ static void __ibmvnic_delayed_reset(struct work_struct *work) - __ibmvnic_reset(&adapter->ibmvnic_reset); - } - -+static void flush_reset_queue(struct ibmvnic_adapter *adapter) -+{ -+ struct list_head *entry, *tmp_entry; -+ -+ if (!list_empty(&adapter->rwi_list)) { -+ list_for_each_safe(entry, tmp_entry, &adapter->rwi_list) { -+ list_del(entry); -+ kfree(list_entry(entry, struct ibmvnic_rwi, list)); -+ } -+ } -+} -+ - static int ibmvnic_reset(struct ibmvnic_adapter *adapter, - enum ibmvnic_reset_reason reason) - { -- struct list_head *entry, *tmp_entry; -- struct ibmvnic_rwi *rwi, *tmp; - struct net_device *netdev = adapter->netdev; -+ struct ibmvnic_rwi *rwi, *tmp; - unsigned long flags; - int ret; - -@@ -2353,12 +2364,9 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter, - /* if we just received a transport event, - * flush reset queue and process this reset - */ -- if (adapter->force_reset_recovery && !list_empty(&adapter->rwi_list)) { -- list_for_each_safe(entry, tmp_entry, &adapter->rwi_list) { -- list_del(entry); -- kfree(list_entry(entry, struct ibmvnic_rwi, list)); -- } -- } -+ if (adapter->force_reset_recovery) -+ flush_reset_queue(adapter); -+ - rwi->reset_reason = reason; - list_add_tail(&rwi->list, &adapter->rwi_list); - netdev_dbg(adapter->netdev, "Scheduling reset (reason %d)\n", reason); --- -2.34.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 24f9e34980a..f82fe39eac2 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -85,7 +85,6 @@ soc-fsl-guts-revert-commit-3c0d64e867ed.patch soc-fsl-guts-add-a-missing-memory-allocation-failure.patch soc-fsl-qe-check-of-ioremap-return-value.patch arm-tegra-move-panels-to-aux-bus.patch -ibmvnic-define-flush_reset_queue-helper.patch ibmvnic-complete-init_done-on-transport-events.patch net-chelsio-cxgb3-check-the-return-value-of-pci_find.patch iavf-refactor-iavf-state-machine-tracking.patch