Skip to content

Commit d24aac4

Browse files
stephenxsstephens
andauthored
[Mellanox] Port the patches to 4.19 (#14)
0001-v4.19-6-Mellanox-platform-Backport-patches-for-new-M.patch 0002-config-mellanox-configuration.patch 0003-mlxsw-minimal-Fix-validation-for-FW-minor-version.patch 0004-mlxsw-core-Add-the-hottest-thermal-zone-detection.patch 0005-hwmon-pmbus-core-Add-support-for-vid-mode-detection-.patch 0006-platform-mellanox-mlxreg-hotplug-Use-capability-r.patch <linux/i2c/pmbus.h> -> <linux/pmbus.h> Remove files which are no longer used. Co-authored-by: stephens <[email protected]>
1 parent bf715fa commit d24aac4

File tree

58 files changed

+8646
-35094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+8646
-35094
lines changed

patch/0001-i2c-mlxcpld-add-master-driver-for-Mellanox-systems.patch

Lines changed: 0 additions & 544 deletions
This file was deleted.

patch/0001-v4.19-6-Mellanox-platform-Backport-patches-for-new-M.patch

Lines changed: 7736 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 209 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
1+
From c4e099fa32c81e09cca7f5252b8c8cc413d1a056 Mon Sep 17 00:00:00 2001
2+
From: root <[email protected]>
3+
Date: Mon, 16 Mar 2020 02:30:11 +0000
4+
Subject: [PATCH 2/2] config: mellanox configuration
5+
6+
It adds the next configuration flags, used by Mellanox systems:
7+
8+
CONFIG_MLXSW_CORE=m
9+
CONFIG_MLXSW_CORE_HWMON=y
10+
CONFIG_MLXSW_CORE_THERMAL=y
11+
CONFIG_MLXSW_CORE_QSFP=y
12+
CONFIG_MLXSW_PCI=m
13+
CONFIG_MLXSW_I2C=m
14+
CONFIG_MLXSW_MINIMAL=m
15+
CONFIG_I2C_MUX_REG=y
16+
CONFIG_I2C_MUX_MLXCPLD=m
17+
CONFIG_I2C_MLXCPLD=m
18+
CONFIG_SENSORS_IIO_HWMON=y
19+
CONFIG_PMBUS=y
20+
CONFIG_SENSORS_PMBUS=y
21+
CONFIG_SENSORS_LM25066=m
22+
CONFIG_SENSORS_TPS53679=m
23+
CONFIG_SENSORS_UCD9000=m
24+
CONFIG_SENSORS_UCD9200=m
25+
CONFIG_LEDS_MLXREG=m
26+
CONFIG_MLX_PLATFORM=m
27+
CONFIG_MELLANOX_PLATFORM=y
28+
CONFIG_MLXREG_HOTPLUG=m
29+
CONFIG_MLXREG_IO=m
30+
CONFIG_MAX1363=y
31+
32+
Signed-off-by: Vadim Pastrenak <[email protected]>
33+
Signed-off-by: Stephen <[email protected]>
34+
35+
config: mellanox fan configuration It adds configuration flag, used by Mellanox systems:
36+
37+
SENSORS_MLXREG_FAN=m
38+
39+
Signed-off-by: Oleksandr Shamray <[email protected]>
40+
Signed-off-by: Stephen <[email protected]>
41+
42+
update kernel config add CONFIG_MLX_WDT
43+
44+
Signed-off-by: Mykola Kostenok <[email protected]>
45+
Signed-off-by: Stephen <[email protected]>
46+
47+
sonic update kernel config mlsxw pci
48+
49+
Signed-off-by: Vadim Pasternak <[email protected]>
50+
Signed-off-by: Stephen <[email protected]>
51+
52+
Adjust configurations
53+
54+
Signed-off-by: Stephen <[email protected]>
55+
---
56+
debian/build/build_amd64_none_amd64/.config | 53 +++++++++++++++++++++--------
57+
1 file changed, 39 insertions(+), 14 deletions(-)
58+
59+
diff --git a/debian/build/build_amd64_none_amd64/.config b/debian/build/build_amd64_none_amd64/.config
60+
index b62b167..d74909b 100644
61+
--- a/debian/build/build_amd64_none_amd64/.config
62+
+++ b/debian/build/build_amd64_none_amd64/.config
63+
@@ -2235,9 +2235,9 @@ CONFIG_EEPROM_LEGACY=m
64+
CONFIG_EEPROM_MAX6875=m
65+
CONFIG_EEPROM_93CX6=m
66+
# CONFIG_EEPROM_93XX46 is not set
67+
+# CONFIG_EEPROM_IDT_89HPESX is not set
68+
CONFIG_EEPROM_SFF_8436=m
69+
CONFIG_EEPROM_OPTOE=m
70+
-# CONFIG_EEPROM_IDT_89HPESX is not set
71+
CONFIG_CB710_CORE=m
72+
# CONFIG_CB710_DEBUG is not set
73+
CONFIG_CB710_DEBUG_ASSUMPTIONS=y
74+
@@ -2860,7 +2860,13 @@ CONFIG_MLX5_MPFS=y
75+
CONFIG_MLX5_CORE_EN_DCB=y
76+
CONFIG_MLX5_CORE_IPOIB=y
77+
# CONFIG_MLX5_EN_IPSEC is not set
78+
-# CONFIG_MLXSW_CORE is not set
79+
+CONFIG_MLXSW_CORE=m
80+
+CONFIG_MLXSW_CORE_HWMON=y
81+
+CONFIG_MLXSW_CORE_THERMAL=y
82+
+CONFIG_MLXSW_CORE_QSFP=y
83+
+# CONFIG_MLXSW_PCI is not set
84+
+CONFIG_MLXSW_I2C=m
85+
+CONFIG_MLXSW_MINIMAL=m
86+
CONFIG_MLXFW=m
87+
CONFIG_NET_VENDOR_MICREL=y
88+
# CONFIG_KS8842 is not set
89+
@@ -3874,8 +3880,8 @@ CONFIG_I2C_MUX_GPIO=m
90+
# CONFIG_I2C_MUX_LTC4306 is not set
91+
# CONFIG_I2C_MUX_PCA9541 is not set
92+
CONFIG_I2C_MUX_PCA954x=m
93+
-# CONFIG_I2C_MUX_REG is not set
94+
-# CONFIG_I2C_MUX_MLXCPLD is not set
95+
+CONFIG_I2C_MUX_REG=m
96+
+CONFIG_I2C_MUX_MLXCPLD=m
97+
CONFIG_I2C_HELPER_AUTO=y
98+
CONFIG_I2C_SMBUS=m
99+
CONFIG_I2C_ALGOBIT=m
100+
@@ -3944,7 +3950,7 @@ CONFIG_I2C_VIPERBOARD=m
101+
#
102+
# Other I2C/SMBus bus drivers
103+
#
104+
-# CONFIG_I2C_MLXCPLD is not set
105+
+CONFIG_I2C_MLXCPLD=m
106+
CONFIG_I2C_STUB=m
107+
# CONFIG_I2C_SLAVE is not set
108+
# CONFIG_I2C_DEBUG_CORE is not set
109+
@@ -4214,7 +4218,7 @@ CONFIG_SENSORS_G760A=m
110+
# CONFIG_SENSORS_HIH6130 is not set
111+
CONFIG_SENSORS_IBMAEM=m
112+
CONFIG_SENSORS_IBMPEX=m
113+
-# CONFIG_SENSORS_IIO_HWMON is not set
114+
+CONFIG_SENSORS_IIO_HWMON=m
115+
CONFIG_SENSORS_I5500=m
116+
CONFIG_SENSORS_CORETEMP=m
117+
CONFIG_SENSORS_IT87=m
118+
@@ -4243,6 +4247,7 @@ CONFIG_SENSORS_MAX6620=m
119+
CONFIG_SENSORS_MAX6697=m
120+
CONFIG_SENSORS_MAX31790=m
121+
# CONFIG_SENSORS_MCP3021 is not set
122+
+CONFIG_SENSORS_MLXREG_FAN=m
123+
# CONFIG_SENSORS_TC654 is not set
124+
CONFIG_SENSORS_MENF21BMC_HWMON=m
125+
CONFIG_SENSORS_ADCXX=m
126+
@@ -4271,7 +4276,24 @@ CONFIG_SENSORS_NCT7802=m
127+
CONFIG_SENSORS_NCT7904=m
128+
CONFIG_SENSORS_NPCM7XX=m
129+
CONFIG_SENSORS_PCF8591=m
130+
-# CONFIG_PMBUS is not set
131+
+CONFIG_PMBUS=m
132+
+CONFIG_SENSORS_PMBUS=m
133+
+# CONFIG_SENSORS_ADM1275 is not set
134+
+# CONFIG_SENSORS_IBM_CFFPS is not set
135+
+# CONFIG_SENSORS_IR35221 is not set
136+
+CONFIG_SENSORS_LM25066=m
137+
+# CONFIG_SENSORS_LTC2978 is not set
138+
+# CONFIG_SENSORS_LTC3815 is not set
139+
+# CONFIG_SENSORS_MAX16064 is not set
140+
+# CONFIG_SENSORS_MAX20751 is not set
141+
+# CONFIG_SENSORS_MAX31785 is not set
142+
+# CONFIG_SENSORS_MAX34440 is not set
143+
+# CONFIG_SENSORS_MAX8688 is not set
144+
+# CONFIG_SENSORS_TPS40422 is not set
145+
+CONFIG_SENSORS_TPS53679=m
146+
+CONFIG_SENSORS_UCD9000=m
147+
+CONFIG_SENSORS_UCD9200=m
148+
+# CONFIG_SENSORS_ZL6100 is not set
149+
# CONFIG_SENSORS_SHT15 is not set
150+
CONFIG_SENSORS_SHT21=m
151+
# CONFIG_SENSORS_SHT3x is not set
152+
@@ -4372,6 +4394,7 @@ CONFIG_MENF21BMC_WATCHDOG=m
153+
CONFIG_WDAT_WDT=m
154+
# CONFIG_XILINX_WATCHDOG is not set
155+
# CONFIG_ZIIRAVE_WATCHDOG is not set
156+
+CONFIG_MLX_WDT=y
157+
# CONFIG_CADENCE_WATCHDOG is not set
158+
# CONFIG_DW_WATCHDOG is not set
159+
# CONFIG_MAX63XX_WATCHDOG is not set
160+
@@ -6466,7 +6489,7 @@ CONFIG_LEDS_MENF21BMC=m
161+
#
162+
# CONFIG_LEDS_BLINKM is not set
163+
# CONFIG_LEDS_MLXCPLD is not set
164+
-# CONFIG_LEDS_MLXREG is not set
165+
+CONFIG_LEDS_MLXREG=m
166+
# CONFIG_LEDS_USER is not set
167+
# CONFIG_LEDS_NIC78BX is not set
168+
169+
@@ -6674,7 +6697,7 @@ CONFIG_INTEL_MIC_X100_DMA=m
170+
# CONFIG_QCOM_HIDMA is not set
171+
CONFIG_DW_DMAC_CORE=m
172+
CONFIG_DW_DMAC=m
173+
-# CONFIG_DW_DMAC_PCI is not set
174+
+CONFIG_DW_DMAC_PCI=m
175+
CONFIG_HSU_DMA=y
176+
177+
#
178+
@@ -7055,7 +7078,7 @@ CONFIG_INTEL_PMC_IPC=m
179+
CONFIG_SURFACE_PRO3_BUTTON=m
180+
# CONFIG_SURFACE_3_BUTTON is not set
181+
# CONFIG_INTEL_PUNIT_IPC is not set
182+
-# CONFIG_MLX_PLATFORM is not set
183+
+CONFIG_MLX_PLATFORM=m
184+
# CONFIG_INTEL_TURBO_MAX_3 is not set
185+
# CONFIG_INTEL_CHTDC_TI_PWRBTN is not set
186+
# CONFIG_I2C_MULTI_INSTANTIATE is not set
187+
@@ -7066,7 +7089,9 @@ CONFIG_CHROMEOS_LAPTOP=m
188+
CONFIG_CHROMEOS_PSTORE=m
189+
# CONFIG_CHROMEOS_TBMC is not set
190+
CONFIG_CROS_KBD_LED_BACKLIGHT=m
191+
-# CONFIG_MELLANOX_PLATFORM is not set
192+
+CONFIG_MELLANOX_PLATFORM=y
193+
+CONFIG_MLXREG_HOTPLUG=m
194+
+CONFIG_MLXREG_IO=m
195+
CONFIG_CLKDEV_LOOKUP=y
196+
CONFIG_HAVE_CLK_PREPARE=y
197+
CONFIG_COMMON_CLK=y
198+
@@ -7252,7 +7277,7 @@ CONFIG_MMA9553=m
199+
# CONFIG_MAX1027 is not set
200+
# CONFIG_MAX11100 is not set
201+
# CONFIG_MAX1118 is not set
202+
-# CONFIG_MAX1363 is not set
203+
+CONFIG_MAX1363=m
204+
# CONFIG_MAX9611 is not set
205+
# CONFIG_MCP320X is not set
206+
# CONFIG_MCP3422 is not set
207+
--
208+
1.9.1
209+

0 commit comments

Comments
 (0)