mlxsw: Introduce fw_fatal health reporter and test cmd to trigger test event
Subsystems (4)
cover mlxsw: Introduce fw_fatal health reporter and test cmd to trigger test event
From: Ido Schimmel <[email protected]>
Jiri says:
This patch set introduces a health reporter for mlxsw that reports FW fatal events. Alongside that, it introduces a test command that is used to trigger a dummy FW fatal event by user:
$ sudo devlink health test pci/0000:03:00.0 reporter fw_fatal
$ devlink health
pci/0000:03:00.0:
reporter fw_fatal
state error error 1 recover 0 last_dump_date 2020-07-27 last_dump_time 16:33:27 auto_dump true$ sudo devlink health dump show pci/0000:03:00.0 reporter fw_fatal -j -p
{
"irisc_id": 0,
"event": [
"id": 3 ],
"method": "query",
"long_process": false,
"command_type": "mad",
"reg_attr_id": 0
}As a dependency, the FW validation and flashing is moved to core.c.
Jiri Pirko (8):
mlxsw: Bump firmware version to XX.2008.1310
mlxsw: Move fw flashing code into core.c
mlxsw: core: Push code doing params register/unregister into separate
helpers
mlxsw: Move fw_load_policy devlink param into core.c
mlxsw: reg: Add Monitoring FW Debug Register
mlxsw: reg: Add Monitoring FW General Debug Register
devlink: introduce the health reporter test command
mlxsw: core: Introduce fw_fatal health reporter
drivers/net/ethernet/mellanox/mlxsw/core.c | 605 +++++++++++++++++- drivers/net/ethernet/mellanox/mlxsw/core.h | 9 +- drivers/net/ethernet/mellanox/mlxsw/reg.h | 101 +++ .../net/ethernet/mellanox/mlxsw/spectrum.c | 371 +---------- .../net/ethernet/mellanox/mlxsw/spectrum.h | 2 - drivers/net/ethernet/mellanox/mlxsw/trap.h | 2 + include/net/devlink.h | 3 + include/uapi/linux/devlink.h | 2 + net/core/devlink.c | 30 + 9 files changed, 742 insertions(+), 383 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/8 mlxsw: Bump firmware version to XX.2008.1310
From: Jiri Pirko <[email protected]>
Among other changes, this version supports FW monitoring.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +6 -6
@@ -45,8 +45,8 @@#include "../mlxfw/mlxfw.h" #define MLXSW_SP1_FWREV_MAJOR 13 -#define MLXSW_SP1_FWREV_MINOR 2007 -#define MLXSW_SP1_FWREV_SUBMINOR 1168 +#define MLXSW_SP1_FWREV_MINOR 2008 +#define MLXSW_SP1_FWREV_SUBMINOR 1310#define MLXSW_SP1_FWREV_CAN_RESET_MINOR 1702static const struct mlxsw_fw_rev mlxsw_sp1_fw_rev = {
@@ -62,8 +62,8 @@ static const struct mlxsw_fw_rev mlxsw_sp1_fw_rev = { "." __stringify(MLXSW_SP1_FWREV_SUBMINOR) ".mfa2"#define MLXSW_SP2_FWREV_MAJOR 29 -#define MLXSW_SP2_FWREV_MINOR 2007 -#define MLXSW_SP2_FWREV_SUBMINOR 1168 +#define MLXSW_SP2_FWREV_MINOR 2008 +#define MLXSW_SP2_FWREV_SUBMINOR 1310static const struct mlxsw_fw_rev mlxsw_sp2_fw_rev = { .major =MLXSW_SP2_FWREV_MAJOR ,
@@ -77,8 +77,8 @@ static const struct mlxsw_fw_rev mlxsw_sp2_fw_rev = { "." __stringify(MLXSW_SP2_FWREV_SUBMINOR) ".mfa2"#define MLXSW_SP3_FWREV_MAJOR 30 -#define MLXSW_SP3_FWREV_MINOR 2007 -#define MLXSW_SP3_FWREV_SUBMINOR 1168 +#define MLXSW_SP3_FWREV_MINOR 2008 +#define MLXSW_SP3_FWREV_SUBMINOR 1310static const struct mlxsw_fw_rev mlxsw_sp3_fw_rev = { .major =MLXSW_SP3_FWREV_MAJOR ,
Signature · 1 line
2.26.2
PATCH 2/8 mlxsw: Move fw flashing code into core.c
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
As the firmware flashing is not specific to Spectrum, move the code to core.c and avoid one op call and 2 exported symbols. Also, this allows to do flash before call of driver->init function and possibly do other core calls in between.
Do some small renaming here and there on the way to be consistent with the rest of core.c code.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 277 +++++++++++++++-- drivers/net/ethernet/mellanox/mlxsw/core.h | 8 +- .../net/ethernet/mellanox/mlxsw/spectrum.c | 288 +----------------- .../net/ethernet/mellanox/mlxsw/spectrum.h | 2 - 4 files changed, 268 insertions(+), 307 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +260 -17
@@ -20,6 +20,7 @@#include <linux/rcupdate.h> #include <linux/slab.h> #include <linux/workqueue.h> +#include <linux/firmware.h> #include <asm/byteorder.h> #include <net/devlink.h> #include <trace/events/devlink.h>
@@ -32,6 +33,7 @@#include "emad.h" #include "reg.h" #include "resources.h" +#include "../mlxfw/mlxfw.h" static LIST_HEAD (mlxsw_core_driver_list);static DEFINE_SPINLOCK (mlxsw_core_driver_list_lock);
@@ -864,6 +866,257 @@ static struct mlxsw_driver *mlxsw_core_driver_get(const char *kind)return mlxsw_driver; } +struct mlxsw_core_fw_info { +struct mlxfw_dev mlxfw_dev; +struct mlxsw_core *mlxsw_core; +}; + +static int mlxsw_core_fw_component_query (struct mlxfw_dev *mlxfw_dev, +u16 component_index,u32 *p_max_size, +u8 *p_align_bits,u16 *p_max_write_size) +{ +struct mlxsw_core_fw_info *mlxsw_core_fw_info = + container_of(mlxfw_dev, struct mlxsw_core_fw_info, mlxfw_dev); +struct mlxsw_core *mlxsw_core = mlxsw_core_fw_info->mlxsw_core; +char mcqi_pl[MLXSW_REG_MCQI_LEN ]; +int err; + +mlxsw_reg_mcqi_pack (mcqi_pl, component_index); + err =mlxsw_reg_query (mlxsw_core,MLXSW_REG (mcqi), mcqi_pl); +if (err) +return err; +mlxsw_reg_mcqi_unpack (mcqi_pl, p_max_size, p_align_bits, p_max_write_size); + + *p_align_bits =max_t (u8, *p_align_bits,2 ); + *p_max_write_size =min_t (u16, *p_max_write_size,MLXSW_REG_MCDA_MAX_DATA_LEN ); +return 0 ; +} + +static int mlxsw_core_fw_fsm_lock (struct mlxfw_dev *mlxfw_dev,u32 *fwhandle) +{ +struct mlxsw_core_fw_info *mlxsw_core_fw_info = + container_of(mlxfw_dev, struct mlxsw_core_fw_info, mlxfw_dev); +struct mlxsw_core *mlxsw_core = mlxsw_core_fw_info->mlxsw_core; +char mcc_pl[MLXSW_REG_MCC_LEN ]; +u8 control_state; +int err; + +mlxsw_reg_mcc_pack (mcc_pl,0 ,0 ,0 ,0 ); + err =mlxsw_reg_query (mlxsw_core,MLXSW_REG (mcc), mcc_pl); +if (err) +return err; + +mlxsw_reg_mcc_unpack (mcc_pl, fwhandle,NULL , &control_state); +if (control_state !=MLXFW_FSM_STATE_IDLE ) +return -EBUSY ; + +mlxsw_reg_mcc_pack (mcc_pl,MLXSW_REG_MCC_INSTRUCTION_LOCK_UPDATE_HANDLE ,0 , *fwhandle,0 ); +return mlxsw_reg_write (mlxsw_core,MLXSW_REG (mcc), mcc_pl); +} + +static int mlxsw_core_fw_fsm_component_update (struct mlxfw_dev *mlxfw_dev,u32 fwhandle, +u16 component_index,u32 component_size) +{ +struct mlxsw_core_fw_info *mlxsw_core_fw_info = + container_of(mlxfw_dev, struct mlxsw_core_fw_info, mlxfw_dev); +struct mlxsw_core *mlxsw_core = mlxsw_core_fw_info->mlxsw_core; +char mcc_pl[MLXSW_REG_MCC_LEN ]; + +mlxsw_reg_mcc_pack (mcc_pl,MLXSW_REG_MCC_INSTRUCTION_UPDATE_COMPONENT , + component_index, fwhandle, component_size); +return mlxsw_reg_write (mlxsw_core,MLXSW_REG (mcc), mcc_pl); +} + +static int mlxsw_core_fw_fsm_block_download (struct mlxfw_dev *mlxfw_dev,u32 fwhandle, +u8 *data,u16 size,u32 offset) +{ +struct mlxsw_core_fw_info *mlxsw_core_fw_info = + container_of(mlxfw_dev, struct mlxsw_core_fw_info, mlxfw_dev); +struct mlxsw_core *mlxsw_core = mlxsw_core_fw_info->mlxsw_core; +char mcda_pl[MLXSW_REG_MCDA_LEN ]; + +mlxsw_reg_mcda_pack (mcda_pl, fwhandle, offset, size, data); +return mlxsw_reg_write (mlxsw_core,MLXSW_REG (mcda), mcda_pl); +} + +static int mlxsw_core_fw_fsm_component_verify (struct mlxfw_dev *mlxfw_dev,u32 fwhandle, +u16 component_index) +{ +struct mlxsw_core_fw_info *mlxsw_core_fw_info = + container_of(mlxfw_dev, struct mlxsw_core_fw_info, mlxfw_dev); +struct mlxsw_core *mlxsw_core = mlxsw_core_fw_info->mlxsw_core; +char mcc_pl[MLXSW_REG_MCC_LEN ]; + +mlxsw_reg_mcc_pack (mcc_pl,MLXSW_REG_MCC_INSTRUCTION_VERIFY_COMPONENT , + component_index, fwhandle,0 ); +return mlxsw_reg_write (mlxsw_core,MLXSW_REG (mcc), mcc_pl); +} + +static int mlxsw_core_fw_fsm_activate (struct mlxfw_dev *mlxfw_dev,u32 fwhandle) +{ +struct mlxsw_core_fw_info *mlxsw_core_fw_info = + container_of(mlxfw_dev, struct mlxsw_core_fw_info, mlxfw_dev); +struct mlxsw_core *mlxsw_core = mlxsw_core_fw_info->mlxsw_core; +char mcc_pl[MLXSW_REG_MCC_LEN ]; + +mlxsw_reg_mcc_pack (mcc_pl,MLXSW_REG_MCC_INSTRUCTION_ACTIVATE ,0 , fwhandle,0 ); +return mlxsw_reg_write (mlxsw_core,MLXSW_REG (mcc), mcc_pl); +} + +static int mlxsw_core_fw_fsm_query_state (struct mlxfw_dev *mlxfw_dev,u32 fwhandle, +enum mlxfw_fsm_state *fsm_state, +enum mlxfw_fsm_state_err *fsm_state_err) +{ +struct mlxsw_core_fw_info *mlxsw_core_fw_info = + container_of(mlxfw_dev, struct mlxsw_core_fw_info, mlxfw_dev); +struct mlxsw_core *mlxsw_core = mlxsw_core_fw_info->mlxsw_core; +char mcc_pl[MLXSW_REG_MCC_LEN ]; +u8 control_state; +u8 error_code; +int err; + +mlxsw_reg_mcc_pack (mcc_pl,0 ,0 , fwhandle,0 ); + err =mlxsw_reg_query (mlxsw_core,MLXSW_REG (mcc), mcc_pl); +if (err) +return err; + +mlxsw_reg_mcc_unpack (mcc_pl,NULL , &error_code, &control_state); + *fsm_state = control_state; + *fsm_state_err = min_t(enum mlxfw_fsm_state_err, error_code, MLXFW_FSM_STATE_ERR_MAX); +return 0 ; +} + +static void mlxsw_core_fw_fsm_cancel (struct mlxfw_dev *mlxfw_dev,u32 fwhandle) +{ +struct mlxsw_core_fw_info *mlxsw_core_fw_info = + container_of(mlxfw_dev, struct mlxsw_core_fw_info, mlxfw_dev); +struct mlxsw_core *mlxsw_core = mlxsw_core_fw_info->mlxsw_core; +char mcc_pl[MLXSW_REG_MCC_LEN ]; + +mlxsw_reg_mcc_pack (mcc_pl,MLXSW_REG_MCC_INSTRUCTION_CANCEL ,0 , fwhandle,0 ); +mlxsw_reg_write (mlxsw_core,MLXSW_REG (mcc), mcc_pl); +} + +static void mlxsw_core_fw_fsm_release (struct mlxfw_dev *mlxfw_dev,u32 fwhandle) +{ +struct mlxsw_core_fw_info *mlxsw_core_fw_info = + container_of(mlxfw_dev, struct mlxsw_core_fw_info, mlxfw_dev); +struct mlxsw_core *mlxsw_core = mlxsw_core_fw_info->mlxsw_core; +char mcc_pl[MLXSW_REG_MCC_LEN ]; + +mlxsw_reg_mcc_pack (mcc_pl,MLXSW_REG_MCC_INSTRUCTION_RELEASE_UPDATE_HANDLE ,0 , fwhandle,0 ); +mlxsw_reg_write (mlxsw_core,MLXSW_REG (mcc), mcc_pl); +} + +static const struct mlxfw_dev_ops mlxsw_core_fw_mlxsw_dev_ops = { + .component_query = mlxsw_core_fw_component_query, + .fsm_lock = mlxsw_core_fw_fsm_lock, + .fsm_component_update = mlxsw_core_fw_fsm_component_update, + .fsm_block_download = mlxsw_core_fw_fsm_block_download, + .fsm_component_verify = mlxsw_core_fw_fsm_component_verify, + .fsm_activate = mlxsw_core_fw_fsm_activate, + .fsm_query_state = mlxsw_core_fw_fsm_query_state, + .fsm_cancel = mlxsw_core_fw_fsm_cancel, + .fsm_release = mlxsw_core_fw_fsm_release, +}; + +static int mlxsw_core_fw_flash (struct mlxsw_core *mlxsw_core,const struct firmware *firmware, +struct netlink_ext_ack *extack) +{ +struct mlxsw_core_fw_info mlxsw_core_fw_info = { + .mlxfw_dev = { + .ops = &mlxsw_core_fw_mlxsw_dev_ops, + .psid = mlxsw_core->bus_info->psid, + .psid_size =strlen (mlxsw_core->bus_info->psid), + .devlink =priv_to_devlink (mlxsw_core), + }, + .mlxsw_core = mlxsw_core + }; +int err; + + mlxsw_core->fw_flash_in_progress = true; + err =mlxfw_firmware_flash (&mlxsw_core_fw_info.mlxfw_dev, firmware, extack); + mlxsw_core->fw_flash_in_progress = false; + +return err; +} + +static int mlxsw_core_fw_rev_validate (struct mlxsw_core *mlxsw_core, +const struct mlxsw_bus_info *mlxsw_bus_info, +const struct mlxsw_fw_rev *req_rev, +const char *filename) +{ +const struct mlxsw_fw_rev *rev = &mlxsw_bus_info->fw_rev; +union devlink_param_value value; +const struct firmware *firmware; +int err; + +/* Don't check if driver does not require it */ +if (!req_rev || !filename) +return 0 ; + +/* Don't check if devlink 'fw_load_policy' param is 'flash' */ + err =devlink_param_driverinit_value_get (priv_to_devlink (mlxsw_core), +DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY , + &value); +if (err) +return err; +if (value.vu8 ==DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH ) +return 0 ; + +/* Validate driver & FW are compatible */ +if (rev->major != req_rev->major) { +WARN (1 ,"Mismatch in major FW version [%d:%d] is never expected; Please contact support\n" , + rev->major, req_rev->major); +return -EINVAL ; + } +if (mlxsw_core_fw_rev_minor_subminor_validate (rev, req_rev)) +return 0 ; + +dev_err (mlxsw_bus_info->dev,"The firmware version %d.%d.%d is incompatible with the driver (required >= %d.%d.%d)\n" , + rev->major, rev->minor, rev->subminor, req_rev->major, + req_rev->minor, req_rev->subminor); +dev_info (mlxsw_bus_info->dev,"Flashing firmware using file %s\n" , filename); + + err =request_firmware_direct (&firmware, filename, mlxsw_bus_info->dev); +if (err) { +dev_err (mlxsw_bus_info->dev,"Could not request firmware file %s\n" , filename); +return err; + } + + err =mlxsw_core_fw_flash (mlxsw_core, firmware,NULL ); +release_firmware (firmware); +if (err) +dev_err (mlxsw_bus_info->dev,"Could not upgrade firmware\n" ); + +/* On FW flash success, tell the caller FW reset is needed +* if current FW supports it. +*/ +if (rev->minor >= req_rev->can_reset_minor) +return err ? err : -EAGAIN ; +else +return 0 ; +} + +static int mlxsw_core_fw_flash_update (struct mlxsw_core *mlxsw_core, +const char *file_name,const char *component, +struct netlink_ext_ack *extack) +{ +const struct firmware *firmware; +int err; + +if (component) +return -EOPNOTSUPP ; + + err =request_firmware_direct (&firmware, file_name, mlxsw_core->bus_info->dev); +if (err) +return err; + err =mlxsw_core_fw_flash (mlxsw_core, firmware, extack); +release_firmware (firmware); + +return err; +} + static int mlxsw_devlink_port_split(struct devlink *devlink, unsigned int port_index, unsigned int count,
@@ -1143,12 +1396,8 @@ static int mlxsw_devlink_flash_update(struct devlink *devlink, struct netlink_ext_ack *extack) {struct mlxsw_core *mlxsw_core =devlink_priv (devlink); -struct mlxsw_driver *mlxsw_driver = mlxsw_core->driver; -if (!mlxsw_driver->flash_update) -return -EOPNOTSUPP ; -return mlxsw_driver->flash_update (mlxsw_core, file_name, - component, extack); +return mlxsw_core_fw_flash_update (mlxsw_core, file_name, component, extack); } static int mlxsw_devlink_trap_init(struct devlink *devlink,
@@ -1374,6 +1623,11 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, goto err_register_params; } + err =mlxsw_core_fw_rev_validate (mlxsw_core, mlxsw_bus_info, mlxsw_driver->fw_req_rev, + mlxsw_driver->fw_filename); +if (err) + goto err_fw_rev_validate; +if (mlxsw_driver->init) { err = mlxsw_driver->init (mlxsw_core, mlxsw_bus_info, extack);if (err)
@@ -1403,6 +1657,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,if (mlxsw_core->driver->fini) mlxsw_core->driver->fini (mlxsw_core); err_driver_init: +err_fw_rev_validate:if (mlxsw_driver->params_unregister && !reload) mlxsw_driver->params_unregister (mlxsw_core); err_register_params:
@@ -2410,18 +2665,6 @@ int mlxsw_core_kvd_sizes_get(struct mlxsw_core *mlxsw_core, }EXPORT_SYMBOL (mlxsw_core_kvd_sizes_get); -void mlxsw_core_fw_flash_start (struct mlxsw_core *mlxsw_core) -{ - mlxsw_core->fw_flash_in_progress = true; -} -EXPORT_SYMBOL (mlxsw_core_fw_flash_start); - -void mlxsw_core_fw_flash_end (struct mlxsw_core *mlxsw_core) -{ - mlxsw_core->fw_flash_in_progress = false; -} -EXPORT_SYMBOL (mlxsw_core_fw_flash_end); -int mlxsw_core_resources_query (struct mlxsw_core *mlxsw_core,char *mbox,struct mlxsw_res *res) {
drivers/net/ethernet/mellanox/mlxsw/core.h +2 -6
@@ -280,6 +280,8 @@ struct mlxsw_driver {struct list_head list;const char *kind;size_t priv_size; +const struct mlxsw_fw_rev *fw_req_rev; +const char *fw_filename;int (*init)(struct mlxsw_core *mlxsw_core,const struct mlxsw_bus_info *mlxsw_bus_info,struct netlink_ext_ack *extack);
@@ -324,9 +326,6 @@ struct mlxsw_driver { unsigned int sb_index, u16 tc_index, enum devlink_sb_pool_type pool_type, u32 *p_cur, u32 *p_max); -int (*flash_update)(struct mlxsw_core *mlxsw_core, -const char *file_name,const char *component, -struct netlink_ext_ack *extack);int (*trap_init)(struct mlxsw_core *mlxsw_core,const struct devlink_trap *trap,void *trap_ctx); void (*trap_fini)(struct mlxsw_core *mlxsw_core,
@@ -378,9 +377,6 @@ int mlxsw_core_kvd_sizes_get(struct mlxsw_core *mlxsw_core, u64 *p_single_size, u64 *p_double_size, u64 *p_linear_size); -void mlxsw_core_fw_flash_start (struct mlxsw_core *mlxsw_core); -void mlxsw_core_fw_flash_end (struct mlxsw_core *mlxsw_core); -u32 mlxsw_core_read_frc_h (struct mlxsw_core *mlxsw_core);u32 mlxsw_core_read_frc_l (struct mlxsw_core *mlxsw_core);
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +6 -282
360 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlxsw/spectrum.h +0 -2
@@ -162,8 +162,6 @@ struct mlxsw_sp {struct mlxsw_sp_counter_pool *counter_pool;struct mlxsw_sp_span *span;struct mlxsw_sp_trap *trap; -const struct mlxsw_fw_rev *req_rev; -const char *fw_filename;const struct mlxsw_sp_kvdl_ops *kvdl_ops;const struct mlxsw_afa_ops *afa_ops;const struct mlxsw_afk_ops *afk_ops;
Signature · 1 line
2.26.2
PATCH 3/8 mlxsw: core: Push code doing params register/unregister into separate helpers
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Extract the code calling params register/unregister driver ops into separate functions. Call publish/unpublish unconditionally.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 39 +++++++++++++++------- 1 file changed, 27 insertions(+), 12 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +27 -12
@@ -1545,6 +1545,24 @@ static const struct devlink_ops mlxsw_devlink_ops = { .trap_policer_counter_get = mlxsw_devlink_trap_policer_counter_get, }; +static int mlxsw_core_params_register (struct mlxsw_core *mlxsw_core) +{ +int err; + +if (mlxsw_core->driver->params_register) { + err = mlxsw_core->driver->params_register (mlxsw_core); +if (err) +return err; + } +return 0 ; +} + +static void mlxsw_core_params_unregister (struct mlxsw_core *mlxsw_core) +{ +if (mlxsw_core->driver->params_register) + mlxsw_core->driver->params_unregister (mlxsw_core); +} + static int __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, const struct mlxsw_bus *mlxsw_bus,
@@ -1617,8 +1635,8 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, goto err_devlink_register; } -if (mlxsw_driver->params_register && !reload) { - err = mlxsw_driver->params_register (mlxsw_core); +if (!reload) { + err =mlxsw_core_params_register (mlxsw_core);if (err) goto err_register_params; }
@@ -1643,8 +1661,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,if (err) goto err_thermal_init; -if (mlxsw_driver->params_register) -devlink_params_publish (devlink); +devlink_params_publish (devlink);if (!reload)devlink_reload_enable (devlink);
@@ -1658,8 +1675,8 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, mlxsw_core->driver->fini (mlxsw_core); err_driver_init: err_fw_rev_validate: -if (mlxsw_driver->params_unregister && !reload) - mlxsw_driver->params_unregister (mlxsw_core); +if (!reload) +mlxsw_core_params_unregister (mlxsw_core); err_register_params:if (!reload)devlink_unregister (devlink);
@@ -1724,14 +1741,13 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,return ; } -if (mlxsw_core->driver->params_unregister) -devlink_params_unpublish (devlink); +devlink_params_unpublish (devlink);mlxsw_thermal_fini (mlxsw_core->thermal);mlxsw_hwmon_fini (mlxsw_core->hwmon);if (mlxsw_core->driver->fini) mlxsw_core->driver->fini (mlxsw_core); -if (mlxsw_core->driver->params_unregister && !reload) - mlxsw_core->driver->params_unregister (mlxsw_core); +if (!reload) +mlxsw_core_params_unregister (mlxsw_core);if (!reload)devlink_unregister (devlink);mlxsw_emad_fini (mlxsw_core);
@@ -1744,8 +1760,7 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,return ; reload_fail_deinit: -if (mlxsw_core->driver->params_unregister) - mlxsw_core->driver->params_unregister (mlxsw_core); +mlxsw_core_params_unregister (mlxsw_core);devlink_unregister (devlink);devlink_resources_unregister (devlink,NULL );devlink_free (devlink);
Signature · 1 line
2.26.2
PATCH 4/8 mlxsw: Move fw_load_policy devlink param into core.c
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
As the fw flashing code was moved to core.c, move the param which is related to it there as well. Remove unnecessary parentheses on the way.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 51 +++++++++++++++- .../net/ethernet/mellanox/mlxsw/spectrum.c | 59 +------------------ 2 files changed, 51 insertions(+), 59 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +50 -1
@@ -1117,6 +1117,46 @@ static int mlxsw_core_fw_flash_update(struct mlxsw_core *mlxsw_core,return err; } +static int mlxsw_core_devlink_param_fw_load_policy_validate (struct devlink *devlink,u32 id, +union devlink_param_value val, +struct netlink_ext_ack *extack) +{ +if (val.vu8 !=DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER && + val.vu8 !=DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH ) { +NL_SET_ERR_MSG_MOD (extack,"'fw_load_policy' must be 'driver' or 'flash'" ); +return -EINVAL ; + } + +return 0 ; +} + +static const struct devlink_param mlxsw_core_fw_devlink_params[] = { +DEVLINK_PARAM_GENERIC (FW_LOAD_POLICY ,BIT (DEVLINK_PARAM_CMODE_DRIVERINIT ),NULL ,NULL , + mlxsw_core_devlink_param_fw_load_policy_validate), +}; + +static int mlxsw_core_fw_params_register (struct mlxsw_core *mlxsw_core) +{ +struct devlink *devlink =priv_to_devlink (mlxsw_core); +union devlink_param_value value; +int err; + + err =devlink_params_register (devlink, mlxsw_core_fw_devlink_params, +ARRAY_SIZE (mlxsw_core_fw_devlink_params)); +if (err) +return err; + + value.vu8 =DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER ; +devlink_param_driverinit_value_set (devlink,DEVLINK_PARAM_GENERIC_ID_FW_LOAD_POLICY , value); +return 0 ; +} + +static void mlxsw_core_fw_params_unregister (struct mlxsw_core *mlxsw_core) +{ +devlink_params_unregister (priv_to_devlink (mlxsw_core), mlxsw_core_fw_devlink_params, +ARRAY_SIZE (mlxsw_core_fw_devlink_params)); +} + static int mlxsw_devlink_port_split(struct devlink *devlink, unsigned int port_index, unsigned int count,
@@ -1549,16 +1589,25 @@ static int mlxsw_core_params_register(struct mlxsw_core *mlxsw_core) {int err; + err =mlxsw_core_fw_params_register (mlxsw_core); +if (err) +return err; +if (mlxsw_core->driver->params_register) { err = mlxsw_core->driver->params_register (mlxsw_core);if (err) -return err; + goto err_params_register; }return 0 ; + +err_params_register: +mlxsw_core_fw_params_unregister (mlxsw_core); +return err; }static void mlxsw_core_params_unregister (struct mlxsw_core *mlxsw_core) { +mlxsw_core_fw_params_unregister (mlxsw_core);if (mlxsw_core->driver->params_register) mlxsw_core->driver->params_unregister (mlxsw_core); }
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +1 -58
92 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 5/8 mlxsw: reg: Add Monitoring FW Debug Register
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Introduce MFDE register that is passed through MFDE trap in case of fatal FW event.
--- drivers/net/ethernet/mellanox/mlxsw/reg.h | 79 +++++++++++++++++++++++ 1 file changed, 79 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/reg.h +79 -0
@@ -9880,6 +9880,84 @@ mlxsw_reg_mgpir_unpack(char *payload, u8 *num_of_devices, *num_of_modules =mlxsw_reg_mgpir_num_of_modules_get (payload); } +/* MFDE - Monitoring FW Debug Register +* ----------------------------------- +*/ +#define MLXSW_REG_MFDE_ID 0x9200 +#define MLXSW_REG_MFDE_LEN 0x18 + +MLXSW_REG_DEFINE (mfde,MLXSW_REG_MFDE_ID ,MLXSW_REG_MFDE_LEN ); + +/* reg_mfde_irisc_id +* Which irisc triggered the event +* Access: RO +*/ +MLXSW_ITEM32 (reg, mfde, irisc_id,0x00 ,8 ,4 ); + +enum mlxsw_reg_mfde_event_id { +MLXSW_REG_MFDE_EVENT_ID_CRSPACE_TO =1 , +/* KVD insertion machine stopped */ +MLXSW_REG_MFDE_EVENT_ID_KVD_IM_STOP , +}; + +/* reg_mfde_event_id +* Access: RO +*/ +MLXSW_ITEM32 (reg, mfde, event_id,0x00 ,0 ,8 ); + +enum mlxsw_reg_mfde_method { +MLXSW_REG_MFDE_METHOD_QUERY , +MLXSW_REG_MFDE_METHOD_WRITE , +}; + +/* reg_mfde_method +* Access: RO +*/ +MLXSW_ITEM32 (reg, mfde, method,0x04 ,29 ,1 ); + +/* reg_mfde_long_process +* Indicates if the command is in long_process mode. +* Access: RO +*/ +MLXSW_ITEM32 (reg, mfde, long_process,0x04 ,28 ,1 ); + +enum mlxsw_reg_mfde_command_type { +MLXSW_REG_MFDE_COMMAND_TYPE_MAD , +MLXSW_REG_MFDE_COMMAND_TYPE_EMAD , +MLXSW_REG_MFDE_COMMAND_TYPE_CMDIF , +}; + +/* reg_mfde_command_type +* Access: RO +*/ +MLXSW_ITEM32 (reg, mfde, command_type,0x04 ,24 ,2 ); + +/* reg_mfde_reg_attr_id +* EMAD - register id, MAD - attibute id +* Access: RO +*/ +MLXSW_ITEM32 (reg, mfde, reg_attr_id,0x04 ,0 ,16 ); + +/* reg_mfde_log_address +* crspace address accessed, which resulted in timeout. +* Valid in case event_id == MLXSW_REG_MFDE_EVENT_ID_CRSPACE_TO +* Access: RO +*/ +MLXSW_ITEM32 (reg, mfde, log_address,0x10 ,0 ,32 ); + +/* reg_mfde_log_id +* Which irisc triggered the timeout. +* Valid in case event_id == MLXSW_REG_MFDE_EVENT_ID_CRSPACE_TO +* Access: RO +*/ +MLXSW_ITEM32 (reg, mfde, log_id,0x14 ,0 ,4 ); + +/* reg_mfde_pipes_mask +* Bit per kvh pipe. +* Access: RO +*/ +MLXSW_ITEM32 (reg, mfde, pipes_mask,0x10 ,0 ,16 ); +/* TNGCR - Tunneling NVE General Configuration Register * ---------------------------------------------------- * The TNGCR register is used for setting up the NVE Tunneling configuration.
@@ -10994,6 +11072,7 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {MLXSW_REG (mtpptr),MLXSW_REG (mtptpt),MLXSW_REG (mgpir), +MLXSW_REG (mfde),MLXSW_REG (tngcr),MLXSW_REG (tnumt), MLXSW_REG(tnqcr),
Signature · 1 line
2.26.2
PATCH 6/8 mlxsw: reg: Add Monitoring FW General Debug Register
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Introduce MFGD register that is used to configure firmware debugging.
--- drivers/net/ethernet/mellanox/mlxsw/reg.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/reg.h +21 -0
@@ -9821,6 +9821,26 @@ static inline void mlxsw_reg_mtptptp_pack(char *payload,mlxsw_reg_mtptpt_message_type_set (payload, message_type); } +/* MFGD - Monitoring FW General Debug Register +* ------------------------------------------- +*/ +#define MLXSW_REG_MFGD_ID 0x90F0 +#define MLXSW_REG_MFGD_LEN 0x0C + +MLXSW_REG_DEFINE (mfgd,MLXSW_REG_MFGD_ID ,MLXSW_REG_MFGD_LEN ); + +/* reg_mfgd_fw_fatal_event_mode +* 0 - don't check FW fatal (default) +* 1 - check FW fatal - enable MFDE trap +* Access: RW +*/ +MLXSW_ITEM32 (reg, mfgd, fatal_event_mode,0x00 ,9 ,2 ); + +/* reg_mfgd_trigger_test +* Access: WO +*/ +MLXSW_ITEM32 (reg, mfgd, trigger_test,0x00 ,11 ,1 ); +/* MGPIR - Management General Peripheral Information Register * ---------------------------------------------------------- * MGPIR register allows software to query the hardware and
@@ -11071,6 +11091,7 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {MLXSW_REG (mtpppc),MLXSW_REG (mtpptr),MLXSW_REG (mtptpt), +MLXSW_REG (mfgd),MLXSW_REG (mgpir),MLXSW_REG (mfde), MLXSW_REG(tngcr),
Signature · 1 line
2.26.2
PATCH 7/8 devlink: introduce the health reporter test command
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Introduce a test command for health reporters. User might use this command to trigger test event on a reporter if the reporter supports it.
--- include/net/devlink.h | 3 +++ include/uapi/linux/devlink.h | 2 ++ net/core/devlink.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+)
include/net/devlink.h +3 -0
@@ -566,6 +566,7 @@ enum devlink_health_reporter_state {* @dump: callback to dump an object * if priv_ctx is NULL, run a full dump * @diagnose: callback to diagnose the current status +* @test: callback to trigger a test event */ struct devlink_health_reporter_ops {
@@ -578,6 +579,8 @@ struct devlink_health_reporter_ops {int (*diagnose)(struct devlink_health_reporter *reporter,struct devlink_fmsg *fmsg,struct netlink_ext_ack *extack); +int (*test)(struct devlink_health_reporter *reporter, +struct netlink_ext_ack *extack); };/**
include/uapi/linux/devlink.h +2 -0
@@ -122,6 +122,8 @@ enum devlink_command {DEVLINK_CMD_TRAP_POLICER_NEW ,DEVLINK_CMD_TRAP_POLICER_DEL , +DEVLINK_CMD_HEALTH_REPORTER_TEST , +/* add new commands above here */ __DEVLINK_CMD_MAX,DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX -1
net/core/devlink.c +30 -0
@@ -6096,6 +6096,28 @@ devlink_nl_cmd_health_reporter_dump_clear_doit(struct sk_buff *skb,return 0 ; } +static int devlink_nl_cmd_health_reporter_test_doit (struct sk_buff *skb, +struct genl_info *info) +{ +struct devlink *devlink = info->user_ptr[0 ]; +struct devlink_health_reporter *reporter; +int err; + + reporter =devlink_health_reporter_get_from_info (devlink, info); +if (!reporter) +return -EINVAL ; + +if (!reporter->ops->test) { +devlink_health_reporter_put (reporter); +return -EOPNOTSUPP ; + } + + err = reporter->ops->test (reporter, info->extack); + +devlink_health_reporter_put (reporter); +return err; +} +struct devlink_stats {u64 rx_bytes;u64 rx_packets;
@@ -7316,6 +7338,14 @@ static const struct genl_ops devlink_nl_ops[] = { .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT | DEVLINK_NL_FLAG_NO_LOCK, }, + { + .cmd = DEVLINK_CMD_HEALTH_REPORTER_TEST, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .doit = devlink_nl_cmd_health_reporter_test_doit, + .flags = GENL_ADMIN_PERM, + .internal_flags =DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT | + DEVLINK_NL_FLAG_NO_LOCK, + }, { .cmd = DEVLINK_CMD_FLASH_UPDATE, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
Signature · 1 line
2.26.2
PATCH 8/8 mlxsw: core: Introduce fw_fatal health reporter
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Introduce devlink health reporter to report FW fatal events. Implement the event listener using MFDE trap and enable the events to be propagated using MFGD register configuration.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 240 ++++++++++++++++++ drivers/net/ethernet/mellanox/mlxsw/core.h | 1 + drivers/net/ethernet/mellanox/mlxsw/reg.h | 1 + .../net/ethernet/mellanox/mlxsw/spectrum.c | 12 + drivers/net/ethernet/mellanox/mlxsw/trap.h | 2 + 5 files changed, 256 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/core.c +240 -0
@@ -84,6 +84,9 @@ struct mlxsw_core {struct mlxsw_core_port *ports;unsigned int max_ports;bool fw_flash_in_progress; +struct { +struct devlink_health_reporter *fw_fatal; + } health;unsigned long driver_priv[];/* driver_priv has to be always the last item */ };
@@ -1612,6 +1615,236 @@ static void mlxsw_core_params_unregister(struct mlxsw_core *mlxsw_core) mlxsw_core->driver->params_unregister (mlxsw_core); } +struct mlxsw_core_health_event { +struct mlxsw_core *mlxsw_core; +char mfde_pl[MLXSW_REG_MFDE_LEN ]; +struct work_struct work; +}; + +static void mlxsw_core_health_event_work (struct work_struct *work) +{ +struct mlxsw_core_health_event *event; +struct mlxsw_core *mlxsw_core; + + event = container_of(work, struct mlxsw_core_health_event, work); + mlxsw_core = event->mlxsw_core; +devlink_health_report (mlxsw_core->health.fw_fatal,"FW fatal event occurred" , + event->mfde_pl); +kfree (event); +} + +static void mlxsw_core_health_listener_func (const struct mlxsw_reg_info *reg, +char *mfde_pl,void *priv) +{ +struct mlxsw_core_health_event *event; +struct mlxsw_core *mlxsw_core = priv; + + event =kmalloc (sizeof (*event),GFP_ATOMIC ); +if (!event) +return ; + event->mlxsw_core = mlxsw_core; +memcpy (event->mfde_pl, mfde_pl,sizeof (event->mfde_pl)); +INIT_WORK (&event->work, mlxsw_core_health_event_work); +mlxsw_core_schedule_work (&event->work); +} + +static const struct mlxsw_listener mlxsw_core_health_listener = +MLXSW_EVENTL (mlxsw_core_health_listener_func,MFDE ,MFDE ); + +static int mlxsw_core_health_fw_fatal_dump (struct devlink_health_reporter *reporter, +struct devlink_fmsg *fmsg,void *priv_ctx, +struct netlink_ext_ack *extack) +{ +char *mfde_pl = priv_ctx; +char *val_str; +u8 event_id; +u32 val; +int err; + +if (!priv_ctx) +/* User-triggered dumps are not possible */ +return -EOPNOTSUPP ; + + val =mlxsw_reg_mfde_irisc_id_get (mfde_pl); + err =devlink_fmsg_u8_pair_put (fmsg,"irisc_id" , val); +if (err) +return err; + err =devlink_fmsg_arr_pair_nest_start (fmsg,"event" ); +if (err) +return err; + + event_id =mlxsw_reg_mfde_event_id_get (mfde_pl); + err =devlink_fmsg_u8_pair_put (fmsg,"id" , event_id); +if (err) +return err; +switch (event_id) { +case MLXSW_REG_MFDE_EVENT_ID_CRSPACE_TO : + val_str ="CR space timeout" ; +break ; +case MLXSW_REG_MFDE_EVENT_ID_KVD_IM_STOP : + val_str ="KVD insertion machine stopped" ; +break ; +default : + val_str =NULL ; + } +if (val_str) { + err =devlink_fmsg_string_pair_put (fmsg,"desc" , val_str); +if (err) +return err; + } + err =devlink_fmsg_arr_pair_nest_end (fmsg); +if (err) +return err; + + val =mlxsw_reg_mfde_method_get (mfde_pl); +switch (val) { +case MLXSW_REG_MFDE_METHOD_QUERY : + val_str ="query" ; +break ; +case MLXSW_REG_MFDE_METHOD_WRITE : + val_str ="write" ; +break ; +default : + val_str =NULL ; + } +if (val_str) { + err =devlink_fmsg_string_pair_put (fmsg,"method" , val_str); +if (err) +return err; + } + + val =mlxsw_reg_mfde_long_process_get (mfde_pl); + err =devlink_fmsg_bool_pair_put (fmsg,"long_process" , val); +if (err) +return err; + + val =mlxsw_reg_mfde_command_type_get (mfde_pl); +switch (val) { +case MLXSW_REG_MFDE_COMMAND_TYPE_MAD : + val_str ="mad" ; +break ; +case MLXSW_REG_MFDE_COMMAND_TYPE_EMAD : + val_str ="emad" ; +break ; +case MLXSW_REG_MFDE_COMMAND_TYPE_CMDIF : + val_str ="cmdif" ; +break ; +default : + val_str =NULL ; + } +if (val_str) { + err =devlink_fmsg_string_pair_put (fmsg,"command_type" , val_str); +if (err) +return err; + } + + val =mlxsw_reg_mfde_reg_attr_id_get (mfde_pl); + err =devlink_fmsg_u32_pair_put (fmsg,"reg_attr_id" , val); +if (err) +return err; + +if (event_id ==MLXSW_REG_MFDE_EVENT_ID_CRSPACE_TO ) { + val =mlxsw_reg_mfde_log_address_get (mfde_pl); + err =devlink_fmsg_u32_pair_put (fmsg,"log_address" , val); +if (err) +return err; + val =mlxsw_reg_mfde_log_id_get (mfde_pl); + err =devlink_fmsg_u8_pair_put (fmsg,"log_irisc_id" , val); +if (err) +return err; + }else if (event_id ==MLXSW_REG_MFDE_EVENT_ID_KVD_IM_STOP ) { + val =mlxsw_reg_mfde_pipes_mask_get (mfde_pl); + err =devlink_fmsg_u32_pair_put (fmsg,"pipes_mask" , val); +if (err) +return err; + } + +return 0 ; +} + +static int +mlxsw_core_health_fw_fatal_test (struct devlink_health_reporter *reporter, +struct netlink_ext_ack *extack) +{ +struct mlxsw_core *mlxsw_core =devlink_health_reporter_priv (reporter); +char mfgd_pl[MLXSW_REG_MFGD_LEN ]; +int err; + +/* Read the register first to make sure no other bits are changed. */ + err =mlxsw_reg_query (mlxsw_core,MLXSW_REG (mfgd), mfgd_pl); +if (err) +return err; +mlxsw_reg_mfgd_trigger_test_set (mfgd_pl, true); +return mlxsw_reg_write (mlxsw_core,MLXSW_REG (mfgd), mfgd_pl); +} + +static const struct devlink_health_reporter_ops +mlxsw_core_health_fw_fatal_ops = { + .name ="fw_fatal" , + .dump = mlxsw_core_health_fw_fatal_dump, + .test = mlxsw_core_health_fw_fatal_test, +}; + +static int mlxsw_core_health_fw_fatal_config (struct mlxsw_core *mlxsw_core, +bool enable) +{ +char mfgd_pl[MLXSW_REG_MFGD_LEN ]; +int err; + +/* Read the register first to make sure no other bits are changed. */ + err =mlxsw_reg_query (mlxsw_core,MLXSW_REG (mfgd), mfgd_pl); +if (err) +return err; +mlxsw_reg_mfgd_fatal_event_mode_set (mfgd_pl, enable); +return mlxsw_reg_write (mlxsw_core,MLXSW_REG (mfgd), mfgd_pl); +} + +static int mlxsw_core_health_init (struct mlxsw_core *mlxsw_core) +{ +struct devlink *devlink =priv_to_devlink (mlxsw_core); +struct devlink_health_reporter *fw_fatal; +int err; + +if (!mlxsw_core->driver->fw_fatal_enabled) +return 0 ; + + fw_fatal =devlink_health_reporter_create (devlink, &mlxsw_core_health_fw_fatal_ops, +0 , mlxsw_core); +if (IS_ERR (fw_fatal)) { +dev_err (mlxsw_core->bus_info->dev,"Failed to create fw fatal reporter" ); +return PTR_ERR (fw_fatal); + } + mlxsw_core->health.fw_fatal = fw_fatal; + + err =mlxsw_core_trap_register (mlxsw_core, &mlxsw_core_health_listener, mlxsw_core); +if (err) + goto err_trap_register; + + err =mlxsw_core_health_fw_fatal_config (mlxsw_core, true); +if (err) + goto err_fw_fatal_config; + +return 0 ; + +err_fw_fatal_config: +mlxsw_core_trap_unregister (mlxsw_core, &mlxsw_core_health_listener, mlxsw_core); +err_trap_register: +devlink_health_reporter_destroy (mlxsw_core->health.fw_fatal); +return err; +} + +static void mlxsw_core_health_fini (struct mlxsw_core *mlxsw_core) +{ +if (!mlxsw_core->driver->fw_fatal_enabled) +return ; + +mlxsw_core_health_fw_fatal_config (mlxsw_core, false); +mlxsw_core_trap_unregister (mlxsw_core, &mlxsw_core_health_listener, mlxsw_core); +/* Make sure there is no more event work scheduled */ +mlxsw_core_flush_owq (); +devlink_health_reporter_destroy (mlxsw_core->health.fw_fatal); +} + static int __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, const struct mlxsw_bus *mlxsw_bus,
@@ -1695,6 +1928,10 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,if (err) goto err_fw_rev_validate; + err =mlxsw_core_health_init (mlxsw_core); +if (err) + goto err_health_init; +if (mlxsw_driver->init) { err = mlxsw_driver->init (mlxsw_core, mlxsw_bus_info, extack);if (err)
@@ -1723,6 +1960,8 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,if (mlxsw_core->driver->fini) mlxsw_core->driver->fini (mlxsw_core); err_driver_init: +mlxsw_core_health_fini (mlxsw_core); +err_health_init: err_fw_rev_validate:if (!reload)mlxsw_core_params_unregister (mlxsw_core);
@@ -1795,6 +2034,7 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,mlxsw_hwmon_fini (mlxsw_core->hwmon);if (mlxsw_core->driver->fini) mlxsw_core->driver->fini (mlxsw_core); +mlxsw_core_health_fini (mlxsw_core);if (!reload)mlxsw_core_params_unregister (mlxsw_core);if (!reload)
drivers/net/ethernet/mellanox/mlxsw/core.h +1 -0
@@ -370,6 +370,7 @@ struct mlxsw_driver {u8 txhdr_len;const struct mlxsw_config_profile *profile;bool res_query_enabled; +bool fw_fatal_enabled; }; int mlxsw_core_kvd_sizes_get(struct mlxsw_core *mlxsw_core,
drivers/net/ethernet/mellanox/mlxsw/reg.h +1 -0
@@ -5579,6 +5579,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_SP_STP ,MLXSW_REG_HTGT_TRAP_GROUP_SP_LACP ,MLXSW_REG_HTGT_TRAP_GROUP_SP_LLDP ,
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +12 -0
@@ -2529,11 +2529,20 @@ static void mlxsw_sp_lag_fini(struct mlxsw_sp *mlxsw_sp)static int mlxsw_sp_basic_trap_groups_set (struct mlxsw_core *mlxsw_core) {char htgt_pl[MLXSW_REG_HTGT_LEN ]; +int err;mlxsw_reg_htgt_pack (htgt_pl,MLXSW_REG_HTGT_TRAP_GROUP_EMAD ,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; + +mlxsw_reg_htgt_pack (htgt_pl,MLXSW_REG_HTGT_TRAP_GROUP_MFDE , +MLXSW_REG_HTGT_INVALID_POLICER , +MLXSW_REG_HTGT_DEFAULT_PRIORITY , +MLXSW_REG_HTGT_DEFAULT_TC );return mlxsw_reg_write (mlxsw_core,MLXSW_REG (htgt), htgt_pl); }
@@ -3287,6 +3296,7 @@ static struct mlxsw_driver mlxsw_sp1_driver = { .txhdr_len = MLXSW_TXHDR_LEN, .profile = &mlxsw_sp1_config_profile, .res_query_enabled = true, + .fw_fatal_enabled = true, };static struct mlxsw_driver mlxsw_sp2_driver = {
@@ -3326,6 +3336,7 @@ static struct mlxsw_driver mlxsw_sp2_driver = { .txhdr_len = MLXSW_TXHDR_LEN, .profile = &mlxsw_sp2_config_profile, .res_query_enabled = true, + .fw_fatal_enabled = true, };static struct mlxsw_driver mlxsw_sp3_driver = {
@@ -3365,6 +3376,7 @@ static struct mlxsw_driver mlxsw_sp3_driver = { .txhdr_len = MLXSW_TXHDR_LEN, .profile = &mlxsw_sp2_config_profile, .res_query_enabled = true, + .fw_fatal_enabled = true, };bool mlxsw_sp_port_dev_check (const struct net_device *dev)
drivers/net/ethernet/mellanox/mlxsw/trap.h +2 -0
@@ -120,6 +120,8 @@ enum { };enum mlxsw_event_trap_id { +/* Fatal Event generated by FW */ +MLXSW_TRAP_ID_MFDE =0x3 ,/* Port Up/Down event generated by hardware */ MLXSW_TRAP_ID_PUDE =0x8 ,/* PTP Ingress FIFO has a new entry */
Signature · 1 line
2.26.2
David Miller
maintainerFrom: Ido Schimmel <[email protected]>
Date: Tue, 15 Sep 2020 11:40:50 +0300
Quoted 26 lines
From: Ido Schimmel <[email protected]>
Jiri says:
This patch set introduces a health reporter for mlxsw that reports FW fatal events. Alongside that, it introduces a test command that is used to trigger a dummy FW fatal event by user:
$ sudo devlink health test pci/0000:03:00.0 reporter fw_fatal$ devlink health pci/0000:03:00.0: reporter fw_fatal state error error 1 recover 0 last_dump_date 2020-07-27 last_dump_time 16:33:27 auto_dump true$ sudo devlink health dump show pci/0000:03:00.0 reporter fw_fatal -j -p { "irisc_id": 0, "event": [ "id": 3 ], "method": "query", "long_process": false, "command_type": "mad", "reg_attr_id": 0 }
Quoted 1 line
As a dependency, the FW validation and flashing is moved to
core.c.
Series applied, thanks everyone.