From 712a27e4078956ba5d57cbbb677d46f7eadc50b7 Mon Sep 17 00:00:00 2001 From: George Hung Date: Tue, 19 May 2020 15:52:33 +0800 Subject: meta-quanta: gbs: add hwmon sensors Define the configuration files of the related sensors and test pass 0001-lev-add-poweron-monitor-feature.patch In-Review: https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-hwmon/+/28181 0002-lev-add-sensors-slow-readings.patch In-Review: https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-hwmon/+/24337 (From meta-quanta rev: a66f2b941cede5fc15fe0d6d56ca2ac9352fdf77) Signed-off-by: George Hung Change-Id: If7f767cbd952cde593e03d30c45572a21cc7c960 Signed-off-by: Andrew Geissler --- .../obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf (limited to 'meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf') 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 new file mode 100644 index 000000000..9ccd60219 --- /dev/null +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf @@ -0,0 +1,37 @@ +LABEL_in1 = "p12v_2_in" +CRITHI_in1 = "60000" +CRITLO_in1 = "40000" +WARNHI_in1 = "60000" +WARNLO_in1 = "40000" +MINVALUE_in1 = "0" +MAXVALUE_in1 = "65" +# READ_VIN is direct value *10 +GAIN_in1 = "10.0" +PWRONMON_in1 = "ON" + +LABEL_in2 = "p12v_2_out" +CRITHI_in2 = "12600" +CRITLO_in2 = "11400" +WARNHI_in2 = "12600" +WARNLO_in2 = "11400" +MINVALUE_in2 = "0" +MAXVALUE_in2 = "14" +PWRONMON_in2 = "ON" + +LABEL_curr1 = "p12v_2_in" +CRITHI_curr1 = "22000" +CRITLO_curr1 = "0" +WARNHI_curr1 = "22000" +WARNLO_curr1 = "0" +MINVALUE_curr1 = "0" +MAXVALUE_curr1 = "35" +PWRONMON_curr1 = "ON" + +LABEL_curr2 = "p12v_2_out" +CRITHI_curr2 = "88000" +CRITLO_curr2 = "0" +WARNHI_curr2 = "88000" +WARNLO_curr2 = "0" +MINVALUE_curr2 = "0" +MAXVALUE_curr2 = "150" +PWRONMON_curr2 = "ON" -- cgit v1.2.3 From 1f2e7000903ae47283405d537af914d49337fc4d Mon Sep 17 00:00:00 2001 From: George Hung Date: Wed, 5 Aug 2020 20:50:42 +0800 Subject: meta-quanta: gbs: fix p12v voltage GAIN and current threshold 1. fix p12v_1/2 input/output voltages GAIN to get the correct value 2. fix p12v_1 output current threshold (From meta-quanta rev: 58c91e5e8ad4e3c916bebbe76c958eafe0254e9e) Signed-off-by: George Hung Change-Id: I3394a2d33e22068509818e36b9dfd89e553703c5 Signed-off-by: Andrew Geissler --- .../phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf | 6 ++++-- .../phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf') 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 9ccd60219..530d36f1a 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 @@ -5,8 +5,8 @@ WARNHI_in1 = "60000" WARNLO_in1 = "40000" MINVALUE_in1 = "0" MAXVALUE_in1 = "65" -# READ_VIN is direct value *10 -GAIN_in1 = "10.0" +# READ_VIN is direct value*100 +GAIN_in1 = "100.0" PWRONMON_in1 = "ON" LABEL_in2 = "p12v_2_out" @@ -16,6 +16,8 @@ WARNHI_in2 = "12600" WARNLO_in2 = "11400" MINVALUE_in2 = "0" MAXVALUE_in2 = "14" +# READ_VOUT is direct value*5.02 +GAIN_in2 = "5.02" PWRONMON_in2 = "ON" LABEL_curr1 = "p12v_2_in" 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 aac47ac1a..59bf25511 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 @@ -5,8 +5,8 @@ WARNHI_in1 = "60000" WARNLO_in1 = "40000" MINVALUE_in1 = "0" MAXVALUE_in1 = "65" -# READ_VIN is direct value *10 -GAIN_in1 = "10.0" +# READ_VIN is direct value*100 +GAIN_in1 = "100.0" PWRONMON_in1 = "ON" LABEL_in2 = "p12v_1_out" @@ -16,6 +16,8 @@ WARNHI_in2 = "12600" WARNLO_in2 = "11400" MINVALUE_in2 = "0" MAXVALUE_in2 = "14" +# READ_VOUT is direct value*5.02 +GAIN_in2 = "5.02" PWRONMON_in2 = "ON" LABEL_curr1 = "p12v_1_in" @@ -28,9 +30,9 @@ MAXVALUE_curr1 = "35" PWRONMON_curr1 = "ON" LABEL_curr2 = "p12v_1_out" -CRITHI_curr2 = "10000" +CRITHI_curr2 = "100000" CRITLO_curr2 = "0" -WARNHI_curr2 = "10000" +WARNHI_curr2 = "100000" WARNLO_curr2 = "0" MINVALUE_curr2 = "0" MAXVALUE_curr2 = "150" -- cgit v1.2.3 From 83ddb552bf2038e39104722b72fea69d832c3d9a Mon Sep 17 00:00:00 2001 From: George Hung Date: Tue, 11 Aug 2020 21:11:11 +0800 Subject: meta-quanta: gbs: change VR and NVMe presence sensors name Change VR and NVMe presence sensors name to make them more readable VR: vddq_abcd_in => vddio_abcd_in vddq_abcd_out => vddio_abcd_out vddq_efgh_in => vddio_efgh_in vddq_efgh_out => vddio_efgh_out p12v_1_in => p12v_mobo_in p12v_1_out => p12v_mobo_out p12v_2_in => p12v_fan_in p12v_2_out => p12v_fan_out (From meta-quanta rev: dfef06ba145eb60e59de7d74310489a6c467a75a) Signed-off-by: George Hung Signed-off-by: Brandon Kim Change-Id: Ie40b6eda8eb72b29a015884ec7bfe4fdd5734979 Signed-off-by: Andrew Geissler --- .../gbs-yaml-config/gbs-ipmi-sensors.yaml | 32 +++++++++++----------- .../apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf | 8 +++--- .../apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf | 8 +++--- .../obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf | 8 +++--- .../obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf | 8 +++--- 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf') 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 40472a610..ee556b4a7 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 @@ -349,28 +349,28 @@ 0x40: <<: *voltage entityInstance: 0x10 - path: /xyz/openbmc_project/sensors/voltage/vddq_abcd_out + path: /xyz/openbmc_project/sensors/voltage/vddio_abcd_out multiplierM: 78 rExp: -4 0x41: <<: *voltage_13v5_in entityInstance: 0x11 - path: /xyz/openbmc_project/sensors/voltage/vddq_abcd_in + path: /xyz/openbmc_project/sensors/voltage/vddio_abcd_in multiplierM: 55 rExp: -3 0x55: <<: *current entityInstance: 0x19 - path: /xyz/openbmc_project/sensors/current/vddq_abcd_in + path: /xyz/openbmc_project/sensors/current/vddio_abcd_in multiplierM: 353 rExp: -4 0x54: <<: *current entityInstance: 0x18 - path: /xyz/openbmc_project/sensors/current/vddq_abcd_out + path: /xyz/openbmc_project/sensors/current/vddio_abcd_out multiplierM: 345 rExp: -3 @@ -378,28 +378,28 @@ 0x42: <<: *voltage entityInstance: 0x12 - path: /xyz/openbmc_project/sensors/voltage/vddq_efgh_out + path: /xyz/openbmc_project/sensors/voltage/vddio_efgh_out multiplierM: 78 rExp: -4 0x43: <<: *voltage_13v5_in entityInstance: 0x13 - path: /xyz/openbmc_project/sensors/voltage/vddq_efgh_in + path: /xyz/openbmc_project/sensors/voltage/vddio_efgh_in multiplierM: 55 rExp: -3 0x57: <<: *current entityInstance: 0x1b - path: /xyz/openbmc_project/sensors/current/vddq_efgh_in + path: /xyz/openbmc_project/sensors/current/vddio_efgh_in multiplierM: 353 rExp: -4 0x56: <<: *current entityInstance: 0x1a - path: /xyz/openbmc_project/sensors/current/vddq_efgh_out + path: /xyz/openbmc_project/sensors/current/vddio_efgh_out multiplierM: 345 rExp: -3 @@ -407,28 +407,28 @@ 0x47: <<: *voltage entityInstance: 0x20 - path: /xyz/openbmc_project/sensors/voltage/p12v_1_out + path: /xyz/openbmc_project/sensors/voltage/p12v_mobo_out multiplierM: 55 rExp: -3 0x48: <<: *voltage_13v5_in entityInstance: 0x21 - path: /xyz/openbmc_project/sensors/voltage/p12v_1_in + path: /xyz/openbmc_project/sensors/voltage/p12v_mobo_in multiplierM: 255 rExp: -3 0x5A: <<: *current entityInstance: 0x25 - path: /xyz/openbmc_project/sensors/current/p12v_1_in + path: /xyz/openbmc_project/sensors/current/p12v_mobo_in multiplierM: 137 rExp: -3 0x59: <<: *current entityInstance: 0x24 - path: /xyz/openbmc_project/sensors/current/p12v_1_out + path: /xyz/openbmc_project/sensors/current/p12v_mobo_out multiplierM: 59 rExp: -2 @@ -436,28 +436,28 @@ 0x49: <<: *voltage entityInstance: 0x22 - path: /xyz/openbmc_project/sensors/voltage/p12v_2_out + path: /xyz/openbmc_project/sensors/voltage/p12v_fan_out multiplierM: 55 rExp: -3 0x4A: <<: *voltage_13v5_in entityInstance: 0x23 - path: /xyz/openbmc_project/sensors/voltage/p12v_2_in + path: /xyz/openbmc_project/sensors/voltage/p12v_fan_in multiplierM: 255 rExp: -3 0x5C: <<: *current entityInstance: 0x27 - path: /xyz/openbmc_project/sensors/current/p12v_2_in + path: /xyz/openbmc_project/sensors/current/p12v_fan_in multiplierM: 137 rExp: -3 0x5B: <<: *current entityInstance: 0x26 - path: /xyz/openbmc_project/sensors/current/p12v_2_out + path: /xyz/openbmc_project/sensors/current/p12v_fan_out multiplierM: 59 rExp: -2 diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf index 757e69950..6fb856335 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf @@ -1,4 +1,4 @@ -LABEL_in1 = "vddq_efgh_in" +LABEL_in1 = "vddio_efgh_in" CRITHI_in1 = "12600" CRITLO_in1 = "11400" WARNHI_in1 = "12600" @@ -9,7 +9,7 @@ MAXVALUE_in1 = "14" GAIN_in1 = "10.0" PWRONMON_in1 = "ON" -LABEL_in2 = "vddq_efgh_out" +LABEL_in2 = "vddio_efgh_out" CRITHI_in2 = "1320" CRITLO_in2 = "800" WARNHI_in2 = "1320" @@ -18,7 +18,7 @@ MINVALUE_in2 = "0" MAXVALUE_in2 = "2" PWRONMON_in2 = "ON" -LABEL_curr1 = "vddq_efgh_in" +LABEL_curr1 = "vddio_efgh_in" CRITHI_curr1 = "8400" CRITLO_curr1 = "0" WARNHI_curr1 = "8400" @@ -27,7 +27,7 @@ MINVALUE_curr1 = "0" MAXVALUE_curr1 = "9" PWRONMON_curr1 = "ON" -LABEL_curr2 = "vddq_efgh_out" +LABEL_curr2 = "vddio_efgh_out" CRITHI_curr2 = "84000" CRITLO_curr2 = "0" WARNHI_curr2 = "84000" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf index df12a20c4..5c484c53d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf @@ -1,4 +1,4 @@ -LABEL_in1 = "vddq_abcd_in" +LABEL_in1 = "vddio_abcd_in" CRITHI_in1 = "12600" CRITLO_in1 = "11400" WARNHI_in1 = "12600" @@ -9,7 +9,7 @@ MAXVALUE_in1 = "14" GAIN_in1 = "10.0" PWRONMON_in1 = "ON" -LABEL_in2 = "vddq_abcd_out" +LABEL_in2 = "vddio_abcd_out" CRITHI_in2 = "1320" CRITLO_in2 = "800" WARNHI_in2 = "1320" @@ -18,7 +18,7 @@ MINVALUE_in2 = "0" MAXVALUE_in2 = "2" PWRONMON_in2 = "ON" -LABEL_curr1 = "vddq_abcd_in" +LABEL_curr1 = "vddio_abcd_in" CRITHI_curr1 = "8400" CRITLO_curr1 = "0" WARNHI_curr1 = "8400" @@ -27,7 +27,7 @@ MINVALUE_curr1 = "0" MAXVALUE_curr1 = "9" PWRONMON_curr1 = "ON" -LABEL_curr2 = "vddq_abcd_out" +LABEL_curr2 = "vddio_abcd_out" CRITHI_curr2 = "84000" CRITLO_curr2 = "0" WARNHI_curr2 = "84000" 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 530d36f1a..c5f694af6 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 @@ -1,4 +1,4 @@ -LABEL_in1 = "p12v_2_in" +LABEL_in1 = "p12v_fan_in" CRITHI_in1 = "60000" CRITLO_in1 = "40000" WARNHI_in1 = "60000" @@ -9,7 +9,7 @@ MAXVALUE_in1 = "65" GAIN_in1 = "100.0" PWRONMON_in1 = "ON" -LABEL_in2 = "p12v_2_out" +LABEL_in2 = "p12v_fan_out" CRITHI_in2 = "12600" CRITLO_in2 = "11400" WARNHI_in2 = "12600" @@ -20,7 +20,7 @@ MAXVALUE_in2 = "14" GAIN_in2 = "5.02" PWRONMON_in2 = "ON" -LABEL_curr1 = "p12v_2_in" +LABEL_curr1 = "p12v_fan_in" CRITHI_curr1 = "22000" CRITLO_curr1 = "0" WARNHI_curr1 = "22000" @@ -29,7 +29,7 @@ MINVALUE_curr1 = "0" MAXVALUE_curr1 = "35" PWRONMON_curr1 = "ON" -LABEL_curr2 = "p12v_2_out" +LABEL_curr2 = "p12v_fan_out" CRITHI_curr2 = "88000" CRITLO_curr2 = "0" WARNHI_curr2 = "88000" 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 59bf25511..a8e92ef75 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 @@ -1,4 +1,4 @@ -LABEL_in1 = "p12v_1_in" +LABEL_in1 = "p12v_mobo_in" CRITHI_in1 = "60000" CRITLO_in1 = "40000" WARNHI_in1 = "60000" @@ -9,7 +9,7 @@ MAXVALUE_in1 = "65" GAIN_in1 = "100.0" PWRONMON_in1 = "ON" -LABEL_in2 = "p12v_1_out" +LABEL_in2 = "p12v_mobo_out" CRITHI_in2 = "12600" CRITLO_in2 = "11400" WARNHI_in2 = "12600" @@ -20,7 +20,7 @@ MAXVALUE_in2 = "14" GAIN_in2 = "5.02" PWRONMON_in2 = "ON" -LABEL_curr1 = "p12v_1_in" +LABEL_curr1 = "p12v_mobo_in" CRITHI_curr1 = "30000" CRITLO_curr1 = "0" WARNHI_curr1 = "30000" @@ -29,7 +29,7 @@ MINVALUE_curr1 = "0" MAXVALUE_curr1 = "35" PWRONMON_curr1 = "ON" -LABEL_curr2 = "p12v_1_out" +LABEL_curr2 = "p12v_mobo_out" CRITHI_curr2 = "100000" CRITLO_curr2 = "0" WARNHI_curr2 = "100000" -- cgit v1.2.3 From 05b628c46e40112382ce268517387c02070a08e8 Mon Sep 17 00:00:00 2001 From: George Hung Date: Thu, 3 Sep 2020 14:23:39 +0800 Subject: meta-gbs: update some sensors m value/threshold/GAIN/sensor type 1. update max31725 temperature threshold 2. add adm1272 power GAIN 3. update vddcr_cpu_in/out current threshold 4. update pwrgd_pvpp/pwrgd_pvddio/pwrgd_cpuvr voltage threshold 5. update p12v_fan_in/out current threshold 6. add p12v_mobo_in/p12v_fan_in current GAIN 7. update p1v8_stby voltage m value 8. update vddcr_cpu_in current m value 9. update hotswap_iout current m value 10.nvme pwr_dis/en sensor type 0x00 -> 0xC0 (From meta-quanta rev: 444a37116b4902b0efffc1c013fc5f6ebf60aa69) Signed-off-by: George Hung Change-Id: Iac993f356a7b3fa8647973479477e5a5ce82655f Signed-off-by: Andrew Geissler --- .../configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml | 12 ++++++------ .../ahb/apb/i2c@85000/i2c-switch@71/i2c@0/max31725@54.conf | 8 ++++---- .../ahb/apb/i2c@85000/i2c-switch@71/i2c@1/max31725@55.conf | 4 ++-- .../ahb/apb/i2c@85000/i2c-switch@71/i2c@2/max31725@5d.conf | 4 ++-- .../obmc/hwmon/ahb/apb/i2c@88000/adm1272@10.conf | 4 ++++ .../hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf | 12 ++++++------ .../obmc/hwmon/ahb/apb/i2c@8c000/max34451@4e.conf | 12 ++++++------ .../phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf | 10 ++++++---- .../phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf | 2 ++ 9 files changed, 38 insertions(+), 30 deletions(-) (limited to 'meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf') 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" -- cgit v1.2.3 From 24be2dfa81d083ab315c2cf290b3b32a2d9e18d1 Mon Sep 17 00:00:00 2001 From: George Hung Date: Thu, 10 Sep 2020 21:15:54 +0800 Subject: meta-quanta: gbs: add VR/adm1272 temperature sensors VR temperature sensor names: vddcr_cpu vddcr_soc vddio_abcd vddio_efgh p12v_mobo p12v_fan adm1272 temperature sensor name: hotswap Note: Since adm1272 PMON_CONFIG didn't enable temperature monitoring by default, add the driver patch to support it (From meta-quanta rev: c680ebe0310ff72dd0811616830d22f5d5bfa108) Signed-off-by: George Hung Change-Id: Icb39c0827fe66faaa91d24b3fc93e15f53d21782 Signed-off-by: Andrew Geissler --- ...-meta-gbs-Enable-adm1272-ADM1272_TEMP1_EN.patch | 45 ++++++++++++++++++++++ .../recipes-kernel/linux/linux-nuvoton_%.bbappend | 1 + .../gbs-yaml-config/gbs-ipmi-sensors.yaml | 39 ++++++++++++++++++- .../obmc/hwmon/ahb/apb/i2c@88000/adm1272@10.conf | 8 ++++ .../apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf | 9 +++++ .../apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf | 9 +++++ .../apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf | 9 +++++ .../apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf | 9 +++++ .../obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf | 9 +++++ .../obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf | 9 +++++ 10 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/0001-meta-gbs-Enable-adm1272-ADM1272_TEMP1_EN.patch (limited to 'meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf') diff --git a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/0001-meta-gbs-Enable-adm1272-ADM1272_TEMP1_EN.patch b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/0001-meta-gbs-Enable-adm1272-ADM1272_TEMP1_EN.patch new file mode 100644 index 000000000..1cfd330ab --- /dev/null +++ b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/0001-meta-gbs-Enable-adm1272-ADM1272_TEMP1_EN.patch @@ -0,0 +1,45 @@ +From 8e211c8bc64521d772c4389219889a240b40307b Mon Sep 17 00:00:00 2001 +From: Charles +Date: Fri, 14 Aug 2020 18:06:22 +0800 +Subject: [PATCH] meta-gis: Enable adm1272 ADM1272_TEMP1_EN + +--- + drivers/hwmon/pmbus/adm1275.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c +index 5caa37fbfc18..550b9a8388f6 100644 +--- a/drivers/hwmon/pmbus/adm1275.c ++++ b/drivers/hwmon/pmbus/adm1275.c +@@ -595,11 +595,13 @@ static int adm1275_probe(struct i2c_client *client, + tindex = 8; + + info->func[0] |= PMBUS_HAVE_PIN | PMBUS_HAVE_STATUS_INPUT | +- PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT; ++ PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT | ++ PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP; + +- /* Enable VOUT if not enabled (it is disabled by default) */ +- if (!(config & ADM1278_VOUT_EN)) { +- config |= ADM1278_VOUT_EN; ++ ++ /* Enable VOUT & TEMP1 if not enabled (it is disabled by default) */ ++ if ((config & (ADM1278_VOUT_EN | ADM1278_TEMP1_EN)) != (ADM1278_VOUT_EN | ADM1278_TEMP1_EN)) { ++ config |= ADM1278_VOUT_EN | ADM1278_TEMP1_EN; + ret = i2c_smbus_write_byte_data(client, + ADM1275_PMON_CONFIG, + config); +@@ -610,9 +612,7 @@ static int adm1275_probe(struct i2c_client *client, + } + } + +- if (config & ADM1278_TEMP1_EN) +- info->func[0] |= +- PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP; ++ + if (config & ADM1278_VIN_EN) + info->func[0] |= PMBUS_HAVE_VIN; + break; +-- +2.25.1 + diff --git a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend index 6347ff638..4de4ca900 100644 --- a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -4,3 +4,4 @@ SRC_URI_append_gbs = " file://0003-Add-basic-support-for-SB-TSI-sensors.patch" SRC_URI_append_gbs = " file://0004-Add-kernel-seven-seg-display-support.patch" SRC_URI_append_gbs = " file://0004-ben-drivers-misc-Character-device-driver-for-seven-segme.patch" SRC_URI_append_gbs = " file://0004-ben-drivers-misc-Platform-driver-for-seven-segment-displ.patch" +SRC_URI_append_gbs = " file://0001-meta-gbs-Enable-adm1272-ADM1272_TEMP1_EN.patch" 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 a6660f753..023992397 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 @@ -316,6 +316,11 @@ multiplierM: 1 rExp: 0 +0x27: + <<: *temperature + entityInstance: 0x28 + path: /xyz/openbmc_project/sensors/temperature/vddcr_cpu + # PVDDCR_SOC0 0x3E: <<: *voltage_13v5_in @@ -345,7 +350,12 @@ multiplierM: 345 rExp: -3 -# PVDDQ_ABCD +0x28: + <<: *temperature + entityInstance: 0x29 + path: /xyz/openbmc_project/sensors/temperature/vddcr_soc + +# PVDDIO_ABCD 0x40: <<: *voltage entityInstance: 0x10 @@ -374,7 +384,12 @@ multiplierM: 345 rExp: -3 -# PVDDQ_EFGH +0x29: + <<: *temperature + entityInstance: 0x2a + path: /xyz/openbmc_project/sensors/temperature/vddio_abcd + +# PVDDIO_EFGH 0x42: <<: *voltage entityInstance: 0x12 @@ -403,6 +418,11 @@ multiplierM: 345 rExp: -3 +0x2A: + <<: *temperature + entityInstance: 0x2b + path: /xyz/openbmc_project/sensors/temperature/vddio_efgh + # P12V_1 0x47: <<: *voltage @@ -432,6 +452,11 @@ multiplierM: 59 rExp: -2 +0x2B: + <<: *temperature + entityInstance: 0x2c + path: /xyz/openbmc_project/sensors/temperature/p12v_mobo + # P12V_2 0x49: <<: *voltage @@ -461,6 +486,11 @@ multiplierM: 59 rExp: -2 +0x2C: + <<: *temperature + entityInstance: 0x2d + path: /xyz/openbmc_project/sensors/temperature/p12v_fan + # Hotswap controller 0x44: <<: *voltage @@ -508,6 +538,11 @@ 0xFF: type: double +0x2D: + <<: *temperature + entityInstance: 0x2e + path: /xyz/openbmc_project/sensors/temperature/hotswap + # fan/pwm mapping # fan0/1 on Mobo, fb_fan0/1/2 on fan board # PWM0 => fan tach 0 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 25172e08b..41a53c052 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 @@ -33,3 +33,11 @@ MINVALUE_power1 = "0" MAXVALUE_power1 = "2200" # READ_Pout is direct value*0.98 GAIN_power1 = "0.98" + +LABEL_temp1= "hotswap" +WARNLO_temp1= "0" +WARNHI_temp1= "125000" +CRITHI_temp1 = "125000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" 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 cc77194ee..4f5ac3f67 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 @@ -35,3 +35,12 @@ WARNLO_curr2 = "0" MINVALUE_curr2 = "0" MAXVALUE_curr2 = "256" PWRONMON_curr2 = "ON" + +LABEL_temp1= "vddcr_cpu" +WARNLO_temp1= "0" +WARNHI_temp1= "125000" +CRITHI_temp1 = "125000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +PWRONMON_temp1 = "ON" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf index c1c3d3e08..de3ba4d0b 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf @@ -35,3 +35,12 @@ WARNLO_curr2 = "0" MINVALUE_curr2 = "0" MAXVALUE_curr2 = "88" PWRONMON_curr2 = "ON" + +LABEL_temp1= "vddcr_soc" +WARNLO_temp1= "0" +WARNHI_temp1= "125000" +CRITHI_temp1 = "125000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +PWRONMON_temp1 = "ON" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf index 6fb856335..80be07d42 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf @@ -35,3 +35,12 @@ WARNLO_curr2 = "0" MINVALUE_curr2 = "0" MAXVALUE_curr2 = "88" PWRONMON_curr2 = "ON" + +LABEL_temp1= "vddio_efgh" +WARNLO_temp1= "0" +WARNHI_temp1= "125000" +CRITHI_temp1 = "125000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +PWRONMON_temp1 = "ON" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf index 5c484c53d..2ae8f21f2 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf @@ -35,3 +35,12 @@ WARNLO_curr2 = "0" MINVALUE_curr2 = "0" MAXVALUE_curr2 = "88" PWRONMON_curr2 = "ON" + +LABEL_temp1= "vddio_abcd" +WARNLO_temp1= "0" +WARNHI_temp1= "125000" +CRITHI_temp1 = "125000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +PWRONMON_temp1 = "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 2cd0ad6fc..0ef7d600a 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 @@ -39,3 +39,12 @@ WARNLO_curr2 = "0" MINVALUE_curr2 = "0" MAXVALUE_curr2 = "150" PWRONMON_curr2 = "ON" + +LABEL_temp1= "p12v_fan" +WARNLO_temp1= "0" +WARNHI_temp1= "125000" +CRITHI_temp1 = "125000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +PWRONMON_temp1 = "ON" 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 81d056d2f..a795a743e 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 @@ -39,3 +39,12 @@ WARNLO_curr2 = "0" MINVALUE_curr2 = "0" MAXVALUE_curr2 = "150" PWRONMON_curr2 = "ON" + +LABEL_temp1= "p12v_mobo" +WARNLO_temp1= "0" +WARNHI_temp1= "125000" +CRITHI_temp1 = "125000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +PWRONMON_temp1 = "ON" -- cgit v1.2.3 From 8464197cfc2d3bfc6aa72dd4255195f948dd1c63 Mon Sep 17 00:00:00 2001 From: George Hung Date: Tue, 6 Oct 2020 14:39:18 +0800 Subject: meta-quanta: gbs: update thermal config to R01 1. update fine tuned PID parameters 2. update sensors threshold (From meta-quanta rev: 52b5953cf0c8c16d34bb8fa7b676316335dbf06e) Signed-off-by: George Hung Change-Id: Icf6f74543552cf511d64fb6bb35bec279f7d0846 Signed-off-by: Andrew Geissler --- .../fans/phosphor-pid-control/config.json | 148 ++++++++++++++--- .../obmc/hwmon/ahb/apb/i2c@82000/sbtsi@4c.conf | 8 +- .../i2c@85000/i2c-switch@71/i2c@0/max31725@54.conf | 8 +- .../i2c@85000/i2c-switch@71/i2c@1/max31725@55.conf | 4 +- .../i2c@85000/i2c-switch@71/i2c@2/max31725@5d.conf | 4 +- .../apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf | 4 +- .../apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf | 4 +- .../apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf | 4 +- .../apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf | 4 +- .../obmc/hwmon/ahb/apb/i2c@8c000/max34451@4e.conf | 8 +- .../obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf | 4 +- .../obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf | 4 +- .../sensors/phosphor-nvme/nvme_config.json | 4 +- .../sensors/phosphor-nvme/nvme_json_rewrite.sh | 4 +- .../fans/read-margin-temp/config-margin.json | 183 +++++++++++++++------ 15 files changed, 293 insertions(+), 102 deletions(-) (limited to 'meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf') diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json index d014380b1..5a4cd1b23 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json +++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json @@ -1,5 +1,5 @@ { - "version" : "R00", + "version" : "R01", "sensors" : [ { "name": "fan0", @@ -62,9 +62,9 @@ "timeout": 0 }, { - "name": "real_fleeting0", + "name": "cputemp", "type": "margin", - "readPath": "/xyz/openbmc_project/extsensors/margin/real_fleeting0", + "readPath": "/xyz/openbmc_project/extsensors/margin/cputemp", "writePath": "", "min": 0, "max": 0, @@ -72,9 +72,29 @@ "timeout": 0 }, { - "name": "real_fleeting1", + "name": "zone0_vr", "type": "margin", - "readPath": "/xyz/openbmc_project/extsensors/margin/real_fleeting1", + "readPath": "/xyz/openbmc_project/extsensors/margin/zone0_vr", + "writePath": "", + "min": 0, + "max": 0, + "ignoreDbusMinMax": true, + "timeout": 0 + }, + { + "name": "nvme", + "type": "margin", + "readPath": "/xyz/openbmc_project/extsensors/margin/nvme", + "writePath": "", + "min": 0, + "max": 0, + "ignoreDbusMinMax": true, + "timeout": 0 + }, + { + "name": "p12v_fan", + "type": "margin", + "readPath": "/xyz/openbmc_project/extsensors/margin/p12v_fan", "writePath": "", "min": 0, "max": 0, @@ -101,7 +121,7 @@ "feedFwdGainCoeff": 0.0056, "integralLimit_min": 0.0, "integralLimit_max": 0.0, - "outLim_min": 20.0, + "outLim_min": 10.0, "outLim_max": 100.0, "slewNeg": 0.0, "slewPos": 0.0 @@ -120,26 +140,89 @@ "feedFwdGainCoeff": 0.0056, "integralLimit_min": 0.0, "integralLimit_max": 0.0, - "outLim_min": 20.0, + "outLim_min": 10.0, "outLim_max": 100.0, "slewNeg": 0.0, "slewPos": 0.0 } }, { - "name": "real_fleeting0", + "name": "cputemp", + "type": "margin", + "inputs": ["cputemp"], + "setpoint": 10.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 714.0, + "integralCoeff": 18.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": 1786.0, + "integralLimit_max": 18000.0, + "outLim_min": 1786.0, + "outLim_max": 18000.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0 + } + }, + { + "name": "zone0_vr", + "type": "margin", + "inputs": ["zone0_vr"], + "setpoint": 10.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 536.0, + "integralCoeff": 9.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": 1786.0, + "integralLimit_max": 18000.0, + "outLim_min": 1786.0, + "outLim_max": 18000.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0 + } + }, + { + "name": "fleeting0", + "type": "margin", + "inputs": ["fleeting0"], + "setpoint": 10.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 536.0, + "integralCoeff": 9.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": 1786.0, + "integralLimit_max": 18000.0, + "outLim_min": 1786.0, + "outLim_max": 18000.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0 + } + }, + { + "name": "fleeting1", "type": "margin", - "inputs": ["real_fleeting0"], + "inputs": ["fleeting1"], "setpoint": 10.0, "pid": { "samplePeriod": 1.0, - "proportionalCoeff": 225.0, - "integralCoeff": 45.0, + "proportionalCoeff": 536.0, + "integralCoeff": 18.0, "feedFwdOffsetCoeff": 0.0, "feedFwdGainCoeff": 0.0, - "integralLimit_min": 2500.0, + "integralLimit_min": 1786.0, "integralLimit_max": 18000.0, - "outLim_min": 2500.0, + "outLim_min": 1786.0, "outLim_max": 18000.0, "slewNeg": 0.0, "slewPos": 0.0, @@ -167,7 +250,7 @@ "feedFwdGainCoeff": 0.0056, "integralLimit_min": 0.0, "integralLimit_max": 0.0, - "outLim_min": 20.0, + "outLim_min": 10.0, "outLim_max": 100.0, "slewNeg": 0.0, "slewPos": 0.0 @@ -186,7 +269,7 @@ "feedFwdGainCoeff": 0.0056, "integralLimit_min": 0.0, "integralLimit_max": 0.0, - "outLim_min": 20.0, + "outLim_min": 10.0, "outLim_max": 100.0, "slewNeg": 0.0, "slewPos": 0.0 @@ -205,26 +288,47 @@ "feedFwdGainCoeff": 0.0056, "integralLimit_min": 0.0, "integralLimit_max": 0.0, - "outLim_min": 20.0, + "outLim_min": 10.0, "outLim_max": 100.0, "slewNeg": 0.0, "slewPos": 0.0 } }, { - "name": "real_fleeting1", + "name": "nvme", + "type": "margin", + "inputs": ["nvme"], + "setpoint": 10.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 1786.0, + "integralCoeff": 36.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": 1786.0, + "integralLimit_max": 18000.0, + "outLim_min": 1786.0, + "outLim_max": 18000.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0 + } + }, + { + "name": "p12v_fan", "type": "margin", - "inputs": ["real_fleeting1"], + "inputs": ["p12v_fan"], "setpoint": 10.0, "pid": { "samplePeriod": 1.0, - "proportionalCoeff": 225.0, - "integralCoeff": 45.0, + "proportionalCoeff": 268.0, + "integralCoeff": 4.0, "feedFwdOffsetCoeff": 0.0, "feedFwdGainCoeff": 0.0, - "integralLimit_min": 2500.0, + "integralLimit_min": 1786.0, "integralLimit_max": 18000.0, - "outLim_min": 2500.0, + "outLim_min": 1786.0, "outLim_max": 18000.0, "slewNeg": 0.0, "slewPos": 0.0, diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/sbtsi@4c.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/sbtsi@4c.conf index de988aa65..6dcada7b1 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/sbtsi@4c.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/sbtsi@4c.conf @@ -1,8 +1,8 @@ LABEL_temp1 = "cputemp" -CRITHI_temp1 = "85000" -CRITLO_temp1 = "5000" -WARNHI_temp1 = "85000" -WARNLO_temp1 = "5000" +CRITHI_temp1 = "95000" +CRITLO_temp1 = "0" +WARNHI_temp1 = "95000" +WARNLO_temp1 = "0" 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@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 b8ba115d1..839a7c610 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 = "70000" -CRITLO_temp1 = "5000" -WARNHI_temp1 = "70000" -WARNLO_temp1 = "5000" +CRITHI_temp1 = "35000" +CRITLO_temp1 = "0" +WARNHI_temp1 = "35000" +WARNLO_temp1 = "0" 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 a798fc9bc..174c62b98 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 = "5000" +CRITLO_temp1 = "0" WARNHI_temp1 = "70000" -WARNLO_temp1 = "5000" +WARNLO_temp1 = "0" 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 a51043876..3fb0ceeeb 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 = "5000" +CRITLO_temp1 = "0" WARNHI_temp1 = "70000" -WARNLO_temp1 = "5000" +WARNLO_temp1 = "0" 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@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 4f5ac3f67..580eeecf8 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 @@ -38,8 +38,8 @@ PWRONMON_curr2 = "ON" LABEL_temp1= "vddcr_cpu" WARNLO_temp1= "0" -WARNHI_temp1= "125000" -CRITHI_temp1 = "125000" +WARNHI_temp1= "100000" +CRITHI_temp1 = "100000" CRITLO_temp1 = "0" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf index de3ba4d0b..f21c32a24 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf @@ -38,8 +38,8 @@ PWRONMON_curr2 = "ON" LABEL_temp1= "vddcr_soc" WARNLO_temp1= "0" -WARNHI_temp1= "125000" -CRITHI_temp1 = "125000" +WARNHI_temp1= "100000" +CRITHI_temp1 = "100000" CRITLO_temp1 = "0" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf index 80be07d42..9cd9a129b 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf @@ -38,8 +38,8 @@ PWRONMON_curr2 = "ON" LABEL_temp1= "vddio_efgh" WARNLO_temp1= "0" -WARNHI_temp1= "125000" -CRITHI_temp1 = "125000" +WARNHI_temp1= "100000" +CRITHI_temp1 = "100000" CRITLO_temp1 = "0" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf index 2ae8f21f2..762af173b 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf @@ -38,8 +38,8 @@ PWRONMON_curr2 = "ON" LABEL_temp1= "vddio_abcd" WARNLO_temp1= "0" -WARNHI_temp1= "125000" -CRITHI_temp1 = "125000" +WARNHI_temp1= "100000" +CRITHI_temp1 = "100000" CRITLO_temp1 = "0" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" 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 353075ab3..9a8a80390 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 @@ -110,10 +110,10 @@ MAXVALUE_in12 = "6" PWRONMON_in12 = "ON" LABEL_temp1 = "powerseq_temp" -CRITHI_temp1 = "85000" -CRITLO_temp1 = "5000" -WARNHI_temp1 = "85000" -WARNLO_temp1 = "5000" +CRITHI_temp1 = "99000" +CRITLO_temp1 = "0" +WARNHI_temp1 = "99000" +WARNLO_temp1 = "0" 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@8c000/vrm@5d.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf index 0ef7d600a..427cdabe0 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 @@ -42,8 +42,8 @@ PWRONMON_curr2 = "ON" LABEL_temp1= "p12v_fan" WARNLO_temp1= "0" -WARNHI_temp1= "125000" -CRITHI_temp1 = "125000" +WARNHI_temp1= "114000" +CRITHI_temp1 = "114000" CRITLO_temp1 = "0" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" 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 a795a743e..c1612d13b 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 @@ -42,8 +42,8 @@ PWRONMON_curr2 = "ON" LABEL_temp1= "p12v_mobo" WARNLO_temp1= "0" -WARNHI_temp1= "125000" -CRITHI_temp1 = "125000" +WARNHI_temp1= "114000" +CRITHI_temp1 = "114000" CRITLO_temp1 = "0" MINVALUE_temp1 = "-128" MAXVALUE_temp1 = "127" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json index 9a114d385..306e74e2a 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json @@ -163,9 +163,9 @@ ], "threshold": [ { - "criticalHigh": 70, + "criticalHigh": 77, "criticalLow": 0, - "warningHigh": 70, + "warningHigh": 77, "warningLow": 0, "maxValue": 127, "minValue": -128 diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh index 27ca98dc5..91dcb5cb3 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh @@ -202,9 +202,9 @@ cat > $TARGET_FILE_NAME << EOF1 ], "threshold": [ { - "criticalHigh": 70, + "criticalHigh": 77, "criticalLow": 0, - "warningHigh": 70, + "warningHigh": 77, "warningLow": 0, "maxValue": 127, "minValue": -128 diff --git a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json index 6b73e34b8..36ed8a0e7 100644 --- a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json +++ b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json @@ -6,9 +6,9 @@ "type": "dbus", "path": "/xyz/openbmc_project/sensors/temperature/cputemp", "parameters": { - "type": "file", - "maxTemp": -1, - "path": "/sys/devices/platform/ahb/ahb:apb/f0082000.i2c/i2c-2/2-004c/hwmon/cpu_hwmon/temp1_max", + "type": "", + "maxTemp": 95000, + "path": "", "sysLabel": "", "targetTemp": -1, "targetTempOffset": -10000, @@ -22,10 +22,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme0", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -37,10 +37,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme1", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -52,10 +52,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme2", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -67,10 +67,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme3", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -82,10 +82,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme4", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -97,10 +97,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme5", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -112,10 +112,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme6", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -127,10 +127,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme7", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -142,10 +142,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme8", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -157,10 +157,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme9", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -172,10 +172,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme10", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -187,10 +187,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme11", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -202,10 +202,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme12", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -217,10 +217,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme13", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -232,10 +232,10 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme14", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } @@ -247,40 +247,115 @@ "path": "/xyz/openbmc_project/sensors/temperature/nvme15", "parameters": { "type": "", - "maxTemp": 70000, + "maxTemp": 77000, "path": "", "sysLabel": "", - "targetTemp": 60000, + "targetTemp": 67000, "targetTempOffset": 0, "scalar": 1.0 } }, { - "name": "fleeting0", - "unit": "millimargin", + "name": "vddcr_cpu", + "unit": "millidegree", "type": "dbus", - "path": "/xyz/openbmc_project/extsensors/margin/fleeting0", + "path": "/xyz/openbmc_project/sensors/temperature/vddcr_cpu", "parameters": { "type": "", - "maxTemp": 0, + "maxTemp": 100000, "path": "", "sysLabel": "", - "targetTemp": 0, + "targetTemp": 90000, "targetTempOffset": 0, "scalar": 1.0 } }, { - "name": "fleeting1", - "unit": "millimargin", + "name": "vddcr_soc", + "unit": "millidegree", "type": "dbus", - "path": "/xyz/openbmc_project/extsensors/margin/fleeting1", + "path": "/xyz/openbmc_project/sensors/temperature/vddcr_soc", "parameters": { "type": "", - "maxTemp": 0, + "maxTemp": 100000, "path": "", "sysLabel": "", - "targetTemp": 0, + "targetTemp": 90000, + "targetTempOffset": 0, + "scalar": 1.0 + } + }, + { + "name": "vddio_abcd", + "unit": "millidegree", + "type": "dbus", + "path": "/xyz/openbmc_project/sensors/temperature/vddio_abcd", + "parameters": { + "type": "", + "maxTemp": 100000, + "path": "", + "sysLabel": "", + "targetTemp": 90000, + "targetTempOffset": 0, + "scalar": 1.0 + } + }, + { + "name": "vddio_efgh", + "unit": "millidegree", + "type": "dbus", + "path": "/xyz/openbmc_project/sensors/temperature/vddio_efgh", + "parameters": { + "type": "", + "maxTemp": 100000, + "path": "", + "sysLabel": "", + "targetTemp": 90000, + "targetTempOffset": 0, + "scalar": 1.0 + } + }, + { + "name": "p12v_mobo", + "unit": "millidegree", + "type": "dbus", + "path": "/xyz/openbmc_project/sensors/temperature/p12v_mobo", + "parameters": { + "type": "", + "maxTemp": 114000, + "path": "", + "sysLabel": "", + "targetTemp": 90000, + "targetTempOffset": 0, + "scalar": 1.0 + } + }, + { + "name": "powerseq_temp", + "unit": "millidegree", + "type": "dbus", + "path": "/xyz/openbmc_project/sensors/temperature/powerseq_temp", + "parameters": { + "type": "", + "maxTemp": 99000, + "path": "", + "sysLabel": "", + "targetTemp": 90000, + "targetTempOffset": 0, + "scalar": 1.0 + } + }, + { + "name": "p12v_fan", + "unit": "millidegree", + "type": "dbus", + "path": "/xyz/openbmc_project/sensors/temperature/p12v_fan", + "parameters": { + "type": "", + "maxTemp": 114000, + "path": "", + "sysLabel": "", + "targetTemp": 90000, "targetTempOffset": 0, "scalar": 1.0 } @@ -293,14 +368,26 @@ { "id": 0, "zoneSetpoint": 10000, - "target": "/xyz/openbmc_project/extsensors/margin/real_fleeting0", - "components": ["cputemp", "fleeting0"] + "target": "/xyz/openbmc_project/extsensors/margin/cputemp", + "components": ["cputemp"] }, { "id": 1, "zoneSetpoint": 10000, - "target": "/xyz/openbmc_project/extsensors/margin/real_fleeting1", + "target": "/xyz/openbmc_project/extsensors/margin/zone0_vr", + "components": ["vddcr_cpu", "vddcr_soc", "vddio_abcd", "vddio_efgh", "p12v_mobo", "powerseq_temp"] + }, + { + "id": 2, + "zoneSetpoint": 10000, + "target": "/xyz/openbmc_project/extsensors/margin/nvme", "components": ["nvme0", "nvme1", "nvme2", "nvme3", "nvme4", "nvme5", "nvme6", "nvme7", "nvme8", "nvme9", "nvme10", "nvme11", "nvme12", "nvme13", "nvme14", "nvme15"] + }, + { + "id": 3, + "zoneSetpoint": 10000, + "target": "/xyz/openbmc_project/extsensors/margin/p12v_fan", + "components": ["p12v_fan"] } ] } -- cgit v1.2.3