RDMA: Add EFA related definitions

Add EFA driver ID to the IOCTL interface uapi. This patch also adds
unspecified node/transport type that will be used by EFA (usnic is left
unchanged as it's already part of our ABI).

Signed-off-by: Gal Pressman <galpress@amazon.com>
Reviewed-by: Shiraz Saleem <shiraz.saleem@intel.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 8c7adc27aeeae254906110dbabc68a49c3e1ad22..c78d0c9646ae5d990ccf72a4cf9b531b4ccf57de 100644 (file)
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -1201,6 +1201,7 @@ static ssize_t node_type_show(struct device *device,
        case RDMA_NODE_RNIC:      return sprintf(buf, "%d: RNIC\n", dev->node_type);
        case RDMA_NODE_USNIC:     return sprintf(buf, "%d: usNIC\n", dev->node_type);
        case RDMA_NODE_USNIC_UDP: return sprintf(buf, "%d: usNIC UDP\n", dev->node_type);
+       case RDMA_NODE_UNSPECIFIED: return sprintf(buf, "%d: unspecified\n", dev->node_type);
        case RDMA_NODE_IB_SWITCH: return sprintf(buf, "%d: switch\n", dev->node_type);
        case RDMA_NODE_IB_ROUTER: return sprintf(buf, "%d: router\n", dev->node_type);
        default:                  return sprintf(buf, "%d: <unknown>\n", dev->node_type);

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index a4e97dd3c4b69d5e4a23168467c57dfa986a3198..e666a1f7608d868621cdd279f455adef15b3d30b 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -218,6 +218,8 @@ rdma_node_get_transport(enum rdma_node_type node_type)
                return RDMA_TRANSPORT_USNIC_UDP;
        if (node_type == RDMA_NODE_RNIC)
                return RDMA_TRANSPORT_IWARP;
+       if (node_type == RDMA_NODE_UNSPECIFIED)
+               return RDMA_TRANSPORT_UNSPECIFIED;
 
        return RDMA_TRANSPORT_IB;
 }

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index deb67b21ccb9ff42b6c6eb064f3e9f6945d0e918..0742095355f28c7bbf994ab137cc113f0aa76760 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -140,6 +140,7 @@ enum rdma_node_type {
        RDMA_NODE_RNIC,
        RDMA_NODE_USNIC,
        RDMA_NODE_USNIC_UDP,
+       RDMA_NODE_UNSPECIFIED,
 };
 
 enum {
@@ -151,7 +152,8 @@ enum rdma_transport_type {
        RDMA_TRANSPORT_IB,
        RDMA_TRANSPORT_IWARP,
        RDMA_TRANSPORT_USNIC,
-       RDMA_TRANSPORT_USNIC_UDP
+       RDMA_TRANSPORT_USNIC_UDP,
+       RDMA_TRANSPORT_UNSPECIFIED,
 };
 
 enum rdma_protocol_type {

diff --git a/include/uapi/rdma/rdma_user_ioctl_cmds.h b/include/uapi/rdma/rdma_user_ioctl_cmds.h
index 06c34d99be8541976afcd6f2cdd4ac83efacaceb..26213f49f5c8ea4a06251b67cab3f9cb312ab386 100644 (file)
--- a/include/uapi/rdma/rdma_user_ioctl_cmds.h
+++ b/include/uapi/rdma/rdma_user_ioctl_cmds.h
@@ -102,6 +102,7 @@ enum rdma_driver_id {
        RDMA_DRIVER_RXE,
        RDMA_DRIVER_HFI1,
        RDMA_DRIVER_QIB,
+       RDMA_DRIVER_EFA,
 };
 
 #endif