Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5c9a705 authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by David S. Miller
Browse files

net/mlx4_core: Report driver version to FW 



If supported, write a driver version string to FW as part of the
INIT_HCA command.

Example of driver version: "Linux,mlx4_core,4.0-0"

Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a37fb855

drivers/net/ethernet/mellanox/mlx4/fw.c

+12 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ static void dump_dev_cap_flags2(struct mlx4_dev *dev, u64 flags) 
		[36] = "QinQ VST mode support",

		[37] = "sl to vl mapping table change event support",

		[38] = "user MAC support",

		[39] = "Report driver version to FW support",

	};

	int i;
@@ -1038,6 +1039,8 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_ETH_BACKPL_AN_REP;

	if (field32 & (1 << 7))

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_RECOVERABLE_ERROR_EVENT;

	if (field32 & (1 << 8))

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_DRIVER_VERSION_TO_FW;

	MLX4_GET(field32, outbox, QUERY_DEV_CAP_DIAG_RPRT_PER_PORT);

	if (field32 & (1 << 17))

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_DIAG_PER_PORT;
@@ -1860,6 +1863,8 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param) 
#define  INIT_HCA_UC_STEERING_OFFSET	 (INIT_HCA_MCAST_OFFSET + 0x18)

#define	 INIT_HCA_LOG_MC_TABLE_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x1b)

#define  INIT_HCA_DEVICE_MANAGED_FLOW_STEERING_EN	0x6

#define  INIT_HCA_DRIVER_VERSION_OFFSET   0x140

#define  INIT_HCA_DRIVER_VERSION_SZ       0x40

#define  INIT_HCA_FS_PARAM_OFFSET         0x1d0

#define  INIT_HCA_FS_BASE_OFFSET          (INIT_HCA_FS_PARAM_OFFSET + 0x00)

#define  INIT_HCA_FS_LOG_ENTRY_SZ_OFFSET  (INIT_HCA_FS_PARAM_OFFSET + 0x12)
@@ -1950,6 +1955,13 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param) 
	if (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_RECOVERABLE_ERROR_EVENT)

		*(inbox + INIT_HCA_RECOVERABLE_ERROR_EVENT_OFFSET / 4) |= cpu_to_be32(1 << 31);



	if (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_DRIVER_VERSION_TO_FW) {

		u8 *dst = (u8 *)(inbox + INIT_HCA_DRIVER_VERSION_OFFSET / 4);



		strncpy(dst, DRV_NAME_FOR_FW, INIT_HCA_DRIVER_VERSION_SZ - 1);

		mlx4_dbg(dev, "Reporting Driver Version to FW: %s\n", dst);

	}



	/* QPC/EEC/CQC/EQC/RDMARC attributes */



	MLX4_PUT(inbox, param->qpc_base,      INIT_HCA_QPC_BASE_OFFSET);

drivers/net/ethernet/mellanox/mlx4/mlx4.h

+1 −1
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ 
#include "fw_qos.h"



#define DRV_NAME	"mlx4_core"

#define PFX		DRV_NAME ": "

#define DRV_VERSION	"4.0-0"

#define DRV_NAME_FOR_FW		"Linux," DRV_NAME "," DRV_VERSION



#define MLX4_FS_UDP_UC_EN		(1 << 1)

#define MLX4_FS_TCP_UC_EN		(1 << 2)

include/linux/mlx4/device.h

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ enum { 
	MLX4_DEV_CAP_FLAG2_SVLAN_BY_QP          = 1ULL <<  36,

	MLX4_DEV_CAP_FLAG2_SL_TO_VL_CHANGE_EVENT = 1ULL << 37,

	MLX4_DEV_CAP_FLAG2_USER_MAC_EN		= 1ULL << 38,

	MLX4_DEV_CAP_FLAG2_DRIVER_VERSION_TO_FW = 1ULL << 39,

};



enum {