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

Commit 1c355a6e authored by Steve Wise's avatar Steve Wise Committed by Roland Dreier
Browse files

RDMA/cxgb3: Fix up MW access rights 



- MWs don't have local read/write permissions.
- Set the MW_BIND enabled bit if a MR has MW_BIND access.

Signed-off-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 5f0f66b0

drivers/infiniband/hw/cxgb3/cxio_hal.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -725,7 +725,7 @@ static int __cxio_tpt_op(struct cxio_rdev *rdev_p, u32 reset_tpt_entry, 
				V_TPT_STAG_TYPE(type) | V_TPT_PDID(pdid));

				V_TPT_STAG_TYPE(type) | V_TPT_PDID(pdid));

		BUG_ON(page_size >= 28);

		BUG_ON(page_size >= 28);

		tpt.flags_pagesize_qpid = cpu_to_be32(V_TPT_PERM(perm) |

		tpt.flags_pagesize_qpid = cpu_to_be32(V_TPT_PERM(perm) |

				F_TPT_MW_BIND_ENABLE |

			((perm & TPT_MW_BIND) ? F_TPT_MW_BIND_ENABLE : 0) |

			V_TPT_ADDR_TYPE((zbva ? TPT_ZBTO : TPT_VATO)) |

			V_TPT_ADDR_TYPE((zbva ? TPT_ZBTO : TPT_VATO)) |

			V_TPT_PAGE_SIZE(page_size));

			V_TPT_PAGE_SIZE(page_size));

		tpt.rsvd_pbl_addr = reset_tpt_entry ? 0 :

		tpt.rsvd_pbl_addr = reset_tpt_entry ? 0 :

drivers/infiniband/hw/cxgb3/iwch_provider.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -293,9 +293,16 @@ static inline u32 iwch_ib_to_tpt_access(int acc) 
	return (acc & IB_ACCESS_REMOTE_WRITE ? TPT_REMOTE_WRITE : 0) |

	return (acc & IB_ACCESS_REMOTE_WRITE ? TPT_REMOTE_WRITE : 0) |

	       (acc & IB_ACCESS_REMOTE_READ ? TPT_REMOTE_READ : 0) |

	       (acc & IB_ACCESS_REMOTE_READ ? TPT_REMOTE_READ : 0) |

	       (acc & IB_ACCESS_LOCAL_WRITE ? TPT_LOCAL_WRITE : 0) |

	       (acc & IB_ACCESS_LOCAL_WRITE ? TPT_LOCAL_WRITE : 0) |

	       (acc & IB_ACCESS_MW_BIND ? TPT_MW_BIND : 0) |

	       TPT_LOCAL_READ;

	       TPT_LOCAL_READ;

}

}





static inline u32 iwch_ib_to_tpt_bind_access(int acc)

{

	return (acc & IB_ACCESS_REMOTE_WRITE ? TPT_REMOTE_WRITE : 0) |

	       (acc & IB_ACCESS_REMOTE_READ ? TPT_REMOTE_READ : 0);

}



enum iwch_mmid_state {

enum iwch_mmid_state {

	IWCH_STAG_STATE_VALID,

	IWCH_STAG_STATE_VALID,

	IWCH_STAG_STATE_INVALID

	IWCH_STAG_STATE_INVALID

drivers/infiniband/hw/cxgb3/iwch_qp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -565,7 +565,7 @@ int iwch_bind_mw(struct ib_qp *qp, 
	wqe->bind.type = TPT_VATO;

	wqe->bind.type = TPT_VATO;





	/* TBD: check perms */

	/* TBD: check perms */

	wqe->bind.perms = iwch_ib_to_tpt_access(mw_bind->mw_access_flags);

	wqe->bind.perms = iwch_ib_to_tpt_bind_access(mw_bind->mw_access_flags);

	wqe->bind.mr_stag = cpu_to_be32(mw_bind->mr->lkey);

	wqe->bind.mr_stag = cpu_to_be32(mw_bind->mr->lkey);

	wqe->bind.mw_stag = cpu_to_be32(mw->rkey);

	wqe->bind.mw_stag = cpu_to_be32(mw->rkey);

	wqe->bind.mw_len = cpu_to_be32(mw_bind->length);

	wqe->bind.mw_len = cpu_to_be32(mw_bind->length);