Commit ca93c457 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Jon Mason

NTB: ntb_pingpong: Choose doorbells based on port number

This commit fixes pingpong support for existing drivers that do not
implement ntb_default_port_number() and ntb_default_peer_port_number().
This is required for hardware (like the crosslink topology of
switchtec) which cannot assign reasonable port numbers to each port due
to its perfect symmetry.

Instead of picking the doorbell to use based on the the index of the
peer, we use the peer's port number. This is a bit clearer and easier
to understand.

Fixes: c7aeb0af ("NTB: ntb_pp: 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 fc8b086d
...@@ -121,15 +121,14 @@ static int pp_find_next_peer(struct pp_ctx *pp) ...@@ -121,15 +121,14 @@ static int pp_find_next_peer(struct pp_ctx *pp)
link = ntb_link_is_up(pp->ntb, NULL, NULL); link = ntb_link_is_up(pp->ntb, NULL, NULL);
/* Find next available peer */ /* Find next available peer */
if (link & pp->nmask) { if (link & pp->nmask)
pidx = __ffs64(link & pp->nmask); pidx = __ffs64(link & pp->nmask);
out_db = BIT_ULL(pidx + 1); else if (link & pp->pmask)
} else if (link & pp->pmask) {
pidx = __ffs64(link & pp->pmask); pidx = __ffs64(link & pp->pmask);
out_db = BIT_ULL(pidx); else
} else {
return -ENODEV; return -ENODEV;
}
out_db = BIT_ULL(ntb_peer_port_number(pp->ntb, pidx));
spin_lock(&pp->lock); spin_lock(&pp->lock);
pp->out_pidx = pidx; pp->out_pidx = pidx;
...@@ -303,7 +302,7 @@ static void pp_init_flds(struct pp_ctx *pp) ...@@ -303,7 +302,7 @@ static void pp_init_flds(struct pp_ctx *pp)
break; break;
} }
pp->in_db = BIT_ULL(pidx); pp->in_db = BIT_ULL(lport);
pp->pmask = GENMASK_ULL(pidx, 0) >> 1; pp->pmask = GENMASK_ULL(pidx, 0) >> 1;
pp->nmask = GENMASK_ULL(pcnt - 1, pidx); pp->nmask = GENMASK_ULL(pcnt - 1, pidx);
...@@ -432,4 +431,3 @@ static void __exit pp_exit(void) ...@@ -432,4 +431,3 @@ static void __exit pp_exit(void)
debugfs_remove_recursive(pp_dbgfs_topdir); debugfs_remove_recursive(pp_dbgfs_topdir);
} }
module_exit(pp_exit); module_exit(pp_exit);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment