Skip to content

Commit

Permalink
hw-mgmt: sensors: Update sensors config files for QM3000 and QM3400
Browse files Browse the repository at this point in the history 
  1. Remove explicit i2c bus numbers for VR devices.
     Due to a limitation in sensors tool, VR devices with identical
     I2C addresses, attached to different I2C busses, have their
     labels displayed incorrectly.
  3. Adjust VR device labels accordingly
  2. Add configuration for second source xdpe1a2g7 VR devices

Signed-off-by: Felix Radensky <fradensky@nvidia.com>
  • Loading branch information
@felixradensky
felixradensky committed Jan 7, 2024
1 parent 7cf494a commit bf247ed
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 189 deletions.
188 changes: 59 additions & 129 deletions usr/etc/hw-management-sensors/qm3000_sensors.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,146 +25,76 @@ chip "stts751-i2c-*-4a"
label temp1 "Ambient Port Side Temp (air exhaust)"

# ASIC power controllers
chip "mp2891-i2c-5-66"
label vin "PMIC-1 ASIC1 12V VDD Volt (in)"
label vout1 "PMIC-1 ASIC1 VDD Volt (out1)"
chip "mp2891-i2c-*-66"
label vin "PMIC-1 12V VDD Volt (in)"
label vout1 "PMIC-1 VDD Volt (out1)"
ignore vout2
label temp1 "PMIC-1 Temp 1"
label pin "PMIC-1 ASIC1 12V VDD Pwr (in)"
label pout1 "PMIC-1 ASIC1 VDD Pwr (out1)"
label pin "PMIC-1 12V VDD Pwr (in)"
label pout1 "PMIC-1 VDD Pwr (out1)"
ignore pout2
label iin "PMIC-1 ASIC1 12V VDD Curr (in)"
label iout1 "PMIC-1 ASIC1 VDD Curr (out1)"
label iin "PMIC-1 12V VDD Curr (in)"
label iout1 "PMIC-1 VDD Curr (out1)"
ignore iout2
chip "mp2891-i2c-5-68"
label vin "PMIC-2 ASIC1 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-2 ASIC1 HVDD PL0 Volt (out1)"
label vout2 "PMIC-2 ASIC1 DVDD PL0 Volt (out2)"
chip "mp2891-i2c-*-68"
label vin "PMIC-2 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-2 HVDD PL0 Volt (out1)"
label vout2 "PMIC-2 DVDD PL0 Volt (out2)"
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label pin "PMIC-2 ASIC1 12V HVDD DVDD (in)"
label pout1 "PMIC-2 ASIC1 HVDD PL0 Pwr (out1)"
label pout2 "PMIC-2 ASIC1 DVDD PL0 Pwr (out2)"
label iin "PMIC-2 ASIC1 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-2 ASIC1 HVDD PL0 Curr (out1)"
label iout2 "PMIC-2 ASIC1 DVDD PL0 Curr (out2)"
chip "mp2891-i2c-5-6c"
label vin "PMIC-3 ASIC1 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-3 ASIC1 HVDD PL1 Volt (out1)"
label vout2 "PMIC-3 ASIC1 DVDD PL1 Volt (out2)"
label pin "PMIC-2 12V HVDD DVDD (in)"
label pout1 "PMIC-2 HVDD PL0 Pwr (out1)"
label pout2 "PMIC-2 DVDD PL0 Pwr (out2)"
label iin "PMIC-2 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-2 HVDD PL0 Curr (out1)"
label iout2 "PMIC-2 DVDD PL0 Curr (out2)"
chip "mp2891-i2c-*-6c"
label vin "PMIC-3 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-3 HVDD PL1 Volt (out1)"
label vout2 "PMIC-3 DVDD PL1 Volt (out2)"
label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2"
label pin "PMIC-3 ASIC1 12V HVDD DVDD (in)"
label pout1 "PMIC-3 ASIC1 HVDD PL1 Pwr (out1)"
label pout2 "PMIC-3 ASIC1 DVDD PL1 Pwr (out2)"
label iin "PMIC-3 ASIC1 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-3 ASIC1 HVDD PL1 Curr (out1)"
label iout2 "PMIC-3 ASIC1 DVDD PL1 Curr (out2)"
chip "mp2891-i2c-21-66"
label vin "PMIC-4 ASIC2 12V VDD Volt (in)"
label vout1 "PMIC-4 ASIC2 VDD Volt (out1)"
label pin "PMIC-3 12V HVDD DVDD (in)"
label pout1 "PMIC-3 HVDD PL1 Pwr (out1)"
label pout2 "PMIC-3 DVDD PL1 Pwr (out2)"
label iin "PMIC-3 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-3 HVDD PL1 Curr (out1)"
label iout2 "PMIC-3 DVDD PL1 Curr (out2)"
chip "xdpe1a2g7-i2c-*-66"
label vin "PMIC-1 12V VDD Volt (in)"
label vout1 "PMIC-1 VDD Volt (out1)"
ignore vout2
label temp1 "PMIC-4 Temp 1"
label pin "PMIC-4 ASIC2 12V VDD Pwr (in)"
label pout1 "PMIC-4 ASIC2 VDD Pwr (out1)"
ignore pout2
label iin "PMIC-4 ASIC2 12V VDD Curr (in)"
label iout1 "PMIC-4 ASIC2 VDD Curr (out1)"
ignore iout2
chip "mp2891-i2c-21-68"
label vin "PMIC-5 ASIC2 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-5 ASIC2 HVDD PL0 Volt (out1)"
label vout2 "PMIC-5 ASIC2 DVDD PL0 Volt (out2)"
label temp1 "PMIC-5 Temp 1"
label temp2 "PMIC-5 Temp 2"
label pin "PMIC-5 ASIC2 12V HVDD DVDD (in)"
label pout1 "PMIC-5 ASIC2 HVDD PL0 Pwr (out1)"
label pout2 "PMIC-5 ASIC2 DVDD PL0 Pwr (out2)"
label iin "PMIC-5 ASIC2 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-5 ASIC2 HVDD PL0 Curr (out1)"
label iout2 "PMIC-5 ASIC2 DVDD PL0 Curr (out2)"
chip "mp2891-i2c-21-6c"
label vin "PMIC-6 ASIC2 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-6 ASIC2 HVDD PL1 Volt (out1)"
label vout2 "PMIC-6 ASIC2 DVDD PL1 Volt (out2)"
label temp1 "PMIC-6 Temp 1"
label temp2 "PMIC-6 Temp 2"
label pin "PMIC-6 ASIC2 12V HVDD DVDD (in)"
label pout1 "PMIC-6 ASIC2 HVDD PL1 Pwr (out1)"
label pout2 "PMIC-6 ASIC2 DVDD PL1 Pwr (out2)"
label iin "PMIC-6 ASIC2 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-6 ASIC2 HVDD PL1 Curr (out1)"
label iout2 "PMIC-6 ASIC2 DVDD PL1 Curr (out2)"
chip "mp2891-i2c-37-66"
label vin "PMIC-7 ASIC3 12V VDD Volt (in)"
label vout1 "PMIC-7 ASIC3 VDD Volt (out1)"
ignore vout2
label temp1 "PMIC-7 Temp 1"
label pin "PMIC-7 ASIC3 12V VDD Pwr (in)"
label pout1 "PMIC-7 ASIC3 VDD Pwr (out1)"
ignore pout2
label iin "PMIC-7 ASIC3 12V VDD Curr (in)"
label iout1 "PMIC-7 ASIC3 VDD Curr (out1)"
ignore iout2
chip "mp2891-i2c-37-68"
label vin "PMIC-8 ASIC3 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-8 ASIC3 HVDD PL0 Volt (out1)"
label vout2 "PMIC-8 ASIC3 DVDD PL0 Volt (out2)"
label temp1 "PMIC-8 Temp 1"
label temp2 "PMIC-8 Temp 2"
label pin "PMIC-8 ASIC3 12V HVDD DVDD (in)"
label pout1 "PMIC-8 ASIC3 HVDD PL0 Pwr (out1)"
label pout2 "PMIC-8 ASIC3 DVDD PL0 Pwr (out2)"
label iin "PMIC-8 ASIC3 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-8 ASIC3 HVDD PL0 Curr (out1)"
label iout2 "PMIC-8 ASIC3 DVDD PL0 Curr (out2)"
chip "mp2891-i2c-37-6c"
label vin "PMIC-9 ASIC3 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-9 ASIC3 HVDD PL1 Volt (out1)"
label vout2 "PMIC-9 ASIC3 DVDD PL1 Volt (out2)"
label temp1 "PMIC-9 Temp 1"
label temp2 "PMIC-9 Temp 2"
label pin "PMIC-9 ASIC3 12V HVDD DVDD (in)"
label pout1 "PMIC-9 ASIC3 HVDD PL1 Pwr (out1)"
label pout2 "PMIC-9 ASIC3 DVDD PL1 Pwr (out2)"
label iin "PMIC-9 ASIC3 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-9 ASIC3 HVDD PL1 Curr (out1)"
label iout2 "PMIC-9 ASIC3 DVDD PL1 Curr (out2)"
chip "mp2891-i2c-53-66"
label vin "PMIC-10 ASIC4 12V VDD Volt (in)"
label vout1 "PMIC-10 ASIC4 VDD Volt (out1)"
ignore vout2
label temp1 "PMIC-10 Temp 1"
label pin "PMIC-10 ASIC4 12V VDD Pwr (in)"
label pout1 "PMIC-10 ASIC4 VDD Pwr (out1)"
label temp1 "PMIC-1 Temp 1"
label pin "PMIC-1 12V VDD Pwr (in)"
label pout1 "PMIC-1 VDD Pwr (out1)"
ignore pout2
label iin "PMIC-10 ASIC4 12V VDD Curr (in)"
label iout1 "PMIC-10 ASIC4 VDD Curr (out1)"
label iin "PMIC-1 12V VDD Curr (in)"
label iout1 "PMIC-1 VDD Curr (out1)"
ignore iout2
chip "mp2891-i2c-53-68"
label vin "PMIC-11 ASIC4 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-11 ASIC4 HVDD PL0 Volt (out1)"
label vout2 "PMIC-11 ASIC4 DVDD PL0 Volt (out2)"
label temp1 "PMIC-11 Temp 1"
label temp2 "PMIC-11 Temp 2"
label pin "PMIC-11 ASIC4 12V HVDD DVDD (in)"
label pout1 "PMIC-11 ASIC4 HVDD PL0 Pwr (out1)"
label pout2 "PMIC-11 ASIC4 DVDD PL0 Pwr (out2)"
label iin "PMIC-11 ASIC4 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-11 ASIC4 HVDD PL0 Curr (out1)"
label iout2 "PMIC-11 ASIC4 DVDD PL0 Curr (out2)"
chip "mp2891-i2c-53-6c"
label vin "PMIC-12 ASIC4 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-12 ASIC4 HVDD PL1 Volt (out1)"
label vout2 "PMIC-12 ASIC4 DVDD PL1 Volt (out2)"
label temp1 "PMIC-12 Temp 1"
label temp2 "PMIC-12 Temp 2"
label pin "PMIC-12 ASIC4 12V HVDD DVDD (in)"
label pout1 "PMIC-12 ASIC4 HVDD PL1 Pwr (out1)"
label pout2 "PMIC-12 ASIC4 DVDD PL1 Pwr (out2)"
label iin "PMIC-12 ASIC4 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-12 ASIC4 HVDD PL1 Curr (out1)"
label iout2 "PMIC-12 ASIC4 DVDD PL1 Curr (out2)"
chip "xdpe1a2g7-i2c-*-68"
label vin "PMIC-2 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-2 HVDD PL0 Volt (out1)"
label vout2 "PMIC-2 DVDD PL0 Volt (out2)"
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label pin "PMIC-2 12V HVDD DVDD (in)"
label pout1 "PMIC-2 HVDD PL0 Pwr (out1)"
label pout2 "PMIC-2 DVDD PL0 Pwr (out2)"
label iin "PMIC-2 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-2 HVDD PL0 Curr (out1)"
label iout2 "PMIC-2 DVDD PL0 Curr (out2)"
chip "xdpe1a2g7-i2c-*-6c"
label vin "PMIC-3 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-3 HVDD PL1 Volt (out1)"
label vout2 "PMIC-3 DVDD PL1 Volt (out2)"
label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2"
label pin "PMIC-3 12V HVDD DVDD (in)"
label pout1 "PMIC-3 HVDD PL1 Pwr (out1)"
label pout2 "PMIC-3 DVDD PL1 Pwr (out2)"
label iin "PMIC-3 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-3 HVDD PL1 Curr (out1)"
label iout2 "PMIC-3 DVDD PL1 Curr (out2)"

# Power supplies
chip "dps460-i2c-*-59"
Expand Down
120 changes: 60 additions & 60 deletions usr/etc/hw-management-sensors/qm3400_sensors.conf
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##################################################################################
# Copyright (c) 2019-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#
# Platform specific sensors config for QM3000
# Platform specific sensors config for QM3400
##################################################################################

# Bus names
Expand All @@ -25,76 +25,76 @@ chip "stts751-i2c-*-4a"
label temp1 "Ambient Port Side Temp (air exhaust)"

# ASIC power controllers
chip "mp2891-i2c-5-66"
label vin "PMIC-1 ASIC1 12V VDD Volt (in)"
label vout1 "PMIC-1 ASIC1 VDD Volt (out1)"
chip "mp2891-i2c-*-66"
label vin "PMIC-1 12V VDD Volt (in)"
label vout1 "PMIC-1 VDD Volt (out1)"
ignore vout2
label temp1 "PMIC-1 Temp 1"
label pin "PMIC-1 ASIC1 12V VDD Pwr (in)"
label pout1 "PMIC-1 ASIC1 VDD Pwr (out1)"
label pin "PMIC-1 12V VDD Pwr (in)"
label pout1 "PMIC-1 VDD Pwr (out1)"
ignore pout2
label iin "PMIC-1 ASIC1 12V VDD Curr (in)"
label iout1 "PMIC-1 ASIC1 VDD Curr (out1)"
label iin "PMIC-1 12V VDD Curr (in)"
label iout1 "PMIC-1 VDD Curr (out1)"
ignore iout2
chip "mp2891-i2c-5-68"
label vin "PMIC-2 ASIC1 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-2 ASIC1 HVDD PL0 Volt (out1)"
label vout2 "PMIC-2 ASIC1 DVDD PL0 Volt (out2)"
chip "mp2891-i2c-*-68"
label vin "PMIC-2 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-2 HVDD PL0 Volt (out1)"
label vout2 "PMIC-2 DVDD PL0 Volt (out2)"
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label pin "PMIC-2 ASIC1 12V HVDD DVDD (in)"
label pout1 "PMIC-2 ASIC1 HVDD PL0 Pwr (out1)"
label pout2 "PMIC-2 ASIC1 DVDD PL0 Pwr (out2)"
label iin "PMIC-2 ASIC1 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-2 ASIC1 HVDD PL0 Curr (out1)"
label iout2 "PMIC-2 ASIC1 DVDD PL0 Curr (out2)"
chip "mp2891-i2c-5-6c"
label vin "PMIC-3 ASIC1 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-3 ASIC1 HVDD PL1 Volt (out1)"
label vout2 "PMIC-3 ASIC1 DVDD PL1 Volt (out2)"
label pin "PMIC-2 12V HVDD DVDD (in)"
label pout1 "PMIC-2 HVDD PL0 Pwr (out1)"
label pout2 "PMIC-2 DVDD PL0 Pwr (out2)"
label iin "PMIC-2 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-2 HVDD PL0 Curr (out1)"
label iout2 "PMIC-2 DVDD PL0 Curr (out2)"
chip "mp2891-i2c-*-6c"
label vin "PMIC-3 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-3 HVDD PL1 Volt (out1)"
label vout2 "PMIC-3 DVDD PL1 Volt (out2)"
label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2"
label pin "PMIC-3 ASIC1 12V HVDD DVDD (in)"
label pout1 "PMIC-3 ASIC1 HVDD PL1 Pwr (out1)"
label pout2 "PMIC-3 ASIC1 DVDD PL1 Pwr (out2)"
label iin "PMIC-3 ASIC1 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-3 ASIC1 HVDD PL1 Curr (out1)"
label iout2 "PMIC-3 ASIC1 DVDD PL1 Curr (out2)"
chip "mp2891-i2c-21-66"
label vin "PMIC-4 ASIC2 12V VDD Volt (in)"
label vout1 "PMIC-4 ASIC2 VDD Volt (out1)"
label pin "PMIC-3 12V HVDD DVDD (in)"
label pout1 "PMIC-3 HVDD PL1 Pwr (out1)"
label pout2 "PMIC-3 DVDD PL1 Pwr (out2)"
label iin "PMIC-3 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-3 HVDD PL1 Curr (out1)"
label iout2 "PMIC-3 DVDD PL1 Curr (out2)"
chip "xdpe1a2g7-i2c-*-66"
label vin "PMIC-1 12V VDD Volt (in)"
label vout1 "PMIC-1 VDD Volt (out1)"
ignore vout2
label temp1 "PMIC-4 Temp 1"
label pin "PMIC-4 ASIC2 12V VDD Pwr (in)"
label pout1 "PMIC-4 ASIC2 VDD Pwr (out1)"
label temp1 "PMIC-1 Temp 1"
label pin "PMIC-1 12V VDD Pwr (in)"
label pout1 "PMIC-1 VDD Pwr (out1)"
ignore pout2
label iin "PMIC-4 ASIC2 12V VDD Curr (in)"
label iout1 "PMIC-4 ASIC2 VDD Curr (out1)"
label iin "PMIC-1 12V VDD Curr (in)"
label iout1 "PMIC-1 VDD Curr (out1)"
ignore iout2
chip "mp2891-i2c-21-68"
label vin "PMIC-5 ASIC2 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-5 ASIC2 HVDD PL0 Volt (out1)"
label vout2 "PMIC-5 ASIC2 DVDD PL0 Volt (out2)"
label temp1 "PMIC-5 Temp 1"
label temp2 "PMIC-5 Temp 2"
label pin "PMIC-5 ASIC2 12V HVDD DVDD (in)"
label pout1 "PMIC-5 ASIC2 HVDD PL0 Pwr (out1)"
label pout2 "PMIC-5 ASIC2 DVDD PL0 Pwr (out2)"
label iin "PMIC-5 ASIC2 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-5 ASIC2 HVDD PL0 Curr (out1)"
label iout2 "PMIC-5 ASIC2 DVDD PL0 Curr (out2)"
chip "mp2891-i2c-21-6c"
label vin "PMIC-6 ASIC2 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-6 ASIC2 HVDD PL1 Volt (out1)"
label vout2 "PMIC-6 ASIC2 DVDD PL1 Volt (out2)"
label temp1 "PMIC-6 Temp 1"
label temp2 "PMIC-6 Temp 2"
label pin "PMIC-6 ASIC2 12V HVDD DVDD (in)"
label pout1 "PMIC-6 ASIC2 HVDD PL1 Pwr (out1)"
label pout2 "PMIC-6 ASIC2 DVDD PL1 Pwr (out2)"
label iin "PMIC-6 ASIC2 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-6 ASIC2 HVDD PL1 Curr (out1)"
label iout2 "PMIC-6 ASIC2 DVDD PL1 Curr (out2)"
chip "xdpe1a2g7-i2c-*-68"
label vin "PMIC-2 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-2 HVDD PL0 Volt (out1)"
label vout2 "PMIC-2 DVDD PL0 Volt (out2)"
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label pin "PMIC-2 12V HVDD DVDD (in)"
label pout1 "PMIC-2 HVDD PL0 Pwr (out1)"
label pout2 "PMIC-2 DVDD PL0 Pwr (out2)"
label iin "PMIC-2 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-2 HVDD PL0 Curr (out1)"
label iout2 "PMIC-2 DVDD PL0 Curr (out2)"
chip "xdpe1a2g7-i2c-*-6c"
label vin "PMIC-3 12V HVDD DVDD Volt (in)"
label vout1 "PMIC-3 HVDD PL1 Volt (out1)"
label vout2 "PMIC-3 DVDD PL1 Volt (out2)"
label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2"
label pin "PMIC-3 12V HVDD DVDD (in)"
label pout1 "PMIC-3 HVDD PL1 Pwr (out1)"
label pout2 "PMIC-3 DVDD PL1 Pwr (out2)"
label iin "PMIC-3 12V HVDD DVDD Curr (in1)"
label iout1 "PMIC-3 HVDD PL1 Curr (out1)"
label iout2 "PMIC-3 DVDD PL1 Curr (out2)"

# Power supplies
chip "dps460-i2c-*-59"
Expand Down

0 comments on commit bf247ed

Please sign in to comment.