Skip to content

Commit

Permalink
[Mellanox] Add new patches come along with hw-mgmt V.7.0000.3032 (#132)
Browse files Browse the repository at this point in the history
What I did:
Added four patches along with hw-mgmt V.7.0000.3032 to buster. They are:
0007-mlxsw-core-thermal-Set-default-thermal-trips-at-init.patch
0008-mlxsw-qsfp_sysfs-Remove-obsolete-code-for-QSFP-EEPRO.patch
0009-platform-mellanox-mlxreg-io-Add-support-for-compl.patch
0010-platform-mellanox-mlxreg-hotplug-Add-environmental-d.patch

How I verify:
Run platform regression test on spectrum 1, spectrum 2 and specturm 3. No new issue found.
  • Loading branch information
Junchao-Mellanox authored Apr 23, 2020
1 parent 246e7fa commit 57f0a4e
Show file tree
Hide file tree
Showing 5 changed files with 943 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
From d1bfc3dfb848ea1b402e2299b1e3b974aad9be60 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@mellanox.com>
Date: Tue, 31 Mar 2020 22:50:02 +0300
Subject: [backport 1/2] mlxsw: core: thermal: Set default thermal trips at
initialization

Set default thermal trip temperatures during thermal zone
initialization. Otherwise polling time for thermal control
could stay zero and such thermal zones will not be triggered by
thermal algorithm.

Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
index b75372998..fc0264f2f 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@ -20,6 +20,10 @@
#define MLXSW_THERMAL_ASIC_TEMP_HIGH 85000 /* 85C */
#define MLXSW_THERMAL_ASIC_TEMP_HOT 105000 /* 105C */
#define MLXSW_THERMAL_ASIC_TEMP_CRIT 110000 /* 110C */
+#define MLXSW_THERMAL_MODULE_TEMP_NORM 60000 /* 60C */
+#define MLXSW_THERMAL_MODULE_TEMP_HIGH 70000 /* 70C */
+#define MLXSW_THERMAL_MODULE_TEMP_HOT 80000 /* 80C */
+#define MLXSW_THERMAL_MODULE_TEMP_CRIT 90000 /* 90C */
#define MLXSW_THERMAL_HYSTERESIS_TEMP 5000 /* 5C */
#define MLXSW_THERMAL_MODULE_TEMP_SHIFT (MLXSW_THERMAL_HYSTERESIS_TEMP * 2)
#define MLXSW_THERMAL_ZONE_MAX_NAME 16
@@ -153,10 +157,10 @@ static int mlxsw_get_cooling_device_idx(struct mlxsw_thermal *thermal,
static void
mlxsw_thermal_module_trips_reset(struct mlxsw_thermal_module *tz)
{
- tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM].temp = 0;
- tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH].temp = 0;
- tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT].temp = 0;
- tz->trips[MLXSW_THERMAL_TEMP_TRIP_CRIT].temp = 0;
+ tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM].temp = MLXSW_THERMAL_MODULE_TEMP_NORM;
+ tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH].temp = MLXSW_THERMAL_MODULE_TEMP_HIGH;
+ tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT].temp = MLXSW_THERMAL_MODULE_TEMP_HOT;
+ tz->trips[MLXSW_THERMAL_TEMP_TRIP_CRIT].temp = MLXSW_THERMAL_MODULE_TEMP_CRIT;
}

static int
--
2.20.1

Loading

0 comments on commit 57f0a4e

Please sign in to comment.