From da9b4349ae7caec03edc72a86511383bc9508f90 Mon Sep 17 00:00:00 2001 From: Ben Pai Date: Tue, 26 Nov 2019 20:57:27 +0800 Subject: meta-ibm: Modify power sensor channel Currently power sensor might get the wrong channel. We have to modify it to the correct channel. Tested: Check sensot list user can see the correct power sensor. (From meta-ibm rev: aaceadff166052bef63b860063ccbda66d918629) Change-Id: I2595c727915b8e72af4f56e5383efb183e9b3638 Signed-off-by: Ben Pai Signed-off-by: Brad Bishop --- .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 37 ++++++++++++++++------ 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index 94eeff7ca..d6d2416ea 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -38,6 +38,23 @@ MODE_temp37 = "label" MODE_temp38 = "label" MODE_temp39 = "label" MODE_temp40 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" +MODE_power5 = "label" +MODE_power6 = "label" +MODE_power7 = "label" +MODE_power8 = "label" +MODE_power9 = "label" +MODE_power10 = "label" +MODE_power11 = "label" +MODE_power12 = "label" +MODE_power13 = "label" +MODE_power14 = "label" +MODE_power15 = "label" + LABEL_temp17 = "p0_core0_temp" WARNHI_temp17 = "85000" WARNLO_temp17 = "0" @@ -278,13 +295,13 @@ WARNLO_temp211 = "0" CRITHI_temp211 = "95000" CRITLO_temp211 = "0" -LABEL_power2 = "io_b_power" -LABEL_power3 = "io_a_power" -LABEL_power4 = "p1_mem_power" -LABEL_power5 = "p1_vdd_power" -LABEL_power6 = "p0_mem_power" -LABEL_power7 = "p0_vdd_power" -LABEL_power8 = "fans_power" -LABEL_power9 = "storage_b_power" -LABEL_power10 = "storage_a_power" -LABEL_power15 = "total_power" +LABEL_power0_14_2 = "io_b_power" +LABEL_power0_13_3 = "io_a_power" +LABEL_power0_2_4 = "p1_mem_power" +LABEL_power0_6_5 = "p1_vdd_power" +LABEL_power0_1_6 = "p0_mem_power" +LABEL_power0_5_7 = "p0_vdd_power" +LABEL_power0_16_8 = "fans_power" +LABEL_power0_19_9 = "storage_b_power" +LABEL_power0_18_10 = "storage_a_power" +LABEL_powersystem = "total_power" -- cgit v1.2.3 From b3cd15164f2af405fdae19375d24355b4bab8cd3 Mon Sep 17 00:00:00 2001 From: Ben Pai Date: Tue, 10 Dec 2019 16:55:37 +0800 Subject: meta-ibm: Set over/under voltage/current value Set warning and critical values for PSU. (From meta-ibm rev: 1b9796d85dd41e8675d0d03132cbff8dd74a1d47) Change-Id: Ie16955f7548e9e6fa54cea2aff767a164abb76f3 Signed-off-by: Ben Pai Signed-off-by: Brad Bishop --- .../apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf | 19 +++++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf index 61b4253bf..80ff06f9f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf @@ -1,4 +1,23 @@ LABEL_in1="ps1_input_voltage" +WARNHI_in1="264000" +WARNLO_in1="200000" +CRITHI_in1="265000" +CRITLO_in1="180000" + LABEL_in2="ps1_output_voltage" +WARNHI_in2="12700" +WARNLO_in2="0" +CRITHI_in2="13000" +CRITLO_in2="0" + LABEL_curr1="ps1_output_current" +WARNHI_curr1="170000" +WARNLO_curr1="0" +CRITHI_curr1="180000" +CRITLO_curr1="0" + LABEL_power1="ps1_input_power" +WARNHI_power1="2300000000" +WARNLO_power1="0" +CRITHI_power1="2500000000" +CRITLO_power1="0" \ No newline at end of file diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf index 92838e1d0..db56c888d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf @@ -1,4 +1,23 @@ LABEL_in1="ps0_input_voltage" +WARNHI_in1="264000" +WARNLO_in1="200000" +CRITHI_in1="265000" +CRITLO_in1="180000" + LABEL_in2="ps0_output_voltage" +WARNHI_in2="12700" +WARNLO_in2="0" +CRITHI_in2="13000" +CRITLO_in2="0" + LABEL_curr1="ps0_output_current" +WARNHI_curr1="170000" +WARNLO_curr1="0" +CRITHI_curr1="180000" +CRITLO_curr1="0" + LABEL_power1="ps0_input_power" +WARNHI_power1="2300000000" +WARNLO_power1="0" +CRITHI_power1="2500000000" +CRITLO_power1="0" -- cgit v1.2.3 From d942f8dba8f76045215208f1b508af2f7598b888 Mon Sep 17 00:00:00 2001 From: Ben Pai Date: Tue, 10 Dec 2019 16:30:56 +0800 Subject: meta-ibm: Fix fanx can't get the correct pwm Although 6 fanx_1 pwm targets are deleted, but fan0_1 fan1_1 and fan2_1 will have a default value that causes the issue to remain unresolved. In this way, two Fans control the same pwm, but I think that our current fan control event is controlled at the same time, so it does not affect the fan control. (From meta-ibm rev: c4ec0f10a091fe74f075d2033fe055b5bbd7d498) Change-Id: I42647c92ffe5e20430cee28de6fd26e2716153d9 Signed-off-by: Ben Pai Signed-off-by: Brad Bishop --- .../fans/phosphor-fan-control-fan-config/mihawk/fans.yaml | 6 ++++++ .../mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml index 9133fa1fa..d0a09004e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml @@ -3,29 +3,35 @@ fans: cooling_zone: 0 sensors: - fan0_0 + - fan0_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan1 cooling_zone: 0 sensors: - fan1_0 + - fan1_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan2 cooling_zone: 0 sensors: - fan2_0 + - fan2_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan3 cooling_zone: 0 sensors: - fan3_0 + - fan3_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan4 cooling_zone: 0 sensors: - fan4_0 + - fan4_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan5 cooling_zone: 0 sensors: - fan5_0 + - fan5_1 target_interface: xyz.openbmc_project.Control.FanPwm diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf index bb569f70a..066ebf6c2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf @@ -12,8 +12,14 @@ LABEL_fan11 = "fan5_0" LABEL_fan12 = "fan5_1" PWM_TARGET_fan1 = "1" +PWM_TARGET_fan2 = "1" PWM_TARGET_fan3 = "2" +PWM_TARGET_fan4 = "2" PWM_TARGET_fan5 = "3" +PWM_TARGET_fan6 = "3" PWM_TARGET_fan7 = "4" +PWM_TARGET_fan8 = "4" PWM_TARGET_fan9 = "5" +PWM_TARGET_fan10 = "5" PWM_TARGET_fan11 = "6" +PWM_TARGET_fan12 = "6" -- cgit v1.2.3