diff options
Diffstat (limited to 'meta-ibm')
47 files changed, 490 insertions, 241 deletions
diff --git a/meta-ibm/README b/meta-ibm/README index 14aa748ee..6f1b695b3 100644 --- a/meta-ibm/README +++ b/meta-ibm/README @@ -11,7 +11,6 @@ FSP-2: meta-fsp2 BSP layer(s) for the following IBM branded servers: Witherspoon: meta-witherspoon -Z: meta-z Subsequent description applies to the distro policy for IBM systems only in conf, classes, and recipes-*, for description of the BSP layers consult the diff --git a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-ibm/meta-palmetto/conf/bblayers.conf.sample index f58d39c2b..3470c2d64 100644 --- a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample +++ b/meta-ibm/meta-palmetto/conf/bblayers.conf.sample @@ -14,7 +14,6 @@ BBLAYERS ?= " \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm \ ##OEROOT##/meta-ibm/meta-palmetto \ " BBLAYERS_NON_REMOVABLE ?= " \ @@ -26,6 +25,5 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm \ ##OEROOT##/meta-ibm/meta-palmetto \ " diff --git a/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-ibm/meta-romulus/conf/bblayers.conf.sample index aa6ac7b72..52329db64 100644 --- a/meta-ibm/meta-romulus/conf/bblayers.conf.sample +++ b/meta-ibm/meta-romulus/conf/bblayers.conf.sample @@ -14,7 +14,6 @@ BBLAYERS ?= " \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm \ ##OEROOT##/meta-ibm/meta-romulus \ " BBLAYERS_NON_REMOVABLE ?= " \ @@ -26,6 +25,5 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm \ ##OEROOT##/meta-ibm/meta-romulus \ " diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf index 628a45a22..78ffbbc82 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf @@ -1,6 +1,8 @@ KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" UBOOT_MACHINE = "evb-ast2600_defconfig" +OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3" + require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service index 74d8e4bfc..3bd1287ee 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service @@ -3,6 +3,7 @@ Description=Perform power workarounds on VRMs Wants=ir35221-on-unbind@%i.service After=ir35221-on-unbind@%i.service Before=avsbus-disable@%i.service +Before=obmc-power-on@%i.target Conflicts=obmc-chassis-poweroff@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml index 71b79b73b..1cf747856 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml @@ -126,134 +126,134 @@ unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS 238: bExp: 0 - entityID: 10 - entityInstance: 1 + entityID: 29 + entityInstance: 2 interfaces: xyz.openbmc_project.Sensor.Value: Value: Offsets: 255: type: int64_t - multiplierM: 2 + multiplierM: 100 offsetB: 0 - path: /xyz/openbmc_project/sensors/power/storage_a_power + path: /xyz/openbmc_project/sensors/fan_tach/fan0_1 rExp: 0 readingType: readingData - scale: -6 + scale: 0 sensorNamePattern: nameLeaf sensorReadingType: 1 - sensorType: 8 + sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Watts + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS 239: bExp: 0 - entityID: 10 - entityInstance: 2 + entityID: 29 + entityInstance: 4 interfaces: xyz.openbmc_project.Sensor.Value: Value: Offsets: 255: type: int64_t - multiplierM: 2 + multiplierM: 100 offsetB: 0 - path: /xyz/openbmc_project/sensors/power/storage_b_power + path: /xyz/openbmc_project/sensors/fan_tach/fan1_1 rExp: 0 readingType: readingData - scale: -6 + scale: 0 sensorNamePattern: nameLeaf sensorReadingType: 1 - sensorType: 8 + sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Watts + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS 240: bExp: 0 - entityID: 10 - entityInstance: 3 + entityID: 29 + entityInstance: 6 interfaces: xyz.openbmc_project.Sensor.Value: Value: Offsets: 255: type: int64_t - multiplierM: 2 + multiplierM: 100 offsetB: 0 - path: /xyz/openbmc_project/sensors/power/p0_vdd_power + path: /xyz/openbmc_project/sensors/fan_tach/fan2_1 rExp: 0 readingType: readingData - scale: -6 + scale: 0 sensorNamePattern: nameLeaf sensorReadingType: 1 - sensorType: 8 + sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Watts + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS 241: bExp: 0 - entityID: 10 - entityInstance: 4 + entityID: 29 + entityInstance: 8 interfaces: xyz.openbmc_project.Sensor.Value: Value: Offsets: 255: type: int64_t - multiplierM: 2 + multiplierM: 100 offsetB: 0 - path: /xyz/openbmc_project/sensors/power/p1_vdd_power + path: /xyz/openbmc_project/sensors/fan_tach/fan3_1 rExp: 0 readingType: readingData - scale: -6 + scale: 0 sensorNamePattern: nameLeaf sensorReadingType: 1 - sensorType: 8 + sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Watts + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS 242: bExp: 0 - entityID: 10 - entityInstance: 5 + entityID: 29 + entityInstance: 10 interfaces: xyz.openbmc_project.Sensor.Value: Value: Offsets: 255: type: int64_t - multiplierM: 2 + multiplierM: 100 offsetB: 0 - path: /xyz/openbmc_project/sensors/power/p0_mem_power + path: /xyz/openbmc_project/sensors/fan_tach/fan4_1 rExp: 0 readingType: readingData - scale: -6 + scale: 0 sensorNamePattern: nameLeaf sensorReadingType: 1 - sensorType: 8 + sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Watts + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS 243: bExp: 0 - entityID: 10 - entityInstance: 6 + entityID: 29 + entityInstance: 12 interfaces: xyz.openbmc_project.Sensor.Value: Value: Offsets: 255: type: int64_t - multiplierM: 2 + multiplierM: 100 offsetB: 0 - path: /xyz/openbmc_project/sensors/power/p1_mem_power + path: /xyz/openbmc_project/sensors/fan_tach/fan5_1 rExp: 0 readingType: readingData - scale: -6 + scale: 0 sensorNamePattern: nameLeaf sensorReadingType: 1 - sensorType: 8 + sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Watts + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS 244: bExp: 0 entityID: 10 - entityInstance: 7 + entityInstance: 3 interfaces: xyz.openbmc_project.Sensor.Value: Value: @@ -262,7 +262,7 @@ type: int64_t multiplierM: 2 offsetB: 0 - path: /xyz/openbmc_project/sensors/power/ps0_input_power + path: /xyz/openbmc_project/sensors/power/p0_vdd_power rExp: 0 readingType: readingData scale: -6 @@ -274,7 +274,7 @@ 245: bExp: 0 entityID: 10 - entityInstance: 8 + entityInstance: 4 interfaces: xyz.openbmc_project.Sensor.Value: Value: @@ -283,7 +283,7 @@ type: int64_t multiplierM: 2 offsetB: 0 - path: /xyz/openbmc_project/sensors/power/ps1_input_power + path: /xyz/openbmc_project/sensors/power/p1_vdd_power rExp: 0 readingType: readingData scale: -6 @@ -295,7 +295,7 @@ 246: bExp: 0 entityID: 10 - entityInstance: 9 + entityInstance: 7 interfaces: xyz.openbmc_project.Sensor.Value: Value: @@ -304,19 +304,19 @@ type: int64_t multiplierM: 2 offsetB: 0 - path: /xyz/openbmc_project/sensors/voltage/ps0_input_voltage + path: /xyz/openbmc_project/sensors/power/ps0_input_power rExp: 0 readingType: readingData - scale: -3 + scale: -6 sensorNamePattern: nameLeaf sensorReadingType: 1 - sensorType: 2 + sensorType: 8 serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts 247: bExp: 0 entityID: 10 - entityInstance: 10 + entityInstance: 8 interfaces: xyz.openbmc_project.Sensor.Value: Value: @@ -325,15 +325,15 @@ type: int64_t multiplierM: 2 offsetB: 0 - path: /xyz/openbmc_project/sensors/voltage/ps1_input_voltage + path: /xyz/openbmc_project/sensors/power/ps1_input_power rExp: 0 readingType: readingData - scale: -3 + scale: -6 sensorNamePattern: nameLeaf sensorReadingType: 1 - sensorType: 2 + sensorType: 8 serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts 248: bExp: 0 entityID: 10 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 f8e89b2ed..bb3226af3 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 @@ -1,8 +1,8 @@ # Mihawk thermal policy for PDM. # # Shut down the system if more than three cores -# have a temperature greater than 100 degrees Celcius. - +# have a temperature greater than 95 degrees Celcius. +# or ambient temperature greater than 45 degrees Celcius. - name: core sensors description: > @@ -107,6 +107,15 @@ - meta: SENSOR path: /xyz/openbmc_project/sensors/temperature/p1_core23_temp +- name: ambient sensor + description: > + 'The machine has one ambient temperature sensors.' + class: group + group: path + members: + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/ambient_temp + - name: core temp description: > 'Monitor the temperature of each core.' @@ -118,6 +127,17 @@ meta: TEMP property: Value +- name: ambient temp + description: > + 'Monitor the ambient temperature.' + 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.' @@ -127,6 +147,15 @@ properties: core temp callback: check temps +- name: watch ambient temp + description: > + 'Trigger logic on ambient temp changes.' + class: watch + watch: property + paths: ambient sensor + properties: ambient temp + callback: check ambient temp + - name: check temps description: > 'If this condition passes at least three cores are running @@ -139,7 +168,21 @@ countop: '>=' countbound: 3 op: '>=' - bound: 115000 + bound: 95000 + oneshot: true + +- name: check ambient temp + description: > + 'If the ambient sensor is too hot. Shut the system down.' + class: condition + condition: count + paths: ambient sensor + properties: ambient temp + callback: ambient log and shutdown + countop: '>=' + countbound: 1 + op: '>=' + bound: 45000 oneshot: true - name: log and shutdown @@ -152,6 +195,16 @@ - create criticalhigh error - create shutdown error +- name: ambient log and shutdown + description: > + 'Shut the system down and log an event.' + class: callback + callback: group + members: + - shutdown + - create ambient criticalhigh error + - create ambient shutdown error + - name: shutdown description: > 'Shut down the system.' @@ -177,6 +230,16 @@ error: xyz::openbmc_project::Sensor::Threshold::Error::CriticalHigh metadata: xyz::openbmc_project::Sensor::Threshold::CriticalHigh::SENSOR_DATA +- name: create ambient criticalhigh error + description: > + 'Create a Ambient CriticalHigh Error log.' + class: callback + callback: elog_with_metadata + paths: ambient sensor + properties: ambient 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.' @@ -185,3 +248,12 @@ paths: core sensors properties: core temp error: xyz::openbmc_project::State::Shutdown::ThermalEvent::Error::Processor + +- name: create ambient shutdown error + description: > + 'Create a SystemShutdown Error log.' + class: callback + callback: elog + paths: ambient sensor + properties: ambient temp + error: xyz::openbmc_project::State::Shutdown::ThermalEvent::Error::Ambient 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 ec63490f3..ade4567ce 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 @@ -549,7 +549,7 @@ events: name: Value type: int64_t property: - value: 50000 + value: 55000 type: int64_t factor: value: 1000 @@ -565,10 +565,10 @@ events: name: Value type: int64_t property: - value: 47000 + value: 52000 type: int64_t factor: - value: 3000 + value: 1000 type: int64_t delta: value: 3 @@ -642,7 +642,7 @@ events: value: 70000 type: int64_t factor: - value: 7000 + value: 4000 type: int64_t delta: value: 5 @@ -689,7 +689,7 @@ events: name: Value type: int64_t property: - value: 70 + value: 80 type: int64_t factor: value: 1 @@ -705,7 +705,7 @@ events: name: Value type: int64_t property: - value: 67 + value: 77 type: int64_t factor: value: 4 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf new file mode 100644 index 000000000..07564e989 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf @@ -0,0 +1,6 @@ +INVENTORY=/system/chassis/motherboard/powersupply0 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=144 +NAME=powersupply0 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf new file mode 100644 index 000000000..304442fe9 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf @@ -0,0 +1,6 @@ +INVENTORY=/system/chassis/motherboard/powersupply1 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=145 +NAME=powersupply1 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf new file mode 100644 index 000000000..0f2a9c4f6 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf @@ -0,0 +1,6 @@ +INVENTORY=/system/chassis/motherboard/powersupply2 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=146 +NAME=powersupply2 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-006a +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf new file mode 100644 index 000000000..3ea74acab --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf @@ -0,0 +1,6 @@ +INVENTORY=/system/chassis/motherboard/powersupply3 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=147 +NAME=powersupply3 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-006b +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 6919edf7c..04399f83c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -7,8 +7,10 @@ FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_ SYSTEMD_LINK_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" SYSTEMD_LINK_${PN}-presence_append_mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK_${PN}-presence_append_rainier = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_rainier = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend new file mode 100644 index 000000000..c847c0564 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -0,0 +1,6 @@ +ALT_RMCPP_IFACE_mihawk = "eth1" +SYSTEMD_SERVICE_${PN}_append_mihawk += " \ + ${PN}@${ALT_RMCPP_IFACE}.service \ + ${PN}@${ALT_RMCPP_IFACE}.socket \ + " + diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json index 80bfbcfd9..123aa6df9 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json @@ -9849,6 +9849,27 @@ "UserAction": null, "VMMigrationFlag": null }, + "xyz.openbmc_project.Certs.Error.InvalidCertificate": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Certs.Error.InvalidCertificate", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0075G", + "ComponentInstance": null, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Firmware/Software Failure", + "Internal": false, + "LengthyDescription": "The provided certificate is not valid. The BMC will continue operating with the old certificate.", + "LogSource": "BMC", + "Message": "The provided certificate is not valid", + "ReferencedInventory": null, + "RelatedEventIDs": {}, + "Serviceable": true, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, "xyz.openbmc_project.Certs.Install.Error.InvalidCertificate": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", @@ -17451,6 +17472,48 @@ "UserAction": null, "VMMigrationFlag": null }, + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0063F", + "ComponentInstance": 0, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from the OCC on CPU 0", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00:00/00:00:00:0a/fsi-master/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2": { + "AffectedLEDs": null, + "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", + "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPCR0063F", + "ComponentInstance": 1, + "DateAdded": null, + "DateReviewed": null, + "EventType": "Communication Failure/Timeout", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "Failed to read from the OCC on CPU 1", + "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1", + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", @@ -22218,6 +22281,27 @@ "UserAction": null, "VMMigrationFlag": null }, + "xyz.openbmc_project.State.Shutdown.Power.Error.Blackout": { + "AffectedLEDs": null, + "AffectedSubsystem": "Power", + "BMCMessageID": "xyz.openbmc_project.State.Shutdown.Power.Error.Blackout", + "CallHomeCandidate": false, + "CommonEventID": "FQPSPPW0065F", + "ComponentInstance": null, + "DateAdded": "10/29/2019", + "DateReviewed": null, + "EventType": "Unrecoverable Hardware Failure", + "Internal": false, + "LengthyDescription": null, + "LogSource": "BMC", + "Message": "All power input was lost and caused an unexpected shutdown while the host was powered on", + "ReferencedInventory": null, + "RelatedEventIDs": {}, + "Serviceable": false, + "Severity": "Warning", + "UserAction": null, + "VMMigrationFlag": null + }, "xyz.openbmc_project.State.Shutdown.Power.Error.Fault": { "AffectedLEDs": null, "AffectedSubsystem": "Cooling", @@ -22431,7 +22515,7 @@ }, "fileInfo": { "Entity": "IBM OpenBMC", - "Version": "1.8.3", + "Version": "1.8.4", "language": "English" } } diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 005dd0c66..090912ec1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -2,10 +2,15 @@ RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-oc RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog" -RDEPENDS_${PN}-extras_append_ibm-ac-server = " witherspoon-pfault-analysis witherspoon-power-supply-sync phosphor-webui" -RDEPENDS_${PN}-extras_append_rainier = " phosphor-webui" +RDEPENDS_${PN}-extras_append_ibm-ac-server = " phosphor-power phosphor-power-systemd-links witherspoon-power-supply-sync phosphor-webui" +RDEPENDS_${PN}-extras_append_rainier = " phosphor-power phosphor-power-systemd-links phosphor-webui" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing" RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" +RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-logging_remove_rainier = "ibm-logging" +RDEPENDS_${PN}-extras_append_rainier = " pldm" +RDEPENDS_${PN}-extras_append_witherspoon-128 = " pldm" +RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm" + ${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/11.json b/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/11.json new file mode 100644 index 000000000..26fdf5c09 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/11.json @@ -0,0 +1,28 @@ +{ + "entries" : [{ + "type" : 33, + "instance" : 0, + "container" : 0, + "effecters" : [{ + "set" : { + "id" : 196, + "size" : 1, + "states" : [1,2] + }, + "dbus" : "/xyz/openbmc_project/state/host0" + }] + }, + { + "type" : 45, + "instance" : 0, + "container" : 0, + "effecters" : [{ + "set" : { + "id" : 260, + "size" : 2, + "states" : [9] + }, + "dbus" : "/xyz/openbmc_project/state/chassis0" + }] + }] +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/enum_attrs.json b/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/enum_attrs.json new file mode 100755 index 000000000..cf20e3e31 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/enum_attrs.json @@ -0,0 +1,54 @@ +{ + "entries":[ + { + "attribute_name":"pvm-fw-boot-side", + "possible_values":[ + "Perm", + "Temp" + ], + "default_values":[ + "Perm" + ] + }, + { + "attribute_name":"pvm-os-boot-side", + "possible_values":[ + "Perm", + "Temp" + ], + "default_values":[ + "Perm" + ] + }, + { + "attribute_name":"pvm-inband-code-update", + "possible_values":[ + "Allowed", + "Not Allowed" + ], + "default_values":[ + "Allowed" + ] + }, + { + "attribute_name":"pvm-surveillance", + "possible_values":[ + "Disabled", + "Enabled" + ], + "default_values":[ + "Enabled" + ] + }, + { + "attribute_name":"pvm-pcie-error-inject", + "possible_values":[ + "Disabled", + "Enabled" + ], + "default_values":[ + "Enabled" + ] + } + ] +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/fileTable.json b/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/fileTable.json new file mode 100755 index 000000000..9d9750a58 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/fileTable.json @@ -0,0 +1,10 @@ +[ + { + "path":"/var/lib/pldm/PHYP-NVRAM", + "file_traits":1 + }, + { + "path":"/var/lib/pldm/PHYP-NVRAM-CKSUM", + "file_traits":4 + } +] diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/host_eid b/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/host_eid new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/host_eid @@ -0,0 +1 @@ +9 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm_%.bbappend new file mode 100644 index 000000000..335396bd7 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm_%.bbappend @@ -0,0 +1,19 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +EXTRA_OEMESON_append = " \ + -Doem-ibm=enabled \ + " + +SRC_URI += "file://fileTable.json" +SRC_URI += "file://enum_attrs.json" +SRC_URI += "file://11.json" +SRC_URI += "file://host_eid" + +do_install_append() { + install -d ${D}${datadir}/pldm/bios/ + install -d ${D}${datadir}/pldm/pdr/ + install -m 0644 ${WORKDIR}/fileTable.json ${D}${datadir}/pldm/ + install -m 0644 ${WORKDIR}/enum_attrs.json ${D}${datadir}/pldm/bios/ + install -m 0644 ${WORKDIR}/11.json ${D}${datadir}/pldm/pdr/ + install -m 0644 ${WORKDIR}/host_eid ${D}${datadir}/pldm/ +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/rainier/psu.json b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/rainier/psu.json new file mode 100644 index 000000000..baa96ac27 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/rainier/psu.json @@ -0,0 +1,31 @@ +{ + "inventoryPMBusAccessType": "HwmonDeviceDebug", + "fruConfigs": [ + { + "propertyName": "PartNumber", + "fileName": "part_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "SerialNumber", + "fileName": "serial_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Model", + "fileName": "ccin", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Version", + "fileName": "fw_version", + "interface": "xyz.openbmc_project.Software.Version" + } + ], + "psuDevices": { + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0" : "/sys/bus/i2c/devices/3-0068", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1" : "/sys/bus/i2c/devices/3-0069", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply2" : "/sys/bus/i2c/devices/3-006a", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply3" : "/sys/bus/i2c/devices/3-006b" + } +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/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/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/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/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/psu.json b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/psu.json new file mode 100644 index 000000000..94f14dd60 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/psu.json @@ -0,0 +1,29 @@ +{ + "inventoryPMBusAccessType": "HwmonDeviceDebug", + "fruConfigs": [ + { + "propertyName": "PartNumber", + "fileName": "part_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "SerialNumber", + "fileName": "serial_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Model", + "fileName": "ccin", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Version", + "fileName": "fw_version", + "interface": "xyz.openbmc_project.Software.Version" + } + ], + "psuDevices": { + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0" : "/sys/bus/i2c/devices/3-0068", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1" : "/sys/bus/i2c/devices/3-0069" + } +} 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/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf index d6732e6b8..d6732e6b8 100644 --- 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/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf 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/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf index cace335b1..cace335b1 100644 --- 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/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/pseq-monitor-pgood.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service index 458c5e6d7..458c5e6d7 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon/pseq-monitor-pgood.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/psu.json b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/psu.json new file mode 100644 index 000000000..cbabc7839 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/psu.json @@ -0,0 +1,29 @@ +{ + "inventoryPMBusAccessType": "HwmonDeviceDebug", + "fruConfigs": [ + { + "propertyName": "PartNumber", + "fileName": "part_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "SerialNumber", + "fileName": "serial_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Model", + "fileName": "ccin", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Version", + "fileName": "fw_version", + "interface": "xyz.openbmc_project.Software.Version" + } + ], + "psuDevices": { + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0" : "/sys/bus/i2c/devices/3-0069", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1" : "/sys/bus/i2c/devices/3-0068" + } +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend new file mode 100644 index 000000000..b90dc9b50 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://psu.json" + +EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" + +DEPENDS += " power-sequencer" + +do_install_append(){ + install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json +} +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')}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml index e40e8dd7c..a6bba44ce 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml @@ -198,13 +198,4 @@ pinID: 83 poll: false analysis: none - GPIOAnalysis: - - type: none - path: "" - gpio_value: low - error_function: memGoodError - option_flags: none - GPIODefinitions: - - GPIODefinition: none - gpio: 0 - callout: "" + diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/witherspoon/ucd90160.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/witherspoon/ucd90160.yaml index 39ee8ed36..9dd381248 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/witherspoon/ucd90160.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/witherspoon/ucd90160.yaml @@ -1,7 +1,7 @@ - Device: index: 0 # Linux sysfs path for this power sequencer (0xC8 8-bit address) - path: /sys/bus/i2c/devices//i2c-11/11-0064 + path: /sys/bus/i2c/devices/i2c-11/11-0064 RailNames: - "5.0VCS" - "12.0V" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb index 76781cbdf..3c174c3e8 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb @@ -5,7 +5,7 @@ PV = "1.0+git${SRCPV}" inherit native inherit phosphor-dbus-yaml -require witherspoon-pfault-analysis.inc +require recipes-phosphor/power/phosphor-power.inc S = "${WORKDIR}/git" 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 deleted file mode 100644 index c3ef3e460..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc +++ /dev/null @@ -1,5 +0,0 @@ -HOMEPAGE = "https://github.com/openbmc/phosphor-power" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "bd4b86d3982cd5592e0417a5e45be6d3083f4c81" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/power-supply-monitor@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/power-supply-monitor@.service deleted file mode 100644 index bf027582d..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/power-supply-monitor@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Power Supply %I Monitor -Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-motherboard-powersupply%i.service -After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-motherboard-powersupply%i.service -Wants=mapper-wait@-org-openbmc-control-power0.service -After=mapper-wait@-org-openbmc-control-power0.service -ConditionPathExists={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf - -[Service] -EnvironmentFile={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf -ExecStart=/usr/bin/env psu-monitor --path=${{DEVPATH}} --instance=${{INSTANCE}} --inventory=${{INVENTORY}} --num-history-records=${{NUM_HISTORY_RECORDS}} --sync-gpio-path=${{SYNC_GPIO_PATH}} --sync-gpio-num=${{SYNC_GPIO_NUM}} -SyslogIdentifier=psu-monitor - -[Install] -RequiredBy=multi-user.target diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor.service deleted file mode 100644 index 8ce3b370d..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Power Sequencer Runtime Monitor -Wants=obmc-host-start-pre@0.target -Before=obmc-host-start-pre@0.target -After=obmc-power-on@0.target -Conflicts=obmc-chassis-poweroff@0.target - -[Service] -ExecStart=/usr/bin/env pseq-monitor -a runtime-monitor -i 500 -SyslogIdentifier=pseq-monitor diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/pseq-monitor-pgood.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/pseq-monitor-pgood.service deleted file mode 100644 index 206fc6602..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/swift/pseq-monitor-pgood.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Power Sequencer Power-on Monitor -Wants=op-power-start@0.service -After=op-power-start@0.service -Conflicts=obmc-chassis-poweroff@0.target -ConditionPathExists=!/run/openbmc/chassis@0-on - -[Service] -Type=oneshot -ExecStart=/usr/bin/env pseq-monitor -a pgood-monitor -i 5000 -SyslogIdentifier=pseq-monitor diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb deleted file mode 100644 index 49fe344dc..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Witherspoon Power Fault Analysis" -DESCRIPTION = "Analyzes power devices for faults" -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit meson -inherit pkgconfig -inherit obmc-phosphor-systemd -inherit pythonnative - -require ${PN}.inc - -S = "${WORKDIR}/git" - -DEPENDS += " \ - phosphor-logging \ - autoconf-archive-native \ - openpower-dbus-interfaces \ - sdbus++-native \ - sdeventplus \ - power-sequencer \ - nlohmann-json \ - " - -EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" - -CHASSIS_ON_TGT = "obmc-chassis-poweron@0.target" -SEQ_MONITOR_SVC = "pseq-monitor.service" -SEQ_MONITOR_FMT = "../${SEQ_MONITOR_SVC}:${CHASSIS_ON_TGT}.wants/${SEQ_MONITOR_SVC}" - -SEQ_PGOOD_SVC = "pseq-monitor-pgood.service" -SEQ_PGOOD_FMT = "../${SEQ_PGOOD_SVC}:${CHASSIS_ON_TGT}.wants/${SEQ_PGOOD_SVC}" - -SYSTEMD_SERVICE_${PN} += "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}" -SYSTEMD_LINK_${PN} += "${SEQ_MONITOR_FMT} ${SEQ_PGOOD_FMT}" - -PSU_MONITOR_TMPL = "power-supply-monitor@.service" -PSU_MONITOR_INSTFMT = "power-supply-monitor@{0}.service" -PSU_MONITOR_TGT = "multi-user.target" -PSU_MONITOR_FMT = "../${PSU_MONITOR_TMPL}:${PSU_MONITOR_TGT}.requires/${PSU_MONITOR_INSTFMT}" - -FILES_psu-monitor = "${bindir}/psu-monitor" -SYSTEMD_SERVICE_${PN} += "${PSU_MONITOR_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" - -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')}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf index 7c7b24811..939b3c1e5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf @@ -1,2 +1,5 @@ LABEL_temp2 = "ambient_temp" - +WARNHI_temp2 = "38000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "40000" +CRITLO_temp2 = "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 5d14ebc94..bb569f70a 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 @@ -5,21 +5,15 @@ LABEL_fan4 = "fan1_1" LABEL_fan5 = "fan2_0" LABEL_fan6 = "fan2_1" LABEL_fan7 = "fan3_0" -LABEL_fan8 = "fan3_1" +LABEL_fan8 = "fan3_1" LABEL_fan9 = "fan4_0" LABEL_fan10 = "fan4_1" 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"
\ No newline at end of file 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 5b347c10c..94eeff7ca 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 @@ -287,5 +287,4 @@ LABEL_power7 = "p0_vdd_power" LABEL_power8 = "fans_power" LABEL_power9 = "storage_b_power" LABEL_power10 = "storage_a_power" -LABEL_power11 = "gpu0_power" -LABEL_power14 = "total_power" +LABEL_power15 = "total_power" diff --git a/meta-ibm/meta-z/conf/bblayers.conf.sample b/meta-ibm/meta-z/conf/bblayers.conf.sample deleted file mode 100644 index 4a117c00b..000000000 --- a/meta-ibm/meta-z/conf/bblayers.conf.sample +++ /dev/null @@ -1,22 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "8" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -BBLAYERS ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe/ \ - ##OEROOT##/meta-openembedded/meta-filesystems/ \ - ##OEROOT##/meta-openembedded/meta-networking/ \ - ##OEROOT##/meta-openembedded/meta-python/ \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-ibm/meta-fsp2 \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm \ - ##OEROOT##/meta-ibm/meta-z \ -" -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - " diff --git a/meta-ibm/meta-z/conf/conf-notes.txt b/meta-ibm/meta-z/conf/conf-notes.txt deleted file mode 100644 index 9b3c01a55..000000000 --- a/meta-ibm/meta-z/conf/conf-notes.txt +++ /dev/null @@ -1,2 +0,0 @@ -Common targets are: - obmc-phosphor-image diff --git a/meta-ibm/meta-z/conf/layer.conf b/meta-ibm/meta-z/conf/layer.conf deleted file mode 100644 index 7b542303c..000000000 --- a/meta-ibm/meta-z/conf/layer.conf +++ /dev/null @@ -1,5 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -BBFILE_COLLECTIONS += "ibm-z-layer" -BBFILE_PATTERN_ibm-z-layer := "^${LAYERDIR}/" diff --git a/meta-ibm/meta-z/conf/local.conf.sample b/meta-ibm/meta-z/conf/local.conf.sample deleted file mode 100644 index bd6b65b5b..000000000 --- a/meta-ibm/meta-z/conf/local.conf.sample +++ /dev/null @@ -1,17 +0,0 @@ -MACHINE ??= "ibm-z" -DISTRO ?= "openbmc-phosphor" -PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " *" -EXTRA_IMAGE_FEATURES = "debug-tweaks" -USER_CLASSES ?= "buildstats image-mklibs image-prelink" -PATCHRESOLVE = "noop" -BB_DISKMON_DIRS = "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" -CONF_VERSION = "1" diff --git a/meta-ibm/meta-z/conf/machine/ibm-z.conf b/meta-ibm/meta-z/conf/machine/ibm-z.conf deleted file mode 100644 index b9d182453..000000000 --- a/meta-ibm/meta-z/conf/machine/ibm-z.conf +++ /dev/null @@ -1,11 +0,0 @@ -MACHINE = "ibm-z" -KERNEL_DEVICETREE = "fsp2.dtb" -KBUILD_DEFCONFIG = "44x/fsp2_defconfig" - -require conf/machine/include/fsp2.inc -require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/openpower.inc - -UBOOT_MACHINE_sunray2 = "fsp2_defconfig" -UBOOT_ENTRYPOINT = "0x10000000" -UBOOT_LOADADDRESS = "0x10000000" diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index e087408ba..f98ee1c70 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/openbmc/ibm-logging" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/ibm-logging" -SRCREV = "3dd7c2e6deec6b4fe3e46b240eae53848dcc520a" +SRCREV = "4c0e8945f072f9139d0efb04e8f955663b972a84" inherit autotools inherit pkgconfig |