net/mlx5: Allow sync reset flow when BF MGT interface device is present

In sync reset flow, PF is checking that only devices of same device ID
as itself present on the PCIe bridge, otherwise it will NACK the reset.
Since the PCIe bridge connection to NIC card has to be 1 to 1, this is
valid.

However, the BlueField device may also expose another sub-device to the
PCI called management interface, which only provides an ethernet channel
between the host and the smart NIC.

Allow sync reset flow also when management interface sub-device present
when checking devices on the PCIe bridge.

Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
index b568988e92e3e95985683f79b8c5fdf601d13d5a..4b8cb120362b44c80af48a83c9b28a3734160ff0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
@@ -325,6 +325,25 @@ static void mlx5_fw_live_patch_event(struct work_struct *work)
                mlx5_core_err(dev, "Failed to reload FW tracer\n");
 }
 
+static const struct pci_device_id mgt_ifc_device_ids[] = {
+       { PCI_VDEVICE(MELLANOX, 0xc2d2) }, /* BlueField1 MGT interface device ID */
+       { PCI_VDEVICE(MELLANOX, 0xc2d3) }, /* BlueField2 MGT interface device ID */
+       { PCI_VDEVICE(MELLANOX, 0xc2d4) }, /* BlueField3-Lx MGT interface device ID */
+       { PCI_VDEVICE(MELLANOX, 0xc2d5) }, /* BlueField3 MGT interface device ID */
+       { PCI_VDEVICE(MELLANOX, 0xc2d6) }, /* BlueField4 MGT interface device ID */
+};
+
+static bool mlx5_is_mgt_ifc_pci_device(struct mlx5_core_dev *dev, u16 dev_id)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(mgt_ifc_device_ids); ++i)
+               if (mgt_ifc_device_ids[i].device == dev_id)
+                       return true;
+
+       return false;
+}
+
 static int mlx5_check_dev_ids(struct mlx5_core_dev *dev, u16 dev_id)
 {
        struct pci_bus *bridge_bus = dev->pdev->bus;
@@ -339,10 +358,15 @@ static int mlx5_check_dev_ids(struct mlx5_core_dev *dev, u16 dev_id)
                err = pci_read_config_word(sdev, PCI_DEVICE_ID, &sdev_id);
                if (err)
                        return pcibios_err_to_errno(err);
-               if (sdev_id != dev_id) {
-                       mlx5_core_warn(dev, "unrecognized dev_id (0x%x)\n", sdev_id);
-                       return -EPERM;
-               }
+
+               if (sdev_id == dev_id)
+                       continue;
+
+               if (mlx5_is_mgt_ifc_pci_device(dev, sdev_id))
+                       continue;
+
+               mlx5_core_warn(dev, "unrecognized dev_id (0x%x)\n", sdev_id);
+               return -EPERM;
        }
        return 0;
 }