diff options
Diffstat (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/power')
8 files changed, 17 insertions, 233 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml index 66f8a92b6..e14640202 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml @@ -52,7 +52,7 @@ GPIOAnalysis: - type: gpuPGOOD # The PCA9xxx chip device path and address (0xC0 8-bit = 0x60 7-bit) - path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-8/8-0060 + path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0060 gpio_value: low # What GPIO value indicates a fault/problem? error_function: gpuPGOODError # Extra analysis function to call for this type option_flags: none @@ -72,7 +72,7 @@ callout: /system/chassis/motherboard/gv100card3 - type: gpuOverTemp # The PCA9xxx chip device path and address (0xC0 8-bit = 0x60 7-bit) - path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-8/8-0060 + path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0060 gpio_value: low # What GPIO value indicates a fault/problem? error_function: gpuOverTempError # Extra analysis function to call for this type option_flags: shutdownOnFault @@ -92,7 +92,7 @@ callout: /system/chassis/motherboard/gv100card3 - type: memGOOD0 # The PCA9xxx chip device path and address (0xE8 8-bit = 0x74 7-bit) - path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-9/9-0074 + path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a380.i2c-bus/i2c-9/9-0074 gpio_value: low # What GPIO value indicates a fault/problem? error_function: memGoodError # Extra analysis function to call for this type option_flags: none @@ -136,7 +136,7 @@ callout: /system/chassis/motherboard/dimm6 - type: memGOOD1 # The PCA9xxx chip device path and address (0xE8 8-bit = 0x74 7-bit) - path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-10/10-0074 + path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a3c0.i2c-bus/i2c-10/10-0074 gpio_value: low # What GPIO value indicates a fault/problem? error_function: memGoodError # Extra analysis function to call for this type option_flags: none diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc index db7c16e5d..b73d922d0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/witherspoon-pfault-analysis" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/witherspoon-pfault-analysis" -SRCREV = "03c19db6a8f72d7f5408667a7daf915d82190efc" +SRCREV = "5b2964fa8e57c46d60c0c0d95d5668c9f9a5ce23" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf index 167e605d0..167e605d0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf index faa5adec6..faa5adec6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf new file mode 100644 index 000000000..d6732e6b8 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0069 +INSTANCE=0 +INVENTORY=/system/chassis/motherboard/powersupply0 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=105 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf new file mode 100644 index 000000000..cace335b1 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0068 +INSTANCE=1 +INVENTORY=/system/chassis/motherboard/powersupply1 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=105 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy-native.bb deleted file mode 100644 index 563f80e30..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy-native.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Power supply policy for Witherspoon" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-dbus-monitor - -SRC_URI += "file://power-supply-policy.yaml" - -do_install() { - install -D ${WORKDIR}/power-supply-policy.yaml ${D}${config_dir}/power-supply-policy.yaml -} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml deleted file mode 100644 index 20141c9c3..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml +++ /dev/null @@ -1,215 +0,0 @@ -# Witherspoon power supply policy for PDM. -# -# Create an error if a power supply is removed while the system is powered on - -- name: power supply0 - class: group - group: path - members: - - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0 - -- name: power supply1 - class: group - group: path - members: - - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1 - -- name: power supplies - description: > - 'A Witherspoon has two power supplies to monitor.' - class: group - group: path - members: - - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0 - - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1 - -- name: chassis state - description: > - 'A Witherspoon has a single chassis to monitor.' - class: group - group: path - members: - - meta: CHASSISSTATE - path: /xyz/openbmc_project/state/chassis0 - -- name: power supply present - description: > - 'Monitor the presence state of each power supply.' - class: group - group: property - type: boolean - members: - - interface: xyz.openbmc_project.Inventory.Item - meta: PRESENT - property: Present - -- name: chassis powered - description: > - 'Monitor the chassis power state.' - class: group - group: property - type: string - members: - - interface: xyz.openbmc_project.State.Chassis - meta: CHASSIS_STATE - property: CurrentPowerState - -- name: watch power supply present - description: > - 'Trigger logic on power supply presence state changes.' - class: watch - watch: property - paths: power supplies - properties: power supply present - callback: check power - -- name: watch chassis state - description: > - 'Trigger logic on chassis power state changes.' - class: watch - watch: property - paths: chassis state - properties: chassis powered - callback: check power - -- name: check power - description: > - 'If the chassis has power, check for power supplies.' - class: condition - condition: count - paths: chassis state - properties: chassis powered - callback: check power supplies - countop: '>' - countbound: 0 - op: '==' - bound: xyz.openbmc_project.State.Chassis.PowerState.On - -- name: check power supplies - description: > - 'Create an error if a power supply is not present.' - class: callback - callback: group - members: - - check power supply0 presence - - check power supply1 presence - -- name: check power supply0 presence - description: > - 'If this condition passes power supply0 has been unplugged for more than - 5 seconds. Count present power supplies rather than non-present - power supplies since the latter would pass if the power supply has not - been created for some reason. - - For a more detailed definition of unplugged, consult the documentation - of xyz.openbmc_project.Inventory.Item and/or the documentation - of the power supply inventory object implementation.' - class: condition - condition: count - paths: power supply0 - properties: power supply present - defer: 5000000us - callback: notpresent power supply0 error - countop: '<' - countbound: 1 - op: '==' - bound: true - -- name: check power supply1 presence - description: > - 'If this condition passes power supply1 has been unplugged for more than - 5 seconds.' - class: condition - condition: count - paths: power supply1 - properties: power supply present - defer: 5000000us - callback: notpresent power supply1 error - countop: '<' - countbound: 1 - op: '==' - bound: true - -- name: notpresent power supply0 error - class: callback - callback: elog - paths: power supply0 - properties: power supply present - error: xyz::openbmc_project::Inventory::Error::NotPresent - metadata: - - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH - value: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0 - type: string - -- name: notpresent power supply1 error - class: callback - callback: elog - paths: power supply1 - properties: power supply present - error: xyz::openbmc_project::Inventory::Error::NotPresent - metadata: - - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH - value: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1 - type: string - -- name: resolve power supply0 errors if present - description: > - 'If power supply0 is present, call the resolve ps0 errors callback.' - class: condition - condition: count - paths: power supply0 - properties: power supply present - callback: resolve power supply0 errors - countop: '>' - countbound: 0 - op: '==' - bound: true - -- name: resolve power supply1 errors if present - description: > - 'If power supply1 is present, call the resolve ps1 errors callback.' - class: condition - condition: count - paths: power supply1 - properties: power supply present - callback: resolve power supply1 errors - countop: '>' - countbound: 0 - op: '==' - bound: true - -- name: resolve power supply0 errors - class: callback - callback: resolve callout - paths: power supply0 - properties: power supply present - callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0 - -- name: resolve power supply1 errors - class: callback - callback: resolve callout - paths: power supply1 - properties: power supply present - callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1 - -- name: watch power supply0 present for resolving error logs - description: > - 'On supply present state changes, check if errors need to be resolved.' - class: watch - watch: property - paths: power supply0 - properties: power supply present - callback: resolve power supply0 errors if present - -- name: watch power supply1 present for resolving error logs - description: > - 'On supply present state changes, check if errors need to be resolved.' - class: watch - watch: property - paths: power supply1 - properties: power supply present - callback: resolve power supply1 errors if present |