summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jiang <dave.jiang@intel.com>2017-07-28 15:10:48 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-30 10:26:42 +0200
commit49fa8c02e4a6359f5c13ce14ee9a79d53e1865ff (patch)
treefa97c0ae257a01152b97140f48ddb4c265bda118
parentab75f0274d344a7a972ae67a283dea9fe8291c87 (diff)
downloadlinux-stable-49fa8c02e4a6359f5c13ce14ee9a79d53e1865ff.tar.gz
linux-stable-49fa8c02e4a6359f5c13ce14ee9a79d53e1865ff.tar.bz2
linux-stable-49fa8c02e4a6359f5c13ce14ee9a79d53e1865ff.zip
ntb: transport shouldn't disable link due to bogus values in SPADs
commit f3fd2afed8eee91620d05b69ab94c14793c849d7 upstream. It seems that under certain scenarios the SPAD can have bogus values caused by an agent (i.e. BIOS or other software) that is not the kernel driver, and that causes memory window setup failure. This should not cause the link to be disabled because if we do that, the driver will never recover again. We have verified in testing that this issue happens and prevents proper link recovery. Signed-off-by: Dave Jiang <dave.jiang@intel.com> Acked-by: Allen Hubbe <Allen.Hubbe@dell.com> Signed-off-by: Jon Mason <jdmason@kudzu.us> Fixes: 84f766855f61 ("ntb: stop link work when we do not have memory") Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/ntb/ntb_transport.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c
index 10e5bf460139..f27d1344d198 100644
--- a/drivers/ntb/ntb_transport.c
+++ b/drivers/ntb/ntb_transport.c
@@ -920,10 +920,8 @@ out1:
ntb_free_mw(nt, i);
/* if there's an actual failure, we should just bail */
- if (rc < 0) {
- ntb_link_disable(ndev);
+ if (rc < 0)
return;
- }
out:
if (ntb_link_is_up(ndev, NULL, NULL) == 1)