summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pagano <mpagano@gentoo.org>2021-07-12 13:25:04 -0400
committerMike Pagano <mpagano@gentoo.org>2021-07-12 13:25:04 -0400
commitda5f7d3accc013203b1edbe8926be726a0a3507d (patch)
treed49cbccec79415ce67318a7e48e9d13fd8aa612f
parentRemove redundant patch (diff)
downloadlinux-patches-da5f7d3accc013203b1edbe8926be726a0a3507d.tar.gz
linux-patches-da5f7d3accc013203b1edbe8926be726a0a3507d.tar.bz2
linux-patches-da5f7d3accc013203b1edbe8926be726a0a3507d.zip
Revert ibmvnic: remove duplicate napi_schedule call in open function5.10-55
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
-rw-r--r--0000_README4
-rw-r--r--2400_revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch46
2 files changed, 50 insertions, 0 deletions
diff --git a/0000_README b/0000_README
index 908e68df..7e89cd16 100644
--- a/0000_README
+++ b/0000_README
@@ -251,6 +251,10 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/raw
Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758
+Patch: 2400_revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch
+From: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/plain/queue-5.10/revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch
+Desc: Revert ibmvnic: remove duplicate napi_schedule call in open function
+
Patch: 2900_tmp513-Fix-build-issue-by-selecting-CONFIG_REG.patch
From: https://bugs.gentoo.org/710790
Desc: tmp513 requies REGMAP_I2C to build. Select it by default in Kconfig. See bug #710790. Thanks to Phil Stracchino
diff --git a/2400_revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch b/2400_revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch
new file mode 100644
index 00000000..6acd4322
--- /dev/null
+++ b/2400_revert-ibmvnic-remove-duplicate-napi_schedule-call-i.patch
@@ -0,0 +1,46 @@
+From a795f695bbc648e27d56f99c38fc1afbe832b088 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 23 Jun 2021 21:13:11 -0700
+Subject: Revert "ibmvnic: remove duplicate napi_schedule call in open
+ function"
+
+From: Dany Madden <drt@linux.ibm.com>
+
+[ Upstream commit 2ca220f92878470c6ba03f9946e412323093cc94 ]
+
+This reverts commit 7c451f3ef676c805a4b77a743a01a5c21a250a73.
+
+When a vnic interface is taken down and then up, connectivity is not
+restored. We bisected it to this commit. Reverting this commit until
+we can fully investigate the issue/benefit of the change.
+
+Fixes: 7c451f3ef676 ("ibmvnic: remove duplicate napi_schedule call in open function")
+Reported-by: Cristobal Forno <cforno12@linux.ibm.com>
+Reported-by: Abdul Haleem <abdhalee@in.ibm.com>
+Signed-off-by: Dany Madden <drt@linux.ibm.com>
+Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/net/ethernet/ibm/ibmvnic.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
+index 8cc444684491..765b38c8b252 100644
+--- a/drivers/net/ethernet/ibm/ibmvnic.c
++++ b/drivers/net/ethernet/ibm/ibmvnic.c
+@@ -1166,6 +1166,11 @@ static int __ibmvnic_open(struct net_device *netdev)
+
+ netif_tx_start_all_queues(netdev);
+
++ if (prev_state == VNIC_CLOSED) {
++ for (i = 0; i < adapter->req_rx_queues; i++)
++ napi_schedule(&adapter->napi[i]);
++ }
++
+ adapter->state = VNIC_OPEN;
+ return rc;
+ }
+--
+2.30.2
+