Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

NTB: perf: Fix support for hardware that doesn't have port numbers

Legacy drivers do not have port numbers (but is reliably only two ports)
and was broken by the recent commit that added mult-port support to
ntb_perf. This is especially important to support the cross link
topology which is perfectly symmetric and cannot assign unique port
numbers easily.

Hardware that returns zero for both the local port and the peer should
just always use gidx=0 for the only peer.

Fixes: 5648e56d03fa ("NTB: ntb_perf: Add full multi-port NTB API support")
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Acked-by: Allen Hubbe <allenbh@gmail.com>
Tested-by: Alexander Fomichev <fomichev.ru@gmail.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>

authored by

Logan Gunthorpe and committed by
Jon Mason
b54369a2 a9c4211a

+10
+10
drivers/ntb/test/ntb_perf.c
··· 1453 1453 if (perf->gidx == -1) 1454 1454 perf->gidx = pidx; 1455 1455 1456 + /* 1457 + * Hardware with only two ports may not have unique port 1458 + * numbers. In this case, the gidxs should all be zero. 1459 + */ 1460 + if (perf->pcnt == 1 && ntb_port_number(perf->ntb) == 0 && 1461 + ntb_peer_port_number(perf->ntb, 0) == 0) { 1462 + perf->gidx = 0; 1463 + perf->peers[0].gidx = 0; 1464 + } 1465 + 1456 1466 for (pidx = 0; pidx < perf->pcnt; pidx++) { 1457 1467 ret = perf_setup_peer_mw(&perf->peers[pidx]); 1458 1468 if (ret)