Commit aa4595d0 authored by Cosmin Ratiu's avatar Cosmin Ratiu Committed by Jakub Kicinski
Browse files

net/mlx5: Store the global doorbell in mlx5_priv 



The global doorbell is used for more than just Ethernet resources, so
move it out of mlx5e_hw_objs into a common place (mlx5_priv), to avoid
non-Ethernet modules (e.g. HWS, ASO) depending on Ethernet structs.

Use this opportunity to consolidate it with the 'uar' pointer already
there, which was used as an RX doorbell. Underneath the 'uar' pointer is
identical to 'bfreg->up', so store a single resource and use that
instead.

For CQ doorbells, care is taken to always use bfreg->up->index instead
of bfreg->index, which may refer to a subsequent UAR page from the same
ALLOC_UAR batch on some NICs.

This paves the way for cleanly supporting multiple doorbells in the
Ethernet driver.

Signed-off-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Reviewed-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 913d28f8

drivers/infiniband/hw/mlx5/cq.c

+2 −2
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ int mlx5_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags) 
{

	struct mlx5_core_dev *mdev = to_mdev(ibcq->device)->mdev;

	struct mlx5_ib_cq *cq = to_mcq(ibcq);

	void __iomem *uar_page = mdev->priv.uar->map;

	void __iomem *uar_page = mdev->priv.bfreg.up->map;

	unsigned long irq_flags;

	int ret = 0;
@@ -923,7 +923,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq, 
		 cq->buf.frag_buf.page_shift -

		 MLX5_ADAPTER_PAGE_SHIFT);



	*index = dev->mdev->priv.uar->index;

	*index = dev->mdev->priv.bfreg.up->index;



	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ int mlx5_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq, 
		mlx5_core_dbg(dev, "failed adding CP 0x%x to debug file system\n",

			      cq->cqn);



	cq->uar = dev->priv.uar;

	cq->uar = dev->priv.bfreg.up;

	cq->irqn = eq->core.irqn;



	return 0;

drivers/net/ethernet/mellanox/mlx5/core/en/params.c

+1 −1
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ static void mlx5e_build_common_cq_param(struct mlx5_core_dev *mdev, 
{

	void *cqc = param->cqc;



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

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

	if (MLX5_CAP_GEN(mdev, cqe_128_always) && cache_line_size() >= 128)

		MLX5_SET(cqc, cqc, cqe_sz, CQE_STRIDE_128_PAD);

}

drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static int mlx5e_ptp_alloc_txqsq(struct mlx5e_ptp *c, int txq_ix, 
	sq->mdev      = mdev;

	sq->ch_ix     = MLX5E_PTP_CHANNEL_IX;

	sq->txq_ix    = txq_ix;

	sq->uar_map   = mdev->mlx5e_res.hw_objs.bfreg.map;

	sq->uar_map   = mdev->priv.bfreg.map;

	sq->min_inline_mode = params->tx_min_inline_mode;

	sq->hw_mtu    = MLX5E_SW2HW_MTU(params, params->sw_mtu);

	sq->stats     = &c->priv->ptp_stats.sq[tc];

drivers/net/ethernet/mellanox/mlx5/core/en_common.c

+1 −10
Original line number Diff line number Diff line
@@ -163,17 +163,11 @@ int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev, bool create_tises) 
		goto err_dealloc_transport_domain;

	}



	err = mlx5_alloc_bfreg(mdev, &res->bfreg, false, false);

	if (err) {

		mlx5_core_err(mdev, "alloc bfreg failed, %d\n", err);

		goto err_destroy_mkey;

	}



	if (create_tises) {

		err = mlx5e_create_tises(mdev, res->tisn);

		if (err) {

			mlx5_core_err(mdev, "alloc tises failed, %d\n", err);

			goto err_destroy_bfreg;

			goto err_destroy_mkey;

		}

		res->tisn_valid = true;

	}
@@ -190,8 +184,6 @@ int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev, bool create_tises) 


	return 0;



err_destroy_bfreg:

	mlx5_free_bfreg(mdev, &res->bfreg);

err_destroy_mkey:

	mlx5_core_destroy_mkey(mdev, res->mkey);

err_dealloc_transport_domain:
@@ -209,7 +201,6 @@ void mlx5e_destroy_mdev_resources(struct mlx5_core_dev *mdev) 
	mdev->mlx5e_res.dek_priv = NULL;

	if (res->tisn_valid)

		mlx5e_destroy_tises(mdev, res->tisn);

	mlx5_free_bfreg(mdev, &res->bfreg);

	mlx5_core_destroy_mkey(mdev, res->mkey);

	mlx5_core_dealloc_transport_domain(mdev, res->td.tdn);

	mlx5_core_dealloc_pd(mdev, res->pdn);