e286869b24
- Why I did it 1. Update Mellanox HW-MGMT package to newer version V.7.0030.1011 2. Replace the SONiC PMON Thermal control algorithm with the one inside the HW-MGMT package on all Nvidia platforms 3. Support Spectrum-4 systems - How I did it 1. Update the HW-MGMT package version number and submodule pointer 2. Remove the thermal control algorithm implementation from Mellanox platform API 3. Revise the patch to HW-MGMT package which will disable HW-MGMT from running on SIMX 4. Update the downstream kernel patch list Signed-off-by: Kebo Liu <kebol@nvidia.com>
103 lines
3.7 KiB
Diff
103 lines
3.7 KiB
Diff
From 7b7f5f88374c3377fc28e48a0bc77ae4aa783fda Mon Sep 17 00:00:00 2001
|
|
From: Vadim Pasternak <vadimp@nvidia.com>
|
|
Date: Tue, 7 Dec 2021 16:07:31 +0200
|
|
Subject: [PATCH backport 5.10 103/182] mlxsw: core: Remove unnecessary asserts
|
|
|
|
Remove unnecessary asserts for module index validation. Leave only one
|
|
that is actually necessary in mlxsw_env_pmpe_listener_func() where the
|
|
module index is directly read from the firmware event.
|
|
|
|
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
|
|
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
|
|
---
|
|
.../net/ethernet/mellanox/mlxsw/core_env.c | 24 -------------------
|
|
1 file changed, 24 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
|
|
index 6dd4ae2f45f4..c1d51b4b6b36 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
|
|
@@ -414,9 +414,6 @@ int mlxsw_env_reset_module(struct net_device *netdev,
|
|
!(req & (ETH_RESET_PHY << ETH_RESET_SHARED_SHIFT)))
|
|
return 0;
|
|
|
|
- if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
|
|
- return -EINVAL;
|
|
-
|
|
mutex_lock(&mlxsw_env->module_info_lock);
|
|
|
|
if (mlxsw_env->module_info[module].num_ports_up) {
|
|
@@ -456,9 +453,6 @@ mlxsw_env_get_module_power_mode(struct mlxsw_core *mlxsw_core, u8 module,
|
|
u32 status_bits;
|
|
int err;
|
|
|
|
- if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
|
|
- return -EINVAL;
|
|
-
|
|
mutex_lock(&mlxsw_env->module_info_lock);
|
|
|
|
params->policy = mlxsw_env->module_info[module].power_mode_policy;
|
|
@@ -560,9 +554,6 @@ mlxsw_env_set_module_power_mode(struct mlxsw_core *mlxsw_core, u8 module,
|
|
bool low_power;
|
|
int err = 0;
|
|
|
|
- if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
|
|
- return -EINVAL;
|
|
-
|
|
if (policy != ETHTOOL_MODULE_POWER_MODE_POLICY_HIGH &&
|
|
policy != ETHTOOL_MODULE_POWER_MODE_POLICY_AUTO) {
|
|
NL_SET_ERR_MSG_MOD(extack, "Unsupported power mode policy");
|
|
@@ -901,9 +892,6 @@ mlxsw_env_module_overheat_counter_get(struct mlxsw_core *mlxsw_core, u8 module,
|
|
{
|
|
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
|
|
|
|
- if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
|
|
- return -EINVAL;
|
|
-
|
|
mutex_lock(&mlxsw_env->module_info_lock);
|
|
*p_counter = mlxsw_env->module_info[module].module_overheat_counter;
|
|
mutex_unlock(&mlxsw_env->module_info_lock);
|
|
@@ -916,9 +904,6 @@ void mlxsw_env_module_port_map(struct mlxsw_core *mlxsw_core, u8 module)
|
|
{
|
|
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
|
|
|
|
- if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
|
|
- return;
|
|
-
|
|
mutex_lock(&mlxsw_env->module_info_lock);
|
|
mlxsw_env->module_info[module].num_ports_mapped++;
|
|
mutex_unlock(&mlxsw_env->module_info_lock);
|
|
@@ -929,9 +914,6 @@ void mlxsw_env_module_port_unmap(struct mlxsw_core *mlxsw_core, u8 module)
|
|
{
|
|
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
|
|
|
|
- if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
|
|
- return;
|
|
-
|
|
mutex_lock(&mlxsw_env->module_info_lock);
|
|
mlxsw_env->module_info[module].num_ports_mapped--;
|
|
mutex_unlock(&mlxsw_env->module_info_lock);
|
|
@@ -943,9 +925,6 @@ int mlxsw_env_module_port_up(struct mlxsw_core *mlxsw_core, u8 module)
|
|
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
|
|
int err = 0;
|
|
|
|
- if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
|
|
- return -EINVAL;
|
|
-
|
|
mutex_lock(&mlxsw_env->module_info_lock);
|
|
|
|
if (mlxsw_env->module_info[module].power_mode_policy !=
|
|
@@ -975,9 +954,6 @@ void mlxsw_env_module_port_down(struct mlxsw_core *mlxsw_core, u8 module)
|
|
{
|
|
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
|
|
|
|
- if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
|
|
- return;
|
|
-
|
|
mutex_lock(&mlxsw_env->module_info_lock);
|
|
|
|
mlxsw_env->module_info[module].num_ports_up--;
|
|
--
|
|
2.20.1
|
|
|