From: Greg Kroah-Hartman Date: Tue, 4 May 2021 04:44:04 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.19.190~45 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31fea949b1d44ffba3de0ca757e0400895cfcbb0;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..0044424c5cb --- /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 +Date: Mon, 21 Dec 2020 22:25:02 +0000 +Subject: igb: Enable RSS for Intel I211 Ethernet Controller + +From: Nick Lowe + +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 +Tested-by: David Switzer +Signed-off-by: Tony Nguyen +Signed-off-by: Greg Kroah-Hartman +--- + 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 b7fcbee0ada..eb2a9b9d949 100644 --- 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