diff options
9 files changed, 38 insertions, 30 deletions
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml index 31f9cb3c2..a6660f753 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml +++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml @@ -154,7 +154,7 @@ sensorType: 0x02 path: /xyz/openbmc_project/sensors/voltage/p1v8_stby sensorReadingType: 0x01 - multiplierM: 235 + multiplierM: 78 offsetB: 0 bExp: 0 rExp: -4 @@ -295,7 +295,7 @@ sensorType: 0x03 path: /xyz/openbmc_project/sensors/current/vddcr_cpu_in sensorReadingType: 0x01 - multiplierM: 78 + multiplierM: 86 rExp: -3 unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes mutability: Mutability::Read @@ -313,8 +313,8 @@ <<: *current entityInstance: 0x15 path: /xyz/openbmc_project/sensors/current/vddcr_cpu_out - multiplierM: 98 - rExp: -2 + multiplierM: 1 + rExp: 0 # PVDDCR_SOC0 0x3E: @@ -483,7 +483,7 @@ entityID: 0x0E entityInstance: 0x02 path: /xyz/openbmc_project/sensors/current/hotswap_iout - multiplierM: 353 + multiplierM: 216 rExp: -3 0x70: @@ -883,7 +883,7 @@ 0xC0: &nvme_power entityID: 0x04 entityInstance: 0x40 - sensorType: 0x00 + sensorType: 0xC0 path: /xyz/openbmc_project/control/nvme/u2_0_pwr_dis sensorReadingType: 0x03 mutability: Mutability::Write|Mutability::Read diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@0/max31725@54.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@0/max31725@54.conf index 839a7c610..b8ba115d1 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@0/max31725@54.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@0/max31725@54.conf @@ -1,8 +1,8 @@ LABEL_temp1 = "i2cool_0" -CRITHI_temp1 = "35000" -CRITLO_temp1 = "0" -WARNHI_temp1 = "35000" -WARNLO_temp1 = "0" +CRITHI_temp1 = "70000" +CRITLO_temp1 = "5000" +WARNHI_temp1 = "70000" +WARNLO_temp1 = "5000" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" ASYNC_READ_TIMEOUT_temp1 = "500" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@1/max31725@55.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@1/max31725@55.conf index 174c62b98..a798fc9bc 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@1/max31725@55.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@1/max31725@55.conf @@ -1,8 +1,8 @@ LABEL_temp1 = "i2cool_1" CRITHI_temp1 = "70000" -CRITLO_temp1 = "0" +CRITLO_temp1 = "5000" WARNHI_temp1 = "70000" -WARNLO_temp1 = "0" +WARNLO_temp1 = "5000" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" ASYNC_READ_TIMEOUT_temp1 = "500" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@2/max31725@5d.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@2/max31725@5d.conf index 3fb0ceeeb..a51043876 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@2/max31725@5d.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@2/max31725@5d.conf @@ -1,8 +1,8 @@ LABEL_temp1 = "i2cool_2" CRITHI_temp1 = "70000" -CRITLO_temp1 = "0" +CRITLO_temp1 = "5000" WARNHI_temp1 = "70000" -WARNLO_temp1 = "0" +WARNLO_temp1 = "5000" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" ASYNC_READ_TIMEOUT_temp1 = "500" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1272@10.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1272@10.conf index 3a83519bf..25172e08b 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1272@10.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@88000/adm1272@10.conf @@ -21,6 +21,8 @@ WARNHI_curr1= "40000" WARNLO_curr1= "0" MINVALUE_curr1 = "0" MAXVALUE_curr1 = "55" +# READ_Iout is direct value*0.98 +GAIN_curr1 = "0.98" LABEL_power1= "hotswap_pout" CRITHI_power1= "1920000000" @@ -29,3 +31,5 @@ WARNHI_power1= "1920000000" WARNLO_power1= "0" MINVALUE_power1 = "0" MAXVALUE_power1 = "2200" +# READ_Pout is direct value*0.98 +GAIN_power1 = "0.98" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf index 09cdfaf57..cc77194ee 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf @@ -19,19 +19,19 @@ MAXVALUE_in2 = "2" PWRONMON_in2 = "ON" LABEL_curr1 = "vddcr_cpu_in" -CRITHI_curr1 = "16700" +CRITHI_curr1 = "21250" CRITLO_curr1 = "0" -WARNHI_curr1 = "16700" +WARNHI_curr1 = "21250" WARNLO_curr1 = "0" MINVALUE_curr1 = "0" -MAXVALUE_curr1 = "20" +MAXVALUE_curr1 = "22" PWRONMON_curr1 = "ON" LABEL_curr2 = "vddcr_cpu_out" -CRITHI_curr2 = "200000" +CRITHI_curr2 = "255000" CRITLO_curr2 = "0" -WARNHI_curr2 = "200000" +WARNHI_curr2 = "255000" WARNLO_curr2 = "0" MINVALUE_curr2 = "0" -MAXVALUE_curr2 = "250" +MAXVALUE_curr2 = "256" PWRONMON_curr2 = "ON" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/max34451@4e.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/max34451@4e.conf index eda5341eb..5adb40c68 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/max34451@4e.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/max34451@4e.conf @@ -63,27 +63,27 @@ PWRONMON_in7 = "ON" LABEL_in8 = "pwrgd_pvpp" CRITHI_in8 = "3600" -CRITLO_in8 = "2600" +CRITLO_in8 = "1000" WARNHI_in8 = "3600" -WARNLO_in8 = "2600" +WARNLO_in8 = "1000" MINVALUE_in8 = "0" MAXVALUE_in8 = "4" PWRONMON_in8 = "ON" LABEL_in9 = "pwrgd_pvddio" CRITHI_in9 = "3600" -CRITLO_in9 = "2600" +CRITLO_in9 = "1000" WARNHI_in9 = "3600" -WARNLO_in9 = "2600" +WARNLO_in9 = "1000" MINVALUE_in9 = "0" MAXVALUE_in9 = "4" PWRONMON_in9 = "ON" LABEL_in10 = "pwrgd_cpuvr" CRITHI_in10 = "3600" -CRITLO_in10 = "2600" +CRITLO_in10 = "1000" WARNHI_in10 = "3600" -WARNLO_in10 = "2600" +WARNLO_in10 = "1000" MINVALUE_in10 = "0" MAXVALUE_in10 = "4" PWRONMON_in10 = "ON" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf index c5f694af6..2cd0ad6fc 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf @@ -21,18 +21,20 @@ GAIN_in2 = "5.02" PWRONMON_in2 = "ON" LABEL_curr1 = "p12v_fan_in" -CRITHI_curr1 = "22000" +CRITHI_curr1 = "30000" CRITLO_curr1 = "0" -WARNHI_curr1 = "22000" +WARNHI_curr1 = "30000" WARNLO_curr1 = "0" MINVALUE_curr1 = "0" MAXVALUE_curr1 = "35" +# READ_Iin is direct value*0.5 +GAIN_curr1 = "0.5" PWRONMON_curr1 = "ON" LABEL_curr2 = "p12v_fan_out" -CRITHI_curr2 = "88000" +CRITHI_curr2 = "100000" CRITLO_curr2 = "0" -WARNHI_curr2 = "88000" +WARNHI_curr2 = "100000" WARNLO_curr2 = "0" MINVALUE_curr2 = "0" MAXVALUE_curr2 = "150" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf index a8e92ef75..81d056d2f 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf @@ -27,6 +27,8 @@ WARNHI_curr1 = "30000" WARNLO_curr1 = "0" MINVALUE_curr1 = "0" MAXVALUE_curr1 = "35" +# READ_Iin is direct value*0.5 +GAIN_curr1 = "0.5" PWRONMON_curr1 = "ON" LABEL_curr2 = "p12v_mobo_out" |