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>
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From 8b83fb501ac77d60e1cc30fac63e71f469ba0992 Mon Sep 17 00:00:00 2001
|
|
From: Vadim Pasternak <vadimp@nvidia.com>
|
|
Date: Fri, 10 Mar 2023 09:15:35 +0000
|
|
Subject: [PATCH backport v.5.10 1/1] platform: mellanox: mlx-platform: Modify
|
|
graceful shutdown callback and power down mask
|
|
|
|
Use kernel_power_off() instead of kernel_halt() to pass through
|
|
machine_power_off() -> pm_power_off(), otherwise axillary power does
|
|
not go off.
|
|
|
|
Change "power down" bitmask.
|
|
|
|
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
|
|
Reviewed-by: Michael Shych <michaelsh@nvidia.com>
|
|
---
|
|
drivers/platform/mellanox/mlx-platform.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/platform/mellanox/mlx-platform.c b/drivers/platform/mellanox/mlx-platform.c
|
|
index 67865636e..55afb4c90 100644
|
|
--- a/drivers/platform/mellanox/mlx-platform.c
|
|
+++ b/drivers/platform/mellanox/mlx-platform.c
|
|
@@ -227,7 +227,7 @@
|
|
MLXPLAT_CPLD_AGGR_MASK_LC_SDWN)
|
|
#define MLXPLAT_CPLD_LOW_AGGR_MASK_LOW 0xc1
|
|
#define MLXPLAT_CPLD_LOW_AGGR_MASK_ASIC2 BIT(2)
|
|
-#define MLXPLAT_CPLD_LOW_AGGR_MASK_PWR_BUT BIT(4)
|
|
+#define MLXPLAT_CPLD_LOW_AGGR_MASK_PWR_BUT GENMASK(5,4)
|
|
#define MLXPLAT_CPLD_LOW_AGGR_MASK_I2C BIT(6)
|
|
#define MLXPLAT_CPLD_PSU_MASK GENMASK(1, 0)
|
|
#define MLXPLAT_CPLD_PWR_MASK GENMASK(1, 0)
|
|
@@ -2509,7 +2509,7 @@ mlxplat_mlxcpld_l1_switch_pwr_events_handler(void *handle, enum mlxreg_hotplug_k
|
|
u8 action)
|
|
{
|
|
dev_info(&mlxplat_dev->dev, "System shutdown due to short press of power button");
|
|
- kernel_halt();
|
|
+ kernel_power_off();
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.20.1
|
|
|