Page MenuHomeFreeBSD
Files F107065518

D29100.diff
No OneTemporary
Actions

D29100.diff
View Options

diff --git a/sys/dev/mlx4/mlx4_core/mlx4.h b/sys/dev/mlx4/mlx4_core/mlx4.h
--- a/sys/dev/mlx4/mlx4_core/mlx4.h
+++ b/sys/dev/mlx4/mlx4_core/mlx4.h
@@ -54,9 +54,9 @@
#define DRV_NAME "mlx4_core"
#define PFX DRV_NAME ": "
#ifndef DRV_VERSION
-#define DRV_VERSION "3.6.0"
+#define DRV_VERSION "3.7.0"
#endif
-#define DRV_RELDATE "December 2020"
+#define DRV_RELDATE "July 2021"
#define MLX4_FS_UDP_UC_EN (1 << 1)
#define MLX4_FS_TCP_UC_EN (1 << 2)
diff --git a/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c b/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
--- a/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
+++ b/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
@@ -63,9 +63,9 @@
#define DRV_NAME MLX4_IB_DRV_NAME
#ifndef DRV_VERSION
-#define DRV_VERSION "3.6.0"
+#define DRV_VERSION "3.7.0"
#endif
-#define DRV_RELDATE "December 2020"
+#define DRV_RELDATE "July 2021"
#define MLX4_IB_FLOW_MAX_PRIO 0xFFF
#define MLX4_IB_FLOW_QPN_MASK 0xFFFFFF
diff --git a/sys/dev/mlx5/mlx5_core/mlx5_core.h b/sys/dev/mlx5/mlx5_core/mlx5_core.h
--- 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
--- 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 @@
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
--- 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 @@
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
--- 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, 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 @@
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);

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 10, 1:53 PM (14 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15743151
Default Alt Text
D29100.diff (4 KB)

Event Timeline