> From: linux-rdma-owner@xxxxxxxxxxxxxxx <linux-rdma-
> owner@xxxxxxxxxxxxxxx> On Behalf Of Kamal Heib
>
> Now that the query_pkey() isn't mandatory by the RDMA core for iwarp
> providers, this callback can be removed from the common ops and moved to
> the RoCE only ops within the qedr driver.
>
> Signed-off-by: Kamal Heib <kamalheib1@xxxxxxxxx>
> ---
> drivers/infiniband/hw/qedr/main.c | 3 +--
> drivers/infiniband/hw/qedr/verbs.c | 1 -
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/infiniband/hw/qedr/main.c
> b/drivers/infiniband/hw/qedr/main.c
> index ccaedfd53e49..c9eeed25c662 100644
> --- a/drivers/infiniband/hw/qedr/main.c
> +++ b/drivers/infiniband/hw/qedr/main.c
> @@ -110,7 +110,6 @@ static int qedr_iw_port_immutable(struct ib_device
> *ibdev, u8 port_num,
> if (err)
> return err;
>
> - immutable->pkey_tbl_len = 1;
> immutable->gid_tbl_len = 1;
> immutable->core_cap_flags = RDMA_CORE_PORT_IWARP;
> immutable->max_mad_size = 0;
> @@ -179,6 +178,7 @@ static int qedr_iw_register_device(struct qedr_dev
> *dev)
>
> static const struct ib_device_ops qedr_roce_dev_ops = {
> .get_port_immutable = qedr_roce_port_immutable,
> + .query_pkey = qedr_query_pkey,
> };
>
> static void qedr_roce_register_device(struct qedr_dev *dev) @@ -221,7
> +221,6 @@ static const struct ib_device_ops qedr_dev_ops = {
> .post_srq_recv = qedr_post_srq_recv,
> .process_mad = qedr_process_mad,
> .query_device = qedr_query_device,
> - .query_pkey = qedr_query_pkey,
> .query_port = qedr_query_port,
> .query_qp = qedr_query_qp,
> .query_srq = qedr_query_srq,
> diff --git a/drivers/infiniband/hw/qedr/verbs.c
> b/drivers/infiniband/hw/qedr/verbs.c
> index 3d7d5617818f..63eb935a1596 100644
> --- a/drivers/infiniband/hw/qedr/verbs.c
> +++ b/drivers/infiniband/hw/qedr/verbs.c
> @@ -239,7 +239,6 @@ int qedr_query_port(struct ib_device *ibdev, u8 port,
> struct ib_port_attr *attr)
> attr->ip_gids = true;
> if (rdma_protocol_iwarp(&dev->ibdev, 1)) {
> attr->gid_tbl_len = 1;
> - attr->pkey_tbl_len = 1;
> } else {
> attr->gid_tbl_len = QEDR_MAX_SGID;
> attr->pkey_tbl_len = QEDR_ROCE_PKEY_TABLE_LEN;
> --
> 2.25.4
Thanks,
Acked-by: Michal Kalderon <michal.kalderon@xxxxxxxxxxx>
