3b422e301c
- Applied all the fixes recommended by upstream for v2.2 stable release(bsc#981996). [+0008-app-testpmd-handle-SIGINT-and-SIGTERM.patch, +0009-bonding-copy-entire-config-structure-in-mode-4.patch, +0010-bonding-fix-active-slaves-with-no-primary.patch, +0011-bonding-do-not-ignore-multicast-in-mode-4.patch, +0012-bonding-do-not-activate-slave-twice.patch, +0013-bonding-fix-crash-when-no-slave-device.patch, +0014-bonding-fix-detach-of-bonded-device.patch, +0015-bonding-fix-detach-of-slave-devices.patch, +0016-eal-linux-support-built-in-kernel-modules.patch, +0017-examples-l3fwd-handle-SIGINT-and-SIGTERM.patch, +0018-fm10k-fix-VLAN-flag-in-scattered-Rx.patch, +0019-i40e-base-fix-driver-load-failure.patch, +0020-i40e-base-fix-missing-check-for-stopped-admin-queue.patch, +0021-i40e-fix-inverted-check-for-no-refcount.patch, +0022-i40e-fix-overflow.patch, +0023-i40e-fix-VLAN-filtering.patch, +0024-mempool-fix-leak-when-creation-fails.patch, +0025-pcap-fix-captured-frame-length.patch, +0026-port-fix-crash-for-ethdev-writer-nodrop.patch, +0027-port-fix-crash-for-ring-writer-nodrop.patch, +0028-tools-fix-unbinding-failure-handling.patch, +0029-tools-support-Python-3-in-bind-script.patch, +0030-tools-support-binding-to-built-in-kernel-modules.patch, +0031-vhost-fix-leak-of-fds-and-mmaps.patch, +0032-virtio-fix-crash-in-statistics-functions.patch, +0033-virtio-fix-descriptors-pointing-to-the-same-buffer.patch, +0034-virtio-fix-restart.patch] OBS-URL: https://build.opensuse.org/request/show/399089 OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=3
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 8a8807369ffafef90c410279b4b2645d2d7a7483 Mon Sep 17 00:00:00 2001
|
|
From: Helin Zhang <helin.zhang@intel.com>
|
|
Date: Tue, 8 Mar 2016 16:14:28 +0800
|
|
Subject: [PATCH] i40e/base: fix driver load failure
|
|
|
|
Fix the driver load failure with linking with some
|
|
PHY types, as the amount of time it takes for the
|
|
GLGEN_RSTAT_DEVSTATE to be set increases greatly on those PHY
|
|
types, which can lead to a timeout.
|
|
|
|
Fixes: 9aeefed05538 ("i40e/base: support ESS")
|
|
|
|
Signed-off-by: Helin Zhang <helin.zhang@intel.com>
|
|
Acked-by: Jingjing Wu <jingjing.wu@intel.com>
|
|
Acked-by: Remy Horton <remy.horton@intel.com>
|
|
---
|
|
drivers/net/i40e/base/i40e_common.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
|
|
index a4cf5cf..925bb1c 100644
|
|
--- a/drivers/net/i40e/base/i40e_common.c
|
|
+++ b/drivers/net/i40e/base/i40e_common.c
|
|
@@ -1316,11 +1316,11 @@ enum i40e_status_code i40e_pf_reset(struct i40e_hw *hw)
|
|
grst_del = (rd32(hw, I40E_GLGEN_RSTCTL) &
|
|
I40E_GLGEN_RSTCTL_GRSTDEL_MASK) >>
|
|
I40E_GLGEN_RSTCTL_GRSTDEL_SHIFT;
|
|
-#ifdef I40E_ESS_SUPPORT
|
|
+
|
|
/* It can take upto 15 secs for GRST steady state */
|
|
grst_del = grst_del * 20; /* bump it to 16 secs max to be safe */
|
|
-#endif
|
|
- for (cnt = 0; cnt < grst_del + 10; cnt++) {
|
|
+
|
|
+ for (cnt = 0; cnt < grst_del; cnt++) {
|
|
reg = rd32(hw, I40E_GLGEN_RSTAT);
|
|
if (!(reg & I40E_GLGEN_RSTAT_DEVSTATE_MASK))
|
|
break;
|
|
--
|
|
2.6.2
|
|
|