mlx5/mlx4: Bump driver version to 3.7

While at it only output driver version to dmesg(8) when hardware is present.

Differential Revision:	https://reviews.freebsd.org/D29100
MFC after:	1 week
Reviewed by:	kib and markj
Sponsored by:	NVIDIA Networking

4 files changed, 6 insertions, 39 deletions

diff --git a/sys/dev/mlx5/mlx5_core/mlx5_core.h b/sys/dev/mlx5/mlx5_core/mlx5_core.h
index a7ce1b31641c..f30f307b04a8 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_core.h
+++ b/sys/dev/mlx5/mlx5_core/mlx5_core.h
@@ -36,9 +36,9 @@
 
 #define DRIVER_NAME "mlx5_core"
 #ifndef DRIVER_VERSION
-#define DRIVER_VERSION "3.6.0"
+#define DRIVER_VERSION "3.7.0"
 #endif
-#define DRIVER_RELDATE "December 2020"
+#define DRIVER_RELDATE "July 2021"
 
 extern int mlx5_core_debug_mask;
 
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c
index 7527af524456..5830d4510d7b 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_main.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2013-2020, Mellanox Technologies, Ltd.  All rights reserved.
+ * Copyright (c) 2013-2021, Mellanox Technologies, Ltd.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -55,8 +55,7 @@
 
 static const char mlx5_version[] = "Mellanox Core driver "
 	DRIVER_VERSION " (" DRIVER_RELDATE ")";
-MODULE_AUTHOR("Eli Cohen <eli@mellanox.com>");
-MODULE_DESCRIPTION("Mellanox Connect-IB, ConnectX-4 core driver");
+MODULE_DESCRIPTION("Mellanox ConnectX-4 and onwards core driver");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_DEPEND(mlx5, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(mlx5, mlxfw, 1, 1, 1);
@@ -1317,6 +1316,8 @@ static int init_one(struct pci_dev *pdev,
 	struct sysctl_oid *current_cap_sysctl_node;
 	struct sysctl_oid *max_cap_sysctl_node;
 
+	printk_once("mlx5: %s", mlx5_version);
+
 	numa_node = dev_to_node(&pdev->dev);
 
 	dev = kzalloc_node(sizeof(*dev), GFP_KERNEL, numa_node);
diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
index 514eefc613a7..40e0d2b0c342 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
@@ -35,14 +35,6 @@
 
 #include <net/debugnet.h>
 
-#ifndef ETH_DRIVER_VERSION
-#define	ETH_DRIVER_VERSION	"3.6.0"
-#endif
-#define DRIVER_RELDATE	"December 2020"
-
-static const char mlx5e_version[] = "mlx5en: Mellanox Ethernet driver "
-	ETH_DRIVER_VERSION " (" DRIVER_RELDATE ")\n";
-
 static int mlx5e_get_wqe_sz(struct mlx5e_priv *priv, u32 *wqe_sz, u32 *nsegs);
 
 struct mlx5e_channel_param {
@@ -4910,14 +4902,6 @@ mlx5e_cleanup(void)
 	mlx5_unregister_interface(&mlx5e_interface);
 }
 
-static void
-mlx5e_show_version(void __unused *arg)
-{
-
-	printf("%s", mlx5e_version);
-}
-SYSINIT(mlx5e_show_version, SI_SUB_DRIVERS, SI_ORDER_ANY, mlx5e_show_version, NULL);
-
 module_init_order(mlx5e_init, SI_ORDER_SIXTH);
 module_exit_order(mlx5e_cleanup, SI_ORDER_SIXTH);
 
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
index 641fc7bce2d5..9a3fdc4df89e 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
@@ -51,12 +51,6 @@
 #include <dev/mlx5/fs.h>
 #include "mlx5_ib.h"
 
-#define DRIVER_NAME "mlx5ib"
-#ifndef DRIVER_VERSION
-#define DRIVER_VERSION "3.6.0"
-#endif
-#define DRIVER_RELDATE	"December 2020"
-
 MODULE_DESCRIPTION("Mellanox Connect-IB HCA IB driver");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_DEPEND(mlx5ib, linuxkpi, 1, 1, 1);
@@ -64,10 +58,6 @@ MODULE_DEPEND(mlx5ib, mlx5, 1, 1, 1);
 MODULE_DEPEND(mlx5ib, ibcore, 1, 1, 1);
 MODULE_VERSION(mlx5ib, 1);
 
-static const char mlx5_version[] =
-	DRIVER_NAME ": Mellanox Connect-IB Infiniband driver "
-	DRIVER_VERSION " (" DRIVER_RELDATE ")\n";
-
 enum {
 	MLX5_ATOMIC_SIZE_QP_8BYTES = 1 << 3,
 };
@@ -3573,13 +3563,5 @@ static void __exit mlx5_ib_cleanup(void)
 	mlx5_ib_odp_cleanup();
 }
 
-static void
-mlx5_ib_show_version(void __unused *arg)
-{
-
-	printf("%s", mlx5_version);
-}
-SYSINIT(mlx5_ib_show_version, SI_SUB_DRIVERS, SI_ORDER_ANY, mlx5_ib_show_version, NULL);
-
 module_init_order(mlx5_ib_init, SI_ORDER_SEVENTH);
 module_exit_order(mlx5_ib_cleanup, SI_ORDER_SEVENTH);