> From: Caleb Sander Mateos <csander@xxxxxxxxxxxxxxx>
> Sent: Friday, November 1, 2024 9:17 AM
>
> The logic of eq_update_ci() is duplicated in mlx5_eq_update_ci(). The only
> additional work done by mlx5_eq_update_ci() is to increment
> eq->cons_index. Call eq_update_ci() from mlx5_eq_update_ci() to avoid
> the duplication.
>
> Signed-off-by: Caleb Sander Mateos <csander@xxxxxxxxxxxxxxx>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +--------
> 1 file changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
> b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
> index 859dcf09b770..078029c81935 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
> @@ -802,19 +802,12 @@ struct mlx5_eqe *mlx5_eq_get_eqe(struct
> mlx5_eq *eq, u32 cc) } EXPORT_SYMBOL(mlx5_eq_get_eqe);
>
> void mlx5_eq_update_ci(struct mlx5_eq *eq, u32 cc, bool arm) {
> - __be32 __iomem *addr = eq->doorbell + (arm ? 0 : 2);
> - u32 val;
> -
> eq->cons_index += cc;
> - val = (eq->cons_index & 0xffffff) | (eq->eqn << 24);
> -
> - __raw_writel((__force u32)cpu_to_be32(val), addr);
> - /* We still want ordering, just not swabbing, so add a barrier */
> - wmb();
> + eq_update_ci(eq, arm);
Long ago I had similar rework patches to get rid of __raw_writel(), which I never got chance to push,
Eq_update_ci() is using full memory barrier.
While mlx5_eq_update_ci() is using only write memory barrier.
So it is not 100% deduplication by this patch.
Please have a pre-patch improving eq_update_ci() to use wmb().
Followed by this patch.
> }
> EXPORT_SYMBOL(mlx5_eq_update_ci);
>
> static void comp_irq_release_pci(struct mlx5_core_dev *dev, u16 vecidx) {
> --
> 2.45.2
>
