Skip to content

Commit

Permalink
hw-mgmt: patches: 5.10: Add temporary mlxsw_minimal driver patch
Browse files Browse the repository at this point in the history
Add temporary mlxsw_minimal driver patch to disable ethtool interface

Signed-off-by: Felix Radensky <[email protected]>
  • Loading branch information
felixradensky committed Dec 31, 2023
1 parent ff8ee32 commit 9db3216
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 0 deletions.
1 change: 1 addition & 0 deletions recipes-kernel/linux/Patch_Status_Table.txt
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@ Kernel-5.10
|9001-DS-OPT-e1000e-skip-NVM-checksum.patch | | Downstream;skip[ALL];take[opt] | | |
|9002-TMP-fix-for-fan-minimum-speed.patch | | Downstream | | |
|9003-platform-mellanox-Introduce-support-of-Nvidia-L1-tra.patch | | Downstream | | P4300 |
|9004-DS-OPT-mlxsw-minimal-Downstream-Disable-ethtool-interface.patch| | Downstream | | |
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Kernel-6.1
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
From f4e330eec87654fd6186b1289be2fec787f94107 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <[email protected]>
Date: Mon, 25 Dec 2023 16:58:37 +0000
Subject: [PATCH backport 5.10 1/1] mlxsw: minimal: Downstream: Disable ethtool
interface

Disable 'ethtool' interface, since it is un-used and just created
un-necessary 'netdevice' interfaces.

Signed-off-by: Vadim Pasternak <[email protected]>
---
drivers/net/ethernet/mellanox/mlxsw/core_env.c | 2 ++
drivers/net/ethernet/mellanox/mlxsw/minimal.c | 4 ++++
2 files changed, 6 insertions(+)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
index f9c770eec..27b87dfa2 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
@@ -1273,6 +1273,8 @@ int mlxsw_env_init(struct mlxsw_core *mlxsw_core, struct mlxsw_env **p_env)
if (err)
goto err_linecards_register;

+ return 0;
+
err = mlxsw_env_temp_warn_event_register(mlxsw_core);
if (err)
goto err_temp_warn_event_register;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
index 9f74ca704..16f482cfd 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
@@ -361,6 +361,8 @@ static int mlxsw_m_ports_create(struct mlxsw_m *mlxsw_m, u8 slot_index)
char mgpir_pl[MLXSW_REG_MGPIR_LEN];
int i, err;

+ return 0;
+
mlxsw_reg_mgpir_pack(mgpir_pl, slot_index);
err = mlxsw_reg_query(mlxsw_m->core, MLXSW_REG(mgpir), mgpir_pl);
if (err)
@@ -425,6 +427,8 @@ static void mlxsw_m_ports_remove(struct mlxsw_m *mlxsw_m, u8 slot_index)
u8 module;
int i;

+ return;
+
for (i = 0; i < mlxsw_m->max_ports; i++) {
port_mapping = mlxsw_m_port_mapping_get(mlxsw_m, slot_index,
i);
--
2.20.1

0 comments on commit 9db3216

Please sign in to comment.