diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-12-16 23:15:45 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-12-16 23:15:45 +0300 |
commit | 506611d226c82d05215ec3d2dab50a43a531b691 (patch) | |
tree | 302e0e255b959be532f5e26329db97740118f5f5 /meta-ibm/meta-witherspoon | |
parent | 243c130a919c7037b5edd3a8097317340796ce85 (diff) | |
parent | 9dfc7e69bc505f474dd4117a8d690b1287e2a48f (diff) | |
download | openbmc-506611d226c82d05215ec3d2dab50a43a531b691.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-ibm/meta-witherspoon')
9 files changed, 592 insertions, 12 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml index bb3226af3..727630cb8 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml @@ -116,6 +116,29 @@ - meta: SENSOR path: /xyz/openbmc_project/sensors/temperature/ambient_temp +- name: gpu sensors + description: > + 'Each gpu has its own temperature sensor.' + class: group + group: path + members: + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu0 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu1 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu2 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu3 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu4 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu5 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu6 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu7 + - name: core temp description: > 'Monitor the temperature of each core.' @@ -138,6 +161,17 @@ meta: TEMP property: Value +- name: gpu temp + description: > + 'Monitor the temperature of each gpu core.' + class: group + group: property + type: int64 + members: + - interface: xyz.openbmc_project.Sensor.Value + meta: TEMP + property: Value + - name: watch core temps description: > 'Trigger logic on core temp changes.' @@ -156,6 +190,15 @@ properties: ambient temp callback: check ambient temp +- name: watch gpu temps + description: > + 'Trigger logic on gpu core temp changes.' + class: watch + watch: property + paths: gpu sensors + properties: gpu temp + callback: check gpu temps + - name: check temps description: > 'If this condition passes at least three cores are running @@ -185,6 +228,20 @@ bound: 45000 oneshot: true +- name: check gpu temps + description: > + 'If the gpu temperature sensor is too hot. Shut the system down.' + class: condition + condition: count + paths: gpu sensors + properties: gpu temp + callback: gpu log and shutdown + countop: '>=' + countbound: 1 + op: '>=' + bound: 92 + oneshot: true + - name: log and shutdown description: > 'Shut the system down and log an event.' @@ -205,6 +262,16 @@ - create ambient criticalhigh error - create ambient shutdown error +- name: gpu log and shutdown + description: > + 'Shut the system down and log an event.' + class: callback + callback: group + members: + - shutdown + - create gpu criticalhigh error + - create gpu shutdown error + - name: shutdown description: > 'Shut down the system.' @@ -240,6 +307,16 @@ error: xyz::openbmc_project::Sensor::Threshold::Error::CriticalHigh metadata: xyz::openbmc_project::Sensor::Threshold::CriticalHigh::SENSOR_DATA +- name: create gpu criticalhigh error + description: > + 'Create a GPU CriticalHigh Error log.' + class: callback + callback: elog_with_metadata + paths: gpu sensors + properties: gpu temp + error: xyz::openbmc_project::Sensor::Threshold::Error::CriticalHigh + metadata: xyz::openbmc_project::Sensor::Threshold::CriticalHigh::SENSOR_DATA + - name: create shutdown error description: > 'Create a SystemShutdown Error log.' @@ -257,3 +334,12 @@ paths: ambient sensor properties: ambient temp error: xyz::openbmc_project::State::Shutdown::ThermalEvent::Error::Ambient + +- name: create gpu shutdown error + description: > + 'Create a SystemShutdown Error log.' + class: callback + callback: elog + paths: gpu sensors + properties: gpu temp + error: xyz::openbmc_project::State::Shutdown::ThermalEvent::Error::GPU diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml index ade4567ce..386f4b7c7 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml @@ -301,6 +301,65 @@ actions: - altevents events: + - name: default_fan_floor_on_service_fail + precondition: + name: services_missing_owner + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: nameHasOwner + handler: setService + - name: signal + signal: nameOwnerChanged + handler: setService + events: + - name: default_fan_floor + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: timer + interval: 5000000 + type: oneshot + actions: + - name: default_floor_on_missing_owner + - name: high_speed_on_occ_service_fails + groups: + - name: occ0_object + interface: org.open_power.OCC.Status + property: + name: OccActive + type: bool + - name: occ1_object + interface: org.open_power.OCC.Status + property: + name: OccActive + type: bool + triggers: + - name: init + method: nameHasOwner + handler: setService + - name: signal + signal: nameOwnerChanged + handler: setService + actions: + - name: call_actions_based_on_timer + timer: + interval: 5000000 + type: oneshot + actions: + - name: set_speed_on_missing_owner + speed: + value: 255 + type: uint64_t - name: missing_or_fails_before_high_speed_air groups: - name: air_cooled_zone0_fans 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/leds/mihawk-led-manager-config/led.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml index 1c6634551..59693ce77 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml @@ -145,4 +145,370 @@ LampTest: Action: 'Blink' DutyOn: 50 Period: 1000 - Priority: 'Blink'
\ No newline at end of file + Priority: 'Blink' +core0Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core1Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core2Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core3Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core4Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core5Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core6Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core7Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core8Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core9Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core10Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core11Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core12Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core13Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core14Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core15Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core16Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core17Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core18Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core19Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core20Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core21Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core22Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core23Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +cpu0Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +cpu1Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm0Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm1Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm2Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm3Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm4Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm5Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm6Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm7Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm8Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm9Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm10Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm11Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm12Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm13Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm14Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm15Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm16Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm17Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm18Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm19Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm20Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm21Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm22Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm23Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm24Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm25Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm26Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm27Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm28Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm29Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm30Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm31Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +motherboardFault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +occFault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +systemFault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On'
\ No newline at end of file diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend index b90dc9b50..350c996d0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +inherit obmc-phosphor-systemd + SRC_URI += "file://psu.json" EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" @@ -12,4 +14,4 @@ do_install_append(){ FILES_${PN} += "${datadir}/phosphor-power/psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" 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" 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" 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" |