Commit 555af0c3 authored by Parav Pandit's avatar Parav Pandit Committed by Saeed Mahameed
Browse files

net/mlx5: Move iseg access helper routines close to mlx5_core driver 



Only mlx5_core driver handles fw initialization check and command
interface revision check.
Hence move them inside the mlx5_core driver where it is used.
This avoid exposing these helpers to all mlx5 drivers.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 356d411c

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

+5 −0
Original line number Diff line number Diff line
@@ -1890,6 +1890,11 @@ static void free_cmd_page(struct mlx5_core_dev *dev, struct mlx5_cmd *cmd) 
			  cmd->alloc_dma);

}



static u16 cmdif_rev(struct mlx5_core_dev *dev)

{

	return ioread32be(&dev->iseg->cmdif_rev_fw_sub) >> 16;

}



int mlx5_cmd_init(struct mlx5_core_dev *dev)

{

	int size = sizeof(struct mlx5_cmd_prot_block);

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

+5 −0
Original line number Diff line number Diff line
@@ -177,6 +177,11 @@ static struct mlx5_profile profile[] = { 
#define FW_PRE_INIT_TIMEOUT_MILI	120000

#define FW_INIT_WARN_MESSAGE_INTERVAL	20000



static int fw_initializing(struct mlx5_core_dev *dev)

{

	return ioread32be(&dev->iseg->initializing) >> 31;

}



static int wait_fw_init(struct mlx5_core_dev *dev, u32 max_wait_mili,

			u32 warn_time_mili)

{

include/linux/mlx5/driver.h

+0 −10
Original line number Diff line number Diff line
@@ -823,11 +823,6 @@ static inline u16 fw_rev_sub(struct mlx5_core_dev *dev) 
	return ioread32be(&dev->iseg->cmdif_rev_fw_sub) & 0xffff;

}



static inline u16 cmdif_rev(struct mlx5_core_dev *dev)

{

	return ioread32be(&dev->iseg->cmdif_rev_fw_sub) >> 16;

}



static inline u32 mlx5_base_mkey(const u32 key)

{

	return key & 0xffffff00u;
@@ -1012,11 +1007,6 @@ int mlx5_core_roce_gid_set(struct mlx5_core_dev *dev, unsigned int index, 
			   u8 roce_version, u8 roce_l3_type, const u8 *gid,

			   const u8 *mac, bool vlan, u16 vlan_id, u8 port_num);



static inline int fw_initializing(struct mlx5_core_dev *dev)

{

	return ioread32be(&dev->iseg->initializing) >> 31;

}



static inline u32 mlx5_mkey_to_idx(u32 mkey)

{

	return mkey >> 8;

CRA Git | Maintained and supported by SUSTech CRA and CCSE