Author: hselasky
Date: Fri Sep 16 11:45:35 2016
New Revision: 305872
URL: https://svnweb.freebsd.org/changeset/base/305872
Log:
mlx5en: Properly declare doorbell lock for 32-bit CPUs.
Sponsored by: Mellanox Technologies
MFC after: 1 week
Modified:
head/sys/dev/mlx5/mlx5_en/en.h
head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
Modified: head/sys/dev/mlx5/mlx5_en/en.h
==============================================================================
--- head/sys/dev/mlx5/mlx5_en/en.h Fri Sep 16 11:40:45 2016
(r305871)
+++ head/sys/dev/mlx5/mlx5_en/en.h Fri Sep 16 11:45:35 2016
(r305872)
@@ -662,6 +662,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;
@@ -784,7 +785,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: head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
==============================================================================
--- head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Fri Sep 16 11:40:45 2016
(r305871)
+++ head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Fri Sep 16 11:45:35 2016
(r305872)
@@ -2753,6 +2753,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-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
