From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-ntb@googlegroups.com,
Jon Mason <jdmason@kudzu.us>
Cc: Allen Hubbe <allenbh@gmail.com>,
Serge Semin <fancer.lancer@gmail.com>,
Shyam Sundar S K <Shyam-sundar.S-k@amd.com>,
Shuah Khan <shuah@kernel.org>, Doug Meyer <dmeyer@gigaio.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH v2 6/8] NTB: perf: Fix support for hardware that doesn't have port numbers
Date: Fri, 20 Jul 2018 12:00:32 -0600 [thread overview]
Message-ID: <20180720180034.3964-7-logang@deltatee.com> (raw)
In-Reply-To: <20180720180034.3964-1-logang@deltatee.com>
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>
---
drivers/ntb/test/ntb_perf.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
index fe27412ffe91..6285cb8515ac 100644
--- a/drivers/ntb/test/ntb_perf.c
+++ b/drivers/ntb/test/ntb_perf.c
@@ -1417,6 +1417,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)
--
2.11.0
next prev parent reply other threads:[~2018-07-20 18:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-20 18:00 [PATCH v2 0/8] Fix breakage caused by the NTB multi-port patchset Logan Gunthorpe
2018-07-20 18:00 ` [PATCH v2 1/8] NTB: ntb_tool: reading the link file should not end in a NULL byte Logan Gunthorpe
2018-07-20 18:00 ` [PATCH v2 2/8] NTB: Setup the DMA mask globally for all drivers Logan Gunthorpe
2018-07-20 18:00 ` [PATCH v2 3/8] NTB: Fix the default port and peer numbers for legacy drivers Logan Gunthorpe
2018-07-20 18:00 ` [PATCH v2 4/8] NTB: ntb_pingpong: Choose doorbells based on port number Logan Gunthorpe
2018-07-23 14:01 ` Allen Hubbe
2018-07-23 16:07 ` Logan Gunthorpe
2018-07-24 17:26 ` Allen Hubbe
2018-07-24 17:37 ` Logan Gunthorpe
2018-07-24 18:12 ` Allen Hubbe
2018-07-24 18:23 ` Logan Gunthorpe
2018-07-20 18:00 ` [PATCH v2 5/8] NTB: perf: Don't require one more memory window than number of peers Logan Gunthorpe
2018-07-20 18:00 ` Logan Gunthorpe [this message]
2018-07-20 18:00 ` [PATCH v2 7/8] NTB: perf: Fix race condition when run with ntb_test Logan Gunthorpe
2018-07-20 18:00 ` [PATCH v2 8/8] NTB: ntb_test: Fix bug when counting remote files Logan Gunthorpe
2018-09-17 15:16 ` [PATCH v2 0/8] Fix breakage caused by the NTB multi-port patchset Alexander Fomichev
2018-09-17 16:06 ` Logan Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180720180034.3964-7-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=Shyam-sundar.S-k@amd.com \
--cc=allenbh@gmail.com \
--cc=dmeyer@gigaio.com \
--cc=fancer.lancer@gmail.com \
--cc=jdmason@kudzu.us \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-ntb@googlegroups.com \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.