Skip to content

Commit 1823653

Browse files
keboliulguohan
andauthored
[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]>
1 parent cb4712f commit 1823653

File tree

2 files changed

+65
-1
lines changed

2 files changed

+65
-1
lines changed
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
From e480c548db43d81659874c4fa89eeda9f4096e5c Mon Sep 17 00:00:00 2001
2+
From: Vadim Pasternak <[email protected]>
3+
Date: Wed, 3 Jun 2020 10:59:20 +0300
4+
Subject: [backport bugfix] platform/x86: mlx-platform: Remove PSU EEPROM
5+
configuration
6+
7+
Remove PSU EEPROM configuration for systems class equipped with
8+
Mellanox chip Spectrume-2. Till now all the systems from this class
9+
used few types of power units, all equipped with EEPROM device with
10+
address space two bytes. Thus, all these devices have been handled by
11+
EEPROM driver "24c32".
12+
There is a new requirement is to support power unit replacement by "off
13+
the shelf" device, matching electrical required parameters. Such device
14+
could be equpped with different EEPROM type, which could be one byte
15+
address space adressing or even could be not equipped with EEPROM.
16+
In such case "24c32" will not work.
17+
18+
Fixes: 1bd42d94ccab ("platform/x86: mlx-platform: Add support for new 200G IB and Ethernet systems")
19+
Signed-off-by: Vadim Pasternak <[email protected]>
20+
---
21+
drivers/platform/x86/mlx-platform.c | 15 ++-------------
22+
1 file changed, 2 insertions(+), 13 deletions(-)
23+
24+
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
25+
index 208f4a476..d6c87fb88 100644
26+
--- a/drivers/platform/x86/mlx-platform.c
27+
+++ b/drivers/platform/x86/mlx-platform.c
28+
@@ -329,15 +329,6 @@ static struct i2c_board_info mlxplat_mlxcpld_psu[] = {
29+
},
30+
};
31+
32+
-static struct i2c_board_info mlxplat_mlxcpld_ng_psu[] = {
33+
- {
34+
- I2C_BOARD_INFO("24c32", 0x51),
35+
- },
36+
- {
37+
- I2C_BOARD_INFO("24c32", 0x50),
38+
- },
39+
-};
40+
-
41+
static struct i2c_board_info mlxplat_mlxcpld_pwr[] = {
42+
{
43+
I2C_BOARD_INFO("dps460", 0x59),
44+
@@ -762,15 +753,13 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_psu_items_data[] = {
45+
.label = "psu1",
46+
.reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
47+
.mask = BIT(0),
48+
- .hpdev.brdinfo = &mlxplat_mlxcpld_ng_psu[0],
49+
- .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
50+
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
51+
},
52+
{
53+
.label = "psu2",
54+
.reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
55+
.mask = BIT(1),
56+
- .hpdev.brdinfo = &mlxplat_mlxcpld_ng_psu[1],
57+
- .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR,
58+
+ .hpdev.nr = MLXPLAT_CPLD_NR_NONE,
59+
},
60+
};
61+
62+
--
63+
2.11.0
64+

patch/series

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ driver-ixgbe-external-phy.patch
7474
0018-mlxsw-i2c-Extend-initialization-with-querying-firmware.patch
7575
0019-mlxsw-i2c-Allow-flexible-setting-of-I2C-transactions.patch
7676
0020-mlxsw-core-Set-different-thermal-polling-time-based.patch
77-
77+
0021-platform-x86-mlx-platform-Remove-PSU-EEPROM-configur.patch

0 commit comments

Comments
 (0)