Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2018-07-19 12:18:31 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2018-07-19 12:22:14 +0200
commitc3d01482c7b00ed10855298b0dbb3987da2a7f95 (patch)
tree6dbccf127869a376f125aca7e2e3ce834a400035
parentd9b5d887ce8371a239dc89330be353d89b7b9287 (diff)
fm10k: don't protect fm10k_queue_mac_request by
fm10k_host_mbx_ready (bsc#1101813 FATE#325148).
-rw-r--r--patches.drivers/fm10k-don-t-protect-fm10k_queue_mac_request-by-fm10k.patch58
-rw-r--r--series.conf1
2 files changed, 59 insertions, 0 deletions
diff --git a/patches.drivers/fm10k-don-t-protect-fm10k_queue_mac_request-by-fm10k.patch b/patches.drivers/fm10k-don-t-protect-fm10k_queue_mac_request-by-fm10k.patch
new file mode 100644
index 0000000000..75017858ed
--- /dev/null
+++ b/patches.drivers/fm10k-don-t-protect-fm10k_queue_mac_request-by-fm10k.patch
@@ -0,0 +1,58 @@
+From: Jacob Keller <jacob.e.keller@intel.com>
+Date: Thu, 12 Apr 2018 11:15:59 -0700
+Subject: fm10k: don't protect fm10k_queue_mac_request by fm10k_host_mbx_ready
+Patch-mainline: v4.18-rc1
+Git-commit: 0a3e92de1be42b5dbed4b81f835740d3f58c5430
+References: bsc#1101813 FATE#325148
+
+We don't actually need to check if the host mbx is ready when queuing
+MAC requests, because these are not handled by a special queue which
+queues up requests until the mailbox is capable of handling them.
+
+Pull these requests outside the fm10k_host_mbx_ready() check, as it is
+not necessary.
+
+Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
+Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
++++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+@@ -1546,12 +1546,12 @@ static void *fm10k_dfwd_add_station(stru
+
+ glort = l2_accel->dglort + 1 + i;
+
+- if (fm10k_host_mbx_ready(interface)) {
++ if (fm10k_host_mbx_ready(interface))
+ hw->mac.ops.update_xcast_mode(hw, glort,
+ FM10K_XCAST_MODE_MULTI);
+- fm10k_queue_mac_request(interface, glort, sdev->dev_addr,
+- hw->mac.default_vid, true);
+- }
++
++ fm10k_queue_mac_request(interface, glort, sdev->dev_addr,
++ hw->mac.default_vid, true);
+
+ for (vid = fm10k_find_next_vlan(interface, 0);
+ vid < VLAN_N_VID;
+@@ -1592,12 +1592,12 @@ static void fm10k_dfwd_del_station(struc
+
+ glort = l2_accel->dglort + 1 + i;
+
+- if (fm10k_host_mbx_ready(interface)) {
++ if (fm10k_host_mbx_ready(interface))
+ hw->mac.ops.update_xcast_mode(hw, glort,
+ FM10K_XCAST_MODE_NONE);
+- fm10k_queue_mac_request(interface, glort, sdev->dev_addr,
+- hw->mac.default_vid, false);
+- }
++
++ fm10k_queue_mac_request(interface, glort, sdev->dev_addr,
++ hw->mac.default_vid, false);
+
+ for (vid = fm10k_find_next_vlan(interface, 0);
+ vid < VLAN_N_VID;
diff --git a/series.conf b/series.conf
index cbae5f4cb4..9e71299461 100644
--- a/series.conf
+++ b/series.conf
@@ -13928,6 +13928,7 @@
patches.drivers/fm10k-use-variadic-arguments-to-fm10k_add_stat_strin.patch
patches.drivers/fm10k-use-macro-to-avoid-passing-the-array-and-size-.patch
patches.drivers/fm10k-warn-if-the-stat-size-is-unknown.patch
+ patches.drivers/fm10k-don-t-protect-fm10k_queue_mac_request-by-fm10k.patch
patches.drivers/qed-Fix-possibility-of-list-corruption-during-rmmod-.patch
patches.drivers/qed-Fix-LL2-race-during-connection-terminate.patch
patches.drivers/mwifiex-pcie-tighten-a-check-in-mwifiex_pcie_process