IB/cma: Fix erroneous validation of supported default GID type

When rdma_cm is initializing a cma_device it checks if this device
supports the preferred default GID type. This check was done in a wrong way
and therefore sometimes rdma_cm is coming up with default GID type that is
not supported by the device.

Fix that by checking for supported GID type properly.

Fixes: 3c7f67d1880d ("IB/cma: Fix default RoCE type setting")
Signed-off-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Selvin Xavier <selvin.xavier@broadcom.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index b76de2e2b20950649f5fc65fc0d8333d4efd781c..852c8fec808859514b6729c8ac362f958e10bf98 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -72,7 +72,7 @@ MODULE_LICENSE("Dual BSD/GPL");
 #define CMA_MAX_CM_RETRIES 15
 #define CMA_CM_MRA_SETTING (IB_CM_MRA_FLAG_DELAY | 24)
 #define CMA_IBOE_PACKET_LIFETIME 18
-#define CMA_PREFERRED_ROCE_GID_TYPE (1 << IB_GID_TYPE_ROCE_UDP_ENCAP)
+#define CMA_PREFERRED_ROCE_GID_TYPE IB_GID_TYPE_ROCE_UDP_ENCAP
 
 static const char * const cma_events[] = {
        [RDMA_CM_EVENT_ADDR_RESOLVED]    = "address resolved",
@@ -4282,7 +4282,7 @@ static void cma_add_one(struct ib_device *device)
        for (i = rdma_start_port(device); i <= rdma_end_port(device); i++) {
                supported_gids = roce_gid_type_mask_support(device, i);
                WARN_ON(!supported_gids);
-               if (supported_gids & CMA_PREFERRED_ROCE_GID_TYPE)
+               if (supported_gids & (1 << CMA_PREFERRED_ROCE_GID_TYPE))
                        cma_dev->default_gid_type[i - rdma_start_port(device)] =
                                CMA_PREFERRED_ROCE_GID_TYPE;
                else