From: Tal Gilboa <talgi@nvidia.com>

Date: Sun, 18 Jul 2021 14:54:13 +0300

Subject: IB/mlx5: Rename is_apu_thread_cq function to is_apu_cq

Patch-mainline: v5.15-rc1

Git-commit: 616d5769345528b989294a242a5906b157a92837

References: jsc#SLE-19253

is_apu_thread_cq() used to detect CQs which are attached to APU

threads. This was extended to support other elements as well,

so the function was renamed to is_apu_cq().

c_eqn_or_apu_element was extended from 8 bits to 32 bits, which wan't

reflected when the APU support was first introduced.

Acked-by: Michael S. Tsirkin <mst@redhat.com> # vdpa

Signed-off-by: Tal Gilboa <talgi@nvidia.com>

Signed-off-by: Leon Romanovsky <leonro@nvidia.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/infiniband/hw/mlx5/cq.c                            |    2 +-

 drivers/infiniband/hw/mlx5/devx.c                          |    7 +++----

 drivers/net/ethernet/mellanox/mlx5/core/cq.c               |    3 ++-

 drivers/net/ethernet/mellanox/mlx5/core/en_main.c          |    2 +-

 drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c        |    2 +-

 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c |    2 +-

 drivers/vdpa/mlx5/net/mlx5_vnet.c                          |    2 +-

 include/linux/mlx5/mlx5_ifc.h                              |    5 ++---

 8 files changed, 12 insertions(+), 13 deletions(-)

--- a/drivers/infiniband/hw/mlx5/cq.c

+++ b/drivers/infiniband/hw/mlx5/cq.c

@@ -996,7 +996,7 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq

 				  MLX5_IB_CQ_PR_FLAGS_CQE_128_PAD));

 	MLX5_SET(cqc, cqc, log_cq_size, ilog2(entries));

 	MLX5_SET(cqc, cqc, uar_page, index);

-	MLX5_SET(cqc, cqc, c_eqn, eqn);

+	MLX5_SET(cqc, cqc, c_eqn_or_apu_element, eqn);

 	MLX5_SET64(cqc, cqc, dbr_addr, cq->db.dma);

 	if (cq->create_flags & IB_UVERBS_CQ_FLAGS_IGNORE_OVERRUN)

 		MLX5_SET(cqc, cqc, oi, 1);

--- a/drivers/infiniband/hw/mlx5/devx.c

+++ b/drivers/infiniband/hw/mlx5/devx.c

@@ -1436,11 +1436,10 @@ out:

 	rcu_read_unlock();

 }

-static bool is_apu_thread_cq(struct mlx5_ib_dev *dev, const void *in)

+static bool is_apu_cq(struct mlx5_ib_dev *dev, const void *in)

 {

 	if (!MLX5_CAP_GEN(dev->mdev, apu) ||

-	    !MLX5_GET(cqc, MLX5_ADDR_OF(create_cq_in, in, cq_context),

-		      apu_thread_cq))

+	    !MLX5_GET(cqc, MLX5_ADDR_OF(create_cq_in, in, cq_context), apu_cq))

 		return false;

 	return true;

@@ -1500,7 +1499,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD

 		err = mlx5_core_create_dct(dev, &obj->core_dct, cmd_in,

 					   cmd_in_len, cmd_out, cmd_out_len);

 	} else if (opcode == MLX5_CMD_OP_CREATE_CQ &&

-		   !is_apu_thread_cq(dev, cmd_in)) {

+		   !is_apu_cq(dev, cmd_in)) {

 		obj->flags |= DEVX_OBJ_FLAGS_CQ;

 		obj->core_cq.comp = devx_cq_comp;

 		err = mlx5_core_create_cq(dev->mdev, &obj->core_cq,

--- a/drivers/net/ethernet/mellanox/mlx5/core/cq.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/cq.c

@@ -89,7 +89,8 @@ static void mlx5_add_cq_to_tasklet(struc

 int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq,

 			u32 *in, int inlen, u32 *out, int outlen)

 {

-	int eqn = MLX5_GET(cqc, MLX5_ADDR_OF(create_cq_in, in, cq_context), c_eqn);

+	int eqn = MLX5_GET(cqc, MLX5_ADDR_OF(create_cq_in, in, cq_context),

+			   c_eqn_or_apu_element);

 	u32 din[MLX5_ST_SZ_DW(destroy_cq_in)] = {};

 	struct mlx5_eq_comp *eq;

 	int err;

--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c

@@ -1619,7 +1619,7 @@ static int mlx5e_create_cq(struct mlx5e_

 				  (__be64 *)MLX5_ADDR_OF(create_cq_in, in, pas));

 	MLX5_SET(cqc,   cqc, cq_period_mode, param->cq_period_mode);

-	MLX5_SET(cqc,   cqc, c_eqn,         eqn);

+	MLX5_SET(cqc,   cqc, c_eqn_or_apu_element, eqn);

 	MLX5_SET(cqc,   cqc, uar_page,      mdev->priv.uar->index);

 	MLX5_SET(cqc,   cqc, log_page_size, cq->wq_ctrl.buf.page_shift -

 					    MLX5_ADAPTER_PAGE_SHIFT);

--- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c

@@ -453,7 +453,7 @@ static int mlx5_fpga_conn_create_cq(stru

 	cqc = MLX5_ADDR_OF(create_cq_in, in, cq_context);

 	MLX5_SET(cqc, cqc, log_cq_size, ilog2(cq_size));

-	MLX5_SET(cqc, cqc, c_eqn, eqn);

+	MLX5_SET(cqc, cqc, c_eqn_or_apu_element, eqn);

 	MLX5_SET(cqc, cqc, uar_page, fdev->conn_res.uar->index);

 	MLX5_SET(cqc, cqc, log_page_size, conn->cq.wq_ctrl.buf.page_shift -

 			   MLX5_ADAPTER_PAGE_SHIFT);

--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c

@@ -789,7 +789,7 @@ static struct mlx5dr_cq *dr_create_cq(st

 	cqc = MLX5_ADDR_OF(create_cq_in, in, cq_context);

 	MLX5_SET(cqc, cqc, log_cq_size, ilog2(ncqe));

-	MLX5_SET(cqc, cqc, c_eqn, eqn);

+	MLX5_SET(cqc, cqc, c_eqn_or_apu_element, eqn);

 	MLX5_SET(cqc, cqc, uar_page, uar->index);

 	MLX5_SET(cqc, cqc, log_page_size, cq->wq_ctrl.buf.page_shift -

 		 MLX5_ADAPTER_PAGE_SHIFT);

--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c

+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c

@@ -572,7 +572,7 @@ static int cq_create(struct mlx5_vdpa_ne

 	cqc = MLX5_ADDR_OF(create_cq_in, in, cq_context);

 	MLX5_SET(cqc, cqc, log_cq_size, ilog2(num_ent));

 	MLX5_SET(cqc, cqc, uar_page, ndev->mvdev.res.uar->index);

-	MLX5_SET(cqc, cqc, c_eqn, eqn);

+	MLX5_SET(cqc, cqc, c_eqn_or_apu_element, eqn);

 	MLX5_SET64(cqc, cqc, dbr_addr, vcq->db.dma);

 	err = mlx5_core_create_cq(mdev, &vcq->mcq, in, inlen, out, sizeof(out));

--- a/include/linux/mlx5/mlx5_ifc.h

+++ b/include/linux/mlx5/mlx5_ifc.h

@@ -3912,7 +3912,7 @@ struct mlx5_ifc_cqc_bits {

 	u8         status[0x4];

 	u8         reserved_at_4[0x2];

 	u8         dbr_umem_valid[0x1];

-	u8         apu_thread_cq[0x1];

+	u8         apu_cq[0x1];

 	u8         cqe_sz[0x3];

 	u8         cc[0x1];

 	u8         reserved_at_c[0x1];

@@ -3938,8 +3938,7 @@ struct mlx5_ifc_cqc_bits {

 	u8         cq_period[0xc];

 	u8         cq_max_count[0x10];

-	u8         reserved_at_a0[0x18];

-	u8         c_eqn[0x8];

+	u8         c_eqn_or_apu_element[0x20];

 	u8         reserved_at_c0[0x3];

 	u8         log_page_size[0x5];