openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
Dave Jiang 2015-06-02 03:45:07 -04:00 committed by Jon Mason
parent e26a5843f7
commit 0f69a7dff9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/ntb/ntb_transport.c
View File

@ -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);