Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3f2511f authored by Ido Shamay's avatar Ido Shamay Committed by David S. Miller
Browse files

net/mlx4: Cache line CQE/EQE stride fixes 



This commit contains 2 fixes for the 128B CQE/EQE stride feaure.
Wei found that mlx4_QUERY_HCA function marked the wrong capability
in flags (64B CQE/EQE), when CQE/EQE stride feature was enabled.
Also added small fix in initial CQE ownership bit assignment, when CQE
is size is not default 32B.

Fixes: 77507aa2 (net/mlx4: Enable CQE/EQE stride support)
Signed-off-by: default avatarWei Yang <weiyang@linux.vnet.ibm.com>
Signed-off-by: default avatarIdo Shamay <idos@mellanox.com>
Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 94191fd6

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+9 −2
Original line number Diff line number Diff line
@@ -1569,8 +1569,15 @@ int mlx4_en_start_port(struct net_device *dev) 
			mlx4_en_free_affinity_hint(priv, i);

			goto cq_err;

		}

		for (j = 0; j < cq->size; j++)

			cq->buf[j].owner_sr_opcode = MLX4_CQE_OWNER_MASK;



		for (j = 0; j < cq->size; j++) {

			struct mlx4_cqe *cqe = NULL;



			cqe = mlx4_en_get_cqe(cq->buf, j, priv->cqe_size) +

			      priv->cqe_factor;

			cqe->owner_sr_opcode = MLX4_CQE_OWNER_MASK;

		}



		err = mlx4_en_set_cq_moder(priv, cq);

		if (err) {

			en_err(priv, "Failed setting cq moderation parameters\n");

drivers/net/ethernet/mellanox/mlx4/fw.c

+2 −2
Original line number Diff line number Diff line
@@ -1852,8 +1852,8 @@ int mlx4_QUERY_HCA(struct mlx4_dev *dev, 
	/* CX3 is capable of extending CQEs\EQEs to strides larger than 64B */

	MLX4_GET(byte_field, outbox, INIT_HCA_EQE_CQE_STRIDE_OFFSET);

	if (byte_field) {

		param->dev_cap_enabled |= MLX4_DEV_CAP_64B_EQE_ENABLED;

		param->dev_cap_enabled |= MLX4_DEV_CAP_64B_CQE_ENABLED;

		param->dev_cap_enabled |= MLX4_DEV_CAP_EQE_STRIDE_ENABLED;

		param->dev_cap_enabled |= MLX4_DEV_CAP_CQE_STRIDE_ENABLED;

		param->cqe_size = 1 << ((byte_field &

					 MLX4_CQE_SIZE_MASK_STRIDE) + 5);

		param->eqe_size = 1 << (((byte_field &