diff options
Diffstat (limited to 'meta-ibm/meta-witherspoon')
105 files changed, 3296 insertions, 272 deletions
diff --git a/meta-ibm/meta-witherspoon/README.md b/meta-ibm/meta-witherspoon/README.md index beb3ca93c..5d2b5c722 100644 --- a/meta-ibm/meta-witherspoon/README.md +++ b/meta-ibm/meta-witherspoon/README.md @@ -6,3 +6,16 @@ This is the Witherspoon machine layer. Witherspoon, or AC922, is an IBM POWER9 two-socket, 2U Accelerated Compute Server with up to 6 NVIDIA Tesla GPUs. More information can be found [here](https://www.ibm.com/us-en/marketplace/power-systems-ac922). + +In addition to witherspoon, this layer contains additional machine +configurations such as swift. The default machine target is witherspoon, +so in order to build a different configuration, or to build witherspoon +after building a different one, set the MACHINE environment to the desired +configuration name as follows (this is only needed once): + + export MACHINE="<machine_configuration>"; \ + export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE MACHINE" + +Then build: + + bitbake obmc-phosphor-image diff --git a/meta-ibm/meta-witherspoon/conf/layer.conf b/meta-ibm/meta-witherspoon/conf/layer.conf index 0ff811e1c..62b067874 100644 --- a/meta-ibm/meta-witherspoon/conf/layer.conf +++ b/meta-ibm/meta-witherspoon/conf/layer.conf @@ -6,5 +6,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "witherspoon-layer" -BBFILE_PATTERN_witherspoon-layer = "" +BBFILE_PATTERN_witherspoon-layer := "^${LAYERDIR}/" LAYERSERIES_COMPAT_witherspoon-layer = "thud warrior" diff --git a/meta-ibm/meta-witherspoon/conf/machine/swift.conf b/meta-ibm/meta-witherspoon/conf/machine/swift.conf new file mode 100644 index 000000000..6b5b7ce4c --- /dev/null +++ b/meta-ibm/meta-witherspoon/conf/machine/swift.conf @@ -0,0 +1,16 @@ +require conf/machine/witherspoon.conf + +KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" + +PHOSPHOR_MRW_LICENSE = "Apache-2.0" +PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +PHOSPHOR_MRW_URI = "git://git@github.com/open-power/swift-xml;protocol=ssh" +PHOSPHOR_MRW_REV = "661fdc993683bd40df4e5f11463ba51da702c55b" + +# 128MB flash size +FLASH_SIZE = "131072" + +# 32MB read-write filesystem +FLASH_UBI_RWFS_SIZE ?= "32768" +FLASH_UBI_RWFS_TXT_SIZE ?= "32MiB" +BMC_RW_SIZE = "0x2000000" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf new file mode 100644 index 000000000..284340d9f --- /dev/null +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf @@ -0,0 +1,14 @@ +require conf/machine/witherspoon.conf +MACHINEOVERRIDES .= ":witherspoon" + +KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-witherspoon-128.dtb" + +MRW_XML = "witherspoon.xml" + +# 128MB flash size +FLASH_SIZE = "131072" + +# 32MB read-write filesystem +FLASH_UBI_RWFS_SIZE ?= "32768" +FLASH_UBI_RWFS_TXT_SIZE ?= "32MiB" +BMC_RW_SIZE = "0x2000000" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf index c6f943429..579b00d14 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf @@ -23,8 +23,8 @@ VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" # Inhibit phosphor-fan-presence-mrw-native PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ - "phosphor-fan-presence-config-native" + "phosphor-fan-presence-config" # Inhibit phosphor-fan-control-fan-config-mrw-native PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ - "phosphor-fan-control-fan-config-native" + "phosphor-fan-control-fan-config" diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend index 847714b38..62ea76f79 100644 --- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://journald-storage-policy.conf" SRC_URI += "file://systemd-journald-override.conf" SRC_URI += "file://journald-size-policy.conf" diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch new file mode 100644 index 000000000..547d5f098 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch @@ -0,0 +1,748 @@ +From a3007793ae0c53b4a39159c6d69502de832a0914 Mon Sep 17 00:00:00 2001 +From: Adriana Kobylak <anoo@us.ibm.com> +Date: Thu, 7 Feb 2019 11:23:00 -0600 +Subject: [PATCH] ARM: dts: Aspeed: Witherspoon-128: Update BMC partitioning + +Create a Witherspoon-128 dts based off Witherspoon but with 128MB +BMC flash chips. + +Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> +--- + arch/arm/boot/dts/Makefile | 1 + + .../boot/dts/aspeed-bmc-opp-witherspoon-128.dts | 712 +++++++++++++++++++++ + 2 files changed, 713 insertions(+) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index bd40148..2341358 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -1245,6 +1245,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ + aspeed-bmc-opp-palmetto.dtb \ + aspeed-bmc-opp-romulus.dtb \ + aspeed-bmc-opp-witherspoon.dtb \ ++ aspeed-bmc-opp-witherspoon-128.dtb \ + aspeed-bmc-opp-zaius.dtb \ + aspeed-bmc-portwell-neptune.dtb \ + aspeed-bmc-quanta-q71l.dtb +diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts +new file mode 100644 +index 0000000..db34564 +--- /dev/null ++++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts +@@ -0,0 +1,712 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/dts-v1/; ++#include "aspeed-g5.dtsi" ++#include <dt-bindings/gpio/aspeed-gpio.h> ++#include <dt-bindings/leds/leds-pca955x.h> ++ ++/ { ++ model = "Witherspoon BMC"; ++ compatible = "ibm,witherspoon-bmc", "aspeed,ast2500"; ++ ++ chosen { ++ stdout-path = &uart5; ++ bootargs = "console=ttyS4,115200 earlyprintk"; ++ }; ++ ++ memory@80000000 { ++ reg = <0x80000000 0x20000000>; ++ }; ++ ++ reserved-memory { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++ flash_memory: region@98000000 { ++ no-map; ++ reg = <0x98000000 0x04000000>; /* 64M */ ++ }; ++ ++ gfx_memory: framebuffer { ++ size = <0x01000000>; ++ alignment = <0x01000000>; ++ compatible = "shared-dma-pool"; ++ reusable; ++ }; ++ ++ video_engine_memory: jpegbuffer { ++ size = <0x02000000>; /* 32MM */ ++ alignment = <0x01000000>; ++ compatible = "shared-dma-pool"; ++ reusable; ++ }; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ ++ air-water { ++ label = "air-water"; ++ gpios = <&gpio ASPEED_GPIO(B, 5) GPIO_ACTIVE_LOW>; ++ linux,code = <ASPEED_GPIO(B, 5)>; ++ }; ++ ++ checkstop { ++ label = "checkstop"; ++ gpios = <&gpio ASPEED_GPIO(J, 2) GPIO_ACTIVE_LOW>; ++ linux,code = <ASPEED_GPIO(J, 2)>; ++ }; ++ ++ ps0-presence { ++ label = "ps0-presence"; ++ gpios = <&gpio ASPEED_GPIO(P, 7) GPIO_ACTIVE_LOW>; ++ linux,code = <ASPEED_GPIO(P, 7)>; ++ }; ++ ++ ps1-presence { ++ label = "ps1-presence"; ++ gpios = <&gpio ASPEED_GPIO(N, 0) GPIO_ACTIVE_LOW>; ++ linux,code = <ASPEED_GPIO(N, 0)>; ++ }; ++ }; ++ ++ iio-hwmon-battery { ++ compatible = "iio-hwmon"; ++ io-channels = <&adc 12>; ++ }; ++ ++ gpio-keys-polled { ++ compatible = "gpio-keys-polled"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ poll-interval = <1000>; ++ ++ fan0-presence { ++ label = "fan0-presence"; ++ gpios = <&pca0 4 GPIO_ACTIVE_LOW>; ++ linux,code = <4>; ++ }; ++ ++ fan1-presence { ++ label = "fan1-presence"; ++ gpios = <&pca0 5 GPIO_ACTIVE_LOW>; ++ linux,code = <5>; ++ }; ++ ++ fan2-presence { ++ label = "fan2-presence"; ++ gpios = <&pca0 6 GPIO_ACTIVE_LOW>; ++ linux,code = <6>; ++ }; ++ ++ fan3-presence { ++ label = "fan3-presence"; ++ gpios = <&pca0 7 GPIO_ACTIVE_LOW>; ++ linux,code = <7>; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ fan0 { ++ retain-state-shutdown; ++ default-state = "keep"; ++ gpios = <&pca0 0 GPIO_ACTIVE_LOW>; ++ }; ++ ++ fan1 { ++ retain-state-shutdown; ++ default-state = "keep"; ++ gpios = <&pca0 1 GPIO_ACTIVE_LOW>; ++ }; ++ ++ fan2 { ++ retain-state-shutdown; ++ default-state = "keep"; ++ gpios = <&pca0 2 GPIO_ACTIVE_LOW>; ++ }; ++ ++ fan3 { ++ retain-state-shutdown; ++ default-state = "keep"; ++ gpios = <&pca0 3 GPIO_ACTIVE_LOW>; ++ }; ++ ++ front-fault { ++ retain-state-shutdown; ++ default-state = "keep"; ++ gpios = <&pca0 13 GPIO_ACTIVE_LOW>; ++ }; ++ ++ front-power { ++ retain-state-shutdown; ++ default-state = "keep"; ++ gpios = <&pca0 14 GPIO_ACTIVE_LOW>; ++ }; ++ ++ front-id { ++ retain-state-shutdown; ++ default-state = "keep"; ++ gpios = <&pca0 15 GPIO_ACTIVE_LOW>; ++ }; ++ ++ rear-fault { ++ gpios = <&gpio ASPEED_GPIO(N, 2) GPIO_ACTIVE_LOW>; ++ }; ++ ++ rear-id { ++ gpios = <&gpio ASPEED_GPIO(N, 4) GPIO_ACTIVE_LOW>; ++ }; ++ ++ rear-power { ++ gpios = <&gpio ASPEED_GPIO(N, 3) GPIO_ACTIVE_LOW>; ++ }; ++ ++ power-button { ++ gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ fsi: gpio-fsi { ++ compatible = "fsi-master-gpio", "fsi-master"; ++ #address-cells = <2>; ++ #size-cells = <0>; ++ no-gpio-delays; ++ ++ clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>; ++ data-gpios = <&gpio ASPEED_GPIO(E, 0) GPIO_ACTIVE_HIGH>; ++ mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>; ++ enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; ++ trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>; ++ }; ++ ++ iio-hwmon-dps310 { ++ compatible = "iio-hwmon"; ++ io-channels = <&dps 0>; ++ }; ++ ++ iio-hwmon-bmp280 { ++ compatible = "iio-hwmon"; ++ io-channels = <&bmp 1>; ++ }; ++ ++}; ++ ++&fmc { ++ status = "okay"; ++ ++ flash@0 { ++ status = "okay"; ++ label = "bmc"; ++ m25p,fast-read; ++ spi-max-frequency = <100000000>; ++ partitions { ++ #address-cells = < 1 >; ++ #size-cells = < 1 >; ++ compatible = "fixed-partitions"; ++ u-boot@0 { ++ reg = < 0 0x60000 >; ++ label = "u-boot"; ++ }; ++ u-boot-env@60000 { ++ reg = < 0x60000 0x20000 >; ++ label = "u-boot-env"; ++ }; ++ obmc-ubi@80000 { ++ reg = < 0x80000 0x7F80000>; ++ label = "obmc-ubi"; ++ }; ++ }; ++ }; ++ ++ flash@1 { ++ status = "okay"; ++ label = "alt-bmc"; ++ m25p,fast-read; ++ spi-max-frequency = <100000000>; ++ partitions { ++ #address-cells = < 1 >; ++ #size-cells = < 1 >; ++ compatible = "fixed-partitions"; ++ u-boot@0 { ++ reg = < 0 0x60000 >; ++ label = "alt-u-boot"; ++ }; ++ u-boot-env@60000 { ++ reg = < 0x60000 0x20000 >; ++ label = "alt-u-boot-env"; ++ }; ++ obmc-ubi@80000 { ++ reg = < 0x80000 0x7F80000>; ++ label = "alt-obmc-ubi"; ++ }; ++ }; ++ }; ++}; ++ ++&spi1 { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_spi1_default>; ++ ++ flash@0 { ++ status = "okay"; ++ label = "pnor"; ++ m25p,fast-read; ++ spi-max-frequency = <100000000>; ++ }; ++}; ++ ++&uart1 { ++ /* Rear RS-232 connector */ ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_txd1_default ++ &pinctrl_rxd1_default ++ &pinctrl_nrts1_default ++ &pinctrl_ndtr1_default ++ &pinctrl_ndsr1_default ++ &pinctrl_ncts1_default ++ &pinctrl_ndcd1_default ++ &pinctrl_nri1_default>; ++}; ++ ++&uart2 { ++ /* APSS */ ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_txd2_default &pinctrl_rxd2_default>; ++}; ++ ++&uart5 { ++ status = "okay"; ++}; ++ ++&lpc_ctrl { ++ status = "okay"; ++ memory-region = <&flash_memory>; ++ flash = <&spi1>; ++}; ++ ++&mbox { ++ status = "okay"; ++}; ++ ++&mac0 { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_rmii1_default>; ++ use-ncsi; ++}; ++ ++&i2c2 { ++ status = "okay"; ++ ++ /* MUX -> ++ * Samtec 1 ++ * Samtec 2 ++ */ ++}; ++ ++&i2c3 { ++ status = "okay"; ++ ++ bmp: bmp280@77 { ++ compatible = "bosch,bmp280"; ++ reg = <0x77>; ++ #io-channel-cells = <1>; ++ }; ++ ++ max31785@52 { ++ compatible = "maxim,max31785a"; ++ reg = <0x52>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ fan@0 { ++ compatible = "pmbus-fan"; ++ reg = <0>; ++ tach-pulses = <2>; ++ maxim,fan-rotor-input = "tach"; ++ maxim,fan-pwm-freq = <25000>; ++ maxim,fan-dual-tach; ++ maxim,fan-no-watchdog; ++ maxim,fan-no-fault-ramp; ++ maxim,fan-ramp = <2>; ++ maxim,fan-fault-pin-mon; ++ }; ++ ++ fan@1 { ++ compatible = "pmbus-fan"; ++ reg = <1>; ++ tach-pulses = <2>; ++ maxim,fan-rotor-input = "tach"; ++ maxim,fan-pwm-freq = <25000>; ++ maxim,fan-dual-tach; ++ maxim,fan-no-watchdog; ++ maxim,fan-no-fault-ramp; ++ maxim,fan-ramp = <2>; ++ maxim,fan-fault-pin-mon; ++ }; ++ ++ fan@2 { ++ compatible = "pmbus-fan"; ++ reg = <2>; ++ tach-pulses = <2>; ++ maxim,fan-rotor-input = "tach"; ++ maxim,fan-pwm-freq = <25000>; ++ maxim,fan-dual-tach; ++ maxim,fan-no-watchdog; ++ maxim,fan-no-fault-ramp; ++ maxim,fan-ramp = <2>; ++ maxim,fan-fault-pin-mon; ++ }; ++ ++ fan@3 { ++ compatible = "pmbus-fan"; ++ reg = <3>; ++ tach-pulses = <2>; ++ maxim,fan-rotor-input = "tach"; ++ maxim,fan-pwm-freq = <25000>; ++ maxim,fan-dual-tach; ++ maxim,fan-no-watchdog; ++ maxim,fan-no-fault-ramp; ++ maxim,fan-ramp = <2>; ++ maxim,fan-fault-pin-mon; ++ }; ++ }; ++ ++ dps: dps310@76 { ++ compatible = "infineon,dps310"; ++ reg = <0x76>; ++ #io-channel-cells = <0>; ++ }; ++ ++ pca0: pca9552@60 { ++ compatible = "nxp,pca9552"; ++ reg = <0x60>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ gpio-controller; ++ #gpio-cells = <2>; ++ ++ gpio@0 { ++ reg = <0>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@1 { ++ reg = <1>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@2 { ++ reg = <2>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@3 { ++ reg = <3>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@4 { ++ reg = <4>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@5 { ++ reg = <5>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@6 { ++ reg = <6>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@7 { ++ reg = <7>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@8 { ++ reg = <8>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@9 { ++ reg = <9>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@10 { ++ reg = <10>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@11 { ++ reg = <11>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@12 { ++ reg = <12>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@13 { ++ reg = <13>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@14 { ++ reg = <14>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@15 { ++ reg = <15>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ }; ++ ++ power-supply@68 { ++ compatible = "ibm,cffps1"; ++ reg = <0x68>; ++ }; ++ ++ power-supply@69 { ++ compatible = "ibm,cffps1"; ++ reg = <0x69>; ++ }; ++}; ++ ++&i2c4 { ++ status = "okay"; ++ ++ tmp423a@4c { ++ compatible = "ti,tmp423"; ++ reg = <0x4c>; ++ }; ++ ++ ir35221@70 { ++ compatible = "infineon,ir35221"; ++ reg = <0x70>; ++ }; ++ ++ ir35221@71 { ++ compatible = "infineon,ir35221"; ++ reg = <0x71>; ++ }; ++}; ++ ++ ++&i2c5 { ++ status = "okay"; ++ ++ tmp423a@4c { ++ compatible = "ti,tmp423"; ++ reg = <0x4c>; ++ }; ++ ++ ir35221@70 { ++ compatible = "infineon,ir35221"; ++ reg = <0x70>; ++ }; ++ ++ ir35221@71 { ++ compatible = "infineon,ir35221"; ++ reg = <0x71>; ++ }; ++}; ++ ++&i2c9 { ++ status = "okay"; ++ ++ tmp275@4a { ++ compatible = "ti,tmp275"; ++ reg = <0x4a>; ++ }; ++}; ++ ++&i2c10 { ++ /* MUX ++ * -> PCIe Slot 3 ++ * -> PCIe Slot 4 ++ */ ++ status = "okay"; ++}; ++ ++&i2c11 { ++ status = "okay"; ++ ++ pca9552: pca9552@60 { ++ compatible = "nxp,pca9552"; ++ reg = <0x60>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ gpio-controller; ++ #gpio-cells = <2>; ++ ++ gpio-line-names = "PS_SMBUS_RESET_N", "APSS_RESET_N", ++ "GPU0_TH_OVERT_N_BUFF", "GPU1_TH_OVERT_N_BUFF", ++ "GPU2_TH_OVERT_N_BUFF", "GPU3_TH_OVERT_N_BUFF", ++ "GPU4_TH_OVERT_N_BUFF", "GPU5_TH_OVERT_N_BUFF", ++ "GPU0_PWR_GOOD_BUFF", "GPU1_PWR_GOOD_BUFF", ++ "GPU2_PWR_GOOD_BUFF", "GPU3_PWR_GOOD_BUFF", ++ "GPU4_PWR_GOOD_BUFF", "GPU5_PWR_GOOD_BUFF", ++ "12V_BREAKER_FLT_N", "THROTTLE_UNLATCHED_N"; ++ ++ gpio@0 { ++ reg = <0>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@1 { ++ reg = <1>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@2 { ++ reg = <2>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@3 { ++ reg = <3>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@4 { ++ reg = <4>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@5 { ++ reg = <5>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@6 { ++ reg = <6>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@7 { ++ reg = <7>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@8 { ++ reg = <8>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@9 { ++ reg = <9>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@10 { ++ reg = <10>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@11 { ++ reg = <11>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@12 { ++ reg = <12>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@13 { ++ reg = <13>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@14 { ++ reg = <14>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ ++ gpio@15 { ++ reg = <15>; ++ type = <PCA955X_TYPE_GPIO>; ++ }; ++ }; ++ ++ rtc@32 { ++ compatible = "epson,rx8900"; ++ reg = <0x32>; ++ }; ++ ++ eeprom@51 { ++ compatible = "atmel,24c64"; ++ reg = <0x51>; ++ }; ++ ++ ucd90160@64 { ++ compatible = "ti,ucd90160"; ++ reg = <0x64>; ++ }; ++}; ++ ++&i2c12 { ++ status = "okay"; ++}; ++ ++&i2c13 { ++ status = "okay"; ++}; ++ ++&vuart { ++ status = "okay"; ++}; ++ ++&gfx { ++ status = "okay"; ++ memory-region = <&gfx_memory>; ++}; ++ ++&pinctrl { ++ aspeed,external-nodes = <&gfx &lhc>; ++}; ++ ++&wdt1 { ++ aspeed,reset-type = "none"; ++ aspeed,external-signal; ++ aspeed,ext-push-pull; ++ aspeed,ext-active-high; ++ ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_wdtrst1_default>; ++}; ++ ++&wdt2 { ++ aspeed,alt-boot; ++}; ++ ++&ibt { ++ status = "okay"; ++}; ++ ++&adc { ++ status = "okay"; ++}; ++ ++&vhub { ++ status = "okay"; ++}; ++ ++&video { ++ status = "okay"; ++ memory-region = <&video_engine_memory>; ++}; ++ ++#include "ibm-power9-dual.dtsi" +-- +1.8.3.1 + diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend index 1b099371e..e41a430c7 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://witherspoon.cfg" +SRC_URI_append_witherspoon-128 = " file://0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb index 5abe1be1f..498b622d9 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb @@ -8,18 +8,16 @@ inherit obmc-phosphor-systemd RDEPENDS_${PN} += "i2c-tools" S = "${WORKDIR}" -SRC_URI += "file://power-workarounds.sh \ + +SRC_URI += "file://avsbus-disable.sh \ file://avsbus-enable.sh \ - file://avsbus-disable.sh" + file://power-workarounds.sh" do_install() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/power-workarounds.sh \ - ${D}${bindir}/power-workarounds.sh - install -m 0755 ${WORKDIR}/avsbus-disable.sh \ - ${D}${bindir}/avsbus-disable.sh - install -m 0755 ${WORKDIR}/avsbus-enable.sh \ - ${D}${bindir}/avsbus-enable.sh + install -m 0755 ${S}/avsbus-disable.sh ${D}${bindir}/avsbus-disable.sh + install -m 0755 ${S}/avsbus-enable.sh ${D}${bindir}/avsbus-enable.sh + install -m 0755 ${S}/power-workarounds.sh ${D}${bindir}/power-workarounds.sh } TMPL_EN= "avsbus-enable@.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh new file mode 100644 index 000000000..1228ff945 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh @@ -0,0 +1,18 @@ +#!/bin/sh
+# For each AVSBus attached rail go back to using VOUT_COMMAND (PMBus voltage)
+# instead of AVSBus and do *not* update VOUT_COMMAND with last voltage sent via
+# AVSBus. This should be run after power-down. This is platform specific
+# settings that must be updated/removed if not Swift.
+
+i2cset -y 9 0x70 0x00 0x00 b # VDD 0 - PAGE set
+i2cset -y 9 0x70 0x01 0x80 b # VDD 0
+i2cset -y 9 0x71 0x00 0x01 b # VCS 0 - PAGE set
+i2cset -y 9 0x71 0x01 0x80 b # VCS 0
+i2cset -y 9 0x71 0x00 0x00 b # VDN 0 - PAGE set
+i2cset -y 9 0x71 0x01 0x80 b # VDN 0
+i2cset -y 10 0x70 0x00 0x00 b # VDD 1 - PAGE set
+i2cset -y 10 0x70 0x01 0x80 b # VDD 1
+i2cset -y 10 0x71 0x00 0x01 b # VCS 1 - PAGE set
+i2cset -y 10 0x71 0x01 0x80 b # VCS 1
+i2cset -y 10 0x71 0x00 0x00 b # VDN 1 - PAGE set
+i2cset -y 10 0x71 0x01 0x80 b # VDN 1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh new file mode 100644 index 000000000..d3840910a --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# For each AVSBus attached power rail set the default boot voltage and then +# program the OPERATION register to switch to AVSBus mode and update default +# start voltage to what was last programmed in VOUT_COMMAND. This should be run +# before power-on. This is platform specific settings that must be +# updated/removed if not Swift. + +i2cset -y 9 0x70 0x00 0x00 b # VDD 0 - PAGE set +i2cset -y 9 0x70 0x21 0xE6 0x00 i # VDD 0 - Set default HW boot voltage to 0.9V +i2cset -y 9 0x70 0x01 0xB0 b # VDD 0 +i2cset -y 9 0x71 0x00 0x01 b # VCS 0 - PAGE set +i2cset -y 9 0x71 0x21 0x00 0x01 i # VCS 0 - Set default HW boot voltage to 1.0V +i2cset -y 9 0x71 0x01 0xB0 b # VCS 0 +i2cset -y 9 0x71 0x00 0x00 b # VDN 0 - PAGE set +i2cset -y 9 0x71 0x21 0xCD 0x00 i # VDN 0 - Set default HW boot voltage to 0.8V +i2cset -y 9 0x71 0x01 0xB0 b # VDN 0 +i2cset -y 10 0x70 0x00 0x00 b # VDD 1 - PAGE set +i2cset -y 10 0x70 0x21 0xE6 0x00 i # VDD 1 - Set default HW boot voltage to 0.9V +i2cset -y 10 0x70 0x01 0xB0 b # VDD 1 +i2cset -y 10 0x71 0x00 0x01 b # VCS 1 - PAGE set +i2cset -y 10 0x71 0x21 0x00 0x01 i # VCS 1 - Set default HW boot voltage to 1.0V +i2cset -y 10 0x71 0x01 0xB0 b # VCS 1 +i2cset -y 10 0x71 0x00 0x00 b # VDN 1 - PAGE set +i2cset -y 10 0x71 0x21 0xCD 0x00 i # VDN 1 - Set default HW boot voltage to 0.8V +i2cset -y 10 0x71 0x01 0xB0 b # VDN 1 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds.sh new file mode 100644 index 000000000..dc1f4803b --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# This should be run before power-on and used to patch/update power specific +# hardware settings. This is platform specific settings that must be +# updated/removed if not Swift. + +########## Program TPS53915 FSW to desired frequency ######### +# FREQUENCY_CONFIG D3h, bits 2:0 + +# AVDD, bus 3 addr 1D, set to 600khz +# 600khz = 1,0,0 +i2cset -y 3 0x1D 0xD3 0x04 b + +# 3.3VA, bus 3 addr 1C, set to 600khz +i2cset -y 3 0x1C 0xD3 0x04 b + +# 3.3VB, bus 3 addr 1B, set to 600khz +i2cset -y 3 0x1B 0xD3 0x04 b + +# 5.0V, bus 3 addr 1A, set to 850khz +# 850khz = 1,1,0 +i2cset -y 3 0x1A 0xD3 0x06 b +########## END Program TPS53915 FSW to desired frequency ######### + diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh index a158f159e..a158f159e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh index 6306c58b0..6306c58b0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds.sh index d40579731..d40579731 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend deleted file mode 100644 index 0165929a6..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend +++ /dev/null @@ -1,24 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -INSTANCES = "motherboard/uuid motherboard/bmc/ethernet" -ITEMS_FMT = "system/chassis/{0}" - -ITEMS = "${@compose_list(d, 'ITEMS_FMT', 'INSTANCES')}" - -ENV_FILES = "obmc/sync_inventory_item/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENV_FILES', 'ITEMS')}" - -TMPL = "obmc-sync-inventory-item@.service" -TGT = "multi-user.target" - -ETH_SVC = "system-chassis-motherboard-bmc-ethernet.service" -UUID_SVC = "system-chassis-motherboard-uuid.service" - -ETH_DROPIN_DIR = "obmc-sync-inventory-item@${ETH_SVC}.d" -UUID_DROPIN_DIR = "obmc-sync-inventory-item@${UUID_SVC}.d" - -SYSTEMD_OVERRIDE_${PN} += "mac_sync_inventory.conf:${ETH_DROPIN_DIR}/mac_sync_inventory.conf" -SYSTEMD_OVERRIDE_${PN} += "uuid_sync_inventory.conf:${UUID_DROPIN_DIR}/uuid_sync_inventory.conf" - -SYSTEMD_LINK_${PN} += "../${TMPL}:${TGT}.wants/obmc-sync-inventory-item@${ETH_SVC}" -SYSTEMD_LINK_${PN} += "../${TMPL}:${TGT}.wants/obmc-sync-inventory-item@${UUID_SVC}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/mac_sync_inventory.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/mac_sync_inventory.conf deleted file mode 100644 index f04b6dd37..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/mac_sync_inventory.conf +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Wants=mapper-wait@-xyz-openbmc_project-network-config.service -After=mapper-wait@-xyz-openbmc_project-network-config.service - -Wants=op-vpd-parser.service -After=op-vpd-parser.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/bmc/ethernet b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/bmc/ethernet deleted file mode 100644 index 722e0e641..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/bmc/ethernet +++ /dev/null @@ -1,2 +0,0 @@ -PROPERTY="MACAddress" -SYNC_TYPE=mac diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/uuid b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/uuid deleted file mode 100644 index 95abbc885..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/uuid +++ /dev/null @@ -1,2 +0,0 @@ -PROPERTY="UUID" -SYNC_TYPE=uuid diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/uuid_sync_inventory.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/uuid_sync_inventory.conf deleted file mode 100644 index 587476244..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/uuid_sync_inventory.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -Wants=op-vpd-parser.service -After=op-vpd-parser.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend index 72d991c7e..72d991c7e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%/obmc/power_control b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/obmc/power_control index a93bdd758..a93bdd758 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%/obmc/power_control +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/obmc/power_control diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bbappend index 2831afe21..2831afe21 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend new file mode 100644 index 000000000..8f2097cc1 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml index 5f6a094ba..5f6a094ba 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend new file mode 100644 index 000000000..8f2097cc1 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/swift/fans.yaml index a70ac85a3..a70ac85a3 100755..100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/swift/fans.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml new file mode 100755 index 000000000..a70ac85a3 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml @@ -0,0 +1,21 @@ +fans: + - inventory: /system/chassis/motherboard/fan2 + cooling_zone: 0 + cooling_profile: all + sensors: + - fan2_0 + - inventory: /system/chassis/motherboard/fan0 + cooling_zone: 0 + cooling_profile: all + sensors: + - fan0_0 + - inventory: /system/chassis/motherboard/fan1 + cooling_zone: 0 + cooling_profile: air + sensors: + - fan1_0 + - inventory: /system/chassis/motherboard/fan3 + cooling_zone: 0 + cooling_profile: all + sensors: + - fan3_0 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend new file mode 100644 index 000000000..8f2097cc1 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/swift/zone_conditions.yaml index 0c8b3c5ff..0c8b3c5ff 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/swift/zone_conditions.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/witherspoon/zone_conditions.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/witherspoon/zone_conditions.yaml new file mode 100644 index 000000000..0c8b3c5ff --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/witherspoon/zone_conditions.yaml @@ -0,0 +1,18 @@ +conditions: + - name: air_cooled_chassis + type: getProperty + properties: + - property: WaterCooled + interface: xyz.openbmc_project.Inventory.Decorator.CoolingType + path: /xyz/openbmc_project/inventory/system/chassis + type: bool + value: false + + - name: water_and_air_cooled_chassis + type: getProperty + properties: + - property: WaterCooled + interface: xyz.openbmc_project.Inventory.Decorator.CoolingType + path: /xyz/openbmc_project/inventory/system/chassis + type: bool + value: true diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend deleted file mode 100644 index 6d4804d12..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend new file mode 100644 index 000000000..8f2097cc1 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/swift/zones.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/swift/zones.yaml new file mode 100644 index 000000000..c10c6c186 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/swift/zones.yaml @@ -0,0 +1,68 @@ +manager_configuration: + power_on_delay: 20 + +zone_configuration: + +#Air cooled zones +- zone_conditions: + - name: air_cooled_chassis + + zones: + - zone: 0 + cooling_profiles: + - air + - all + full_speed: 9500 + default_floor: 8000 + increase_delay: 5 + decrease_interval: 30 + interfaces: + - name: xyz.openbmc_project.Control.ThermalMode + properties: + - name: Supported + type: array[string] + values: + - value: DEFAULT + description: > + Default thermal control mode + - name: Current + type: string + persist: true + values: + - value: DEFAULT + description: > + Set current thermal control mode to the + default which will be replaced on startup if + another supported mode was selected & persisted. + +#Water cooled zones +- zone_conditions: + - name: water_and_air_cooled_chassis + + zones: + - zone: 0 + cooling_profiles: + - water + - all + full_speed: 9500 + default_floor: 8000 + increase_delay: 5 + decrease_interval: 30 + interfaces: + - name: xyz.openbmc_project.Control.ThermalMode + properties: + - name: Supported + type: array[string] + values: + - value: DEFAULT + description: > + Default thermal control mode + - name: Current + type: string + persist: true + values: + - value: DEFAULT + description: > + Set current thermal control mode to the + default which will be replaced on startup if + another supported mode was selected & persisted. diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml index d31b30445..d31b30445 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend new file mode 100644 index 000000000..8f2097cc1 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml index 5db7966fa..5db7966fa 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend new file mode 100644 index 000000000..8f2097cc1 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.yaml index 1c26fc21f..1c26fc21f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/swift/obmc/phosphor-fan/phosphor-cooling-type-0.conf index e5e8f435e..e5e8f435e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/swift/obmc/phosphor-fan/phosphor-cooling-type-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/swift/phosphor-cooling-type@.service index c1f5ae293..c1f5ae293 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/swift/phosphor-cooling-type@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/obmc/phosphor-fan/phosphor-cooling-type-0.conf new file mode 100644 index 000000000..e5e8f435e --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/obmc/phosphor-fan/phosphor-cooling-type-0.conf @@ -0,0 +1,6 @@ +OBJPATH="--path=/system/chassis" +AIR="--air" +WATER="" +DEVICE="--dev=/dev/input/by-path/platform-gpio-keys-event" +CODE="--event=13" + diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-cooling-type@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-cooling-type@.service new file mode 100644 index 000000000..c1f5ae293 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-cooling-type@.service @@ -0,0 +1,15 @@ +[Unit] +Description=Phosphor Cooling Type +Wants=mapper-wait@-xyz-openbmc_project-inventory.service +After=mapper-wait@-xyz-openbmc_project-inventory.service +ConditionPathExists={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf + +[Service] +Type=oneshot +RemainAfterExit=yes +EnvironmentFile={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf +ExecStart=/usr/bin/env phosphor-cooling-type ${{OBJPATH}} ${{AIR}} ${{WATER}} ${{DEVICE}} ${{CODE}} +SyslogIdentifier=phosphor-cooling-type + +[Install] +RequiredBy=multi-user.target diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend index 7467d36ec..58c1a5f9d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" # Package configuration FAN_PACKAGES += " \ @@ -12,7 +12,7 @@ INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" COOLING_TGT = "multi-user.target" FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" -FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type" +FILES_phosphor-cooling-type = "${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE_phosphor-cooling-type += "${TMPL_COOLING}" SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" @@ -21,11 +21,11 @@ COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" #These services are protected by the watchdog -SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" #These services need to be stopped when watchdog expires -SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-monitor-config/monitor.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-monitor-config/monitor.yaml new file mode 100644 index 000000000..5b9856c46 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-monitor-config/monitor.yaml @@ -0,0 +1,2 @@ +# TODO: Populate with https://github.com/ibm-openbmc/dev/issues/601 +# Placeholder diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-presence-config/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-presence-config/config.yaml new file mode 100644 index 000000000..5b9856c46 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/swift-phosphor-fan-presence-config/config.yaml @@ -0,0 +1,2 @@ +# TODO: Populate with https://github.com/ibm-openbmc/dev/issues/601 +# Placeholder diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index eafd11f6c..b58fc3b06 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,7 +1,6 @@ BMC_RW_MTD = "bmc" BMC_RO_MTD = "alt-bmc+bmc" BMC_KERNEL_MTD = "bmc" -BMC_RW_SIZE = "0x600000" # Enable signature verification by DISTRO_FEATURE obmc-ubi-fs PACKAGECONFIG_append_df-obmc-ubi-fs = " verify_signature" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf index 285a8f704..e271d4d63 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf @@ -3,3 +3,4 @@ DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=104 NAME=powersupply0 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/swift/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf new file mode 100644 index 000000000..57f5c7a4c --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/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=143 +NAME=powersupply1 +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/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf index 56e16c567..d7681f896 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf @@ -3,3 +3,4 @@ DEVPATH=/dev/input/by-path/platform-gpio-keys-event KEY=127 NAME=powersupply1 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_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 0fa11050b..f5a358200 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 @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend index bea352f7d..aa7e786c0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller" +OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb new file mode 100644 index 000000000..cdb146c50 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb @@ -0,0 +1,17 @@ +SUMMARY = "Copy Witherspoon inventory cleanup yaml for inventory manager" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit allarch +inherit phosphor-inventory-manager + +S = "${WORKDIR}" + +SRC_URI = "file://inventory-cleanup.yaml" + +do_install() { + install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml +} + +FILES_${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml index cce8c9dcc..a363bda8d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml @@ -36,3 +36,16 @@ events: - /system/chassis/motherboard/fan1/fan1_0 - /system/chassis/motherboard/fan1/fan1_1 - /system/chassis/motherboard/fan1 + + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis: + xyz.openbmc_project.Inventory.Item.Chassis: + Type: + value: "RackMount" + type: string diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json new file mode 100644 index 000000000..a86a65d5b --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json @@ -0,0 +1,1605 @@ +[ + { + "path": "system/chassis/motherboard/powersupply0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/power/ps0_input_power", + "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", + "/xyz/openbmc_project/sensors/current/ps0_output_current", + "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage" + ] + }, + { + "types": + { + "rType": "chassis", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/power/ps0_input_power", + "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", + "/xyz/openbmc_project/sensors/current/ps0_output_current", + "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "leds" + }, + "paths": + [ + "/xyz/openbmc_project/led/physical/cffps1_69" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/powersupply1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/power/ps1_input_power", + "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", + "/xyz/openbmc_project/sensors/current/ps1_output_current", + "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage" + ] + }, + { + "types": + { + "rType": "chassis", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/power/ps1_input_power", + "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", + "/xyz/openbmc_project/sensors/current/ps1_output_current", + "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "leds" + }, + "paths": + [ + "/xyz/openbmc_project/led/physical/cffps1_68" + ] + } + + ] + }, + { + "path": "system/chassis/motherboard/fan0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan0_0", + "/xyz/openbmc_project/sensors/fan_tach/fan0_1" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "leds" + }, + "paths": + [ + "/xyz/openbmc_project/led/physical/fan0" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan1_0", + "/xyz/openbmc_project/sensors/fan_tach/fan1_1" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "leds" + }, + "paths": + [ + "/xyz/openbmc_project/led/physical/fan1" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan2_0", + "/xyz/openbmc_project/sensors/fan_tach/fan2_1" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "leds" + }, + "paths": + [ + "/xyz/openbmc_project/led/physical/fan2" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/fan3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan3_0", + "/xyz/openbmc_project/sensors/fan_tach/fan3_1" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "leds" + }, + "paths": + [ + "/xyz/openbmc_project/led/physical/fan3" + ] + } + ] + }, + { + "path": "system/chassis/motherboard", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/ambient", + "/xyz/openbmc_project/sensors/temperature/pcie", + + "/xyz/openbmc_project/sensors/voltage/p0_vdd_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vcs_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vddr_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vdn_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vcs_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vdd_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vddr_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vdn_voltage", + + "/xyz/openbmc_project/sensors/power/p0_vdd_power", + "/xyz/openbmc_project/sensors/power/p0_vcs_power", + "/xyz/openbmc_project/sensors/power/p0_vddr_power", + "/xyz/openbmc_project/sensors/power/p0_vdn_power", + "/xyz/openbmc_project/sensors/power/p1_vdd_power", + "/xyz/openbmc_project/sensors/power/p1_vcs_power", + "/xyz/openbmc_project/sensors/power/p1_vddr_power", + "/xyz/openbmc_project/sensors/power/p1_vdn_power", + + "/xyz/openbmc_project/sensors/temperature/p0_vddr_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vcs_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vdd_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vdn_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vddr_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vcs_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vdd_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vdn_temp", + + "/xyz/openbmc_project/sensors/current/p0_vcs_current", + "/xyz/openbmc_project/sensors/current/p0_vddr_current", + "/xyz/openbmc_project/sensors/current/p0_vdd_current", + "/xyz/openbmc_project/sensors/current/p0_vdn_current", + "/xyz/openbmc_project/sensors/current/p1_vcs_current", + "/xyz/openbmc_project/sensors/current/p1_vddr_current", + "/xyz/openbmc_project/sensors/current/p1_vdd_current", + "/xyz/openbmc_project/sensors/current/p1_vdn_current", + + "/xyz/openbmc_project/sensors/power/fan_disk_power", + "/xyz/openbmc_project/sensors/power/io_power", + "/xyz/openbmc_project/sensors/power/total_power", + "/xyz/openbmc_project/sensors/power/p0_io_power", + "/xyz/openbmc_project/sensors/power/p0_mem_power", + "/xyz/openbmc_project/sensors/power/p0_power", + "/xyz/openbmc_project/sensors/power/p1_io_power", + "/xyz/openbmc_project/sensors/power/p1_mem_power", + "/xyz/openbmc_project/sensors/power/p1_power" + + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu0_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu0_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu1_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu1_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu2_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu2_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu3_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu3_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card4", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu4_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu4_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card5", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu5_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu5_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core0_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core1_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core2_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core3_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core4", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core4_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core5", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core5_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core6", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core6_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core7", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core7_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core8", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core8_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core9", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core9_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core10", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core10_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core11", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core11_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core12", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core12_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core13", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core13_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core14", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core14_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core15", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core15_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core16", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core16_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core17", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core17_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core18", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core18_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core19", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core19_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core20", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core20_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core21", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core21_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core22", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core22_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core23", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core23_temp" + ] + } + ] + }, + + { + "path": "system/chassis/motherboard/cpu1/core0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core0_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core1_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core2_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core3_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core4", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core4_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core5", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core5_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core6", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core6_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core7", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core7_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core8", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core8_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core9", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core9_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core10", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core10_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core11", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core11_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core12", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core12_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core13", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core13_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core14", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core14_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core15", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core15_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core16", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core16_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core17", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core17_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core18", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core18_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core19", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core19_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core20", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core20_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core21", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core21_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core22", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core22_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core23", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core23_temp" + ] + } + ] + }, + + { + "path": "system/chassis/motherboard/dimm0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm0_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm1_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm2_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm3_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm4", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm4_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm5", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm5_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm6", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm6_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm7", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm7_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm8", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm8_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm9", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm9_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm10", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm10_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm11", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm11_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm12", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm12_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm13", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm13_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm14", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm14_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm15", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "child_sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm15_temp" + ] + } + ] + }, + { + "path": "system/chassis", + "endpoints": + [ + { + "types": + { + "rType": "chassis", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/fan0_0", + "/xyz/openbmc_project/sensors/fan_tach/fan0_1", + "/xyz/openbmc_project/sensors/fan_tach/fan1_0", + "/xyz/openbmc_project/sensors/fan_tach/fan1_1", + "/xyz/openbmc_project/sensors/fan_tach/fan2_0", + "/xyz/openbmc_project/sensors/fan_tach/fan2_1", + "/xyz/openbmc_project/sensors/fan_tach/fan3_0", + "/xyz/openbmc_project/sensors/fan_tach/fan3_1", + + "/xyz/openbmc_project/sensors/temperature/ambient", + "/xyz/openbmc_project/sensors/temperature/pcie", + + "/xyz/openbmc_project/sensors/temperature/gpu0_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu0_mem_temp", + "/xyz/openbmc_project/sensors/temperature/gpu1_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu1_mem_temp", + "/xyz/openbmc_project/sensors/temperature/gpu2_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu2_mem_temp", + "/xyz/openbmc_project/sensors/temperature/gpu3_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu3_mem_temp", + "/xyz/openbmc_project/sensors/temperature/gpu4_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu4_mem_temp", + "/xyz/openbmc_project/sensors/temperature/gpu5_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu5_mem_temp", + + "/xyz/openbmc_project/sensors/temperature/p0_core0_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core1_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core2_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core3_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core4_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core5_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core6_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core7_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core8_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core9_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core10_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core11_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core12_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core13_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core14_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core15_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core16_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core17_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core18_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core19_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core20_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core21_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core22_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core23_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core0_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core1_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core2_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core3_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core4_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core5_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core6_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core7_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core8_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core9_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core10_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core11_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core12_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core13_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core14_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core15_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core16_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core17_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core18_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core19_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core20_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core21_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core22_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core23_temp", + + "/xyz/openbmc_project/sensors/temperature/dimm0_temp", + "/xyz/openbmc_project/sensors/temperature/dimm1_temp", + "/xyz/openbmc_project/sensors/temperature/dimm2_temp", + "/xyz/openbmc_project/sensors/temperature/dimm3_temp", + "/xyz/openbmc_project/sensors/temperature/dimm4_temp", + "/xyz/openbmc_project/sensors/temperature/dimm5_temp", + "/xyz/openbmc_project/sensors/temperature/dimm6_temp", + "/xyz/openbmc_project/sensors/temperature/dimm7_temp", + "/xyz/openbmc_project/sensors/temperature/dimm8_temp", + "/xyz/openbmc_project/sensors/temperature/dimm9_temp", + "/xyz/openbmc_project/sensors/temperature/dimm10_temp", + "/xyz/openbmc_project/sensors/temperature/dimm11_temp", + "/xyz/openbmc_project/sensors/temperature/dimm12_temp", + "/xyz/openbmc_project/sensors/temperature/dimm13_temp", + "/xyz/openbmc_project/sensors/temperature/dimm14_temp", + "/xyz/openbmc_project/sensors/temperature/dimm15_temp", + + "/xyz/openbmc_project/sensors/voltage/p0_vdd_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vcs_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vddr_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vdn_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vcs_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vdd_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vddr_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vdn_voltage", + + "/xyz/openbmc_project/sensors/temperature/p0_vcs_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vddr_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vdd_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vdn_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vcs_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vddr_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vdd_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vdn_temp", + + "/xyz/openbmc_project/sensors/current/p0_vcs_current", + "/xyz/openbmc_project/sensors/current/p0_vddr_current", + "/xyz/openbmc_project/sensors/current/p0_vdd_current", + "/xyz/openbmc_project/sensors/current/p0_vdn_current", + "/xyz/openbmc_project/sensors/current/p1_vcs_current", + "/xyz/openbmc_project/sensors/current/p1_vddr_current", + "/xyz/openbmc_project/sensors/current/p1_vdd_current", + "/xyz/openbmc_project/sensors/current/p1_vdn_current" + ] + } + ] + } +] diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend new file mode 100644 index 000000000..9b5b948fa --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGECONFIG_append = " associations" +SRC_URI += "file://associations.json" + + +DEPENDS_append_witherspoon = " inventory-cleanup" + +do_install_append() { + install -d ${D}${base_datadir} + install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend index 72d991c7e..72d991c7e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml index 072cc5cd6..072cc5cd6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend index 72d991c7e..72d991c7e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%/fru-config-not-sent-by-host.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml index 65c02b64b..65c02b64b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%/fru-config-not-sent-by-host.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml index f81159c73..8e0634f13 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml @@ -20,28 +20,6 @@ 0xFF:
type: int64_t
-0xde:
- entityID: 0x1D
- entityInstance: 2
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan0_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
0xdf:
entityID: 0x1D
entityInstance: 3
@@ -64,28 +42,6 @@ 0xFF:
type: int64_t
-0xe2:
- entityID: 0x1D
- entityInstance: 4
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan1_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
0xe3:
entityID: 0x1D
entityInstance: 5
@@ -108,28 +64,6 @@ 0xFF:
type: int64_t
-0xe4:
- entityID: 0x1D
- entityInstance: 6
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan2_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
0xe5:
entityID: 0x1D
entityInstance: 7
@@ -152,28 +86,6 @@ 0xFF:
type: int64_t
-0xe6:
- entityID: 0x1D
- entityInstance: 8
- sensorType: 0x04
- path: /xyz/openbmc_project/sensors/fan_tach/fan3_1
- sensorReadingType: 0x01
- multiplierM: 100
- offsetB: 0
- bExp: 0
- rExp: 0
- unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
- scale: 0
- serviceInterface: org.freedesktop.DBus.Properties
- readingType: readingData
- sensorNamePattern: nameLeaf
- interfaces:
- xyz.openbmc_project.Sensor.Value:
- Value:
- Offsets:
- 0xFF:
- type: int64_t
-
0xe7:
entityID: 0x0A
entityInstance: 1
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/witherspoon_hwmon_sensors.hardcoded.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/witherspoon_hwmon_sensors.hardcoded.yaml new file mode 100644 index 000000000..69c4ccdfc --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/witherspoon_hwmon_sensors.hardcoded.yaml @@ -0,0 +1,88 @@ +0xde:
+ entityID: 0x1D
+ entityInstance: 2
+ sensorType: 0x04
+ path: /xyz/openbmc_project/sensors/fan_tach/fan0_1
+ sensorReadingType: 0x01
+ multiplierM: 100
+ offsetB: 0
+ bExp: 0
+ rExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+ scale: 0
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ sensorNamePattern: nameLeaf
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0xFF:
+ type: int64_t
+
+0xe2:
+ entityID: 0x1D
+ entityInstance: 4
+ sensorType: 0x04
+ path: /xyz/openbmc_project/sensors/fan_tach/fan1_1
+ sensorReadingType: 0x01
+ multiplierM: 100
+ offsetB: 0
+ bExp: 0
+ rExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+ scale: 0
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ sensorNamePattern: nameLeaf
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0xFF:
+ type: int64_t
+
+0xe4:
+ entityID: 0x1D
+ entityInstance: 6
+ sensorType: 0x04
+ path: /xyz/openbmc_project/sensors/fan_tach/fan2_1
+ sensorReadingType: 0x01
+ multiplierM: 100
+ offsetB: 0
+ bExp: 0
+ rExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+ scale: 0
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ sensorNamePattern: nameLeaf
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0xFF:
+ type: int64_t
+
+0xe6:
+ entityID: 0x1D
+ entityInstance: 8
+ sensorType: 0x04
+ path: /xyz/openbmc_project/sensors/fan_tach/fan3_1
+ sensorReadingType: 0x01
+ multiplierM: 100
+ offsetB: 0
+ bExp: 0
+ rExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+ scale: 0
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ sensorNamePattern: nameLeaf
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0xFF:
+ type: int64_t
+
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index e1798ad4b..eec3999f2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,10 +1,15 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append = " \ file://occ_sensors.hardcoded.yaml \ file://hwmon_sensors.hardcoded.yaml \ file://channel.yaml \ " +# System-specific sensors +SRC_URI_append_witherspoon = " \ + file://witherspoon_hwmon_sensors.hardcoded.yaml \ + " + EXTRA_OECONF_append = " \ CHANNEL_YAML_GEN=${WORKDIR}/channel.yaml \ " diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend new file mode 100644 index 000000000..29d23c8c4 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend @@ -0,0 +1 @@ +SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth0.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend deleted file mode 100644 index 259394817..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -RDEPENDS_${PN}-fans_remove += "obmc-control-fan" -RDEPENDS_${PN}-chassis_remove += "obmc-button-reset" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer.bb new file mode 100644 index 000000000..f19e02ff8 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer.bb @@ -0,0 +1,18 @@ +SUMMARY = "Power sequencer data definition" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit allarch + +SRC_URI = "file://ucd90160.yaml" + +FILES_${PN} += "${datadir}/power-sequencer/ucd90160.yaml" + +S = "${WORKDIR}" + +do_install() { + DEST=${D}${datadir}/power-sequencer + + install -D ucd90160.yaml ${DEST}/ucd90160.yaml +} 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 new file mode 100644 index 000000000..494d0a034 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml @@ -0,0 +1,180 @@ +- Device: + index: 0 + # Linux sysfs path for this power sequencer (0xC8 8-bit address) + path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-8/8-0064 + RailNames: + - "12.0V" + - "3.3V" + - "1.8V" + - "1.1V" + - "0.8V_SW" + - "5.0V" + - "VDN0" + - "VDN1" + - "AVDD" + - "VIO0" + - "VIO1" + - "VDD0" + - "VDD1" + - "VCS0" + - "VCS1" + GPIConfigs: + - name: PGOOD_5P0V + gpi: 1 + pinID: 8 + poll: false + analysis: none + - name: MEM_GOOD0 + gpi: 2 + pinID: 9 + poll: false + analysis: memGOOD0 + - name: MEM_GOOD1 + gpi: 3 + pinID: 10 + poll: false + analysis: memGOOD1 + - name: GPU_PGOOD + gpi: 4 + pinID: 14 + poll: false + analysis: gpuPGOOD # Extra GPIOAnalysis to run if faulted + - name: GPU_TH_OVERT + gpi: 5 + pinID: 17 + poll: false + analysis: gpuOverTemp # Extra GPIOAnalysis to run if faulted + - name: SOFTWARE_PGOOD + gpi: 6 + pinID: 11 + poll: false + analysis: none + 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 + gpio_value: low # What GPIO value indicates a fault/problem? + error_function: gpuPGOODError # Extra analysis function to call for this type + option_flags: none + GPIODefinitions: + - GPIODefinition: GPU Card 0 + gpio: 8 # GPIO pin/register to check for fault + # Call out path for fault + callout: /system/chassis/motherboard/gv100card0 + - GPIODefinition: GPU Card 1 + gpio: 9 + callout: /system/chassis/motherboard/gv100card1 + - GPIODefinition: GPU Card 2 + gpio: 10 + callout: /system/chassis/motherboard/gv100card2 + - GPIODefinition: GPU Card 3 + gpio: 11 + 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 + gpio_value: low # What GPIO value indicates a fault/problem? + error_function: gpuOverTempError # Extra analysis function to call for this type + option_flags: shutdownOnFault + GPIODefinitions: + - GPIODefinition: GPU Card 0 Overtemperature + gpio: 2 # GPIO pin/register to check for fault + # Call out path for fault + callout: /system/chassis/motherboard/gv100card0 + - GPIODefinition: GPU Card 1 Overtemperature + gpio: 3 + callout: /system/chassis/motherboard/gv100card1 + - GPIODefinition: GPU Card 2 Overtemperature + gpio: 4 + callout: /system/chassis/motherboard/gv100card2 + - GPIODefinition: GPU Card 3 Overtemperature + gpio: 5 + 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 + gpio_value: low # What GPIO value indicates a fault/problem? + error_function: memGoodError # Extra analysis function to call for this type + option_flags: none + GPIODefinitions: + - GPIODefinition: CPU 0 OMI0A PGOOD + gpio: 0 # GPIO pin/register to check for fault + # Call out path for fault + callout: /system/chassis/motherboard/dimm4 + - GPIODefinition: CPU 0 OMI0B PGOOD + gpio: 1 + callout: /system/chassis/motherboard/dimm3 + - GPIODefinition: CPU 0 OMI0C PGOOD + gpio: 2 + callout: /system/chassis/motherboard/dimm2 + - GPIODefinition: CPU 0 OMI1A PGOOD + gpio: 3 + callout: /system/chassis/motherboard/dimm5 + - GPIODefinition: CPU 0 OMI1B PGOOD + gpio: 4 + callout: /system/chassis/motherboard/dimm10 + - GPIODefinition: CPU 0 OMI1C PGOOD + gpio: 5 + callout: /system/chassis/motherboard/dimm8 + - GPIODefinition: CPU 0 OMI2A PGOOD + gpio: 6 + callout: /system/chassis/motherboard/dimm11 + - GPIODefinition: CPU 0 OMI2B PGOOD + gpio: 7 + callout: /system/chassis/motherboard/dimm9 + - GPIODefinition: CPU 0 OMI3A PGOOD + gpio: 8 + callout: /system/chassis/motherboard/dimm0 + - GPIODefinition: CPU 0 OMI3B PGOOD + gpio: 9 + callout: /system/chassis/motherboard/dimm1 + - GPIODefinition: CPU 0 OMI3C PGOOD + gpio: 10 + callout: /system/chassis/motherboard/dimm7 + - GPIODefinition: CPU 0 OMI4A PGOOD + gpio: 11 + 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 + gpio_value: low # What GPIO value indicates a fault/problem? + error_function: memGoodError # Extra analysis function to call for this type + option_flags: none + GPIODefinitions: + - GPIODefinition: CPU 1 OMI0A PGOOD + gpio: 0 # GPIO pin/register to check for fault + # Call out path for fault + callout: /system/chassis/motherboard/dimm16 + - GPIODefinition: CPU 1 OMI0B PGOOD + gpio: 1 + callout: /system/chassis/motherboard/dimm15 + - GPIODefinition: CPU 1 OMI0C PGOOD + gpio: 2 + callout: /system/chassis/motherboard/dimm14 + - GPIODefinition: CPU 1 OMI1A PGOOD + gpio: 3 + callout: /system/chassis/motherboard/dimm17 + - GPIODefinition: CPU 1 OMI1B PGOOD + gpio: 4 + callout: /system/chassis/motherboard/dimm22 + - GPIODefinition: CPU 1 OMI1C PGOOD + gpio: 5 + callout: /system/chassis/motherboard/dimm20 + - GPIODefinition: CPU 1 OMI2A PGOOD + gpio: 6 + callout: /system/chassis/motherboard/dimm23 + - GPIODefinition: CPU 1 OMI2B PGOOD + gpio: 7 + callout: /system/chassis/motherboard/dimm21 + - GPIODefinition: CPU 1 OMI3A PGOOD + gpio: 8 + callout: /system/chassis/motherboard/dimm12 + - GPIODefinition: CPU 1 OMI3B PGOOD + gpio: 9 + callout: /system/chassis/motherboard/dimm13 + - GPIODefinition: CPU 1 OMI3C PGOOD + gpio: 10 + callout: /system/chassis/motherboard/dimm19 + - GPIODefinition: CPU 1 OMI4A PGOOD + gpio: 11 + callout: /system/chassis/motherboard/dimm18 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 new file mode 100644 index 000000000..bf373ea92 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/witherspoon/ucd90160.yaml @@ -0,0 +1,103 @@ +- Device: + index: 0 + # Linux sysfs path for this power sequencer (0xC8 8-bit address) + path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-11/11-0064 + RailNames: + - "5.0VCS" + - "12.0V" + - "3.3V" + - "1.8V" + - "1.1V" + - "1.0V" + - "0.9V" + - "VDN-A" + - "VDN-B" + - "AVDD" + - "VIO-A" + - "VIO-B" + - "VDD-A" + - "VDD-B" + - "VCS-A" + - "VCS-B" + GPIConfigs: + - name: PGOOD_5P0V + gpi: 1 + pinID: 8 + poll: false + analysis: none + - name: MEM_GOOD0 + gpi: 2 + pinID: 9 + poll: false + analysis: none + - name: MEM_GOOD1 + gpi: 3 + pinID: 10 + poll: false + analysis: none + - name: GPU_PGOOD + gpi: 4 + pinID: 14 + poll: false + analysis: gpuPGOOD + - name: GPU_TH_OVERT + gpi: 5 + pinID: 17 + poll: true + analysis: gpuOverTemp + - name: SOFTWARE_PGOOD + gpi: 6 + pinID: 11 + poll: false + analysis: none + GPIOAnalysis: + - type: gpuPGOOD + path: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-11/11-0060 + gpio_value: low + error_function: gpuPGOODError + option_flags: none + GPIODefinitions: + - GPIODefinition: GPU Card 0 + gpio: 8 + callout: /system/chassis/motherboard/gv100card0 + - GPIODefinition: GPU Card 1 + gpio: 9 + callout: /system/chassis/motherboard/gv100card1 + - GPIODefinition: GPU Card 2 + gpio: 10 + callout: /system/chassis/motherboard/gv100card2 + - GPIODefinition: GPU Card 3 + gpio: 11 + callout: /system/chassis/motherboard/gv100card3 + - GPIODefinition: GPU Card 4 + gpio: 12 + callout: /system/chassis/motherboard/gv100card4 + - GPIODefinition: GPU Card 5 + gpio: 13 + callout: /system/chassis/motherboard/gv100card5 + - type: gpuOverTemp # Extra analysis function to call for this type + # 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-11/11-0060 + gpio_value: low # What GPIO value indicates a fault/problem? + error_function: gpuOverTempError + option_flags: shutdownOnFault + GPIODefinitions: + - GPIODefinition: GPU Card 0 Overtemperature + gpio: 2 # GPIO pin/register to check for fault + # Call out path for fault + callout: /system/chassis/motherboard/gv100card0 + - GPIODefinition: GPU Card 1 Overtemperature + gpio: 3 + callout: /system/chassis/motherboard/gv100card1 + - GPIODefinition: GPU Card 2 Overtemperature + gpio: 4 + callout: /system/chassis/motherboard/gv100card2 + - GPIODefinition: GPU Card 3 Overtemperature + gpio: 5 + callout: /system/chassis/motherboard/gv100card3 + - GPIODefinition: GPU Card 4 Overtemperature + gpio: 6 + callout: /system/chassis/motherboard/gv100card4 + - GPIODefinition: GPU Card 5 Overtemperature + gpio: 7 + callout: /system/chassis/motherboard/gv100card5 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 be1ebd4ba..00b703d63 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 = "57bee329bbf1b67dd159f103b634be2fede08822" +SRCREV = "9c7897ce9176bf954e7e6b9a50d07c71e4035242" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/power-supply-monitor@.service index 56e2d218a..bf027582d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/power-supply-monitor@.service @@ -1,5 +1,5 @@ [Unit] -Description=Witherspoon Power Supply %I Monitor +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 @@ -8,8 +8,8 @@ ConditionPathExists={envfiledir}/obmc/power-supply-monitor/power-supply-monitor- [Service] EnvironmentFile={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf -ExecStart=/usr/bin/env witherspoon-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=witherspoon-psu-monitor +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/witherspoon-pseq-monitor-pgood.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor-pgood.service index ff6bcd181..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/witherspoon-pfault-analysis/pseq-monitor-pgood.service @@ -1,5 +1,5 @@ [Unit] -Description=Witherspoon Power Sequencer Power-on Monitor +Description=Power Sequencer Power-on Monitor Wants=op-power-start@0.service After=op-power-start@0.service Wants=power-workarounds@0.service @@ -9,5 +9,5 @@ ConditionPathExists=!/run/openbmc/chassis@0-on [Service] Type=oneshot -ExecStart=/usr/bin/env witherspoon-pseq-monitor -a pgood-monitor -i 5000 -SyslogIdentifier=witherspoon-pseq-monitor +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/pseq-monitor.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor.service new file mode 100644 index 000000000..8ce3b370d --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/pseq-monitor.service @@ -0,0 +1,10 @@ +[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/witherspoon-pseq-monitor.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor.service deleted file mode 100644 index 6e76c8f48..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-pseq-monitor.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Witherspoon 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 witherspoon-pseq-monitor -a runtime-monitor -i 500 -SyslogIdentifier=witherspoon-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 index c50765795..802f7594a 100644 --- 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 @@ -18,24 +18,27 @@ DEPENDS += " \ openpower-dbus-interfaces \ sdbus++-native \ sdeventplus \ + power-sequencer \ " +EXTRA_OECONF = "UCD90160_DEF_YAML_FILE=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" + CHASSIS_ON_TGT = "obmc-chassis-poweron@0.target" -SEQ_MONITOR_SVC = "witherspoon-pseq-monitor.service" +SEQ_MONITOR_SVC = "pseq-monitor.service" SEQ_MONITOR_FMT = "../${SEQ_MONITOR_SVC}:${CHASSIS_ON_TGT}.wants/${SEQ_MONITOR_SVC}" -SEQ_PGOOD_SVC = "witherspoon-pseq-monitor-pgood.service" +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 = "witherspoon-power-supply-monitor@.service" -PSU_MONITOR_INSTFMT = "witherspoon-power-supply-monitor@{0}.service" +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_witherspoon-psu-monitor = "${sbindir}/witherspoon-psu-monitor" +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')}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync.bb index ea7804bcd..a2d7e8919 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync.bb @@ -1,4 +1,4 @@ -SUMMARY = "Witherspoon Power Supply Sync" +SUMMARY = "Power Supply Sync" DESCRIPTION = "Synchronizes the power supplies' INPUT_HISTORY data" PR = "r1" LICENSE = "Apache-2.0" @@ -8,7 +8,7 @@ inherit obmc-phosphor-systemd RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" -SYNC_SERVICE = "witherspoon-power-supply-sync.service" +SYNC_SERVICE = "power-supply-sync.service" TGTFMT = "obmc-chassis-poweron@0.target" SYNC_FMT = "../${SYNC_SERVICE}:${TGTFMT}.wants/${SYNC_SERVICE}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync/witherspoon-power-supply-sync.service b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service index 005a0141d..9e342367b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync/witherspoon-power-supply-sync.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service @@ -1,5 +1,5 @@ [Unit] -Description=Witherspoon Power Supply Input History SYNC +Description=Power Supply Input History SYNC Wants=obmc-power-start-pre@0.target After=obmc-power-start-pre@0.target Wants=obmc-chassis-poweron@0.target @@ -8,7 +8,7 @@ ConditionPathExists=!/run/openbmc/chassis@0-on [Service] ExecStart=/usr/bin/env phosphor-gpio-util --gpio=105 --path=/dev/gpiochip0 --delay=5 --action=low_high -SyslogIdentifier=witherspoon-power-supply-sync +SyslogIdentifier=power-supply-sync [Install] RequiredBy=obmc-chassis-poweron@0.target diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/wspoon.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf index 409a75f0b..409a75f0b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/wspoon.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf new file mode 100644 index 000000000..cddafc1a2 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf @@ -0,0 +1,17 @@ +LABEL_fan1 = "fan0_0" +CRITLO_fan1 = "3000" +CRITHI_fan1 = "12000" + +LABEL_fan2 = "fan1_0" +CRITLO_fan2 = "3000" +CRITHI_fan2 = "12000" + +LABEL_fan3 = "fan2_0" +CRITLO_fan3 = "3000" +CRITHI_fan3 = "12000" + +LABEL_fan4 = "fan3_0" +CRITLO_fan4 = "3000" +CRITHI_fan4 = "12000" + +TARGET_MODE = "RPM" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf new file mode 100644 index 000000000..cddafc1a2 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf @@ -0,0 +1,17 @@ +LABEL_fan1 = "fan0_0" +CRITLO_fan1 = "3000" +CRITHI_fan1 = "12000" + +LABEL_fan2 = "fan1_0" +CRITLO_fan2 = "3000" +CRITHI_fan2 = "12000" + +LABEL_fan3 = "fan2_0" +CRITLO_fan3 = "3000" +CRITHI_fan3 = "12000" + +LABEL_fan4 = "fan3_0" +CRITLO_fan4 = "3000" +CRITHI_fan4 = "12000" + +TARGET_MODE = "RPM" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf new file mode 100644 index 000000000..a96bb93a8 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "pcie0_1" +WARNHI_temp1 = "60000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "70000" +CRITLO_temp1 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf new file mode 100644 index 000000000..188898b36 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "pcie2_3" +WARNHI_temp1 = "60000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "70000" +CRITLO_temp1 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf index cdf8b4726..cdf8b4726 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf index cdf8b4726..cdf8b4726 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf index 0aafc9b14..0aafc9b14 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf index 5c0efe420..5c0efe420 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf index e463b517c..e463b517c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf index 2fadbdec0..2fadbdec0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf index 9ae1f1ef1..9ae1f1ef1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf index 723a68d66..723a68d66 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf index 1fa7b5a5c..1fa7b5a5c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf index d4e9326b2..d4e9326b2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf index 3af092867..3af092867 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index c7ea3113c..c5fa56f65 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -37,21 +37,21 @@ MODE_temp36 = "label" MODE_temp37 = "label" MODE_temp38 = "label" -MODE_power1 = "function_id" -MODE_power2 = "function_id" -MODE_power3 = "function_id" -MODE_power4 = "function_id" -MODE_power5 = "function_id" -MODE_power6 = "function_id" -MODE_power7 = "function_id" -MODE_power8 = "function_id" -MODE_power9 = "function_id" -MODE_power10 = "function_id" -MODE_power11 = "function_id" -MODE_power12 = "function_id" -MODE_power13 = "function_id" -MODE_power14 = "function_id" -MODE_power15 = "function_id" +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" REMOVERCS = "11" @@ -283,56 +283,56 @@ WARNLO_temp205 = "0" CRITHI_temp205 = "83000" CRITLO_temp205 = "0" -LABEL_power22 = "total_power" -WARNHI_power22 = "3050000000" -WARNLO_power22 = "0" -CRITHI_power22 = "3100000000" -CRITLO_power22 = "0" - -LABEL_power5 = "p0_power" -WARNHI_power5 = "250000000" -WARNLO_power5 = "0" -CRITHI_power5 = "300000000" -CRITLO_power5 = "0" - -LABEL_power6 = "p1_power" -WARNHI_power6 = "250000000" -WARNLO_power6 = "0" -CRITHI_power6 = "300000000" -CRITLO_power6 = "0" - -LABEL_power9 = "p0_io_power" -WARNHI_power9 = "80000000" -WARNLO_power9 = "0" -CRITHI_power9 = "100000000" -CRITLO_power9 = "0" - -LABEL_power10 = "p1_io_power" -WARNHI_power10 = "80000000" -WARNLO_power10 = "0" -CRITHI_power10 = "100000000" -CRITLO_power10 = "0" - -LABEL_power1 = "p0_mem_power" -WARNHI_power1 = "250000000" -WARNLO_power1 = "0" -CRITHI_power1 = "300000000" -CRITLO_power1 = "0" - -LABEL_power2 = "p1_mem_power" -WARNHI_power2 = "250000000" -WARNLO_power2 = "0" -CRITHI_power2 = "300000000" -CRITLO_power2 = "0" - -LABEL_power18 = "fan_disk_power" -WARNHI_power18 = "375000000" -WARNLO_power18 = "0" -CRITHI_power18 = "400000000" -CRITLO_power18 = "0" - -LABEL_power13 = "io_power" -WARNHI_power13 = "128000000" -WARNLO_power13 = "0" -CRITHI_power13 = "150000000" -CRITLO_power13 = "0" +LABEL_power0_22_0 = "total_power" +WARNHI_power0_22_0 = "3050000000" +WARNLO_power0_22_0 = "0" +CRITHI_power0_22_0 = "3100000000" +CRITLO_power0_22_0 = "0" + +LABEL_power0_5_2 = "p0_power" +WARNHI_power0_5_2 = "250000000" +WARNLO_power0_5_2 = "0" +CRITHI_power0_5_2 = "300000000" +CRITLO_power0_5_2 = "0" + +LABEL_power0_6_3 = "p1_power" +WARNHI_power0_6_3 = "250000000" +WARNLO_power0_6_3 = "0" +CRITHI_power0_6_3 = "300000000" +CRITLO_power0_6_3 = "0" + +LABEL_power0_9_4 = "p0_io_power" +WARNHI_power0_9_4 = "80000000" +WARNLO_power0_9_4 = "0" +CRITHI_power0_9_4 = "100000000" +CRITLO_power0_9_4 = "0" + +LABEL_power0_10_5 = "p1_io_power" +WARNHI_power0_10_5 = "80000000" +WARNLO_power0_10_5 = "0" +CRITHI_power0_10_5 = "100000000" +CRITLO_power0_10_5 = "0" + +LABEL_power0_1_6 = "p0_mem_power" +WARNHI_power0_1_6 = "250000000" +WARNLO_power0_1_6 = "0" +CRITHI_power0_1_6 = "300000000" +CRITLO_power0_1_6 = "0" + +LABEL_power0_2_7 = "p1_mem_power" +WARNHI_power0_2_7 = "250000000" +WARNLO_power0_2_7 = "0" +CRITHI_power0_2_7 = "300000000" +CRITLO_power0_2_7 = "0" + +LABEL_power0_18_14 = "fan_disk_power" +WARNHI_power0_18_14 = "375000000" +WARNLO_power0_18_14 = "0" +CRITHI_power0_18_14 = "400000000" +CRITLO_power0_18_14 = "0" + +LABEL_power0_13_15 = "io_power" +WARNHI_power0_13_15 = "128000000" +WARNLO_power0_13_15 = "0" +CRITHI_power0_13_15 = "150000000" +CRITLO_power0_13_15 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf index 55b72fc2a..55b72fc2a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index e9ddccd97..75e7655af 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -6,11 +6,13 @@ SRC_URI += " \ file://start_max31785_hwmon.sh \ " -WSPOON_CHIPS = " \ +CHIPS = " \ + bus@1e78a000/i2c-bus@100/max31785@52_air \ + bus@1e78a000/i2c-bus@100/max31785@52_water \ + " +CHIPS_append_witherspoon = " \ bus@1e78a000/i2c-bus@100/bmp280@77 \ bus@1e78a000/i2c-bus@100/dps310@76 \ - bus@1e78a000/i2c-bus@100/max31785@52_air \ - bus@1e78a000/i2c-bus@100/max31785@52_water \ bus@1e78a000/i2c-bus@100/power-supply@68 \ bus@1e78a000/i2c-bus@100/power-supply@69 \ bus@1e78a000/i2c-bus@140/ir35221@70 \ @@ -19,22 +21,27 @@ WSPOON_CHIPS = " \ bus@1e78a000/i2c-bus@180/ir35221@71 \ bus@1e78a000/i2c-bus@380/tmp275@4a \ " -WSPOON_ITEMSFMT = "ahb/apb/{0}.conf" -WSPOON_ITEMS = "${@compose_list(d, 'WSPOON_ITEMSFMT', 'WSPOON_CHIPS')}" +CHIPS_append_swift = " \ + bus@1e78a000/i2c-bus@440/tmp275@4a \ + bus@1e78a000/i2c-bus@440/tmp275@48 \ + " + +ITEMSFMT = "ahb/apb/{0}.conf" +ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" -WSPOON_OCCS = " \ +OCCS_witherspoon = " \ 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ " -WSPOON_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" -WSPOON_OCCITEMS = "${@compose_list(d, 'WSPOON_OCCSFMT', 'WSPOON_OCCS')}" +OCCSFMT_witherspoon = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +OCCITEMS_witherspoon = "${@compose_list(d, 'OCCSFMT_witherspoon', 'OCCS_witherspoon')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'WSPOON_ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'WSPOON_OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_witherspoon = " ${@compose_list(d, 'ENVS', 'OCCITEMS_witherspoon')}" -SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/wspoon.conf" -SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@wspoon.service" +SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/max31785.conf" +SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" SYSTEMD_SERVICE_${PN} += "max31785-hwmon-helper@.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 71a583690..02c0e94b4 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append = " file://TPMEnable-default-true.override.yml" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/swift/gpio_defs.json b/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/swift/gpio_defs.json new file mode 100644 index 000000000..83332db61 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/swift/gpio_defs.json @@ -0,0 +1,63 @@ +{ + "gpio_configs": { + + "power_config": { + "power_good_in": "SYS_PWROK_BUFF", + "power_up_outs": [ + {"name": "SOFTWARE_PGOOD", "polarity": true}, + {"name": "BMC_POWER_UP", "polarity": true} + ], + "reset_outs": [ + {"name": "BMC_CP0_RESET_N", "polarity": false} + ] + } + }, + + "gpio_definitions": [ + { + "name": "BMC_POWER_UP", + "pin": "A0", + "direction": "out" + }, + { + "name": "SOFTWARE_PGOOD", + "pin": "R1", + "direction": "out" + }, + { + "name": "SYS_PWROK_BUFF", + "pin": "A2", + "direction": "in" + }, + { + "name": "CHECKSTOP", + "pin": "J2", + "direction": "falling" + }, + { + "name": "BMC_CP0_RESET_N", + "pin": "A1", + "direction": "out" + }, + { + "name": "BMC_VS1_PERST_N", + "pin": "B7", + "direction": "out" + }, + { + "name": "BMC_CP0_PERST_ENABLE_R", + "pin": "A3", + "direction": "out" + }, + { + "name": "POWER_BUTTON", + "pin": "I3", + "direction": "both" + } + { + "name": "AIR_WATER_N", + "pin": "B5", + "direction": "in" + } + ] +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon/gpio_defs.json index 5df8d0141..5df8d0141 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon/gpio_defs.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend index fe36dc413..530950328 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend @@ -1,4 +1,9 @@ -do_install_append() { +do_install_append_witherspoon() { DEST=${D}${inventory_envdir} printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory } + +do_install_append_swift() { + DEST=${D}${inventory_envdir} + printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-08/08-0051/eeprom" >> ${DEST}/inventory +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/witherspoon-config_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/witherspoon-config_git.bb deleted file mode 100644 index 04c2ffa81..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/workbook/witherspoon-config_git.bb +++ /dev/null @@ -1,6 +0,0 @@ -SUMMARY = "Witherspoon board wiring" -DESCRIPTION = "Board wiring information for the Witherspoon OpenPOWER system." -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit config-in-skeleton |