Skip to content

[Nokia ixs7215] Platform API temperature threshold value fixes #10533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 25, 2022
Merged

[Nokia ixs7215] Platform API temperature threshold value fixes #10533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d87315
[Nokia ixs7215] Platform API temperature threshold value fixes
dflynn-Nokia Mar 28, 2022
9b1f266
Merge branch '202012' into 202012-temp-threshold-fixes
qiluo-msft Apr 15, 2022
93264df
Merge branch '202012' into 202012-temp-threshold-fixes
Blueve Apr 21, 2022
1da2966
Merge branch '202012' into 202012-temp-threshold-fixes
Blueve Apr 23, 2022
7539318
Merge branch '202012' into 202012-temp-threshold-fixes
Blueve Apr 24, 2022
a422783
Merge branch '202012' into 202012-temp-threshold-fixes
Blueve Apr 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/test/test-thermal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def main():
high_thresh = "NA"

print(" Low Threshold(C): {}, High Threshold(C): {}".format(low_thresh,
high_thresh))
high_thresh))

try:
crit_low_thresh = thermal.get_low_critical_threshold()
Expand Down
20 changes: 10 additions & 10 deletions platform/marvell-armhf/sonic-platform-nokia/7215/sonic_platform/thermal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,25 @@ def __init__(self, thermal_index):
if self.index < 3:
i2c_path = self.I2C_CLASS_DIR + self.I2C_DEV_MAPPING[self.index - 1][0]
sensor_index = self.I2C_DEV_MAPPING[self.index - 1][1]
sensor_max_suffix = "max"
sensor_crit_suffix = None
sensor_high_suffix = "max"
sensor_high_crit_suffix = None
hwmon_node = os.listdir(i2c_path)[0]
self.SENSOR_DIR = i2c_path + hwmon_node + '/'

# ADT7473 temperature sensors
elif self.index < 6:
i2c_path = self.I2C_CLASS_DIR + self.I2C_DEV_MAPPING[self.index - 1][0]
sensor_index = self.I2C_DEV_MAPPING[self.index - 1][1]
sensor_max_suffix = "max"
sensor_crit_suffix = "crit"
sensor_high_suffix = "crit"
sensor_high_crit_suffix = None
self.SENSOR_DIR = i2c_path

# Armada 38x SOC temperature sensor
else:
dev_path = self.HWMON_CLASS_DIR
sensor_index = 1
sensor_max_suffix = None
sensor_crit_suffix = None
sensor_high_suffix = None
sensor_high_crit_suffix = None
hwmon_node = os.listdir(dev_path)[0]
self.SENSOR_DIR = dev_path + hwmon_node + '/'

Expand All @@ -71,16 +71,16 @@ def __init__(self, thermal_index):
+ "temp{}_input".format(sensor_index)

# sysfs file for high threshold value if supported for this sensor
if sensor_max_suffix:
if sensor_high_suffix:
self.thermal_high_threshold_file = self.SENSOR_DIR \
+ "temp{}_{}".format(sensor_index, sensor_max_suffix)
+ "temp{}_{}".format(sensor_index, sensor_high_suffix)
else:
self.thermal_high_threshold_file = None

# sysfs file for crit high threshold value if supported for this sensor
if sensor_crit_suffix:
if sensor_high_crit_suffix:
self.thermal_high_crit_threshold_file = self.SENSOR_DIR \
+ "temp{}_{}".format(sensor_index, sensor_crit_suffix)
+ "temp{}_{}".format(sensor_index, sensor_high_crit_suffix)
else:
self.thermal_high_crit_threshold_file = None

Expand Down