net/mlx5: Remove initial segmentation duplicate definitions

Device definitions belong in mlx5_ifc, remove the duplicates in
mlx5_core.h.

Signed-off-by: Gal Pressman <gal@nvidia.com>
Reviewed-by: Jianbo Liu <jianbol@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw.c b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
index 58f4c0d0fafa25ec682eca9be8bda3dc146de044..e7faf7e73ca4817fb0d4fb19d9d4ba285a563c74 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
@@ -366,18 +366,18 @@ int mlx5_cmd_fast_teardown_hca(struct mlx5_core_dev *dev)
                return -EIO;
        }
 
-       mlx5_set_nic_state(dev, MLX5_NIC_IFC_DISABLED);
+       mlx5_set_nic_state(dev, MLX5_INITIAL_SEG_NIC_INTERFACE_DISABLED);
 
        /* Loop until device state turns to disable */
        end = jiffies + msecs_to_jiffies(delay_ms);
        do {
-               if (mlx5_get_nic_state(dev) == MLX5_NIC_IFC_DISABLED)
+               if (mlx5_get_nic_state(dev) == MLX5_INITIAL_SEG_NIC_INTERFACE_DISABLED)
                        break;
 
                cond_resched();
        } while (!time_after(jiffies, end));
 
-       if (mlx5_get_nic_state(dev) != MLX5_NIC_IFC_DISABLED) {
+       if (mlx5_get_nic_state(dev) != MLX5_INITIAL_SEG_NIC_INTERFACE_DISABLED) {
                dev_err(&dev->pdev->dev, "NIC IFC still %d after %lums.\n",
                        mlx5_get_nic_state(dev), delay_ms);
                return -EIO;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c
index 5c2ac2d9dbd996c856f6ef064e4c13ffea3bfdec..9463ede84d8d4cd0deec685f845cc8c80e1e7a4b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/health.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c
@@ -116,9 +116,9 @@ u32 mlx5_health_check_fatal_sensors(struct mlx5_core_dev *dev)
                return MLX5_SENSOR_PCI_COMM_ERR;
        if (pci_channel_offline(dev->pdev))
                return MLX5_SENSOR_PCI_ERR;
-       if (mlx5_get_nic_state(dev) == MLX5_NIC_IFC_DISABLED)
+       if (mlx5_get_nic_state(dev) == MLX5_INITIAL_SEG_NIC_INTERFACE_DISABLED)
                return MLX5_SENSOR_NIC_DISABLED;
-       if (mlx5_get_nic_state(dev) == MLX5_NIC_IFC_SW_RESET)
+       if (mlx5_get_nic_state(dev) == MLX5_INITIAL_SEG_NIC_INTERFACE_SW_RESET)
                return MLX5_SENSOR_NIC_SW_RESET;
        if (sensor_fw_synd_rfr(dev))
                return MLX5_SENSOR_FW_SYND_RFR;
@@ -185,7 +185,7 @@ static bool reset_fw_if_needed(struct mlx5_core_dev *dev)
        /* Write the NIC interface field to initiate the reset, the command
         * interface address also resides here, don't overwrite it.
         */
-       mlx5_set_nic_state(dev, MLX5_NIC_IFC_SW_RESET);
+       mlx5_set_nic_state(dev, MLX5_INITIAL_SEG_NIC_INTERFACE_SW_RESET);
 
        return true;
 }
@@ -246,13 +246,13 @@ recover_from_sw_reset:
        /* Recover from SW reset */
        end = jiffies + msecs_to_jiffies(delay_ms);
        do {
-               if (mlx5_get_nic_state(dev) == MLX5_NIC_IFC_DISABLED)
+               if (mlx5_get_nic_state(dev) == MLX5_INITIAL_SEG_NIC_INTERFACE_DISABLED)
                        break;
 
                msleep(20);
        } while (!time_after(jiffies, end));
 
-       if (mlx5_get_nic_state(dev) != MLX5_NIC_IFC_DISABLED) {
+       if (mlx5_get_nic_state(dev) != MLX5_INITIAL_SEG_NIC_INTERFACE_DISABLED) {
                dev_err(&dev->pdev->dev, "NIC IFC still %d after %lums.\n",
                        mlx5_get_nic_state(dev), delay_ms);
        }
@@ -272,26 +272,26 @@ static void mlx5_handle_bad_state(struct mlx5_core_dev *dev)
        u8 nic_interface = mlx5_get_nic_state(dev);
 
        switch (nic_interface) {
-       case MLX5_NIC_IFC_FULL:
+       case MLX5_INITIAL_SEG_NIC_INTERFACE_FULL_DRIVER:
                mlx5_core_warn(dev, "Expected to see disabled NIC but it is full driver\n");
                break;
 
-       case MLX5_NIC_IFC_DISABLED:
+       case MLX5_INITIAL_SEG_NIC_INTERFACE_DISABLED:
                mlx5_core_warn(dev, "starting teardown\n");
                break;
 
-       case MLX5_NIC_IFC_NO_DRAM_NIC:
+       case MLX5_INITIAL_SEG_NIC_INTERFACE_NO_DRAM_NIC:
                mlx5_core_warn(dev, "Expected to see disabled NIC but it is no dram nic\n");
                break;
 
-       case MLX5_NIC_IFC_SW_RESET:
+       case MLX5_INITIAL_SEG_NIC_INTERFACE_SW_RESET:
                /* The IFC mode field is 3 bits, so it will read 0x7 in 2 cases:
                 * 1. PCI has been disabled (ie. PCI-AER, PF driver unloaded
                 *    and this is a VF), this is not recoverable by SW reset.
                 *    Logging of this is handled elsewhere.
                 * 2. FW reset has been issued by another function, driver can
                 *    be reloaded to recover after the mode switches to
-                *    MLX5_NIC_IFC_DISABLED.
+                *    MLX5_INITIAL_SEG_NIC_INTERFACE_DISABLED.
                 */
                if (dev->priv.health.fatal_error != MLX5_SENSOR_PCI_COMM_ERR)
                        mlx5_core_warn(dev, "NIC SW reset in progress\n");

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
index a79b7959361b5c324ebecd50e7038c1941a87f9b..58732f44940f26280920cf8d9e1dbf770a4e1b68 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
@@ -312,13 +312,6 @@ static inline int mlx5_rescan_drivers(struct mlx5_core_dev *dev)
        return ret;
 }
 
-enum {
-       MLX5_NIC_IFC_FULL               = 0,
-       MLX5_NIC_IFC_DISABLED           = 1,
-       MLX5_NIC_IFC_NO_DRAM_NIC        = 2,
-       MLX5_NIC_IFC_SW_RESET           = 7
-};
-
 u8 mlx5_get_nic_state(struct mlx5_core_dev *dev);
 void mlx5_set_nic_state(struct mlx5_core_dev *dev, u8 state);
 

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 6c44f107b8ba7bb0e72dc7168a2b844b74e7cf38..7f5e846eb46df0ae55a9bed8304556335e4c744c 100644 (file)
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -10661,6 +10661,7 @@ enum {
        MLX5_INITIAL_SEG_NIC_INTERFACE_FULL_DRIVER  = 0x0,
        MLX5_INITIAL_SEG_NIC_INTERFACE_DISABLED     = 0x1,
        MLX5_INITIAL_SEG_NIC_INTERFACE_NO_DRAM_NIC  = 0x2,
+       MLX5_INITIAL_SEG_NIC_INTERFACE_SW_RESET     = 0x7,
 };
 
 enum {