svn commit: r347847 - stable/11/sys/dev/mlx5/mlx5_core

[Hans Petter Selasky]

Author: hselasky
Date: Thu May 16 17:59:43 2019
New Revision: 347847
URL: https://svnweb.freebsd.org/changeset/base/347847

Log:
  MFC r347292:
  Add mlx5_firmware_update() in mlx5core.
  Add support for upgrading firmware on mlx5 module load.
  
  Submitted by:	slavash@
  Sponsored by:	Mellanox Technologies

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

Modified: stable/11/sys/dev/mlx5/mlx5_core/mlx5_main.c
==============================================================================
--- stable/11/sys/dev/mlx5/mlx5_core/mlx5_main.c	Thu May 16 17:59:02 2019	(r347846)
+++ stable/11/sys/dev/mlx5/mlx5_core/mlx5_main.c	Thu May 16 17:59:43 2019	(r347847)
@@ -52,6 +52,7 @@ MODULE_DESCRIPTION("Mellanox Connect-IB, ConnectX-4 co
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_DEPEND(mlx5, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(mlx5, mlxfw, 1, 1, 1);
+MODULE_DEPEND(mlx5, firmware, 1, 1, 1);
 MODULE_VERSION(mlx5, 1);
 
 SYSCTL_NODE(_hw, OID_AUTO, mlx5, CTLFLAG_RW, 0, "mlx5 hardware controls");
@@ -820,6 +821,23 @@ void *mlx5_get_protocol_dev(struct mlx5_core_dev *mdev
 }
 EXPORT_SYMBOL(mlx5_get_protocol_dev);
 
+static int
+mlx5_firmware_update(struct mlx5_core_dev *dev)
+{
+	const struct firmware *fw;
+	int err;
+
+	fw = firmware_get("mlx5fw_mfa");
+	if (fw) {
+		err = mlx5_firmware_flash(dev, fw);
+		firmware_put(fw, FIRMWARE_UNLOAD);
+	}
+	else
+		return (-ENOENT);
+
+	return err;
+}
+
 static int mlx5_pci_init(struct mlx5_core_dev *dev, struct mlx5_priv *priv)
 {
 	struct pci_dev *pdev = dev->pdev;
@@ -1256,6 +1274,8 @@ static int init_one(struct pci_dev *pdev,
 	}
 
 	mlx5_fwdump_prep(dev);
+
+	mlx5_firmware_update(dev);
 
 	pci_save_state(bsddev);
 	return 0;