Commit d344e553 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mlxsw-various-updates' 

Ido Schimmel says:

====================
mlxsw: Various updates

This patchset contains miscellaneous updates for mlxsw. No user visible
changes that I am aware of.

Patches #1-#5 rework registration of internal traps in preparation of
line cards support.

Patch #6 improves driver resilience against a misbehaving device.

Patch #7 prevents the driver from overwriting device internal actions.
See the commit message for more details.
====================

Link: https://lore.kernel.org/r/20220127090226.283442-1-idosch@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3268ee8f ef14c298

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

+68 −7
Original line number Diff line number Diff line
@@ -212,6 +212,29 @@ struct mlxsw_event_listener_item { 
	void *priv;

};



static const u8 mlxsw_core_trap_groups[] = {

	MLXSW_REG_HTGT_TRAP_GROUP_EMAD,

	MLXSW_REG_HTGT_TRAP_GROUP_CORE_EVENT,

};



static int mlxsw_core_trap_groups_set(struct mlxsw_core *mlxsw_core)

{

	char htgt_pl[MLXSW_REG_HTGT_LEN];

	int err;

	int i;



	for (i = 0; i < ARRAY_SIZE(mlxsw_core_trap_groups); i++) {

		mlxsw_reg_htgt_pack(htgt_pl, mlxsw_core_trap_groups[i],

				    MLXSW_REG_HTGT_INVALID_POLICER,

				    MLXSW_REG_HTGT_DEFAULT_PRIORITY,

				    MLXSW_REG_HTGT_DEFAULT_TC);

		err = mlxsw_reg_write(mlxsw_core, MLXSW_REG(htgt), htgt_pl);

		if (err)

			return err;

	}

	return 0;

}



/******************

 * EMAD processing

 ******************/
@@ -777,16 +800,10 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core) 
	if (err)

		goto err_trap_register;



	err = mlxsw_core->driver->basic_trap_groups_set(mlxsw_core);

	if (err)

		goto err_emad_trap_set;

	mlxsw_core->emad.use_emad = true;



	return 0;



err_emad_trap_set:

	mlxsw_core_trap_unregister(mlxsw_core, &mlxsw_emad_rx_listener,

				   mlxsw_core);

err_trap_register:

	destroy_workqueue(mlxsw_core->emad_wq);

	return err;
@@ -1706,7 +1723,7 @@ static void mlxsw_core_health_listener_func(const struct mlxsw_reg_info *reg, 
}



static const struct mlxsw_listener mlxsw_core_health_listener =

	MLXSW_EVENTL(mlxsw_core_health_listener_func, MFDE, MFDE);

	MLXSW_CORE_EVENTL(mlxsw_core_health_listener_func, MFDE);



static int

mlxsw_core_health_fw_fatal_dump_fatal_cause(const char *mfde_pl,
@@ -2122,6 +2139,10 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
		}

	}



	err = mlxsw_core_trap_groups_set(mlxsw_core);

	if (err)

		goto err_trap_groups_set;



	err = mlxsw_emad_init(mlxsw_core);

	if (err)

		goto err_emad_init;
@@ -2181,6 +2202,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
err_register_params:

	mlxsw_emad_fini(mlxsw_core);

err_emad_init:

err_trap_groups_set:

	kfree(mlxsw_core->lag.mapping);

err_alloc_lag_mapping:

	mlxsw_ports_fini(mlxsw_core, reload);
@@ -2540,6 +2562,45 @@ void mlxsw_core_trap_unregister(struct mlxsw_core *mlxsw_core, 
}

EXPORT_SYMBOL(mlxsw_core_trap_unregister);



int mlxsw_core_traps_register(struct mlxsw_core *mlxsw_core,

			      const struct mlxsw_listener *listeners,

			      size_t listeners_count, void *priv)

{

	int i, err;



	for (i = 0; i < listeners_count; i++) {

		err = mlxsw_core_trap_register(mlxsw_core,

					       &listeners[i],

					       priv);

		if (err)

			goto err_listener_register;

	}

	return 0;



err_listener_register:

	for (i--; i >= 0; i--) {

		mlxsw_core_trap_unregister(mlxsw_core,

					   &listeners[i],

					   priv);

	}

	return err;

}

EXPORT_SYMBOL(mlxsw_core_traps_register);



void mlxsw_core_traps_unregister(struct mlxsw_core *mlxsw_core,

				 const struct mlxsw_listener *listeners,

				 size_t listeners_count, void *priv)

{

	int i;



	for (i = 0; i < listeners_count; i++) {

		mlxsw_core_trap_unregister(mlxsw_core,

					   &listeners[i],

					   priv);

	}

}

EXPORT_SYMBOL(mlxsw_core_traps_unregister);



int mlxsw_core_trap_state_set(struct mlxsw_core *mlxsw_core,

			      const struct mlxsw_listener *listener,

			      bool enabled)

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

+9 −1
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ struct mlxsw_listener { 
		.enabled_on_register = true,					\

	}



#define MLXSW_CORE_EVENTL(_func, _trap_id)		\

	MLXSW_EVENTL(_func, _trap_id, CORE_EVENT)



int mlxsw_core_rx_listener_register(struct mlxsw_core *mlxsw_core,

				    const struct mlxsw_rx_listener *rxl,

				    void *priv, bool enabled);
@@ -181,6 +184,12 @@ int mlxsw_core_trap_register(struct mlxsw_core *mlxsw_core, 
void mlxsw_core_trap_unregister(struct mlxsw_core *mlxsw_core,

				const struct mlxsw_listener *listener,

				void *priv);

int mlxsw_core_traps_register(struct mlxsw_core *mlxsw_core,

			      const struct mlxsw_listener *listeners,

			      size_t listeners_count, void *priv);

void mlxsw_core_traps_unregister(struct mlxsw_core *mlxsw_core,

				 const struct mlxsw_listener *listeners,

				 size_t listeners_count, void *priv);

int mlxsw_core_trap_state_set(struct mlxsw_core *mlxsw_core,

			      const struct mlxsw_listener *listener,

			      bool enabled);
@@ -315,7 +324,6 @@ struct mlxsw_driver { 
		    const struct mlxsw_bus_info *mlxsw_bus_info,

		    struct netlink_ext_ack *extack);

	void (*fini)(struct mlxsw_core *mlxsw_core);

	int (*basic_trap_groups_set)(struct mlxsw_core *mlxsw_core);

	int (*port_type_set)(struct mlxsw_core *mlxsw_core, u16 local_port,

			     enum devlink_port_type new_type);

	int (*port_split)(struct mlxsw_core *mlxsw_core, u16 local_port,

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

+2 −2
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ mlxsw_env_mtwe_listener_func(const struct mlxsw_reg_info *reg, char *mtwe_pl, 
}



static const struct mlxsw_listener mlxsw_env_temp_warn_listener =

	MLXSW_EVENTL(mlxsw_env_mtwe_listener_func, MTWE, MTWE);

	MLXSW_CORE_EVENTL(mlxsw_env_mtwe_listener_func, MTWE);



static int mlxsw_env_temp_warn_event_register(struct mlxsw_core *mlxsw_core)

{
@@ -915,7 +915,7 @@ mlxsw_env_pmpe_listener_func(const struct mlxsw_reg_info *reg, char *pmpe_pl, 
}



static const struct mlxsw_listener mlxsw_env_module_plug_listener =

	MLXSW_EVENTL(mlxsw_env_pmpe_listener_func, PMPE, PMPE);

	MLXSW_CORE_EVENTL(mlxsw_env_pmpe_listener_func, PMPE);



static int

mlxsw_env_module_plug_event_register(struct mlxsw_core *mlxsw_core)

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

+1 −3
Original line number Diff line number Diff line
@@ -6141,9 +6141,7 @@ MLXSW_ITEM32(reg, htgt, type, 0x00, 8, 4); 


enum mlxsw_reg_htgt_trap_group {

	MLXSW_REG_HTGT_TRAP_GROUP_EMAD,

	MLXSW_REG_HTGT_TRAP_GROUP_MFDE,

	MLXSW_REG_HTGT_TRAP_GROUP_MTWE,

	MLXSW_REG_HTGT_TRAP_GROUP_PMPE,

	MLXSW_REG_HTGT_TRAP_GROUP_CORE_EVENT,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_STP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_LACP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_LLDP,

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

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ enum mlxsw_res_id { 
	MLXSW_RES_ID_ACL_MAX_REGIONS,

	MLXSW_RES_ID_ACL_MAX_GROUPS,

	MLXSW_RES_ID_ACL_MAX_GROUP_SIZE,

	MLXSW_RES_ID_ACL_MAX_DEFAULT_ACTIONS,

	MLXSW_RES_ID_ACL_FLEX_KEYS,

	MLXSW_RES_ID_ACL_MAX_ACTION_PER_RULE,

	MLXSW_RES_ID_ACL_ACTIONS_PER_SET,
@@ -90,6 +91,7 @@ static u16 mlxsw_res_ids[] = { 
	[MLXSW_RES_ID_ACL_MAX_REGIONS] = 0x2903,

	[MLXSW_RES_ID_ACL_MAX_GROUPS] = 0x2904,

	[MLXSW_RES_ID_ACL_MAX_GROUP_SIZE] = 0x2905,

	[MLXSW_RES_ID_ACL_MAX_DEFAULT_ACTIONS] = 0x2908,

	[MLXSW_RES_ID_ACL_FLEX_KEYS] = 0x2910,

	[MLXSW_RES_ID_ACL_MAX_ACTION_PER_RULE] = 0x2911,

	[MLXSW_RES_ID_ACL_ACTIONS_PER_SET] = 0x2912,