RDMA/siw: Remove the query_pkey callback

Now that the query_pkey() isn't mandatory by the RDMA core for iwarp
providers, this callback can be removed.

Link: https://lore.kernel.org/r/20200714183414.61069-5-kamalheib1@gmail.com
Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
Acked-by: Bernard Metzler <bmt@zurich.ibm.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/sw/siw/siw_main.c b/drivers/infiniband/sw/siw/siw_main.c
index a0b8cc643c5cfcf6342f8b8f170f2ee42f8196f4..18c08259157f158b2b1bc3372b6434e5ebe618f2 100644 (file)
--- a/drivers/infiniband/sw/siw/siw_main.c
+++ b/drivers/infiniband/sw/siw/siw_main.c
@@ -288,7 +288,6 @@ static const struct ib_device_ops siw_device_ops = {
        .post_srq_recv = siw_post_srq_recv,
        .query_device = siw_query_device,
        .query_gid = siw_query_gid,
-       .query_pkey = siw_query_pkey,
        .query_port = siw_query_port,
        .query_qp = siw_query_qp,
        .query_srq = siw_query_srq,

diff --git a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/siw/siw_verbs.c
index 0d509f7a10a63b5f4cc1ff7108c80314f97c974a..adafa1b8bebe389db9012fc355ee6e27c3874c68 100644 (file)
--- a/drivers/infiniband/sw/siw/siw_verbs.c
+++ b/drivers/infiniband/sw/siw/siw_verbs.c
@@ -176,7 +176,6 @@ int siw_query_port(struct ib_device *base_dev, u8 port,
        attr->active_mtu = ib_mtu_int_to_enum(sdev->netdev->mtu);
        attr->phys_state = sdev->state == IB_PORT_ACTIVE ?
                IB_PORT_PHYS_STATE_LINK_UP : IB_PORT_PHYS_STATE_DISABLED;
-       attr->pkey_tbl_len = 1;
        attr->port_cap_flags = IB_PORT_CM_SUP | IB_PORT_DEVICE_MGMT_SUP;
        attr->state = sdev->state;
        /*
@@ -204,20 +203,12 @@ int siw_get_port_immutable(struct ib_device *base_dev, u8 port,
        if (rv)
                return rv;
 
-       port_immutable->pkey_tbl_len = attr.pkey_tbl_len;
        port_immutable->gid_tbl_len = attr.gid_tbl_len;
        port_immutable->core_cap_flags = RDMA_CORE_PORT_IWARP;
 
        return 0;
 }
 
-int siw_query_pkey(struct ib_device *base_dev, u8 port, u16 idx, u16 *pkey)
-{
-       /* Report the default pkey */
-       *pkey = 0xffff;
-       return 0;
-}
-
 int siw_query_gid(struct ib_device *base_dev, u8 port, int idx,
                  union ib_gid *gid)
 {

diff --git a/drivers/infiniband/sw/siw/siw_verbs.h b/drivers/infiniband/sw/siw/siw_verbs.h
index 9335c48c01de26de0e6e7ec957b1da98fb56f3cc..d9572275a6b69557c7add81e331657f9238d0051 100644 (file)
--- a/drivers/infiniband/sw/siw/siw_verbs.h
+++ b/drivers/infiniband/sw/siw/siw_verbs.h
@@ -46,7 +46,6 @@ int siw_create_cq(struct ib_cq *base_cq, const struct ib_cq_init_attr *attr,
                  struct ib_udata *udata);
 int siw_query_port(struct ib_device *base_dev, u8 port,
                   struct ib_port_attr *attr);
-int siw_query_pkey(struct ib_device *base_dev, u8 port, u16 idx, u16 *pkey);
 int siw_query_gid(struct ib_device *base_dev, u8 port, int idx,
                  union ib_gid *gid);
 int siw_alloc_pd(struct ib_pd *base_pd, struct ib_udata *udata);