Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'ntb-4.13-bugfixes' of git://github.com/jonmason/ntb
Pull NTB fixes from Jon Mason:
"NTB bug fixes to address an incorrect ntb_mw_count reference in the
NTB transport, improperly bringing down the link if SPADs are
corrupted, and an out-of-order issue regarding link negotiation and
data passing"
* tag 'ntb-4.13-bugfixes' of git://github.com/jonmason/ntb:
ntb: ntb_test: ensure the link is up before trying to configure the mws
ntb: transport shouldn't disable link due to bogus values in SPADs
ntb: use correct mw_count function in ntb_tool and ntb_transport
+7
-5
+2
-4
drivers/ntb/ntb_transport.c
+2
-4
drivers/ntb/ntb_transport.c
···
924
924
ntb_free_mw(nt, i);
925
925
926
926
/* if there's an actual failure, we should just bail */
927
-
if (rc < 0) {
928
-
ntb_link_disable(ndev);
927
+
if (rc < 0)
929
928
return;
930
-
}
931
929
932
930
out:
933
931
if (ntb_link_is_up(ndev, NULL, NULL) == 1)
···
1057
1059
int node;
1058
1060
int rc, i;
1059
1061
1060
-
mw_count = ntb_mw_count(ndev, PIDX);
1062
+
mw_count = ntb_peer_mw_count(ndev);
1061
1063
1062
1064
if (!ndev->ops->mw_set_trans) {
1063
1065
dev_err(&ndev->dev, "Inbound MW based NTB API is required\n");
+1
-1
drivers/ntb/test/ntb_tool.c
+1
-1
drivers/ntb/test/ntb_tool.c
+4
tools/testing/selftests/ntb/ntb_test.sh
+4
tools/testing/selftests/ntb/ntb_test.sh
···
333
333
link_test $LOCAL_TOOL $REMOTE_TOOL
334
334
link_test $REMOTE_TOOL $LOCAL_TOOL
335
335
336
+
#Ensure the link is up on both sides before continuing
337
+
write_file Y $LOCAL_TOOL/link_event
338
+
write_file Y $REMOTE_TOOL/link_event
339
+
336
340
for PEER_TRANS in $(ls $LOCAL_TOOL/peer_trans*); do
337
341
PT=$(basename $PEER_TRANS)
338
342
write_file $MW_SIZE $LOCAL_TOOL/$PT