IB/core: Add inline function to validate port

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 2e52021aa999..b1371eb9f46c 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -504,8 +504,7 @@ int ib_find_cached_gid_by_port(struct ib_device *ib_dev,
         struct ib_gid_attr val = {.ndev = ndev, .gid_type = gid_type};
         unsigned long flags;
 
-        if (port < rdma_start_port(ib_dev) ||
-            port > rdma_end_port(ib_dev))
+        if (!rdma_is_port_valid(ib_dev, port))
                 return -ENOENT;
 
         table = ib_dev->cache.ports[port - rdma_start_port(ib_dev)].gid;
@@ -562,8 +561,7 @@ static int ib_cache_gid_find_by_filter(struct ib_device *ib_dev,
         bool found = false;
 
 
-        if (port < rdma_start_port(ib_dev) ||
-            port > rdma_end_port(ib_dev) ||
+        if (!rdma_is_port_valid(ib_dev, port) ||
             !rdma_protocol_roce(ib_dev, port))
                 return -EPROTONOSUPPORT;
 
@@ -845,7 +843,7 @@ int ib_get_cached_gid(struct ib_device *device,
         unsigned long flags;
         struct ib_gid_table *table;
 
-        if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
+        if (!rdma_is_port_valid(device, port_num))
                 return -EINVAL;
 
         table = device->cache.ports[port_num - rdma_start_port(device)].gid;
@@ -895,7 +893,7 @@ int ib_get_cached_pkey(struct ib_device *device,
         unsigned long flags;
         int ret = 0;
 
-        if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
+        if (!rdma_is_port_valid(device, port_num))
                 return -EINVAL;
 
         read_lock_irqsave(&device->cache.lock, flags);
@@ -924,7 +922,7 @@ int ib_find_cached_pkey(struct ib_device *device,
         int ret = -ENOENT;
         int partial_ix = -1;
 
-        if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
+        if (!rdma_is_port_valid(device, port_num))
                 return -EINVAL;
 
         read_lock_irqsave(&device->cache.lock, flags);
@@ -964,7 +962,7 @@ int ib_find_exact_cached_pkey(struct ib_device *device,
         int i;
         int ret = -ENOENT;
 
-        if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
+        if (!rdma_is_port_valid(device, port_num))
                 return -EINVAL;
 
         read_lock_irqsave(&device->cache.lock, flags);
@@ -993,7 +991,7 @@ int ib_get_cached_lmc(struct ib_device *device,
         unsigned long flags;
         int ret = 0;
 
-        if (port_num < rdma_start_port(device) || port_num > rdma_end_port(device))
+        if (!rdma_is_port_valid(device, port_num))
                 return -EINVAL;
 
         read_lock_irqsave(&device->cache.lock, flags);
@@ -1038,7 +1036,7 @@ static void ib_cache_update(struct ib_device *device,
         bool                       use_roce_gid_table =
                                         rdma_cap_roce_gid_table(device, port);
 
-        if (port < rdma_start_port(device) || port > rdma_end_port(device))
+        if (!rdma_is_port_valid(device, port))
                 return;
 
         table = device->cache.ports[port - rdma_start_port(device)].gid;