svn commit: r341935 - stable/12/sys/dev/mlx5/mlx5_core

[Hans Petter Selasky]

Author: hselasky
Date: Wed Dec 12 12:23:35 2018
New Revision: 341935
URL: https://svnweb.freebsd.org/changeset/base/341935

Log:
  MFC r341561:
  mlx5: Add global control to disable firmware reset, for all mlx5 devices.
  
  Submitted by:   kib@
  Sponsored by:   Mellanox Technologies

Modified:
  stable/12/sys/dev/mlx5/mlx5_core/mlx5_health.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mlx5/mlx5_core/mlx5_health.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_core/mlx5_health.c	Wed Dec 12 12:22:40 2018	(r341934)
+++ stable/12/sys/dev/mlx5/mlx5_core/mlx5_health.c	Wed Dec 12 12:23:35 2018	(r341935)
@@ -59,6 +59,11 @@ enum  {
 	MLX5_SENSOR_FW_SYND_RFR		= 5,
 };
 
+static int mlx5_fw_reset_enable = 1;
+SYSCTL_INT(_hw_mlx5, OID_AUTO, fw_reset_enable, CTLFLAG_RWTUN,
+    &mlx5_fw_reset_enable, 0,
+    "Enable firmware reset");
+
 static int lock_sem_sw_reset(struct mlx5_core_dev *dev)
 {
 	int ret;
@@ -180,10 +185,13 @@ static u32 check_fatal_sensors(struct mlx5_core_dev *d
 
 static void reset_fw_if_needed(struct mlx5_core_dev *dev)
 {
-	bool supported = (ioread32be(&dev->iseg->initializing) >>
-			  MLX5_FW_RESET_SUPPORTED_OFFSET) & 1;
+	bool supported;
 	u32 cmdq_addr, fatal_error;
 
+	if (!mlx5_fw_reset_enable)
+		return;
+	supported = (ioread32be(&dev->iseg->initializing) >>
+	    MLX5_FW_RESET_SUPPORTED_OFFSET) & 1;
 	if (!supported)
 		return;