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

Commit c740f471 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Greg Kroah-Hartman
Browse files

net/mlx5_core: Clean driver version and name 



[ Upstream commit 17a7612b99e66d2539341ab4f888f970c2c7f76d ]

Remove exposed driver version as it was done in other drivers,
so module version will work correctly by displaying the kernel
version for which it is compiled.

And move mlx5_core module name to general include, so auxiliary drivers
will be able to use it as a basis for a name in their device ID tables.

Reviewed-by: default avatarParav Pandit <parav@nvidia.com>
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Stable-dep-of: 1b2bd0c0264f ("net/mlx5e: Check return value of snprintf writing to fw_version buffer for representors")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e4bdbcce

drivers/net/ethernet/mellanox/mlx5/core/devlink.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ mlx5_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, 
	u32 running_fw, stored_fw;

	int err;



	err = devlink_info_driver_name_put(req, DRIVER_NAME);

	err = devlink_info_driver_name_put(req, KBUILD_MODNAME);

	if (err)

		return err;

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

+1 −3
Original line number Diff line number Diff line
@@ -40,9 +40,7 @@ void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv, 
{

	struct mlx5_core_dev *mdev = priv->mdev;



	strlcpy(drvinfo->driver, DRIVER_NAME, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, DRIVER_VERSION,

		sizeof(drvinfo->version));

	strlcpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));

	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),

		 "%d.%d.%04d (%.16s)",

		 fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev),

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ static void mlx5e_rep_get_drvinfo(struct net_device *dev, 


	strlcpy(drvinfo->driver, mlx5e_rep_driver_name,

		sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version));

	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),

		 "%d.%d.%04d (%.16s)",

		 fw_rev_maj(mdev), fw_rev_min(mdev),

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static void mlx5i_get_drvinfo(struct net_device *dev, 
	struct mlx5e_priv *priv = mlx5i_epriv(dev);



	mlx5e_ethtool_get_drvinfo(priv, drvinfo);

	strlcpy(drvinfo->driver, DRIVER_NAME "[ib_ipoib]",

	strlcpy(drvinfo->driver, KBUILD_MODNAME "[ib_ipoib]",

		sizeof(drvinfo->driver));

}

drivers/net/ethernet/mellanox/mlx5/core/main.c

+6 −4
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ 
MODULE_AUTHOR("Eli Cohen <eli@mellanox.com>");

MODULE_DESCRIPTION("Mellanox 5th generation network adapters (ConnectX series) core driver");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_VERSION(DRIVER_VERSION);



unsigned int mlx5_core_debug_mask;

module_param_named(debug_mask, mlx5_core_debug_mask, uint, 0644);
@@ -222,7 +221,7 @@ static void mlx5_set_driver_version(struct mlx5_core_dev *dev) 
	strncat(string, ",", remaining_size);



	remaining_size = max_t(int, 0, driver_ver_sz - strlen(string));

	strncat(string, DRIVER_NAME, remaining_size);

	strncat(string, KBUILD_MODNAME, remaining_size);



	remaining_size = max_t(int, 0, driver_ver_sz - strlen(string));

	strncat(string, ",", remaining_size);
@@ -307,7 +306,7 @@ static int request_bar(struct pci_dev *pdev) 
		return -ENODEV;

	}



	err = pci_request_regions(pdev, DRIVER_NAME);

	err = pci_request_regions(pdev, KBUILD_MODNAME);

	if (err)

		dev_err(&pdev->dev, "Couldn't get PCI resources, aborting\n");
@@ -1618,7 +1617,7 @@ void mlx5_recover_device(struct mlx5_core_dev *dev) 
}



static struct pci_driver mlx5_core_driver = {

	.name           = DRIVER_NAME,

	.name           = KBUILD_MODNAME,

	.id_table       = mlx5_core_pci_table,

	.probe          = init_one,

	.remove         = remove_one,
@@ -1644,6 +1643,9 @@ static int __init mlx5_init(void) 
{

	int err;



	WARN_ONCE(strcmp(MLX5_ADEV_NAME, KBUILD_MODNAME),

		  "mlx5_core name not in sync with kernel module name");



	get_random_bytes(&sw_owner_id, sizeof(sw_owner_id));



	mlx5_core_verify_params();