Author: hselasky
Date: Fri Sep 23 08:32:18 2016
New Revision: 306249
URL: https://svnweb.freebsd.org/changeset/base/306249
Log:
MFC r305872:
mlx5en: Properly declare doorbell lock for 32-bit CPUs.
Sponsored by: Mellanox Technologies
Modified:
stable/10/sys/dev/mlx5/mlx5_en/en.h
stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/mlx5/mlx5_en/en.h
==============================================================================
--- stable/10/sys/dev/mlx5/mlx5_en/en.h Fri Sep 23 08:31:38 2016
(r306248)
+++ stable/10/sys/dev/mlx5/mlx5_en/en.h Fri Sep 23 08:32:18 2016
(r306249)
@@ -672,6 +672,7 @@ struct mlx5e_priv {
struct work_struct update_stats_work;
struct work_struct update_carrier_work;
struct work_struct set_rx_mode_work;
+ MLX5_DECLARE_DOORBELL_LOCK(doorbell_lock)
struct mlx5_core_dev *mdev;
struct ifnet *ifp;
@@ -794,7 +795,8 @@ mlx5e_tx_notify_hw(struct mlx5e_sq *sq,
wmb();
} else {
- mlx5_write64(wqe, sq->uar.map + ofst, NULL);
+ mlx5_write64(wqe, sq->uar.map + ofst,
+ MLX5_GET_DOORBELL_LOCK(&sq->priv->doorbell_lock));
}
sq->bf_offset ^= sq->bf_buf_size;
Modified: stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
==============================================================================
--- stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Fri Sep 23 08:31:38
2016 (r306248)
+++ stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Fri Sep 23 08:32:18
2016 (r306249)
@@ -2759,6 +2759,7 @@ mlx5e_priv_mtx_init(struct mlx5e_priv *p
mtx_init(&priv->async_events_mtx, "mlx5async", MTX_NETWORK_LOCK,
MTX_DEF);
sx_init(&priv->state_lock, "mlx5state");
callout_init_mtx(&priv->watchdog, &priv->async_events_mtx, 0);
+ MLX5_INIT_DOORBELL_LOCK(&priv->doorbell_lock);
}
static void
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
