net/mlx5e: Remove redundant tstamp pointer from channel structures

Remove the tstamp pointer field from mlx5e_channel, mlx5e_ptp, and
mlx5e_trap structures, since it was only used to reference the tstamp
field in the priv structure. Instead, directly use the tstamp field
from priv when initializing RQ structures.

Also remove the unused hwtstamp_config field from mlx5_clock structure
as part of the cleanup.

Signed-off-by: Carolina Jubran <cjubran@nvidia.com>
Reviewed-by: Cosmin Ratiu <cratiu@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/1761819910-1011051-2-git-send-email-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 14e3207b14e745be9beb853151c428b399ff6273..5485cf0149267ef6ce46b4e523de863c3df93605 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -784,7 +784,6 @@ struct mlx5e_channel {
        /* control */
        struct mlx5e_priv         *priv;
        struct mlx5_core_dev      *mdev;
-       struct hwtstamp_config    *tstamp;
        DECLARE_BITMAP(state, MLX5E_CHANNEL_NUM_STATES);
        int                        ix;
        int                        vec_ix;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
index c93ee969ea647775f772a9f119d529244d19117f..96a78b6d4904be0e03a5f48dbf008e239e71a99a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
@@ -896,7 +896,6 @@ int mlx5e_ptp_open(struct mlx5e_priv *priv, struct mlx5e_params *params,
 
        c->priv     = priv;
        c->mdev     = priv->mdev;
-       c->tstamp   = &priv->tstamp;
        c->pdev     = mlx5_core_dma_dev(priv->mdev);
        c->netdev   = priv->netdev;
        c->mkey_be  = cpu_to_be32(priv->mdev->mlx5e_res.hw_objs.mkey);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h b/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h
index 1b3c9648220b368b2662dff9a2442671faf69271..1c0e0a86a9ac85523bc66987d8823592c8c1ff2d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h
@@ -64,7 +64,6 @@ struct mlx5e_ptp {
        /* control */
        struct mlx5e_priv         *priv;
        struct mlx5_core_dev      *mdev;
-       struct hwtstamp_config    *tstamp;
        DECLARE_BITMAP(state, MLX5E_PTP_STATE_NUM_STATES);
        struct mlx5_sq_bfreg      *bfreg;
 };

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c b/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c
index 996fcdb5a29d016910ee4578a571ebc0ccc66caa..db6932b0cedfa7a4ff8064fba95ad418f121334c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c
@@ -144,7 +144,6 @@ static struct mlx5e_trap *mlx5e_open_trap(struct mlx5e_priv *priv)
 
        t->priv     = priv;
        t->mdev     = priv->mdev;
-       t->tstamp   = &priv->tstamp;
        t->pdev     = mlx5_core_dma_dev(priv->mdev);
        t->netdev   = priv->netdev;
        t->mkey_be  = cpu_to_be32(priv->mdev->mlx5e_res.hw_objs.mkey);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/trap.h b/drivers/net/ethernet/mellanox/mlx5/core/en/trap.h
index aa3f17658c6d4cb9f9452209cf799e35a89de86b..394e917ea2b0a92bcdc423d0c1439f5efe971be7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/trap.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/trap.h
@@ -22,7 +22,6 @@ struct mlx5e_trap {
        /* control */
        struct mlx5e_priv         *priv;
        struct mlx5_core_dev      *mdev;
-       struct hwtstamp_config    *tstamp;
        DECLARE_BITMAP(state, MLX5E_CHANNEL_NUM_STATES);
 
        struct mlx5e_params        params;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
index dbd88eb5c082a54a31496b395c4f494b5176d7ba..dc5a4afa4974ce82a381e15e6c0902eb666a1ad2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
@@ -71,7 +71,7 @@ static int mlx5e_init_xsk_rq(struct mlx5e_channel *c,
        rq->pdev         = c->pdev;
        rq->netdev       = c->netdev;
        rq->priv         = c->priv;
-       rq->tstamp       = c->tstamp;
+       rq->tstamp       = &c->priv->tstamp;
        rq->clock        = mdev->clock;
        rq->icosq        = &c->icosq;
        rq->ix           = c->ix;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 9c46511e7b43766ccc47d78dc87aee328d37bfbc..20f55542433d3d2343f92c18e7f4b37729ea83c3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -735,7 +735,7 @@ static int mlx5e_init_rxq_rq(struct mlx5e_channel *c, struct mlx5e_params *param
        rq->pdev         = c->pdev;
        rq->netdev       = c->netdev;
        rq->priv         = c->priv;
-       rq->tstamp       = c->tstamp;
+       rq->tstamp       = &c->priv->tstamp;
        rq->clock        = mdev->clock;
        rq->icosq        = &c->icosq;
        rq->ix           = c->ix;
@@ -2803,7 +2803,6 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
 
        c->priv     = priv;
        c->mdev     = mdev;
-       c->tstamp   = &priv->tstamp;
        c->ix       = ix;
        c->vec_ix   = vec_ix;
        c->sd_ix    = mlx5_sd_ch_ix_get_dev_ix(mdev, ix);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h
index c18a652c0faa1c6dbb62b19577291b783ca40034..aff3aed62c748f2d1e19de94df6477463d6865ad 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h
@@ -54,7 +54,6 @@ struct mlx5_timer {
 
 struct mlx5_clock {
        seqlock_t                  lock;
-       struct hwtstamp_config     hwtstamp_config;
        struct ptp_clock          *ptp;
        struct ptp_clock_info      ptp_info;
        struct mlx5_pps            pps_info;