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

Commit 0f69a7df authored by Dave Jiang's avatar Dave Jiang Committed by Jon Mason
Browse files

NTB: Read peer info from local SPAD in transport 



The transport was writing and then reading the peer scratch pad,
essentially reading what it just wrote instead of exchanging any
information with the peer.  The transport expects the peer values to be
the same as the local values, so this issue was not obvious.

Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
parent e26a5843

drivers/ntb/ntb_transport.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -761,17 +761,17 @@ static void ntb_transport_link_work(struct work_struct *work) 
	ntb_peer_spad_write(ndev, VERSION, NTB_TRANSPORT_VERSION);

	ntb_peer_spad_write(ndev, VERSION, NTB_TRANSPORT_VERSION);





	/* Query the remote side for its info */

	/* Query the remote side for its info */

	val = ntb_peer_spad_read(ndev, VERSION);

	val = ntb_spad_read(ndev, VERSION);

	dev_dbg(&pdev->dev, "Remote version = %d\n", val);

	dev_dbg(&pdev->dev, "Remote version = %d\n", val);

	if (val != NTB_TRANSPORT_VERSION)

	if (val != NTB_TRANSPORT_VERSION)

		goto out;

		goto out;





	val = ntb_peer_spad_read(ndev, NUM_QPS);

	val = ntb_spad_read(ndev, NUM_QPS);

	dev_dbg(&pdev->dev, "Remote max number of qps = %d\n", val);

	dev_dbg(&pdev->dev, "Remote max number of qps = %d\n", val);

	if (val != nt->qp_count)

	if (val != nt->qp_count)

		goto out;

		goto out;





	val = ntb_peer_spad_read(ndev, NUM_MWS);

	val = ntb_spad_read(ndev, NUM_MWS);

	dev_dbg(&pdev->dev, "Remote number of mws = %d\n", val);

	dev_dbg(&pdev->dev, "Remote number of mws = %d\n", val);

	if (val != nt->mw_count)

	if (val != nt->mw_count)

		goto out;

		goto out;
@@ -779,10 +779,10 @@ static void ntb_transport_link_work(struct work_struct *work) 
	for (i = 0; i < nt->mw_count; i++) {

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

		u64 val64;

		u64 val64;





		val = ntb_peer_spad_read(ndev, MW0_SZ_HIGH + (i * 2));

		val = ntb_spad_read(ndev, MW0_SZ_HIGH + (i * 2));

		val64 = (u64)val << 32;

		val64 = (u64)val << 32;





		val = ntb_peer_spad_read(ndev, MW0_SZ_LOW + (i * 2));

		val = ntb_spad_read(ndev, MW0_SZ_LOW + (i * 2));

		val64 |= val;

		val64 |= val;





		dev_dbg(&pdev->dev, "Remote MW%d size = %#llx\n", i, val64);

		dev_dbg(&pdev->dev, "Remote MW%d size = %#llx\n", i, val64);