Commit f9beaf4f authored by Jianbo Liu's avatar Jianbo Liu Committed by Paolo Abeni
Browse files

net/mlx5: Change clock in mlx5_core_dev to mlx5_clock pointer 



Change clock member in mlx5_core_dev to a pointer, so it can point to
a clock shared by multiple functions in later patch.

For now, each function has its own clock, so mdev in mlx5_clock_priv
is the back pointer to the function. Later it points to one (normally
the first one) of the multiple functions sharing the same clock.

Change mlx5_init_clock() to return error if mlx5_clock is not
allocated. Besides, a null clock is defined and used when hardware
clock is not supported. So, the clock pointer is always pointing to
something valid.

Signed-off-by: default avatarJianbo Liu <jianbol@nvidia.com>
Reviewed-by: default avatarCarolina Jubran <cjubran@nvidia.com>
Reviewed-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 355f58f1

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

+2 −2
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int mlx5e_ptp_alloc_txqsq(struct mlx5e_ptp *c, int txq_ix, 
	int node;



	sq->pdev      = c->pdev;

	sq->clock     = &mdev->clock;

	sq->clock     = mdev->clock;

	sq->mkey_be   = c->mkey_be;

	sq->netdev    = c->netdev;

	sq->priv      = c->priv;
@@ -696,7 +696,7 @@ static int mlx5e_init_ptp_rq(struct mlx5e_ptp *c, struct mlx5e_params *params, 
	rq->pdev         = c->pdev;

	rq->netdev       = priv->netdev;

	rq->priv         = priv;

	rq->clock        = &mdev->clock;

	rq->clock        = mdev->clock;

	rq->tstamp       = &priv->tstamp;

	rq->mdev         = mdev;

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

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static void mlx5e_init_trap_rq(struct mlx5e_trap *t, struct mlx5e_params *params 
	rq->pdev         = t->pdev;

	rq->netdev       = priv->netdev;

	rq->priv         = priv;

	rq->clock        = &mdev->clock;

	rq->clock        = mdev->clock;

	rq->tstamp       = &priv->tstamp;

	rq->mdev         = mdev;

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

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

+2 −2
Original line number Diff line number Diff line
@@ -289,9 +289,9 @@ static u64 mlx5e_xsk_fill_timestamp(void *_priv) 
	ts = get_cqe_ts(priv->cqe);



	if (mlx5_is_real_time_rq(priv->cq->mdev) || mlx5_is_real_time_sq(priv->cq->mdev))

		return mlx5_real_time_cyc2time(&priv->cq->mdev->clock, ts);

		return mlx5_real_time_cyc2time(priv->cq->mdev->clock, ts);



	return  mlx5_timecounter_cyc2time(&priv->cq->mdev->clock, ts);

	return  mlx5_timecounter_cyc2time(priv->cq->mdev->clock, ts);

}



static void mlx5e_xsk_request_checksum(u16 csum_start, u16 csum_offset, void *priv)

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int mlx5e_init_xsk_rq(struct mlx5e_channel *c, 
	rq->netdev       = c->netdev;

	rq->priv         = c->priv;

	rq->tstamp       = c->tstamp;

	rq->clock        = &mdev->clock;

	rq->clock        = mdev->clock;

	rq->icosq        = &c->icosq;

	rq->ix           = c->ix;

	rq->channel      = c;

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

+2 −2
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static int mlx5e_init_rxq_rq(struct mlx5e_channel *c, struct mlx5e_params *param 
	rq->netdev       = c->netdev;

	rq->priv         = c->priv;

	rq->tstamp       = c->tstamp;

	rq->clock        = &mdev->clock;

	rq->clock        = mdev->clock;

	rq->icosq        = &c->icosq;

	rq->ix           = c->ix;

	rq->channel      = c;
@@ -1614,7 +1614,7 @@ static int mlx5e_alloc_txqsq(struct mlx5e_channel *c, 
	int err;



	sq->pdev      = c->pdev;

	sq->clock     = &mdev->clock;

	sq->clock     = mdev->clock;

	sq->mkey_be   = c->mkey_be;

	sq->netdev    = c->netdev;

	sq->mdev      = c->mdev;