-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Mellanox] Add kernel patches with hw-mgmt V.7.0010.1300 (#168)
Add new kernel patches for mlxsw driver: - Move PSU EEPROM configuration from kerenl to user space for SPC2 / SPC3 system official commit ID c071afcea6ecf24a3c119f25ce9f71ffd55b5dc2 (5.10-rc1) Co-authored-by: lguohan <[email protected]>
- Loading branch information
Showing
2 changed files
with
65 additions
and
1 deletion.
There are no files selected for viewing
64 changes: 64 additions & 0 deletions
64
patch/0021-platform-x86-mlx-platform-Remove-PSU-EEPROM-configur.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
From e480c548db43d81659874c4fa89eeda9f4096e5c Mon Sep 17 00:00:00 2001 | ||
From: Vadim Pasternak <[email protected]> | ||
Date: Wed, 3 Jun 2020 10:59:20 +0300 | ||
Subject: [backport bugfix] platform/x86: mlx-platform: Remove PSU EEPROM | ||
configuration | ||
|
||
Remove PSU EEPROM configuration for systems class equipped with | ||
Mellanox chip Spectrume-2. Till now all the systems from this class | ||
used few types of power units, all equipped with EEPROM device with | ||
address space two bytes. Thus, all these devices have been handled by | ||
EEPROM driver "24c32". | ||
There is a new requirement is to support power unit replacement by "off | ||
the shelf" device, matching electrical required parameters. Such device | ||
could be equpped with different EEPROM type, which could be one byte | ||
address space adressing or even could be not equipped with EEPROM. | ||
In such case "24c32" will not work. | ||
|
||
Fixes: 1bd42d94ccab ("platform/x86: mlx-platform: Add support for new 200G IB and Ethernet systems") | ||
Signed-off-by: Vadim Pasternak <[email protected]> | ||
--- | ||
drivers/platform/x86/mlx-platform.c | 15 ++------------- | ||
1 file changed, 2 insertions(+), 13 deletions(-) | ||
|
||
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c | ||
index 208f4a476..d6c87fb88 100644 | ||
--- a/drivers/platform/x86/mlx-platform.c | ||
+++ b/drivers/platform/x86/mlx-platform.c | ||
@@ -329,15 +329,6 @@ static struct i2c_board_info mlxplat_mlxcpld_psu[] = { | ||
}, | ||
}; | ||
|
||
-static struct i2c_board_info mlxplat_mlxcpld_ng_psu[] = { | ||
- { | ||
- I2C_BOARD_INFO("24c32", 0x51), | ||
- }, | ||
- { | ||
- I2C_BOARD_INFO("24c32", 0x50), | ||
- }, | ||
-}; | ||
- | ||
static struct i2c_board_info mlxplat_mlxcpld_pwr[] = { | ||
{ | ||
I2C_BOARD_INFO("dps460", 0x59), | ||
@@ -762,15 +753,13 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_psu_items_data[] = { | ||
.label = "psu1", | ||
.reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, | ||
.mask = BIT(0), | ||
- .hpdev.brdinfo = &mlxplat_mlxcpld_ng_psu[0], | ||
- .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, | ||
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE, | ||
}, | ||
{ | ||
.label = "psu2", | ||
.reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, | ||
.mask = BIT(1), | ||
- .hpdev.brdinfo = &mlxplat_mlxcpld_ng_psu[1], | ||
- .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, | ||
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE, | ||
}, | ||
}; | ||
|
||
-- | ||
2.11.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters