Commit 4d12c04c authored by Jason Gunthorpe's avatar Jason Gunthorpe

RDMA: Remove 'max_map_per_fmr'

Now that FMR support is gone, this attribute can be deleted from all
places.

Link: https://lore.kernel.org/r/13-v3-f58e6669d5d3+2cf-fmr_removal_jgg@mellanox.comReviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 649392bf
...@@ -356,7 +356,6 @@ static void copy_query_dev_fields(struct ib_ucontext *ucontext, ...@@ -356,7 +356,6 @@ static void copy_query_dev_fields(struct ib_ucontext *ucontext,
resp->max_mcast_qp_attach = attr->max_mcast_qp_attach; resp->max_mcast_qp_attach = attr->max_mcast_qp_attach;
resp->max_total_mcast_qp_attach = attr->max_total_mcast_qp_attach; resp->max_total_mcast_qp_attach = attr->max_total_mcast_qp_attach;
resp->max_ah = attr->max_ah; resp->max_ah = attr->max_ah;
resp->max_map_per_fmr = attr->max_map_per_fmr;
resp->max_srq = attr->max_srq; resp->max_srq = attr->max_srq;
resp->max_srq_wr = attr->max_srq_wr; resp->max_srq_wr = attr->max_srq_wr;
resp->max_srq_sge = attr->max_srq_sge; resp->max_srq_sge = attr->max_srq_sge;
......
...@@ -1361,7 +1361,6 @@ static void hfi1_fill_device_attr(struct hfi1_devdata *dd) ...@@ -1361,7 +1361,6 @@ static void hfi1_fill_device_attr(struct hfi1_devdata *dd)
rdi->dparms.props.max_cq = hfi1_max_cqs; rdi->dparms.props.max_cq = hfi1_max_cqs;
rdi->dparms.props.max_ah = hfi1_max_ahs; rdi->dparms.props.max_ah = hfi1_max_ahs;
rdi->dparms.props.max_cqe = hfi1_max_cqes; rdi->dparms.props.max_cqe = hfi1_max_cqes;
rdi->dparms.props.max_map_per_fmr = 32767;
rdi->dparms.props.max_pd = hfi1_max_pds; rdi->dparms.props.max_pd = hfi1_max_pds;
rdi->dparms.props.max_qp_rd_atom = HFI1_MAX_RDMA_ATOMIC; rdi->dparms.props.max_qp_rd_atom = HFI1_MAX_RDMA_ATOMIC;
rdi->dparms.props.max_qp_init_rd_atom = 255; rdi->dparms.props.max_qp_init_rd_atom = 255;
......
...@@ -83,7 +83,6 @@ static int i40iw_query_device(struct ib_device *ibdev, ...@@ -83,7 +83,6 @@ static int i40iw_query_device(struct ib_device *ibdev,
props->max_qp_rd_atom = I40IW_MAX_IRD_SIZE; props->max_qp_rd_atom = I40IW_MAX_IRD_SIZE;
props->max_qp_init_rd_atom = props->max_qp_rd_atom; props->max_qp_init_rd_atom = props->max_qp_rd_atom;
props->atomic_cap = IB_ATOMIC_NONE; props->atomic_cap = IB_ATOMIC_NONE;
props->max_map_per_fmr = 1;
props->max_fast_reg_page_list_len = I40IW_MAX_PAGES_PER_FMR; props->max_fast_reg_page_list_len = I40IW_MAX_PAGES_PER_FMR;
return 0; return 0;
} }
......
...@@ -999,7 +999,6 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, ...@@ -999,7 +999,6 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
props->max_mcast_qp_attach = MLX5_CAP_GEN(mdev, max_qp_mcg); props->max_mcast_qp_attach = MLX5_CAP_GEN(mdev, max_qp_mcg);
props->max_total_mcast_qp_attach = props->max_mcast_qp_attach * props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
props->max_mcast_grp; props->max_mcast_grp;
props->max_map_per_fmr = INT_MAX; /* no limit in ConnectIB */
props->max_ah = INT_MAX; props->max_ah = INT_MAX;
props->hca_core_clock = MLX5_CAP_GEN(mdev, device_frequency_khz); props->hca_core_clock = MLX5_CAP_GEN(mdev, device_frequency_khz);
props->timestamp_mask = 0x7FFFFFFFFFFFFFFFULL; props->timestamp_mask = 0x7FFFFFFFFFFFFFFFULL;
......
...@@ -118,16 +118,6 @@ static int mthca_query_device(struct ib_device *ibdev, struct ib_device_attr *pr ...@@ -118,16 +118,6 @@ static int mthca_query_device(struct ib_device *ibdev, struct ib_device_attr *pr
props->max_mcast_qp_attach = MTHCA_QP_PER_MGM; props->max_mcast_qp_attach = MTHCA_QP_PER_MGM;
props->max_total_mcast_qp_attach = props->max_mcast_qp_attach * props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
props->max_mcast_grp; props->max_mcast_grp;
/*
* If Sinai memory key optimization is being used, then only
* the 8-bit key portion will change. For other HCAs, the
* unused index bits will also be used for FMR remapping.
*/
if (mdev->mthca_flags & MTHCA_FLAG_SINAI_OPT)
props->max_map_per_fmr = 255;
else
props->max_map_per_fmr =
(1 << (32 - ilog2(mdev->limits.num_mpts))) - 1;
err = 0; err = 0;
out: out:
......
...@@ -99,7 +99,6 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr, ...@@ -99,7 +99,6 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr,
attr->max_mw = dev->attr.max_mw; attr->max_mw = dev->attr.max_mw;
attr->max_pd = dev->attr.max_pd; attr->max_pd = dev->attr.max_pd;
attr->atomic_cap = 0; attr->atomic_cap = 0;
attr->max_map_per_fmr = 0;
attr->max_qp_rd_atom = attr->max_qp_rd_atom =
min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp); min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp);
attr->max_qp_init_rd_atom = dev->attr.max_ord_per_qp; attr->max_qp_init_rd_atom = dev->attr.max_ord_per_qp;
......
...@@ -145,7 +145,6 @@ int qedr_query_device(struct ib_device *ibdev, ...@@ -145,7 +145,6 @@ int qedr_query_device(struct ib_device *ibdev,
attr->max_mw = qattr->max_mw; attr->max_mw = qattr->max_mw;
attr->max_pd = qattr->max_pd; attr->max_pd = qattr->max_pd;
attr->atomic_cap = dev->atomic_cap; attr->atomic_cap = dev->atomic_cap;
attr->max_map_per_fmr = 16;
attr->max_qp_init_rd_atom = attr->max_qp_init_rd_atom =
1 << (fls(qattr->max_qp_req_rd_atomic_resc) - 1); 1 << (fls(qattr->max_qp_req_rd_atomic_resc) - 1);
attr->max_qp_rd_atom = attr->max_qp_rd_atom =
......
...@@ -1460,7 +1460,6 @@ static void qib_fill_device_attr(struct qib_devdata *dd) ...@@ -1460,7 +1460,6 @@ static void qib_fill_device_attr(struct qib_devdata *dd)
rdi->dparms.props.max_cq = ib_qib_max_cqs; rdi->dparms.props.max_cq = ib_qib_max_cqs;
rdi->dparms.props.max_cqe = ib_qib_max_cqes; rdi->dparms.props.max_cqe = ib_qib_max_cqes;
rdi->dparms.props.max_ah = ib_qib_max_ahs; rdi->dparms.props.max_ah = ib_qib_max_ahs;
rdi->dparms.props.max_map_per_fmr = 32767;
rdi->dparms.props.max_qp_rd_atom = QIB_MAX_RDMA_ATOMIC; rdi->dparms.props.max_qp_rd_atom = QIB_MAX_RDMA_ATOMIC;
rdi->dparms.props.max_qp_init_rd_atom = 255; rdi->dparms.props.max_qp_init_rd_atom = 255;
rdi->dparms.props.max_srq = ib_qib_max_srqs; rdi->dparms.props.max_srq = ib_qib_max_srqs;
......
...@@ -322,7 +322,6 @@ int usnic_ib_query_device(struct ib_device *ibdev, ...@@ -322,7 +322,6 @@ int usnic_ib_query_device(struct ib_device *ibdev,
props->max_mcast_grp = 0; props->max_mcast_grp = 0;
props->max_mcast_qp_attach = 0; props->max_mcast_qp_attach = 0;
props->max_total_mcast_qp_attach = 0; props->max_total_mcast_qp_attach = 0;
props->max_map_per_fmr = 0;
/* Owned by Userspace /* Owned by Userspace
* max_qp_wr, max_sge, max_sge_rd, max_cqe */ * max_qp_wr, max_sge, max_sge_rd, max_cqe */
mutex_unlock(&us_ibdev->usdev_lock); mutex_unlock(&us_ibdev->usdev_lock);
......
...@@ -430,7 +430,6 @@ struct ib_device_attr { ...@@ -430,7 +430,6 @@ struct ib_device_attr {
int max_mcast_qp_attach; int max_mcast_qp_attach;
int max_total_mcast_qp_attach; int max_total_mcast_qp_attach;
int max_ah; int max_ah;
int max_map_per_fmr;
int max_srq; int max_srq;
int max_srq_wr; int max_srq_wr;
int max_srq_sge; int max_srq_sge;
......
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