IB/mlx4: Use port iterator and validation APIs

Use IB core provided routine to check if the port is valid or not and to
iterate over IB ports.

Link: https://lore.kernel.org/r/20210127150010.1876121-10-leon@kernel.org
Signed-off-by: Parav Pandit <parav@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index e3cd402c079afcff98e0951a1482c51088623cfc..f26a0d92084298e4a9a81c0a19cee477f5b88fba 100644 (file)
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1699,7 +1699,7 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp,
        struct mlx4_dev *dev = (to_mdev(qp->device))->dev;
        int is_bonded = mlx4_is_bonded(dev);
 
-       if (flow_attr->port < 1 || flow_attr->port > qp->device->phys_port_cnt)
+       if (!rdma_is_port_valid(qp->device, flow_attr->port))
                return ERR_PTR(-EINVAL);
 
        if (flow_attr->flags & ~IB_FLOW_ATTR_FLAGS_DONT_TRAP)

diff --git a/drivers/infiniband/hw/mlx4/sysfs.c b/drivers/infiniband/hw/mlx4/sysfs.c
index 1b5891130aaba1a32c31f4eeb7ee5241738f88e9..24ee79aa2122ed628fcf6b86c1d52bc071bd4a02 100644 (file)
--- a/drivers/infiniband/hw/mlx4/sysfs.c
+++ b/drivers/infiniband/hw/mlx4/sysfs.c
@@ -798,7 +798,7 @@ static void unregister_pkey_tree(struct mlx4_ib_dev *device)
 
 int mlx4_ib_device_register_sysfs(struct mlx4_ib_dev *dev)
 {
-       int i;
+       unsigned int i;
        int ret = 0;
 
        if (!mlx4_is_master(dev->dev))
@@ -817,7 +817,7 @@ int mlx4_ib_device_register_sysfs(struct mlx4_ib_dev *dev)
                goto err_ports;
        }
 
-       for (i = 1; i <= dev->ib_dev.phys_port_cnt; ++i) {
+       rdma_for_each_port(&dev->ib_dev, i) {
                ret = add_port_entries(dev, i);
                if (ret)
                        goto err_add_entries;