From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ido Schimmel Subject: [PATCH net-next 3/3] mlxsw: spectrum: Skip firmware version check based on devlink parameter Date: Tue, 6 Nov 2018 20:05:04 +0000 Message-ID: <20181106200314.29918-4-idosch@mellanox.com> References: <20181106200314.29918-1-idosch@mellanox.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: "davem@davemloft.net" , Jiri Pirko , Shalom Toledo , Moshe Shemesh , "dsahern@gmail.com" , "jakub.kicinski@netronome.com" , "andrew@lunn.ch" , "f.fainelli@gmail.com" , mlxsw , Ido Schimmel To: "netdev@vger.kernel.org" Return-path: Received: from mail-eopbgr30068.outbound.protection.outlook.com ([40.107.3.68]:10370 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726184AbeKGFcE (ORCPT ); Wed, 7 Nov 2018 00:32:04 -0500 In-Reply-To: <20181106200314.29918-1-idosch@mellanox.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: From: Shalom Toledo Based on fw_version_check devlink parameter, skip firmware version check in order to run the device with different firmware version than required by the driver for testing and/or debugging purposes. Signed-off-by: Shalom Toledo Reviewed-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/core.c | 13 ++++++ drivers/net/ethernet/mellanox/mlxsw/core.h | 2 + .../net/ethernet/mellanox/mlxsw/spectrum.c | 45 +++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ether= net/mellanox/mlxsw/core.c index b2e1b83525db..281aeb1c2386 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -1036,6 +1036,12 @@ __mlxsw_core_bus_device_register(const struct mlxsw_= bus_info *mlxsw_bus_info, goto err_devlink_register; } =20 + if (mlxsw_driver->params_register && !reload) { + err =3D mlxsw_driver->params_register(mlxsw_core); + if (err) + goto err_register_params; + } + err =3D mlxsw_hwmon_init(mlxsw_core, mlxsw_bus_info, &mlxsw_core->hwmon); if (err) goto err_hwmon_init; @@ -1058,6 +1064,9 @@ __mlxsw_core_bus_device_register(const struct mlxsw_b= us_info *mlxsw_bus_info, err_thermal_init: mlxsw_hwmon_fini(mlxsw_core->hwmon); err_hwmon_init: + if (mlxsw_driver->params_unregister && !reload) + mlxsw_driver->params_unregister(mlxsw_core); +err_register_params: if (!reload) devlink_unregister(devlink); err_devlink_register: @@ -1121,6 +1130,8 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_co= re *mlxsw_core, mlxsw_core->driver->fini(mlxsw_core); mlxsw_thermal_fini(mlxsw_core->thermal); mlxsw_hwmon_fini(mlxsw_core->hwmon); + if (mlxsw_core->driver->params_unregister && !reload) + mlxsw_core->driver->params_unregister(mlxsw_core); if (!reload) devlink_unregister(devlink); mlxsw_emad_fini(mlxsw_core); @@ -1133,6 +1144,8 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_co= re *mlxsw_core, return; =20 reload_fail_deinit: + if (mlxsw_core->driver->params_unregister) + mlxsw_core->driver->params_unregister(mlxsw_core); devlink_unregister(devlink); devlink_resources_unregister(devlink, NULL); devlink_free(devlink); diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ether= net/mellanox/mlxsw/core.h index c35be477856f..d811be8989b0 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.h +++ b/drivers/net/ethernet/mellanox/mlxsw/core.h @@ -282,6 +282,8 @@ struct mlxsw_driver { const struct mlxsw_config_profile *profile, u64 *p_single_size, u64 *p_double_size, u64 *p_linear_size); + int (*params_register)(struct mlxsw_core *mlxsw_core); + void (*params_unregister)(struct mlxsw_core *mlxsw_core); u8 txhdr_len; const struct mlxsw_config_profile *profile; bool res_query_enabled; diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/e= thernet/mellanox/mlxsw/spectrum.c index 9bec940330a4..ab1ca8c1d6df 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -318,6 +318,7 @@ static int mlxsw_sp_fw_rev_validate(struct mlxsw_sp *ml= xsw_sp) const struct mlxsw_fw_rev *rev =3D &mlxsw_sp->bus_info->fw_rev; const struct mlxsw_fw_rev *req_rev =3D mlxsw_sp->req_rev; const char *fw_filename =3D mlxsw_sp->fw_filename; + union devlink_param_value value; const struct firmware *firmware; int err; =20 @@ -325,6 +326,15 @@ static int mlxsw_sp_fw_rev_validate(struct mlxsw_sp *m= lxsw_sp) if (!req_rev || !fw_filename) return 0; =20 + /* Don't check if devlink fw_version_check param is false */ + err =3D devlink_param_driverinit_value_get(priv_to_devlink(mlxsw_sp->core= ), + DEVLINK_PARAM_GENERIC_ID_FW_VERSION_CHECK, + &value); + if (err) + return err; + if (!value.vbool) + return 0; + /* Validate driver & FW are compatible */ if (rev->major !=3D req_rev->major) { WARN(1, "Mismatch in major FW version [%d:%d] is never expected; Please = contact support\n", @@ -4171,6 +4181,37 @@ static int mlxsw_sp_kvd_sizes_get(struct mlxsw_core = *mlxsw_core, return 0; } =20 +static const struct devlink_param mlxsw_sp_devlink_params[] =3D { + DEVLINK_PARAM_GENERIC(FW_VERSION_CHECK, + BIT(DEVLINK_PARAM_CMODE_DRIVERINIT), + NULL, NULL, NULL), +}; + +static int mlxsw_sp_params_register(struct mlxsw_core *mlxsw_core) +{ + struct devlink *devlink =3D priv_to_devlink(mlxsw_core); + union devlink_param_value value; + int err; + + err =3D devlink_params_register(devlink, mlxsw_sp_devlink_params, + ARRAY_SIZE(mlxsw_sp_devlink_params)); + if (err) + return err; + + value.vbool =3D true; + devlink_param_driverinit_value_set(devlink, + DEVLINK_PARAM_GENERIC_ID_FW_VERSION_CHECK, + value); + return 0; +} + +static void mlxsw_sp_params_unregister(struct mlxsw_core *mlxsw_core) +{ + devlink_params_unregister(priv_to_devlink(mlxsw_core), + mlxsw_sp_devlink_params, + ARRAY_SIZE(mlxsw_sp_devlink_params)); +} + static struct mlxsw_driver mlxsw_sp1_driver =3D { .kind =3D mlxsw_sp1_driver_name, .priv_size =3D sizeof(struct mlxsw_sp), @@ -4192,6 +4233,8 @@ static struct mlxsw_driver mlxsw_sp1_driver =3D { .txhdr_construct =3D mlxsw_sp_txhdr_construct, .resources_register =3D mlxsw_sp1_resources_register, .kvd_sizes_get =3D mlxsw_sp_kvd_sizes_get, + .params_register =3D mlxsw_sp_params_register, + .params_unregister =3D mlxsw_sp_params_unregister, .txhdr_len =3D MLXSW_TXHDR_LEN, .profile =3D &mlxsw_sp1_config_profile, .res_query_enabled =3D true, @@ -4217,6 +4260,8 @@ static struct mlxsw_driver mlxsw_sp2_driver =3D { .sb_occ_tc_port_bind_get =3D mlxsw_sp_sb_occ_tc_port_bind_get, .txhdr_construct =3D mlxsw_sp_txhdr_construct, .resources_register =3D mlxsw_sp2_resources_register, + .params_register =3D mlxsw_sp_params_register, + .params_unregister =3D mlxsw_sp_params_unregister, .txhdr_len =3D MLXSW_TXHDR_LEN, .profile =3D &mlxsw_sp2_config_profile, .res_query_enabled =3D true, --=20 2.19.1