Commit 7b261af9 authored by Vadim Pasternak's avatar Vadim Pasternak Committed by David S. Miller
Browse files

mlxsw: core: Add bus argument to environment init API 



Pass bus argument to mlxsw_env_init(). The purpose is to get access to
device handle, which is to be provided to error message in case of line
card activation failure.

Signed-off-by: default avatarVadim Pasternak <vadimp@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de28976d

drivers/net/ethernet/mellanox/mlxsw/core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2175,7 +2175,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
	if (err)

	if (err)

		goto err_thermal_init;

		goto err_thermal_init;





	err = mlxsw_env_init(mlxsw_core, &mlxsw_core->env);

	err = mlxsw_env_init(mlxsw_core, mlxsw_bus_info, &mlxsw_core->env);

	if (err)

	if (err)

		goto err_env_init;

		goto err_env_init;

drivers/net/ethernet/mellanox/mlxsw/core_env.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ struct mlxsw_env_line_card { 




struct mlxsw_env {

struct mlxsw_env {

	struct mlxsw_core *core;

	struct mlxsw_core *core;

	const struct mlxsw_bus_info *bus_info;

	u8 max_module_count; /* Maximum number of modules per-slot. */

	u8 max_module_count; /* Maximum number of modules per-slot. */

	u8 num_of_slots; /* Including the main board. */

	u8 num_of_slots; /* Including the main board. */

	struct mutex line_cards_lock; /* Protects line cards. */

	struct mutex line_cards_lock; /* Protects line cards. */
@@ -1194,7 +1195,9 @@ mlxsw_env_module_type_set(struct mlxsw_core *mlxsw_core, u8 slot_index) 
	return 0;

	return 0;

}

}





int mlxsw_env_init(struct mlxsw_core *mlxsw_core, struct mlxsw_env **p_env)

int mlxsw_env_init(struct mlxsw_core *mlxsw_core,

		   const struct mlxsw_bus_info *bus_info,

		   struct mlxsw_env **p_env)

{

{

	u8 module_count, num_of_slots, max_module_count;

	u8 module_count, num_of_slots, max_module_count;

	char mgpir_pl[MLXSW_REG_MGPIR_LEN];

	char mgpir_pl[MLXSW_REG_MGPIR_LEN];
@@ -1221,6 +1224,7 @@ int mlxsw_env_init(struct mlxsw_core *mlxsw_core, struct mlxsw_env **p_env) 
		return -ENOMEM;

		return -ENOMEM;





	env->core = mlxsw_core;

	env->core = mlxsw_core;

	env->bus_info = bus_info;

	env->num_of_slots = num_of_slots + 1;

	env->num_of_slots = num_of_slots + 1;

	env->max_module_count = max_module_count;

	env->max_module_count = max_module_count;

	err = mlxsw_env_line_cards_alloc(env);

	err = mlxsw_env_line_cards_alloc(env);

drivers/net/ethernet/mellanox/mlxsw/core_env.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,9 @@ int mlxsw_env_module_port_up(struct mlxsw_core *mlxsw_core, u8 slot_index, 
void mlxsw_env_module_port_down(struct mlxsw_core *mlxsw_core, u8 slot_index,

void mlxsw_env_module_port_down(struct mlxsw_core *mlxsw_core, u8 slot_index,

				u8 module);

				u8 module);





int mlxsw_env_init(struct mlxsw_core *core, struct mlxsw_env **p_env);

int mlxsw_env_init(struct mlxsw_core *core,

		   const struct mlxsw_bus_info *bus_info,

		   struct mlxsw_env **p_env);

void mlxsw_env_fini(struct mlxsw_env *env);

void mlxsw_env_fini(struct mlxsw_env *env);





#endif
 
#endif