Commit b54369a2 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Jon Mason
Browse files

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: 5648e56d ("NTB: ntb_perf: Add full multi-port NTB API support")
Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Acked-by: default avatarAllen Hubbe <allenbh@gmail.com>
Tested-by: default avatarAlexander Fomichev <fomichev.ru@gmail.com>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
parent a9c4211a
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -1453,6 +1453,16 @@ static int perf_init_peers(struct perf_ctx *perf)
	if (perf->gidx == -1)
		perf->gidx = pidx;

	/*
	 * Hardware with only two ports may not have unique port
	 * numbers. In this case, the gidxs should all be zero.
	 */
	if (perf->pcnt == 1 &&  ntb_port_number(perf->ntb) == 0 &&
	    ntb_peer_port_number(perf->ntb, 0) == 0) {
		perf->gidx = 0;
		perf->peers[0].gidx = 0;
	}

	for (pidx = 0; pidx < perf->pcnt; pidx++) {
		ret = perf_setup_peer_mw(&perf->peers[pidx]);
		if (ret)