Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ntb: use correct mw_count function in ntb_tool and ntb_transport 



After converting to the new API, both ntb_tool and ntb_transport are
using ntb_mw_count to iterate through ntb_peer_get_addr when they
should be using ntb_peer_mw_count.

This probably isn't an issue with the Intel and AMD drivers but
this will matter for any future driver with asymetric memory window
counts.

Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Acked-by: default avatarAllen Hubbe <Allen.Hubbe@emc.com>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
Fixes: 443b9a14 ("NTB: Alter MW API to support multi-ports devices")
parent 5771a8c0

drivers/ntb/ntb_transport.c

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ static int ntb_transport_probe(struct ntb_client *self, struct ntb_dev *ndev) 
	int node;

	int rc, i;



	mw_count = ntb_mw_count(ndev, PIDX);

	mw_count = ntb_peer_mw_count(ndev);



	if (!ndev->ops->mw_set_trans) {

		dev_err(&ndev->dev, "Inbound MW based NTB API is required\n");

drivers/ntb/test/ntb_tool.c

+1 −1
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb) 
	tc->ntb = ntb;

	init_waitqueue_head(&tc->link_wq);



	tc->mw_count = min(ntb_mw_count(tc->ntb, PIDX), MAX_MWS);

	tc->mw_count = min(ntb_peer_mw_count(tc->ntb), MAX_MWS);

	for (i = 0; i < tc->mw_count; i++) {

		rc = tool_init_mw(tc, i);

		if (rc)