5.4-stable patches

added patches:
	igb-enable-rss-for-intel-i211-ethernet-controller.patch

diff --git a/queue-5.4/igb-enable-rss-for-intel-i211-ethernet-controller.patch b/queue-5.4/igb-enable-rss-for-intel-i211-ethernet-controller.patch
new file mode 100644 (file)
index 0000000..0044424
--- /dev/null
+++ b/queue-5.4/igb-enable-rss-for-intel-i211-ethernet-controller.patch
@@ -0,0 +1,44 @@
+From 6e6026f2dd2005844fb35c3911e8083c09952c6c Mon Sep 17 00:00:00 2001
+From: Nick Lowe <nick.lowe@gmail.com>
+Date: Mon, 21 Dec 2020 22:25:02 +0000
+Subject: igb: Enable RSS for Intel I211 Ethernet Controller
+
+From: Nick Lowe <nick.lowe@gmail.com>
+
+commit 6e6026f2dd2005844fb35c3911e8083c09952c6c upstream.
+
+The Intel I211 Ethernet Controller supports 2 Receive Side Scaling (RSS)
+queues. It should not be excluded from having this feature enabled.
+
+Via commit c883de9fd787 ("igb: rename igb define to be more generic")
+E1000_MRQC_ENABLE_RSS_4Q was renamed to E1000_MRQC_ENABLE_RSS_MQ to
+indicate that this is a generic bit flag to enable queues and not
+a flag that is specific to devices that support 4 queues
+
+The bit flag enables 2, 4 or 8 queues appropriately depending on the part.
+
+Tested with a multicore CPU and frames were then distributed as expected.
+
+This issue appears to have been introduced because of confusion caused
+by the prior name.
+
+Signed-off-by: Nick Lowe <nick.lowe@gmail.com>
+Tested-by: David Switzer <david.switzer@intel.com>
+Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/intel/igb/igb_main.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -4326,8 +4326,7 @@ static void igb_setup_mrqc(struct igb_ad
+               else
+                       mrqc |= E1000_MRQC_ENABLE_VMDQ;
+       } else {
+-              if (hw->mac.type != e1000_i211)
+-                      mrqc |= E1000_MRQC_ENABLE_RSS_MQ;
++              mrqc |= E1000_MRQC_ENABLE_RSS_MQ;
+       }
+       igb_vmm_control(adapter);
+ 

diff --git a/queue-5.4/series b/queue-5.4/series
index b7fcbee0ada2bd2a311582d12bb6243b490659bb..eb2a9b9d94924d39eab52e536d04ffea200fe3d5 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -2,3 +2,4 @@ mips-do-not-include-hi-and-lo-in-clobber-list-for-r6.patch
 acpi-tables-x86-reserve-memory-occupied-by-acpi-tables.patch
 acpi-x86-call-acpi_boot_table_init-after-acpi_table_upgrade.patch
 net-usb-ax88179_178a-initialize-local-variables-before-use.patch
+igb-enable-rss-for-intel-i211-ethernet-controller.patch