diff options
680 files changed, 17732 insertions, 2714 deletions
@@ -53,28 +53,12 @@ supported hardware targets, see the following example: ```text $ . setup <machine> [build_dir] Target machine must be specified. Use one of: - -ahe50dc harma s7106 -bletchley kudo s8036 -daytonax lannister sbp1 -dl360-g11 minerva spc621d8hm3 -dl360poc mori starscream -dl385-g11 mtjade system1 -e3c246d4i mtmitchell tatlin-archive-x86 -e3c256d4i ncplite tiogapass -ethanolx nicole transformers -evb-ast2500 olympus-nuvoton vegman-n110 -evb-ast2600 p10bmc vegman-rx20 -evb-npcm750 palmetto vegman-sx20 -evb-npcm845 qcom-dc-scm-v1 witherspoon -f0b quanta-q71l witherspoon-tacoma -fp5280g3 rl300-g11 x11spi -g220a romed8hm3 yosemite4 -gbs romulus yosemitev2 -genesis3 s2600wf zaius -greatlakes s6q +... ``` +A more complete list of supported machines can be found under +[meta-phosphor/docs](https://github.com/openbmc/openbmc/blob/master/meta-phosphor/docs/supported-machines.md). + Once you know the target (e.g. romulus), source the `setup` script as follows: ```sh @@ -170,6 +154,9 @@ model. So while you may be able to compile and install an OpenBMC build on your system and get some basic functionality, rough edges (such as your cooling fans running continuously at full throttle) are likely. +See also +["Supported Machines"](https://github.com/openbmc/openbmc/blob/master/meta-phosphor/docs/supported-machines.md). + ## Features of OpenBMC ### Feature List diff --git a/meta-amd/meta-daytonax/recipes-phosphor/leds/daytonax-led-manager-config/led.yaml b/meta-amd/meta-daytonax/recipes-phosphor/leds/daytonax-led-manager-config/led.yaml index 36f37dd569..1443dd653c 100644 --- a/meta-amd/meta-daytonax/recipes-phosphor/leds/daytonax-led-manager-config/led.yaml +++ b/meta-amd/meta-daytonax/recipes-phosphor/leds/daytonax-led-manager-config/led.yaml @@ -12,6 +12,7 @@ enclosure_identify: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' lamp_test: led-fault: @@ -21,6 +22,7 @@ lamp_test: Priority: 'Blink' led-identify: Action: 'On' + Priority: 'Blink' # All kinds of faults using the same action as enclosure_fault Fan0Fault: diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/leds/ethanolx-led-manager-config/led.yaml b/meta-amd/meta-ethanolx/recipes-phosphor/leds/ethanolx-led-manager-config/led.yaml index 818872fe2a..87c52eec7d 100644 --- a/meta-amd/meta-ethanolx/recipes-phosphor/leds/ethanolx-led-manager-config/led.yaml +++ b/meta-amd/meta-ethanolx/recipes-phosphor/leds/ethanolx-led-manager-config/led.yaml @@ -12,6 +12,7 @@ enclosure_identify: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' lamp_test: fault: @@ -21,6 +22,7 @@ lamp_test: Priority: 'Blink' identify: Action: 'On' + Priority: 'Blink' # All kinds of faults using the same action as enclosure_fault Fan0Fault: diff --git a/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere-usbnet.service b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere-usbnet.service index 3499543258..461d423ad4 100644 --- a/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere-usbnet.service +++ b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere-usbnet.service @@ -1,12 +1,14 @@ [Unit] Description=Ampere Ethernet over USB gadget device -After=phosphor-ipmi-host.service +After=multi-user.target +StartLimitIntervalSec=20 +StartLimitBurst=3 [Service] -Type=oneshot -RemainAfterExit=yes ExecStart=/usr/sbin/ampere_usbnet.sh -ExecStop=/usr/bin/usb-ctrl ecm usbnet off +Restart=on-failure +RestartMode=direct +RestartSec=5 [Install] WantedBy=multi-user.target diff --git a/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere_usbnet.sh b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere_usbnet.sh index ca9357fa3a..fb886c2eab 100644 --- a/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere_usbnet.sh +++ b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere_usbnet.sh @@ -1,18 +1,22 @@ #!/bin/bash -ENV_MAC_ADDR=$(fw_printenv ethaddr eth1addr) +# Get MAC Address from uboot, or fallback to a random +ENV_MAC_ADDR= +ENV_MAC_ADDR=${ENV_MAC_ADDR:-"$(fw_printenv -n ethaddr)"} +ENV_MAC_ADDR=${ENV_MAC_ADDR:-"$(fw_printenv -n eth1addr)"} +MAC_ADDR=${ENV_MAC_ADDR:-"F8:C2:49:A6:09:3B"} -MAC_ADDR=$(echo "$ENV_MAC_ADDR" | cut -d "=" -f 2) - -if [ -n "$MAC_ADDR" ]; then - # Generate MAC Address from eth1addr using locally administered MAC - # https://en.wikipedia.org/wiki/MAC_address#Universal_vs._local_(U/L_bit - SUBMAC=$(echo "$MAC_ADDR" | cut -d ":" -f 2-6) - /usr/bin/usb-ctrl ecm usbnet on "06:$SUBMAC" "02:$SUBMAC" -else - /usr/bin/usb-ctrl ecm usbnet on -fi +# Generate MAC Address using locally administered MAC +# https://en.wikipedia.org/wiki/MAC_address#Universal_vs._local_(U/L_bit +SUBMAC=$(echo "$MAC_ADDR" | cut -d ":" -f 2-5) +/usr/bin/usb-ctrl ecm usbnet off +/usr/bin/usb-ctrl ecm usbnet on "06:$SUBMAC:01" "06:$SUBMAC:00" # Use NCM (Ethernet) Gadget instead of FunctionFS Gadget echo 0x0103 > /sys/kernel/config/usb_gadget/usbnet/idProduct echo "OpenBMC usbnet Device" > /sys/kernel/config/usb_gadget/usbnet/strings/0x409/product + +if [ "$MAC_ADDR" != "$ENV_MAC_ADDR" ]; then + # fail and wait for systemd to restart this service + exit 1 +fi diff --git a/meta-ampere/meta-common/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/fans/phosphor-fan_%.bbappend index 5a3a67826c..524b5f8ed9 100644 --- a/meta-ampere/meta-common/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -4,5 +4,5 @@ FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" # To use CurrentHostState to decide host state for phosphor-fan-monitor PACKAGECONFIG:append = " delay-host-control monitor-use-host-state" -PACKAGECONFIG[delay-host-control] = "-Ddelay-host-control=20" +PACKAGECONFIG[delay-host-control] = "-Ddelay-host-control=150" PACKAGECONFIG[monitor-use-host-state] = "-Dmonitor-use-host-state=enabled" diff --git a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh index 96094bb054..6e2f12b275 100755 --- a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh +++ b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh @@ -44,22 +44,12 @@ case ${EXTENDED_VERSION} in CMD="/usr/sbin/ampere_flash_bios.sh $IMAGE 2" ;; - "scp-primary") - IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.img" -o -name "*.slim" -o -name "*.rom" \)) - CMD="/usr/sbin/ampere_firmware_upgrade.sh smpmpro $IMAGE 1" - ;; - - "scp-secondary") - IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.img" -o -name "*.slim" -o -name "*.rom" \)) - CMD="/usr/sbin/ampere_firmware_upgrade.sh smpmpro $IMAGE 2" - ;; - - "eeprom" | "eeprom-primary") + "eeprom" | "eeprom-primary" | "scp-primary") IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.img" -o -name "*.slim" -o -name "*.rom" -o -name "*.bin" \)) CMD="/usr/sbin/ampere_firmware_upgrade.sh eeprom $IMAGE 1" ;; - "eeprom-secondary") + "eeprom-secondary" | "scp-secondary") IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.img" -o -name "*.slim" -o -name "*.rom" -o -name "*.bin" \)) CMD="/usr/sbin/ampere_firmware_upgrade.sh eeprom $IMAGE 2" ;; @@ -76,14 +66,18 @@ case ${EXTENDED_VERSION} in ;; "mbcpld") - IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.jed" \)) - CMD="/usr/bin/ampere_firmware_upgrade.sh mb_cpld $IMAGE" + IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.jed" -o -name "*.bin" \)) + CMD="/usr/sbin/ampere_firmware_upgrade.sh mb_cpld $IMAGE" ;; "bmccpld") - IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.jed" \)) - CMD="/usr/bin/ampere_firmware_upgrade.sh bmc_cpld $IMAGE" + IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.jed" -o -name "*.bin" \)) + CMD="/usr/sbin/ampere_firmware_upgrade.sh bmc_cpld $IMAGE" + ;; + "bpcpld"*) + IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.jed" -o -name "*.bin" \)) + TARGET="${EXTENDED_VERSION:6}" + CMD="/usr/sbin/ampere_firmware_upgrade.sh bp_cpld $IMAGE $TARGET" ;; - *) echo "Invalid ExtendedVersion: ${EXTENDED_VERSION}. Please check MANIFEST file!" exit 1 diff --git a/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb deleted file mode 100644 index 1b5a119b1b..0000000000 --- a/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Copy the inventory cleanup yaml for inventory manager" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -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-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml deleted file mode 100644 index 23f54e3319..0000000000 --- a/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml +++ /dev/null @@ -1,16 +0,0 @@ -description: > - Ampere inventory fixups - -events: - - 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: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" - type: string diff --git a/meta-ampere/meta-common/recipes-phosphor/ipmi/ampere-ipmi-oem.bb b/meta-ampere/meta-common/recipes-phosphor/ipmi/ampere-ipmi-oem.bb index 593a3dfe80..a19146d531 100644 --- a/meta-ampere/meta-common/recipes-phosphor/ipmi/ampere-ipmi-oem.bb +++ b/meta-ampere/meta-common/recipes-phosphor/ipmi/ampere-ipmi-oem.bb @@ -14,7 +14,7 @@ LIBRARY_NAMES = "libzampoemcmds.so" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ampere-ipmi-oem.git;branch=master;protocol=https" -SRCREV = "2491e06d4a832d34dfd439ff11d6edd5ca4fb443" +SRCREV = "ee2e1df6ca5fd87b401d4eb15b80224f3025a612" HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" diff --git a/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 0000000000..74a5fb2aef --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1,2 @@ +PACKAGECONFIG:append = " sync-mac" +EXTRA_OEMESON:append = " -Dforce-sync-mac=false" diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_firmware_upgrade.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_firmware_upgrade.sh index 227f264923..91a45a54e3 100755 --- a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_firmware_upgrade.sh +++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_firmware_upgrade.sh @@ -102,8 +102,8 @@ if [ $# -eq 0 ]; then echo "Usage:" echo " $(basename "$0") <Type> <Image file> <DEV_SEL> [SECPRO]" echo "Where:" - echo " <Type>: smpmpro or fru" - echo " If Type is smpmpro, then DEV_SEL must is 1 (MAIN EEPROM), 2 (Failover)" + echo " <Type>: eeprom or fru" + echo " If Type is eeprom, then DEV_SEL must is 1 (MAIN EEPROM), 2 (Failover)" echo " SECPRO: Optional, input '1' to enter & flash secpro mode. Default: 0" exit 0 fi @@ -138,8 +138,11 @@ if [ $SECPRO == 1 ] && [ "$DEV_SEL" == 2 ]; then exit fi -if [[ $TYPE == "smpmpro" ]]; then - do_smpmpro_upgrade -elif [[ $TYPE == "fru" ]]; then - do_fru_upgrade -fi +case $TYPE in + "smpmpro" | "eeprom") + do_smpmpro_upgrade + ;; + "fru") + do_fru_upgrade + ;; +esac diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json index b07e4fa75d..9d0322c147 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json +++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json @@ -23,7 +23,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade" ] }, { @@ -61,7 +61,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade" ] }, { @@ -99,7 +99,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade" ] }, { @@ -137,7 +137,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade" ] }, { @@ -175,7 +175,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade" ] }, { @@ -213,7 +213,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade" ] }, { diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 768c66758f..7c5678e8e1 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1,5 +1,3 @@ -DEPENDS:append = " inventory-cleanup" - FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PACKAGECONFIG:append = " associations" SRC_URI:append = " file://associations.json" diff --git a/meta-ampere/meta-jade/recipes-phosphor/leds/phosphor-led-manager/com.ampere.Hardware.Chassis.Model.MtJade.json b/meta-ampere/meta-jade/recipes-phosphor/leds/phosphor-led-manager/com.ampere.Hardware.Chassis.Model.MtJade.json index 7c341376ca..0d5de3c18d 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/leds/phosphor-led-manager/com.ampere.Hardware.Chassis.Model.MtJade.json +++ b/meta-ampere/meta-jade/recipes-phosphor/leds/phosphor-led-manager/com.ampere.Hardware.Chassis.Model.MtJade.json @@ -11,11 +11,24 @@ ] }, { + "group": "gpio_fault", + "members": [ + { + "Name": "fault", + "Action": "On", + "DutyOn": 50, + "Period": 0, + "Priority": "On" + } + ] + }, + { "group": "enclosure_identify", "members": [ { "Name": "identify", "Action": "On", + "Priority": "On", "DutyOn": 50, "Period": 1000 } @@ -27,6 +40,7 @@ { "Name": "identify", "Action": "Blink", + "Priority": "On", "DutyOn": 50, "Period": 1000 } @@ -38,6 +52,7 @@ { "Name": "fault", "Action": "On", + "Priority": "On", "DutyOn": 50, "Period": 1000 } @@ -49,6 +64,7 @@ { "Name": "fault", "Action": "On", + "Priority": "On", "DutyOn": 50, "Period": 1000 } @@ -60,6 +76,7 @@ { "Name": "fault", "Action": "On", + "Priority": "On", "DutyOn": 50, "Period": 1000 } @@ -71,6 +88,7 @@ { "Name": "fault", "Action": "On", + "Priority": "On", "DutyOn": 50, "Period": 1000 } @@ -82,6 +100,7 @@ { "Name": "fault", "Action": "On", + "Priority": "On", "DutyOn": 50, "Period": 1000 } @@ -93,6 +112,31 @@ { "Name": "fault", "Action": "On", + "Priority": "On", + "DutyOn": 50, + "Period": 1000 + } + ] + }, + { + "group": "psu_fault", + "members": [ + { + "Name": "fault", + "Action": "On", + "Priority": "On", + "DutyOn": 50, + "Period": 1000 + } + ] + }, + { + "group": "ras_ue_fault", + "members": [ + { + "Name": "fault", + "Action": "On", + "Priority": "On", "DutyOn": 50, "Period": 1000 } @@ -104,6 +148,7 @@ { "Name": "fault", "Action": "On", + "Priority": "On", "DutyOn": 50, "Period": 1000 } diff --git a/meta-ampere/meta-jade/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/network/phosphor-network_%.bbappend index 2f2ee59295..43046ea54f 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -PACKAGECONFIG:append = " sync-mac " - SRC_URI:append = " file://config.json " FILES:${PN} += "${datadir}/network/*.json" diff --git a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh index a5ec8e7608..ac472f9460 100644 --- a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh +++ b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh @@ -4,6 +4,48 @@ # shellcheck source=meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-platform-init/mtmitchell_platform_gpios_init.sh source /usr/sbin/platform_gpios_init.sh +function mtc_board_revision_detection() { + # Support to detect MTC board revisions via board ID and to set GPI pins for the host + # to identify the board revision. + + # Check the mainboard by board_id (i2c0, address 0x20) + board_id=$(i2cget -y -a 0 0x20 0x0 b) + if [ "$?" == '1' ]; then + echo "Failed to read board_id from i2c" + fi + + # BIT[7:6:5:4] + # 0000 : EVT1 + # 0001 : EVT2 + # 0010 : EVT3 + # 0011 : + # 0100 : DVT1 + # 0101 : DVT2 + # 0110 : DVT3 + # 0111 : + # 1000 : PVT1 + # 1001 : PVT2 + # 1010 : PVT3 + # 1011 : + + md_id_7_6_5_4=$(( (board_id & 0xF0)>>4 )) + + # P0[7] -> GPI[1] and P0[6] -> GPI[0] + # P[7:6] = 2'b01 for Mitchell 2.0 (PVT2) + # P[7:6] = 2'b00 for Mitchell 1.0 (EVTx, DVTx, PVT1 ) + if [[ $md_id_7_6_5_4 -gt 8 ]]; then + # Board is MTC2.0 + echo "Update GPI1 to low and GPI0 to high" + gpioset $(gpiofind gpi1)=0 + gpioset $(gpiofind gpi0)=1 + else + # Board is MTC1.0 + echo "Update GPI1 to low and GPI0 to low" + gpioset $(gpiofind gpi1)=0 + gpioset $(gpiofind gpi0)=0 + fi +} + #pre platform init function. implemented in platform_gpios_init.sh pre-platform-init @@ -40,6 +82,8 @@ for gpioName in "${input_gpios_in_bmc_reboot[@]}"; do gpioget $(gpiofind "$gpioName") done +mtc_board_revision_detection + #post platform init function. implemented in platform_gpios_init.sh post-platform-init diff --git a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-utils/ampere_flash_bios.sh b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-utils/ampere_flash_bios.sh index 3c9cd42aaa..d5fcf5c402 100755 --- a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-utils/ampere_flash_bios.sh +++ b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-utils/ampere_flash_bios.sh @@ -18,31 +18,25 @@ # 0 => to switch SPI_CS0_L to second SPI Nor device # shellcheck disable=SC2046 +# shellcheck disable=SC2086 do_flash () { - # Check the HNOR partition available + # always unbind then bind the ASpeed SMC driver again to prevent + # the changing of the device erasesize by nvparm HOST_MTD=$(< /proc/mtd grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') - if [ -z "$HOST_MTD" ]; + if [ -n "$HOST_MTD" ]; then - # Check the ASpeed SMC driver binded before - HOST_SPI=/sys/bus/platform/drivers/spi-aspeed-smc/1e630000.spi - if [ -d "$HOST_SPI" ]; then - echo "Unbind the ASpeed SMC driver" - echo 1e630000.spi > /sys/bus/platform/drivers/spi-aspeed-smc/unbind - sleep 2 - fi - - # If the HNOR partition is not available, then bind again driver - echo "--- Bind the ASpeed SMC driver" - echo 1e630000.spi > /sys/bus/platform/drivers/spi-aspeed-smc/bind + echo 1e630000.spi > /sys/bus/platform/drivers/spi-aspeed-smc/unbind sleep 2 + fi + echo 1e630000.spi > /sys/bus/platform/drivers/spi-aspeed-smc/bind - HOST_MTD=$(< /proc/mtd grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') - if [ -z "$HOST_MTD" ]; - then - echo "Fail to probe Host SPI-NOR device" - exit 1 - fi + # Check the PNOR partition available + HOST_MTD=$(< /proc/mtd grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') + if [ -z "$HOST_MTD" ]; + then + echo "Fail to probe the Host SPI-NOR device" + exit 1 fi echo "--- Flashing firmware image $IMAGE to @/dev/$HOST_MTD" @@ -54,7 +48,7 @@ if [ $# -eq 0 ]; then echo "Usage: $(basename "$0") <UEFI/EDKII image file> <DEV_SEL> [SPECIAL_BOOT]" echo "Where:" echo " DEV_SEL 1 is Primary SPI (by default), 2 is Second SPI" - echo " SPECIAL_BOOT: Optional, input '1' to enter & flash SPECIAL_BOOT mode. Default: 0" + echo " SPECIAL_BOOT: Optional, input '1' to flash "Secure Provisioning" image and enter Special Boot mode. Default: 0" exit 0 fi @@ -106,16 +100,16 @@ if [[ $DEV_SEL == 1 ]]; then echo "Run update Primary Host SPI-NOR" gpioset $(gpiofind spi0-backup-sel)=1 # Primary SPI elif [[ $DEV_SEL == 2 ]]; then - echo "Run update Second Host SPI-NOR" + echo "Run update Secondary Host SPI-NOR" gpioset $(gpiofind spi0-backup-sel)=0 # Second SPI else echo "Please choose primary SPI (1) or second SPI (2)" exit 0 fi -# Restrict to flash Second Host SPI-NOR in case of SPECIAL_BOOT +# Restrict to flash Secondary Host SPI-NOR in case of SPECIAL_BOOT if [ $SPECIAL_BOOT == 1 ] && [ "$DEV_SEL" == 2 ]; then - echo "Not allow to flash the Second Host SPI-NOR with SPECIAL_BOOT image" + echo "Flashing 2nd Host SPI NOR image with SECProv image is not allowed" exit fi @@ -125,16 +119,20 @@ do_flash # Assert SPECIAL_BOOT GPIO PIN if [[ $SPECIAL_BOOT == 1 ]]; then gpioset $(gpiofind host0-special-boot)=1 + # Set HOST BOOTCOUNT to 0 to prevent Host reboot + busctl set-property xyz.openbmc_project.State.Host0 \ + /xyz/openbmc_project/state/host0 \ + xyz.openbmc_project.Control.Boot.RebootAttempts RetryAttempts u 0 fi -# Switch the SPI bus to the primary spi device +# Switch the SPI bus to the primary SPI device echo "Switch to the Primary Host SPI-NOR" gpioset $(gpiofind spi0-backup-sel)=1 # Primary SPI # Switch the host SPI bus to HOST." echo "--- Switch the host SPI bus to HOST." if ! gpioset $(gpiofind spi0-program-sel)=0; then - echo "ERROR: Switch the host SPI bus to HOST. Please check gpio state" + echo "ERROR: Switch the host SPI bus to HOST. Please check GPIO state" exit 1 fi @@ -145,18 +143,31 @@ then obmcutil poweron fi -# Deassert SPECIAL_BOOT GPIO PIN if it is being asserted +# Detection SECProv of failure or success if [[ $SPECIAL_BOOT == 1 ]]; then - # Time out checking for Host ON is 60s - cnt=12 - while [ "$cnt" -gt 0 ]; + # 30s time out in wait for FW_BOOT_OK + state=0 + cnt=60 + while [ $cnt -gt 0 ]; do - cnt=$((cnt - 1)) - if systemctl status obmc-host-already-on@0.target | grep "Active: active"; then - echo "Deassert SPECIAL_BOOT GPIO PIN if it is being asserted." - gpioset $(gpiofind host0-special-boot)=0 - exit 0 + # Monitor FW_BOOT_OK gpio + state=$(gpioget $(gpiofind s0-fw-boot-ok)) + if [[ "$state" == "1" ]]; then + break fi - sleep 5 + sleep 0.5 + cnt=$((cnt - 1)) done + + echo "--- Turning the Chassis off" + obmcutil chassisoff + + # Deassert SPECIAL_BOOT GPIO PIN + gpioset $(gpiofind host0-special-boot)=0 + + sleep 10 + # Recover HOST BOOTCOUNT to default + busctl set-property xyz.openbmc_project.State.Host0 \ + /xyz/openbmc_project/state/host0 \ + xyz.openbmc_project.Control.Boot.RebootAttempts RetryAttempts u 3 fi diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/events.json b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/events.json new file mode 100644 index 0000000000..1a27aa0a7a --- /dev/null +++ b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/events.json @@ -0,0 +1,718 @@ +[ + { + // Hold fans at the given target when a number of fans are missing. + "name": "fan(s) missing", + "groups": [ + { + "name": "fan inventory", + "interface": "xyz.openbmc_project.Inventory.Item", + "property": { "name": "Present" } + } + ], + "triggers": [ + { + "class": "init", + "method": "get_properties" + }, + { + "class": "signal", + "signal": "properties_changed" + }, + { + "class": "signal", + "signal": "interfaces_added" + } + ], + "actions": [ + { + "name": "count_state_before_target", + "count": 1, + "state": false, + "target": 255 + } + ] + }, + { + // Hold fans at the given target when a number of rotors are nonfunctional. + "name": "fan rotor(s) faulted", + "groups": [ + { + "name": "fan0 rotor inventory", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + }, + { + "name": "fan1 rotor inventory", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + }, + { + "name": "fan2 rotor inventory", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + }, + { + "name": "fan3 rotor inventory", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + }, + { + "name": "fan4 rotor inventory", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + }, + { + "name": "fan5 rotor inventory", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + } + ], + "triggers": [ + { + "class": "init", + "method": "get_properties" + }, + { + "class": "signal", + "signal": "properties_changed" + }, + { + "class": "signal", + "signal": "interfaces_added" + } + ], + "actions": [ + { + "name": "count_state_before_target", + "count": 1, + "state": false, + "target": 255 + } + ] + }, + { + // Set a raised fan floor when any PLDM temperature sensor is nonfunctional + "name": "Nonfunctional PLDM sensors", + "groups": [ + { + "name": "PLDM Sensors", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + } + ], + "triggers": [ + { + "class": "init", + "method": "get_properties" + }, + { + "class": "signal", + "signal": "properties_changed" + }, + { + "class": "signal", + "signal": "interfaces_added" + } + ], + "actions": [ + { + "name": "count_state_before_target", + "groups": [ + { + "name": "PLDM Sensors", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + } + ], + "count": 1, + "state": false, + "target": 255 + } + ] + }, + { + // Set a raised fan floor when any temperature sensor is nonfunctional + "name": "Nonfunctional temperature sensors", + "groups": [ + { + "name": "Sys Inlet Temp Components", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + }, + { + "name": "CPU Temps", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + }, + { + "name": "PSU Max Temps", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + }, + { + "name": "PCIE Zone Temps", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + } + ], + "triggers": [ + { + "class": "init", + "method": "get_properties" + }, + { + "class": "timer", + "type": "repeating", + "interval": 6000000, + "preload_groups": true + } + ], + "actions": [ + { + "name": "count_state_before_target", + "groups": [ + { + "name": "Sys Inlet Temp Components", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + }, + { + "name": "CPU Temps", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + }, + { + "name": "PSU Max Temps", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + }, + { + "name": "PCIE Zone Temps", + "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus", + "property": { "name": "Functional" } + } + ], + "count": 10, + "state": false, + "target": 255 + } + ] + }, + { + "name": "Target mapping from CPU Temps", + "groups": [ + { + "name": "CPU Temps", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "triggers": [ + { + "class": "poweron", + "method": "get_properties" + }, + { + "class": "init", + "method": "get_properties" + }, + { + "class": "signal", + "signal": "properties_changed" + }, + { + "class": "timer", + "type": "repeating", + "interval": 5000000, + "preload_groups": true + } + ], + "actions": [ + { + "name": "target_from_group_max", + "groups": [ + { + "name": "CPU Temps", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "neg_hysteresis": 2, + "pos_hysteresis": 0, + "map": [ + { "value": 1.0, "target": 77.0 }, + { "value": 50.0, "target": 89.0 }, + { "value": 60.0, "target": 102.0 }, + { "value": 65.0, "target": 115.0 }, + { "value": 70.0, "target": 122.0 }, + { "value": 76.0, "target": 128.0 }, + { "value": 77.0, "target": 130.0 }, + { "value": 78.0, "target": 133.0 }, + { "value": 79.0, "target": 135.0 }, + { "value": 80.0, "target": 138.0 }, + { "value": 81.0, "target": 140.0 }, + { "value": 82.0, "target": 143.0 }, + { "value": 83.0, "target": 145.0 }, + { "value": 84.0, "target": 148.0 }, + { "value": 85.0, "target": 161.0 }, + { "value": 86.0, "target": 173.0 }, + { "value": 87.0, "target": 181.0 }, + { "value": 88.0, "target": 189.0 }, + { "value": 89.0, "target": 196.0 }, + { "value": 90.0, "target": 204.0 }, + { "value": 91.0, "target": 207.0 }, + { "value": 92.0, "target": 232.0 }, + { "value": 93.0, "target": 237.0 }, + { "value": 94.0, "target": 242.0 }, + { "value": 95.0, "target": 247.0 }, + { "value": 96.0, "target": 252.0 }, + { "value": 97.0, "target": 255.0 }, + { "value": 98.0, "target": 255.0 }, + { "value": 99.0, "target": 255.0 } + ] + } + ] + }, + { + "name": "Target mapping from CPU DIMM Temps", + "groups": [ + { + "name": "CPU DIMM Temps", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "triggers": [ + { + "class": "poweron", + "method": "get_properties" + }, + { + "class": "init", + "method": "get_properties" + }, + { + "class": "signal", + "signal": "properties_changed" + }, + { + "class": "timer", + "type": "repeating", + "interval": 5000000, + "preload_groups": true + } + ], + "actions": [ + { + "name": "target_from_group_max", + "groups": [ + { + "name": "CPU DIMM Temps", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "neg_hysteresis": 2, + "pos_hysteresis": 0, + "map": [ + { "value": 1.0, "target": 26.0 }, + { "value": 20.0, "target": 51.0 }, + { "value": 30.0, "target": 64.0 }, + { "value": 35.0, "target": 77.0 }, + { "value": 38.0, "target": 89.0 }, + { "value": 40.0, "target": 102.0 }, + { "value": 45.0, "target": 115.0 }, + { "value": 50.0, "target": 128.0 }, + { "value": 54.0, "target": 140.0 }, + { "value": 58.0, "target": 153.0 }, + { "value": 63.0, "target": 166.0 }, + { "value": 67.0, "target": 179.0 }, + { "value": 70.0, "target": 191.0 }, + { "value": 73.0, "target": 204.0 }, + { "value": 75.0, "target": 230.0 }, + { "value": 80.0, "target": 242.0 }, + { "value": 85.0, "target": 255.0 } + ] + } + ] + }, + { + "name": "Target mapping from NVMeM2 Max Temp", + "groups": [ + { + "name": "NVMeM2 Max Temp", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "triggers": [ + { + "class": "poweron", + "method": "get_properties" + }, + { + "class": "init", + "method": "get_properties" + }, + { + "class": "signal", + "signal": "properties_changed" + }, + { + "class": "timer", + "type": "repeating", + "interval": 5000000, + "preload_groups": true + } + ], + "actions": [ + { + "name": "target_from_group_max", + "groups": [ + { + "name": "NVMeM2 Max Temp", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "neg_hysteresis": 2, + "pos_hysteresis": 0, + "map": [ + { "value": 1.0, "target": 51.0 }, + { "value": 25.0, "target": 77.0 }, + { "value": 30.0, "target": 82.0 }, + { "value": 34.0, "target": 87.0 }, + { "value": 35.0, "target": 92.0 }, + { "value": 36.0, "target": 97.0 }, + { "value": 37.0, "target": 102.0 }, + { "value": 38.0, "target": 115.0 }, + { "value": 39.0, "target": 128.0 }, + { "value": 40.0, "target": 140.0 }, + { "value": 41.0, "target": 153.0 }, + { "value": 42.0, "target": 166.0 }, + { "value": 45.0, "target": 179.0 }, + { "value": 50.0, "target": 191.0 }, + { "value": 55.0, "target": 204.0 }, + { "value": 60.0, "target": 217.0 }, + { "value": 63.0, "target": 230.0 }, + { "value": 65.0, "target": 242.0 }, + { "value": 70.0, "target": 245.0 }, + { "value": 85.0, "target": 250.0 }, + { "value": 87.0, "target": 255.0 } + ] + } + ] + }, + { + "name": "Target mapping from NVMeFBP Max Temp", + "groups": [ + { + "name": "NVMeFBP Max Temp", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "triggers": [ + { + "class": "poweron", + "method": "get_properties" + }, + { + "class": "init", + "method": "get_properties" + }, + { + "class": "signal", + "signal": "properties_changed" + }, + { + "class": "timer", + "type": "repeating", + "interval": 5000000, + "preload_groups": true + } + ], + "actions": [ + { + "name": "target_from_group_max", + "groups": [ + { + "name": "NVMeFBP Max Temp", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "neg_hysteresis": 2, + "pos_hysteresis": 0, + "map": [ + { "value": 1.0, "target": 26.0 }, + { "value": 10.0, "target": 38.0 }, + { "value": 20.0, "target": 51.0 }, + { "value": 30.0, "target": 77.0 }, + { "value": 35.0, "target": 89.0 }, + { "value": 38.0, "target": 102.0 }, + { "value": 40.0, "target": 128.0 }, + { "value": 43.0, "target": 153.0 }, + { "value": 45.0, "target": 179.0 }, + { "value": 47.0, "target": 204.0 }, + { "value": 50.0, "target": 217.0 }, + { "value": 65.0, "target": 230.0 }, + { "value": 68.0, "target": 242.0 }, + { "value": 70.0, "target": 255.0 } + ] + } + ] + }, + { + "name": "Target mapping from OCP Max Temp", + "groups": [ + { + "name": "OCP Max Temp", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "triggers": [ + { + "class": "poweron", + "method": "get_properties" + }, + { + "class": "init", + "method": "get_properties" + }, + { + "class": "signal", + "signal": "properties_changed" + }, + { + "class": "timer", + "type": "repeating", + "interval": 5000000, + "preload_groups": true + } + ], + "actions": [ + { + "name": "target_from_group_max", + "groups": [ + { + "name": "OCP Max Temp", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "neg_hysteresis": 2, + "pos_hysteresis": 0, + "map": [ + { "value": 1.0, "target": 26.0 }, + { "value": 30.0, "target": 38.0 }, + { "value": 40.0, "target": 51.0 }, + { "value": 45.0, "target": 64.0 }, + { "value": 50.0, "target": 77.0 }, + { "value": 55.0, "target": 89.0 }, + { "value": 60.0, "target": 102.0 }, + { "value": 64.0, "target": 115.0 }, + { "value": 67.0, "target": 122.0 }, + { "value": 70.0, "target": 128.0 }, + { "value": 75.0, "target": 140.0 }, + { "value": 77.0, "target": 145.0 }, + { "value": 79.0, "target": 150.0 }, + { "value": 80.0, "target": 153.0 }, + { "value": 81.0, "target": 179.0 }, + { "value": 82.0, "target": 184.0 }, + { "value": 84.0, "target": 194.0 }, + { "value": 85.0, "target": 199.0 }, + { "value": 86.0, "target": 212.0 }, + { "value": 87.0, "target": 224.0 }, + { "value": 88.0, "target": 232.0 }, + { "value": 89.0, "target": 240.0 }, + { "value": 90.0, "target": 247.0 }, + { "value": 100.0, "target": 255.0 }, + { "value": 105.0, "target": 255.0 } + ] + } + ] + }, + { + "name": "Target mapping from PSU Max Temps", + "groups": [ + { + "name": "PSU Max Temps", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "triggers": [ + { + "class": "poweron", + "method": "get_properties" + }, + { + "class": "init", + "method": "get_properties" + }, + { + "class": "signal", + "signal": "properties_changed" + }, + { + "class": "timer", + "type": "repeating", + "interval": 5000000, + "preload_groups": true + } + ], + "actions": [ + { + "name": "target_from_group_max", + "groups": [ + { + "name": "PSU Max Temps", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "neg_hysteresis": 2, + "pos_hysteresis": 0, + "map": [ + { "value": 1.0, "target": 26.0 }, + { "value": 10.0, "target": 51.0 }, + { "value": 20.0, "target": 77.0 }, + { "value": 25.0, "target": 89.0 }, + { "value": 30.0, "target": 102.0 }, + { "value": 35.0, "target": 115.0 }, + { "value": 38.0, "target": 128.0 }, + { "value": 40.0, "target": 140.0 }, + { "value": 43.0, "target": 153.0 }, + { "value": 45.0, "target": 166.0 }, + { "value": 47.0, "target": 179.0 }, + { "value": 49.0, "target": 191.0 }, + { "value": 52.0, "target": 204.0 }, + { "value": 54.0, "target": 242.0 }, + { "value": 55.0, "target": 255.0 } + ] + } + ] + }, + { + "name": "Target mapping from PCIE Zone Temps", + "groups": [ + { + "name": "PCIE Zone Temps", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "triggers": [ + { + "class": "poweron", + "method": "get_properties" + }, + { + "class": "init", + "method": "get_properties" + }, + { + "class": "signal", + "signal": "properties_changed" + }, + { + "class": "timer", + "type": "repeating", + "interval": 5000000, + "preload_groups": true + } + ], + "actions": [ + { + "name": "target_from_group_max", + "groups": [ + { + "name": "PCIE Zone Temps", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "neg_hysteresis": 2, + "pos_hysteresis": 0, + "map": [ + { "value": 1.0, "target": 26.0 }, + { "value": 25.0, "target": 38.0 }, + { "value": 35.0, "target": 51.0 }, + { "value": 37.0, "target": 56.0 }, + { "value": 38.0, "target": 64.0 }, + { "value": 40.0, "target": 77.0 }, + { "value": 42.0, "target": 89.0 }, + { "value": 43.0, "target": 102.0 }, + { "value": 44.0, "target": 115.0 }, + { "value": 45.0, "target": 128.0 }, + { "value": 46.0, "target": 140.0 }, + { "value": 47.0, "target": 153.0 }, + { "value": 48.0, "target": 166.0 }, + { "value": 49.0, "target": 179.0 }, + { "value": 50.0, "target": 191.0 }, + { "value": 51.0, "target": 204.0 }, + { "value": 52.0, "target": 217.0 }, + { "value": 53.0, "target": 230.0 }, + { "value": 54.0, "target": 242.0 }, + { "value": 55.0, "target": 255.0 } + ] + } + ] + }, + { + "name": "Target mapping from Sys Inlet Temp", + "groups": [ + { + "name": "Sys Inlet Temp", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "triggers": [ + { + "class": "poweron", + "method": "get_properties" + }, + { + "class": "init", + "method": "get_properties" + }, + { + "class": "signal", + "signal": "properties_changed" + }, + { + "class": "timer", + "type": "repeating", + "interval": 5000000, + "preload_groups": true + } + ], + "actions": [ + { + "name": "target_from_group_max", + "groups": [ + { + "name": "Sys Inlet Temp", + "interface": "xyz.openbmc_project.Sensor.Value", + "property": { "name": "Value" } + } + ], + "neg_hysteresis": 2, + "pos_hysteresis": 0, + "map": [ + { "value": 1.0, "target": 26.0 }, + { "value": 10.0, "target": 51.0 }, + { "value": 20.0, "target": 64.0 }, + { "value": 25.0, "target": 77.0 }, + { "value": 30.0, "target": 89.0 }, + { "value": 35.0, "target": 102.0 }, + { "value": 38.0, "target": 179.0 }, + { "value": 40.0, "target": 255.0 } + ] + } + ] + } +] diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/fans.json b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/fans.json new file mode 100644 index 0000000000..ad58857681 --- /dev/null +++ b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/fans.json @@ -0,0 +1,44 @@ +[ + { + "name": "FAN0", + "zone": "0", + "sensors": ["PWM7"], + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/" + }, + { + "name": "FAN1", + "zone": "0", + "sensors": ["PWM5"], + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/" + }, + { + "name": "FAN2", + "zone": "0", + "sensors": ["PWM4"], + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/" + }, + { + "name": "FAN3", + "zone": "0", + "sensors": ["PWM3"], + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/" + }, + { + "name": "FAN4", + "zone": "0", + "sensors": ["PWM1"], + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/" + }, + { + "name": "FAN5", + "zone": "0", + "sensors": ["PWM0"], + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/" + } +] diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/groups.json b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/groups.json new file mode 100644 index 0000000000..5baa063752 --- /dev/null +++ b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/groups.json @@ -0,0 +1,134 @@ +[ + { + "name": "fan inventory", + "members": [ + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN0", + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN1", + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN2", + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN3", + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN4", + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN5" + ] + }, + { + "name": "fan0 rotor inventory", + "members": [ + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN0/FAN0_F", + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN0/FAN0_R" + ] + }, + { + "name": "fan1 rotor inventory", + "members": [ + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN1/FAN1_F", + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN1/FAN1_R" + ] + }, + { + "name": "fan2 rotor inventory", + "members": [ + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN2/FAN2_F", + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN2/FAN2_R" + ] + }, + { + "name": "fan3 rotor inventory", + "members": [ + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN3/FAN3_F", + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN3/FAN3_R" + ] + }, + { + "name": "fan4 rotor inventory", + "members": [ + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN4/FAN4_F", + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN4/FAN4_R" + ] + }, + { + "name": "fan5 rotor inventory", + "members": [ + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN5/FAN5_F", + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard/FAN5/FAN5_R" + ] + }, + { + "name": "CPU Temps", + "service": "xyz.openbmc_project.PLDM", + "members": [ + "/xyz/openbmc_project/sensors/temperature/S0_SOC_Pkg_Temp", + "/xyz/openbmc_project/sensors/temperature/S1_SOC_Pkg_Temp" + ] + }, + { + "name": "PLDM Sensors", + "service": "xyz.openbmc_project.PLDM", + "members": [ + "/xyz/openbmc_project/sensors/temperature/S0_ThrotOff_Temp", + "/xyz/openbmc_project/sensors/temperature/S1_ThrotOff_Temp" + ] + }, + { + "name": "CPU DIMM Temps", + "service": "xyz.openbmc_project.VirtualSensor", + "members": [ + "/xyz/openbmc_project/sensors/temperature/S0_DIMMG0_Temp", + "/xyz/openbmc_project/sensors/temperature/S1_DIMMG0_Temp" + ] + }, + { + "name": "NVMeM2 Max Temp", + "service": "xyz.openbmc_project.VirtualSensor", + "members": [ + "/xyz/openbmc_project/sensors/temperature/NVMeM2_MaxTemp" + ] + }, + { + "name": "NVMeFBP Max Temp", + "service": "xyz.openbmc_project.VirtualSensor", + "members": [ + "/xyz/openbmc_project/sensors/temperature/NVMeFBP_MaxTemp" + ] + }, + { + "name": "OCP Max Temp", + "service": "xyz.openbmc_project.VirtualSensor", + "members": [ + "/xyz/openbmc_project/sensors/temperature/OCP_MaxTemp" + ] + }, + { + "name": "PSU Max Temps", + "service": "xyz.openbmc_project.PSUSensor", + "members": [ + "/xyz/openbmc_project/sensors/temperature/PSU0_TEMP", + "/xyz/openbmc_project/sensors/temperature/PSU1_TEMP" + ] + }, + { + "name": "PCIE Zone Temps", + "service": "xyz.openbmc_project.HwmonTempSensor", + "members": [ + "/xyz/openbmc_project/sensors/temperature/PcieZoneTemp1", + "/xyz/openbmc_project/sensors/temperature/PcieZoneTemp2" + ] + }, + { + "name": "Sys Inlet Temp", + "service": "xyz.openbmc_project.VirtualSensor", + "members": [ + "/xyz/openbmc_project/sensors/temperature/SysInletTemp" + ] + }, + { + "name": "Sys Inlet Temp Components", + "service": "xyz.openbmc_project.HwmonTempSensor", + "members": [ + "/xyz/openbmc_project/sensors/temperature/SysCabInletTemp", + "/xyz/openbmc_project/sensors/temperature/MBInletTemp1", + "/xyz/openbmc_project/sensors/temperature/MBInletTemp2", + "/xyz/openbmc_project/sensors/temperature/InletTemp" + ] + } + +] diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/monitor.json b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/monitor.json new file mode 100644 index 0000000000..9b2d592874 --- /dev/null +++ b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/monitor.json @@ -0,0 +1,160 @@ +{ + "fans": [ + { + "inventory": "/system/board/Mt_Mitchell_Motherboard/FAN0", + "allowed_out_of_range_time": 12, + "deviation": 25, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "set_func_on_present": false, + "sensors": [ + { + "name": "FAN0_F", + "has_target": true, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM7", + "factor": 90, + "offset": 0 + }, + { + "name": "FAN0_R", + "has_target": false, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM7", + "factor": 86, + "offset": 0 + } + ] + }, + { + "inventory": "/system/board/Mt_Mitchell_Motherboard/FAN1", + "allowed_out_of_range_time": 12, + "deviation": 25, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "set_func_on_present": false, + "sensors": [ + { + "name": "FAN1_F", + "has_target": true, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM5", + "factor": 90, + "offset": 0 + }, + { + "name": "FAN1_R", + "has_target": false, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM5", + "factor": 86, + "offset": 0 + } + ] + }, + { + "inventory": "/system/board/Mt_Mitchell_Motherboard/FAN2", + "allowed_out_of_range_time": 12, + "deviation": 25, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "set_func_on_present": false, + "sensors": [ + { + "name": "FAN2_F", + "has_target": true, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM4", + "factor": 90, + "offset": 0 + }, + { + "name": "FAN2_R", + "has_target": false, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM4", + "factor": 86, + "offset": 0 + } + ] + }, + { + "inventory": "/system/board/Mt_Mitchell_Motherboard/FAN3", + "allowed_out_of_range_time": 12, + "deviation": 25, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "set_func_on_present": false, + "sensors": [ + { + "name": "FAN3_F", + "has_target": true, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM3", + "factor": 90, + "offset": 0 + }, + { + "name": "FAN3_R", + "has_target": false, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM3", + "factor": 86, + "offset": 0 + } + ] + }, + { + "inventory": "/system/board/Mt_Mitchell_Motherboard/FAN4", + "allowed_out_of_range_time": 12, + "deviation": 25, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "set_func_on_present": false, + "sensors": [ + { + "name": "FAN4_F", + "has_target": true, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM1", + "factor": 90, + "offset": 0 + }, + { + "name": "FAN4_R", + "has_target": false, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM1", + "factor": 86, + "offset": 0 + } + ] + }, + { + "inventory": "/system/board/Mt_Mitchell_Motherboard/FAN5", + "allowed_out_of_range_time": 12, + "deviation": 25, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "set_func_on_present": false, + "sensors": [ + { + "name": "FAN5_F", + "has_target": true, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM0", + "factor": 90, + "offset": 0 + }, + { + "name": "FAN5_R", + "has_target": false, + "target_interface": "xyz.openbmc_project.Control.FanPwm", + "target_path": "/xyz/openbmc_project/control/fanpwm/PWM0", + "factor": 86, + "offset": 0 + } + ] + } + ] + } diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service new file mode 100644 index 0000000000..6ad9165307 --- /dev/null +++ b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service @@ -0,0 +1,11 @@ +[Unit] +Description=Phosphor Fan Control Daemon +Wants=xyz.openbmc_project.fansensor.service +After=xyz.openbmc_project.fansensor.service +StartLimitIntervalSec=30 +StartLimitBurst=3 + +[Service] +Restart=always +ExecStart=-phosphor-fan-control +RestartSec=20 diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service new file mode 100644 index 0000000000..83a2436e6c --- /dev/null +++ b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service @@ -0,0 +1,11 @@ +[Unit] +Description=Phosphor Fan Monitor Daemon +Wants=xyz.openbmc_project.fansensor.service +After=xyz.openbmc_project.fansensor.service +StartLimitIntervalSec=30 +StartLimitBurst=3 + +[Service] +Restart=always +ExecStart=-phosphor-fan-monitor +RestartSec=20 diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service new file mode 100644 index 0000000000..64f6f8f238 --- /dev/null +++ b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service @@ -0,0 +1,11 @@ +[Unit] +Description=Phosphor Fan Presence Tach Daemon +Wants=xyz.openbmc_project.fansensor.service +After=xyz.openbmc_project.fansensor.service +StartLimitIntervalSec=30 +StartLimitBurst=3 + +[Service] +Restart=on-failure +ExecStart=phosphor-fan-presence-tach +RestartSec=20 diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/presence.json b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/presence.json new file mode 100644 index 0000000000..f0b5c464fc --- /dev/null +++ b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/presence.json @@ -0,0 +1,98 @@ +[ + { + "name": "FAN0", + "path": "/system/board/Mt_Mitchell_Motherboard/FAN0", + "methods": [ + { + "type": "tach", + "sensors": [ + "FAN0_F", + "FAN0_R" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "FAN1", + "path": "/system/board/Mt_Mitchell_Motherboard/FAN1", + "methods": [ + { + "type": "tach", + "sensors": [ + "FAN1_F", + "FAN1_R" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "FAN2", + "path": "/system/board/Mt_Mitchell_Motherboard/FAN2", + "methods": [ + { + "type": "tach", + "sensors": [ + "FAN2_F", + "FAN2_R" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "FAN3", + "path": "/system/board/Mt_Mitchell_Motherboard/FAN3", + "methods": [ + { + "type": "tach", + "sensors": [ + "FAN3_F", + "FAN3_R" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "FAN4", + "path": "/system/board/Mt_Mitchell_Motherboard/FAN4", + "methods": [ + { + "type": "tach", + "sensors": [ + "FAN4_F", + "FAN4_R" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "FAN5", + "path": "/system/board/Mt_Mitchell_Motherboard/FAN5", + "methods": [ + { + "type": "tach", + "sensors": [ + "FAN5_F", + "FAN5_R" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + } + ] diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/zones.json b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/zones.json new file mode 100644 index 0000000000..e87cdfae95 --- /dev/null +++ b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan/zones.json @@ -0,0 +1,10 @@ +[ + { + "name": "0", + "poweron_target": 153, + "default_ceiling": 255, + "default_floor": 64, + "increase_delay": 1, + "decrease_interval": 5 + } +] diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan_%.bbappend new file mode 100644 index 0000000000..3a4bbd07a8 --- /dev/null +++ b/meta-ampere/meta-mitchell/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -0,0 +1,42 @@ +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" + +PACKAGECONFIG:append = " json" + +SRC_URI:append = " \ + file://events.json \ + file://fans.json \ + file://groups.json \ + file://zones.json \ + file://monitor.json \ + file://presence.json \ + file://phosphor-fan-control@.service \ + file://phosphor-fan-monitor@.service \ + file://phosphor-fan-presence-tach@.service \ + " + +MITCHELL_COMPAT_NAME = "com.ampere.Hardware.Chassis.Model.MtMitchell" + +CONTROL_CONFIGS = "events.json fans.json zones.json groups.json" + +do_install:append () { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/phosphor-fan-monitor@.service ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/phosphor-fan-control@.service ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/phosphor-fan-presence-tach@.service ${D}${systemd_system_unitdir} + + # datadir = /usr/share + install -d ${D}${datadir}/phosphor-fan-presence/control/${MITCHELL_COMPAT_NAME} + install -d ${D}${datadir}/phosphor-fan-presence/monitor/${MITCHELL_COMPAT_NAME} + install -d ${D}${datadir}/phosphor-fan-presence/presence/${MITCHELL_COMPAT_NAME} + + for CONTROL_CONFIG in ${CONTROL_CONFIGS} + do + install -m 0644 ${WORKDIR}/${CONTROL_CONFIG} \ + ${D}${datadir}/phosphor-fan-presence/control/${MITCHELL_COMPAT_NAME} + done + + install -m 0644 ${WORKDIR}/monitor.json \ + ${D}${datadir}/phosphor-fan-presence/monitor/${MITCHELL_COMPAT_NAME}/config.json + install -m 0644 ${WORKDIR}/presence.json \ + ${D}${datadir}/phosphor-fan-presence/presence/${MITCHELL_COMPAT_NAME}/config.json +} diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json index 4afaca0665..f23d74029c 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json +++ b/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json @@ -32,7 +32,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard" ] } ] @@ -70,7 +70,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard" ] } ] @@ -108,7 +108,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard" ] } ] @@ -146,7 +146,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard" ] } ] @@ -184,7 +184,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard" ] } ] @@ -222,7 +222,7 @@ }, "paths": [ - "/xyz/openbmc_project/inventory/system/chassis" + "/xyz/openbmc_project/inventory/system/board/Mt_Mitchell_Motherboard" ] } ] diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 768c66758f..7c5678e8e1 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ampere/meta-mitchell/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1,5 +1,3 @@ -DEPENDS:append = " inventory-cleanup" - FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PACKAGECONFIG:append = " associations" SRC_URI:append = " file://associations.json" diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/leds/phosphor-led-manager/com.ampere.Hardware.Chassis.Model.MtMitchell.json b/meta-ampere/meta-mitchell/recipes-phosphor/leds/phosphor-led-manager/com.ampere.Hardware.Chassis.Model.MtMitchell.json index 8cd5d1beae..e6e72488dc 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/leds/phosphor-led-manager/com.ampere.Hardware.Chassis.Model.MtMitchell.json +++ b/meta-ampere/meta-mitchell/recipes-phosphor/leds/phosphor-led-manager/com.ampere.Hardware.Chassis.Model.MtMitchell.json @@ -4,18 +4,18 @@ "group": "bmc_booted", "members": [ { - "Name": "bmc_ready", + "Name": "led_bmc_ready", "Action": "On", "DutyOn": 50, "Period": 0, "Priority": "On" }, { - "Name": "sw_heartbeat", + "Name": "led_sw_heartbeat", "Action": "Blink", "DutyOn": 50, "Period": 2000, - "Priority": "On" + "Priority": "Blink" } ] }, @@ -25,25 +25,14 @@ ] }, { - "group": "systemFault", - "members": [ - { - "Name": "fault", - "Action": "On", - "DutyOn": 50, - "Period": 0, - "Priority": "Blink" - } - ] - }, - { "group": "enclosure_identify", "members": [ { - "Name": "identify", + "Name": "led_identify", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" } ] }, @@ -51,10 +40,11 @@ "group": "enclosure_identify_blink", "members": [ { - "Name": "identify", + "Name": "led_identify", "Action": "Blink", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" } ] }, @@ -62,16 +52,18 @@ "group": "fan0_fault", "members": [ { - "Name": "fan_fault", + "Name": "led_fan_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" }, { - "Name": "fault", + "Name": "led_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" } ] }, @@ -79,16 +71,18 @@ "group": "fan1_fault", "members": [ { - "Name": "fan_fault", + "Name": "led_fan_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" }, { - "Name": "fault", + "Name": "led_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" } ] }, @@ -96,16 +90,18 @@ "group": "fan2_fault", "members": [ { - "Name": "fan_fault", + "Name": "led_fan_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" }, { - "Name": "fault", + "Name": "led_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" } ] }, @@ -113,16 +109,18 @@ "group": "fan3_fault", "members": [ { - "Name": "fan_fault", + "Name": "led_fan_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" }, { - "Name": "fault", + "Name": "led_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" } ] }, @@ -130,16 +128,18 @@ "group": "fan4_fault", "members": [ { - "Name": "fan_fault", + "Name": "led_fan_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" }, { - "Name": "fault", + "Name": "led_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" } ] }, @@ -147,16 +147,49 @@ "group": "fan5_fault", "members": [ { - "Name": "fan_fault", + "Name": "led_fan_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" }, { - "Name": "fault", + "Name": "led_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" + } + ] + }, + { + "group": "psu_fault", + "members": [ + { + "Name": "led_psu_fault", + "Action": "On", + "DutyOn": 50, + "Period": 1000, + "Priority": "On" + }, + { + "Name": "led_fault", + "Action": "On", + "DutyOn": 50, + "Period": 1000, + "Priority": "On" + } + ] + }, + { + "group": "ras_ue_fault", + "members": [ + { + "Name": "led_fault", + "Action": "On", + "DutyOn": 50, + "Period": 1000, + "Priority": "On" } ] }, @@ -164,10 +197,23 @@ "group": "overtemp_fault", "members": [ { - "Name": "fault", + "Name": "led_fault", + "Action": "On", + "DutyOn": 50, + "Period": 1000, + "Priority": "On" + } + ] + }, + { + "group": "gpio_fault", + "members": [ + { + "Name": "led_fault", "Action": "On", "DutyOn": 50, - "Period": 1000 + "Period": 1000, + "Priority": "On" } ] } diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ampere/meta-mitchell/recipes-phosphor/network/phosphor-network_%.bbappend index 2f2ee59295..43046ea54f 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ampere/meta-mitchell/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -PACKAGECONFIG:append = " sync-mac " - SRC_URI:append = " file://config.json " FILES:${PN} += "${datadir}/network/*.json" diff --git a/meta-aspeed/recipes-aspeed/python/socsec/0001-otptool-Define-value_start-in-rev_id-path.patch b/meta-aspeed/recipes-aspeed/python/socsec/0001-otptool-Define-value_start-in-rev_id-path.patch index 65785196f6..7c029b6750 100644 --- a/meta-aspeed/recipes-aspeed/python/socsec/0001-otptool-Define-value_start-in-rev_id-path.patch +++ b/meta-aspeed/recipes-aspeed/python/socsec/0001-otptool-Define-value_start-in-rev_id-path.patch @@ -5,7 +5,7 @@ Subject: [PATCH] otptool: Define value_start in `rev_id` path See https://github.com/AspeedTech-BMC/socsec/pull/18 -Upstream-Status: Accepted +Upstream-Status: Backport [next release] Signed-off-by: Andrew Jeffery <andrew@aj.id.au> --- socsec/otptool.py | 1 + @@ -21,5 +21,5 @@ index efeab96dbd96..97da143723dd 100755 bit_length = info['bit_length'] + value_start = info['value_start'] offset_value = int(value, 16) - value_start - + if offset_value < 0 or offset_value > bit_length: diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index c5a0f7d7b6..462b477ca8 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -10,7 +10,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "7ce62637441bc08745eebf0b629be8f58fb4ffa3" +SRCREV = "2ac7fde7b01234deaa43187d5d721bddbba0f992" SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" SRC_URI:append:uboot-flash-32768 = " file://u-boot_flash_32M.cfg" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index c7eea87328..3ceeb6bc40 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-6.6" -LINUX_VERSION ?= "6.6.35" +LINUX_VERSION ?= "6.6.52" -SRCREV="6c71a0574249f5e5a45fe055ab5f837023d5eeca" +SRCREV="932df9afc2f024ddd310c964b6adbafd05c77723" require linux-aspeed.inc diff --git a/meta-asrock/meta-e3c246d4i/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-asrock/meta-e3c246d4i/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json index 200fa3b6a1..9582763371 100644 --- a/meta-asrock/meta-e3c246d4i/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json +++ b/meta-asrock/meta-e3c246d4i/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json @@ -6,6 +6,7 @@ { "Name" : "heartbeat", "Action" : "Blink", + "Priority" : "Blink", "DutyOn" : 50, "Period" : 1000 } @@ -17,6 +18,7 @@ { "Name": "system-fault", "Action": "Blink", + "Priority" : "Blink", "DutyOn": 50, "Period": 250 } diff --git a/meta-asrock/meta-e3c256d4i/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-asrock/meta-e3c256d4i/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json index 200fa3b6a1..9582763371 100644 --- a/meta-asrock/meta-e3c256d4i/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json +++ b/meta-asrock/meta-e3c256d4i/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json @@ -6,6 +6,7 @@ { "Name" : "heartbeat", "Action" : "Blink", + "Priority" : "Blink", "DutyOn" : 50, "Period" : 1000 } @@ -17,6 +18,7 @@ { "Name": "system-fault", "Action": "Blink", + "Priority" : "Blink", "DutyOn": 50, "Period": 250 } diff --git a/meta-asrock/meta-romed8hm3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-asrock/meta-romed8hm3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json index 200fa3b6a1..9582763371 100644 --- a/meta-asrock/meta-romed8hm3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json +++ b/meta-asrock/meta-romed8hm3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json @@ -6,6 +6,7 @@ { "Name" : "heartbeat", "Action" : "Blink", + "Priority" : "Blink", "DutyOn" : 50, "Period" : 1000 } @@ -17,6 +18,7 @@ { "Name": "system-fault", "Action": "Blink", + "Priority" : "Blink", "DutyOn": 50, "Period": 250 } diff --git a/meta-asrock/meta-spc621d8hm3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-asrock/meta-spc621d8hm3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json index 200fa3b6a1..9582763371 100644 --- a/meta-asrock/meta-spc621d8hm3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json +++ b/meta-asrock/meta-spc621d8hm3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json @@ -6,6 +6,7 @@ { "Name" : "heartbeat", "Action" : "Blink", + "Priority" : "Blink", "DutyOn" : 50, "Period" : 1000 } @@ -17,6 +18,7 @@ { "Name": "system-fault", "Action": "Blink", + "Priority" : "Blink", "DutyOn": 50, "Period": 250 } diff --git a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch deleted file mode 100644 index fb26499b51..0000000000 --- a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6901c1fb9c8fbf33461811b9f1667bcaf876b747 Mon Sep 17 00:00:00 2001 -From: John Wang <wangzhiqiang.bj@bytedance.com> -Date: Wed, 30 Sep 2020 13:02:22 +0800 -Subject: [PATCH 5/5] ARM: dts: aspeed: Enable g220a uart route - -Signed-off-by: John Wang <wangzhiqiang.bj@bytedance.com> ---- - arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts -index 2ae2684c115c..c18ca23f57ac 100644 ---- a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts -+++ b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts -@@ -929,3 +929,7 @@ &video { - &vhub { - status = "okay"; - }; -+ -+&uart_routing { -+ status = "okay"; -+}; --- -2.25.1 - diff --git a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend index e962940a64..2b600b3abc 100644 --- a/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,5 +1,3 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI:append:g220a = " file://g220a.cfg \ - file://0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch \ - " +SRC_URI:append:g220a = " file://g220a.cfg" diff --git a/meta-delta/OWNERS b/meta-delta/OWNERS deleted file mode 100644 index 70a4c8bc38..0000000000 --- a/meta-delta/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -owners: -- zev@bewilderbeest.net diff --git a/meta-evb/meta-evb-arm/meta-evb-fvp-base/README.md b/meta-evb/meta-evb-arm/meta-evb-fvp-base/README.md index 135e1a05cd..081a7c3d4a 100644 --- a/meta-evb/meta-evb-arm/meta-evb-fvp-base/README.md +++ b/meta-evb/meta-evb-arm/meta-evb-fvp-base/README.md @@ -8,20 +8,21 @@ with the Manageability Control Processor (MCP) over PLDM over MCTP over UART. ## Diagram + ``` - AP debug console - | -+---------------------+ -| Neoverse RD-N2 FVP | -| | PLDM over -+-----+ +-------+ MCTP over +--------------------------+ -| SCP | | MCP | (terminal_0) ------- UART ----- (terminal_1)| /dev/ttyAMA1 Base FVP |--- redfish -+-----+-------+-------+ +--------------------------+ - | | | - | debug console FVP debug console - | (terminal_uart_mcp) (terminal_0) -debug console -(terminal_uart_scp) + AP debug console + | + +-----------------------+ + +--------------------------+ | Neoverse RD-N2 FVP | + | Base FVP | PLDM over | | + | | MCTP over +-------+ +-------+ +redfish--| /dev/ttyAMA1 |-------------- UART --------------| MCP | | SCP | + +--------------------------+ (terminal_1) (terminal_0) +-------+-------+-------+ + | | | + FVP debug console | debug console + (terminal_0) | (terminal_uart_scp) + debug console + (terminal_uart_mcp) ``` ## Features @@ -54,9 +55,9 @@ debug console ## References -- SCP FW for MCP https://gitlab.arm.com/firmware/SCP-firmware +- SCP FW for MCP https://gitlab.arm.com/infra-solutions/reference-design/platsw/scp-firmware/-/tree/refinfra-satmc?ref_type=heads - Base FVP Download https://developer.arm.com/Tools%20and%20Software/Fixed%20Virtual%20Platforms - Neoverse FVP Download https://developer.arm.com/downloads/-/arm-ecosystem-fvps - PLDM + MCTP Specifications https://www.dmtf.org/standards/pmci -- Neoverse System Architecture https://developer.arm.com/documentation/102759/relc/Hardware-and-topology/System-architecture?lang=en -- Other FVP SW Docs https://gitlab.arm.com/arm-reference-solutions/arm-reference-solutions-docs/ +- Neoverse System Architecture https://developer.arm.com/documentation/102099/0003/Technical-overview?lang=en +- Other FVP SW Docs https://neoverse-reference-design.docs.arm.com/en/latest/index.html diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf index 20a8e5c5a8..48abbd36d1 100644 --- a/meta-facebook/conf/layer.conf +++ b/meta-facebook/conf/layer.conf @@ -5,6 +5,13 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" +BBFILES_DYNAMIC += " \ + aspeed-layer:${LAYERDIR}/dynamic-layers/aspeed-layer/recipes-*/*/*.bb \ + aspeed-layer:${LAYERDIR}/dynamic-layers/aspeed-layer/recipes-*/*/*.bbappend \ + nuvoton-layer:${LAYERDIR}/dynamic-layers/nuvoton-layer/recipes-*/*/*.bb \ + nuvoton-layer:${LAYERDIR}/dynamic-layers/nuvoton-layer/recipes-*/*/*.bbappend \ + " + BBFILE_COLLECTIONS += "facebook-layer" BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/" LAYERSERIES_COMPAT_facebook-layer := "nanbield scarthgap" diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 2575eb6361..75c61637a9 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -23,3 +23,8 @@ IMAGE_FEATURES:append = " allow-root-login" SERIAL_CONSOLES:facebook = "57600;ttyS4" OBMC_ORG_YAML_SUBDIRS:append:facebook = " com/meta" + +# Remove some common features we have no use for. +DISTRO_FEATURES:remove = "avahi" +DISTRO_FEATURES:remove = "ldap" +DISTRO_FEATURES:remove = "slp" diff --git a/meta-facebook/dynamic-layers/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/dynamic-layers/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 0000000000..8a561fbb9f --- /dev/null +++ b/meta-facebook/dynamic-layers/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1 @@ +require recipes-kernel/linux/facebook-linux.inc diff --git a/meta-facebook/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-facebook/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend new file mode 100644 index 0000000000..8a561fbb9f --- /dev/null +++ b/meta-facebook/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -0,0 +1 @@ +require recipes-kernel/linux/facebook-linux.inc diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config/led.yaml b/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config/led.yaml index 4dc90584fb..f08d8b4671 100644 --- a/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config/led.yaml +++ b/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config/led.yaml @@ -4,24 +4,28 @@ bmc_booted: sys_log_id: Action: 'On' + Priority: 'Blink' enclosure_fault: sys_log_id: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' enclosure_identify: sys_log_id: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' enclosure_identify_blink: sys_log_id: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' #==================== # Fan 0 @@ -29,14 +33,18 @@ enclosure_identify_blink: fan0_fault: fan0_amber: Action: 'On' + Priority: 'Blink' fan0_blue: Action: 'Off' + Priority: 'Blink' fan0_good: fan0_amber: Action: 'Off' + Priority: 'Blink' fan0_blue: Action: 'On' + Priority: 'Blink' #==================== # Fan 1 @@ -44,14 +52,18 @@ fan0_good: fan1_fault: fan1_amber: Action: 'On' + Priority: 'Blink' fan1_blue: Action: 'Off' + Priority: 'Blink' fan1_good: fan1_amber: Action: 'Off' + Priority: 'Blink' fan1_blue: Action: 'On' + Priority: 'Blink' #==================== # Fan 2 @@ -59,14 +71,18 @@ fan1_good: fan2_fault: fan2_amber: Action: 'On' + Priority: 'Blink' fan2_blue: Action: 'Off' + Priority: 'Blink' fan2_good: fan2_amber: Action: 'Off' + Priority: 'Blink' fan2_blue: Action: 'On' + Priority: 'Blink' #==================== # Fan 3 @@ -74,14 +90,18 @@ fan2_good: fan3_fault: fan3_amber: Action: 'On' + Priority: 'Blink' fan3_blue: Action: 'Off' + Priority: 'Blink' fan3_good: fan3_amber: Action: 'Off' + Priority: 'Blink' fan3_blue: Action: 'On' + Priority: 'Blink' #==================== # Sled 1 @@ -89,22 +109,26 @@ fan3_good: sled1_fault: sled1_amber: Action: 'On' + Priority: 'Blink' sled1_good: sled1_blue: Action: 'On' + Priority: 'Blink' sled1_identify: sled1_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' sled1_identify_blink: sled1_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' #==================== # Sled 2 @@ -112,22 +136,26 @@ sled1_identify_blink: sled2_fault: sled2_amber: Action: 'On' + Priority: 'Blink' sled2_good: sled2_blue: Action: 'On' + Priority: 'Blink' sled2_identify: sled2_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' sled2_identify_blink: sled2_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' #==================== # Sled 3 @@ -135,22 +163,26 @@ sled2_identify_blink: sled3_fault: sled3_amber: Action: 'On' + Priority: 'Blink' sled3_good: sled3_blue: Action: 'On' + Priority: 'Blink' sled3_identify: sled3_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' sled3_identify_blink: sled3_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' #==================== # Sled 4 @@ -158,22 +190,26 @@ sled3_identify_blink: sled4_fault: sled4_amber: Action: 'On' + Priority: 'Blink' sled4_good: sled4_blue: Action: 'On' + Priority: 'Blink' sled4_identify: sled4_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' sled4_identify_blink: sled4_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' #==================== # Sled 5 @@ -181,22 +217,26 @@ sled4_identify_blink: sled5_fault: sled5_amber: Action: 'On' + Priority: 'Blink' sled5_good: sled5_blue: Action: 'On' + Priority: 'Blink' sled5_identify: sled5_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' sled5_identify_blink: sled5_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' #==================== # Sled 6 @@ -204,19 +244,23 @@ sled5_identify_blink: sled6_fault: sled6_amber: Action: 'On' + Priority: 'Blink' sled6_good: sled6_blue: Action: 'On' + Priority: 'Blink' sled6_identify: sled6_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' sled6_identify_blink: sled6_amber: Action: 'Blink' DutyOn: 50 Period: 400 + Priority: 'Blink' diff --git a/meta-ieisystems/conf/layer.conf b/meta-facebook/meta-catalina/conf/layer.conf index 60f56a95e0..96848520f6 100644 --- a/meta-ieisystems/conf/layer.conf +++ b/meta-facebook/meta-catalina/conf/layer.conf @@ -5,6 +5,7 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS += "ieisystems-layer" -BBFILE_PATTERN_ieisystems-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ieisystems-layer = "nanbield scarthgap" +BBFILE_COLLECTIONS += "catalina-layer" +BBFILE_PATTERN_catalina-layer := "^${LAYERDIR}/" + +LAYERSERIES_COMPAT_catalina-layer := "nanbield scarthgap" diff --git a/meta-facebook/meta-catalina/conf/machine/catalina.conf b/meta-facebook/meta-catalina/conf/machine/catalina.conf new file mode 100644 index 0000000000..4285b60edf --- /dev/null +++ b/meta-facebook/meta-catalina/conf/machine/catalina.conf @@ -0,0 +1,26 @@ +# Catalina config file. + +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb" + +UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" +UBOOT_DEVICETREE = "ast2600-facebook" + +SPL_BINARY = "spl/u-boot-spl.bin" +SOCSEC_SIGN_ENABLE = "0" + +OBMC_COMPATIBLE_NAMES = "com.meta.Hardware.BMC.Model.Catalina" + +require conf/distro/include/phosphor-static-norootfs.inc +require conf/machine/include/facebook-compute-singlehost.inc +require conf/machine/include/ast2600.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/facebook-tpm2.inc +require conf/machine/include/facebook-ncsi-nic.inc + +FLASH_SIZE = "131072" + +VIRTUAL-RUNTIME_obmc-host-state-manager = "phosphor-state-manager-host" +VIRTUAL-RUNTIME_obmc-chassis-state-manager = "phosphor-state-manager-chassis" + +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" diff --git a/meta-facebook/meta-catalina/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-catalina/conf/templates/default/bblayers.conf.sample new file mode 100644 index 0000000000..dfc03a9349 --- /dev/null +++ b/meta-facebook/meta-catalina/conf/templates/default/bblayers.conf.sample @@ -0,0 +1,18 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security/meta-tpm \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-facebook \ + ##OEROOT##/meta-facebook/meta-catalina \ + " diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/conf-notes.txt b/meta-facebook/meta-catalina/conf/templates/default/conf-notes.txt index 9b3c01a556..9b3c01a556 100644 --- a/meta-ieisystems/meta-fp5280g3/conf/templates/default/conf-notes.txt +++ b/meta-facebook/meta-catalina/conf/templates/default/conf-notes.txt diff --git a/meta-facebook/meta-catalina/conf/templates/default/local.conf.sample b/meta-facebook/meta-catalina/conf/templates/default/local.conf.sample new file mode 100644 index 0000000000..a11072bf4e --- /dev/null +++ b/meta-facebook/meta-catalina/conf/templates/default/local.conf.sample @@ -0,0 +1,258 @@ +# +# This file is your local configuration file and is where all local user settings +# are placed. The comments in this file give some guide to the options a new user +# to the system might want to change but pretty much any configuration option can +# be set in this file. More adventurous users can look at local.conf.extended +# which contains other examples of configuration which can be placed in this file +# but new users likely won't need any of them initially. +# +# Lines starting with the '#' character are commented out and in some cases the +# default values are provided as comments to show people example syntax. Enabling +# the option is a question of removing the # character and making any change to the +# variable as required. + +# +# Machine Selection +# +MACHINE ??= "catalina" + +# +# Where to place downloads +# +# During a first build the system will download many different source code tarballs +# from various upstream projects. This can take a while, particularly if your network +# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you +# can preserve this directory to speed up this part of subsequent builds. This directory +# is safe to share between multiple builds on the same machine too. +# +# The default is a downloads directory under TOPDIR which is the build directory. +# +#DL_DIR ?= "${TOPDIR}/downloads" + +# +# Where to place shared-state files +# +# BitBake has the capability to accelerate builds based on previously built output. +# This is done using "shared state" files which can be thought of as cache objects +# and this option determines where those files are placed. +# +# You can wipe out TMPDIR leaving this directory intact and the build would regenerate +# from these files if no changes were made to the configuration. If changes were made +# to the configuration, only shared state files where the state was still valid would +# be used (done using checksums). +# +# The default is a sstate-cache directory under TOPDIR. +# +#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" + +# +# Where to place the build output +# +# This option specifies where the bulk of the building work should be done and +# where BitBake should place its temporary files and output. Keep in mind that +# this includes the extraction and compilation of many applications and the toolchain +# which can use Gigabytes of hard disk space. +# +# The default is a tmp directory under TOPDIR. +# +#TMPDIR = "${TOPDIR}/tmp" + +# +# Default policy config +# +# The distribution setting controls which policy settings are used as defaults. +# The default value is fine for general Yocto project use, at least initially. +# Ultimately when creating custom policy, people will likely end up subclassing +# these defaults. +# +DISTRO ?= "openbmc-phosphor" +# As an example of a subclass there is a "bleeding" edge policy configuration +# where many versions are set to the absolute latest code from the upstream +# source control systems. This is just mentioned here as an example, its not +# useful to most new users. +# DISTRO ?= "poky-bleeding" + +# +# Package Management configuration +# +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used +# to generate the root filesystems. +# Options are: +# - 'package_deb' for debian style deb files +# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) +# - 'package_rpm' for rpm style packages +# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" +# We default to ipk: +PACKAGE_CLASSES ?= "package_ipk" + +# +# SDK target architecture +# +# This variable specifies the architecture to build SDK items for and means +# you can build the SDK packages for architectures other than the machine you are +# running the build on (i.e. building i686 packages on an x86_64 host). +# Supported values are i686, x86_64, aarch64 +#SDKMACHINE ?= "i686" + +SANITY_TESTED_DISTROS:append ?= " *" + +# +# Extra image configuration defaults +# +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# images. Some of these options are added to certain image types automatically. The +# variable can contain the following options: +# "dbg-pkgs" - add -dbg packages for all installed packages +# (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) +# "dev-pkgs" - add -dev packages for all installed packages +# (useful if you want to develop against libs in the image) +# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages +# (useful if you want to run the package test suites) +# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) +# "tools-debug" - add debugging tools (gdb, strace) +# "eclipse-debug" - add Eclipse remote debugging support +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) +# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) +# "debug-tweaks" - make an image suitable for development +# e.g. ssh root access has a blank password +# There are other application targets that can be used here too, see +# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. +# We default to enabling the debugging tweaks. +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" + +# +# Additional image features +# +# The following is a list of additional classes to use when building images which +# enable extra features. Some available options which can be included in this variable +# are: +# - 'buildstats' collect build statistics +USER_CLASSES ?= "buildstats" + +# +# Runtime testing of images +# +# The build system can test booting virtual machine images under qemu (an emulator) +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO_qemuall = "1" + +# +# Interactive shell configuration +# +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is +# multithreaded and needs to be able to handle the case where more than one parallel +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. +# +# Examples of the occasions this may happen are when resolving patches which cannot +# be applied, to use the devshell or the kernel menuconfig +# +# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none +# Note: currently, Konsole support only works for KDE 3.x due to the way +# newer Konsole versions behave +#OE_TERMINAL = "auto" +# By default disable interactive patch resolution (tasks will just fail instead): +PATCHRESOLVE = "noop" + +# +# Disk Space Monitoring during the build +# +# Monitor the disk space during the build. If there is less that 1GB of space or less +# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort +# of the build. The reason for this is that running completely out of space can corrupt +# files and damages the build in ways which may not be easily recoverable. +# It's necessary to monitor /tmp, if there is no space left the build will fail +# with very exotic errors. +BB_DISKMON_DIRS ??= "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" + +# +# Shared-state files from other locations +# +# As mentioned above, shared state files are prebuilt cache data objects which can be +# used to accelerate build time. This variable can be used to configure the system +# to search other mirror locations for these objects before it builds the data itself. +# +# This can be a filesystem directory, or a remote url such as http or ftp. These +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# cache locations to check for the shared objects. +# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH +# at the end as shown in the examples below. This will be substituted with the +# correct path within the directory structure. +#SSTATE_MIRRORS ?= "\ +#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* file:///some/local/dir/sstate/PATH" + +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following line. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" + +# +# Qemu configuration +# +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +PACKAGECONFIG:append:pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" + +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" + +# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to +# track the version of this file when it was generated. This can safely be ignored if +# this doesn't mean anything to you. +CONF_VERSION = "2" + +# Set the root password to '0penBmc' +# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc diff --git a/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk/yosemite4.cfg b/meta-facebook/meta-catalina/recipes-bsp/u-boot/u-boot-aspeed-sdk/catalina.cfg index 1e2a374f73..1e2a374f73 100644 --- a/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk/yosemite4.cfg +++ b/meta-facebook/meta-catalina/recipes-bsp/u-boot/u-boot-aspeed-sdk/catalina.cfg diff --git a/meta-facebook/meta-catalina/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-facebook/meta-catalina/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend new file mode 100644 index 0000000000..c88c0ec6b7 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI +="file://catalina.cfg" diff --git a/meta-facebook/meta-catalina/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-facebook/meta-catalina/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend new file mode 100644 index 0000000000..2f71ae69e1 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-aspeed-sdk:" +SRC_URI +="file://catalina.cfg" diff --git a/meta-facebook/meta-catalina/recipes-catalina/plat-svc/files/catalina-early-sys-init b/meta-facebook/meta-catalina/recipes-catalina/plat-svc/files/catalina-early-sys-init new file mode 100644 index 0000000000..4f6191ba6b --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-catalina/plat-svc/files/catalina-early-sys-init @@ -0,0 +1,22 @@ +#!/bin/bash -e +# shellcheck source=meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions +source /usr/libexec/fb-common-functions + +# Enable standby power and bind i2c components +/usr/libexec/catalina/standby-power-enable + +# Workaround +# rebind PDB i2c mux +bind_i2c_device pca954x 1-0070 +# rebind PDB Fan IC +bind_i2c_device max31790 18-0021 +bind_i2c_device max31790 18-0027 +# rebind PDB FRU +bind_i2c_device at24 21-0054 +bind_i2c_device at24 21-0054 +# rebind OSFP FRU +bind_i2c_device at24 22-0051 +# rebind FIO FRU +bind_i2c_device at24 23-0053 + +exit 0 diff --git a/meta-facebook/meta-catalina/recipes-catalina/plat-svc/files/catalina-sys-init.service b/meta-facebook/meta-catalina/recipes-catalina/plat-svc/files/catalina-sys-init.service new file mode 100644 index 0000000000..4000491d37 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-catalina/plat-svc/files/catalina-sys-init.service @@ -0,0 +1,16 @@ +[Unit] +Description=Catalina Early System Init +Before=phosphor-multi-gpio-monitor.service +Before=phosphor-multi-gpio-presence.service +Before=phosphor-pid-control.service +Before=xyz.openbmc_project.EntityManager.service +Before=xyz.openbmc_project.fansensor.service +Before=systemd-networkd.service + +[Service] +Type=oneshot +ExecStart=/usr/libexec/catalina/catalina-early-sys-init +SyslogIdentifier=Catalina Early Init + +[Install] +WantedBy=multi-user.target diff --git a/meta-facebook/meta-catalina/recipes-catalina/plat-svc/files/standby-power-enable b/meta-facebook/meta-catalina/recipes-catalina/plat-svc/files/standby-power-enable new file mode 100644 index 0000000000..97fbb812f8 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-catalina/plat-svc/files/standby-power-enable @@ -0,0 +1,173 @@ +#!/bin/bash +# shellcheck source=meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions +source /usr/libexec/fb-common-functions + +GPIO_HIGH=1 +GPIO_LOW=0 + +wait_gpio_value() +{ + local net_name=$1 + local max_retries=$3 + local delay_secs=$4 + local expd_val=$2 + + local gpio_val=0 + local trycnt=1 + + until [[ $gpio_val -gt 0 || $trycnt -gt $max_retries ]] + do + gpio_val=$(get_gpio "$net_name") + rc=$? + if [[ $rc -ne 0 ]]; then + err_msg="Unable to read $net_name" + echo "$err_msg" + return 1 + fi + if [[ $gpio_val -eq $expd_val ]]; then + return 0 + fi + sleep "$delay_secs" + ((trycnt++)) + done + + err_msg="wait_gpio_value failed, gpio_val=$gpio_val, exp_val=$expd_val" + echo "$err_msg" + return 1 +} + +bind_i2c_muxes() +{ + # Module 0 I2C Mux + # i2c24 - i2c27 + bind_i2c_device pca954x 0-0071 + # i2c28 - i2c31 + bind_i2c_device pca954x 0-0072 + # i2c32 - i2c35 + bind_i2c_device pca954x 0-0073 + + # Module 1 I2C Mux + # i2c36 - i2c39 + bind_i2c_device pca954x 0-0075 + # i2c40 - i2c43 + bind_i2c_device pca954x 0-0076 + # i2c44 - i2c47 + bind_i2c_device pca954x 0-0077 + + # HDD Board I2C Mux, i2c48 - i2c55 + bind_i2c_device pca954x 5-0070 +} + +bind_gpio_expanders() +{ + # Module 0 IOEXP + bind_i2c_device pca953x 2-0020 + # Module 1 IOEXP + bind_i2c_device pca953x 2-0021 + # HMC IOEXP + bind_i2c_device pca953x 2-0027 + # BMC IOEXP + bind_i2c_device pca953x 6-0021 + # IO Mezz 0 IOEXP + bind_i2c_device pca953x 29-0020 + # IO Mezz 1 IOEXP + bind_i2c_device pca953x 41-0021 +} + +bind_fru_eeproms() +{ + # Module 0 FRU + bind_i2c_device at24 13-0050 + # Module 1 FRU + bind_i2c_device at24 12-0050 + # HMC FRU + bind_i2c_device at24 13-0057 + # Left CBC FRU + bind_i2c_device at24 13-0054 + # Right CBC FRU + bind_i2c_device at24 13-0055 + # IO Mezz 0 FRU + bind_i2c_device at24 29-0050 + # IO Mezz 1 FRU + bind_i2c_device at24 41-0050 + # HDD Board FRU + bind_i2c_device at24 54-0052 +} + +reset_host_usb() +{ + set_gpio "USB2_HUB_RESET_L" "$GPIO_LOW" + sleep 1 + set_gpio "USB2_HUB_RESET_L" "$GPIO_HIGH" +} + +rebind_hmc_usb_network() +{ + echo 1e6a1000.usb > /sys/bus/platform/drivers/ehci-platform/unbind + echo 1e6a1000.usb > /sys/bus/platform/drivers/ehci-platform/bind +} + +is_stby_good() +{ + local gpio_val + + if ! gpio_val=$(get_gpio "STBY_POWER_PG_3V3"); then + return 1 + fi + + if [[ $gpio_val -eq 0 ]]; then + return 1 + fi + + return 0 +} + +set_bmc_ready() +{ + local bmc_ready="/sys/class/leds/bmc_ready_noled/brightness" + local bmc_ready_cpld="/sys/class/leds/bmc_ready_cpld_noled/brightness" + + echo 1 > ${bmc_ready} + echo 1 > ${bmc_ready_cpld} + return 0 +} + +if ! is_stby_good; then + set_gpio "SCM_HPM_STBY_RST_N" "$GPIO_LOW" +fi + +set_gpio "SCM_HPM_STBY_EN" "$GPIO_HIGH" +set_gpio "stby_power_en_cpld" "$GPIO_HIGH" +if ! wait_gpio_value "STBY_POWER_PG_3V3" "$GPIO_HIGH" 20 1; then + echo "Error: failed to get STBY_POWER_PG_3V3 as high (1) in 20 sec" + exit 1 +fi +set_gpio "stby_power_gd_cpld" "$GPIO_HIGH" + +bind_i2c_muxes +bind_gpio_expanders + +reset_host_usb + +set_gpio "HMC_PGOOD" "$GPIO_HIGH" +set_gpio "EROT_FPGA_RST_L" "$GPIO_HIGH" +set_gpio "SEC_EROT_FPGA_RST_L" "$GPIO_HIGH" +set_gpio "HMC_EROT_RST_L" "$GPIO_HIGH" +set_gpio "SCM_HPM_STBY_RST_N" "$GPIO_HIGH" + +if ! wait_gpio_value "HMC_READY" "$GPIO_HIGH" 180 1; then + echo "Error: failed to get HMC_READY as high (1) in 180 sec" + exit 1 +fi + +rebind_hmc_usb_network + +if ! wait_gpio_value "FPGA_READY_BMC" "$GPIO_HIGH" 180 1; then + echo "Error: failed to get FPGA_READY_BMC as high (1) in 180 sec" + exit 1 +fi + +bind_fru_eeproms +set_bmc_ready + +exit 0 diff --git a/meta-facebook/meta-catalina/recipes-catalina/plat-svc/plat-svc_0.1.bb b/meta-facebook/meta-catalina/recipes-catalina/plat-svc/plat-svc_0.1.bb new file mode 100644 index 0000000000..22fd0a64e0 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-catalina/plat-svc/plat-svc_0.1.bb @@ -0,0 +1,26 @@ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch systemd obmc-phosphor-systemd + +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "libgpiod-tools" +RDEPENDS:${PN} += "fb-common-functions" + +SRC_URI += " \ + file://catalina-sys-init.service \ + file://catalina-early-sys-init \ + file://standby-power-enable \ + " + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN}:append = " \ + catalina-sys-init.service \ + " + +do_install() { + CATALINA_LIBEXECDIR="${D}${libexecdir}/catalina" + install -d ${CATALINA_LIBEXECDIR} + install -m 0755 ${WORKDIR}/catalina-early-sys-init ${CATALINA_LIBEXECDIR} + install -m 0755 ${WORKDIR}/standby-power-enable ${CATALINA_LIBEXECDIR} +} diff --git a/meta-facebook/meta-catalina/recipes-kernel/linux/linux-aspeed/catalina.cfg b/meta-facebook/meta-catalina/recipes-kernel/linux/linux-aspeed/catalina.cfg new file mode 100644 index 0000000000..419b2ff923 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-kernel/linux/linux-aspeed/catalina.cfg @@ -0,0 +1,66 @@ +# large memory support +CONFIG_VMSPLIT_3G_OPT=y +CONFIG_HAVE_CLK=y +CONFIG_OF=y + +# aspeed-adc driver +CONFIG_COMMON_CLK=y +CONFIG_ASPEED_ADC=y + +# NCSI +CONFIG_NCSI_OEM_CMD_GET_MAC=y + +# devmem +CONFIG_DEVMEM=y + +# RTC +CONFIG_RTC_DRV_NCT3018Y=y + +# USB EHCI +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_PLATFORM=y + +# USB NET +CONFIG_USB_NET_DRIVERS=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_CDCETHER=y +CONFIG_USB_NET_CDC_NCM=y +CONFIG_USB_NET_CDC_SUBSET_ENABLE=y +CONFIG_USB_NET_CDC_SUBSET=y + +# SPI GPIO +CONFIG_SPI_GPIO=y +CONFIG_SPI_BITBANG=y + +# IPMI & SSIF & IPMB +CONFIG_IPMI_HANDLER=y +CONFIG_IPMI_DEVICE_INTERFACE=y +CONFIG_SSIF_IPMI_BMC=y +CONFIG_IPMB_DEVICE_INTERFACE=y + +# Aspeed OTP +CONFIG_ASPEED_OTP=y + +# Hwmon Sensors +CONFIG_SENSORS_ADC128D818=y +CONFIG_GPIO_PCA953X=y +CONFIG_SENSORS_INA238=y +CONFIG_SENSORS_INA2XX=y +CONFIG_SENSORS_ISL68137=y +CONFIG_SENSORS_LTC4286=y +CONFIG_SENSORS_MAX31790=y +CONFIG_SENSORS_MP2856=y +CONFIG_SENSORS_MP5990=y +CONFIG_SENSORS_PT5161L=y +CONFIG_SENSORS_XDPE152=y +# CONFIG_SENSORS_NCT7363=y # fan ic 2nd + +# IIO Sensors +CONFIG_TI_ADS1015=y +CONFIG_MAX1363=y + +# I2C Mux +CONFIG_I2C_MUX_PCA954x=y + +# Enable loadable module +CONFIG_MODULES=y diff --git a/meta-facebook/meta-catalina/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-catalina/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 0000000000..fd6dcf1412 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:" +SRC_URI += "file://catalina.cfg" + diff --git a/meta-facebook/meta-catalina/recipes-phosphor/chassis/obmc-phosphor-buttons/gpio_defs.json b/meta-facebook/meta-catalina/recipes-phosphor/chassis/obmc-phosphor-buttons/gpio_defs.json new file mode 100644 index 0000000000..d66c1756b8 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/chassis/obmc-phosphor-buttons/gpio_defs.json @@ -0,0 +1,10 @@ +{ + "gpio_definitions": [ + { + "name": "HOST_SELECTOR", + "group_gpio_config" : [], + "max_position" : 1, + "host_selector_map" : {} + } + ] +} diff --git a/meta-facebook/meta-catalina/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend new file mode 100644 index 0000000000..91e994e961 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" + +SRC_URI += "file://gpio_defs.json" + +do_install:append() { + install -d ${D}${sysconfdir}/default/obmc/gpio/ + install -m 0644 ${WORKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/ +} + +FILES:${PN}-signals:append = " ${sysconfdir}/default/obmc/gpio/gpio_defs.json" diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-gpio-log@.service b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-gpio-log@.service new file mode 100644 index 0000000000..b44b0ba35e --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-gpio-log@.service @@ -0,0 +1,8 @@ +[Unit] +Description=%i GPIO Assert + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/catalina-gpio-monitor %i assert + +SyslogIdentifier=%i-gpio-assert diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-reset-button.service b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-reset-button.service new file mode 100644 index 0000000000..89a6b3f8d7 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-reset-button.service @@ -0,0 +1,8 @@ +[Unit] +Description=Assert ID_RST_BTN_BMC_N + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/catalina-gpio-monitor ID_RST_BTN_BMC_N assert + +SyslogIdentifier=assert-run-power-pg diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-run-power-pg.service b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-run-power-pg.service new file mode 100644 index 0000000000..e8a1e2438e --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/assert-run-power-pg.service @@ -0,0 +1,8 @@ +[Unit] +Description=Assert RUN_POWER_PG + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/catalina-gpio-monitor RUN_POWER_PG assert + +SyslogIdentifier=assert-run-power-pg diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/catalina-gpio-monitor b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/catalina-gpio-monitor new file mode 100644 index 0000000000..779d856bb1 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/catalina-gpio-monitor @@ -0,0 +1,91 @@ +#!/bin/bash +# shellcheck source=meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions +source /usr/libexec/fb-common-functions + +GPIO_HIGH=1 +GPIO_LOW=0 + +LINENAME="$1" +STATE="$2" + +logging() +{ + MESSAGE="$1" + SEVERITY="$2" + busctl call \ + xyz.openbmc_project.Logging /xyz/openbmc_project/logging \ + xyz.openbmc_project.Logging.Create Create "ssa{ss}" \ + "$MESSAGE" "$SEVERITY" 0 +} + +log_error() +{ + logging "$1" "xyz.openbmc_project.Logging.Entry.Level.Error" +} + +log_info() +{ + logging "$1" "xyz.openbmc_project.Logging.Entry.Level.Informational" +} + + +do_RUN_POWER_PG_change() +{ + if [ "$STATE" = "assert" ]; then + set_gpio "PCI_MUX_SEL" "$GPIO_HIGH" + busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host CurrentHostState s xyz.openbmc_project.State.Host.HostState.Running + else + set_gpio "PCI_MUX_SEL" "$GPIO_LOW" + busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host CurrentHostState s xyz.openbmc_project.State.Host.HostState.Off + fi +} + +do_ID_RST_BTN_BMC_N_change() +{ + if [ "$STATE" = "assert" ]; then + set_gpio "RST_BMC_RSTBTN_OUT_N" "$GPIO_HIGH" + else + set_gpio "RST_BMC_RSTBTN_OUT_N" "$GPIO_LOW" + fi +} + +do_leak_detect_change() +{ + if [ "$STATE" = "assert" ]; then + LOG_MSG="leak has been detected" + else + LOG_MSG="leak has been recoverd" + fi + + case "$LINENAME" in + "LEAK0_DETECT_R" | "LEAK2_DETECT_R") + LOG_MSG="A large $LOG_MSG at location $LINENAME" + ;; + "LEAK1_DETECT_R" | "LEAK3_DETECT_R") + LOG_MSG="A small $LOG_MSG at location $LINENAME" + ;; + *) + return 0 + ;; + esac + + if [ "$STATE" = "assert" ]; then + log_error "$LOG_MSG" + else + log_info "$LOG_MSG" + fi +} + +case $LINENAME in + "RUN_POWER_PG" | "ID_RST_BTN_BMC_N") + FUNC_NAME="do_${LINENAME}_change" + "$FUNC_NAME" + ;; + "LEAK0_DETECT_R" | "LEAK1_DETECT_R" | "LEAK2_DETECT_R" | "LEAK3_DETECT_R") + do_leak_detect_change + ;; + *) + echo "Unknown LINENAME = $LINENAME" + exit 1 + ;; +esac diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-gpio-log@service b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-gpio-log@service new file mode 100644 index 0000000000..5767e1f9f0 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-gpio-log@service @@ -0,0 +1,8 @@ +[Unit] +Description=Deassert %i + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/catalina-gpio-monitor %i deassert + +SyslogIdentifier=deassert-%i diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-reset-button.service b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-reset-button.service new file mode 100644 index 0000000000..f822b2f0fd --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-reset-button.service @@ -0,0 +1,8 @@ +[Unit] +Description=Deassert ID_RST_BTN_BMC_N + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/catalina-gpio-monitor ID_RST_BTN_BMC_N deassert + +SyslogIdentifier=deassert-run-power-pg diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-run-power-pg.service b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-run-power-pg.service new file mode 100644 index 0000000000..4301e89a10 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-run-power-pg.service @@ -0,0 +1,8 @@ +[Unit] +Description=Deassert RUN_POWER_PG + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/catalina-gpio-monitor RUN_POWER_PG deassert + +SyslogIdentifier=deassert-run-power-pg diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json new file mode 100644 index 0000000000..42d458a2cf --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json @@ -0,0 +1,62 @@ +[ + { + "Name": "RUN_POWER_PG", + "LineName": "RUN_POWER_PG", + "EventMon": "BOTH", + "Targets": { + "RISING": ["assert-run-power-pg.service"], + "FALLING": ["deassert-run-power-pg.service"] + }, + "Continue": true + }, + { + "Name": "ID_RST_BTN_BMC_N", + "LineName": "ID_RST_BTN_BMC_N", + "EventMon": "BOTH", + "Targets": { + "RISING": ["assert-reset-button.service"], + "FALLING": ["deassert-reset-button.service"] + }, + "Continue": true + }, + { + "Name": "LEAK0_DETECT_R", + "LineName": "LEAK0_DETECT_R", + "EventMon": "BOTH", + "Targets": { + "RISING": ["assert-gpio-log@LEAK0_DETECT_R.service"], + "FALLING": ["deassert-gpio-log@LEAK0_DETECT_R.service"] + }, + "Continue": true + }, + { + "Name": "LEAK1_DETECT_R", + "LineName": "LEAK1_DETECT_R", + "EventMon": "BOTH", + "Targets": { + "RISING": ["assert-gpio-log@LEAK1_DETECT_R.service"], + "FALLING": ["deassert-gpio-log@LEAK1_DETECT_R.service"] + }, + "Continue": true + }, + { + "Name": "LEAK2_DETECT_R", + "LineName": "LEAK2_DETECT_R", + "EventMon": "BOTH", + "Targets": { + "RISING": ["assert-gpio-log@LEAK2_DETECT_R.service"], + "FALLING": ["deassert-gpio-log@LEAK2_DETECT_R.service"] + }, + "Continue": true + }, + { + "Name": "LEAK3_DETECT_R", + "LineName": "LEAK3_DETECT_R", + "EventMon": "BOTH", + "Targets": { + "RISING": ["assert-gpio-log@LEAK3_DETECT_R.service"], + "FALLING": ["deassert-gpio-log@LEAK3_DETECT_R.service"] + }, + "Continue": true + } +] diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-presence.json b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-presence.json new file mode 100644 index 0000000000..f4f73feff7 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-presence.json @@ -0,0 +1,99 @@ +[ + { + "Name": "Fan0", + "LineName": "FAN_0_PRESENT_N", + "ActiveLow": true, + "Inventory": "/system/chassis/Catalina/Fan0" + }, + { + "Name": "Fan1", + "LineName": "FAN_1_PRESENT_N", + "ActiveLow": true, + "Inventory": "/system/chassis/Catalina/Fan1" + }, + { + "Name": "Fan2", + "LineName": "FAN_2_PRESENT_N", + "ActiveLow": true, + "Inventory": "/system/chassis/Catalina/Fan2" + }, + { + "Name": "Fan3", + "LineName": "FAN_3_PRESENT_N", + "ActiveLow": true, + "Inventory": "/system/chassis/Catalina/Fan3" + }, + { + "Name": "Fan4", + "LineName": "FAN_4_PRESENT_N", + "ActiveLow": true, + "Inventory": "/system/chassis/Catalina/Fan4" + }, + { + "Name": "Fan5", + "LineName": "FAN_5_PRESENT_N", + "ActiveLow": true, + "Inventory": "/system/chassis/Catalina/Fan5" + }, + { + "Name": "Fan6", + "LineName": "FAN_6_PRESENT_N", + "ActiveLow": true, + "Inventory": "/system/chassis/Catalina/Fan6" + }, + { + "Name": "Fan6", + "LineName": "FAN_7_PRESENT_N", + "ActiveLow": true, + "Inventory": "/system/chassis/Catalina/Fan7" + }, + { + "Name": "LeakCable0", + "LineName": "PRSNT_CHASSIS0_LEAK_CABLE_R_N", + "ActiveLow": true, + "Inventory": "/system/chassis/compute_tray/cable/LeakCable0", + "ExtraInterfaces": ["xyz.openbmc_project.Inventory.Item.Cable"] + }, + { + "Name": "LeakCable1", + "LineName": "PRSNT_CHASSIS1_LEAK_CABLE_R_N", + "ActiveLow": true, + "Inventory": "/system/chassis/compute_tray/cable/LeakCable1", + "ExtraInterfaces": ["xyz.openbmc_project.Inventory.Item.Cable"] + }, + { + "Name": "LeakCable2", + "LineName": "PRSNT_CHASSIS2_LEAK_CABLE_R_N", + "ActiveLow": true, + "Inventory": "/system/chassis/compute_tray/cable/LeakCable2", + "ExtraInterfaces": ["xyz.openbmc_project.Inventory.Item.Cable"] + }, + { + "Name": "LeakCable3", + "LineName": "PRSNT_CHASSIS3_LEAK_CABLE_R_N", + "ActiveLow": true, + "Inventory": "/system/chassis/compute_tray/cable/LeakCable3", + "ExtraInterfaces": ["xyz.openbmc_project.Inventory.Item.Cable"] + }, + { + "Name": "OSFPPowerCable", + "LineName": "PRSNT_OSFP_POWER_CABLE_N", + "ActiveLow": true, + "Inventory": "/system/chassis/compute_tray/cable/OSFPPowerCable", + "ExtraInterfaces": ["xyz.openbmc_project.Inventory.Item.Cable"] + }, + { + "Name": "HDDPowerCable", + "LineName": "PRSNT_HDDBD_POWER_CABLE_N", + "ActiveLow": true, + "Inventory": "/system/chassis/compute_tray/cable/HDDPowerCable", + "ExtraInterfaces": ["xyz.openbmc_project.Inventory.Item.Cable"] + }, + { + "Name": "FIORJ45Cable", + "LineName": "PRSNT_RJ45_FIO_N_R", + "ActiveLow": true, + "Inventory": "/system/chassis/compute_tray/cable/FIORJ45Cable", + "ExtraInterfaces": ["xyz.openbmc_project.Inventory.Item.Cable"] + } +] diff --git a/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend new file mode 100644 index 0000000000..1fce94b731 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -0,0 +1,32 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +inherit obmc-phosphor-systemd systemd + +SRC_URI += " \ + file://catalina-gpio-monitor \ + file://phosphor-multi-gpio-monitor.json \ + " + +RDEPENDS:${PN}:append = " bash" + +FILES:${PN} += "${systemd_system_unitdir}/*" + +SYSTEMD_SERVICE:${PN}-monitor += " \ + assert-reset-button.service \ + assert-run-power-pg.service \ + deassert-reset-button.service \ + deassert-run-power-pg.service \ + " + +SYSTEMD_AUTO_ENABLE = "enable" + +do_install:append:() { + install -d ${D}${datadir}/${PN} + install -d ${D}${libexecdir}/${PN} + + install -m 0644 ${WORKDIR}/phosphor-multi-gpio-monitor.json \ + ${D}${datadir}/${PN}/phosphor-multi-gpio-monitor.json + install -m 0644 ${WORKDIR}/phosphor-multi-gpio-presence.json \ + ${D}${datadir}/${PN}/phosphor-multi-gpio-presence.json + install -m 0755 ${WORKDIR}/catalina-gpio-monitor ${D}${libexecdir}/${PN}/catalina-gpio-monitor +} diff --git a/meta-facebook/meta-catalina/recipes-phosphor/health/phosphor-health-monitor_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/health/phosphor-health-monitor_%.bbappend new file mode 100644 index 0000000000..6a04728951 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/health/phosphor-health-monitor_%.bbappend @@ -0,0 +1 @@ +CPU_CRIT_TGT = "" diff --git a/meta-facebook/meta-catalina/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/host/phosphor-host-postd_%.bbappend new file mode 100644 index 0000000000..6e2f476085 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/host/phosphor-host-postd_%.bbappend @@ -0,0 +1 @@ +SNOOP_DEVICE = "" diff --git a/meta-facebook/meta-catalina/recipes-phosphor/images/fb-catalina-phosphor-image.inc b/meta-facebook/meta-catalina/recipes-phosphor/images/fb-catalina-phosphor-image.inc new file mode 100644 index 0000000000..77bd70b50a --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/images/fb-catalina-phosphor-image.inc @@ -0,0 +1,18 @@ +# Catalina Image configuration. + +# Enable obmc-phosphor-buttons which needed by debug card function. +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + obmc-phosphor-buttons-signals \ + obmc-phosphor-buttons-handler \ +" + +# Monitor presence gpio status +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + phosphor-gpio-monitor \ + phosphor-gpio-monitor-presence \ +" + +# Catalina platform services +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + plat-svc \ +" diff --git a/meta-facebook/meta-catalina/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bbappend new file mode 100644 index 0000000000..a718b14f7b --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" +SOURCE_FILES:append = " 99-platform-init"
\ No newline at end of file diff --git a/meta-facebook/meta-catalina/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init b/meta-facebook/meta-catalina/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init new file mode 100644 index 0000000000..d9def86a2a --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init @@ -0,0 +1,23 @@ +#bin/sh + +# Create /dev/mem +if [ ! -c /dev/mem ]; then + /bin/mknod /dev/mem c 1 1 +fi + +# Disable FMC_WDT2 +FMC_WDT2_CTRL_VAL=$(/sbin/devmem 0x1e620064) +FMC_WDT2_CTRL_VAL=$((16#${FMC_WDT2_CTRL_VAL#"0x"})) +SET_VAL=$((FMC_WDT2_CTRL_VAL & 0xFFFFFFFE)) +/sbin/devmem 0x1e620064 32 "$SET_VAL" + +# Detect boot flash source +SLOT_FILE="/run/media/slot" +mkdir -p "$(dirname "${SLOT_FILE}")" +if [ "$((FMC_WDT2_CTRL_VAL & 0x00000010))" != "0" ]; then + echo "1" > "$SLOT_FILE" +else + echo "0" > "$SLOT_FILE" +fi + +exit 0 diff --git a/meta-facebook/meta-catalina/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/interfaces/bmcweb_%.bbappend new file mode 100644 index 0000000000..30b7e83552 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -0,0 +1,5 @@ +# Temporarily enable redfish aggregation until Redfish Client is +# written and supported. +EXTRA_OEMESON:append = "\ + -Dredfish-aggregation=enabled \ +" diff --git a/meta-facebook/meta-catalina/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 0000000000..7beee05eb4 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,4 @@ +#remove xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service +SOFT_SVC = "" +SOFT_TGTFMT = "" +SOFT_FMT = "" diff --git a/meta-facebook/meta-catalina/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend new file mode 100644 index 0000000000..a51e34d852 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend @@ -0,0 +1,6 @@ +IPMB_CHANNELS = "\ + /dev/ipmb-7 \ + " +IPMB_REMOTE_ADDR = "\ + 96 \ + " diff --git a/meta-facebook/meta-catalina/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-facebook/meta-catalina/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json new file mode 100644 index 0000000000..7247bb72c3 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json @@ -0,0 +1,28 @@ +{ + "leds": [ + { + "group" : "bmc_booted", + "members" : [ + { + "Name" : "bmc_heartbeat_amber", + "Action" : "Blink", + "Priority" : "Blink", + "DutyOn" : 50, + "Period" : 1000 + } + ] + }, + { + "group": "enclosure_identify", + "members": [ + { + "Name": "fp_id_amber", + "Action": "Blink", + "Priority" : "Blink", + "DutyOn": 50, + "Period": 1000 + } + ] + } + ] +} diff --git a/meta-facebook/meta-catalina/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/leds/phosphor-led-manager_%.bbappend new file mode 100644 index 0000000000..b4cbc0287c --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append = " file://led-group-config.json" + +# Power led is handled by CPLD. +CHASSIS_TARGETS = "" + +do_install:append() { + install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/ +} diff --git a/meta-facebook/meta-catalina/recipes-phosphor/network/phosphor-network/00-hmc-usb0.network b/meta-facebook/meta-catalina/recipes-phosphor/network/phosphor-network/00-hmc-usb0.network new file mode 100644 index 0000000000..ad93bc4bab --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/network/phosphor-network/00-hmc-usb0.network @@ -0,0 +1,13 @@ +[Match] +Driver=cdc_ether + +[Link] +Name=usb0 + +[Network] +DHCP=false +LinkLocalAddressing=no +IPv6AcceptRA=false + +[Address] +Address=172.31.13.241/24 diff --git a/meta-facebook/meta-catalina/recipes-phosphor/network/phosphor-network/90-hmc-usb0-network.rules b/meta-facebook/meta-catalina/recipes-phosphor/network/phosphor-network/90-hmc-usb0-network.rules new file mode 100644 index 0000000000..5e5e310bc2 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/network/phosphor-network/90-hmc-usb0-network.rules @@ -0,0 +1 @@ +SUBSYSTEM=="net", SUBSYSTEMS=="usb", ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a2", NAME="usb0" diff --git a/meta-facebook/meta-catalina/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 0000000000..e32c468068 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1,19 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append = " \ + file://00-hmc-usb0.network \ + file://90-hmc-usb0-network.rules \ + " + +FILES:${PN}:append = " \ + ${systemd_unitdir}/network/00-hmc-usb0.network \ + ${sysconfdir}/udev/rules.d/90-hmc-usb0-network.rules \ + " + +do_install:append() { + install -d ${D}${systemd_unitdir}/network/ + install -m 0644 ${WORKDIR}/00-hmc-usb0.network ${D}${systemd_unitdir}/network/00-hmc-usb0.network + + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/90-hmc-usb0-network.rules ${D}${sysconfdir}/udev/rules.d/90-hmc-usb0-network.rules +} diff --git a/meta-facebook/meta-catalina/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/sensors/dbus-sensors_%.bbappend new file mode 100644 index 0000000000..a7c4a546c3 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +PACKAGECONFIG = " \ + adcsensor \ + hwmontempsensor \ + psusensor \ + nvmesensor \ + fansensor \ +" diff --git a/meta-facebook/meta-catalina/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-facebook/meta-catalina/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json new file mode 100644 index 0000000000..0d4f101c7a --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json @@ -0,0 +1,2 @@ +[ +] diff --git a/meta-facebook/meta-catalina/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 0000000000..5edbc327df --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append = " file://virtual_sensor_config.json " diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-power-state-init b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-power-state-init new file mode 100644 index 0000000000..d2f8912c5c --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-power-state-init @@ -0,0 +1,16 @@ +#!/bin/bash + +busctl set-property \ + xyz.openbmc_project.State.Chassis0 \ + /xyz/openbmc_project/state/chassis0 \ + xyz.openbmc_project.State.Chassis \ + CurrentPowerState s \ + xyz.openbmc_project.State.Chassis.PowerState.On + +busctl set-property \ + xyz.openbmc_project.State.Chassis0 \ + /xyz/openbmc_project/state/chassis0 \ + xyz.openbmc_project.State.Chassis \ + CurrentPowerStatus s \ + xyz.openbmc_project.State.Chassis.PowerStatus.Good + diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-power-state-init.conf b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-power-state-init.conf new file mode 100644 index 0000000000..132a42fb47 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-power-state-init.conf @@ -0,0 +1,3 @@ +[Service] +ExecStartPre=/usr/libexec/phosphor-state-manager/chassis-power-state-init + diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle new file mode 100644 index 0000000000..1be59f8b9c --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle @@ -0,0 +1,12 @@ +#!/bin/bash + +# shellcheck source=meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/power-cmd +source /usr/libexec/phosphor-state-manager/power-cmd + +if ! chassis_power_cycle; then + phosphor_log_err "chassis power cycle failed" + exit 1 +fi + +phosphor_log_info "chassis power cycle success" +exit 0 diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle@.service b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle@.service new file mode 100644 index 0000000000..1060a5c9ec --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Chassis Power Cycle: %i +Before=obmc-chassis-powercycle@%i.target + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-state-manager/chassis-powercycle %i + +[Install] +RequiredBy=obmc-chassis-powercycle@%i.target diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-poweron b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-poweron new file mode 100644 index 0000000000..e7e49a6885 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-poweron @@ -0,0 +1,12 @@ +#!/bin/bash + +# shellcheck source=meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/power-cmd +source /usr/libexec/phosphor-state-manager/power-cmd + +if ! chassis_power_on; then + phosphor_log_err "chassis power on failed" + exit 1 +fi + +phosphor_log_info "chassis power on success" +exit 0 diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service new file mode 100644 index 0000000000..56aa080618 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/chassis-poweron@.service @@ -0,0 +1,10 @@ +[Unit] +Description=power on chassis:%i +Before=obmc-chassis-poweron@%i.target + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-state-manager/chassis-poweron %i + +[Install] +RequiredBy=obmc-chassis-poweron@%i.target diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-force-poweroff b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-force-poweroff new file mode 100644 index 0000000000..8e98171dcf --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-force-poweroff @@ -0,0 +1,12 @@ +#!/bin/bash + +# shellcheck source=meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/power-cmd +source /usr/libexec/phosphor-state-manager/power-cmd + +if ! host_force_power_off; then + phosphor_log_err "host force power off failed" + exit 1 +fi + +phosphor_log_info "host force power off success" +exit 0
\ No newline at end of file diff --git a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/host-force-poweroff@.service b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-force-poweroff@.service index 062d4f2098..062d4f2098 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/host-force-poweroff@.service +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-force-poweroff@.service diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-graceful-poweroff b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-graceful-poweroff new file mode 100644 index 0000000000..d41589668b --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-graceful-poweroff @@ -0,0 +1,12 @@ +#!/bin/bash + +# shellcheck source=meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/power-cmd +source /usr/libexec/phosphor-state-manager/power-cmd + +if ! host_graceful_power_off; then + phosphor_log_err "host graceful power off failed" + exit 1 +fi + +phosphor_log_info "host graceful power off success" +exit 0
\ No newline at end of file diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-graceful-poweroff@.service b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-graceful-poweroff@.service new file mode 100644 index 0000000000..c8af4ee700 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-graceful-poweroff@.service @@ -0,0 +1,15 @@ +[Unit] +Description=power off host:%i +Wants=obmc-host-stop-pre@%i.target +Before=obmc-host-stop-pre@%i.target +Conflicts=obmc-host-start@%i.target +ConditionPathExists=!/run/openbmc/host@%i-request + +[Service] +Restart=no +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/libexec/phosphor-state-manager/host-graceful-poweroff %i + +[Install] +WantedBy=obmc-host-shutdown@%i.target diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-poweron b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-poweron new file mode 100644 index 0000000000..9840932ede --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-poweron @@ -0,0 +1,12 @@ +#!/bin/bash + +# shellcheck source=meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/power-cmd +source /usr/libexec/phosphor-state-manager/power-cmd + +if ! host_power_on; then + phosphor_log_err "host power on failed" + exit 1 +fi + +phosphor_log_info "host power on success" +exit 0 diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-poweron@.service b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-poweron@.service new file mode 100644 index 0000000000..17b875f1a5 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/host-poweron@.service @@ -0,0 +1,22 @@ +[Unit] +Description=power on host:%i +Wants=obmc-host-start-pre@%i.target +After=obmc-host-start-pre@%i.target +Wants=obmc-host-starting@%i.target +Before=obmc-host-starting@%i.target +Before=obmc-host-started@%i.target +Wants=obmc-power-on@%i.target +After=obmc-power-on@%i.target +Conflicts=obmc-host-stop@%i.target +Wants=phosphor-set-host-transition-to-running@service +Before=phosphor-set-host-transition-to-running@service +ConditionPathExists=!/run/openbmc/host@%i-on + +[Service] +Restart=no +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/libexec/phosphor-state-manager/host-poweron %i + +[Install] +RequiredBy=obmc-host-startmin@%i.target diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/phosphor-wait-power-off@.service b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/phosphor-wait-power-off@.service new file mode 100644 index 0000000000..d3d68297e6 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/phosphor-wait-power-off@.service @@ -0,0 +1,19 @@ +[Unit] +Description=Wait for Power%i to turn off +Before=obmc-power-off@%i.target +Wants=obmc-power-stop@%i.target +Before=obmc-power-stop@%i.target +Wants=obmc-power-stop-pre@%i.target +After=obmc-power-stop-pre@%i.target +Conflicts=obmc-chassis-poweron@%i.target + +[Service] +Type=oneshot +RemainAfterExit=yes +# This is wrong, but at least gives us something since we're not using +# skeleton. +ExecStart=sleep 10 +ExecStart=/bin/rm -f /run/openbmc/host@%i-request + +[Install] +RequiredBy=obmc-host-stop@%i.target diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/power-cmd b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/power-cmd new file mode 100644 index 0000000000..fc2ae92660 --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager/power-cmd @@ -0,0 +1,153 @@ +#!/bin/bash + +# shellcheck source=meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions +source /usr/libexec/fb-common-functions + +phosphor_log() { + busctl call \ + xyz.openbmc_project.Logging \ + /xyz/openbmc_project/logging \ + xyz.openbmc_project.Logging.Create \ + Create "ssa{ss}" "$1" "$2" 0 +} + +phosphor_log_err() { + local msg=$1 + local logErr="xyz.openbmc_project.Logging.Entry.Level.Error" + phosphor_log "$msg" "$logErr" +} + +phosphor_log_info() { + local msg=$1 + local logInfo="xyz.openbmc_project.Logging.Entry.Level.Informational" + phosphor_log "$msg" "$logInfo" +} + +chassis_power_cycle_ltc4287() +{ + if ! i2cset -f -y 20 0x42 0xfd 0x04; then + echo "48V HSC1 set reboot delay failed" + return 1 + fi + + if ! i2cset -f -y 20 0x43 0xfd 0x04; then + echo "48V HSC2 set reboot delay failed" + return 1 + fi + + if ! i2cset -f -y 20 0x42 0xfd 0x0c; then + echo "48V HSC1 set reboot bit failed" + return 1 + fi + + if ! i2cset -f -y 20 0x43 0xfd 0x0c; then + echo "48V HSC2 set reboot bit failed" + return 1 + fi + + return 0 +} + +chassis_power_cycle() +{ + chassis_power_cycle_ltc4287 + return $? +} + +chassis_power_on() +{ + # MB stabdby power should enabled by before BMC ready + # So only do checking here. + if [ "$(chassis_power_status)" != "on" ]; then + return 1 + fi + return 0 +} + +chassis_power_status() +{ + if [ "$(get_gpio "STBY_POWER_PG_3V3")" -eq 1 ]; then + echo "on" + else + echo "off" + fi +} + +host_power_on() +{ + if [ "$(host_power_status)" == "off" ]; then + press_host_power_button 1 + if ! wait_host_power_on; then + return 1 + fi + fi + return 0 +} + +host_force_power_off() +{ + if [ "$(host_power_status)" == "on" ]; then + press_host_power_button 6 + if ! wait_host_power_off; then + return 1 + fi + fi + return 0 +} + +host_graceful_power_off() +{ + if [ "$(host_power_status)" == "on" ]; then + press_host_power_button 1 + if ! wait_host_power_off; then + return 1 + fi + fi + return 0 +} + +host_power_status() +{ + if [ "$(get_gpio "host0-ready")" -eq 1 ]; then + echo "on" + else + echo "off" + fi +} + +press_host_power_button() +{ + local press_delay_sec="$1" + set_gpio "SYS_BMC_PWRBTN_R_N" 1 + set_gpio "SYS_BMC_PWRBTN_R_N" 0 + sleep "$press_delay_sec" + set_gpio "SYS_BMC_PWRBTN_R_N" 1 +} + +wait_host_power_change() +{ + local exp_val="$1" + local count=0 + until [ $count -gt 10 ] + do + sleep 1 + if [ "$(host_power_status)" == "$exp_val" ]; then + return 0 + fi + ((count++)) + done + + return 1 +} + +wait_host_power_on() +{ + wait_host_power_change "on" + return $? +} + +wait_host_power_off() +{ + wait_host_power_change "off" + return $? +}
\ No newline at end of file diff --git a/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager_%.bbappend new file mode 100644 index 0000000000..036473ef5c --- /dev/null +++ b/meta-facebook/meta-catalina/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -0,0 +1,135 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +#=============================================================================== +# TODO: need to be removed once patch merged. +# meta-facebook: phosphor-state-manager: refactor targets and relationships +# https://gerrit.openbmc.org/c/openbmc/openbmc/+/69903 + +PACKAGECONFIG:remove = "only-run-apr-on-power-loss" + +# The host-graceful-poweroff service replaces the `pldmSoftPowerOff` and +# `xyz.openbmc_project.Ipmi.Internal.SoftPowerOff` services to gracefully +# shutdown the host. +HOST_DEFAULT_TARGETS:append = " \ + obmc-host-shutdown@{}.target.requires/host-graceful-poweroff@{}.service \ + obmc-host-warm-reboot@{}.target.requires/host-graceful-poweroff@{}.service \ + " + +# The "warm-reboot" is what does the graceful shutdown operation and the +# normal "reboot" is suppose to do a forced reboot. `host-shutdown` is used +# as part of the graceful shutdown path, which we want to skip in a normal +# reboot, so remove the dependency. The `phosphor-reboot-host@.service` does +# continue to be in `obmc-host-reboot` requirements and it depends on +# `obmc-host-stop`, which will initiate a `host-force-poweroff`. +HOST_DEFAULT_TARGETS:remove = " \ + obmc-host-reboot@{}.target.requires/obmc-host-shutdown@{}.service \ + " + +# The host-poweron service is the equivalent to the start_host@ service +# from meta-openpower. +HOST_DEFAULT_TARGETS:append = " \ + obmc-host-startmin@{}.target.requires/host-poweron@{}.service \ + " + +# The host-stop service is called as a side-effect of force-warm-reboot and is +# expected to force-stop the processors. They will be restarted in the +# subsequent `obmc-host-reboot` (which calls `host-startmin`) +HOST_DEFAULT_TARGETS:append = " \ + obmc-host-stop@{}.target.requires/host-force-poweroff@{}.service \ + " + +# Add services for the chassis power operations. +CHASSIS_DEFAULT_TARGETS:append = " \ + obmc-chassis-poweron@{}.target.requires/chassis-poweron@{}.service \ + obmc-chassis-hard-poweroff@{}.target.requires/chassis-poweroff@{}.service \ + obmc-chassis-powercycle@{}.target.requires/chassis-powercycle@{}.service \ + " + +# We don't use the obmc-power-start or obmc-power-stop, which use the +# `org.openbmc` interface but instead install our own chassis-poweron and +# chassis-poweroff. +CHASSIS_DEFAULT_TARGETS:remove = " \ + obmc-chassis-poweron@{}.target.requires/obmc-power-start@{}.service \ + obmc-chassis-poweroff@{}.target.requires/obmc-power-stop@{}.service \ + " + +# The obmc-chassis-powerreset target is used to determine the state of the host +# when the BMC resets (to handle cases where the BMC reset while the host is +# running). The default implementation of these relies on `org.openbmc` +# interfaces we do not implement, so we need to remove them. +CHASSIS_DEFAULT_TARGETS:remove = " \ + obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-on@{}.service \ + obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-running@{}.service \ + " + +RDEPENDS:${PN}:append = " bash" + +FILES:${PN} += "${systemd_system_unitdir}/*.service" +FILES:${PN} += "${libexecdir}/${PN}" + +CHASSIS_DEFAULT_TARGETS:remove = " \ + obmc-chassis-poweron@{}.target.wants/chassis-poweron@{}.service \ + obmc-chassis-hard-poweroff@{}.target.wants/chassis-poweroff@{}.service \ + obmc-chassis-powercycle@{}.target.wants/chassis-powercycle@{}.service \ +" + +HOST_DEFAULT_TARGETS:remove = " \ + obmc-host-shutdown@{}.target.wants/host-poweroff@{}.service \ + obmc-host-start@{}.target.wants/host-poweron@{}.service \ + obmc-host-reboot@{}.target.wants/host-powercycle@{}.service \ + obmc-host-force-warm-reboot@{}.target.wants/host-powerreset@{}.service \ +" +#=============================================================================== + +RDEPENDS:${PN}:append = " bash" +PACKAGECONFIG:append = " host-gpio" + +SRC_URI:append = " \ + file://chassis-power-state-init \ + file://chassis-power-state-init.conf \ + file://chassis-powercycle \ + file://chassis-powercycle@.service \ + file://chassis-poweron \ + file://chassis-poweron@.service \ + file://host-force-poweroff \ + file://host-force-poweroff@.service \ + file://host-graceful-poweroff \ + file://host-graceful-poweroff@.service \ + file://host-poweron \ + file://host-poweron@.service \ + file://power-cmd \ + file://phosphor-wait-power-off@.service \ + " + +# Catalina chassis off is host force off +CHASSIS_DEFAULT_TARGETS:remove = " \ + obmc-chassis-hard-poweroff@{}.target.requires/chassis-poweroff@{}.service \ + " +CHASSIS_DEFAULT_TARGETS:append = " \ + obmc-chassis-hard-poweroff@{}.target.requires/host-force-poweroff@{}.service \ + " + +#We need to ensure that the chassis power is always on. +CHASSIS_DEFAULT_TARGETS:remove = " \ + obmc-host-shutdown@{}.target.requires/obmc-chassis-poweroff@{}.target \ + " +HARD_OFF_TMPL_CTRL="" +HARD_OFF_TGTFMT_CTRL="" +HARD_OFF_FMT_CTRL="" +HARD_OFF_INSTFMT_CTRL="" + +do_install:append() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}/ + + install -d ${D}${libexecdir}/${PN} + install -m 0755 ${WORKDIR}/chassis-power-state-init ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/host-force-poweroff ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/host-graceful-poweroff ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/host-poweron ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/power-cmd ${D}${libexecdir}/${PN}/ +} + +SYSTEMD_OVERRIDE:${PN}-host += "chassis-power-state-init.conf:xyz.openbmc_project.State.Host@0.service.d/chassis-power-state-init.conf" diff --git a/meta-facebook/meta-harma/conf/machine/harma.conf b/meta-facebook/meta-harma/conf/machine/harma.conf index 3beb5e19f5..be5086a0d4 100644 --- a/meta-facebook/meta-harma/conf/machine/harma.conf +++ b/meta-facebook/meta-harma/conf/machine/harma.conf @@ -4,7 +4,7 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb" UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" -UBOOT_DEVICETREE = "ast2600-bletchley" +UBOOT_DEVICETREE = "ast2600-facebook" SPL_BINARY = "spl/u-boot-spl.bin" SOCSEC_SIGN_ENABLE = "0" @@ -12,6 +12,7 @@ SOCSEC_SIGN_ENABLE = "0" OBMC_COMPATIBLE_NAMES = "com.meta.Hardware.BMC.Model.Harma" require conf/distro/include/phosphor-static-norootfs.inc +require conf/distro/include/pldm.inc require conf/machine/include/facebook-compute-singlehost.inc require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc diff --git a/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg index c49f3f855e..4c83fe4af2 100644 --- a/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg +++ b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg @@ -74,9 +74,21 @@ CONFIG_AD5272=y CONFIG_MCP9600=y # APML -CONFIG_I3C=y CONFIG_APML_SBRMI=y CONFIG_APML_SBTSI=y +# I3C drivers +CONFIG_I3C=y +CONFIG_DW_I3C_MASTER=y +CONFIG_AST2600_I3C_MASTER=y + # SPI GPIO CONFIG_SPI_GPIO=y + +# I2C mqueue for mctp +CONFIG_I2C_SLAVE_MQUEUE=m +CONFIG_I2C_SLAVE_MQUEUE_QUEUE_SIZE=32 +CONFIG_I2C_SLAVE_MQUEUE_MESSAGE_SIZE=256 + +# RTC sensor +CONFIG_RTC_DRV_PCF8563=y diff --git a/meta-facebook/meta-harma/recipes-networking/mctp/files/setup-bic-eid b/meta-facebook/meta-harma/recipes-networking/mctp/files/setup-bic-eid new file mode 100644 index 0000000000..da51310abc --- /dev/null +++ b/meta-facebook/meta-harma/recipes-networking/mctp/files/setup-bic-eid @@ -0,0 +1,39 @@ +#!/bin/bash + +# Set BIC EID +bic_addr=0x20 +busnum=9 +maxRetries=10 +retryInterval=1 + +retry_command() { + + command="$1" + retries=0 + + while [ $retries -lt $maxRetries ]; do + if bash -c "$command"; then + return 0 + else + retries=$((retries + 1)) + echo "Retry $retries/$maxRetries: Command failed. Retrying in $retryInterval seconds..." + sleep $retryInterval + fi + done + + return 1 +} + +command=" + busctl call xyz.openbmc_project.MCTP \ + /xyz/openbmc_project/mctp \ + au.com.CodeConstruct.MCTP \ + LearnEndpoint \ + say mctpi2c${busnum} 1 ${bic_addr}" + +if ! retry_command "$command"; then + echo "Failed to busctl call after $maxRetries attempts." + exit 1 +fi +echo "BIC EID set to ${bic_addr}" +exit 0
\ No newline at end of file diff --git a/meta-facebook/meta-harma/recipes-networking/mctp/files/setup-eid.conf b/meta-facebook/meta-harma/recipes-networking/mctp/files/setup-eid.conf new file mode 100644 index 0000000000..3074382d2d --- /dev/null +++ b/meta-facebook/meta-harma/recipes-networking/mctp/files/setup-eid.conf @@ -0,0 +1,9 @@ +[Unit] +After=mctpd.service +Requires=mctpd.service + +[Service] +ExecStartPre=-/usr/libexec/mctp/setup-local-eid +ExecStartPost=-/usr/libexec/mctp/setup-bic-eid +Restart=always +RestartSec=10 diff --git a/meta-facebook/meta-harma/recipes-networking/mctp/files/setup-local-eid b/meta-facebook/meta-harma/recipes-networking/mctp/files/setup-local-eid new file mode 100644 index 0000000000..a72606fcf2 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-networking/mctp/files/setup-local-eid @@ -0,0 +1,45 @@ +#!/bin/bash + +# Set mctpi2c link up and assign local address. +localEid=8 +busNum=9 +maxRetries=5 +retryInterval=1 + +retry_command() { + + command="$1" + retries=0 + + while [ $retries -lt $maxRetries ]; do + if bash -c "$command"; then + return 0 + else + retries=$((retries + 1)) + echo "Retry $retries/$maxRetries: Command failed. Retrying in $retryInterval seconds..." + sleep $retryInterval + fi + done + + return 1 +} + +# Retry mctp link command +if ! retry_command "mctp link set mctpi2c${busNum} up"; then + echo "Failed to set mctp link after $maxRetries attempts." + exit 1 +fi + +# Check if local EID is already set +mctpOutput=$(mctp address show) +if echo "$mctpOutput" | grep -q "mctpi2c${busNum}"; then + echo "mctpi2c${busNum} local EID already set" +else + # Retry mctp addr add command + if ! retry_command "mctp addr add ${localEid} dev mctpi2c${busNum}"; then + echo "Failed to add mctp address after $maxRetries attempts." + exit 1 + fi +fi +echo "mctpi2c${busNum} local EID set to ${localEid}" +exit 0
\ No newline at end of file diff --git a/meta-facebook/meta-harma/recipes-networking/mctp/mctp_%.bbappend b/meta-facebook/meta-harma/recipes-networking/mctp/mctp_%.bbappend new file mode 100644 index 0000000000..c33d4da9a1 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-networking/mctp/mctp_%.bbappend @@ -0,0 +1,26 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + + +SRC_URI += " \ + file://setup-eid.conf \ + file://setup-local-eid \ + file://setup-bic-eid \ +" + +RDEPENDS:${PN} += " bash" +FILES:${PN} += "${systemd_system_unitdir}/*" + +do_install:append () { + override_dir=${D}${systemd_system_unitdir}/mctpd.service.d + install -d ${D}${systemd_system_unitdir}/mctpd.service.d + + install -m 0644 ${WORKDIR}/setup-eid.conf \ + ${override_dir}/setup-eid.conf + + install -d ${D}${libexecdir}/mctp + + install -m 0755 ${WORKDIR}/setup-local-eid \ + ${D}${libexecdir}/mctp/ + install -m 0755 ${WORKDIR}/setup-bic-eid \ + ${D}${libexecdir}/mctp/ +} diff --git a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/blacklist.json b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/blacklist.json index a000e689c9..f6789eb5d5 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/blacklist.json +++ b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/blacklist.json @@ -3,8 +3,7 @@ 8, { "bus": 9, - "addresses": ["0x30", "0x31", "0x3F", "0x43", "0x49", "0x4A", "0x4B", "0x4C", "0x71"] - }, - 11 + "addresses": [ "0x20", "0x30", "0x31", "0x3F", "0x43", "0x49", "0x4A", "0x4B", "0x4C", "0x71"] + } ] } diff --git a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/device-driver-probe b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/device-driver-probe index 6eb9643fc1..2d16069822 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/device-driver-probe +++ b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/device-driver-probe @@ -1,22 +1,60 @@ #!/bin/bash -read_mux_dev() { +read_i2c_dev() { + local bus="$1" + local addr="$2" + for _ in {1..3}; do - if /usr/sbin/i2cget -f -y "$1" "$2" 2>/dev/null; then + if /usr/sbin/i2cget -f -y "$bus" "$addr" 2>/dev/null; then return 0 fi done return 1 } -probe_sitv_pttv_mux() { - if read_mux_dev 9 0x71; then +probe_dev() { + echo ina230 0x45 > /sys/bus/i2c/devices/i2c-22/new_device + echo ina230 0x45 > /sys/bus/i2c/devices/i2c-23/new_device + + if read_i2c_dev 9 0x71; then echo pca9546 0x71 > /sys/bus/i2c/devices/i2c-9/new_device - else + elif read_i2c_dev 11 0x71; then echo pca9546 0x71 > /sys/bus/i2c/devices/i2c-11/new_device + else + return + fi + + echo adc128d818 0x1d > /sys/bus/i2c/devices/i2c-36/new_device + echo ina238 0x44 > /sys/bus/i2c/devices/i2c-36/new_device + echo ina238 0x45 > /sys/bus/i2c/devices/i2c-36/new_device + echo MCP9600 0x60 > /sys/bus/i2c/devices/i2c-34/new_device + echo MCP9600 0x62 > /sys/bus/i2c/devices/i2c-34/new_device + echo MCP9600 0x63 > /sys/bus/i2c/devices/i2c-34/new_device + echo MCP9600 0x64 > /sys/bus/i2c/devices/i2c-34/new_device + echo MCP9600 0x65 > /sys/bus/i2c/devices/i2c-34/new_device + echo MCP9600 0x66 > /sys/bus/i2c/devices/i2c-34/new_device + echo MCP9600 0x67 > /sys/bus/i2c/devices/i2c-34/new_device + echo MCP9600 0x64 > /sys/bus/i2c/devices/i2c-35/new_device + echo MCP9600 0x65 > /sys/bus/i2c/devices/i2c-35/new_device + echo MCP9600 0x66 > /sys/bus/i2c/devices/i2c-35/new_device + echo tmp75 0x49 > /sys/bus/i2c/devices/i2c-36/new_device + echo tmp75 0x4A > /sys/bus/i2c/devices/i2c-36/new_device + echo tmp75 0x4B > /sys/bus/i2c/devices/i2c-36/new_device + echo tmp75 0x4C > /sys/bus/i2c/devices/i2c-36/new_device + echo tmp75 0x49 > /sys/bus/i2c/devices/i2c-37/new_device + echo tmp75 0x4A > /sys/bus/i2c/devices/i2c-37/new_device + echo tmp75 0x4B > /sys/bus/i2c/devices/i2c-37/new_device + echo tmp75 0x4C > /sys/bus/i2c/devices/i2c-37/new_device +} + +set_hsc_sample_rate() { + if read_i2c_dev 4 0x44; then + # set ltc4287 sample to 4096/1.16s + i2cset -f -y 4 0x44 0xD9 0x8b fi } -probe_sitv_pttv_mux +probe_dev +set_hsc_sample_rate exit 0 diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/plat-80-obmc-console-uart.rules b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/plat-80-obmc-console-uart.rules index db7919d25c..588640b438 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/plat-80-obmc-console-uart.rules +++ b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/plat-80-obmc-console-uart.rules @@ -1,2 +1,3 @@ SUBSYSTEM=="tty", ATTRS{iomem_base}=="0x1E78F000", ENV{SYSTEMD_WANTS}="obmc-console@ttyS2", TAG+="systemd" SUBSYSTEM=="tty", KERNEL=="ttyUSB1", ENV{SYSTEMD_WANTS}="obmc-console@ttyUSB1", TAG+="systemd" +SUBSYSTEM=="tty", KERNEL=="ttyUSB6", ENV{SYSTEMD_WANTS}="obmc-console@ttyUSB6", TAG+="systemd" diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB6.conf b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB6.conf new file mode 100644 index 0000000000..e3121a7c1d --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB6.conf @@ -0,0 +1,3 @@ +baud = 57600 +console-id = usb6 +logfile = /var/log/obmc-console-usb6.log diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/setup-uart-routing b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/setup-uart-routing index 9df066b72c..ecf3cdf173 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/setup-uart-routing +++ b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/setup-uart-routing @@ -1,8 +1,8 @@ #!/bin/bash connect_uart_route() { - echo -ne "$1" > /sys/devices/platform/ahb/ahb:apb/1e789000.lpc/1e789098.uart-routing/"$2" - echo -ne "$2" > /sys/devices/platform/ahb/ahb:apb/1e789000.lpc/1e789098.uart-routing/"$1" + echo -ne "$1" > /sys/devices/platform/ahb/1e780000.apb/1e789000.lpc/1e789098.uart-routing/"$2" + echo -ne "$2" > /sys/devices/platform/ahb/1e780000.apb/1e789000.lpc/1e789098.uart-routing/"$1" } connect_uart_route "uart1" "uart4" diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/setup-uart-routing.conf b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/setup-uart-routing.conf deleted file mode 100644 index c91a0b1bcd..0000000000 --- a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/setup-uart-routing.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -ExecStartPre=/usr/libexec/obmc-console/setup-uart-routing diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend index e500001bed..3d5942813d 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console_%.bbappend @@ -4,20 +4,13 @@ RDEPENDS:${PN}:append = " bash" inherit obmc-phosphor-systemd SRC_URI:append = " \ - file://setup-uart-routing \ - file://setup-uart-routing.conf \ file://server.ttyUSB1.conf \ + file://server.ttyUSB6.conf \ file://plat-80-obmc-console-uart.rules \ " -do_install:append() { - install -d ${D}${libexecdir}/${PN} - install -m 0755 ${WORKDIR}/setup-uart-routing ${D}${libexecdir}/${PN} -} - -OBMC_CONSOLE_TTYS:append = " ttyUSB1" - -SYSTEMD_OVERRIDE:${PN}:append = " setup-uart-routing.conf:obmc-console@ttyS2.service.d/setup-uart-routing.conf" +OBMC_CONSOLE_TTYS:append = " ttyUSB1 ttyUSB6" +OBMC_SOL_ROUTING = "uart1:uart4 uart4:uart1 io1:uart2 uart2:io1" do_install:append() { install -d ${D}${base_libdir}/udev/rules.d/ diff --git a/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-fan_%.bbappend new file mode 100644 index 0000000000..65d189013d --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend:= "${THISDIR}/${PN}:" + +PACKAGECONFIG:remove = "sensor-monitor" +SYSTEMD_SERVICE:${PN}-sensor-monitor:remove = "sensor-monitor.service" +SYSTEMD_LINK:${PN}-sensor-monitor = "" diff --git a/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control/config.json b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control/config.json new file mode 100644 index 0000000000..8e741cb25c --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control/config.json @@ -0,0 +1,545 @@ +{ + "sensors": [ + { + "name": "MB_CPU_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_CPU_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_DIMM_A0_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A0_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_DIMM_A10_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A10_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_DIMM_A1_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A1_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_DIMM_A2_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A2_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_DIMM_A4_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A4_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_DIMM_A6_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A6_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_DIMM_A7_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A7_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_DIMM_A8_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A8_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_VR_CPU_PDDIO_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU_PDDIO_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_VR_CPU_PVDD11_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU_PVDD11_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_VR_CPU_SOC_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU_SOC_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_VR_CPU_VCORE0_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU_VCORE0_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_VR_CPU_VCORE1_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU_VCORE1_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_RETIMER0_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_RETIMER0_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "MB_RETIMER1_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/MB_RETIMER1_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "NIC_Temp_1", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/NIC_Temp_1", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "SCM_INLET_TEMP_C", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/SCM_INLET_TEMP_C", + "timeout": 0, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP0_FAN0_TACH_IL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN0_TACH_IL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP0_FAN0_TACH_OL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN0_TACH_OL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP0_FAN1_TACH_IL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN1_TACH_IL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP0_FAN1_TACH_OL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN1_TACH_OL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP0_FAN2_TACH_IL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN2_TACH_IL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP0_FAN2_TACH_OL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN2_TACH_OL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP0_FAN3_TACH_IL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN3_TACH_IL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP0_FAN3_TACH_OL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP0_FAN3_TACH_OL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP0_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP1_FAN0_TACH_IL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN0_TACH_IL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP1_FAN0_TACH_OL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN0_TACH_OL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP1_FAN1_TACH_IL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN1_TACH_IL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP1_FAN1_TACH_OL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN1_TACH_OL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP1_FAN2_TACH_IL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN2_TACH_IL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP1_FAN2_TACH_OL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN2_TACH_OL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP1_FAN3_TACH_IL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN3_TACH_IL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + }, + { + "name": "FAN_BP1_FAN3_TACH_OL_SPEED_RPM", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN_BP1_FAN3_TACH_OL_SPEED_RPM", + "writePath": "/xyz/openbmc_project/control/fanpwm/FAN_BP1_FAN_PWM", + "min": 0, + "max": 255, + "ignoreDbusMinMax": true + } + ], + + "zones": [ + { + "id": 1, + "failsafePercent": 100.0, + "minThermalOutput": 0.0, + "cycleTimeBaseMS": 1000, + "updateThermalsTimeMS": 1000, + "accumulateSetPoint": true, + "pids": [ + { + "name": "All Fan", + "type": "fan", + "inputs": [ + "FAN_BP0_FAN0_TACH_IL_SPEED_RPM", + "FAN_BP0_FAN0_TACH_OL_SPEED_RPM", + "FAN_BP0_FAN1_TACH_IL_SPEED_RPM", + "FAN_BP0_FAN1_TACH_OL_SPEED_RPM", + "FAN_BP0_FAN2_TACH_IL_SPEED_RPM", + "FAN_BP0_FAN2_TACH_OL_SPEED_RPM", + "FAN_BP0_FAN3_TACH_IL_SPEED_RPM", + "FAN_BP0_FAN3_TACH_OL_SPEED_RPM", + "FAN_BP1_FAN0_TACH_IL_SPEED_RPM", + "FAN_BP1_FAN0_TACH_OL_SPEED_RPM", + "FAN_BP1_FAN1_TACH_IL_SPEED_RPM", + "FAN_BP1_FAN1_TACH_OL_SPEED_RPM", + "FAN_BP1_FAN2_TACH_IL_SPEED_RPM", + "FAN_BP1_FAN2_TACH_OL_SPEED_RPM", + "FAN_BP1_FAN3_TACH_IL_SPEED_RPM", + "FAN_BP1_FAN3_TACH_OL_SPEED_RPM" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 1, + "proportionalCoeff": 0.0, + "integralCoeff": 0.0, + "derivativeCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 1.0, + "integralLimit_min": 0.0, + "integralLimit_max": 0.0, + "outLim_min": 0.0, + "outLim_max": 100.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0, + "negativeHysteresis": 0 + } + }, + { + "name": "Stepwise_MB_CPU", + "type": "stepwise", + "inputs": [ + "MB_CPU_TEMP_C" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 1, + "isCeiling": false, + "reading": { + "0": 55, + "1": 60, + "2": 65, + "3": 70, + "4": 75 + }, + "output": { + "0": 20, + "1": 25, + "2": 30, + "3": 35, + "4": 40 + }, + "positiveHysteresis": 0, + "negativeHysteresis": 2 + } + }, + { + "name": "PID_MB_CPU", + "type": "temp", + "inputs": [ + "MB_CPU_TEMP_C" + ], + "setpoint": 79.0, + "pid": { + "samplePeriod": 1, + "proportionalCoeff": -3.0, + "integralCoeff": -0.0035, + "derivativeCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": -50.0, + "integralLimit_max": 100.0, + "outLim_min": 0.0, + "outLim_max": 100.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0, + "negativeHysteresis": 2, + "checkHysterWithSetpt": true + } + }, + { + "name": "Stepwise_MB_DIMM", + "type": "stepwise", + "inputs": [ + "MB_DIMM_A0_TEMP_C", + "MB_DIMM_A1_TEMP_C", + "MB_DIMM_A2_TEMP_C", + "MB_DIMM_A4_TEMP_C", + "MB_DIMM_A6_TEMP_C", + "MB_DIMM_A7_TEMP_C", + "MB_DIMM_A8_TEMP_C", + "MB_DIMM_A10_TEMP_C" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 1, + "isCeiling": false, + "reading": { + "0": 60, + "1": 70, + "2": 75 + }, + "output": { + "0": 20, + "1": 25, + "3": 30 + }, + "positiveHysteresis": 0, + "negativeHysteresis": 2 + } + }, + { + "name": "PID_MB_DIMM", + "type": "temp", + "inputs": [ + "MB_DIMM_A0_TEMP_C", + "MB_DIMM_A1_TEMP_C", + "MB_DIMM_A2_TEMP_C", + "MB_DIMM_A4_TEMP_C", + "MB_DIMM_A6_TEMP_C", + "MB_DIMM_A7_TEMP_C", + "MB_DIMM_A8_TEMP_C", + "MB_DIMM_A10_TEMP_C" + ], + "setpoint": 79.0, + "pid": { + "samplePeriod": 1, + "proportionalCoeff": -3.0, + "integralCoeff": -0.0035, + "derivativeCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 0.0, + "integralLimit_min": -50.0, + "integralLimit_max": 100.0, + "outLim_min": 0.0, + "outLim_max": 100.0, + "slewNeg": 0.0, + "slewPos": 0.0, + "positiveHysteresis": 0, + "negativeHysteresis": 2, + "checkHysterWithSetpt": true + } + }, + { + "name": "Stepwise_MB_VR", + "type": "stepwise", + "inputs": [ + "MB_VR_CPU_VCORE0_TEMP_C", + "MB_VR_CPU_VCORE1_TEMP_C", + "MB_VR_CPU_PVDD11_TEMP_C", + "MB_VR_CPU_PDDIO_TEMP_C", + "MB_VR_CPU_SOC_TEMP_C" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 1, + "isCeiling": false, + "reading": { + "0": 80, + "1": 90, + "2": 100 + }, + "output": { + "0": 20, + "1": 25, + "2": 90 + }, + "positiveHysteresis": 0, + "negativeHysteresis": 2 + } + }, + { + "name": "Stepwise_MB_RETIMER", + "type": "stepwise", + "inputs": [ + "MB_RETIMER0_TEMP_C", + "MB_RETIMER1_TEMP_C" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 1, + "isCeiling": false, + "reading": { + "0": 80, + "1": 90, + "2": 100 + }, + "output": { + "0": 20, + "1": 25, + "2": 90 + }, + "positiveHysteresis": 0, + "negativeHysteresis": 2 + } + }, + { + "name": "Stepwise_NIC", + "type": "stepwise", + "inputs": [ + "NIC_Temp_1" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 1, + "isCeiling": false, + "reading": { + "0": 80, + "1": 90, + "2": 100 + }, + "output": { + "0": 20, + "1": 25, + "2": 90 + }, + "positiveHysteresis": 0, + "negativeHysteresis": 2 + } + }, + { + "name": "Stepwise_SCM_INLET", + "type": "stepwise", + "inputs": [ + "SCM_INLET_TEMP_C" + ], + "setpoint": 0.0, + "pid": { + "samplePeriod": 1, + "isCeiling": false, + "reading": { + "0": 25, + "1": 30, + "2": 35, + "3": 40 + }, + "output": { + "0": 20, + "1": 25, + "2": 35, + "3": 90 + }, + "positiveHysteresis": 0, + "negativeHysteresis": 2 + } + } + ] + } + ] +} diff --git a/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control_%.bbappend new file mode 100644 index 0000000000..56632d8fd8 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS:prepend:= "${THISDIR}/${PN}:" +SRC_URI:append = " file://config.json \ + " + +FILES:${PN}:append = " ${datadir}/swampd/config.json" + +do_install:append() { + install -d ${D}${datadir}/swampd + install -m 0644 -D ${WORKDIR}/config.json ${D}${datadir}/swampd/config.json +} diff --git a/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh b/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager/bios-update index b21c5d2ead..5877afee3f 100755 --- a/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh +++ b/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager/bios-update @@ -29,10 +29,13 @@ set_gpio_to_cpu() echo "Bios upgrade started at $(date)" -#Power off host server. +# Power off the host server using a graceful shutdown. +# If the server does not power off, +# it will then perform a forced shutdown echo "Power off host server" -power_off -sleep 15 +obmcutil poweroff + +sleep 25 if [ "$(power_status)" != "off" ]; then echo "Host server didn't power off" diff --git a/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service b/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service index 7e098908e5..7d1dc08a03 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service +++ b/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service @@ -4,4 +4,4 @@ Description=Flash Host Bios image %I to Host [Service] Type=oneshot RemainAfterExit=no -ExecStart=/usr/sbin/bios-update.sh /tmp/images/%i +ExecStart=/usr/sbin/bios-update /tmp/images/%i diff --git a/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 047f01970a..6dd496f071 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-facebook/meta-harma/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,10 +1,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://bios-update.sh" +SRC_URI += "file://bios-update" PACKAGECONFIG:append = " flash_bios" RDEPENDS:${PN} += "bash" do_install:append() { install -d ${D}/${sbindir} - install -m 0755 ${WORKDIR}/bios-update.sh ${D}/${sbindir}/ + install -m 0755 ${WORKDIR}/bios-update ${D}/${sbindir}/ } diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-good b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-good index cc2258f373..00bf4fa922 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-good +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-power-good @@ -1,9 +1,18 @@ #!/bin/bash +# shellcheck source=meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions +source /usr/libexec/fb-common-functions + # Set Host Power Status Running -busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host CurrentHostState s xyz.openbmc_project.State.Host.HostState.Running +if [ "$(get_gpio "power-card-enable")" -eq 0 ]; then + busctl set-property xyz.openbmc_project.State.Host0 \ + /xyz/openbmc_project/state/host0 \ + xyz.openbmc_project.State.Host \ + CurrentHostState s \ + xyz.openbmc_project.State.Host.HostState.Running -systemctl start obmc-led-group-start@power_on.service + systemctl start obmc-led-group-start@power_on.service +fi # The hardware disables the multiplexer in standby # to prevent sending a command by mistake to the retimer when it boots up. diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-uart-switch-button b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-uart-switch-button new file mode 100644 index 0000000000..1da52ed361 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-uart-switch-button @@ -0,0 +1,23 @@ +#!/bin/bash + +# shellcheck source=meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions +source /usr/libexec/fb-common-functions + +uart_lsb=$(get_gpio "uart-switch-lsb") +uart_msb=$(get_gpio "uart-switch-msb") +uart_lsb=$((1 - uart_lsb)) +uart_msb=$((1 - uart_msb)) + +uart_sel=$((uart_msb+(uart_lsb<<1))) + +set_postcode_leds() { + num=$1 + for i in {0..7}; do + bit_value=$(( (num >> i) & 1 )) + set_gpio "led-postcode-$i" $bit_value + done +} + +set_postcode_leds "$uart_sel" + +exit 0 diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-uart-switch-button.service b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-uart-switch-button.service new file mode 100644 index 0000000000..b7e491ecca --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/deassert-uart-switch-button.service @@ -0,0 +1,8 @@ +[Unit] +Description=Deassert Uart Switch Button + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/deassert-uart-switch-button + +SyslogIdentifier=deassert-uart-switch-button diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-off b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-off index 121db3f34e..1eed8d1fab 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-off +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-off @@ -5,3 +5,6 @@ sleep 5 # Set Host Power Off obmcutil poweroff + +# Turn off the power Led +systemctl start obmc-led-group-stop@power_on.service diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-on b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-on index d556137d9d..122a89f7d3 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-on +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-on @@ -4,3 +4,6 @@ sleep 1 # Set Host Power On obmcutil poweron + +# Turn on the power Led +systemctl start obmc-led-group-start@power_on.service diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/logging b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/logging index ce69c4e12f..ae96b13cdd 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/logging +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/logging @@ -1,10 +1,26 @@ #!/bin/bash +# shellcheck source=meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions +source /usr/libexec/fb-common-functions + MESSAGE=$1 ARG=$2 VAL=$3 -busctl call \ +# remove prefix from 0_reset-cause-platrst to reset-cause-platrst +loginfo="${MESSAGE#*_}" + +# get gpio chip id +number="${MESSAGE%%_*}" + +# get assert or deassert message +action=$(echo "$MESSAGE" | awk '{print $NF}') + +gpio_msg="${VAL#*_}" + +if [ "$(get_gpio "power-card-enable")" -eq 0 ] || [ "$number" -ne 2 ] || [ "$action" == "assert" ]; then + busctl call \ xyz.openbmc_project.Logging /xyz/openbmc_project/logging \ - xyz.openbmc_project.Logging.Create Create "ssa{ss}" "$MESSAGE" \ - xyz.openbmc_project.Logging.Entry.Level.Error 1 "$ARG" "$VAL" + xyz.openbmc_project.Logging.Create Create "ssa{ss}" "$loginfo" \ + xyz.openbmc_project.Logging.Entry.Level.Error 1 "$ARG" "$gpio_msg" +fi diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init index 4e7dd65a67..2a8af58b1d 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init @@ -4,7 +4,7 @@ source /usr/libexec/fb-common-functions host_led_init() { - if [ "$(get_gpio power-host-good)" -eq 1 ]; then + if [ "$(get_gpio "power-host-good")" -eq 1 ] && [ "$(get_gpio "power-card-enable")" -eq 0 ]; then systemctl start obmc-led-group-start@power_on.service else systemctl start obmc-led-group-stop@power_on.service diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init.service b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init.service index 1ee870bd36..37da7d731d 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init.service +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init.service @@ -1,6 +1,7 @@ [Unit] -Wants=xyz.openbmc_project.State.Host@0.service -After=xyz.openbmc_project.State.Host@0.service +Wants=mapper-wait@-xyz-openbmc_project-state-host0.service +After=mapper-wait@-xyz-openbmc_project-state-host0.service + [Service] Type=oneshot diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json index 7402df4325..7f225c2c55 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json @@ -1,166 +1,165 @@ [ { - "Name": "reset-button", + "Name": "reset-cause-platrst", "ChipId": "0", - "GpioNum": 122, + "GpioNum": 16, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-gpio-log@reset-button.service","deassert-reset-button.service"], - "FALLING": ["assert-gpio-log@reset-button.service","assert-reset-button.service"] - + "RISING": ["deassert-gpio-log@0_reset-cause-platrst.service"], + "FALLING": ["assert-gpio-log@0_reset-cause-platrst.service"] }, "Continue": true }, { - "Name": "power-button", + "Name": "power-hsc-good", "ChipId": "0", - "GpioNum": 120, + "GpioNum": 21, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-gpio-log@power-button.service"], - "FALLING": ["assert-gpio-log@power-button.service"] + "RISING": ["host-power-on.service"], + "FALLING": ["host-power-off.service"] }, "Continue": true }, { - "Name": "presence-post-card", + "Name": "power-button", "ChipId": "0", - "GpioNum": 206, + "GpioNum": 120, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-gpio-log@presence-post-card.service"], - "FALLING": ["assert-gpio-log@presence-post-card.service"] + "RISING": ["deassert-gpio-log@0_power-button.service"], + "FALLING": ["assert-gpio-log@0_power-button.service"] }, "Continue": true }, { - "Name": "ac-power-button", - "ChipId": "1", - "GpioNum": 0, - "EventMon": "FALLING", + "Name": "reset-button", + "ChipId": "0", + "GpioNum": 122, + "EventMon": "BOTH", "Targets": { - "FALLING": ["assert-gpio-log@ac-power-button.service"] + "RISING": ["deassert-gpio-log@0_reset-button.service","deassert-reset-button.service"], + "FALLING": ["assert-gpio-log@0_reset-button.service","assert-reset-button.service"] }, "Continue": true }, { - "Name": "irq-uv-detect-alert", - "ChipId": "2", - "GpioNum": 174, - "EventMon": "FALLING", + "Name": "uart-switch-button", + "ChipId": "0", + "GpioNum": 135, + "EventMon": "RISING", "Targets": { - "FALLING": ["assert-gpio-log@irq-uv-detect-alert.service"] + "RISING": ["deassert-uart-switch-button.service"] }, "Continue": true }, { - "Name": "irq-hsc-alert", - "ChipId": "2", - "GpioNum": 176, - "EventMon": "BOTH", + "Name": "ac-power-button", + "ChipId": "1", + "GpioNum": 0, + "EventMon": "FALLING", "Targets": { - "RISING": ["deassert-gpio-log@irq-hsc-alert.service"], - "FALLING": ["assert-gpio-log@irq-hsc-alert.service"] + "FALLING": ["assert-gpio-log@1_ac-power-button.service"] }, "Continue": true }, { - "Name": "cpu0-prochot-alert", + "Name": "power-host-good", "ChipId": "2", - "GpioNum": 178, + "GpioNum": 60, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-gpio-log@cpu0-prochot-alert.service"], - "FALLING": ["assert-gpio-log@cpu0-prochot-alert.service"] + "RISING": ["deassert-power-good.service", "deassert-gpio-log@2_power-host-good.service"], + "FALLING": ["assert-power-good.service", "assert-gpio-log@2_power-host-good.service"] + }, "Continue": true }, { - "Name": "cpu0-thermtrip-alert", + "Name": "post-end-n", "ChipId": "2", - "GpioNum": 180, - "EventMon": "FALLING", + "GpioNum": 66, + "EventMon": "BOTH", "Targets": { - "FALLING": ["assert-gpio-log@cpu0-thermtrip-alert.service"] + "RISING": ["deassert-post-end.service"], + "FALLING": ["assert-post-end.service"] + }, "Continue": true }, { - "Name": "reset-cause-platrst", + "Name": "leakage-detect-alert", "ChipId": "0", - "GpioNum": 16, + "GpioNum": 92, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-gpio-log@reset-cause-platrst.service"], - "FALLING": ["assert-gpio-log@reset-cause-platrst.service"] + "RISING": ["deassert-gpio-log@0_leakage-detect-alert.service"], + "FALLING": ["assert-gpio-log@0_leakage-detect-alert.service"] }, "Continue": true }, { - "Name": "power-host-good", + "Name": "irq-uv-detect-alert", "ChipId": "2", - "GpioNum": 60, + "GpioNum": 174, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-power-good.service", "deassert-gpio-log@power-host-good.service"], - "FALLING": ["assert-power-good.service", "assert-gpio-log@power-host-good.service"] - + "RISING": ["deassert-gpio-log@2_irq-uv-detect-alert.service"], + "FALLING": ["assert-gpio-log@2_irq-uv-detect-alert.service"] }, "Continue": true }, { - "Name": "reset-cause-pcie", + "Name": "irq-hsc-alert", "ChipId": "2", - "GpioNum": 182, + "GpioNum": 176, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-gpio-log@reset-cause-pcie.service"], - "FALLING": ["assert-gpio-log@reset-cause-pcie.service"] + "RISING": ["deassert-gpio-log@2_irq-hsc-alert.service"], + "FALLING": ["assert-gpio-log@2_irq-hsc-alert.service"] }, "Continue": true }, { - "Name": "pvdd11-ocp-alert", + "Name": "cpu0-prochot-alert", "ChipId": "2", - "GpioNum": 184, + "GpioNum": 178, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-gpio-log@pvdd11-ocp-alert.service"], - "FALLING": ["assert-gpio-log@pvdd11-ocp-alert.service"] + "RISING": ["deassert-gpio-log@2_cpu0-prochot-alert.service"], + "FALLING": ["assert-gpio-log@2_cpu0-prochot-alert.service"] }, "Continue": true }, { - "Name": "post-end-n", + "Name": "cpu0-thermtrip-alert", "ChipId": "2", - "GpioNum": 66, - "EventMon": "BOTH", + "GpioNum": 180, + "EventMon": "FALLING", "Targets": { - "RISING": ["deassert-post-end.service"], - "FALLING": ["assert-post-end.service"] - + "FALLING": ["assert-gpio-log@2_cpu0-thermtrip-alert.service"] }, "Continue": true }, { - "Name": "leakage-detect-alert", - "ChipId": "0", - "GpioNum": 92, + "Name": "reset-cause-pcie", + "ChipId": "2", + "GpioNum": 182, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-gpio-log@leakage-detect-alert.service", "host-power-on.service"], - "FALLING": ["assert-gpio-log@leakage-detect-alert.service", "host-power-off.service"] + "RISING": ["deassert-gpio-log@2_reset-cause-pcie.service"], + "FALLING": ["assert-gpio-log@2_reset-cause-pcie.service"] }, "Continue": true }, { - "Name": "power-hsc-good", - "ChipId": "0", - "GpioNum": 21, + "Name": "pvdd11-ocp-alert", + "ChipId": "2", + "GpioNum": 184, "EventMon": "BOTH", "Targets": { - "RISING": ["host-power-on.service"], - "FALLING": ["host-power-off.service"] + "RISING": ["deassert-gpio-log@2_pvdd11-ocp-alert.service"], + "FALLING": ["assert-gpio-log@2_pvdd11-ocp-alert.service"] }, "Continue": true } diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-presence.json b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-presence.json index d406147211..d1d7e6e7b9 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-presence.json +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-presence.json @@ -33,5 +33,12 @@ "ActiveLow": true, "Bias": "DISABLE", "Inventory": "/system/board/Harma_MB/presence_asic_modules_1" + }, + { + "Name": "presence-post-card", + "LineName": "presence-post-card", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Harma_MB/presence_post_card" } -]
\ No newline at end of file +] diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 791fe265ff..6787b885b9 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -16,6 +16,8 @@ SRC_URI += "file://assert-gpio-log@.service \ file://deassert-power-good.service \ file://deassert-reset-button \ file://deassert-reset-button.service \ + file://deassert-uart-switch-button \ + file://deassert-uart-switch-button.service \ file://host-power-off \ file://host-power-off.service \ file://host-power-on \ @@ -38,6 +40,7 @@ SYSTEMD_SERVICE:${PN} += " \ deassert-power-good.service \ deassert-post-end.service \ deassert-reset-button.service \ + deassert-uart-switch-button.service \ multi-gpios-sys-init.service \ " @@ -69,6 +72,8 @@ do_install:append:() { install -m 0755 ${WORKDIR}/assert-power-good ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/deassert-power-good ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/deassert-uart-switch-button ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/host-power-off ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/host-power-on ${D}${libexecdir}/${PN}/ } diff --git a/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json index f4aa51e776..23e7f8b041 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json +++ b/meta-facebook/meta-harma/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json @@ -6,6 +6,7 @@ { "Name" : "bmc_heartbeat_amber", "Action" : "Blink", + "Priority" : "Blink", "DutyOn" : 50, "Period" : 1000 } @@ -27,6 +28,7 @@ { "Name": "fp_id_amber", "Action": "Blink", + "Priority" : "Blink", "DutyOn": 50, "Period": 1000 } diff --git a/meta-facebook/meta-harma/recipes-phosphor/settings/phosphor-settings-defaults-native.bbappend b/meta-facebook/meta-harma/recipes-phosphor/settings/phosphor-settings-defaults-native.bbappend new file mode 100644 index 0000000000..f764b219a0 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/settings/phosphor-settings-defaults-native.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append = " \ + file://harma-temporary-software-versions.yml \ +" + +SETTINGS_BMC_TEMPLATES:append = " \ + harma-temporary-software-versions.yml \ +" diff --git a/meta-facebook/meta-harma/recipes-phosphor/settings/phosphor-settings-defaults-native/harma-temporary-software-versions.yml b/meta-facebook/meta-harma/recipes-phosphor/settings/phosphor-settings-defaults-native/harma-temporary-software-versions.yml new file mode 100644 index 0000000000..2e2d73f239 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/settings/phosphor-settings-defaults-native/harma-temporary-software-versions.yml @@ -0,0 +1,96 @@ +/xyz/openbmc_project/software/chassis/Harma_SCM_bmc: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + +/xyz/openbmc_project/software/chassis/Harma_SCM_tpm: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + +/xyz/openbmc_project/software/chassis/Harma_SCM_scm_cpld: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + +/xyz/openbmc_project/software/chassis/Minerva_CB_cb_cpld: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + +/xyz/openbmc_project/software/chassis/Harma_MB_vr_cpu0_pvdd11: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + +/xyz/openbmc_project/software/chassis/Harma_MB_vr_cpu0_vcore0: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + +/xyz/openbmc_project/software/chassis/Harma_MB_vr_cpu0_vcore1: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + +/xyz/openbmc_project/software/chassis/Harma_MB_mb_cpld: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + +/xyz/openbmc_project/software/chassis/Harma_MB_retimer0: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + +/xyz/openbmc_project/software/chassis/Harma_MB_retimer1: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + +/xyz/openbmc_project/software/chassis/Harma_MB_bios: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + +/xyz/openbmc_project/software/chassis/Nic_nic0: +- Interface: "xyz.openbmc_project.Software.Version" + Properties: + Version: + Default: '""' + Purpose: + Default: Version::VersionPurpose::Other + diff --git a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/host-force-poweroff b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/host-powerreset index 4a0d7e02e9..08b8722d41 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/host-force-poweroff +++ b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/host-powerreset @@ -3,4 +3,4 @@ # shellcheck source=meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/power-cmd source /usr/libexec/phosphor-state-manager/power-cmd -force_power_off +power_reset diff --git a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/host-powerreset@.service b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/host-powerreset@.service new file mode 100644 index 0000000000..0fd059ce16 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/host-powerreset@.service @@ -0,0 +1,9 @@ +[Unit] +Description=Host Power Reset: %i + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-state-manager/host-powerreset %i + +[Install] +WantedBy=obmc-host-force-warm-reboot@%i.target diff --git a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/power-cmd b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/power-cmd index d9a224ba12..3a3005db36 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/power-cmd +++ b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager/power-cmd @@ -5,33 +5,36 @@ source /usr/libexec/fb-common-functions # Power Good Status power_status() { - if [ "$(get_gpio "host0-ready")" -eq 1 ]; then + if [ "$(get_gpio "host0-ready")" -eq 1 ] && [ "$(get_gpio "power-card-enable")" -eq 0 ] ; then echo "on" else echo "off" fi } -# DC off -graceful_power_off() { +# Force DC off +force_power_off() { if [ "$(power_status)" == "on" ]; then set_gpio power-host-control 0 - sleep 1 + sleep 6 set_gpio power-host-control 1 sleep 1 - - # wait host power off - sleep 10 fi } -# DC off -force_power_off() { +# Graceful DC off +graceful_power_off() { if [ "$(power_status)" == "on" ]; then set_gpio power-host-control 0 - sleep 6 + sleep 1 set_gpio power-host-control 1 sleep 1 + + # wait host power off + sleep 10 + if [ "$(power_status)" == "on" ]; then + force_power_off + fi fi } @@ -57,3 +60,12 @@ power_on() { fi return 0 } + +# Host reset +power_reset() { + set_gpio reset-control 0 + sleep 1 + set_gpio reset-control 1 + sleep 1 + return 0 +} diff --git a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend index 72f7faa2a5..9683b07637 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -30,42 +30,32 @@ CHASSIS_DEFAULT_TARGETS:append = " \ obmc-chassis-poweroff@{}.target.requires/obmc-powered-off@{}.service \ " -# Harma Chassis off is host force off -CHASSIS_DEFAULT_TARGETS:append = " \ - obmc-chassis-hard-poweroff@{}.target.requires/host-force-poweroff@{}.service \ - " - # Host Config +# Host Reset HOST_DEFAULT_TARGETS:remove = " \ obmc-host-warm-reboot@{}.target.requires/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service \ + obmc-host-warm-reboot@{}.target.wants/pldmSoftPowerOff.service \ + obmc-host-force-warm-reboot@{}.target.requires/obmc-host-stop@{}.target \ + obmc-host-force-warm-reboot@{}.target.requires/phosphor-reboot-host@{}.service \ " -# TODO: Remove it when 69903 applied. +# Host On/Off HOST_DEFAULT_TARGETS:append = " \ obmc-host-startmin@{}.target.requires/host-poweron@{}.service \ " -# TODO: Remove it when 69903 applied. HOST_DEFAULT_TARGETS:append = " \ obmc-host-shutdown@{}.target.requires/host-graceful-poweroff@{}.service \ - obmc-host-warm-reboot@{}.target.requires/host-graceful-poweroff@{}.service \ - " - -# TODO: Remove it when 69903 applied. -HOST_DEFAULT_TARGETS:append = " \ - obmc-host-stop@{}.target.requires/host-force-poweroff@{}.service \ " -# TODO: Remove it when 69903 applied. HOST_DEFAULT_TARGETS:remove = " \ obmc-host-shutdown@{}.target.wants/host-poweroff@{}.service \ obmc-host-start@{}.target.wants/host-poweron@{}.service \ - obmc-host-reboot@{}.target.wants/host-powercycle@{}.service \ - obmc-host-force-warm-reboot@{}.target.wants/host-powerreset@{}.service \ " -# TODO: Remove when 69903 applied. +# Host Cycle HOST_DEFAULT_TARGETS:remove = " \ + obmc-host-reboot@{}.target.wants/host-powercycle@{}.service \ obmc-host-reboot@{}.target.requires/obmc-host-shutdown@{}.service \ " @@ -87,12 +77,12 @@ SRC_URI:append = " \ file://chassis-poweroff@.service \ file://chassis-poweron \ file://chassis-poweron@.service \ - file://host-force-poweroff \ - file://host-force-poweroff@.service \ file://host-graceful-poweroff \ file://host-graceful-poweroff@.service \ file://host-poweron \ file://host-poweron@.service \ + file://host-powerreset \ + file://host-powerreset@.service \ file://power-cmd \ file://phosphor-wait-power-off@.service \ file://discover-sys-init.conf \ @@ -110,9 +100,9 @@ do_install:append() { install -m 0755 ${WORKDIR}/chassis-poweroff ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/chassis-poweron ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/chassis-powercycle ${D}${libexecdir}/${PN}/ - install -m 0755 ${WORKDIR}/host-force-poweroff ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/host-graceful-poweroff ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/host-poweron ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/host-powerreset ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/power-cmd ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/phosphor-state-manager-init ${D}${libexecdir}/${PN}/ } diff --git a/meta-facebook/meta-minerva/conf/machine/minerva.conf b/meta-facebook/meta-minerva/conf/machine/minerva.conf index 7b2ee8a3b5..742dfdd817 100644 --- a/meta-facebook/meta-minerva/conf/machine/minerva.conf +++ b/meta-facebook/meta-minerva/conf/machine/minerva.conf @@ -2,7 +2,7 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb" UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" -UBOOT_DEVICETREE = "ast2600-bletchley" +UBOOT_DEVICETREE = "ast2600-facebook" SPL_BINARY = "spl/u-boot-spl.bin" SOCSEC_SIGN_ENABLE = "0" diff --git a/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg b/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg index 02ce902d34..9a2f340c71 100644 --- a/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg +++ b/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg @@ -27,6 +27,7 @@ CONFIG_SENSORS_INA2XX=y CONFIG_SENSORS_LTC2945=y CONFIG_SENSORS_MAX31790=y CONFIG_SENSORS_LTC4286=y +CONFIG_SENSORS_XDP710=y # SPI GPIO CONFIG_SPI_GPIO=y diff --git a/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init b/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init index de609ee56b..e22adc57c1 100644 --- a/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init +++ b/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init @@ -7,7 +7,6 @@ power_on_led_init() { } # set initial value for GPIO output pins -set_gpio PWREN_MTIA_BLADE0_EN_N 0 set_gpio PWREN_MTIA_BLADE1_EN_N 0 set_gpio PWREN_MTIA_BLADE2_EN_N 0 set_gpio PWREN_MTIA_BLADE3_EN_N 0 @@ -23,15 +22,15 @@ set_gpio PWREN_MTIA_BLADE12_EN_N 0 set_gpio PWREN_MTIA_BLADE13_EN_N 0 set_gpio PWREN_MTIA_BLADE14_EN_N 0 set_gpio PWREN_MTIA_BLADE15_EN_N 0 +set_gpio PWREN_MTIA_BLADE16_EN_N 0 -set_gpio PWREN_NW_BLADE0_EN_N 0 set_gpio PWREN_NW_BLADE1_EN_N 0 set_gpio PWREN_NW_BLADE2_EN_N 0 set_gpio PWREN_NW_BLADE3_EN_N 0 set_gpio PWREN_NW_BLADE4_EN_N 0 set_gpio PWREN_NW_BLADE5_EN_N 0 +set_gpio PWREN_NW_BLADE6_EN_N 0 -set_gpio PWREN_MTIA_BLADE0_HSC_EN_N 0 set_gpio PWREN_MTIA_BLADE1_HSC_EN_N 0 set_gpio PWREN_MTIA_BLADE2_HSC_EN_N 0 set_gpio PWREN_MTIA_BLADE3_HSC_EN_N 0 @@ -47,53 +46,35 @@ set_gpio PWREN_MTIA_BLADE12_HSC_EN_N 0 set_gpio PWREN_MTIA_BLADE13_HSC_EN_N 0 set_gpio PWREN_MTIA_BLADE14_HSC_EN_N 0 set_gpio PWREN_MTIA_BLADE15_HSC_EN_N 0 +set_gpio PWREN_MTIA_BLADE16_HSC_EN_N 0 -set_gpio PWREN_NW_BLADE0_HSC_EN_N 0 set_gpio PWREN_NW_BLADE1_HSC_EN_N 0 set_gpio PWREN_NW_BLADE2_HSC_EN_N 0 set_gpio PWREN_NW_BLADE3_HSC_EN_N 0 set_gpio PWREN_NW_BLADE4_HSC_EN_N 0 set_gpio PWREN_NW_BLADE5_HSC_EN_N 0 +set_gpio PWREN_NW_BLADE6_HSC_EN_N 0 -set_gpio PWREN_FCB_TOP_L_EN_N 0 -set_gpio PWREN_FCB_TOP_R_EN_N 0 -set_gpio PWREN_FCB_MIDDLE_L_EN_N 0 -set_gpio PWREN_FCB_MIDDLE_R_EN_N 0 -set_gpio PWREN_FCB_BOTTOM_L_EN_N 0 -set_gpio PWREN_FCB_BOTTOM_R_EN_N 0 +set_gpio PWREN_SGPIO_FCB_1_EN_N 0 +set_gpio PWREN_SGPIO_FCB_2_EN_N 0 +set_gpio PWREN_SGPIO_FCB_3_EN_N 0 +set_gpio PWREN_SGPIO_FCB_4_EN_N 0 +set_gpio PWREN_SGPIO_FCB_5_EN_N 0 +set_gpio PWREN_SGPIO_FCB_6_EN_N 0 -set_gpio FM_CMM_AC_CYCLE_N 1 +set_gpio FM_BMC_RST_RTCRST_R 0 +set_gpio ERR_INJECT_CMM_PWR_FAIL_N 1 -# if MGMT_SFP_PRSNT_N = 0 -> MGMT_SFP_TX_DIS = 0 -# if MGMT_SFP_PRSNT_N = 1 -> MGMT_SFP_TX_DIS = 1 -MGMT_SFP_PRSNT_N_VALUE=$(get_gpio MGMT_SFP_PRSNT_N) -if [ "$MGMT_SFP_PRSNT_N_VALUE" = "0" ]; then - set_gpio MGMT_SFP_TX_DIS 0 -else - set_gpio MGMT_SFP_TX_DIS 1 -fi +set_gpio RST_I2CRST_FCB_1_N 1 +set_gpio RST_I2CRST_FCB_2_N 1 +set_gpio RST_I2CRST_FCB_3_N 1 +set_gpio RST_I2CRST_FCB_4_N 1 +set_gpio RST_I2CRST_FCB_5_N 1 +set_gpio RST_I2CRST_FCB_6_N 1 -set_gpio RST_I2CRST_MTIA_BLADE0_1_N 1 -set_gpio RST_I2CRST_MTIA_BLADE2_3_N 1 -set_gpio RST_I2CRST_MTIA_BLADE4_5_N 1 -set_gpio RST_I2CRST_MTIA_BLADE6_7_N 1 -set_gpio RST_I2CRST_MTIA_BLADE8_9_N 1 -set_gpio RST_I2CRST_MTIA_BLADE10_11_N 1 -set_gpio RST_I2CRST_MTIA_BLADE12_13_N 1 -set_gpio RST_I2CRST_MTIA_BLADE14_15_N 1 -set_gpio RST_I2CRST_NW_BLADE0_1_2_N 1 -set_gpio RST_I2CRST_NW_BLADE3_4_5_N 1 - -set_gpio RST_I2CRST_FCB_N 1 -set_gpio RST_I2CRST_FCB_B_L_N 1 -set_gpio RST_I2CRST_FCB_B_R_N 1 -set_gpio RST_I2CRST_FCB_M_L_N 1 -set_gpio RST_I2CRST_FCB_M_R_N 1 -set_gpio RST_I2CRST_FCB_T_L_N 1 -set_gpio RST_I2CRST_FCB_T_R_N 1 - -set_gpio wFM_88E6393X_BIN_UPDATE_EN_N 1 -set_gpio WATER_VALVE_CLOSED_N 0 +set_gpio FM_MDIO_SW_SEL 0 +set_gpio FM_88E6393X_BIN_UPDATE_EN_N 1 +set_gpio WATER_VALVE_CLOSED_N 1 set_gpio BMC_READY 1 power_on_led_init diff --git a/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager/blacklist.json b/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager/blacklist.json new file mode 100644 index 0000000000..8ece28787f --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager/blacklist.json @@ -0,0 +1,28 @@ +{ + "buses": [ + { + "bus": 16, + "addresses": [ "0x51"] + }, + { + "bus": 17, + "addresses": [ "0x51"] + }, + { + "bus": 18, + "addresses": [ "0x51"] + }, + { + "bus": 19, + "addresses": [ "0x51"] + }, + { + "bus": 20, + "addresses": [ "0x51"] + }, + { + "bus": 21, + "addresses": [ "0x51"] + } + ] +} diff --git a/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager_%.bbappend new file mode 100644 index 0000000000..26e599094c --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +inherit obmc-phosphor-systemd systemd + +SRC_URI += "\ + file://blacklist.json \ + " + +do_install:append() { + install -m 0644 -D ${WORKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json +} diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/select-uart-mux b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/select-uart-mux deleted file mode 100644 index f2038364d1..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/select-uart-mux +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -e -# shellcheck source=meta-facebook/meta-minerva/recipes-minerva/plat-tool/files/minerva-common-functions -# Select UART Mux: UART Mux for switching between MTIA blade 0~15 -# Usage: select-uart-mux <0-15> -source /usr/libexec/minerva-common-functions - -convert_decimal_to_binary() { - decimal=$1 - - binary="" - for ((i = 3; i >= 0; i--)); do - bit=$(( (decimal >> i) & 1 )) - binary="${binary}${bit}" - done - - echo "$binary" -} - -uart_mux_select() -{ - local BLADE_INDEX=$1 - - if ((BLADE_INDEX >= 0)) && ((BLADE_INDEX < 16)); then - BINARY_INDEX=$(convert_decimal_to_binary "$BLADE_INDEX") - - set_gpio BLADE_UART_SEL0 "${BINARY_INDEX:3:1}" - set_gpio BLADE_UART_SEL1 "${BINARY_INDEX:2:1}" - set_gpio BLADE_UART_SEL2 "${BINARY_INDEX:1:1}" - set_gpio BLADE_UART_SEL3 "${BINARY_INDEX:0:1}" - else - logger -p user.info "uart_mux_select: unknow blade index ($BLADE_INDEX)" - return 1 - fi - - return 0 -} - -BLADE_INDEX=$1 -uart_mux_select "$BLADE_INDEX" diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf index 6622dd6367..3971b24aab 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf +++ b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf @@ -1,3 +1,67 @@ +mux-gpios = BLADE_UART_SEL0,BLADE_UART_SEL1,BLADE_UART_SEL2,BLADE_UART_SEL3 baud = 57600 -console-id = compute-blade -logfile = /var/log/obmc-console-compute-blade.log +console-id = ttyS5 + +[compute_blade_1] +mux-index = 0 +logfile = /var/log/obmc-console-compute_blade_1.log + +[compute_blade_2] +mux-index = 1 +logfile = /var/log/obmc-console-compute_blade_2.log + +[compute_blade_3] +mux-index = 2 +logfile = /var/log/obmc-console-compute_blade_3.log + +[compute_blade_4] +mux-index = 3 +logfile = /var/log/obmc-console-compute_blade_4.log + +[compute_blade_5] +mux-index = 4 +logfile = /var/log/obmc-console-compute_blade_5.log + +[compute_blade_6] +mux-index = 5 +logfile = /var/log/obmc-console-compute_blade_6.log + +[compute_blade_7] +mux-index = 6 +logfile = /var/log/obmc-console-compute_blade_7.log + +[compute_blade_8] +mux-index = 7 +logfile = /var/log/obmc-console-compute_blade_8.log + +[compute_blade_9] +mux-index = 8 +logfile = /var/log/obmc-console-compute_blade_9.log + +[compute_blade_10] +mux-index = 9 +logfile = /var/log/obmc-console-compute_blade_10.log + +[compute_blade_11] +mux-index = 10 +logfile = /var/log/obmc-console-compute_blade_11.log + +[compute_blade_12] +mux-index = 11 +logfile = /var/log/obmc-console-compute_blade_12.log + +[compute_blade_13] +mux-index = 12 +logfile = /var/log/obmc-console-compute_blade_13.log + +[compute_blade_14] +mux-index = 13 +logfile = /var/log/obmc-console-compute_blade_14.log + +[compute_blade_15] +mux-index = 14 +logfile = /var/log/obmc-console-compute_blade_15.log + +[compute_blade_16] +mux-index = 15 +logfile = /var/log/obmc-console-compute_blade_16.log diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend index f60b2d646d..0d969220da 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend @@ -6,7 +6,6 @@ OBMC_CONSOLE_TTYS:fb-nohost:append = " ttyS5" SRC_URI:append = " \ file://80-minerva-obmc-console-uart.rules \ - file://select-uart-mux \ " RDEPENDS:${PN}:append = " bash" @@ -17,7 +16,4 @@ do_install:append() { install -d ${D}/${nonarch_base_libdir}/udev/rules.d rm -f ${D}/${nonarch_base_libdir}/udev/rules.d/80-obmc-console-uart.rules install -m 0644 ${WORKDIR}/80-minerva-obmc-console-uart.rules ${D}/${nonarch_base_libdir}/udev/rules.d - - # Install script for selecting uart mux - install -m 0744 ${WORKDIR}/select-uart-mux ${D}${bindir} } diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-assert@.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-assert@.service deleted file mode 100644 index 76b3b893d8..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-assert@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=%i Cable Present Assert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i cable present assert" "CABLE" "%i" -SyslogIdentifier=%i-cable-present-assert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-deassert@.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-deassert@.service deleted file mode 100644 index 2d655ad340..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-deassert@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=%i Cable Present Deassert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i cable present deassert" "CABLE" "%i" -SyslogIdentifier=%i-cable-present-deassert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-monitor.json index 8f25dcb11d..29d11ab7fe 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-monitor.json @@ -1,338 +1,19 @@ [ { - "Name": "PRSNT_MTIA_BLADE0_N", - "ChipId": "2", - "GpioNum": 0, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-0.service"], - "RISING": ["present-deassert@mtia-blade-0.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE1_N", - "ChipId": "2", - "GpioNum": 2, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-1.service"], - "RISING": ["present-deassert@mtia-blade-1.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE2_N", - "ChipId": "2", - "GpioNum": 4, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-2.service"], - "RISING": ["present-deassert@mtia-blade-2.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE3_N", - "ChipId": "2", - "GpioNum": 6, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-3.service"], - "RISING": ["present-deassert@mtia-blade-3.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE4_N", - "ChipId": "2", - "GpioNum": 8, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-4.service"], - "RISING": ["present-deassert@mtia-blade-4.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE5_N", - "ChipId": "2", - "GpioNum": 10, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-5.service"], - "RISING": ["present-deassert@mtia-blade-5.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE6_N", - "ChipId": "2", - "GpioNum": 12, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-6.service"], - "RISING": ["present-deassert@mtia-blade-6.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE7_N", - "ChipId": "2", - "GpioNum": 14, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-7.service"], - "RISING": ["present-deassert@mtia-blade-7.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE8_N", - "ChipId": "2", - "GpioNum": 16, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-8.service"], - "RISING": ["present-deassert@mtia-blade-8.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE9_N", - "ChipId": "2", - "GpioNum": 18, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-9.service"], - "RISING": ["present-deassert@mtia-blade-9.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE10_N", - "ChipId": "2", - "GpioNum": 20, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-10.service"], - "RISING": ["present-deassert@mtia-blade-10.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE11_N", - "ChipId": "2", - "GpioNum": 22, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-11.service"], - "RISING": ["present-deassert@mtia-blade-11.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE12_N", - "ChipId": "2", - "GpioNum": 24, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-12.service"], - "RISING": ["present-deassert@mtia-blade-12.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE13_N", - "ChipId": "2", - "GpioNum": 26, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-13.service"], - "RISING": ["present-deassert@mtia-blade-13.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE14_N", - "ChipId": "2", - "GpioNum": 28, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-14.service"], - "RISING": ["present-deassert@mtia-blade-14.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE15_N", - "ChipId": "2", - "GpioNum": 30, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-15.service"], - "RISING": ["present-deassert@mtia-blade-15.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE0_N", - "ChipId": "2", - "GpioNum": 32, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-0.service"], - "RISING": ["present-deassert@network-blade-0.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE1_N", - "ChipId": "2", - "GpioNum": 34, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-1.service"], - "RISING": ["present-deassert@network-blade-1.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE2_N", - "ChipId": "2", - "GpioNum": 36, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-2.service"], - "RISING": ["present-deassert@network-blade-2.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE3_N", - "ChipId": "2", - "GpioNum": 38, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-3.service"], - "RISING": ["present-deassert@network-blade-3.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE4_N", - "ChipId": "2", - "GpioNum": 40, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-4.service"], - "RISING": ["present-deassert@network-blade-4.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE5_N", - "ChipId": "2", - "GpioNum": 42, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-5.service"], - "RISING": ["present-deassert@network-blade-5.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_TOP_0_N", - "ChipId": "2", - "GpioNum": 44, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-top-0.service"], - "RISING": ["present-deassert@fcb-top-0.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_TOP_1_N", - "ChipId": "2", - "GpioNum": 46, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-top-1.service"], - "RISING": ["present-deassert@fcb-top-1.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_MIDDLE_0_N", - "ChipId": "2", - "GpioNum": 48, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-mid-0.service"], - "RISING": ["present-deassert@fcb-mid-0.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_MIDDLE_1_N", - "ChipId": "2", - "GpioNum": 50, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-mid-1.service"], - "RISING": ["present-deassert@fcb-mid-1.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_BOTTOM_0_N", - "ChipId": "2", - "GpioNum": 52, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-bot-0.service"], - "RISING": ["present-deassert@fcb-bot-0.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_BOTTOM_1_N", - "ChipId": "2", - "GpioNum": 54, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-bot-1.service"], - "RISING": ["present-deassert@fcb-bot-1.service"] - }, - "Continue": true - }, - { - "Name": "PWRGD_MTIA_BLADE0_PWROK", + "Name": "PWRGD_MTIA_BLADE1_PWROK_N", "ChipId": "2", "GpioNum": 56, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@mtia-blade-0.service"], - "RISING": ["power-good-deassert@mtia-blade-0.service"] - }, - "Continue": true - }, - { - "Name": "PWRGD_MTIA_BLADE1_PWROK", - "ChipId": "2", - "GpioNum": 58, - "EventMon": "BOTH", - "Targets": { "FALLING": ["power-good-assert@mtia-blade-1.service"], "RISING": ["power-good-deassert@mtia-blade-1.service"] }, "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE2_PWROK", + "Name": "PWRGD_MTIA_BLADE2_PWROK_N", "ChipId": "2", - "GpioNum": 60, + "GpioNum": 58, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-2.service"], @@ -341,9 +22,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE3_PWROK", + "Name": "PWRGD_MTIA_BLADE3_PWROK_N", "ChipId": "2", - "GpioNum": 62, + "GpioNum": 60, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-3.service"], @@ -352,9 +33,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE4_PWROK", + "Name": "PWRGD_MTIA_BLADE4_PWROK_N", "ChipId": "2", - "GpioNum": 64, + "GpioNum": 62, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-4.service"], @@ -363,9 +44,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE5_PWROK", + "Name": "PWRGD_MTIA_BLADE5_PWROK_N", "ChipId": "2", - "GpioNum": 66, + "GpioNum": 64, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-5.service"], @@ -374,9 +55,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE6_PWROK", + "Name": "PWRGD_MTIA_BLADE6_PWROK_N", "ChipId": "2", - "GpioNum": 68, + "GpioNum": 66, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-6.service"], @@ -385,9 +66,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE7_PWROK", + "Name": "PWRGD_MTIA_BLADE7_PWROK_N", "ChipId": "2", - "GpioNum": 70, + "GpioNum": 68, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-7.service"], @@ -396,9 +77,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE8_PWROK", + "Name": "PWRGD_MTIA_BLADE8_PWROK_N", "ChipId": "2", - "GpioNum": 72, + "GpioNum": 70, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-8.service"], @@ -407,9 +88,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE9_PWROK", + "Name": "PWRGD_MTIA_BLADE9_PWROK_N", "ChipId": "2", - "GpioNum": 74, + "GpioNum": 72, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-9.service"], @@ -418,9 +99,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE10_PWROK", + "Name": "PWRGD_MTIA_BLADE10_PWROK_N", "ChipId": "2", - "GpioNum": 76, + "GpioNum": 74, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-10.service"], @@ -429,9 +110,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE11_PWROK", + "Name": "PWRGD_MTIA_BLADE11_PWROK_N", "ChipId": "2", - "GpioNum": 78, + "GpioNum": 76, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-11.service"], @@ -440,9 +121,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE12_PWROK", + "Name": "PWRGD_MTIA_BLADE12_PWROK_N", "ChipId": "2", - "GpioNum": 80, + "GpioNum": 78, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-12.service"], @@ -451,9 +132,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE13_PWROK", + "Name": "PWRGD_MTIA_BLADE13_PWROK_N", "ChipId": "2", - "GpioNum": 82, + "GpioNum": 80, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-13.service"], @@ -462,9 +143,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE14_PWROK", + "Name": "PWRGD_MTIA_BLADE14_PWROK_N", "ChipId": "2", - "GpioNum": 84, + "GpioNum": 82, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-14.service"], @@ -473,9 +154,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE15_PWROK", + "Name": "PWRGD_MTIA_BLADE15_PWROK_N", "ChipId": "2", - "GpioNum": 86, + "GpioNum": 84, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-15.service"], @@ -484,20 +165,20 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE0_PWROK", + "Name": "PWRGD_MTIA_BLADE16_PWROK_N", "ChipId": "2", - "GpioNum": 88, + "GpioNum": 86, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@network-blade-0.service"], - "RISING": ["power-good-deassert@network-blade-0.service"] + "FALLING": ["power-good-assert@mtia-blade-16.service"], + "RISING": ["power-good-deassert@mtia-blade-16.service"] }, "Continue": true }, { - "Name": "PWRGD_NW_BLADE1_PWROK", + "Name": "PWRGD_NW_BLADE1_PWROK_N", "ChipId": "2", - "GpioNum": 90, + "GpioNum": 88, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@network-blade-1.service"], @@ -506,9 +187,9 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE2_PWROK", + "Name": "PWRGD_NW_BLADE2_PWROK_N", "ChipId": "2", - "GpioNum": 92, + "GpioNum": 90, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@network-blade-2.service"], @@ -517,9 +198,9 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE3_PWROK", + "Name": "PWRGD_NW_BLADE3_PWROK_N", "ChipId": "2", - "GpioNum": 94, + "GpioNum": 92, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@network-blade-3.service"], @@ -528,9 +209,9 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE4_PWROK", + "Name": "PWRGD_NW_BLADE4_PWROK_N", "ChipId": "2", - "GpioNum": 96, + "GpioNum": 94, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@network-blade-4.service"], @@ -539,9 +220,9 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE5_PWROK", + "Name": "PWRGD_NW_BLADE5_PWROK_N", "ChipId": "2", - "GpioNum": 98, + "GpioNum": 96, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@network-blade-5.service"], @@ -550,86 +231,86 @@ "Continue": true }, { - "Name": "PWRGD_FCB_TOP_0_PWROK", + "Name": "PWRGD_NW_BLADE6_PWROK_N", "ChipId": "2", - "GpioNum": 100, + "GpioNum": 98, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-top-0.service"], - "RISING": ["power-good-deassert@fcb-top-0.service"] + "FALLING": ["power-good-assert@network-blade-6.service"], + "RISING": ["power-good-deassert@network-blade-6.service"] }, "Continue": true }, { - "Name": "PWRGD_FCB_TOP_1_PWROK", + "Name": "PWRGD_FCB_1_N", "ChipId": "2", - "GpioNum": 102, + "GpioNum": 100, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-top-1.service"], - "RISING": ["power-good-deassert@fcb-top-1.service"] + "FALLING": ["power-good-assert@fcb-1.service"], + "RISING": ["power-good-deassert@fcb-1.service"] }, "Continue": true }, { - "Name": "PWRGD_FCB_MIDDLE_0_PWROK", + "Name": "PWRGD_FCB_2_N", "ChipId": "2", - "GpioNum": 104, + "GpioNum": 102, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-mid-0.service"], - "RISING": ["power-good-deassert@fcb-mid-0.service"] + "FALLING": ["power-good-assert@fcb-2.service"], + "RISING": ["power-good-deassert@fcb-2.service"] }, "Continue": true }, { - "Name": "PWRGD_FCB_MIDDLE_1_PWROK", + "Name": "PWRGD_FCB_3_N", "ChipId": "2", - "GpioNum": 106, + "GpioNum": 104, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-mid-1.service"], - "RISING": ["power-good-deassert@fcb-mid-1.service"] + "FALLING": ["power-good-assert@fcb-3.service"], + "RISING": ["power-good-deassert@fcb-3.service"] }, "Continue": true }, { - "Name": "PWRGD_FCB_BOTTOM_0_PWROK", + "Name": "PWRGD_FCB_4_N", "ChipId": "2", - "GpioNum": 108, + "GpioNum": 106, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-bot-0.service"], - "RISING": ["power-good-deassert@fcb-bot-0.service"] + "FALLING": ["power-good-assert@fcb-4.service"], + "RISING": ["power-good-deassert@fcb-4.service"] }, "Continue": true }, { - "Name": "PWRGD_FCB_BOTTOM_1_PWROK", + "Name": "PWRGD_FCB_6_N", "ChipId": "2", - "GpioNum": 110, + "GpioNum": 108, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-bot-1.service"], - "RISING": ["power-good-deassert@fcb-bot-1.service"] + "FALLING": ["power-good-assert@fcb-6.service"], + "RISING": ["power-good-deassert@fcb-6.service"] }, "Continue": true }, { - "Name": "LEAK_DETECT_MTIA_BLADE0_N", + "Name": "PWRGD_FCB_5_N", "ChipId": "2", - "GpioNum": 112, + "GpioNum": 110, "EventMon": "BOTH", "Targets": { - "FALLING": ["leak-detect-assert@mtia-blade-0.service"], - "RISING": ["leak-detect-deassert@mtia-blade-0.service"] + "FALLING": ["power-good-assert@fcb-5.service"], + "RISING": ["power-good-deassert@fcb-5.service"] }, "Continue": true }, { "Name": "LEAK_DETECT_MTIA_BLADE1_N", "ChipId": "2", - "GpioNum": 114, + "GpioNum": 112, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-1.service"], @@ -640,7 +321,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE2_N", "ChipId": "2", - "GpioNum": 116, + "GpioNum": 114, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-2.service"], @@ -651,7 +332,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE3_N", "ChipId": "2", - "GpioNum": 118, + "GpioNum": 116, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-3.service"], @@ -662,7 +343,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE4_N", "ChipId": "2", - "GpioNum": 120, + "GpioNum": 118, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-4.service"], @@ -673,7 +354,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE5_N", "ChipId": "2", - "GpioNum": 122, + "GpioNum": 120, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-5.service"], @@ -684,7 +365,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE6_N", "ChipId": "2", - "GpioNum": 124, + "GpioNum": 122, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-6.service"], @@ -695,7 +376,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE7_N", "ChipId": "2", - "GpioNum": 126, + "GpioNum": 124, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-7.service"], @@ -706,7 +387,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE8_N", "ChipId": "2", - "GpioNum": 128, + "GpioNum": 126, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-8.service"], @@ -717,7 +398,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE9_N", "ChipId": "2", - "GpioNum": 130, + "GpioNum": 128, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-9.service"], @@ -728,7 +409,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE10_N", "ChipId": "2", - "GpioNum": 132, + "GpioNum": 130, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-10.service"], @@ -739,7 +420,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE11_N", "ChipId": "2", - "GpioNum": 134, + "GpioNum": 132, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-11.service"], @@ -750,7 +431,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE12_N", "ChipId": "2", - "GpioNum": 136, + "GpioNum": 134, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-12.service"], @@ -761,7 +442,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE13_N", "ChipId": "2", - "GpioNum": 138, + "GpioNum": 136, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-13.service"], @@ -772,7 +453,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE14_N", "ChipId": "2", - "GpioNum": 140, + "GpioNum": 138, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-14.service"], @@ -783,7 +464,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE15_N", "ChipId": "2", - "GpioNum": 142, + "GpioNum": 140, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-15.service"], @@ -792,20 +473,20 @@ "Continue": true }, { - "Name": "LEAK_DETECT_NW_BLADE0_N", + "Name": "LEAK_DETECT_MTIA_BLADE16_N", "ChipId": "2", - "GpioNum": 144, + "GpioNum": 142, "EventMon": "BOTH", "Targets": { - "FALLING": ["leak-detect-assert@network-blade-0.service"], - "RISING": ["leak-detect-deassert@network-blade-0.service"] + "FALLING": ["leak-detect-assert@mtia-blade-16.service"], + "RISING": ["leak-detect-deassert@mtia-blade-16.service"] }, "Continue": true }, { "Name": "LEAK_DETECT_NW_BLADE1_N", "ChipId": "2", - "GpioNum": 146, + "GpioNum": 144, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@network-blade-1.service"], @@ -816,7 +497,7 @@ { "Name": "LEAK_DETECT_NW_BLADE2_N", "ChipId": "2", - "GpioNum": 148, + "GpioNum": 146, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@network-blade-2.service"], @@ -827,7 +508,7 @@ { "Name": "LEAK_DETECT_NW_BLADE3_N", "ChipId": "2", - "GpioNum": 150, + "GpioNum": 148, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@network-blade-3.service"], @@ -838,7 +519,7 @@ { "Name": "LEAK_DETECT_NW_BLADE4_N", "ChipId": "2", - "GpioNum": 152, + "GpioNum": 150, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@network-blade-4.service"], @@ -849,7 +530,7 @@ { "Name": "LEAK_DETECT_NW_BLADE5_N", "ChipId": "2", - "GpioNum": 154, + "GpioNum": 152, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@network-blade-5.service"], @@ -858,20 +539,20 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE0_HSC_PWROK_N", + "Name": "LEAK_DETECT_NW_BLADE6_N", "ChipId": "2", - "GpioNum": 156, + "GpioNum": 154, "EventMon": "BOTH", "Targets": { - "FALLING": ["ac-power-good-assert@mtia-blade-0.service"], - "RISING": ["ac-power-good-deassert@mtia-blade-0.service"] + "FALLING": ["leak-detect-assert@network-blade-6.service"], + "RISING": ["leak-detect-deassert@network-blade-6.service"] }, "Continue": true }, { "Name": "PWRGD_MTIA_BLADE1_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 158, + "GpioNum": 156, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-1.service"], @@ -882,7 +563,7 @@ { "Name": "PWRGD_MTIA_BLADE2_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 160, + "GpioNum": 158, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-2.service"], @@ -893,7 +574,7 @@ { "Name": "PWRGD_MTIA_BLADE3_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 162, + "GpioNum": 160, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-3.service"], @@ -904,7 +585,7 @@ { "Name": "PWRGD_MTIA_BLADE4_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 164, + "GpioNum": 162, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-4.service"], @@ -915,7 +596,7 @@ { "Name": "PWRGD_MTIA_BLADE5_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 166, + "GpioNum": 164, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-5.service"], @@ -926,7 +607,7 @@ { "Name": "PWRGD_MTIA_BLADE6_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 168, + "GpioNum": 166, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-6.service"], @@ -937,7 +618,7 @@ { "Name": "PWRGD_MTIA_BLADE7_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 170, + "GpioNum": 168, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-7.service"], @@ -948,7 +629,7 @@ { "Name": "PWRGD_MTIA_BLADE8_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 172, + "GpioNum": 170, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-8.service"], @@ -959,7 +640,7 @@ { "Name": "PWRGD_MTIA_BLADE9_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 174, + "GpioNum": 172, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-9.service"], @@ -970,7 +651,7 @@ { "Name": "PWRGD_MTIA_BLADE10_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 176, + "GpioNum": 174, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-10.service"], @@ -981,7 +662,7 @@ { "Name": "PWRGD_MTIA_BLADE11_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 178, + "GpioNum": 176, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-11.service"], @@ -992,7 +673,7 @@ { "Name": "PWRGD_MTIA_BLADE12_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 180, + "GpioNum": 178, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-12.service"], @@ -1003,7 +684,7 @@ { "Name": "PWRGD_MTIA_BLADE13_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 182, + "GpioNum": 180, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-13.service"], @@ -1014,7 +695,7 @@ { "Name": "PWRGD_MTIA_BLADE14_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 184, + "GpioNum": 182, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-14.service"], @@ -1025,7 +706,7 @@ { "Name": "PWRGD_MTIA_BLADE15_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 186, + "GpioNum": 184, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-15.service"], @@ -1034,20 +715,20 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE0_HSC_PWROK_N", + "Name": "PWRGD_MTIA_BLADE16_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 188, + "GpioNum": 186, "EventMon": "BOTH", "Targets": { - "FALLING": ["ac-power-good-assert@network-blade-0.service"], - "RISING": ["ac-power-good-deassert@network-blade-0.service"] + "FALLING": ["ac-power-good-assert@mtia-blade-16.service"], + "RISING": ["ac-power-good-deassert@mtia-blade-16.service"] }, "Continue": true }, { "Name": "PWRGD_NW_BLADE1_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 190, + "GpioNum": 188, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@network-blade-1.service"], @@ -1058,7 +739,7 @@ { "Name": "PWRGD_NW_BLADE2_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 192, + "GpioNum": 190, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@network-blade-2.service"], @@ -1069,7 +750,7 @@ { "Name": "PWRGD_NW_BLADE3_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 194, + "GpioNum": 192, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@network-blade-3.service"], @@ -1080,7 +761,7 @@ { "Name": "PWRGD_NW_BLADE4_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 196, + "GpioNum": 194, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@network-blade-4.service"], @@ -1091,7 +772,7 @@ { "Name": "PWRGD_NW_BLADE5_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 198, + "GpioNum": 196, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@network-blade-5.service"], @@ -1100,79 +781,79 @@ "Continue": true }, { - "Name": "RPU_READY", + "Name": "PWRGD_NW_BLADE6_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 200, + "GpioNum": 198, "EventMon": "BOTH", "Targets": { - "FALLING": ["rpu-ready-deassert.service"], - "RISING": ["rpu-ready-assert.service"] + "FALLING": ["ac-power-good-assert@network-blade-6.service"], + "RISING": ["ac-power-good-deassert@network-blade-6.service"] }, "Continue": true }, { - "Name": "CMM_CABLE_CARTRIDGE_PRSNT_TOP_N", + "Name": "RPU_READY", "ChipId": "2", - "GpioNum": 224, + "GpioNum": 200, "EventMon": "BOTH", "Targets": { - "FALLING": ["cable-present-assert@cmm-cartridge-top.service"], - "RISING": ["cable-present-deassert@cmm-cartridge-top.service"] + "FALLING": ["rpu-ready-deassert@rpu_ready.service"], + "RISING": ["rpu-ready-assert@rpu_ready.service"] }, "Continue": true }, { - "Name": "CMM_CABLE_CARTRIDGE_PRSNT_BOT_N", + "Name": "RPU_READY_SPARE", "ChipId": "2", - "GpioNum": 222, + "GpioNum": 246, "EventMon": "BOTH", "Targets": { - "FALLING": ["cable-present-assert@cmm-cartridge-bot.service"], - "RISING": ["cable-present-deassert@cmm-cartridge-bot.service"] + "FALLING": ["rpu-ready-deassert@rpu_ready_spare.service"], + "RISING": ["rpu-ready-assert@rpu_ready_spare.service"] }, "Continue": true }, { - "Name": "BOT_BCB_CABLE_PRSNT_N", + "Name": "CHASSIS_LEAK0_DETECT_N", "ChipId": "2", - "GpioNum": 226, + "GpioNum": 234, "EventMon": "BOTH", "Targets": { - "FALLING": ["cable-present-assert@bcb-bot.service"], - "RISING": ["cable-present-deassert@bcb-bot.service"] + "FALLING": ["leak-detect-assert@chassis-leak-sensor-0.service"], + "RISING": ["leak-detect-deassert@chassis-leak-sensor-0.service"] }, "Continue": true }, { - "Name": "TOP_BCB_CABLE_PRSNT_N", + "Name": "CHASSIS_LEAK1_DETECT_N", "ChipId": "2", - "GpioNum": 228, + "GpioNum": 236, "EventMon": "BOTH", "Targets": { - "FALLING": ["cable-present-assert@bcb-top.service"], - "RISING": ["cable-present-deassert@bcb-top.service"] + "FALLING": ["leak-detect-assert@chassis-leak-sensor-1.service"], + "RISING": ["leak-detect-deassert@chassis-leak-sensor-1.service"] }, "Continue": true }, { - "Name": "CR_TOGGLE_BOOT_N", + "Name": "IT_GEAR_LEAK", "ChipId": "2", - "GpioNum": 216, + "GpioNum": 204, "EventMon": "BOTH", "Targets": { - "FALLING": ["present-assert@cmm-blade-toggle-switch.service"], - "RISING": ["present-deassert@cmm-blade-toggle-switch.service"] + "FALLING": ["leak-detect-deassert@it-gear-leak.service"], + "RISING": ["leak-detect-assert@it-gear-leak.service"] }, "Continue": true }, { - "Name": "MGMT_SFP_PRSNT_N", + "Name": "IT_GEAR_LEAK_SPARE", "ChipId": "2", - "GpioNum": 238, + "GpioNum": 248, "EventMon": "BOTH", "Targets": { - "FALLING": ["sfp-present-assert.service"], - "RISING": ["sfp-present-deassert.service"] + "FALLING": ["leak-detect-deassert@it-gear-leak-spare.service"], + "RISING": ["leak-detect-assert@it-gear-leak-spare.service"] }, "Continue": true } diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-presence.json b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-presence.json new file mode 100644 index 0000000000..507fb43b26 --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-presence.json @@ -0,0 +1,247 @@ +[ + { + "Name": "PRSNT_MTIA_BLADE1", + "LineName": "PRSNT_MTIA_BLADE1_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE1" + }, + { + "Name": "PRSNT_MTIA_BLADE2", + "LineName": "PRSNT_MTIA_BLADE2_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE2" + }, + { + "Name": "PRSNT_MTIA_BLADE3", + "LineName": "PRSNT_MTIA_BLADE3_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE3" + }, + { + "Name": "PRSNT_MTIA_BLADE4", + "LineName": "PRSNT_MTIA_BLADE4_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE4" + }, + { + "Name": "PRSNT_MTIA_BLADE5", + "LineName": "PRSNT_MTIA_BLADE5_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE5" + }, + { + "Name": "PRSNT_MTIA_BLADE6", + "LineName": "PRSNT_MTIA_BLADE6_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE6" + }, + { + "Name": "PRSNT_MTIA_BLADE7", + "LineName": "PRSNT_MTIA_BLADE7_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE7" + }, + { + "Name": "PRSNT_MTIA_BLADE8", + "LineName": "PRSNT_MTIA_BLADE8_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE8" + }, + { + "Name": "PRSNT_MTIA_BLADE9", + "LineName": "PRSNT_MTIA_BLADE9_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE9" + }, + { + "Name": "PRSNT_MTIA_BLADE10", + "LineName": "PRSNT_MTIA_BLADE10_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE10" + }, + { + "Name": "PRSNT_MTIA_BLADE11", + "LineName": "PRSNT_MTIA_BLADE11_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE11" + }, + { + "Name": "PRSNT_MTIA_BLADE12", + "LineName": "PRSNT_MTIA_BLADE12_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE12" + }, + { + "Name": "PRSNT_MTIA_BLADE13", + "LineName": "PRSNT_MTIA_BLADE13_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE13" + }, + { + "Name": "PRSNT_MTIA_BLADE14", + "LineName": "PRSNT_MTIA_BLADE14_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE14" + }, + { + "Name": "PRSNT_MTIA_BLADE15", + "LineName": "PRSNT_MTIA_BLADE15_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE15" + }, + { + "Name": "PRSNT_MTIA_BLADE16", + "LineName": "PRSNT_MTIA_BLADE16_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE16" + }, + { + "Name": "PRSNT_NW_BLADE1", + "LineName": "PRSNT_NW_BLADE1_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE1" + }, + { + "Name": "PRSNT_NW_BLADE2", + "LineName": "PRSNT_NW_BLADE2_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE2" + }, + { + "Name": "PRSNT_NW_BLADE3", + "LineName": "PRSNT_NW_BLADE3_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE3" + }, + { + "Name": "PRSNT_NW_BLADE4", + "LineName": "PRSNT_NW_BLADE4_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE4" + }, + { + "Name": "PRSNT_NW_BLADE5", + "LineName": "PRSNT_NW_BLADE5_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE5" + }, + { + "Name": "PRSNT_NW_BLADE6", + "LineName": "PRSNT_NW_BLADE6_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE6" + }, + { + "Name": "PRSNT_FCB_1", + "LineName": "PRSNT_FCB_1_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_1" + }, + { + "Name": "PRSNT_FCB_2", + "LineName": "PRSNT_FCB_2_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_2" + }, + { + "Name": "PRSNT_FCB_3", + "LineName": "PRSNT_FCB_3_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_3" + }, + { + "Name": "PRSNT_FCB_4", + "LineName": "PRSNT_FCB_4_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_4" + }, + { + "Name": "PRSNT_FCB_5", + "LineName": "PRSNT_FCB_5_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_5" + }, + { + "Name": "PRSNT_FCB_6", + "LineName": "PRSNT_FCB_6_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_6" + }, + { + "Name": "PRSNT_CABLE_CARTRIDGE_TOP", + "LineName": "CMM_CABLE_CARTRIDGE_PRSNT_TOP_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_CABLE_CARTRIDGE_TOP" + }, + { + "Name": "PRSNT_CABLE_CARTRIDGE_BOT", + "LineName": "CMM_CABLE_CARTRIDGE_PRSNT_BOT_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_CABLE_CARTRIDGE_BOT" + }, + { + "Name": "PRSNT_BCB_CABLE_BOT", + "LineName": "BOT_BCB_CABLE_PRSNT_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_BCB_CABLE_BOT" + }, + { + "Name": "PRSNT_BCB_CABLE_TOP", + "LineName": "TOP_BCB_CABLE_PRSNT_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_BCB_CABLE_TOP" + }, + { + "Name": "CR_TOGGLE_BOOT", + "LineName": "CR_TOGGLE_BOOT_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/CR_TOGGLE_BOOT" + }, + { + "Name": "IT_GEAR_RPU_LINK", + "LineName": "IT_GEAR_RPU_LINK_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/IT_GEAR_RPU_LINK" + }, + { + "Name": "IT_GEAR_RPU_LINK_SPARE", + "LineName": "IT_GEAR_RPU_LINK_SPARE_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/IT_GEAR_RPU_LINK_SPARE" + } +] diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-assert@.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-assert@.service deleted file mode 100644 index 3f35e55e8d..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-assert@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=%i Present Assert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i present assert" "BLADE" "%i" -SyslogIdentifier=%i-present-assert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-deassert@.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-deassert@.service deleted file mode 100644 index f9b8d3e2dc..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-deassert@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=%i Present Deassert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i present deassert" "BLADE" "%i" -SyslogIdentifier=%i-present-deassert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert.service deleted file mode 100644 index 19d8811fbb..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=RPU ready Assert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "RPU ready assert" "AALC" "RPU" -SyslogIdentifier=rpu-ready-assert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert@.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert@.service new file mode 100644 index 0000000000..ef953dcfe6 --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert@.service @@ -0,0 +1,7 @@ +[Unit] +Description=%i Assert + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i assert" "AALC" "%i" +SyslogIdentifier=rpu-ready-assert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert.service deleted file mode 100644 index b028e03340..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=RPU ready Deassert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "RPU ready deassert" "AALC" "RPU" -SyslogIdentifier=rpu-ready-deassert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert@.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert@.service new file mode 100644 index 0000000000..d15562570a --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert@.service @@ -0,0 +1,7 @@ +[Unit] +Description=%i Deassert + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i deassert" "AALC" "%i" +SyslogIdentifier=rpu-ready-deassert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-assert.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-assert.service deleted file mode 100644 index 5388faa566..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-assert.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=MGMT SFP Present Assert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/sfp-present-check 0 -SyslogIdentifier=sfp-present-assert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-check b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-check deleted file mode 100644 index 980ee43248..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-check +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# shellcheck source=meta-facebook/meta-minerva/recipes-minerva/plat-tool/files/minerva-common-functions -source /usr/libexec/minerva-common-functions - -if [ "$1" == "0" ]; then - set_gpio MGMT_SFP_TX_DIS 0 -else - set_gpio MGMT_SFP_TX_DIS 1 -fi diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-deassert.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-deassert.service deleted file mode 100644 index 875c0a99c4..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-deassert.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=MGMT SFP Present Deassert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/sfp-present-check 1 -SyslogIdentifier=sfp-present-deassert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index cc6c54c42d..b8a12fc43e 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -2,18 +2,12 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd systemd -SERVICE_LIST = "present-assert@.service \ - present-deassert@.service \ - power-good-assert@.service \ +SERVICE_LIST = "power-good-assert@.service \ power-good-deassert@.service \ leak-detect-assert@.service \ leak-detect-deassert@.service \ - rpu-ready-assert.service \ - rpu-ready-deassert.service \ - cable-present-assert@.service \ - cable-present-deassert@.service \ - sfp-present-assert.service \ - sfp-present-deassert.service \ + rpu-ready-assert@.service \ + rpu-ready-deassert@.service \ ac-power-good-assert@.service \ ac-power-good-deassert@.service \ " @@ -21,8 +15,8 @@ SERVICE_LIST = "present-assert@.service \ SERVICE_FILE_FMT = "file://{0}" SRC_URI += "file://minerva-phosphor-multi-gpio-monitor.json \ + file://minerva-phosphor-multi-gpio-presence.json \ file://logging \ - file://sfp-present-check \ ${@compose_list(d, 'SERVICE_FILE_FMT', 'SERVICE_LIST')} \ " @@ -38,6 +32,8 @@ do_install:append:() { install -d ${D}${datadir}/phosphor-gpio-monitor install -m 0644 ${WORKDIR}/minerva-phosphor-multi-gpio-monitor.json \ ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json + install -m 0644 ${WORKDIR}/minerva-phosphor-multi-gpio-presence.json \ + ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-presence.json for s in ${SERVICE_LIST} do @@ -46,5 +42,4 @@ do_install:append:() { install -d ${D}${libexecdir}/${PN} install -m 0755 ${WORKDIR}/logging ${D}${libexecdir}/${PN}/ - install -m 0755 ${WORKDIR}/sfp-present-check ${D}${libexecdir}/${PN}/ } diff --git a/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc b/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc index 58c3a46db6..d6efc962ec 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc +++ b/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc @@ -5,6 +5,11 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ phosphor-gpio-monitor \ " +# Monitor gpio presence status +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + phosphor-gpio-monitor-presence \ +" + # Temporarily add plat-svc for gpio initialization OBMC_IMAGE_EXTRA_INSTALL:append = " \ plat-svc \ @@ -41,3 +46,8 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ OBMC_IMAGE_EXTRA_INSTALL:append = " \ phosphor-power-control \ " + +# Enable mbpoll for communication with the smart valve by modbus command +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + mbpoll \ +" diff --git a/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json index 53f6cba7bd..d6e385f5a4 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json +++ b/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json @@ -6,6 +6,7 @@ { "Name" : "bmc_heartbeat_amber", "Action" : "Blink", + "Priority" : "Blink", "DutyOn" : 50, "Period" : 1000 } @@ -27,6 +28,7 @@ { "Name": "fp_id_amber", "Action": "Blink", + "Priority" : "Blink", "DutyOn": 50, "Period": 250 } @@ -37,11 +39,13 @@ "members": [ { "Name": "fan_status_led", - "Action": "On" + "Action": "On", + "Priority" : "Blink" }, { "Name": "fan_fault_led_n", - "Action": "On" + "Action": "On", + "Priority" : "Blink" } ] } diff --git a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend index 4f8d258055..4ef3a959ed 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,4 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +PACKAGECONFIG:append = " host-gpio" CHASSIS_DEFAULT_TARGETS:remove = " \ obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-on@{}.service \ diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh b/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/bios-update index 4b99f0be4a..4b99f0be4a 100755 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/bios-update diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service b/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service index 7e098908e5..7d1dc08a03 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service @@ -4,4 +4,4 @@ Description=Flash Host Bios image %I to Host [Service] Type=oneshot RemainAfterExit=no -ExecStart=/usr/sbin/bios-update.sh /tmp/images/%i +ExecStart=/usr/sbin/bios-update /tmp/images/%i diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 047f01970a..6dd496f071 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,10 +1,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://bios-update.sh" +SRC_URI += "file://bios-update" PACKAGECONFIG:append = " flash_bios" RDEPENDS:${PN} += "bash" do_install:append() { install -d ${D}/${sbindir} - install -m 0755 ${WORKDIR}/bios-update.sh ${D}/${sbindir}/ + install -m 0755 ${WORKDIR}/bios-update ${D}/${sbindir}/ } diff --git a/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/fb-powerctrl_0.1.bb b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/fb-powerctrl_0.1.bb index 21bd220432..0af04f1df3 100644 --- a/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/fb-powerctrl_0.1.bb +++ b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/fb-powerctrl_0.1.bb @@ -6,7 +6,7 @@ inherit allarch systemd obmc-phosphor-systemd RDEPENDS:${PN} += "bash" SRC_URI += " \ - file://setup_gpio.sh \ + file://setup_gpio \ file://power-util \ file://host-gpio.service \ file://host-poweroff.service \ @@ -23,6 +23,6 @@ S = "${WORKDIR}" do_install() { install -d ${D}/usr/sbin - install -m 0755 ${S}/setup_gpio.sh ${D}/${sbindir}/ + install -m 0755 ${S}/setup_gpio ${D}/${sbindir}/ install -m 0755 ${S}/power-util ${D}/${sbindir}/ } diff --git a/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/host-gpio.service b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/host-gpio.service index 82ba12e8ec..758de9f14d 100644 --- a/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/host-gpio.service +++ b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/host-gpio.service @@ -5,5 +5,5 @@ Description=Configure GPIOs for Tiogapass Restart=no RemainAfterExit=true Type=oneshot -ExecStart=/usr/sbin/setup_gpio.sh -SyslogIdentifier=setup_gpio.sh +ExecStart=/usr/sbin/setup_gpio +SyslogIdentifier=setup_gpio diff --git a/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/setup_gpio.sh b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/setup_gpio index cac3b20c7d..cac3b20c7d 100755 --- a/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/setup_gpio.sh +++ b/meta-facebook/meta-tiogapass/recipes-tiogapass/fb-powerctrl/files/setup_gpio diff --git a/meta-facebook/meta-ventura/conf/layer.conf b/meta-facebook/meta-ventura/conf/layer.conf new file mode 100644 index 0000000000..2cf81ec8f2 --- /dev/null +++ b/meta-facebook/meta-ventura/conf/layer.conf @@ -0,0 +1,11 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "ventura-layer" +BBFILE_PATTERN_ventura-layer := "^${LAYERDIR}/" + +LAYERSERIES_COMPAT_ventura-layer := "nanbield scarthgap" diff --git a/meta-facebook/meta-ventura/conf/machine/ventura.conf b/meta-facebook/meta-ventura/conf/machine/ventura.conf new file mode 100644 index 0000000000..21dc37e572 --- /dev/null +++ b/meta-facebook/meta-ventura/conf/machine/ventura.conf @@ -0,0 +1,18 @@ +KMACHINE = "aspeed" +#KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb" +KERNEL_DEVICETREE = "aspeed/aspeed-ast2600-evb.dtb" + +UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" +UBOOT_DEVICETREE = "ast2600-bletchley" +SPL_BINARY = "spl/u-boot-spl.bin" +SOCSEC_SIGN_ENABLE = "0" + +OBMC_COMPATIBLE_NAMES = "com.meta.Hardware.BMC.Model.Ventura" + +require conf/distro/include/phosphor-static-norootfs.inc +require conf/machine/include/facebook-nohost.inc +require conf/machine/include/ast2600.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/facebook-tpm2.inc + +FLASH_SIZE = "131072" diff --git a/meta-facebook/meta-ventura/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-ventura/conf/templates/default/bblayers.conf.sample new file mode 100644 index 0000000000..a3598f2d5f --- /dev/null +++ b/meta-facebook/meta-ventura/conf/templates/default/bblayers.conf.sample @@ -0,0 +1,18 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security/meta-tpm \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-facebook \ + ##OEROOT##/meta-facebook/meta-ventura \ + " diff --git a/meta-facebook/meta-ventura/conf/templates/default/conf-notes.txt b/meta-facebook/meta-ventura/conf/templates/default/conf-notes.txt new file mode 100644 index 0000000000..43d4ab099d --- /dev/null +++ b/meta-facebook/meta-ventura/conf/templates/default/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-facebook/meta-ventura/conf/templates/default/local.conf.sample b/meta-facebook/meta-ventura/conf/templates/default/local.conf.sample new file mode 100644 index 0000000000..0971308f52 --- /dev/null +++ b/meta-facebook/meta-ventura/conf/templates/default/local.conf.sample @@ -0,0 +1,258 @@ + +# This file is your local configuration file and is where all local user settings +# are placed. The comments in this file give some guide to the options a new user +# to the system might want to change but pretty much any configuration option can +# be set in this file. More adventurous users can look at local.conf.extended +# which contains other examples of configuration which can be placed in this file +# but new users likely won't need any of them initially. +# +# Lines starting with the '#' character are commented out and in some cases the +# default values are provided as comments to show people example syntax. Enabling +# the option is a question of removing the # character and making any change to the +# variable as required. + +# +# Machine Selection +# +MACHINE ??= "ventura" + +# +# Where to place downloads +# +# During a first build the system will download many different source code tarballs +# from various upstream projects. This can take a while, particularly if your network +# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you +# can preserve this directory to speed up this part of subsequent builds. This directory +# is safe to share between multiple builds on the same machine too. +# +# The default is a downloads directory under TOPDIR which is the build directory. +# +#DL_DIR ?= "${TOPDIR}/downloads" + +# +# Where to place shared-state files +# +# BitBake has the capability to accelerate builds based on previously built output. +# This is done using "shared state" files which can be thought of as cache objects +# and this option determines where those files are placed. +# +# You can wipe out TMPDIR leaving this directory intact and the build would regenerate +# from these files if no changes were made to the configuration. If changes were made +# to the configuration, only shared state files where the state was still valid would +# be used (done using checksums). +# +# The default is a sstate-cache directory under TOPDIR. +# +#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" + +# +# Where to place the build output +# +# This option specifies where the bulk of the building work should be done and +# where BitBake should place its temporary files and output. Keep in mind that +# this includes the extraction and compilation of many applications and the toolchain +# which can use Gigabytes of hard disk space. +# +# The default is a tmp directory under TOPDIR. +# +#TMPDIR = "${TOPDIR}/tmp" + +# +# Default policy config +# +# The distribution setting controls which policy settings are used as defaults. +# The default value is fine for general Yocto project use, at least initially. +# Ultimately when creating custom policy, people will likely end up subclassing +# these defaults. +# +DISTRO ?= "openbmc-phosphor" +# As an example of a subclass there is a "bleeding" edge policy configuration +# where many versions are set to the absolute latest code from the upstream +# source control systems. This is just mentioned here as an example, its not +# useful to most new users. +# DISTRO ?= "poky-bleeding" + +# +# Package Management configuration +# +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used +# to generate the root filesystems. +# Options are: +# - 'package_deb' for debian style deb files +# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) +# - 'package_rpm' for rpm style packages +# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" +# We default to ipk: +PACKAGE_CLASSES ?= "package_ipk" + +# +# SDK target architecture +# +# This variable specifies the architecture to build SDK items for and means +# you can build the SDK packages for architectures other than the machine you are +# running the build on (i.e. building i686 packages on an x86_64 host). +# Supported values are i686, x86_64, aarch64 +#SDKMACHINE ?= "i686" + +SANITY_TESTED_DISTROS:append ?= " *" + +# +# Extra image configuration defaults +# +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# images. Some of these options are added to certain image types automatically. The +# variable can contain the following options: +# "dbg-pkgs" - add -dbg packages for all installed packages +# (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) +# "dev-pkgs" - add -dev packages for all installed packages +# (useful if you want to develop against libs in the image) +# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages +# (useful if you want to run the package test suites) +# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) +# "tools-debug" - add debugging tools (gdb, strace) +# "eclipse-debug" - add Eclipse remote debugging support +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) +# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) +# "debug-tweaks" - make an image suitable for development +# e.g. ssh root access has a blank password +# There are other application targets that can be used here too, see +# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. +# We default to enabling the debugging tweaks. +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" + +# +# Additional image features +# +# The following is a list of additional classes to use when building images which +# enable extra features. Some available options which can be included in this variable +# are: +# - 'buildstats' collect build statistics +USER_CLASSES ?= "buildstats" + +# +# Runtime testing of images +# +# The build system can test booting virtual machine images under qemu (an emulator) +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO_qemuall = "1" + +# +# Interactive shell configuration +# +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is +# multithreaded and needs to be able to handle the case where more than one parallel +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. +# +# Examples of the occasions this may happen are when resolving patches which cannot +# be applied, to use the devshell or the kernel menuconfig +# +# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none +# Note: currently, Konsole support only works for KDE 3.x due to the way +# newer Konsole versions behave +#OE_TERMINAL = "auto" +# By default disable interactive patch resolution (tasks will just fail instead): +PATCHRESOLVE = "noop" + +# +# Disk Space Monitoring during the build +# +# Monitor the disk space during the build. If there is less that 1GB of space or less +# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort +# of the build. The reason for this is that running completely out of space can corrupt +# files and damages the build in ways which may not be easily recoverable. +# It's necessary to monitor /tmp, if there is no space left the build will fail +# with very exotic errors. +BB_DISKMON_DIRS ??= "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" + +# +# Shared-state files from other locations +# +# As mentioned above, shared state files are prebuilt cache data objects which can be +# used to accelerate build time. This variable can be used to configure the system +# to search other mirror locations for these objects before it builds the data itself. +# +# This can be a filesystem directory, or a remote url such as http or ftp. These +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# cache locations to check for the shared objects. +# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH +# at the end as shown in the examples below. This will be substituted with the +# correct path within the directory structure. +#SSTATE_MIRRORS ?= "\ +#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* file:///some/local/dir/sstate/PATH" + +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following line. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" + +# +# Qemu configuration +# +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +PACKAGECONFIG:append:pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" + +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" + +# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to +# track the version of this file when it was generated. This can safely be ignored if +# this doesn't mean anything to you. +CONF_VERSION = "2" + +# Set the root password to '0penBmc' +# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc diff --git a/meta-facebook/meta-ventura/recipes-bsp/u-boot/u-boot-aspeed-sdk/ventura.cfg b/meta-facebook/meta-ventura/recipes-bsp/u-boot/u-boot-aspeed-sdk/ventura.cfg new file mode 100644 index 0000000000..6419b95298 --- /dev/null +++ b/meta-facebook/meta-ventura/recipes-bsp/u-boot/u-boot-aspeed-sdk/ventura.cfg @@ -0,0 +1,3 @@ +ONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS4,57600n8 root=/dev/ram rw vmalloc=768M" +CONFIG_BAUDRATE=57600 diff --git a/meta-facebook/meta-ventura/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-facebook/meta-ventura/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend new file mode 100644 index 0000000000..1656f36be1 --- /dev/null +++ b/meta-facebook/meta-ventura/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI +="file://ventura.cfg" diff --git a/meta-facebook/meta-ventura/recipes-kernel/linux/linux-aspeed/ventura.cfg b/meta-facebook/meta-ventura/recipes-kernel/linux/linux-aspeed/ventura.cfg new file mode 100644 index 0000000000..6690bd3648 --- /dev/null +++ b/meta-facebook/meta-ventura/recipes-kernel/linux/linux-aspeed/ventura.cfg @@ -0,0 +1,33 @@ +# large memory support +CONFIG_HAVE_CLK=y +CONFIG_OF=y +CONFIG_VMSPLIT_3G_OPT=y +# I2C drivers +CONFIG_I2C=y +CONFIG_I2C_SLAVE=y +# ASPEED SGPIO +CONFIG_GPIO_ASPEED_SGPIO=y +# devmem +CONFIG_DEVMEM=y +# Aspeed OTP +CONFIG_ASPEED_OTP=y +# Enable loadable module +CONFIG_MODULES=y +# IPMI & IPMB +CONFIG_IPMI_HANDLER=y +CONFIG_IPMI_DEVICE_INTERFACE=y +CONFIG_IPMB_DEVICE_INTERFACE=y +# REGULATOR +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +# Sensors +CONFIG_I2C_MUX_PCA954x=y +CONFIG_SENSORS_INA238=y +CONFIG_SENSORS_INA2XX=y +CONFIG_SENSORS_LTC2945=y +CONFIG_SENSORS_LTC4286=y +CONFIG_SENSORS_MAX31790=y +CONFIG_SENSORS_ADC128D818=y + +# SPI GPIO +CONFIG_SPI_GPIO=y diff --git a/meta-facebook/meta-ventura/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-ventura/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 0000000000..c0be93755a --- /dev/null +++ b/meta-facebook/meta-ventura/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:" +SRC_URI += "file://ventura.cfg" diff --git a/meta-facebook/meta-ventura/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-facebook/meta-ventura/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json new file mode 100644 index 0000000000..fe51488c70 --- /dev/null +++ b/meta-facebook/meta-ventura/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json @@ -0,0 +1 @@ +[] diff --git a/meta-facebook/meta-ventura/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/meta-ventura/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 0000000000..d51654672a --- /dev/null +++ b/meta-facebook/meta-ventura/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append:ventura = " file://virtual_sensor_config.json " diff --git a/meta-facebook/meta-yosemite4/conf/machine/include/yosemite4-common.inc b/meta-facebook/meta-yosemite4/conf/machine/include/yosemite4-common.inc new file mode 100644 index 0000000000..9ed8a9ed33 --- /dev/null +++ b/meta-facebook/meta-yosemite4/conf/machine/include/yosemite4-common.inc @@ -0,0 +1,21 @@ +MACHINEOVERRIDES =. "yosemite4-common:" + +require conf/distro/include/phosphor-static-norootfs.inc +require conf/distro/include/pldm.inc +require conf/machine/include/facebook-compute-multihost.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/facebook-tpm2.inc +require conf/machine/include/facebook-ncsi-nic.inc + +FLASH_SIZE = "131072" + +OBMC_HOST_INSTANCES = "1 2 3 4 5 6 7 8" +# Primary chassis as Sled plus secondary chassis in N slots. +OBMC_CHASSIS_INSTANCES = "0 ${OBMC_HOST_INSTANCES}" + +NCSI_ETH_INTF = "eth0 eth1" + +VIRTUAL-RUNTIME_obmc-host-state-manager = "phosphor-state-manager-host" +VIRTUAL-RUNTIME_obmc-chassis-state-manager = "phosphor-state-manager-chassis" + +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "yosemite4-led-manager-config-native" diff --git a/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf b/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf index 802a164249..62afa1fd30 100644 --- a/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf +++ b/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf @@ -8,23 +8,5 @@ SOCSEC_SIGN_ENABLE = "0" OBMC_COMPATIBLE_NAMES = "com.meta.Hardware.BMC.Model.Yosemite4" -require conf/distro/include/phosphor-static-norootfs.inc -require conf/distro/include/pldm.inc -require conf/machine/include/facebook-compute-multihost.inc require conf/machine/include/ast2600.inc -require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/facebook-tpm2.inc -require conf/machine/include/facebook-ncsi-nic.inc - -FLASH_SIZE = "131072" - -OBMC_HOST_INSTANCES = "1 2 3 4 5 6 7 8" -# Primary chassis as Sled plus secondary chassis in N slots. -OBMC_CHASSIS_INSTANCES = "0 ${OBMC_HOST_INSTANCES}" - -NCSI_ETH_INTF = "eth0 eth1" - -VIRTUAL-RUNTIME_obmc-host-state-manager = "phosphor-state-manager-host" -VIRTUAL-RUNTIME_obmc-chassis-state-manager = "phosphor-state-manager-chassis" - -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "yosemite4-led-manager-config-native"
\ No newline at end of file +require conf/machine/include/yosemite4-common.inc diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/layer.conf b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/layer.conf new file mode 100644 index 0000000000..1f3253f9d0 --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/layer.conf @@ -0,0 +1,14 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +# Ignore bbappend related to ASPEED in meta-yosemite4 +BBMASK += ".*aspeed.*\.bbappend" + +BBFILE_COLLECTIONS += "yosemite4n-layer" +BBFILE_PATTERN_yosemite4n-layer := "^${LAYERDIR}/" + +LAYERSERIES_COMPAT_yosemite4n-layer := "nanbield scarthgap" diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/machine/yosemite4n.conf b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/machine/yosemite4n.conf new file mode 100644 index 0000000000..643af5e3fe --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/machine/yosemite4n.conf @@ -0,0 +1,27 @@ +KMACHINE = "nuvoton" +KERNEL_DEVICETREE = "nuvoton/${KMACHINE}-npcm845-yosemite4.dtb" + +UBOOT_MACHINE = "arbel_evb_defconfig" +UBOOT_DEVICETREE = "nuvoton-npcm845-yosemite4" + +IGPS_MACHINE = "EB" +DEVICE_GEN = "A1" + +OBMC_COMPATIBLE_NAMES = "com.meta.Hardware.BMC.Model.Yosemite4N" + +ARCH_DEFAULT_KERNELIMAGETYPE:npcm8xx = "Image" + +require meta-yosemite4/conf/machine/include/yosemite4-common.inc +require conf/machine/include/npcm8xx.inc + +UBOOT_MKIMAGE:append:npcm8xx = " -E -B 8" + +FLASH_UBOOT_OFFSET:flash-131072 = "0" +FLASH_MANIFEST_OFFSET:flash-131072 = "2808" +FLASH_UBOOT_ENV_OFFSET:flash-131072 = "2816" +FLASH_KERNEL_OFFSET:flash-131072 = "3072" +FLASH_ROFS_OFFSET:flash-131072 = "9216" +FLASH_RWFS_OFFSET:flash-131072 = "49152" + +SECURED_IMAGE = "False" +TIP_IMAGE = "False" diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/templates/default/bblayers.conf.sample new file mode 100644 index 0000000000..1073f083f5 --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/templates/default/bblayers.conf.sample @@ -0,0 +1,21 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security/meta-tpm \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-arm/meta-arm \ + ##OEROOT##/meta-arm/meta-arm-toolchain \ + ##OEROOT##/meta-nuvoton \ + ##OEROOT##/meta-facebook \ + ##OEROOT##/meta-facebook/meta-yosemite4 \ + ##OEROOT##/meta-facebook/meta-yosemite4/meta-yosemite4n \ + " diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/conf-notes.txt b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/templates/default/conf-notes.txt index 9b3c01a556..9b3c01a556 100644 --- a/meta-ieisystems/meta-nf5280m7/conf/templates/default/conf-notes.txt +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/templates/default/conf-notes.txt diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/templates/default/local.conf.sample b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/templates/default/local.conf.sample new file mode 100644 index 0000000000..e8ef5ffc2b --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/conf/templates/default/local.conf.sample @@ -0,0 +1,258 @@ +# +# This file is your local configuration file and is where all local user settings +# are placed. The comments in this file give some guide to the options a new user +# to the system might want to change but pretty much any configuration option can +# be set in this file. More adventurous users can look at local.conf.extended +# which contains other examples of configuration which can be placed in this file +# but new users likely won't need any of them initially. +# +# Lines starting with the '#' character are commented out and in some cases the +# default values are provided as comments to show people example syntax. Enabling +# the option is a question of removing the # character and making any change to the +# variable as required. + +# +# Machine Selection +# +MACHINE ??= "yosemite4n" + +# +# Where to place downloads +# +# During a first build the system will download many different source code tarballs +# from various upstream projects. This can take a while, particularly if your network +# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you +# can preserve this directory to speed up this part of subsequent builds. This directory +# is safe to share between multiple builds on the same machine too. +# +# The default is a downloads directory under TOPDIR which is the build directory. +# +#DL_DIR ?= "${TOPDIR}/downloads" + +# +# Where to place shared-state files +# +# BitBake has the capability to accelerate builds based on previously built output. +# This is done using "shared state" files which can be thought of as cache objects +# and this option determines where those files are placed. +# +# You can wipe out TMPDIR leaving this directory intact and the build would regenerate +# from these files if no changes were made to the configuration. If changes were made +# to the configuration, only shared state files where the state was still valid would +# be used (done using checksums). +# +# The default is a sstate-cache directory under TOPDIR. +# +#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" + +# +# Where to place the build output +# +# This option specifies where the bulk of the building work should be done and +# where BitBake should place its temporary files and output. Keep in mind that +# this includes the extraction and compilation of many applications and the toolchain +# which can use Gigabytes of hard disk space. +# +# The default is a tmp directory under TOPDIR. +# +#TMPDIR = "${TOPDIR}/tmp" + +# +# Default policy config +# +# The distribution setting controls which policy settings are used as defaults. +# The default value is fine for general Yocto project use, at least initially. +# Ultimately when creating custom policy, people will likely end up subclassing +# these defaults. +# +DISTRO ?= "openbmc-phosphor" +# As an example of a subclass there is a "bleeding" edge policy configuration +# where many versions are set to the absolute latest code from the upstream +# source control systems. This is just mentioned here as an example, its not +# useful to most new users. +# DISTRO ?= "poky-bleeding" + +# +# Package Management configuration +# +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used +# to generate the root filesystems. +# Options are: +# - 'package_deb' for debian style deb files +# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) +# - 'package_rpm' for rpm style packages +# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" +# We default to ipk: +PACKAGE_CLASSES ?= "package_ipk" + +# +# SDK target architecture +# +# This variable specifies the architecture to build SDK items for and means +# you can build the SDK packages for architectures other than the machine you are +# running the build on (i.e. building i686 packages on an x86_64 host). +# Supported values are i686, x86_64, aarch64 +#SDKMACHINE ?= "i686" + +SANITY_TESTED_DISTROS:append ?= " *" + +# +# Extra image configuration defaults +# +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# images. Some of these options are added to certain image types automatically. The +# variable can contain the following options: +# "dbg-pkgs" - add -dbg packages for all installed packages +# (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) +# "dev-pkgs" - add -dev packages for all installed packages +# (useful if you want to develop against libs in the image) +# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages +# (useful if you want to run the package test suites) +# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) +# "tools-debug" - add debugging tools (gdb, strace) +# "eclipse-debug" - add Eclipse remote debugging support +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) +# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) +# "debug-tweaks" - make an image suitable for development +# e.g. ssh root access has a blank password +# There are other application targets that can be used here too, see +# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. +# We default to enabling the debugging tweaks. +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" + +# +# Additional image features +# +# The following is a list of additional classes to use when building images which +# enable extra features. Some available options which can be included in this variable +# are: +# - 'buildstats' collect build statistics +USER_CLASSES ?= "buildstats" + +# +# Runtime testing of images +# +# The build system can test booting virtual machine images under qemu (an emulator) +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO_qemuall = "1" + +# +# Interactive shell configuration +# +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is +# multithreaded and needs to be able to handle the case where more than one parallel +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. +# +# Examples of the occasions this may happen are when resolving patches which cannot +# be applied, to use the devshell or the kernel menuconfig +# +# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none +# Note: currently, Konsole support only works for KDE 3.x due to the way +# newer Konsole versions behave +#OE_TERMINAL = "auto" +# By default disable interactive patch resolution (tasks will just fail instead): +PATCHRESOLVE = "noop" + +# +# Disk Space Monitoring during the build +# +# Monitor the disk space during the build. If there is less that 1GB of space or less +# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort +# of the build. The reason for this is that running completely out of space can corrupt +# files and damages the build in ways which may not be easily recoverable. +# It's necessary to monitor /tmp, if there is no space left the build will fail +# with very exotic errors. +BB_DISKMON_DIRS ??= "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" + +# +# Shared-state files from other locations +# +# As mentioned above, shared state files are prebuilt cache data objects which can be +# used to accelerate build time. This variable can be used to configure the system +# to search other mirror locations for these objects before it builds the data itself. +# +# This can be a filesystem directory, or a remote url such as http or ftp. These +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# cache locations to check for the shared objects. +# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH +# at the end as shown in the examples below. This will be substituted with the +# correct path within the directory structure. +#SSTATE_MIRRORS ?= "\ +#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* file:///some/local/dir/sstate/PATH" + +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following line. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" + +# +# Qemu configuration +# +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +PACKAGECONFIG:append:pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" + +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" + +# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to +# track the version of this file when it was generated. This can safely be ignored if +# this doesn't mean anything to you. +CONF_VERSION = "2" + +# Set the root password to '0penBmc' +# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/images/file/settings.json b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/images/file/settings.json new file mode 100644 index 0000000000..361a78ece5 --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/images/file/settings.json @@ -0,0 +1,13 @@ +{ + "BootBlockAndHeader_no_tip.xml": + { + "vendor": "100", + "board_type": "1", + "MC_CONFIG": "0x04", + "FIU0_CLK_DIVIDER": "0", + "FIU1_CLK_DIVIDER": "0", + "FIU3_CLK_DIVIDER": "0", + "BAUD_RATE": "57600", + "DestAddr": "0xFFFD0000" + } +} diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/images/npcm8xx-bootloader_%.bbappend b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/images/npcm8xx-bootloader_%.bbappend new file mode 100644 index 0000000000..3c97a9f9ea --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/images/npcm8xx-bootloader_%.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/file:" diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend new file mode 100644 index 0000000000..dc0d8ca2e3 --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-nuvoton:${THISDIR}/../../../../recipes-bsp/uboot/files:" + +SRC_URI +="file://yosemite4-common.cfg \ + file://yosemite4.cfg" diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/u-boot/u-boot-nuvoton/yosemite4.cfg b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/u-boot/u-boot-nuvoton/yosemite4.cfg new file mode 100644 index 0000000000..92f45a5b8e --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/u-boot/u-boot-nuvoton/yosemite4.cfg @@ -0,0 +1,6 @@ +CONFIG_SYS_SKIP_UART_INIT=y +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="setenv console ttyS4,57600n8; run common_bootargs; bootm 80300000" +CONFIG_USE_PREBOOT=y +CONFIG_ENV_OFFSET=0x2C0000 +CONFIG_ENV_ADDR=0x802C0000 diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend new file mode 100644 index 0000000000..0e2c3fdd36 --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:${THISDIR}/../../../../recipes-bsp/uboot/files:" + +SRC_URI +="file://yosemite4-common.cfg \ + file://yosemite4.cfg" diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-kernel/linux/linux-nuvoton/yosemite4.cfg b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-kernel/linux/linux-nuvoton/yosemite4.cfg new file mode 100644 index 0000000000..0db12d8110 --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-kernel/linux/linux-nuvoton/yosemite4.cfg @@ -0,0 +1,65 @@ +# TPM drivers +CONFIG_TCG_TIS_SPI=y + +# I2C drivers +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_NPCM=y +CONFIG_I2C_MUX=y + +# SPI controller master driver and spi-gpio +CONFIG_SPI=y +CONFIG_SPI_NPCM_FIU=y +CONFIG_SPI_NPCM_PSPI=y + +# Jtag driver +CONFIG_NUVOTON_JTAG=y +CONFIG_NPCM8XX_JTAG_MASTER=y + +# Enable SGPIO Driver support +CONFIG_GPIOLIB=y +CONFIG_GPIO_NPCM_SGPIO=y + +# Enable ADC +CONFIG_NPCM_ADC=y +CONFIG_IIO=y +CONFIG_SENSORS_IIO_HWMON=y + +# Enable NCSI +CONFIG_NET_NCSI=y + +# Disable unused MDIO functions +# CONFIG_MDIO_BITBANG is not set +# CONFIG_MDIO_GPIO is not set + +# MUX controller for setting UART switch mode +CONFIG_IIO_MUX=y +CONFIG_MULTIPLEXER=y +CONFIG_MUX_MMIO=y + +# Enable UBIFS for static no-rootfs +CONFIG_MTD_UBI=y +CONFIG_UBIFS_FS=y +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set + +# Enable VFAT FS +CONFIG_VFAT_FS=y + +# LED +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y + +# I3C drivers +CONFIG_SVC_I3C_MASTER=y +CONFIG_NPCM845_I3C_MASTER=y + +# MCTP +CONFIG_MCTP=y + +# PMBUS drivers +CONFIG_PMBUS=y +CONFIG_SENSORS_PMBUS=y diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-kernel/linux/linux-nuvoton_%.bbappend new file mode 100644 index 0000000000..cac5c5bf5f --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-nuvoton:${THISDIR}/../../../../recipes-kernel/linux/files:" +SRC_URI += "file://yosemite4-common.cfg \ + file://yosemite4.cfg \ + " diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-networking/mctp/mctp_%.bbappend b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-networking/mctp/mctp_%.bbappend new file mode 100644 index 0000000000..8802adbb46 --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-networking/mctp/mctp_%.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" diff --git a/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-phosphor/images/fb-yosemite4n-phosphor-image.inc b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-phosphor/images/fb-yosemite4n-phosphor-image.inc new file mode 100644 index 0000000000..4de5a24a5a --- /dev/null +++ b/meta-facebook/meta-yosemite4/meta-yosemite4n/recipes-phosphor/images/fb-yosemite4n-phosphor-image.inc @@ -0,0 +1 @@ +require meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc diff --git a/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend index a35fc42a9b..8f468ceebe 100644 --- a/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI +="file://yosemite4.cfg" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:${THISDIR}/../../../recipes-bsp/uboot/files:" +SRC_URI +="file://yosemite4-common.cfg" diff --git a/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend index bf843a530d..8f468ceebe 100644 --- a/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-aspeed-sdk:" -SRC_URI +="file://yosemite4.cfg" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:${THISDIR}/../../../recipes-bsp/uboot/files:" +SRC_URI +="file://yosemite4-common.cfg" diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/yosemite4.cfg b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/yosemite4.cfg index 989f9dba02..913ab3b69b 100644 --- a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/yosemite4.cfg +++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/yosemite4.cfg @@ -1,11 +1,3 @@ -# TPM drivers -CONFIG_TCG_TPM=y -CONFIG_TCG_TIS_CORE=y -CONFIG_TCG_TIS=y -CONFIG_TCG_TIS_SPI=m -# I2C drivers -CONFIG_I2C=y -CONFIG_I2C_SLAVE=y # I2C mqueue for mctp CONFIG_I2C_SLAVE_MQUEUE=m CONFIG_I2C_SLAVE_MQUEUE_QUEUE_SIZE=32 @@ -14,8 +6,6 @@ CONFIG_I2C_SLAVE_MQUEUE_MESSAGE_SIZE=256 CONFIG_SPI_ASPEED=y CONFIG_SPI_GPIO=y # Jtag driver -CONFIG_JTAG=y -CONFIG_HAS_IOMEM=y CONFIG_JTAG_ASPEED=y CONFIG_JTAG_ASPEED_LEGACY_UIO=y # device driver @@ -26,7 +16,9 @@ CONFIG_I2C_MUX_PCA954x=y CONFIG_SENSORS_TMP421=y CONFIG_MAX1363=y CONFIG_SENSORS_INA238=y +CONFIG_SENSORS_ISL28022=y CONFIG_SENSORS_ADC128D818=y +CONFIG_RICHTEK_RTQ6056=y CONFIG_SENSORS_MAX31790=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y @@ -34,8 +26,10 @@ CONFIG_LEDS_PCA955X=y CONFIG_LEDS_PCA955X_GPIO=y CONFIG_SENSORS_INA233=y CONFIG_SENSORS_MP5023=y +CONFIG_SENSORS_MP5990=y CONFIG_SENSORS_EMC1403=y CONFIG_SENSORS_NCT7363=y +CONFIG_SENSORS_XDP710=y # UHCI/EHCI driver CONFIG_USB_UHCI_HCD=y CONFIG_USB_STORAGE=y @@ -65,3 +59,5 @@ CONFIG_REGMAP_I3C=y CONFIG_IPMB_DEVICE_INTERFACE=y # For regulator CONFIG_REGULATOR=y +# Aspeed OTP +CONFIG_ASPEED_OTP=y diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed_%.bbappend index 62623af695..c0248c3e74 100644 --- a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,3 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:" -SRC_URI += "file://yosemite4.cfg" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:${THISDIR}/../../../recipes-kernel/linux/files:" +SRC_URI += "file://yosemite4-common.cfg \ + file://yosemite4.cfg" diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/mctp-config b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/mctp-config new file mode 100644 index 0000000000..ded51ae7d8 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/mctp-config @@ -0,0 +1,39 @@ +#!/bin/sh + +# Set mctpi2c/mctpi3c link up and assign local address. +localEid=8 + +# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions +. /usr/libexec/yosemite4-common-functions + +is_nuvoton_board="$(check_nuvoton_board)" + +busnum=0 +if [ -n "$is_nuvoton_board" ]; then + # Enable MCTP-I3C for Nuvoton BMC + # The Sentinel Dome BICs are after the I3C hub on I3C bus0 and bus1. + while [ $busnum -le 1 ] + do + mctp link set mctpi3c${busnum} up + mctp addr add ${localEid} dev mctpi3c${busnum} + busnum=$((busnum+1)) + done +else + # Enable MCTP-I2C for ASPEED BMC + # The Sentinel Dome BICs are on the i2c bus0 to bus7. + while [ $busnum -le 7 ] + do + mctp link set mctpi2c${busnum} up + mctp addr add ${localEid} dev mctpi2c${busnum} + busnum=$((busnum+1)) + done +fi + +# The NICs are on the i2c bus24 to bus27. +busnum=24 +while [ $busnum -le 27 ] +do + mctp link set mctpi2c${busnum} up + mctp addr add ${localEid} dev mctpi2c${busnum} + busnum=$((busnum+1)) +done diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/mctp-config.sh b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/mctp-config.sh deleted file mode 100644 index fcb8677424..0000000000 --- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/mctp-config.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# Set mctpi2c link up and assign local address. -localEid=8 - -# The Sentinel Dome BICs are on the i2c bus0 to bus7. -busnum=0 -while [ $busnum -le 7 ] -do - mctp link set mctpi2c${busnum} up - mctp addr add ${localEid} dev mctpi2c${busnum} - busnum=$((busnum+1)) -done - -# The NICs are on the i2c bus24 to bus27. -busnum=24 -while [ $busnum -le 27 ] -do - mctp link set mctpi2c${busnum} up - mctp addr add ${localEid} dev mctpi2c${busnum} - busnum=$((busnum+1)) -done diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/nic-gpio-addrs b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/nic-gpio-addrs new file mode 100644 index 0000000000..bf5663641e --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/nic-gpio-addrs @@ -0,0 +1,43 @@ +#!/bin/sh +# shellcheck disable=SC2034 +# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions +. /usr/libexec/yosemite4-common-functions + +is_nuvoton_board="$(check_nuvoton_board)" + +if [ -n "$is_nuvoton_board" ] +then + WIDTH=32 + # PRSNT_NIC0 is at the 23th bit (GPIO Bank5: GPIO183), 0 means NIC is present + PRSNT_NIC0=0xf0015004 + BITMASK_NIC0=0x800000 + + # PRSNT_NIC1 is at the 29th bit (GPIO Bank5: GPIO189), 0 means NIC is present + PRSNT_NIC1=0xf0015004 + BITMASK_NIC1=0x20000000 + + # PRSNT_NIC2 is at the 28th bit (GPIO Bank2: GPIO92), 0 means NIC is present + PRSNT_NIC2=0xf0012004 + BITMASK_NIC2=0x10000000 + + # PRSNT_NIC3 is at the 24th bit (GPIO Bank5: GPIO184), 0 means NIC is present + PRSNT_NIC3=0xf0015004 + BITMASK_NIC3=0x400000 +else + WIDTH=8 + # PRSNT_NIC0 is at the 6th bit (GPIOU5), 0 means NIC is present + PRSNT_NIC0=0x1e780088 + BITMASK_NIC0=0x20 + + # PRSNT_NIC1 is at the 1th bit (GPIOE0), 0 means NIC is present + PRSNT_NIC1=0x1e780020 + BITMASK_NIC1=0x01 + + # PRSNT_NIC2 is at the 2th bit (GPIOE1), 0 means NIC is present + PRSNT_NIC2=0x1e780020 + BITMASK_NIC2=0x02 + + # PRSNT_NIC3 is at the 4th bit (GPIOM3), 0 means NIC is present + PRSNT_NIC3=0x1e780078 + BITMASK_NIC3=0x08 +fi diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-local-eid.conf b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-local-eid.conf index 7a3d8eee53..2856ea949c 100644 --- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-local-eid.conf +++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-local-eid.conf @@ -3,6 +3,6 @@ After=xyz.openbmc_project.EntityManager.service Requires=xyz.openbmc_project.EntityManager.service [Service] -ExecStartPre=-/usr/share/mctp/mctp-config.sh +ExecStartPre=-/usr/libexec/mctp/mctp-config Restart=always RestartSec=10 diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints new file mode 100644 index 0000000000..a4c9abacd4 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints @@ -0,0 +1,32 @@ +#!/bin/sh + +# Setup Endpoint for NICs, using devmem to read GPIO value since +# the gpio pin is occupied by gpio-monitor, read the value from +# gpioget is not possible. + +# shellcheck source=meta-facebook/meta-yosemite4/recipes-networking/mctp/files/nic-gpio-addrs +. /usr/libexec/mctp/nic-gpio-addrs + +# Setup slot1 NIC +gpio_val=$(devmem "$PRSNT_NIC0" "$WIDTH") +if [ $((gpio_val & "$BITMASK_NIC0")) -eq 0 ]; then + systemctl start setup-nic-endpoint-slot@0.service +fi + +# Setup slot2 NIC +gpio_val=$(devmem "$PRSNT_NIC1" "$WIDTH") +if [ $((gpio_val & "$BITMASK_NIC1")) -eq 0 ]; then + systemctl start setup-nic-endpoint-slot@1.service +fi + +# Setup slot3 NIC +gpio_val=$(devmem "$PRSNT_NIC2" "$WIDTH") +if [ $((gpio_val & "$BITMASK_NIC2")) -eq 0 ]; then + systemctl start setup-nic-endpoint-slot@2.service +fi + +# Setup slot4 NIC +gpio_val=$(devmem "$PRSNT_NIC3" "$WIDTH") +if [ $((gpio_val & "$BITMASK_NIC3")) -eq 0 ]; then + systemctl start setup-nic-endpoint-slot@3.service +fi diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.conf b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.conf index ad532c9a7d..4e59295db6 100644 --- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.conf +++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.conf @@ -3,6 +3,6 @@ After=mctpd.service Requires=mctpd.service
[Service]
-ExecStartPost=-/usr/share/mctp/setup-static-endpoints.sh
+ExecStartPost=-/usr/libexec/mctp/setup-static-endpoints
Restart=always
RestartSec=10
diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.sh b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.sh deleted file mode 100644 index e71e147a1f..0000000000 --- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/setup-static-endpoints.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# Setup Endpoint for NICs, using devmem to read GPIO value since -# the gpio pin is occupied by gpio-monitor, read the value from -# gpioget is not possible. - -# Setup slot1 NIC -gpio_val=$(devmem 0x1e780088 8) -# PRSNT_NIC0 is at the 6th bit (GPIOU5), 0 means NIC is present -if [ $((gpio_val & 0x20)) -eq 0 ]; then - systemctl start setup-nic-endpoint-slot@0.service -fi - -# Setup slot2 & 3 NIC -gpio_val=$(devmem 0x1e780020 8) -# PRSNT_NIC1 is at the 1th bit (GPIOE0), 0 means NIC is present -if [ $((gpio_val & 0x01)) -eq 0 ]; then - systemctl start setup-nic-endpoint-slot@1.service -fi -# PRSNT_NIC2 is at the 2th bit (GPIOE1), 0 means NIC is present -if [ $((gpio_val & 0x02)) -eq 0 ]; then - systemctl start setup-nic-endpoint-slot@2.service -fi - -# Setup slot4 NIC -gpio_val=$(devmem 0x1e780078 8) -# PRSNT_NIC3 is at the 4th bit (GPIOM3), 0 means NIC is present -if [ $((gpio_val & 0x08)) -eq 0 ]; then - systemctl start setup-nic-endpoint-slot@3.service -fi diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend b/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend index 04dcac30d9..077f1b4d37 100644 --- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend @@ -1,11 +1,11 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - SRC_URI += " \ file://setup-local-eid.conf \ file://setup-static-endpoints.conf \ - file://mctp-config.sh \ - file://setup-static-endpoints.sh \ + file://mctp-config \ + file://setup-static-endpoints \ + file://nic-gpio-addrs \ " FILES:${PN} += "${systemd_system_unitdir}/*" @@ -13,13 +13,18 @@ FILES:${PN} += "${systemd_system_unitdir}/*" do_install:append () { override_dir=${D}${systemd_system_unitdir}/mctpd.service.d install -d ${D}${systemd_system_unitdir}/mctpd.service.d - install -d ${D}${datadir}/mctp + install -m 0644 ${WORKDIR}/setup-local-eid.conf \ ${override_dir}/setup-local-eid.conf install -m 0644 ${WORKDIR}/setup-static-endpoints.conf \ ${override_dir}/setup-static-endpoints.conf - install -m 0755 ${WORKDIR}/mctp-config.sh \ - ${D}${datadir}/mctp/ - install -m 0755 ${WORKDIR}/setup-static-endpoints.sh \ - ${D}${datadir}/mctp/ + + install -d ${D}${libexecdir}/mctp + + install -m 0755 ${WORKDIR}/mctp-config \ + ${D}${libexecdir}/mctp/ + install -m 0755 ${WORKDIR}/setup-static-endpoints \ + ${D}${libexecdir}/mctp/ + install -m 0755 ${WORKDIR}/nic-gpio-addrs \ + ${D}${libexecdir}/mctp/ } diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/chassis/obmc-phosphor-buttons/gpio_defs.json b/meta-facebook/meta-yosemite4/recipes-phosphor/chassis/obmc-phosphor-buttons/gpio_defs.json new file mode 100644 index 0000000000..98cfb24ad8 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/chassis/obmc-phosphor-buttons/gpio_defs.json @@ -0,0 +1,10 @@ +{ + "gpio_definitions": [ + { + "name": "HOST_SELECTOR", + "group_gpio_config": [], + "max_position": 9, + "host_selector_map": {} + } + ] +} diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend new file mode 100644 index 0000000000..91e994e961 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/chassis/obmc-phosphor-buttons_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" + +SRC_URI += "file://gpio_defs.json" + +do_install:append() { + install -d ${D}${sysconfdir}/default/obmc/gpio/ + install -m 0644 ${WORKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/ +} + +FILES:${PN}-signals:append = " ${sysconfdir}/default/obmc/gpio/gpio_defs.json" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control_%.bbappend new file mode 100644 index 0000000000..283fcf9286 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +FILES:${PN}:append = " ${datadir}/swampd" +FILES:${PN}:append = " ${systemd_system_unitdir}/phosphor-pid-control.service.d/*.conf" + +do_install:append() { + + override_dir="${D}${systemd_system_unitdir}/phosphor-pid-control.service.d" + override_file="${override_dir}/yosemite4.conf" + mkdir -p ${D}${systemd_system_unitdir}/phosphor-pid-control.service.d + echo "[Unit]" > ${override_file} + echo "After=" >> ${override_file} + echo "After=multi-user.target" >> ${override_file} + +} diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/check-interrupt b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/check-interrupt new file mode 100644 index 0000000000..60f6263504 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/check-interrupt @@ -0,0 +1,147 @@ +#!/bin/bash + +# Provide source directive to shellcheck. +# shellcheck source=meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd +source /usr/libexec/phosphor-state-manager/power-cmd + +log_message() { + local slot_num=$(($1+1)) + local MESSAGE="SLOT$slot_num $2 Power Fault" + local COMBINED_INFO="$3" + + busctl call \ + xyz.openbmc_project.Logging /xyz/openbmc_project/logging \ + xyz.openbmc_project.Logging.Create Create "ssa{ss}" "$MESSAGE" \ + "xyz.openbmc_project.Logging.Entry.Level.Error" 1 "FAULT" "$COMBINED_INFO" +} + +host_power_status() { + id=$1 + service_path="xyz.openbmc_project.State.Host${id}" + object_path="/xyz/openbmc_project/state/host${id}" + interface_path="xyz.openbmc_project.State.Host" + property="CurrentHostState" + status=$(busctl get-property "$service_path" "$object_path" $interface_path $property | cut -d"." -f6) + if [ "$status" == "Running\"" ]; then + echo "on" + else + echo "off" + fi +} + +# Sleep for 10ms to ignore GPIO instability during blade hot-plug +usleep 10000 + +if [ "$1" = "slot1-slot4" ]; then + i2c_bus=8 + mux_addr=0x70 + slot_num_offset=0 +elif [ "$1" = "slot5-slot8" ]; then + i2c_bus=9 + mux_addr=0x71 + slot_num_offset=4 +else + echo "Invalid input: $1" + exit 1 +fi + +count=0 +check_count=0 +SLOT_RANGE=4 +CLEAR_BIT=20 +while [ $check_count -lt $SLOT_RANGE ] +do + count=0 + + # i2ctranster to check which slot got interrupt + read -r INT_BYTE <<< "$(i2ctransfer -f -y $i2c_bus w1@$mux_addr 0 r1)" + INT_BYTE=$((INT_BYTE >> 4)) + + if [ $INT_BYTE -eq 0 ]; then + exit 0 + fi + + while [ $count -lt $SLOT_RANGE ] + do + + fault=$(( (INT_BYTE >> count) & 1 )) + # if fault[i] == 1, means slot_x got ISR + if [ $fault -eq 1 ]; then + slot_num=$((count + slot_num_offset)) + + # i2ctranster to get CPLD IOE (0x24) addr 0x01 (port1, ac) + read -r FAULT_BYTE <<< "$(i2ctransfer -f -y $slot_num w1@0x24 0x01 r1)" + + # check which pin fault, add to fault info + if (( (FAULT_BYTE >> 0) & 1 == 1 )); then + [ -n "$COMBINED_INFO" ] && COMBINED_INFO="${COMBINED_INFO},PWRGD_P1V8_STBY_FAULT" || COMBINED_INFO="PWRGD_P1V8_STBY_FAULT" + elif (( (FAULT_BYTE >> 1) & 1 == 1 )); then + [ -n "$COMBINED_INFO" ] && COMBINED_INFO="${COMBINED_INFO},PWRGD_P1V2_STBY_FAULT" || COMBINED_INFO="PWRGD_P1V2_STBY_FAULT" + fi + + # call logging function + if [ -n "$COMBINED_INFO" ]; then + log_message $slot_num "AC" "$COMBINED_INFO" + fi + + # clean + COMBINED_INFO="" + # i2ctranster to get CPLD IOE (0x24) addr 0x02 (port2, dc) + read -r FAULT_BYTE <<< "$(i2ctransfer -f -y $slot_num w1@0x24 0x02 r1)" + + # check which pin fault, add to fault info + if (( (FAULT_BYTE >> 0) & 1 == 1 )); then + [ -n "$COMBINED_INFO" ] && COMBINED_INFO="${COMBINED_INFO},PWRGD_PVDDCR_CPU0_FAULT" || COMBINED_INFO="PWRGD_PVDDCR_CPU0_FAULT" + elif (( (FAULT_BYTE >> 1) & 1 == 1 )); then + [ -n "$COMBINED_INFO" ] && COMBINED_INFO="${COMBINED_INFO},PWRGD_PVDDCR_SOC_FAULT" || COMBINED_INFO="PWRGD_PVDDCR_SOC_FAULT" + elif (( (FAULT_BYTE >> 2) & 1 == 1 )); then + [ -n "$COMBINED_INFO" ] && COMBINED_INFO="${COMBINED_INFO},PWRGD_PVDDCR_CPU1_FAULT" || COMBINED_INFO="PWRGD_PVDDCR_CPU1_FAULT" + elif (( (FAULT_BYTE >> 3) & 1 == 1 )); then + [ -n "$COMBINED_INFO" ] && COMBINED_INFO="${COMBINED_INFO},PWRGD_PVDDIO_FAULT" || COMBINED_INFO="PWRGD_PVDDIO_FAULT" + elif (( (FAULT_BYTE >> 4) & 1 == 1 )); then + [ -n "$COMBINED_INFO" ] && COMBINED_INFO="${COMBINED_INFO},PWRGD_PVDD11_S3_R_FAULT" || COMBINED_INFO="PWRGD_PVDD11_S3_R_FAULT" + fi + + # call logging function + if [ -n "$COMBINED_INFO" ]; then + log_message $slot_num "DC" $COMBINED_INFO + fi + + + # Check CPU power status + host_id=$((slot_num + 1)) + read -r PWR_STATUS_BYTE <<< "$(i2ctransfer -f -y $slot_num w1@0x23 0x02 r1)" + if (( (PWR_STATUS_BYTE >> 2) & 1 == 1 )); then + if [ "$(host_power_status $host_id)" == "off" ]; then + echo "Host$host_id power status change to on" + busctl set-property xyz.openbmc_project.State.Host$host_id /xyz/openbmc_project/state/host$host_id xyz.openbmc_project.State.Host RequestedHostTransition s "xyz.openbmc_project.State.Host.Transition.On" + fi + else + if [ "$(host_power_status $host_id)" == "on" ]; then + echo "Host$host_id power status change to off" + busctl set-property xyz.openbmc_project.State.Host$host_id /xyz/openbmc_project/state/host$host_id xyz.openbmc_project.State.Host RequestedHostTransition s "xyz.openbmc_project.State.Host.Transition.Off" + fi + fi + + + # Clear interrupt + cpld_ioe_chip=$(basename "/sys/bus/i2c/devices/$slot_num-0021/"*gpiochip*) + + if ! gpio_set "$cpld_ioe_chip" "$CLEAR_BIT"=1 + then + echo "Set slot_num: $slot_num register to clear interrupt fail" + fi + + usleep 5000 + + if ! gpio_set "$cpld_ioe_chip" "$CLEAR_BIT"=0 + then + echo "Set slot_num: $slot_num register to default status fail" + fi + fi + + count=$((count + 1)) + done + + check_count=$((check_count + 1)) +done diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/check-interrupt@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/check-interrupt@.service new file mode 100644 index 0000000000..261d1636f5 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/check-interrupt@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Check %i interrupt + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/check-interrupt %i +SyslogIdentifier=check-interrupt%i diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/configure-nic-mctp-endpoint b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/configure-nic-mctp-endpoint new file mode 100644 index 0000000000..e78c7eabba --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/configure-nic-mctp-endpoint @@ -0,0 +1,60 @@ +#!/bin/sh + +INVALID_INPUT=255 + +# Set Broadcom & Nvidia NIC sensors status +set_TMP421_sensor_enabled() { + enabled_value=$1 + + for nic_id in 0 1 2 3; do + busctl set-property xyz.openbmc_project.HwmonTempSensor /xyz/openbmc_project/sensors/temperature/NIC${nic_id}_TEMP_C xyz.openbmc_project.Object.Enable Enabled b "$enabled_value" 2> /dev/null + done +} + +# Set Terminus NIC sensors status +set_EMC1403_sensor_enabled() { + enabled_value=$1 + + for i2c_bus in 24 25 26 27; do + busctl set-property xyz.openbmc_project.HwmonTempSensor /xyz/openbmc_project/sensors/temperature/NIC_TEMP_${i2c_bus} xyz.openbmc_project.Object.Enable Enabled b "$value" 2> /dev/null + done +} + +set_nic_sensors_enabled() { + value=$1 + + if [ "$value" != "true" ] && [ "$value" != "false" ]; then + echo "Invalid value: $value, the value should only be 'true' or 'false'" + return $INVALID_INPUT + fi + + # Set Broadcom & Nvidia NIC sensors status + set_TMP421_sensor_enabled "$value" + # Set Terminus NIC sensors status + set_EMC1403_sensor_enabled "$value" + + sleep 1 +} + +# This script is a backup solution for setting up/removing MCTP endpoint for NICs +action=$1 +slot=$2 +# NIC bus are 24~27. +bus=$((24 + slot)) +# Static EID for NIC are 90~93. +eid=$((90 + slot)) + +sleep 2 + +if [ "$action" = "add" ]; then + set_nic_sensors_enabled "false" + echo "Adding MCTP endpoint for slot $slot" + busctl call xyz.openbmc_project.MCTP /xyz/openbmc_project/mctp au.com.CodeConstruct.MCTP AssignEndpointStatic sayy "mctpi2c${bus}" 1 0x32 "$eid" + + sleep 3 + set_nic_sensors_enabled "true" +elif [ "$action" = "remove" ]; then + echo "Removing MCTP endpoint for slot $slot" + busctl call xyz.openbmc_project.MCTP /xyz/openbmc_project/mctp/1/${eid} au.com.CodeConstruct.MCTP.Endpoint Remove +fi + diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/configure-nic-mctp-endpoint.sh b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/configure-nic-mctp-endpoint.sh deleted file mode 100644 index 59031b5400..0000000000 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/configure-nic-mctp-endpoint.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# This script is a backup solution for setting up/removing MCTP endpoint for NICs -action=$1 -slot=$2 -# NIC bus are 24~27. -bus=$((24 + slot)) -# Static EID for NIC are 90~93. -eid=$((90 + slot)) - -sleep 2 - -if [ "$action" = "add" ]; then - echo "Adding MCTP endpoint for slot $slot" - busctl call xyz.openbmc_project.MCTP /xyz/openbmc_project/mctp au.com.CodeConstruct.MCTP AssignEndpointStatic sayy "mctpi2c${bus}" 1 0x32 "$eid" -elif [ "$action" = "remove" ]; then - echo "Removing MCTP endpoint for slot $slot" - busctl call xyz.openbmc_project.MCTP /xyz/openbmc_project/mctp/1/${eid} au.com.CodeConstruct.MCTP.Endpoint Remove -fi - diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub new file mode 100644 index 0000000000..b8268e8668 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub @@ -0,0 +1,50 @@ +#!/bin/bash + +disable_i3c_hub() +{ + local unplugged_slot="$1" + local hub_path + local offset_file + local access_file + local current_port + local mask=1 + + if [ "$unplugged_slot" -lt 5 ]; then + hub_path="/sys/kernel/debug/i3c-hub-0-*/reg" + echo "Slot $unplugged_slot on i3c hub 0." + else + hub_path="/sys/kernel/debug/i3c-hub-1-*/reg" + echo "Slot $unplugged_slot on i3c hub 1." + fi + + for file in $hub_path/{offset,access}; do + if [[ $file == *"/offset" ]]; then + offset_file="$file" + elif [[ $file == *"/access" ]]; then + access_file="$file" + fi + done + + echo "Unlock i3c hub register." + echo 16 > "$offset_file" + echo 105 > "$access_file" + + echo "Disable slot${unplugged_slot} i3c port." + echo 18 > "$offset_file" + current_port=$(cat "$access_file") + if [ "$unplugged_slot" -gt 4 ]; then + ((unplugged_slot=unplugged_slot-4)) + fi + mask=$((mask << (--unplugged_slot))) + mask=$((~mask)) + current_port=$((current_port & mask)) + echo $current_port > "$access_file" + + echo "Lock i3c hub register." + echo 16 > "$offset_file" + echo 0 > "$access_file" + + exit 0 +} + +disable_i3c_hub "$1" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub@.service new file mode 100644 index 0000000000..2ffa66b14d --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/disable-i3c-hub@.service @@ -0,0 +1,7 @@ +[Unit] +Description=slot-disable-i3c-hub:%i + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/disable-i3c-hub %i +SyslogIdentifier=slot-disable-i3c-hub %i diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub new file mode 100644 index 0000000000..f57c7654e9 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub @@ -0,0 +1,50 @@ +#!/bin/bash + +enable_i3c_hub() +{ + local plugged_slot="$1" + local hub_path + local offset_file + local access_file + local current_port + local mask=1 + + sleep 2 + if [ "$plugged_slot" -lt 5 ]; then + hub_path="/sys/kernel/debug/i3c-hub-0-*/reg" + echo "Slot${plugged_slot} on i3c hub 0." + else + hub_path="/sys/kernel/debug/i3c-hub-1-*/reg" + echo "Slot${plugged_slot} on i3c hub 1." + fi + + for file in $hub_path/{offset,access}; do + if [[ $file == *"/offset" ]]; then + offset_file="$file" + elif [[ $file == *"/access" ]]; then + access_file="$file" + fi + done + + echo "Unlock i3c hub register." + echo 16 > "$offset_file" + echo 105 > "$access_file" + + echo "Enable slot${plugged_slot} i3c port." + echo 18 > "$offset_file" + current_port=$(cat "$access_file") + if [ "$plugged_slot" -gt 4 ]; then + ((plugged_slot=plugged_slot-4)) + fi + mask=$((mask << (--plugged_slot))) + current_port=$((current_port | mask)) + echo $current_port > "$access_file" + + echo "Lock i3c hub register." + echo 16 > "$offset_file" + echo 0 > "$access_file" + + exit 0 +} + +enable_i3c_hub "$1" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub@.service new file mode 100644 index 0000000000..4d9c0839a1 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/enable-i3c-hub@.service @@ -0,0 +1,7 @@ +[Unit] +Description=slot-enable-i3c-hub:%i + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/enable-i3c-hub %i +SyslogIdentifier=slot-enable-i3c-hub %i diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-board-efuse-fault b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-board-efuse-fault new file mode 100644 index 0000000000..641db4b683 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-board-efuse-fault @@ -0,0 +1,48 @@ +#!/bin/bash + +log_message() { + local MESSAGE="Fan board $1 eFuse fault" + local COMBINED_INFO="eFuse$2" + + busctl call \ + xyz.openbmc_project.Logging /xyz/openbmc_project/logging \ + xyz.openbmc_project.Logging.Create Create "ssa{ss}" "$MESSAGE" \ + "xyz.openbmc_project.Logging.Entry.Level.Error" 1 "FAULT" "$COMBINED_INFO" +} + + + +# if $1 == 0, fan board 0 IOE is at i2c-30 0x22. +# if $1 == 1, fan board 1 IOE is at i2c-31 0x22. + +if [ "$1" -eq 0 ]; then + i2c_bus=30 + ioe_addr=0x22 + fan_board=0 +elif [ "$1" -eq 1 ]; then + i2c_bus=31 + ioe_addr=0x22 + fan_board=1 +else + echo "Invalid input. Please provide 0 or 1." + exit 1 +fi + + +# i2ctranster to check which slot got interrupt +read -r INT_BYTE <<< "$(i2ctransfer -f -y $i2c_bus w1@$ioe_addr 0 r1)" +INT_BYTE=$((INT_BYTE >> 2)) + +# Traverse INT_BYTE +count=0 +EFUSE_RANGE=6 +while [ $count -lt $EFUSE_RANGE ] +do + fault=$(( (INT_BYTE >> count) & 1 )) + # if fault[i] == 0, means efuse_x got fault + if [ $fault -eq 0 ]; then + log_message $fan_board $count + fi + + count=$((count + 1)) +done diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-board-efuse-fault@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-board-efuse-fault@.service new file mode 100644 index 0000000000..0042d84084 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/fan-board-efuse-fault@.service @@ -0,0 +1,7 @@ +[Unit] +Description=fan board power-fault:%i + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/fan-board-efuse-fault %i +SyslogIdentifier=fan-board-efuse-fault%i diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/probe-slot-device b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/probe-slot-device index d83772094e..f99c7ee058 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/probe-slot-device +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/probe-slot-device @@ -1,4 +1,8 @@ #!/bin/bash +# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions +source /usr/libexec/yosemite4-common-functions + +is_nuvoton_board="$(check_nuvoton_board)" HOST_BUS=$(($1 - 1)) HOST_VIRTUAL_BUS=$(($1 + 15)) @@ -12,3 +16,10 @@ echo $HOST_VIRTUAL_BUS-0049 > /sys/bus/i2c/drivers/pca953x/bind echo $HOST_VIRTUAL_BUS-0050 > /sys/bus/i2c/drivers/at24/bind echo $HOST_VIRTUAL_BUS-0051 > /sys/bus/i2c/drivers/at24/bind echo $HOST_VIRTUAL_BUS-0054 > /sys/bus/i2c/drivers/at24/bind + +if [ -n "$is_nuvoton_board" ] +then + # Set interface of SD BIC to I3C + GPIOCHIP=$(basename /sys/bus/i2c/devices/$HOST_BUS-0023/*gpiochip*) + gpioset "$GPIOCHIP" 24=1 +fi diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/remove-nic-endpoint-slot@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/remove-nic-endpoint-slot@.service index d16ba2f44f..90a4b407ad 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/remove-nic-endpoint-slot@.service +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/remove-nic-endpoint-slot@.service @@ -3,6 +3,6 @@ Description=Remove MCTP endpoint for Slot%i NIC [Service]
Type=oneshot
-ExecStart=/usr/bin/configure-nic-mctp-endpoint.sh remove %i
+ExecStart=/usr/bin/configure-nic-mctp-endpoint remove %i
SyslogIdentifier=remove-nic-endpoint-slot%i
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device deleted file mode 100644 index 611d5e94bf..0000000000 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -bus=$(($1 + 15)) - -# rescan eeprom for fru information -busctl call xyz.openbmc_project.FruDevice /xyz/openbmc_project/FruDevice xyz.openbmc_project.FruDeviceManager ReScanBus q $bus diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device@.service deleted file mode 100644 index 8b4438e1a6..0000000000 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-device@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Rescan FruDevice for slot %i - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/rescan-fru-device %i -SyslogIdentifier=rescan-fru-device%i diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-ocp-setting b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-ocp-setting new file mode 100644 index 0000000000..e09fabc428 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-ocp-setting @@ -0,0 +1,34 @@ +#!/bin/bash +# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions +source /usr/libexec/yosemite4-common-functions + +bus=$(($1 + 15)) + +# rescan eeprom for fru information +busctl call xyz.openbmc_project.FruDevice /xyz/openbmc_project/FruDevice xyz.openbmc_project.FruDeviceManager ReScanBus q $bus +# wait for fru device to be ready +sleep 10 +# check if Wailua Falls is present +wailua_falls_present=$(busctl tree xyz.openbmc_project.FruDevice | grep Wailua_Falls) +# set 48V/12V HSC OCP values +if [ -n "$wailua_falls_present" ]; then + set_gpio P48V_OCP_GPIO1 0 + set_gpio P48V_OCP_GPIO2 0 + set_gpio P48V_OCP_GPIO3 0 + set_gpio HSC_OCP_SLOT_ODD_GPIO1 1 + set_gpio HSC_OCP_SLOT_ODD_GPIO2 0 + set_gpio HSC_OCP_SLOT_ODD_GPIO3 0 + set_gpio HSC_OCP_SLOT_EVEN_GPIO1 1 + set_gpio HSC_OCP_SLOT_EVEN_GPIO2 0 + set_gpio HSC_OCP_SLOT_EVEN_GPIO3 0 +else + set_gpio P48V_OCP_GPIO1 1 + set_gpio P48V_OCP_GPIO2 0 + set_gpio P48V_OCP_GPIO3 0 + set_gpio HSC_OCP_SLOT_ODD_GPIO1 0 + set_gpio HSC_OCP_SLOT_ODD_GPIO2 1 + set_gpio HSC_OCP_SLOT_ODD_GPIO3 0 + set_gpio HSC_OCP_SLOT_EVEN_GPIO1 0 + set_gpio HSC_OCP_SLOT_EVEN_GPIO2 1 + set_gpio HSC_OCP_SLOT_EVEN_GPIO3 0 +fi diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-ocp-setting@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-ocp-setting@.service new file mode 100644 index 0000000000..2d6f868186 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/rescan-fru-ocp-setting@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Rescan FruDevice for slot and set HSC OCP values %i + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/rescan-fru-ocp-setting %i +SyslogIdentifier=rescan-fru-ocp-settinge%i diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/setup-nic-endpoint-slot@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/setup-nic-endpoint-slot@.service index db06940930..c030a9afe3 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/setup-nic-endpoint-slot@.service +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/setup-nic-endpoint-slot@.service @@ -3,6 +3,6 @@ Description=Setup MCTP endpoint for Slot%i NIC [Service]
Type=oneshot
-ExecStart=/usr/bin/configure-nic-mctp-endpoint.sh add %i
+ExecStart=/usr/bin/configure-nic-mctp-endpoint add %i
SyslogIdentifier=setup-nic-endpoint-slot%i
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/slot-hsc-fault b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/slot-hsc-fault new file mode 100644 index 0000000000..b9afc446bf --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/slot-hsc-fault @@ -0,0 +1,36 @@ +#!/bin/bash + +dec_to_hex() { + local decimal=$1 + local hex="" + local digits="0123456789ABCDEF" + + while [ "$decimal" -gt 0 ]; do + remainder=$((decimal % 16)) + hex="${digits:remainder:1}$hex" + decimal=$((decimal / 16)) + done + + # ensure the length of $hex >= 4 + while [ ${#hex} -lt 4 ]; do + hex="0$hex" + done + + echo "0x${hex:-0}" +} + +i2c_bus=$(($1 - 1)) + +#i2ctransfer to get STATUS_WORD +read -r LOW_BYTE HIGH_BYTE <<< "$(i2ctransfer -f -y $i2c_bus w1@0x40 0x79 r2)" +STATUS_WORD=$((LOW_BYTE | (HIGH_BYTE << 8) )) +STATUS_WORD=$(dec_to_hex $STATUS_WORD) + +#Add event log +MESSAGE="SLOT$1 HSC Fault" +ARG="STATUS_WORD" + +busctl call \ + xyz.openbmc_project.Logging /xyz/openbmc_project/logging \ + xyz.openbmc_project.Logging.Create Create "ssa{ss}" "$MESSAGE" \ + xyz.openbmc_project.Logging.Entry.Level.Error 1 "$ARG" "$STATUS_WORD" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/slot-hsc-fault@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/slot-hsc-fault@.service new file mode 100644 index 0000000000..5a673ff008 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/slot-hsc-fault@.service @@ -0,0 +1,7 @@ +[Unit] +Description=slot hsc-fault:%i + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/slot-hsc-fault %i +SyslogIdentifier=slot-hsc-fault%i diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json index ab898a9028..6e722d671b 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json @@ -1,8 +1,7 @@ [ { "Name": "BTN_BMC_R2_N", - "ChipId": "0", - "GpioNum": 121, + "LineName": "BTN_BMC_R2_N", "EventMon": "RISING", "Targets": { "RISING": ["set-button-sled.service"] @@ -11,96 +10,87 @@ }, { "Name": "PWROK_STBY_BMC_SLOT1", - "ChipId": "0", - "GpioNum": 10, + "LineName": "PWRGD_SLOT1_STBY", "EventMon": "BOTH", "Targets": { - "RISING": ["probe-slot-device@1.service", "rescan-fru-device@1.service", "rescan-wf-bic@1.service"], - "FALLING": ["rescan-fru-device@1.service"] + "RISING": ["probe-slot-device@1.service", "rescan-fru-ocp-setting@1.service", "rescan-wf-bic@1.service"], + "FALLING": ["rescan-fru-ocp-setting@1.service"] }, "Continue": true }, { "Name": "PWROK_STBY_BMC_SLOT2", - "ChipId": "0", - "GpioNum": 11, + "LineName": "PWRGD_SLOT2_STBY", "EventMon": "BOTH", "Targets": { - "RISING": ["probe-slot-device@2.service", "rescan-fru-device@2.service", "rescan-wf-bic@2.service"], - "FALLING": ["rescan-fru-device@2.service"] + "RISING": ["probe-slot-device@2.service", "rescan-fru-ocp-setting@2.service", "rescan-wf-bic@2.service"], + "FALLING": ["rescan-fru-ocp-setting@2.service"] }, "Continue": true }, { "Name": "PWROK_STBY_BMC_SLOT3", - "ChipId": "0", - "GpioNum": 12, + "LineName": "PWRGD_SLOT3_STBY", "EventMon": "BOTH", "Targets": { - "RISING": ["probe-slot-device@3.service", "rescan-fru-device@3.service", "rescan-wf-bic@3.service"], - "FALLING": ["rescan-fru-device@3.service"] + "RISING": ["probe-slot-device@3.service", "rescan-fru-ocp-setting@3.service", "rescan-wf-bic@3.service"], + "FALLING": ["rescan-fru-ocp-setting@3.service"] }, "Continue": true }, { "Name": "PWROK_STBY_BMC_SLOT4", - "ChipId": "0", - "GpioNum": 13, + "LineName": "PWRGD_SLOT4_STBY", "EventMon": "BOTH", "Targets": { - "RISING": ["probe-slot-device@4.service", "rescan-fru-device@4.service", "rescan-wf-bic@4.service"], - "FALLING": ["rescan-fru-device@4.service"] + "RISING": ["probe-slot-device@4.service", "rescan-fru-ocp-setting@4.service", "rescan-wf-bic@4.service"], + "FALLING": ["rescan-fru-ocp-setting@4.service"] }, "Continue": true }, { "Name": "PWROK_STBY_BMC_SLOT5", - "ChipId": "0", - "GpioNum": 190, + "LineName": "PWRGD_SLOT5_STBY", "EventMon": "BOTH", "Targets": { - "RISING": ["probe-slot-device@5.service", "rescan-fru-device@5.service", "rescan-wf-bic@5.service"], - "FALLING": ["rescan-fru-device@5.service"] + "RISING": ["probe-slot-device@5.service", "rescan-fru-ocp-setting@5.service", "rescan-wf-bic@5.service"], + "FALLING": ["rescan-fru-ocp-setting@5.service"] }, "Continue": true }, { "Name": "PWROK_STBY_BMC_SLOT6", - "ChipId": "0", - "GpioNum": 191, + "LineName": "PWRGD_SLOT6_STBY", "EventMon": "BOTH", "Targets": { - "RISING": ["probe-slot-device@6.service", "rescan-fru-device@6.service", "rescan-wf-bic@6.service"], - "FALLING": ["rescan-fru-device@6.service"] + "RISING": ["probe-slot-device@6.service", "rescan-fru-ocp-setting@6.service", "rescan-wf-bic@6.service"], + "FALLING": ["rescan-fru-ocp-setting@6.service"] }, "Continue": true }, { "Name": "PWROK_STBY_BMC_SLOT7", - "ChipId": "0", - "GpioNum": 195, + "LineName": "PWRGD_SLOT7_STBY", "EventMon": "BOTH", "Targets": { - "RISING": ["probe-slot-device@7.service", "rescan-fru-device@7.service", "rescan-wf-bic@7.service"], - "FALLING": ["rescan-fru-device@7.service"] + "RISING": ["probe-slot-device@7.service", "rescan-fru-ocp-setting@7.service", "rescan-wf-bic@7.service"], + "FALLING": ["rescan-fru-ocp-setting@7.service"] }, "Continue": true }, { "Name": "PWROK_STBY_BMC_SLOT8", - "ChipId": "0", - "GpioNum": 202, + "LineName": "PWRGD_SLOT8_STBY", "EventMon": "BOTH", "Targets": { - "RISING": ["probe-slot-device@8.service", "rescan-fru-device@8.service", "rescan-wf-bic@8.service"], - "FALLING": ["rescan-fru-device@8.service"] + "RISING": ["probe-slot-device@8.service", "rescan-fru-ocp-setting@8.service", "rescan-wf-bic@8.service"], + "FALLING": ["rescan-fru-ocp-setting@8.service"] }, "Continue": true }, { "Name": "PRSNT_NIC0_N", - "ChipId": "0", - "GpioNum": 165, + "LineName": "PRSNT_NIC0_N", "EventMon": "BOTH", "Targets": { "RISING": ["remove-nic-endpoint-slot@0.service"], @@ -114,8 +104,7 @@ }, { "Name": "PRSNT_NIC1_N", - "ChipId": "0", - "GpioNum": 32, + "LineName": "PRSNT_NIC1_N", "EventMon": "BOTH", "Targets": { "RISING": ["remove-nic-endpoint-slot@1.service"], @@ -130,8 +119,7 @@ }, { "Name": "PRSNT_NIC2_N", - "ChipId": "0", - "GpioNum": 33, + "LineName": "PRSNT_NIC2_N", "EventMon": "BOTH", "Targets": { "RISING": ["remove-nic-endpoint-slot@2.service"], @@ -146,8 +134,7 @@ }, { "Name": "PRSNT_NIC3_N", - "ChipId": "0", - "GpioNum": 99, + "LineName": "PRSNT_NIC3_N", "EventMon": "BOTH", "Targets": { "RISING": ["remove-nic-endpoint-slot@3.service"], @@ -161,89 +148,241 @@ }, { "Name": "PRSNT_SB_SLOT1_BMC_N", - "ChipId": "0", - "GpioNum": 44, - "EventMon": "FALLING", + "LineName": "PRSNT_SB_SLOT1_N", + "EventMon": "BOTH", "Targets": { + "RISING": [ + "disable-i3c-hub@1.service" + ], "FALLING": [ - "slot-hot-plug@1.service"] + "slot-hot-plug@1.service", + "enable-i3c-hub@1.service" + ] }, "Continue": true }, { "Name": "PRSNT_SB_SLOT2_BMC_N", - "ChipId": "0", - "GpioNum": 45, - "EventMon": "FALLING", + "LineName": "PRSNT_SB_SLOT2_N", + "EventMon": "BOTH", "Targets": { + "RISING": [ + "disable-i3c-hub@2.service" + ], "FALLING": [ - "slot-hot-plug@2.service"] + "slot-hot-plug@2.service", + "enable-i3c-hub@2.service" + ] }, "Continue": true }, { "Name": "PRSNT_SB_SLOT3_BMC_N", - "ChipId": "0", - "GpioNum": 46, - "EventMon": "FALLING", + "LineName": "PRSNT_SB_SLOT3_N", + "EventMon": "BOTH", "Targets": { + "RISING": [ + "disable-i3c-hub@3.service" + ], "FALLING": [ - "slot-hot-plug@3.service"] + "slot-hot-plug@3.service", + "enable-i3c-hub@3.service" + ] }, "Continue": true }, { "Name": "PRSNT_SB_SLOT4_BMC_N", - "ChipId": "0", - "GpioNum": 47, - "EventMon": "FALLING", + "LineName": "PRSNT_SB_SLOT4_N", + "EventMon": "BOTH", "Targets": { + "RISING": [ + "disable-i3c-hub@4.service" + ], "FALLING": [ - "slot-hot-plug@4.service"] + "slot-hot-plug@4.service", + "enable-i3c-hub@4.service" + ] }, "Continue": true }, { "Name": "PRSNT_SB_SLOT5_BMC_N", - "ChipId": "0", - "GpioNum": 132, - "EventMon": "FALLING", + "LineName": "PRSNT_SB_SLOT5_N", + "EventMon": "BOTH", "Targets": { + "RISING": [ + "disable-i3c-hub@5.service" + ], "FALLING": [ - "slot-hot-plug@5.service"] + "slot-hot-plug@5.service", + "enable-i3c-hub@5.service" + ] }, "Continue": true }, { "Name": "PRSNT_SB_SLOT6_BMC_N", - "ChipId": "0", - "GpioNum": 133, - "EventMon": "FALLING", + "LineName": "PRSNT_SB_SLOT6_N", + "EventMon": "BOTH", "Targets": { + "RISING": [ + "disable-i3c-hub@6.service" + ], "FALLING": [ - "slot-hot-plug@6.service"] + "slot-hot-plug@6.service", + "enable-i3c-hub@6.service" + ] }, "Continue": true }, { "Name": "PRSNT_SB_SLOT7_BMC_N", - "ChipId": "0", - "GpioNum": 134, - "EventMon": "FALLING", + "LineName": "PRSNT_SB_SLOT7_N", + "EventMon": "BOTH", "Targets": { + "RISING": [ + "disable-i3c-hub@7.service" + ], "FALLING": [ - "slot-hot-plug@7.service"] + "slot-hot-plug@7.service", + "enable-i3c-hub@7.service" + ] }, "Continue": true }, { "Name": "PRSNT_SB_SLOT8_BMC_N", - "ChipId": "0", - "GpioNum": 135, + "LineName": "PRSNT_SB_SLOT8_N", + "EventMon": "BOTH", + "Targets": { + "RISING": [ + "disable-i3c-hub@8.service" + ], + "FALLING": [ + "slot-hot-plug@8.service", + "enable-i3c-hub@8.service" + ] + }, + "Continue": true + }, + { + "Name": "FLT_HSC_SERVER_SLOT1_N", + "LineName": "FLT_HSC_SERVER_SLOT1_N", + "EventMon": "FALLING", + "Targets": { + "FALLING": [ + "slot-hsc-fault@1.service"] + }, + "Continue": true + }, + { + "Name": "FLT_HSC_SERVER_SLOT2_N", + "LineName": "FLT_HSC_SERVER_SLOT2_N", + "EventMon": "FALLING", + "Targets": { + "FALLING": [ + "slot-hsc-fault@2.service"] + }, + "Continue": true + }, + { + "Name": "FLT_HSC_SERVER_SLOT3_N", + "LineName": "FLT_HSC_SERVER_SLOT3_N", + "EventMon": "FALLING", + "Targets": { + "FALLING": [ + "slot-hsc-fault@3.service"] + }, + "Continue": true + }, + { + "Name": "FLT_HSC_SERVER_SLOT4_N", + "LineName": "FLT_HSC_SERVER_SLOT4_N", + "EventMon": "FALLING", + "Targets": { + "FALLING": [ + "slot-hsc-fault@4.service"] + }, + "Continue": true + }, + { + "Name": "FLT_HSC_SERVER_SLOT5_N", + "LineName": "FLT_HSC_SERVER_SLOT5_N", + "EventMon": "FALLING", + "Targets": { + "FALLING": [ + "slot-hsc-fault@5.service"] + }, + "Continue": true + }, + { + "Name": "FLT_HSC_SERVER_SLOT6_N", + "LineName": "FLT_HSC_SERVER_SLOT6_N", + "EventMon": "FALLING", + "Targets": { + "FALLING": [ + "slot-hsc-fault@6.service"] + }, + "Continue": true + }, + { + "Name": "FLT_HSC_SERVER_SLOT7_N", + "LineName": "FLT_HSC_SERVER_SLOT7_N", + "EventMon": "FALLING", + "Targets": { + "FALLING": [ + "slot-hsc-fault@7.service"] + }, + "Continue": true + }, + { + "Name": "FLT_HSC_SERVER_SLOT8_N", + "LineName": "FLT_HSC_SERVER_SLOT8_N", + "EventMon": "FALLING", + "Targets": { + "FALLING": [ + "slot-hsc-fault@8.service"] + }, + "Continue": true + }, + { + "Name": "INT_SMB_BMC_SLOT1_4_BMC_N", + "LineName": "INT_SMB_BMC_SLOT1_4_BMC_N", + "EventMon": "FALLING", + "Targets": { + "FALLING": [ + "check-interrupt@slot1-slot4.service"] + }, + "Continue": true + }, + { + "Name": "INT_SMB_BMC_SLOT5_8_BMC_N", + "LineName": "INT_SMB_BMC_SLOT5_8_BMC_N", + "EventMon": "FALLING", + "Targets": { + "FALLING": [ + "check-interrupt@slot5-slot8.service"] + }, + "Continue": true + }, + { + "Name": "INT_FANBOARD1_IOEXP_N", + "LineName": "INT_FANBOARD1_IOEXP_N", + "EventMon": "FALLING", + "Targets": { + "FALLING": [ + "fan-board-efuse-fault@1.service"] + }, + "Continue": true + }, + { + "Name": "INT_FANBOARD0_IOEXP_N", + "LineName": "INT_FANBOARD0_IOEXP_N", "EventMon": "FALLING", "Targets": { "FALLING": [ - "slot-hot-plug@8.service"] + "fan-board-efuse-fault@0.service"] }, "Continue": true } diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 112b3424ac..739aa7022a 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd systemd SRC_URI += "file://yosemite4-phosphor-multi-gpio-monitor.json \ - file://configure-nic-mctp-endpoint.sh \ + file://configure-nic-mctp-endpoint \ file://setup-nic-endpoint-slot@.service \ file://remove-nic-endpoint-slot@.service \ file://set-button-sled.service \ @@ -11,11 +11,21 @@ SRC_URI += "file://yosemite4-phosphor-multi-gpio-monitor.json \ file://probe-slot-device \ file://reconfig-net-interface@.service \ file://reconfig-net-interface \ - file://rescan-fru-device@.service \ - file://rescan-fru-device \ + file://rescan-fru-ocp-setting@.service \ + file://rescan-fru-ocp-setting \ file://slot-hot-plug@.service \ file://rescan-wf-bic \ file://rescan-wf-bic@.service \ + file://slot-hsc-fault \ + file://slot-hsc-fault@.service \ + file://fan-board-efuse-fault \ + file://fan-board-efuse-fault@.service \ + file://enable-i3c-hub \ + file://enable-i3c-hub@.service \ + file://disable-i3c-hub \ + file://disable-i3c-hub@.service \ + file://check-interrupt \ + file://check-interrupt@.service \ " RDEPENDS:${PN}:append = " bash" @@ -25,12 +35,17 @@ FILES:${PN} += "${systemd_system_unitdir}/*" SYSTEMD_SERVICE:${PN} += " \ set-button-sled.service \ probe-slot-device@.service \ - rescan-fru-device@.service \ + rescan-fru-ocp-setting@.service \ slot-hot-plug@.service \ setup-nic-endpoint-slot@.service \ remove-nic-endpoint-slot@.service \ rescan-wf-bic@.service \ + slot-hsc-fault@.service \ + fan-board-efuse-fault@.service \ reconfig-net-interface@.service \ + enable-i3c-hub@.service \ + disable-i3c-hub@.service \ + check-interrupt@.service \ " SYSTEMD_AUTO_ENABLE = "enable" @@ -41,17 +56,27 @@ do_install:append:() { ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json install -m 0644 ${WORKDIR}/set-button-sled.service ${D}${systemd_system_unitdir}/set-button-sled.service install -m 0644 ${WORKDIR}/probe-slot-device@.service ${D}${systemd_system_unitdir}/probe-slot-device@.service - install -m 0644 ${WORKDIR}/rescan-fru-device@.service ${D}${systemd_system_unitdir}/rescan-fru-device@.service + install -m 0644 ${WORKDIR}/rescan-fru-ocp-setting@.service ${D}${systemd_system_unitdir}/rescan-fru-ocp-setting@.service install -m 0644 ${WORKDIR}/slot-hot-plug@.service ${D}${systemd_system_unitdir}/slot-hot-plug@.service install -m 0644 ${WORKDIR}/setup-nic-endpoint-slot@.service ${D}${systemd_system_unitdir}/ install -m 0644 ${WORKDIR}/reconfig-net-interface@.service ${D}${systemd_system_unitdir}/reconfig-net-interface@.service install -m 0644 ${WORKDIR}/remove-nic-endpoint-slot@.service ${D}${systemd_system_unitdir}/ install -m 0644 ${WORKDIR}/rescan-wf-bic@.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/slot-hsc-fault@.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/fan-board-efuse-fault@.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/enable-i3c-hub@.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/disable-i3c-hub@.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/check-interrupt@.service ${D}${systemd_system_unitdir}/ install -d ${D}${libexecdir}/${PN} install -m 0755 ${WORKDIR}/probe-slot-device ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/reconfig-net-interface ${D}${libexecdir}/${PN}/ - install -m 0755 ${WORKDIR}/rescan-fru-device ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/rescan-fru-ocp-setting ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/rescan-wf-bic ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/slot-hsc-fault ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/fan-board-efuse-fault ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/enable-i3c-hub ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/disable-i3c-hub ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/check-interrupt ${D}${libexecdir}/${PN}/ install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/configure-nic-mctp-endpoint.sh ${D}/${bindir}/ + install -m 0755 ${WORKDIR}/configure-nic-mctp-endpoint ${D}/${bindir}/ } diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc b/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc index 2b5727e7ce..16a77f6e04 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc @@ -14,9 +14,11 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ OBMC_IMAGE_EXTRA_INSTALL:append = " \ plat-svc \ " - +# Enable obmc-phosphor-buttons which needed by debug card function. OBMC_IMAGE_EXTRA_INSTALL:append = " \ phosphor-gpio-monitor \ + obmc-phosphor-buttons-signals \ + obmc-phosphor-buttons-handler \ " # This enables the feature of dbus-monitor which defined in diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bbappend new file mode 100644 index 0000000000..a718b14f7b --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" +SOURCE_FILES:append = " 99-platform-init"
\ No newline at end of file diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init b/meta-facebook/meta-yosemite4/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init new file mode 100644 index 0000000000..d9def86a2a --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init @@ -0,0 +1,23 @@ +#bin/sh + +# Create /dev/mem +if [ ! -c /dev/mem ]; then + /bin/mknod /dev/mem c 1 1 +fi + +# Disable FMC_WDT2 +FMC_WDT2_CTRL_VAL=$(/sbin/devmem 0x1e620064) +FMC_WDT2_CTRL_VAL=$((16#${FMC_WDT2_CTRL_VAL#"0x"})) +SET_VAL=$((FMC_WDT2_CTRL_VAL & 0xFFFFFFFE)) +/sbin/devmem 0x1e620064 32 "$SET_VAL" + +# Detect boot flash source +SLOT_FILE="/run/media/slot" +mkdir -p "$(dirname "${SLOT_FILE}")" +if [ "$((FMC_WDT2_CTRL_VAL & 0x00000010))" != "0" ]; then + echo "1" > "$SLOT_FILE" +else + echo "0" > "$SLOT_FILE" +fi + +exit 0 diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config/led.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config/led.yaml index 7f894927d6..d94a9e174a 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config/led.yaml +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config/led.yaml @@ -1,142 +1,166 @@ fan0_ok: + Priority: 1 fan0_blue: Action: "On" fan0_amber: Action: "Off" fan0_fail: + Priority: 2 fan0_blue: Action: "Off" fan0_amber: Action: "On" fan1_ok: + Priority: 10 fan1_blue: Action: "On" fan1_amber: Action: "Off" fan1_fail: + Priority: 11 fan1_blue: Action: "Off" fan1_amber: Action: "On" fan2_ok: + Priority: 20 fan2_blue: Action: "On" fan2_amber: Action: "Off" fan2_fail: + Priority: 21 fan2_blue: Action: "Off" fan2_amber: Action: "On" fan3_ok: + Priority: 30 fan3_blue: Action: "On" fan3_amber: Action: "Off" fan3_fail: + Priority: 31 fan3_blue: Action: "Off" fan3_amber: Action: "On" fan4_ok: + Priority: 40 fan4_blue: Action: "On" fan4_amber: Action: "Off" fan4_fail: + Priority: 41 fan4_blue: Action: "Off" fan4_amber: Action: "On" fan5_ok: + Priority: 50 fan5_blue: Action: "On" fan5_amber: Action: "Off" fan5_fail: + Priority: 51 fan5_blue: Action: "Off" fan5_amber: Action: "On" fan6_ok: + Priority: 60 fan6_blue: Action: "On" fan6_amber: Action: "Off" fan6_fail: + Priority: 61 fan6_blue: Action: "Off" fan6_amber: Action: "On" fan7_ok: + Priority: 70 fan7_blue: Action: "On" fan7_amber: Action: "Off" fan7_fail: + Priority: 71 fan7_blue: Action: "Off" fan7_amber: Action: "On" fan8_ok: + Priority: 80 fan8_blue: Action: "On" fan8_amber: Action: "Off" fan8_fail: + Priority: 81 fan8_blue: Action: "Off" fan8_amber: Action: "On" fan9_ok: + Priority: 90 fan9_blue: Action: "On" fan9_amber: Action: "Off" fan9_fail: + Priority: 91 fan9_blue: Action: "Off" fan9_amber: Action: "On" fan10_ok: + Priority: 100 fan10_blue: Action: "On" fan10_amber: Action: "Off" fan10_fail: + Priority: 101 fan10_blue: Action: "Off" fan10_amber: Action: "On" fan11_ok: + Priority: 110 fan11_blue: Action: "On" fan11_amber: Action: "Off" fan11_fail: + Priority: 111 fan11_blue: Action: "Off" fan11_amber: diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/phosphor-fan/phosphor-fan_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/phosphor-fan/phosphor-fan_%.bbappend new file mode 100644 index 0000000000..fac18e1ebc --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/phosphor-fan/phosphor-fan_%.bbappend @@ -0,0 +1 @@ +EXTRA_OEMESON = "-Dskip-power-checking=enabled" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm_nic_power_cycle b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm_nic_power_cycle new file mode 100644 index 0000000000..da563b304c --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm_nic_power_cycle @@ -0,0 +1,81 @@ +#!/bin/sh + +# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions +. /usr/libexec/yosemite4-common-functions + +NIC0_GPIO="EN_NIC0_POWER_BMC_R" +NIC1_GPIO="EN_NIC1_POWER_BMC_R" +NIC2_GPIO="EN_NIC2_POWER_BMC_R" +NIC3_GPIO="EN_NIC3_POWER_BMC_R" +CONTROL_GPIO=0 + +if [ "$1" -eq "0" ]; then + CONTROL_GPIO=$NIC0_GPIO +elif [ "$1" -eq "1" ]; then + CONTROL_GPIO=$NIC1_GPIO +elif [ "$1" -eq "2" ]; then + CONTROL_GPIO=$NIC2_GPIO +elif [ "$1" -eq "3" ]; then + CONTROL_GPIO=$NIC3_GPIO +else + echo "Invalid NIC number!" + exit 1 +fi + +corresponding_slot1=$((2*$1+1)) +corresponding_slot2=$((2*$1+2)) + +# DC power off the corresponding slot +mfg-tool power-control -p $corresponding_slot1 -a off -s runtime +mfg-tool power-control -p $corresponding_slot2 -a off -s runtime + +# Power off NIC card +i=1 +while [ "$i" -lt 3 ] +do + set_gpio "$CONTROL_GPIO" 0 + ret=$? + if [ $ret -eq 0 ]; then + break + fi + + if [ "$i" -eq "3" ]; then + echo "Control NIC $1 power off failed!" + exit 1 + fi + i=$((i+1)) +done + +sleep 1 + +# Power on NIC card +i=1 +while [ "$i" -lt 3 ] +do + set_gpio "$CONTROL_GPIO" 1 + ret=$? + if [ $ret -eq 0 ]; then + break + fi + + if [ "$i" -eq "3" ]; then + echo "Control NIC $1 power on failed!" + exit 1 + fi + i=$((i+1)) +done + +# Wait NIC power on +sleep 5 + +# DC power on the corresponding slot +mfg-tool power-control -p $corresponding_slot1 -a on -s runtime +mfg-tool power-control -p $corresponding_slot2 -a on -s runtime + +# Reconfig network interface +net_index=$(($1-1)) +if [ "$1" -eq 1 ] || [ "$1" -eq 2 ]; then + /usr/libexec/phosphor-gpio-monitor/reconfig-net-interface eth"$net_index" +fi + +exit 0 diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm_nic_power_cycle@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm_nic_power_cycle@.service new file mode 100644 index 0000000000..0cd8bca852 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm_nic_power_cycle@.service @@ -0,0 +1,6 @@ +[Unit] +Description=PLDM nic power cycle + +[Service] +Type=oneshot +ExecStart=/usr/libexec/pldm/pldm_nic_power_cycle %i diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend index 1c7753f6ed..120e9a1f72 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend @@ -2,9 +2,23 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += " \ file://boot_config_setting_attrs.json \ + file://pldm_nic_power_cycle \ + file://pldm_nic_power_cycle@.service \ " +FILES:${PN}:append = " \ + ${systemd_system_unitdir}/pldm_nic_power_cycle \ +" + +SYSTEMD_SERVICE:${PN} += " \ + pldm_nic_power_cycle@.service \ + " + do_install:append() { install -d ${D}/usr/share/pldm/bios install -m 0644 ${WORKDIR}/boot_config_setting_attrs.json ${D}/usr/share/pldm/bios/boot_config_setting_attrs.json + + install -d ${D}${libexecdir}/${PN} + install -m 0755 ${WORKDIR}/pldm_nic_power_cycle ${D}${libexecdir}/${PN}/ + install -m 0644 ${WORKDIR}/pldm_nic_power_cycle@.service ${D}${systemd_system_unitdir} } diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json index 33d855f1cd..51c73f001c 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json @@ -476,11 +476,11 @@ } ] }, - "Expression": "(((P1 + P2 + P3 + P4 + P5 + P6 + P7 + P8 + P9 + P10 + P11 + P12 + P13 + P14 + P15 + P16 + P17 + P18 + P19 + P20 + P21 + P22 + P23 + P24) / 24) * 0.0725) - 14.5" + "Expression": "(((P1 + P2 + P3 + P4 + P5 + P6 + P7 + P8 + P9 + P10 + P11 + P12 + P13 + P14 + P15 + P16 + P17 + P18 + P19 + P20 + P21 + P22 + P23 + P24) / 24) * 0.0702) - 16.9" }, { "Desc": { - "Name": "Calibrated_MB_FIO_TEMP_C_3_10", + "Name": "Calibrated_Sentinel_Dome_Slot_1_MB_FIO_TEMP_C", "SensorType": "temperature" }, "Associations": [ @@ -505,7 +505,7 @@ { "ParamName": "MB_FIO_TEMP_10", "Desc": { - "Name": "MB_FIO_TEMP_C_3_10", + "Name": "Sentinel_Dome_Slot_1_MB_FIO_TEMP_C", "SensorType": "temperature" } } @@ -515,7 +515,7 @@ }, { "Desc": { - "Name": "Calibrated_MB_FIO_TEMP_C_3_20", + "Name": "Calibrated_Sentinel_Dome_Slot_2_MB_FIO_TEMP_C", "SensorType": "temperature" }, "Associations": [ @@ -540,7 +540,7 @@ { "ParamName": "MB_FIO_TEMP_20", "Desc": { - "Name": "MB_FIO_TEMP_C_3_20", + "Name": "Sentinel_Dome_Slot_2_MB_FIO_TEMP_C", "SensorType": "temperature" } } @@ -550,7 +550,7 @@ }, { "Desc": { - "Name": "Calibrated_MB_FIO_TEMP_C_3_30", + "Name": "Calibrated_Sentinel_Dome_Slot_3_MB_FIO_TEMP_C", "SensorType": "temperature" }, "Associations": [ @@ -575,7 +575,7 @@ { "ParamName": "MB_FIO_TEMP_30", "Desc": { - "Name": "MB_FIO_TEMP_C_3_30", + "Name": "Sentinel_Dome_Slot_3_MB_FIO_TEMP_C", "SensorType": "temperature" } } @@ -585,7 +585,7 @@ }, { "Desc": { - "Name": "Calibrated_MB_FIO_TEMP_C_3_40", + "Name": "Calibrated_Sentinel_Dome_Slot_4_MB_FIO_TEMP_C", "SensorType": "temperature" }, "Associations": [ @@ -610,7 +610,7 @@ { "ParamName": "MB_FIO_TEMP_40", "Desc": { - "Name": "MB_FIO_TEMP_C_3_40", + "Name": "Sentinel_Dome_Slot_4_MB_FIO_TEMP_C", "SensorType": "temperature" } } @@ -620,7 +620,7 @@ }, { "Desc": { - "Name": "Calibrated_MB_FIO_TEMP_C_3_50", + "Name": "Calibrated_Sentinel_Dome_Slot_5_MB_FIO_TEMP_C", "SensorType": "temperature" }, "Associations": [ @@ -645,7 +645,7 @@ { "ParamName": "MB_FIO_TEMP_50", "Desc": { - "Name": "MB_FIO_TEMP_C_3_50", + "Name": "Sentinel_Dome_Slot_5_MB_FIO_TEMP_C", "SensorType": "temperature" } } @@ -655,7 +655,7 @@ }, { "Desc": { - "Name": "Calibrated_MB_FIO_TEMP_C_3_60", + "Name": "Calibrated_Sentinel_Dome_Slot_6_MB_FIO_TEMP_C", "SensorType": "temperature" }, "Associations": [ @@ -680,7 +680,7 @@ { "ParamName": "MB_FIO_TEMP_60", "Desc": { - "Name": "MB_FIO_TEMP_C_3_60", + "Name": "Sentinel_Dome_Slot_6_MB_FIO_TEMP_C", "SensorType": "temperature" } } @@ -690,7 +690,7 @@ }, { "Desc": { - "Name": "Calibrated_MB_FIO_TEMP_C_3_70", + "Name": "Calibrated_Sentinel_Dome_Slot_7_MB_FIO_TEMP_C", "SensorType": "temperature" }, "Associations": [ @@ -715,7 +715,7 @@ { "ParamName": "MB_FIO_TEMP_70", "Desc": { - "Name": "MB_FIO_TEMP_C_3_70", + "Name": "Sentinel_Dome_Slot_7_MB_FIO_TEMP_C", "SensorType": "temperature" } } @@ -725,7 +725,7 @@ }, { "Desc": { - "Name": "Calibrated_MB_FIO_TEMP_C_3_80", + "Name": "Calibrated_Sentinel_Dome_Slot_8_MB_FIO_TEMP_C", "SensorType": "temperature" }, "Associations": [ @@ -750,12 +750,792 @@ { "ParamName": "MB_FIO_TEMP_80", "Desc": { - "Name": "MB_FIO_TEMP_C_3_80", + "Name": "Sentinel_Dome_Slot_8_MB_FIO_TEMP_C", "SensorType": "temperature" } } ] }, "Expression": "MB_FIO_TEMP_80 - (Fan_PWM == 100 ? -0.2 : (Fan_PWM >=90 ? -0.1 : (Fan_PWM >=70 ? 0.4 : (Fan_PWM >=50 ? 0.5 : (Fan_PWM >=30 ? 0.6 : 0)))))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_48VHSC0_CURR_A", + "SensorType": "current", + "MaxValue": "255", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 94, + "CriticalHigh": 71.5, + "WarningHigh": 68.25 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_current1", + "Desc": { + "Name": "MEDUSA_48VHSC0_CURR_A_1", + "SensorType": "current" + } + }, + { + "ParamName": "hsc_current2", + "Desc": { + "Name": "MEDUSA_48VHSC0_CURR_A_2", + "SensorType": "current" + } + } + ] + }, + "Expression": "ifNan((hsc_current1 * 1.012 + 0.05), (hsc_current2 * 0.302 - 0.15))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_48VHSC0_INPUT_PWR_W", + "SensorType": "power", + "MaxValue": "3000", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 4512, + "CriticalHigh": 3432, + "WarningHigh": 3276 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_input_power1", + "Desc": { + "Name": "MEDUSA_48VHSC0_INPUT_PWR_W_1", + "SensorType": "power" + } + }, + { + "ParamName": "hsc_input_power2", + "Desc": { + "Name": "MEDUSA_48VHSC0_INPUT_PWR_W_2", + "SensorType": "power" + } + } + ] + }, + "Expression": "ifNan((hsc_input_power1 * 1.01 + 7), (hsc_input_power2 * 0.3))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_48VHSC1_CURR_A", + "SensorType": "current", + "MaxValue": "255", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 94, + "CriticalHigh": 71.5, + "WarningHigh": 68.25 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_current1", + "Desc": { + "Name": "MEDUSA_48VHSC1_CURR_A_1", + "SensorType": "current" + } + }, + { + "ParamName": "hsc_current2", + "Desc": { + "Name": "MEDUSA_48VHSC1_CURR_A_2", + "SensorType": "current" + } + } + ] + }, + "Expression": "ifNan((hsc_current1 * 1.012 + 0.05), (hsc_current2 * 0.302 - 0.15))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_48VHSC1_INPUT_PWR_W", + "SensorType": "power", + "MaxValue": "3000", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 4512, + "CriticalHigh": 3432, + "WarningHigh": 3276 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_input_power1", + "Desc": { + "Name": "MEDUSA_48VHSC1_INPUT_PWR_W_1", + "SensorType": "power" + } + }, + { + "ParamName": "hsc_input_power2", + "Desc": { + "Name": "MEDUSA_48VHSC1_INPUT_PWR_W_2", + "SensorType": "power" + } + } + ] + }, + "Expression": "ifNan((hsc_input_power1 * 1.01 + 7), (hsc_input_power2 * 0.3))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB1_12VHSC_CURR_A", + "SensorType": "current", + "MaxValue": "255", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 90, + "CriticalHigh": 87.956, + "WarningHigh": 83.958 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_current1", + "Desc": { + "Name": "MEDUSA_MB1_12VHSC_CURR_A_1", + "SensorType": "current" + } + }, + { + "ParamName": "hsc_current2", + "Desc": { + "Name": "MEDUSA_MB1_12VHSC_CURR_A_2", + "SensorType": "current" + } + } + ] + }, + "Expression": "ifNan((hsc_current1 * 1.02), (hsc_current2 * 0.505))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB2_12VHSC_CURR_A", + "SensorType": "current", + "MaxValue": "255", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 90, + "CriticalHigh": 87.956, + "WarningHigh": 83.958 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_current1", + "Desc": { + "Name": "MEDUSA_MB2_12VHSC_CURR_A_1", + "SensorType": "current" + } + }, + { + "ParamName": "hsc_current2", + "Desc": { + "Name": "MEDUSA_MB2_12VHSC_CURR_A_2", + "SensorType": "current" + } + } + ] + }, + "Expression": "ifNan((hsc_current1 * 1.02), (hsc_current2 * 0.505))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB3_12VHSC_CURR_A", + "SensorType": "current", + "MaxValue": "255", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 90, + "CriticalHigh": 87.956, + "WarningHigh": 83.958 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_current1", + "Desc": { + "Name": "MEDUSA_MB3_12VHSC_CURR_A_1", + "SensorType": "current" + } + }, + { + "ParamName": "hsc_current2", + "Desc": { + "Name": "MEDUSA_MB3_12VHSC_CURR_A_2", + "SensorType": "current" + } + } + ] + }, + "Expression": "ifNan((hsc_current1 * 1.02), (hsc_current2 * 0.505))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB4_12VHSC_CURR_A", + "SensorType": "current", + "MaxValue": "255", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 90, + "CriticalHigh": 87.956, + "WarningHigh": 83.958 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_current1", + "Desc": { + "Name": "MEDUSA_MB4_12VHSC_CURR_A_1", + "SensorType": "current" + } + }, + { + "ParamName": "hsc_current2", + "Desc": { + "Name": "MEDUSA_MB4_12VHSC_CURR_A_2", + "SensorType": "current" + } + } + ] + }, + "Expression": "ifNan((hsc_current1 * 1.02), (hsc_current2 * 0.505))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB5_12VHSC_CURR_A", + "SensorType": "current", + "MaxValue": "255", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 90, + "CriticalHigh": 87.956, + "WarningHigh": 83.958 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_current1", + "Desc": { + "Name": "MEDUSA_MB5_12VHSC_CURR_A_1", + "SensorType": "current" + } + }, + { + "ParamName": "hsc_current2", + "Desc": { + "Name": "MEDUSA_MB5_12VHSC_CURR_A_2", + "SensorType": "current" + } + } + ] + }, + "Expression": "ifNan((hsc_current1 * 1.02), (hsc_current2 * 0.505))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB6_12VHSC_CURR_A", + "SensorType": "current", + "MaxValue": "255", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 90, + "CriticalHigh": 87.956, + "WarningHigh": 83.958 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_current1", + "Desc": { + "Name": "MEDUSA_MB6_12VHSC_CURR_A_1", + "SensorType": "current" + } + }, + { + "ParamName": "hsc_current2", + "Desc": { + "Name": "MEDUSA_MB6_12VHSC_CURR_A_2", + "SensorType": "current" + } + } + ] + }, + "Expression": "ifNan((hsc_current1 * 1.02), (hsc_current2 * 0.505))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB7_12VHSC_CURR_A", + "SensorType": "current", + "MaxValue": "255", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 90, + "CriticalHigh": 87.956, + "WarningHigh": 83.958 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_current1", + "Desc": { + "Name": "MEDUSA_MB7_12VHSC_CURR_A_1", + "SensorType": "current" + } + }, + { + "ParamName": "hsc_current2", + "Desc": { + "Name": "MEDUSA_MB7_12VHSC_CURR_A_2", + "SensorType": "current" + } + } + ] + }, + "Expression": "ifNan((hsc_current1 * 1.02), (hsc_current2 * 0.505))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB8_12VHSC_CURR_A", + "SensorType": "current", + "MaxValue": "255", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 90, + "CriticalHigh": 87.956, + "WarningHigh": 83.958 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_current1", + "Desc": { + "Name": "MEDUSA_MB8_12VHSC_CURR_A_1", + "SensorType": "current" + } + }, + { + "ParamName": "hsc_current2", + "Desc": { + "Name": "MEDUSA_MB8_12VHSC_CURR_A_2", + "SensorType": "current" + } + } + ] + }, + "Expression": "ifNan((hsc_current1 * 1.02), (hsc_current2 * 0.505))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB1_12VHSC_INPUT_PWR_W", + "SensorType": "power", + "MaxValue": "3000", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 1125, + "CriticalHigh": 1099.45, + "WarningHigh": 1049.47 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_input_power1", + "Desc": { + "Name": "MEDUSA_MB1_12VHSC_INPUT_PWR_W_1", + "SensorType": "power" + } + }, + { + "ParamName": "hsc_input_power2", + "Desc": { + "Name": "MEDUSA_MB1_12VHSC_INPUT_PWR_W_2", + "SensorType": "power" + } + } + ] + }, + "Expression": "ifNan((hsc_input_power1 + 2.5), (hsc_input_power2 * 0.505 + 3))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB2_12VHSC_INPUT_PWR_W", + "SensorType": "power", + "MaxValue": "3000", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 1125, + "CriticalHigh": 1099.45, + "WarningHigh": 1049.47 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_input_power1", + "Desc": { + "Name": "MEDUSA_MB2_12VHSC_INPUT_PWR_W_1", + "SensorType": "power" + } + }, + { + "ParamName": "hsc_input_power2", + "Desc": { + "Name": "MEDUSA_MB2_12VHSC_INPUT_PWR_W_2", + "SensorType": "power" + } + } + ] + }, + "Expression": "ifNan((hsc_input_power1 + 2.5), (hsc_input_power2 * 0.505 + 3))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB3_12VHSC_INPUT_PWR_W", + "SensorType": "power", + "MaxValue": "3000", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 1125, + "CriticalHigh": 1099.45, + "WarningHigh": 1049.47 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_input_power1", + "Desc": { + "Name": "MEDUSA_MB3_12VHSC_INPUT_PWR_W_1", + "SensorType": "power" + } + }, + { + "ParamName": "hsc_input_power2", + "Desc": { + "Name": "MEDUSA_MB3_12VHSC_INPUT_PWR_W_2", + "SensorType": "power" + } + } + ] + }, + "Expression": "ifNan((hsc_input_power1 + 2.5), (hsc_input_power2 * 0.505 + 3))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB4_12VHSC_INPUT_PWR_W", + "SensorType": "power", + "MaxValue": "3000", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 1125, + "CriticalHigh": 1099.45, + "WarningHigh": 1049.47 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_input_power1", + "Desc": { + "Name": "MEDUSA_MB4_12VHSC_INPUT_PWR_W_1", + "SensorType": "power" + } + }, + { + "ParamName": "hsc_input_power2", + "Desc": { + "Name": "MEDUSA_MB4_12VHSC_INPUT_PWR_W_2", + "SensorType": "power" + } + } + ] + }, + "Expression": "ifNan((hsc_input_power1 + 2.5), (hsc_input_power2 * 0.505 + 3))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB5_12VHSC_INPUT_PWR_W", + "SensorType": "power", + "MaxValue": "3000", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 1125, + "CriticalHigh": 1099.45, + "WarningHigh": 1049.47 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_input_power1", + "Desc": { + "Name": "MEDUSA_MB5_12VHSC_INPUT_PWR_W_1", + "SensorType": "power" + } + }, + { + "ParamName": "hsc_input_power2", + "Desc": { + "Name": "MEDUSA_MB5_12VHSC_INPUT_PWR_W_2", + "SensorType": "power" + } + } + ] + }, + "Expression": "ifNan((hsc_input_power1 + 2.5), (hsc_input_power2 * 0.505 + 3))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB6_12VHSC_INPUT_PWR_W", + "SensorType": "power", + "MaxValue": "3000", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 1125, + "CriticalHigh": 1099.45, + "WarningHigh": 1049.47 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_input_power1", + "Desc": { + "Name": "MEDUSA_MB6_12VHSC_INPUT_PWR_W_1", + "SensorType": "power" + } + }, + { + "ParamName": "hsc_input_power2", + "Desc": { + "Name": "MEDUSA_MB6_12VHSC_INPUT_PWR_W_2", + "SensorType": "power" + } + } + ] + }, + "Expression": "ifNan((hsc_input_power1 + 2.5), (hsc_input_power2 * 0.505 + 3))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB7_12VHSC_INPUT_PWR_W", + "SensorType": "power", + "MaxValue": "3000", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 1125, + "CriticalHigh": 1099.45, + "WarningHigh": 1049.47 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_input_power1", + "Desc": { + "Name": "MEDUSA_MB7_12VHSC_INPUT_PWR_W_1", + "SensorType": "power" + } + }, + { + "ParamName": "hsc_input_power2", + "Desc": { + "Name": "MEDUSA_MB7_12VHSC_INPUT_PWR_W_2", + "SensorType": "power" + } + } + ] + }, + "Expression": "ifNan((hsc_input_power1 + 2.5), (hsc_input_power2 * 0.505 + 3))" + }, + { + "Desc": { + "Name": "Calibrated_MEDUSA_MB8_12VHSC_INPUT_PWR_W", + "SensorType": "power", + "MaxValue": "3000", + "MinValue": "0" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board" + ] + ], + "Threshold": { + "HardShutdownHigh": 1125, + "CriticalHigh": 1099.45, + "WarningHigh": 1049.47 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "hsc_input_power1", + "Desc": { + "Name": "MEDUSA_MB8_12VHSC_INPUT_PWR_W_1", + "SensorType": "power" + } + }, + { + "ParamName": "hsc_input_power2", + "Desc": { + "Name": "MEDUSA_MB8_12VHSC_INPUT_PWR_W_2", + "SensorType": "power" + } + } + ] + }, + "Expression": "ifNan((hsc_input_power1 + 2.5), (hsc_input_power2 * 0.505 + 3))" } ] diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/settings/phosphor-settings-defaults-native/yosemite4-temporary-host-software-versions.yml b/meta-facebook/meta-yosemite4/recipes-phosphor/settings/phosphor-settings-defaults-native/yosemite4-temporary-host-software-versions.yml index ac5e0cdd77..795bd7a564 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/settings/phosphor-settings-defaults-native/yosemite4-temporary-host-software-versions.yml +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/settings/phosphor-settings-defaults-native/yosemite4-temporary-host-software-versions.yml @@ -70,7 +70,7 @@ Purpose: Default: Version::VersionPurpose::Other -/xyz/openbmc_project/software/host{}/Wailua_Falls_vr_pvddq_ab_asci1: +/xyz/openbmc_project/software/host{}/Wailua_Falls_vr_pvddq_ab_asic1: - Interface: "xyz.openbmc_project.Software.Version" Properties: Version: @@ -78,7 +78,7 @@ Purpose: Default: Version::VersionPurpose::Other -/xyz/openbmc_project/software/host{}/Wailua_Falls_vr_pvddq_cd_asci1: +/xyz/openbmc_project/software/host{}/Wailua_Falls_vr_pvddq_cd_asic1: - Interface: "xyz.openbmc_project.Software.Version" Properties: Version: @@ -86,7 +86,7 @@ Purpose: Default: Version::VersionPurpose::Other -/xyz/openbmc_project/software/host{}/Wailua_Falls_vr_pvddq_ab_asci2: +/xyz/openbmc_project/software/host{}/Wailua_Falls_vr_pvddq_ab_asic2: - Interface: "xyz.openbmc_project.Software.Version" Properties: Version: @@ -94,7 +94,7 @@ Purpose: Default: Version::VersionPurpose::Other -/xyz/openbmc_project/software/host{}/Wailua_Falls_vr_pvddq_cd_asci2: +/xyz/openbmc_project/software/host{}/Wailua_Falls_vr_pvddq_cd_asic2: - Interface: "xyz.openbmc_project.Software.Version" Properties: Version: diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle index c13138f0a2..4b63347212 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle @@ -5,6 +5,9 @@ # Provide source directive to shellcheck. # shellcheck source=meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd source /usr/libexec/phosphor-state-manager/power-cmd +# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions +source /usr/libexec/yosemite4-common-functions + #IO 0:7 input port for showing slot 1:8 power status #IO 8:16 output port for controlling slot 1:8 power status CHASSIS_ID=$1 @@ -12,45 +15,171 @@ IO_EXP_SLOT_PWR_STATUS=$((CHASSIS_ID - 1)) IO_EXP_SLOT_PWR_CTRL=$((IO_EXP_SLOT_PWR_STATUS + 8)) IO_EXP_SLED_CYCLE=12 #IO_EXP_BIC_PWR_CTRL=32 +IO_EXP_SLOT_12V_STATUS=$((CHASSIS_ID + 23)) +MANAGEMENT_BOARD_VERSION=$(get_product_version Management_Board) + +if [ -z "$MANAGEMENT_BOARD_VERSION" ]; then + echo "Failed to check management board fru info, sled cycle keep default setting" +fi GPIOCHIP_IO_EXP_SLOT_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$SPIDER_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLOT_PWR_CTRL_ADDR/"*gpiochip*) GPIOCHIP_IO_EXP_SLED_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$MANAGEMENT_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLED_PWR_CTRL_ADDR/"*gpiochip*) #GPIOCHIP_IO_EXP_BIC_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$IO_EXP_SLOT_PWR_STATUS-00$IO_EXP_BIC_PWR_CTRL_ADDR/"*gpiochip*) +is_nuvoton_board="$(check_nuvoton_board)" + +enable_i3c_hub() +{ + local target_slot="$CHASSIS_ID" + local hub_path + local offset_file + local access_file + local current_port + local mask=1 + + echo "Do 12V cycle enable i3c-hub" + if [ "$target_slot" -lt 5 ]; then + hub_path="/sys/kernel/debug/i3c-hub-0-*/reg" + echo "Slot${target_slot} on i3c hub 0." + else + hub_path="/sys/kernel/debug/i3c-hub-1-*/reg" + echo "Slot${target_slot} on i3c hub 1." + fi + + for file in $hub_path/{offset,access}; do + if [[ $file == *"/offset" ]]; then + offset_file="$file" + elif [[ $file == *"/access" ]]; then + access_file="$file" + fi + done + + echo "Unlock i3c hub register." + echo 16 > "$offset_file" + echo 105 > "$access_file" + + echo "Enable slot${target_slot} i3c port." + echo 18 > "$offset_file" + current_port=$(cat "$access_file") + if [ "$target_slot" -gt 4 ]; then + ((target_slot=target_slot-4)) + fi + mask=$((mask << (--target_slot))) + current_port=$((current_port | mask)) + echo $current_port > "$access_file" + cat "$access_file" + + echo "Lock i3c hub register." + echo 16 > "$offset_file" + echo 0 > "$access_file" +} + +disable_i3c_hub() +{ + local target_slot="$CHASSIS_ID" + local hub_path + local offset_file + local access_file + local current_port + local mask=1 + + echo "Do 12V cycle disable i3c hub" + if [ "$target_slot" -lt 5 ]; then + hub_path="/sys/kernel/debug/i3c-hub-0-*/reg" + echo "Slot$target_slot on i3c hub 0." + else + hub_path="/sys/kernel/debug/i3c-hub-1-*/reg" + echo "Slot$target_slot on i3c hub 1." + fi + + for file in $hub_path/{offset,access}; do + if [[ $file == *"/offset" ]]; then + offset_file="$file" + elif [[ $file == *"/access" ]]; then + access_file="$file" + fi + done + + echo "Unlock i3c hub register." + echo 16 > "$offset_file" + echo 105 > "$access_file" + + echo "Disable slot${target_slot} i3c port." + echo 18 > "$offset_file" + current_port=$(cat "$access_file") + if [ "$target_slot" -gt 4 ]; then + ((target_slot=target_slot-4)) + fi + mask=$((mask << (--target_slot))) + mask=$((~mask)) + current_port=$((current_port & mask)) + echo $current_port > "$access_file" + cat "$access_file" + + echo "Lock i3c hub register." + echo 16 > "$offset_file" + echo 0 > "$access_file" +} + chassis-power-cycle() { CHASSIS_ID=$1 if [ "$CHASSIS_ID" -le 8 ] then - chassis_status=$(gpioget "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS") + chassis_status=$(gpio_get "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS") if [ "$chassis_status" == "$STATE_ON" ] then - busctl call xyz.openbmc_project.MCTP "/xyz/openbmc_project/mctp/1/${CHASSIS_ID}0" au.com.CodeConstruct.MCTP.Endpoint Remove - busctl call xyz.openbmc_project.MCTP "/xyz/openbmc_project/mctp/1/${CHASSIS_ID}2" au.com.CodeConstruct.MCTP.Endpoint Remove + if [ -n "$is_nuvoton_board" ] + then + # inform management CPLD that the slot is 12V off + if ! gpio_set "$GPIOCHIP_IO_EXP_SLED_PWR_CTRL" "$IO_EXP_SLOT_12V_STATUS"=0 + then + echo "Failed to inform management CPLD that slot$1 is 12V off" + fi + fi + disable_i3c_hub sleep 1 - if ! gpioset "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_CTRL"=1 + if ! gpio_set "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_CTRL"=1 then - echo "Failed to set slot$1 power off" + msg="Failed to set slot$CHASSIS_ID power off" + echo "${msg}" + add_sel "${msg}" fi - sleep 10 + sleep 20 fi - if ! gpioset "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_CTRL"=0 + if ! gpio_set "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_CTRL"=0 then - echo "Failed to set slot$1 power on" + msg="Failed to set slot$CHASSIS_ID power on" + echo "${msg}" + add_sel "${msg}" fi sleep 2 # Check chassis status after doing 12V cycle - chassis_status=$(gpioget "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS") + chassis_status=$(get_ac_on_status "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS") if [ "$chassis_status" == "$STATE_ON" ] then + if [ -n "$is_nuvoton_board" ] + then + # inform management CPLD that the slot is 12V on + if ! gpio_set "$GPIOCHIP_IO_EXP_SLED_PWR_CTRL" "$IO_EXP_SLOT_12V_STATUS"=1 + then + echo "Failed to inform management CPLD that slot$1 is 12V on" + fi + fi + enable_i3c_hub busctl set-property "$CHASSIS_BUS_NAME""$CHASSIS_ID" "$CHASSIS_OBJ_PATH""$CHASSIS_ID" "$CHASSIS_INTF_NAME" "$CHASSIS_PROPERTY_NAME" s "$CHASSIS_ON_PROPERTY" /usr/libexec/phosphor-state-manager/wait-until-mctp-connection-done "$CHASSIS_ID" && systemctl restart "phosphor-discover-system-state@$CHASSIS_ID.service" - echo "Chassis$CHASSIS_ID cycle success" + msg="Chassis$CHASSIS_ID cycle success" + echo "${msg}" + add_sel "${msg}" exit 0; else busctl set-property "$CHASSIS_BUS_NAME""$CHASSIS_ID" "$CHASSIS_OBJ_PATH""$CHASSIS_ID" "$CHASSIS_INTF_NAME" "$CHASSIS_PROPERTY_NAME" s "$CHASSIS_OFF_PROPERTY" + msg="Chassis$CHASSIS_ID cycle failed, Chassis$CHASSIS_ID is power off" + echo "${msg}" + add_sel "${msg}" exit 1; fi fi @@ -59,10 +188,21 @@ chassis-power-cycle() exit 1; } +sled-cycle() +{ + if [ -z "$MANAGEMENT_BOARD_VERSION" ]; then + set_gpio FM_BMC_SLED_CYCLE_R 1 + elif [ "$MANAGEMENT_BOARD_VERSION" = "DVT" ] || [ "$MANAGEMENT_BOARD_VERSION" = "EVT" ]; then + gpio_set "$GPIOCHIP_IO_EXP_SLED_PWR_CTRL" "$IO_EXP_SLED_CYCLE"=1 + else + set_gpio FM_BMC_SLED_CYCLE_R 1 + fi +} + if [ "$1" == 0 ] then echo "Starting sled cycle..." - if ! gpioset "$GPIOCHIP_IO_EXP_SLED_PWR_CTRL" "$IO_EXP_SLED_CYCLE"=1 + if ! sled-cycle then echo "Failed to do sled cycle" fi diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff index 2f9b550d1e..c92be7c537 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff @@ -5,48 +5,112 @@ # Provide source directive to shellcheck. # shellcheck source=meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd source /usr/libexec/phosphor-state-manager/power-cmd +# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions +source /usr/libexec/yosemite4-common-functions + #IO 0:7 input port for showing slot 1:8 power status #IO 8:16 output port for controlling slot 1:8 power status CHASSIS_ID=$1 IO_EXP_SLOT_PWR_STATUS=$((CHASSIS_ID - 1)) IO_EXP_SLOT_PWR_CTRL=$((IO_EXP_SLOT_PWR_STATUS + 8)) #IO_EXP_BIC_PWR_CTRL=32 +IO_EXP_SLOT_12V_STATUS=$((CHASSIS_ID + 23)) GPIOCHIP_IO_EXP_SLOT_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$SPIDER_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLOT_PWR_CTRL_ADDR/"*gpiochip*) #GPIOCHIP_IO_EXP_BIC_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$IO_EXP_SLOT_PWR_STATUS-00$IO_EXP_BIC_PWR_CTRL_ADDR/"*gpiochip*) +GPIOCHIP_IO_EXP_SLOT_12V_STATUS_CTRL=$(basename "/sys/bus/i2c/devices/$MANAGEMENT_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLED_PWR_CTRL_ADDR/"*gpiochip*) + +is_nuvoton_board="$(check_nuvoton_board)" + +disable_i3c_hub() +{ + local target_slot="$CHASSIS_ID" + local hub_path + local offset_file + local access_file + local current_port + local mask=1 + + echo "Do 12V off disable i3c hub" + if [ "$target_slot" -lt 5 ]; then + hub_path="/sys/kernel/debug/i3c-hub-0-*/reg" + echo "Slot$target_slot on i3c hub 0." + else + hub_path="/sys/kernel/debug/i3c-hub-1-*/reg" + echo "Slot$target_slot on i3c hub 1." + fi + + for file in $hub_path/{offset,access}; do + if [[ $file == *"/offset" ]]; then + offset_file="$file" + elif [[ $file == *"/access" ]]; then + access_file="$file" + fi + done + + echo "Unlock i3c hub register." + echo 16 > "$offset_file" + echo 105 > "$access_file" + + echo "Disable slot${target_slot} i3c port." + echo 18 > "$offset_file" + current_port=$(cat "$access_file") + if [ "$target_slot" -gt 4 ]; then + ((target_slot=target_slot-4)) + fi + mask=$((mask << (--target_slot))) + mask=$((~mask)) + current_port=$((current_port & mask)) + echo $current_port > "$access_file" + cat "$access_file" + + echo "Lock i3c hub register." + echo 16 > "$offset_file" + echo 0 > "$access_file" +} # Server 12v power off chassis-power-off() { - busctl call xyz.openbmc_project.MCTP "/xyz/openbmc_project/mctp/1/${CHASSIS_ID}0" au.com.CodeConstruct.MCTP.Endpoint Remove - busctl call xyz.openbmc_project.MCTP "/xyz/openbmc_project/mctp/1/${CHASSIS_ID}2" au.com.CodeConstruct.MCTP.Endpoint Remove - sleep 1 - if ! gpioset "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_CTRL"=1 + disable_i3c_hub + if ! gpio_set "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_CTRL"=1 then - echo "Failed to set slot$1 power off" + msg="Failed to set slot$CHASSIS_ID power off" + echo "${msg}" + add_sel "${msg}" fi sleep 1 # Check chassis status after doing 12V off - chassis_status=$(gpioget "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS") + chassis_status=$(gpio_get "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS") if [ "$chassis_status" == "$STATE_OFF" ] then busctl set-property "$CHASSIS_BUS_NAME""$CHASSIS_ID" "$CHASSIS_OBJ_PATH""$CHASSIS_ID" "$CHASSIS_INTF_NAME" "$CHASSIS_PROPERTY_NAME" s "$CHASSIS_OFF_PROPERTY" echo "Chassis$CHASSIS_ID is power off" else busctl set-property "$CHASSIS_BUS_NAME""$CHASSIS_ID" "$CHASSIS_OBJ_PATH""$CHASSIS_ID" "$CHASSIS_INTF_NAME" "$CHASSIS_PROPERTY_NAME" s "$CHASSIS_ON_PROPERTY" - echo "Chassis$CHASSIS_ID is power on" + msg="Failed to power off Chassis$CHASSIS_ID, Chassis$CHASSIS_ID is power on" + echo "${msg}" + add_sel "${msg}" exit 0; fi } -if ! chassis_status=$(gpioget "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS"); then +if ! chassis_status=$(gpio_get "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS"); then echo "Failed to get chassis status" exit 1 fi if [ "$chassis_status" == "$STATE_ON" ] then + if [ -n "$is_nuvoton_board" ] + then + # inform management CPLD that the slot is 12V off + if ! gpio_set "$GPIOCHIP_IO_EXP_SLOT_12V_STATUS_CTRL" "$IO_EXP_SLOT_12V_STATUS"=0 + then + echo "Failed to inform management CPLD that slot$1 is 12V off" + fi + fi chassis-power-off exit 0; else diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron index 3a1584f99d..fb4b3a94a1 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron @@ -5,38 +5,104 @@ # Provide source directive to shellcheck. # shellcheck source=meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd source /usr/libexec/phosphor-state-manager/power-cmd +# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions +source /usr/libexec/yosemite4-common-functions GPIOCHIP_IO_EXP_SLOT_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$SPIDER_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLOT_PWR_CTRL_ADDR/"*gpiochip*) +GPIOCHIP_IO_EXP_SLOT_12V_STATUS_CTRL=$(basename "/sys/bus/i2c/devices/$MANAGEMENT_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLED_PWR_CTRL_ADDR/"*gpiochip*) #IO 0:7 input port for showing slot 1:8 power status #IO 8:16 output port for controlling slot 1:8 power status CHASSIS_ID=$1 IO_EXP_SLOT_PWR_STATUS=$((CHASSIS_ID - 1)) IO_EXP_SLOT_PWR_CTRL=$((IO_EXP_SLOT_PWR_STATUS + 8)) +IO_EXP_SLOT_12V_STATUS=$((CHASSIS_ID + 23)) + +is_nuvoton_board="$(check_nuvoton_board)" + +enable_i3c_hub() +{ + local target_slot="$CHASSIS_ID" + local hub_path + local offset_file + local access_file + local current_port + local mask=1 + + echo "Do 12V on enable i3c-hub" + sleep 1 + if [ "$target_slot" -lt 5 ]; then + hub_path="/sys/kernel/debug/i3c-hub-0-*/reg" + echo "Slot${target_slot} on i3c hub 0." + else + hub_path="/sys/kernel/debug/i3c-hub-1-*/reg" + echo "Slot${target_slot} on i3c hub 1." + fi + + for file in $hub_path/{offset,access}; do + if [[ $file == *"/offset" ]]; then + offset_file="$file" + elif [[ $file == *"/access" ]]; then + access_file="$file" + fi + done + + echo "Unlock i3c hub register." + echo 16 > "$offset_file" + echo 105 > "$access_file" + + echo "Enable slot${target_slot} i3c port." + echo 18 > "$offset_file" + current_port=$(cat "$access_file") + if [ "$target_slot" -gt 4 ]; then + ((target_slot=target_slot-4)) + fi + mask=$((mask << (--target_slot))) + current_port=$((current_port | mask)) + echo $current_port > "$access_file" + cat "$access_file" + + echo "Lock i3c hub register." + echo 16 > "$offset_file" + echo 0 > "$access_file" +} # Server 12v power on chassis-power-on() { - if ! gpioset "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_CTRL"=0 + if ! gpio_set "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_CTRL"=0 then - echo "Failed to set slot$1 power on" + msg="Failed to set slot$1 power on" + echo "${msg}" + add_sel "${msg}" fi sleep 1 # Check chassis status after doing 12V on - chassis_status=$(gpioget "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS") + chassis_status=$(get_ac_on_status "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS") if [ "$chassis_status" == "$STATE_ON" ] then + if [ -n "$is_nuvoton_board" ] + then + # inform management CPLD that the slot is 12V on + if ! gpio_set "$GPIOCHIP_IO_EXP_SLOT_12V_STATUS_CTRL" "$IO_EXP_SLOT_12V_STATUS"=1 + then + echo "Failed to inform management CPLD that slot$1 is 12V on" + fi + fi + enable_i3c_hub busctl set-property "$CHASSIS_BUS_NAME""$CHASSIS_ID" "$CHASSIS_OBJ_PATH""$CHASSIS_ID" "$CHASSIS_INTF_NAME" "$CHASSIS_PROPERTY_NAME" s "$CHASSIS_ON_PROPERTY" - echo "Chassis is power on" + echo "Chassis$CHASSIS_ID is power on" else busctl set-property "$CHASSIS_BUS_NAME""$CHASSIS_ID" "$CHASSIS_OBJ_PATH""$CHASSIS_ID" "$CHASSIS_INTF_NAME" "$CHASSIS_PROPERTY_NAME" s "$CHASSIS_OFF_PROPERTY" - echo "Chassis is power off" + msg="Failed to power on Chassis$CHASSIS_ID, Chassis$CHASSIS_ID is power off" + echo "${msg}" + add_sel "${msg}" exit 0; fi } -if ! chassis_status=$(gpioget "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS"); then +if ! chassis_status=$(gpio_get "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS"); then echo "Failed to get chassis status" exit 1 fi @@ -47,6 +113,6 @@ then /usr/libexec/phosphor-state-manager/wait-until-mctp-connection-done "$CHASSIS_ID" && systemctl restart "phosphor-discover-system-state@$CHASSIS_ID.service" exit 0; else - echo "Chassis is already on" + echo "Chassis$1 is already on" exit 0; fi diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle index 29067327c2..2e7d316e52 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle @@ -14,7 +14,7 @@ GPIOCHIP_IO_EXP_HOST_POWER_STATUS=$(basename "/sys/bus/i2c/devices/$CHASSIS_BUS- EID=$((CHASSIS_ID * 10)) get_host_status() { - if ! host_status=$(gpioget "$GPIOCHIP_IO_EXP_HOST_POWER_STATUS" "$IO_EXP_P0_PWRGD_R_OUT"); then + if ! host_status=$(gpio_get "$GPIOCHIP_IO_EXP_HOST_POWER_STATUS" "$IO_EXP_P0_PWRGD_R_OUT"); then echo "Failed to get host status" exit 1 fi @@ -34,7 +34,9 @@ if [ "$host_status" == "$STATE_ON" ]; then get_host_status if [ "$host_status" != "$STATE_OFF" ]; then - echo "Do power cycle fail, fail to set host$CHASSIS_ID power off" + msg="Do power cycle fail, fail to set host$CHASSIS_ID power off" + echo "${msg}" + add_sel "${msg}" exit 1 fi fi @@ -48,10 +50,14 @@ if [ "$host_status" != "$STATE_ON" ]; then get_host_status if [ "$host_status" != "$STATE_ON" ]; then - echo "Do power cycle, failed to set host$CHASSIS_ID power on" + msg="Do power cycle, failed to set host$CHASSIS_ID power on" + echo "${msg}" + add_sel "${msg}" exit 1 fi fi -echo "Host power cycle success" -exit 0;
\ No newline at end of file +msg="Host$1 power cycle success" +echo "${msg}" +add_sel "${msg}" +exit 0; diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff index 7592f20958..cdfe724371 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff @@ -11,7 +11,7 @@ IO_EXP_P0_PWRGD_R_OUT=18 GPIOCHIP_IO_EXP_HOST_POWER_STATUS=$(basename "/sys/bus/i2c/devices/$CHASSIS_BUS-0023/"*gpiochip*) get_host_status() { - if ! host_status=$(gpioget "$GPIOCHIP_IO_EXP_HOST_POWER_STATUS" "$IO_EXP_P0_PWRGD_R_OUT"); then + if ! host_status=$(gpio_get "$GPIOCHIP_IO_EXP_HOST_POWER_STATUS" "$IO_EXP_P0_PWRGD_R_OUT"); then echo "Failed to get host status" exit 1 fi @@ -43,9 +43,11 @@ get_host_status if [ "$host_status" == "$STATE_OFF" ] then - echo "Host power off success" + echo "Host$1 power off success" exit 0; else - echo "Failed to set host$1 power off" + msg="Failed to set host$1 power off" + echo "${msg}" + add_sel "${msg}" exit 1 fi diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron index bdaa0ebfd8..73291158ea 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron @@ -10,7 +10,7 @@ IO_EXP_P0_PWRGD_R_OUT=18 GPIOCHIP_IO_EXP_HOST_POWER_STATUS=$(basename "/sys/bus/i2c/devices/$CHASSIS_BUS-0023/"*gpiochip*) get_host_status() { - if ! host_status=$(gpioget "$GPIOCHIP_IO_EXP_HOST_POWER_STATUS" "$IO_EXP_P0_PWRGD_R_OUT"); then + if ! host_status=$(gpio_get "$GPIOCHIP_IO_EXP_HOST_POWER_STATUS" "$IO_EXP_P0_PWRGD_R_OUT"); then echo "Failed to get host status" exit 1 fi @@ -20,7 +20,7 @@ get_host_status if [ "$host_status" == "$STATE_ON" ] then - echo "Already host power on." + echo "Already host$1 power on." exit 0; fi @@ -45,9 +45,11 @@ get_host_status if [ "$host_status" == "$STATE_ON" ] then - echo "Host power on success" + echo "Host$1 power on success" exit 0; else - echo "Failed to set host$1 power on" + msg="Failed to set host$1 power on" + echo "${msg}" + add_sel "${msg}" exit 1 fi diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset index 8829f366d2..8b49c91574 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset @@ -11,7 +11,9 @@ source /usr/libexec/phosphor-state-manager/power-cmd EID=$(($1*10)) if ! pldmtool raw -d 0x80 0x02 0x39 0x00 0x00 0x01 0x00 0x04 -m "$EID" then - echo "Failed to set host$1 power reset" + msg="Failed to set host$1 power reset" + echo "${msg}" + add_sel "${msg}" else - echo "Host is power reset" + echo "Host$1 is power reset" fi diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd index abba9235d2..62a93959e4 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd @@ -1,9 +1,12 @@ #!/bin/bash +# shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions +source /usr/libexec/yosemite4-common-functions + export STATE_OFF=0 export STATE_ON=1 export STATE_UNKNOWN=-1 -export MANAGEMENT_BOARD_IO_EXP_BUS_NUM="13" +export MANAGEMENT_BOARD_IO_EXP_BUS_NUM="34" export SPIDER_BOARD_IO_EXP_BUS_NUM="28" export IO_EXP_SLOT_PWR_CTRL_ADDR="21" export IO_EXP_SLED_PWR_CTRL_ADDR="21" @@ -14,3 +17,65 @@ export CHASSIS_INTF_NAME="xyz.openbmc_project.State.Chassis" export CHASSIS_PROPERTY_NAME="CurrentPowerState" export CHASSIS_ON_PROPERTY="xyz.openbmc_project.State.Chassis.PowerState.On" export CHASSIS_OFF_PROPERTY="xyz.openbmc_project.State.Chassis.PowerState.Off" + +MANAGEMENT_BOARD_VERSION=$(get_product_version Management_Board) +if [ "$MANAGEMENT_BOARD_VERSION" = "DVT" ] || [ "$MANAGEMENT_BOARD_VERSION" = "EVT" ]; then + MANAGEMENT_BOARD_IO_EXP_BUS_NUM="13" +fi + +gpio_get() +{ + RETRY=3 + while [ $RETRY -gt 0 ] + do + if gpioget "$1" "$2" + then + return 0 + fi + RETRY=$((RETRY-1)) + sleep 0.5 + done + echo "gpioget failed" +} + +gpio_set() +{ + RETRY=3 + while [ $RETRY -gt 0 ] + do + if gpioset "$1" "$2" + then + return 0 + fi + RETRY=$((RETRY-1)) + sleep 0.5 + done + echo "gpioset failed" +} + +add_sel() +{ + MESSAGE="$*" + + busctl call \ + xyz.openbmc_project.Logging /xyz/openbmc_project/logging \ + xyz.openbmc_project.Logging.Create Create "ssa{ss}" "$MESSAGE" \ + xyz.openbmc_project.Logging.Entry.Level.Error 0 +} + +get_ac_on_status() +{ + RETRY=20 + while [ $RETRY -gt 0 ] + do + if [ "$(gpio_get "$1" "$2")" == "$STATE_ON" ] + then + echo "$STATE_ON" + return 0 + fi + RETRY=$((RETRY-1)) + sleep 1 + done + echo "$STATE_OFF" +} + diff --git a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init index ec8ed1fce3..7f02ad24eb 100644 --- a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init +++ b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-early-sys-init @@ -1,33 +1,31 @@ -#!/bin/bash -e +#!/bin/bash # shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions source /usr/libexec/yosemite4-common-functions +is_nuvoton_board="$(check_nuvoton_board)" enable_all_fan_input() { - for file in /sys/bus/i2c/devices/*/hwmon/*/fan*_enable + # There is no fan_enable for 2nd source Fan IC: NCT7363 + if find /sys/bus/i2c/devices/*/hwmon/*/fan*_enable -print -quit 2>/dev/null | grep -q .; then + for file in /sys/bus/i2c/devices/*/hwmon/*/fan*_enable + do + echo 1 > "${file}" + done + fi +} + +set_sd_bic_interface_to_i3c() +{ + for host_bus in $(seq 0 7); do - echo 1 > "${file}" + GPIOCHIP=$(basename /sys/bus/i2c/devices/"$host_bus"-0023/*gpiochip*) + if [ "$GPIOCHIP" != "*gpiochip*" ]; then + gpioset "$GPIOCHIP" 24=1 + fi done } -# probe devices behind mux for management board cpld - -rev_id_gpiochip=$(basename "/sys/bus/i2c/devices/13-0020/"*gpiochip*) -rev_id_bit0=$(gpioget "$rev_id_gpiochip" 0) -rev_id_bit1=$(gpioget "$rev_id_gpiochip" 1) -rev_id_bit2=$(gpioget "$rev_id_gpiochip" 2) -rev_id_bit3=$(gpioget "$rev_id_gpiochip" 3) - -# Default devicetree was set for EVT and later, only POC will do following manual devices' probing -if [ "$rev_id_bit0" -eq 0 ] && [ "$rev_id_bit1" -eq 0 ] && [ "$rev_id_bit2" -eq 0 ] && [ "$rev_id_bit3" -eq 0 ] -then - echo 24c128 "0x50" > /sys/bus/i2c/devices/i2c-12/new_device - echo 24c64 "0x54" > /sys/bus/i2c/devices/i2c-12/new_device - echo tmp75 "0x48" > /sys/bus/i2c/devices/i2c-12/new_device - echo nct3018y "0x6f" > /sys/bus/i2c/devices/i2c-12/new_device -fi - # set initial value for GPIO output pins set_gpio EN_P5V_USB_CPLD_R 1 set_gpio EN_NIC0_POWER_BMC_R 1 @@ -39,18 +37,33 @@ set_gpio RST_USB_HUB_R_N 1 set_gpio FM_BMC_READY_R2 1 set_gpio SPI_LOCK_REQ_BMC_N 1 set_gpio EN_P3V_BAT_SCALED_R 0 +set_gpio FM_BMC_SLED_CYCLE_R 0 set_gpio NIC0_MAIN_PWR_EN 1 set_gpio NIC1_MAIN_PWR_EN 1 set_gpio NIC2_MAIN_PWR_EN 1 set_gpio NIC3_MAIN_PWR_EN 1 -# short-term set gpio v0~v3 to input pin for slot5~8 reset button -mknod -m 660 /dev/mem c 1 1 -chown root:kmem /dev/mem -devmem 0x1e78008c 32 0x19000000 +if [ -z "$is_nuvoton_board" ] +then + # short-term set gpio v0~v3 to input pin for slot5~8 reset button + if [ ! -c "/dev/mem" ]; then + mknod -m 660 /dev/mem c 1 1 + fi + chown root:kmem /dev/mem + devmem 0x1e78008c 32 0x19000000 + + # adjust the i2c clock duty cycle for bus 11 + devmem 0x1E78A604 32 0x00487006 +fi # Enable all fan input as early as possible enable_all_fan_input +if [ -n "$is_nuvoton_board" ] +then + # Set interface to SD BIC to I3C for Nuvoton BMC + set_sd_bic_interface_to_i3c +fi + exit 0 diff --git a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init index a68839e239..529678d8c1 100644 --- a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init +++ b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init @@ -2,14 +2,28 @@ # shellcheck source=meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions source /usr/libexec/yosemite4-common-functions +# wait for entity manager +mapper wait /xyz/openbmc_project/inventory/system/board/Yosemite_4_Management_Board +mapper wait /xyz/openbmc_project/inventory/system/board/Yosemite_4_Medusa_Board + # probe devices behind mux for management board cpld +mgm_stage=$(get_product_version Management_Board) -stage=$(busctl introspect xyz.openbmc_project.FruDevice /xyz/openbmc_project/FruDevice/Medusa_Board | grep '.PRODUCT_VERSION' | awk -F\" '{print $2}') +if [ -z "$mgm_stage" ]; then + echo "Failed to check management board fru info, all CPLD I/O expender are keeping default setting" +elif [ "$mgm_stage" = "DVT" ] || [ "$mgm_stage" = "EVT" ]; then + echo pca9506 "0x20" > /sys/bus/i2c/devices/i2c-13/new_device + echo pca9506 "0x21" > /sys/bus/i2c/devices/i2c-13/new_device + echo pca9506 "0x22" > /sys/bus/i2c/devices/i2c-13/new_device + echo pca9506 "0x23" > /sys/bus/i2c/devices/i2c-13/new_device +fi # set initial value for pca9555 i/o pins on medusa board -if [ -z "$stage" ]; then +medusa_stage=$(get_product_version Medusa_Board) + +if [ -z "$medusa_stage" ]; then echo "Failed to check medusa board fru info, all I/O pins are keeping default input" -elif [ "$stage" = "POC" ]; then +elif [ "$medusa_stage" = "POC" ]; then set_gpio P48V_OCP_GPIO1 0 set_gpio P48V_OCP_GPIO2 0 set_gpio P48V_OCP_GPIO3 0 @@ -42,4 +56,13 @@ else set_gpio HSC_OCP_SLOT_EVEN_GPIO2 0 set_gpio HSC_OCP_SLOT_EVEN_GPIO3 0 fi + +# check adc device on medusa board +medusa_model=$(get_product_model Medusa_Board) +if [ "$medusa_model" = "Medusa Board ADC-RNS-ISL 12VHSC-ADI 48VHSC-INF" ]; then + echo 11-0044 > /sys/bus/i2c/drivers/isl28022/bind +else + echo 11-0044 > /sys/bus/i2c/drivers/ina238/bind +fi + exit 0 diff --git a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init.service b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init.service index 68b3934bd9..aa0250b3c7 100644 --- a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init.service +++ b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-svc/files/yosemite4-schematic-init.service @@ -1,7 +1,7 @@ [Unit] Description=Yosemite4 Schematic Init -After=xyz.openbmc_project.FruDevice.service -Requires=xyz.openbmc_project.FruDevice.service +After=xyz.openbmc_project.EntityManager.service +Requires=xyz.openbmc_project.EntityManager.service [Service] Type=oneshot diff --git a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions index 0614ff0827..68dcd0d1b8 100644 --- a/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions +++ b/meta-facebook/meta-yosemite4/recipes-yosemite4/plat-tool/files/yosemite4-common-functions @@ -20,3 +20,25 @@ set_gpio() return 0 } +check_nuvoton_board() +{ + set +e + grep nuvoton /sys/firmware/devicetree/base/compatible + return 0 +} + +get_product_version() +{ + local FRU_NAME=$1 + local PRODUCT_VERSION + PRODUCT_VERSION=$(busctl get-property xyz.openbmc_project.EntityManager /xyz/openbmc_project/inventory/system/board/Yosemite_4_"$FRU_NAME" xyz.openbmc_project.Inventory.Decorator.Revision Version| awk -F\" '{print $2}') + echo "$PRODUCT_VERSION" +} + +get_product_model() +{ + local FRU_NAME=$1 + local PRODUCT_MODEL + PRODUCT_MODEL=$(busctl get-property xyz.openbmc_project.EntityManager /xyz/openbmc_project/inventory/system/board/Yosemite_4_"$FRU_NAME" xyz.openbmc_project.Inventory.Decorator.Asset Model| awk -F\" '{print $2}') + echo "$PRODUCT_MODEL" +} diff --git a/meta-facebook/recipes-bsp/uboot/files/yosemite4-common.cfg b/meta-facebook/recipes-bsp/uboot/files/yosemite4-common.cfg new file mode 100644 index 0000000000..1e2a374f73 --- /dev/null +++ b/meta-facebook/recipes-bsp/uboot/files/yosemite4-common.cfg @@ -0,0 +1,3 @@ +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS4,57600n8 root=/dev/ram rw vmalloc=768M" +CONFIG_BAUDRATE=57600 diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf index d59ca0811c..a3651235e3 100644 --- a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf @@ -28,27 +28,11 @@ template(name="IPMISELTemplate" type="list") { constant(value="\n") } -# Template for Redfish messages -# "<timestamp> <MessageId>,<MessageArgs>" -template(name="RedfishTemplate" type="list") { - property(name="timereported" dateFormat="rfc3339") - constant(value=" ") - property(name="$!REDFISH_MESSAGE_ID") - constant(value=",") - property(name="$!REDFISH_MESSAGE_ARGS") - constant(value="\n") -} - # If the journal entry has a IPMI SEL MESSAGE_ID, save as IPMI SEL if ($!IPMISEL_MESSAGE_ID != "") then { action(type="omfile" file="/var/log/ipmi_sel" template="IPMISELTemplate") } -# If the journal entry has a Redfish MessageId, save as a Redfish event -if ($!REDFISH_MESSAGE_ID != "") then { - action(type="omfile" file="/var/log/redfish" template="RedfishTemplate") -} - # At least one of the consoles will require streaming host console. module(load="imfile") diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate index b564c3812e..02f80a9d28 100644 --- a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate @@ -10,14 +10,3 @@ systemctl restart rsyslog 2> /dev/null || true endscript } - -# Keep up to four 64k files for redfish (256k total) -/var/log/redfish -{ - rotate 3 - size 64k - missingok - postrotate - systemctl restart rsyslog 2> /dev/null || true - endscript -} diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index 42b07a7697..bc04b5ad8a 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem;branch=master;protocol=https" -SRCREV = "519530beae4e7d368f5fc31fa252d51fd7caa601" +SRCREV = "d8d95a3d35071cfef54b519db4a7ffb5beb4b5bf" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions b/meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions index b04332a8a2..d073b66f9f 100644 --- a/meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions +++ b/meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions @@ -37,3 +37,15 @@ set_gpio() echo " success" return 0 } + +bind_i2c_device() +{ + DRIVER_NAME="$1" + DEV_BUS_ADDR="$2" + DRIVER_DIR_PATH="/sys/bus/i2c/drivers/${DRIVER_NAME}" + DRIVER_BIND_PATH="${DRIVER_DIR_PATH}/bind" + if [ ! -L "${DRIVER_DIR_PATH}/${DEV_BUS_ADDR}" ]; then + echo "bind_i2c_device: $DRIVER_NAME, $DEV_BUS_ADDR" + echo "${DEV_BUS_ADDR}" > "${DRIVER_BIND_PATH}" + fi +} diff --git a/meta-facebook/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/recipes-kernel/linux/facebook-linux.inc index cb3fb3f16a..cb3fb3f16a 100644 --- a/meta-facebook/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-facebook/recipes-kernel/linux/facebook-linux.inc diff --git a/meta-facebook/recipes-kernel/linux/files/yosemite4-common.cfg b/meta-facebook/recipes-kernel/linux/files/yosemite4-common.cfg new file mode 100644 index 0000000000..d280c383bd --- /dev/null +++ b/meta-facebook/recipes-kernel/linux/files/yosemite4-common.cfg @@ -0,0 +1,55 @@ +# TPM drivers +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y +CONFIG_TCG_TIS_SPI=m +# I2C drivers +CONFIG_I2C=y +CONFIG_I2C_SLAVE=y +# Jtag driver +CONFIG_JTAG=y +CONFIG_HAS_IOMEM=y +# device driver +CONFIG_SENSORS_LM75=y +CONFIG_EEPROM_AT24=y +CONFIG_SENSORS_ADM1275=y +CONFIG_I2C_MUX_PCA954x=y +CONFIG_SENSORS_TMP421=y +CONFIG_MAX1363=y +CONFIG_SENSORS_INA238=y +CONFIG_SENSORS_ADC128D818=y +CONFIG_SENSORS_MAX31790=y +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_LEDS_PCA955X=y +CONFIG_LEDS_PCA955X_GPIO=y +CONFIG_SENSORS_INA233=y +CONFIG_SENSORS_MP5023=y +CONFIG_SENSORS_EMC1403=y +CONFIG_SENSORS_NCT7363=y +# UHCI/EHCI driver +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_F_HID=y +# RTC driver +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_NCT3018Y=y +# NCSI +CONFIG_NCSI_OEM_CMD_GET_MAC=y +# UART enable threads +CONFIG_SERIAL_8250_NR_UARTS=9 +CONFIG_SERIAL_8250_RUNTIME_UARTS=9 +# USB SERIAL +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_FTDI_SIO=m +# I3C drivers +CONFIG_I3C=y +CONFIG_MCTP_TRANSPORT_I3C=y +CONFIG_I3C_HUB=y +CONFIG_REGMAP_I3C=y +# For OCP debug card +CONFIG_IPMB_DEVICE_INTERFACE=y +# For regulator +CONFIG_REGULATOR=y diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/client.conf b/meta-facebook/recipes-phosphor/console/obmc-console/client.conf new file mode 100644 index 0000000000..d84c0046a3 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/client.conf @@ -0,0 +1,3 @@ +# Specify the escape sequence <Ctrl+L>x which is usable by +# existing FB tooling. +escape-sequence = x diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf index f9326c8507..c5b591b2c9 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf @@ -1,3 +1,4 @@ baud = 57600 console-id = host0 logfile = /var/log/obmc-console-host0.log +aspeed-uart-routing = "OBMC_SOL_ROUTING" diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend index 9f6022c313..9ba6523275 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend @@ -11,3 +11,16 @@ OBMC_BMC_TTY = "ttyS4" SERVER_CONFS = "${@ ' '.join([ f'file://server.{i}.conf' for i in d.getVar('OBMC_CONSOLE_TTYS', True).split() ])}" SRC_URI:append = " ${SERVER_CONFS}" +SRC_URI:append = " file://client.conf " + +OBMC_SOL_ROUTING ?= "" + +do_install:append() { + install -m 0644 ${WORKDIR}/client.conf ${D}${sysconfdir}/${BPN}/client.conf +} + +do_install:prepend() { + if [ -f "${WORKDIR}/server.${OBMC_CONSOLE_HOST_TTY}.conf" ]; then + sed -i "s/\"OBMC_SOL_ROUTING\"/${OBMC_SOL_ROUTING}/g" ${WORKDIR}/server.${OBMC_CONSOLE_HOST_TTY}.conf + fi +} diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-fan/catalina/host-poweroff b/meta-facebook/recipes-phosphor/fans/phosphor-fan/catalina/host-poweroff new file mode 100644 index 0000000000..f9514811a7 --- /dev/null +++ b/meta-facebook/recipes-phosphor/fans/phosphor-fan/catalina/host-poweroff @@ -0,0 +1,5 @@ +#!/bin/bash +# Power off the hosts when fan sensors crossed thresholds. + +echo "This feature is not implemented in catalina and it will be implemented in future." + diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-fan/yosemite4/host-poweroff b/meta-facebook/recipes-phosphor/fans/phosphor-fan/yosemite4-common/host-poweroff index b0bbaf6492..b0bbaf6492 100644 --- a/meta-facebook/recipes-phosphor/fans/phosphor-fan/yosemite4/host-poweroff +++ b/meta-facebook/recipes-phosphor/fans/phosphor-fan/yosemite4-common/host-poweroff diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend index 9b4364b92f..bb5da86f21 100644 --- a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -48,7 +48,7 @@ pkg_postinst:${PN}-sensor-monitor() { ln -s $TARGET $LINK } -pkg_postinst:${PN}-sensor-monitor:harma() { +pkg_postinst:${PN}-sensor-monitor:fb-compute-singlehost() { rm -f $D$systemd_system_unitdir/obmc-chassis-hard-poweroff@0.target.requires/obmc-chassis-poweroff@.target } diff --git a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/ipmb-rescan-fru.sh b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/ipmb-rescan-fru index cee0eacf9e..cee0eacf9e 100644 --- a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/ipmb-rescan-fru.sh +++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/ipmb-rescan-fru diff --git a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc-ipmb-rescan-fru.service b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc-ipmb-rescan-fru.service index 4c71b03ae8..c7a5b91f91 100644 --- a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc-ipmb-rescan-fru.service +++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc-ipmb-rescan-fru.service @@ -3,4 +3,4 @@ Description=ipmb based rescan the slots fru service [Service] Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/ipmb-rescan-fru.sh +ExecStart=/usr/libexec/phosphor-gpio-monitor/ipmb-rescan-fru diff --git a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 294fa42916..4a28bc2720 100644 --- a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI:append:fb-compute-multihost = " file://phosphor-multi-gpio-monitor.json" SRC_URI:append:fb-compute-multihost = " file://obmc-ipmb-rescan-fru.service" -SRC_URI:append:fb-compute-multihost = " file://ipmb-rescan-fru.sh" +SRC_URI:append:fb-compute-multihost = " file://ipmb-rescan-fru" RDEPENDS:${PN} += "bash" @@ -24,6 +24,6 @@ do_install:append:fb-compute-multihost() { ${D}${systemd_system_unitdir} install -d ${D}${libexecdir}/phosphor-gpio-monitor - install -m 0755 ${WORKDIR}/ipmb-rescan-fru.sh ${D}${libexecdir}/phosphor-gpio-monitor/ + install -m 0755 ${WORKDIR}/ipmb-rescan-fru ${D}${libexecdir}/phosphor-gpio-monitor/ } FILES:${PN} += "${systemd_system_unitdir}/obmc-ipmb-rescan-fru.service" diff --git a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc index 375e36a765..013b846ec2 100644 --- a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc +++ b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc @@ -16,6 +16,7 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ '', d)} \ curl \ dbus-top \ + iproute2 \ jq \ strace \ tcpdump \ diff --git a/meta-facebook/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-facebook/recipes-phosphor/interfaces/bmcweb_%.bbappend index bebd7befa6..81704728ed 100644 --- a/meta-facebook/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-facebook/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,7 +1,8 @@ EXTRA_OEMESON:append = "\ -Dredfish-dbus-log=enabled \ + -Dmeta-tls-common-name-parsing=enabled \ " PACKAGECONFIG:append = " insecure-redfish-expand" -MUTUAL_TLS_PARSING="meta" +MUTUAL_TLS_PARSING="Meta" diff --git a/meta-facebook/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-facebook/recipes-phosphor/logging/phosphor-logging_%.bbappend new file mode 100644 index 0000000000..9962561a45 --- /dev/null +++ b/meta-facebook/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -0,0 +1,2 @@ +EXTRA_OEMESON:append = " -Derror_cap=1000"
+EXTRA_OEMESON:append = " -Derror_info_cap=1000"
\ No newline at end of file diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service index f7e93b82f2..525a215574 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service @@ -5,7 +5,7 @@ Description=Phosphor Watchdog ExecStart=/usr/bin/env phosphor-watchdog --continue --service=xyz.openbmc_project.Watchdog \ --path=/xyz/openbmc_project/watchdog/host0 \ --action_target=xyz.openbmc_project.State.Watchdog.Action.HardReset=phosphor-watchdog-host-reset.service \ - --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerOff=host-phosphor-watchdog-host-poweroff.service \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerOff=phosphor-watchdog-host-poweroff.service \ --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerCycle=phosphor-watchdog-host-cycle.service \ SyslogIdentifier=phosphor-watchdog diff --git a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend index 767d487ec5..81680021ba 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -4,18 +4,9 @@ DEPENDS:append:kudo = " gpioplus" STATE_MGR_PACKAGES:remove:kudo = " ${PN}-host-check" RRECOMMENDS:${PN}-host:remove:kudo = " ${PN}-host-check" -EXTRA_OEMESON:append:kudo = " -Dhost-gpios=enabled" +PACKAGECONFIG:append:kudo = " host-gpio" FILES:${PN}:append:kudo = " ${systemd_system_unitdir}/*" -FILES:${PN}-host:append:kudo = " ${bindir}/phosphor-host-condition-gpio" -SYSTEMD_SERVICE:${PN}-host:append:kudo = " phosphor-host-condition-gpio@.service" - -pkg_postinst:${PN}-obmc-targets:prepend:kudo() { - mkdir -p $D$systemd_system_unitdir/multi-user.target.requires - LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service" - TARGET="../phosphor-host-condition-gpio@.service" - ln -s $TARGET $LINK -} pkg_postinst:${PN}-obmc-targets:append:kudo() { rm "$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/obmc-chassis-poweroff@0.target" @@ -32,11 +23,6 @@ pkg_postinst:${PN}-obmc-targets:append:kudo() { rm "$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-host-running@0.service" } -pkg_prerm:${PN}-obmc-targets:prepend:kudo() { - LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service" - rm $LINK -} - SRC_URI:append:kudo = " \ file://xyz.openbmc_project.State.Chassis@.service \ file://xyz.openbmc_project.State.Host@.service \ diff --git a/meta-fii/meta-mori/recipes-phosphor/leds/mori-led-manager-config/led.yaml b/meta-fii/meta-mori/recipes-phosphor/leds/mori-led-manager-config/led.yaml index d9ffd3714c..a2d790b69d 100644 --- a/meta-fii/meta-mori/recipes-phosphor/leds/mori-led-manager-config/led.yaml +++ b/meta-fii/meta-mori/recipes-phosphor/leds/mori-led-manager-config/led.yaml @@ -1,13 +1,16 @@ bmc_booted: BMC_ALIVE: Action: 'On' + Priority: 'Blink' boot_status_inactive: boot_status_led: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' boot_status_bootcomplete: boot_status_led: Action: 'On' + Priority: 'Blink' diff --git a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend index 2f05677486..da65243c2f 100644 --- a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,15 +1,11 @@ FILESEXTRAPATHS:prepend:mori := "${THISDIR}/${PN}:" -DEPENDS:append:mori = " gpioplus" +PACKAGECONFIG:append:mori = " host-gpio" SRC_URI:append:mori = " \ file://xyz.openbmc_project.State.Chassis@.service \ file://xyz.openbmc_project.State.Host@.service \ " -SYSTEMD_SERVICE:${PN}-host:append:mori = " phosphor-host-condition-gpio@.service" - -EXTRA_OEMESON:append:mori = " -Dhost-gpios=enabled" - do_install:append:mori() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Chassis@.service \ @@ -19,18 +15,7 @@ do_install:append:mori() { } FILES:${PN}:append:mori = " ${systemd_system_unitdir}/*" -FILES:${PN}-host:append:mori = " ${bindir}/phosphor-host-condition-gpio" -pkg_prerm:${PN}-obmc-targets:prepend:mori() { - LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service" - rm $LINK -} -pkg_postinst:${PN}-obmc-targets:prepend:mori() { - mkdir -p $D$systemd_system_unitdir/multi-user.target.requires - LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service" - TARGET="../phosphor-host-condition-gpio@.service" - ln -s $TARGET $LINK -} pkg_postinst:${PN}-obmc-targets:append:mori() { rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/obmc-host-shutdown@0.target" rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/phosphor-reboot-host@0.service" diff --git a/meta-google/recipes-google/google-misc/google-misc.inc b/meta-google/recipes-google/google-misc/google-misc.inc index 9870e97723..75c6606735 100644 --- a/meta-google/recipes-google/google-misc/google-misc.inc +++ b/meta-google/recipes-google/google-misc/google-misc.inc @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://../../LICENSE;md5=34400b68072d710fecd0a2940a0d1658" SRC_URI += "git://github.com/openbmc/google-misc;branch=master;protocol=https" -SRCREV = "08988f3dd9b4e0eed788f029d380c876841c09eb" +SRCREV = "a06304b02fa5c4cd9f576a2191994a8259900cba" S = "${WORKDIR}/git/subprojects/${GOOGLE_MISC_PROJ}" inherit meson pkgconfig diff --git a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb index 383d9ad978..d09eaae05a 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb @@ -23,7 +23,7 @@ RDEPENDS:${PN} += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/google-ipmi-sys;branch=master;protocol=https" -SRCREV = "56b2d9f30b05a0471fec58adbba666bfe31032f3" +SRCREV = "e89296998b00d3e92361fdb37152a18566cf4505" FILES:${PN} += "${libdir}/ipmid-providers" diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in index b392176483..c2783be525 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in @@ -15,6 +15,7 @@ [ -n "${gbmc_ncsi_br_deprecated_ips_lib-}" ] && return source /usr/share/network/lib.sh || exit +source /usr/share/gbmc-net-lib.sh || exit gbmc_ncsi_br_deprecated_ips_init= gbmc_ncsi_br_deprecated_ips_confip= @@ -22,6 +23,8 @@ gbmc_ncsi_br_deprecated_ips_lastip= gbmc_ncsi_br_deprecated_ips_lastncsi= gbmc_ncsi_br_deprecated_ips_confncsi= +GBMC_NCSI_ROUTE_TABLE=900 + gbmc_ncsi_br_deprecated_ips_update() { [ -n "$gbmc_ncsi_br_deprecated_ips_init" ] || return [ "$gbmc_ncsi_br_deprecated_ips_confip" != "$gbmc_ncsi_br_deprecated_ips_lastip" ] || \ @@ -62,6 +65,10 @@ IPv6ProxyNDPAddress=$pfx IPv6ProxyNDPAddress=$stateless_pfx ${host_pfx:+IPv6ProxyNDPAddress=}$host_pfx ${stateless_ip:+IPv6ProxyNDPAddress=}$stateless_ip +[RoutingPolicyRule] +From=$pfx/76 +Table=$GBMC_NCSI_ROUTE_TABLE +Priority=$GBMC_NCSI_ROUTE_TABLE EOF read -r -d '' nfcontents <<EOF table inet filter { @@ -86,14 +93,31 @@ EOF fi done - # Ensure that systemd-networkd performs a reconfiguration as it doesn't - # currently check the mtime of drop-in files. - touch -c /etc/systemd/network/*-bmc-@NCSI_IF@.network + # Remove all old ncsi neighbor proxied entries, since we solely + # manage all of these entries and we don't want any that are stale + local entry + while read -r entry; do + ip -6 neigh del proxy ${entry%% *} dev @NCSI_IF@ || true + done < <(ip -6 neigh show proxy dev @NCSI_IF@) + ip -6 rule del pref $GBMC_NCSI_ROUTE_TABLE 2>/dev/null || true - if [ "$(systemctl is-active systemd-networkd)" != 'inactive' ]; then - networkctl reload && networkctl reconfigure @NCSI_IF@ + local st=0 + if [ -n "$gbmc_ncsi_br_deprecated_ips_lastip" ]; then + sysctl net.ipv6.conf.@NCSI_IF@.proxy_ndp=1 >/dev/null || st=$? + ip -6 neigh add proxy $pfx dev @NCSI_IF@ || st=$? + ip -6 neigh add proxy $stateless_pfx dev @NCSI_IF@ || st=$? + if [ -n "$host_pfx" ]; then + ip -6 neigh add proxy $host_pfx dev @NCSI_IF@ || st=$? + fi + if [ -n "$stateless_ip" ]; then + ip -6 neigh add proxy $stateless_ip dev @NCSI_IF@ || st=$? + fi + ip -6 rule add pref $GBMC_NCSI_ROUTE_TABLE from $pfx/76 \ + lookup $GBMC_NCSI_ROUTE_TABLE || st=$? fi + (( st == 0 )) || gbmc_net_networkd_reload @NCSI_IF@ + local rfile=/run/nftables/40-gbmc-ncsi-br.rules mkdir -p -m 755 "$(dirname "$rfile")" if [ -z "$nfcontents" ]; then diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-dhcrelay.service.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-dhcrelay.service.in index 62a519a2da..c085cbcdec 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-dhcrelay.service.in +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-dhcrelay.service.in @@ -3,11 +3,15 @@ Description=gBMC DHCP Relay Agent Daemon After=network.target StartLimitIntervalSec=10 StartLimitBurst=3 +LogRateLimitIntervalSec=120 +LogRateLimitBurst=100 [Service] +Environment="RP_FLAG=-rp 3967" +EnvironmentFile=-/run/gbmc-ncsi-dhcrelay.env Restart=always RestartSec=5 -ExecStart=/usr/sbin/dhcrelay -d --no-pid -rp 3967 -l gbmcncsidhcp -u ff02::1:2%%@NCSI_IF@ +ExecStart=/usr/sbin/dhcrelay -d --no-pid $RP_FLAG -l gbmcncsidhcp -u ff02::1:2%%@NCSI_IF@ [Install] WantedBy=multi-user.target diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ip-from-ra.service.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ip-from-ra.service.in deleted file mode 100644 index 82972fffce..0000000000 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ip-from-ra.service.in +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=gBMC NCSI RA Discovery -After=network.target -StartLimitIntervalSec=10 -StartLimitBurst=3 -Conflicts=nic-hostless@@NCSI_IF@.target -Conflicts=nic-hostful@@NCSI_IF@.target - -[Service] -Restart=always -RestartSec=5 -ExecStart=/usr/libexec/gbmc-ncsi-ip-from-ra.sh - -[Install] -WantedBy=multi-user.target diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ip-from-ra.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ip-from-ra.sh.in deleted file mode 100755 index 4aae5c86b3..0000000000 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ip-from-ra.sh.in +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash -# Copyright 2021 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -[ ! -e /usr/share/gbmc-br-lib.sh ] && exit - -# shellcheck source=meta-google/recipes-google/networking/network-sh/lib.sh -source /usr/share/network/lib.sh || exit -# shellcheck source=meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-lib.sh -source /usr/share/gbmc-br-lib.sh || exit - -NCSI_IF='@NCSI_IF@' - -old_pfx= -old_fqdn= -old_rtr= - -set_host() { - [[ -n "$host" && -n "$domain" && -n "$hextet" ]] || return - - local fqdn="$host-n$hextet.$domain" - [ "$fqdn" != "$old_fqdn" ] || return - old_fqdn="$fqdn" - - echo "Found hostname $fqdn" >&2 - hostnamectl set-hostname "$fqdn" || true -} - -set_net() { - [[ -n "$pfx" && -n "$rtr" ]] || return - [[ "$pfx" != "$old_pfx" || "$rtr" != "$old_rtr" ]] || return - old_pfx="$pfx" - old_rtr="$rtr" - - echo "Found prefix $pfx from $rtr" >&2 - - # We no longer need NCSId if we are in this configuration - systemctl stop --no-block ncsid@"$NCSI_IF" || true - - # Save the IP address for the interface - gbmc_br_set_ip "$pfx" || true - - # DHCP Relay workaround until alternate source port is supported - # TODO: Remove this once internal relaying cleanups land - gbmc-ncsi-smartnic-wa.sh || true -} - -w=60 -while true; do - start=$SECONDS - while read -r line; do - # `script` terminates all lines with a CRLF, remove it - line="${line:0:-1}" - if [ -z "$line" ]; then - hextet= - pfx= - host= - domain= - elif [[ "$line" =~ ^Prefix' '*:' '*(.*)/([0-9]+)$ ]]; then - t_pfx="${BASH_REMATCH[1]}" - t_pfx_len="${BASH_REMATCH[2]}" - ip_to_bytes t_pfx_b "$t_pfx" || continue - (( t_pfx_len == 76 && (t_pfx_b[8] & 0xfd) == 0xfd )) || continue - (( t_pfx_b[9] |= 1 )) - hextet="fd$(printf '%02x' "${t_pfx_b[9]}")" - pfx="$(ip_bytes_to_str t_pfx_b)" - elif [[ "$line" =~ ^'DNS search list'' '*:' '*([^.]+)(.*[.]google[.]com)' '*$ ]]; then - # Ideally, we use PCRE and with lookahead and can do this in a single regex - # ^([a-zA-Z0-9-]+(?=-n[a-fA-F0-9]{1,4})|[a-zA-Z0-9-]+(?!-n[a-fA-F0-9]{1,4}))[^.]*[.]((?:[a-zA-Z0-9]*[.])*google[.]com)$ - # Instead we do multiple steps to extract the needed info - host="${BASH_REMATCH[1]}" - domain="${BASH_REMATCH[2]#.}" - if [[ "$host" =~ (-n[a-fA-F0-9]{1,4})$ ]]; then - host="${host%"${BASH_REMATCH[1]}"}" - fi - elif [[ "$line" =~ ^from' '(.*)$ ]]; then - rtr="${BASH_REMATCH[1]}" - set_net || true - set_host || true - fi - done < <(exec script -q -c "rdisc6 -d -m $NCSI_IF -w $(( w * 1000 ))" /dev/null 2>/dev/null) - # If rdisc6 exits early we still want to wait the full `w` time before - # starting again. - (( timeout = start + w - SECONDS )) - sleep $(( timeout < 0 ? 0 : timeout )) -done diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ra.service.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ra.service.in new file mode 100644 index 0000000000..d389740b1f --- /dev/null +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ra.service.in @@ -0,0 +1,15 @@ +[Unit] +Description=RA Gateway Updater +Wants=mapper-wait@-xyz-openbmc_project-network-@NCSI_IF@.service +After=mapper-wait@-xyz-openbmc_project-network-@NCSI_IF@.service +After=ncsid@NCSI_IF@.service +StartLimitIntervalSec=1min +StartLimitBurst=5 + +[Service] +Restart=always +RestartSec=5 +ExecStart=/usr/libexec/gbmc-ncsi-ra.sh @NCSI_IF@ + +[Install] +WantedBy=multi-user.target diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ra.sh b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ra.sh new file mode 100644 index 0000000000..ca8fa05caa --- /dev/null +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-ra.sh @@ -0,0 +1,91 @@ +#!/bin/bash +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# shellcheck source=meta-google/recipes-google/networking/gbmc-net-common/gbmc-net-lib.sh +source /usr/share/gbmc-net-lib.sh || exit + +RA_IF=$1 +IP_OFFSET=1 +# NCSI is known to be closer to the ToR than bridge routes. Prefer over bridge routes. +ROUTE_METRIC=900 +ROUTE_TABLE=900 + +update_rtr() { + busctl set-property xyz.openbmc_project.Network /xyz/openbmc_project/network/"$RA_IF" \ + xyz.openbmc_project.Network.EthernetInterface DefaultGateway6 s "" || true + + default_update_rtr "$@" + + # Add additional gateway information + for file in /run/systemd/network/{00,}-bmc-$RA_IF.network; do + mkdir -p "$file.d" + printf '[Route]\nGateway=%s\nGatewayOnLink=true\nTable=%d' \ + "$rtr" "$ROUTE_TABLE" >"$file.d"/10-gateway-table.conf + done + + ip -6 route replace default via "$rtr" onlink dev "$RA_IF" table "$ROUTE_TABLE" || \ + gbmc_net_networkd_reload "$RA_IF" +} + +ncsi_is_active() { + systemctl is-active -q nic-hostless@"$RA_IF".target && return + systemctl is-active -q nic-hostful@"$RA_IF".target && return + return 1 +} + +update_fqdn() { + true +} + +old_ncsi_pfx= + +update_pfx() { + local pfx="$1" + + # We only do this for smartNICs (which don't use NCSI) + ncsi_is_active && return + + # Don't change anything for an empty prefix + [ -z "$pfx" ] && return + + # We no longer need NCSId if we are in this configuration + systemctl stop --no-block ncsid@"$RA_IF" || true + + # DHCP Relay workaround until alternate source port is supported + # TODO: Remove this once internal relaying cleanups land + gbmc-ncsi-smartnic-wa.sh || true + + # Override any existing address information within files + # Make sure we cover `00-*` and `-*` files + for file in /run/systemd/network/{00,}-bmc-gbmcbr.network; do + mkdir -p "$file.d" + printf '[Network]\nAddress=%s/128' \ + "$pfx" >"$file.d"/10-ncsi-addr.conf + done + + # Don't force networkd to reload as this can break phosphor-networkd + # Fall back to reload only if ip link commands fail + if [ -n "$old_ncsi_pfx" ]; then + ip -6 addr del "$old_ncsi_pfx/128" dev gbmcbr || true + fi + ip -6 addr replace "$pfx/128" dev gbmcbr || \ + gbmc_net_networkd_reload gbmcbr || true + old_ncsi_pfx=$pfx + + echo "Set NCSI addr $pfx on gbmcbr" >&2 +} + +# shellcheck source=meta-google/recipes-google/networking/gbmc-net-common/gbmc-ra.sh +source /usr/share/gbmc-ra.sh || exit diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in index 88f52d38e8..c05e239f7f 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in @@ -13,34 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -HAS_DHCRELAY='@GBMC_NCSI_DHCP_RELAY@' +HAS_DHCRELAY='@GBMC_DHCP_RELAY@' if [ "$HAS_DHCRELAY" = 1 ]; then - override=/run/systemd/system/gbmc-ncsi-dhcrelay.service.d/10-nosp.conf - mkdir -p "$(dirname "$override")" - echo '[Service]' >"$override" - echo 'ExecStart=' >>"$override" # Remove the source relay port from the relay, bringing it back to run on # the default port 547. Our relays don't support the source port option needed # to run on 3967 for our legacy NICs. - grep '^ExecStart=' /lib/systemd/system/gbmc-ncsi-dhcrelay.service | \ - sed 's, -rp 3967,,' >>"$override" -fi - -override=/run/systemd/system/gbmc-br-dhcp.service.d/10-direct.conf -mkdir -p "$(dirname "$override")" -echo '[Service]' >"$override" -echo 'ExecStart=' >>"$override" -# Switch the gbmcbr interface for the NCSI one to avoid passing the SOLICIT -# message through the BMC relay. -grep '^ExecStart=' /lib/systemd/system/gbmc-br-dhcp.service | \ - sed 's, -i gbmcbr, -i @NCSI_IF@,' >>"$override" - -systemctl daemon-reload -if [ "$HAS_DHCRELAY" = 1 ]; then + echo 'RP_FLAG=' >/run/gbmc-ncsi-dhcrelay.env systemctl reset-failed gbmc-ncsi-dhcrelay systemctl restart --no-block gbmc-ncsi-dhcrelay fi + +echo 'INTF=@NCSI_IF@' >/run/gbmc-br-dhcp.env systemctl reset-failed gbmc-br-dhcp systemctl restart --no-block gbmc-br-dhcp diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb index 29ec5bd19e..aac9935642 100644 --- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb +++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb @@ -5,20 +5,20 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd -GBMC_NCSI_DHCP_RELAY ??= "${@'' if int(d.getVar('FLASH_SIZE')) < 65536 else '1'}" +GBMC_DHCP_RELAY ??= "${@'' if int(d.getVar('FLASH_SIZE')) < 65536 else '1'}" GBMC_NCSI_IF_OLD ??= "" GBMC_NCSI_PURGE_ETC ??= "" GBMC_NCSI_DHCP_IMPERSONATE_HOST ??= "1" SRC_URI += " \ - ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'file://-bmc-gbmcbrncsidhcp.netdev'} \ - ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'file://-bmc-gbmcbrncsidhcp.network'} \ - ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'file://-bmc-gbmcncsidhcp.netdev'} \ - ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'file://-bmc-gbmcncsidhcp.network'} \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcbrncsidhcp.netdev'} \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcbrncsidhcp.network'} \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcncsidhcp.netdev'} \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcncsidhcp.network'} \ file://50-gbmc-ncsi.rules.in \ - ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'file://gbmc-ncsi-dhcrelay.service.in'} \ - file://gbmc-ncsi-ip-from-ra.service.in \ - file://gbmc-ncsi-ip-from-ra.sh.in \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://gbmc-ncsi-dhcrelay.service.in'} \ + file://gbmc-ncsi-ra.service.in \ + file://gbmc-ncsi-ra.sh \ file://gbmc-ncsi-smartnic-wa.sh.in \ file://gbmc-ncsi-sslh.socket.in \ file://gbmc-ncsi-sslh.service \ @@ -36,13 +36,13 @@ S = "${WORKDIR}" RDEPENDS:${PN} += " \ bash \ - ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'dhcp-relay'} \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'dhcp-relay'} \ gbmc-ip-monitor \ + gbmc-net-common \ ncsid \ network-sh \ nftables-systemd \ sslh \ - ndisc6-rdisc6 \ " FILES:${PN} += " \ @@ -52,11 +52,11 @@ FILES:${PN} += " \ " SYSTEMD_SERVICE:${PN} += " \ - ${@'' if d.getVar('GBMC_NCSI_DHCP_RELAY') != '1' else 'gbmc-ncsi-dhcrelay.service'} \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'gbmc-ncsi-dhcrelay.service'} \ gbmc-ncsi-sslh.service \ gbmc-ncsi-sslh.socket \ gbmc-ncsi-set-nicenabled.service \ - gbmc-ncsi-ip-from-ra.service \ + gbmc-ncsi-ra.service \ ${@'' if d.getVar('GBMC_NCSI_IF_OLD') == '' else 'gbmc-ncsi-old.service'} \ ${@'' if d.getVar('GBMC_NCSI_PURGE_ETC') == '' else 'gbmc-ncsi-purge.service'} \ " @@ -74,7 +74,7 @@ do_install:append() { echo "net.ipv6.conf.$if_name.dad_transmits=0" \ >>${D}${sysconfdir}/sysctl.d/25-gbmc-ncsi.conf - if [ "${GBMC_NCSI_DHCP_RELAY}" = 1 ]; then + if [ "${GBMC_DHCP_RELAY}" = 1 ]; then install -d -m0755 ${D}${systemd_unitdir}/network install -m0644 ${WORKDIR}/-bmc-gbmcbrncsidhcp.netdev \ ${D}${systemd_unitdir}/network/ @@ -136,7 +136,7 @@ do_install:append() { sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-set-nicenabled.service.in \ >${D}${systemd_system_unitdir}/gbmc-ncsi-set-nicenabled.service - if [ "${GBMC_NCSI_DHCP_RELAY}" = "1" ]; then + if [ "${GBMC_DHCP_RELAY}" = "1" ]; then sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-dhcrelay.service.in \ >${D}${systemd_system_unitdir}/gbmc-ncsi-dhcrelay.service fi @@ -151,15 +151,13 @@ do_install:append() { >${D}${systemd_system_unitdir}/gbmc-ncsi-purge.service fi - sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-ip-from-ra.service.in \ - >${WORKDIR}/gbmc-ncsi-ip-from-ra.service - install -m0644 ${WORKDIR}/gbmc-ncsi-ip-from-ra.service ${D}${systemd_system_unitdir} - sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-ip-from-ra.sh.in \ - >${WORKDIR}/gbmc-ncsi-ip-from-ra.sh + sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-ra.service.in \ + >${WORKDIR}/gbmc-ncsi-ra.service + install -m0644 ${WORKDIR}/gbmc-ncsi-ra.service ${D}${systemd_system_unitdir} install -d -m0755 ${D}${libexecdir} - install -m0755 ${WORKDIR}/gbmc-ncsi-ip-from-ra.sh ${D}${libexecdir}/ + install -m0755 ${WORKDIR}/gbmc-ncsi-ra.sh ${D}${libexecdir}/ - sed -e "s,@NCSI_IF@,$if_name,g" -e "s,@GBMC_NCSI_DHCP_RELAY@,${GBMC_NCSI_DHCP_RELAY},g" \ + sed -e "s,@NCSI_IF@,$if_name,g" -e "s,@GBMC_DHCP_RELAY@,${GBMC_DHCP_RELAY},g" \ ${WORKDIR}/gbmc-ncsi-smartnic-wa.sh.in >${WORKDIR}/gbmc-ncsi-smartnic-wa.sh install -d -m0755 ${D}${bindir} install -m0755 ${WORKDIR}/gbmc-ncsi-smartnic-wa.sh ${D}${bindir}/ diff --git a/meta-google/recipes-google/ncsi/ncsid_git.bb b/meta-google/recipes-google/ncsi/ncsid_git.bb index 6fad50a3ca..d746c278cd 100644 --- a/meta-google/recipes-google/ncsi/ncsid_git.bb +++ b/meta-google/recipes-google/ncsi/ncsid_git.bb @@ -14,7 +14,6 @@ SYSTEMD_SERVICE:${PN} += " \ ncsid@.service \ nic-hostful@.target \ nic-hostless@.target \ - update-ra-gw@.service \ " DEPENDS += " \ @@ -31,3 +30,9 @@ RDEPENDS:${PN} += " \ ndisc6-rdisc6 \ systemd \ " + +# TODO: Remove when package is bumped to formally delete this service +do_install:append() { + rm ${D}${systemd_system_unitdir}/update-ra-gw@.service + rm ${D}${libexecdir}/update_ra_gw.sh +} diff --git a/meta-google/recipes-google/networking/dhcp-done_git.bb b/meta-google/recipes-google/networking/dhcp-done_git.bb index 12e3903837..2cc9b95c88 100644 --- a/meta-google/recipes-google/networking/dhcp-done_git.bb +++ b/meta-google/recipes-google/networking/dhcp-done_git.bb @@ -4,9 +4,12 @@ GOOGLE_MISC_PROJ = "dhcp-done" require ../google-misc/google-misc.inc +EXTRA_OEMESON = " \ + -Dtests=disabled \ + " inherit systemd -SYSTEMD_SERVICE:${PN} += "dhcp-done@.service" +SYSTEMD_SERVICE:${PN} += "dhcp-done.service" DEPENDS += " \ sdeventplus \ diff --git a/meta-google/recipes-google/networking/gbmc-bridge.bb b/meta-google/recipes-google/networking/gbmc-bridge.bb index 3f20530291..0a6f40eda7 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge.bb +++ b/meta-google/recipes-google/networking/gbmc-bridge.bb @@ -15,12 +15,15 @@ SRC_URI += " \ file://50-gbmc-br.rules \ file://gbmc-br-ula.sh \ file://gbmc-br-from-ra.sh \ - file://gbmc-br-ensure-ra.sh \ - file://gbmc-br-ensure-ra.service \ + file://gbmc-br-hostname.sh \ + file://gbmc-br-hostname.service \ + file://gbmc-br-ra.sh.in \ + file://gbmc-br-ra.service \ file://gbmc-br-gw-src.sh \ file://gbmc-br-nft.sh \ file://gbmc-br-dhcp.sh \ - file://50-gbmc-psu-hardreset.sh \ + file://50-gbmc-psu-hardreset.sh.in \ + file://51-gbmc-reboot.sh \ file://gbmc-br-dhcp.service \ file://gbmc-br-dhcp-term.sh \ file://gbmc-br-dhcp-term.service \ @@ -42,25 +45,38 @@ RDEPENDS:${PN}:append = " \ bash \ dhcp-done \ gbmc-ip-monitor \ + gbmc-net-common \ network-sh \ ndisc6-rdisc6 \ nftables-systemd \ " SYSTEMD_SERVICE:${PN} += " \ - gbmc-br-ensure-ra.service \ + gbmc-br-hostname.service \ gbmc-br-dhcp.service \ gbmc-br-dhcp-term.service \ gbmc-br-load-ip.service \ + gbmc-br-ra.service \ " GBMC_BR_MAC_ADDR ?= "" +# Enables the assignment of IP address and hostname by discovering the +# machine name and BMC prefix from another BMC on the bridge network. +# This is intended only to be used when there is a single expansion tray +# on the BMC network. If more than one machine uses this feature with the +# same offset in the same machine network, it will collide with others. +# A value of 0 implies that this feature is disabled. +GBMC_BR_FIXED_OFFSET ?= "0" + # Generated via https://cd34.com/rfc4193/ based on a MAC from a machine I own # and we allocated it downstream. Intended to only be used within a complete # system of multiple network endpoints. GBMC_ULA_PREFIX = "fdb5:0481:10ce:0" +# coordinated powercycle +GBMC_COORDINATED_POWERCYCLE ?= "true" + def mac_to_eui64(mac): if not mac: return '' @@ -122,21 +138,28 @@ do_install() { install -m0644 ${WORKDIR}/gbmc-br-nft.sh "$mondir"/ install -d -m0755 ${D}${libexecdir} - install -m0755 ${WORKDIR}/gbmc-br-ensure-ra.sh ${D}${libexecdir}/ + install -m0755 ${WORKDIR}/gbmc-br-hostname.sh ${D}${libexecdir}/ install -m0755 ${WORKDIR}/gbmc-br-dhcp.sh ${D}${libexecdir}/ install -m0755 ${WORKDIR}/gbmc-br-dhcp-term.sh ${D}${libexecdir}/ install -d -m0755 ${D}${systemd_system_unitdir} - install -m0644 ${WORKDIR}/gbmc-br-ensure-ra.service ${D}${systemd_system_unitdir}/ + install -m0644 ${WORKDIR}/gbmc-br-hostname.service ${D}${systemd_system_unitdir}/ install -m0644 ${WORKDIR}/gbmc-br-dhcp.service ${D}${systemd_system_unitdir}/ install -m0644 ${WORKDIR}/gbmc-br-dhcp-term.service ${D}${systemd_system_unitdir}/ install -m0644 ${WORKDIR}/gbmc-br-load-ip.service ${D}${systemd_system_unitdir}/ install -d -m0755 ${D}${datadir}/gbmc-br-dhcp + + sed 's,@COORDINATED_POWERCYCLE@,${GBMC_COORDINATED_POWERCYCLE},' ${WORKDIR}/50-gbmc-psu-hardreset.sh.in >${WORKDIR}/50-gbmc-psu-hardreset.sh install -m0644 ${WORKDIR}/50-gbmc-psu-hardreset.sh ${D}${datadir}/gbmc-br-dhcp/ + install -m0644 ${WORKDIR}/51-gbmc-reboot.sh ${D}${datadir}/gbmc-br-dhcp/ install -m0644 ${WORKDIR}/gbmc-br-lib.sh ${D}${datadir}/ install -d ${D}/${bindir} install -m0755 ${WORKDIR}/gbmc-start-dhcp.sh ${D}${bindir}/ + + sed 's,@IP_OFFSET@,${GBMC_BR_FIXED_OFFSET},' ${WORKDIR}/gbmc-br-ra.sh.in >${WORKDIR}/gbmc-br-ra.sh + install -m0755 ${WORKDIR}/gbmc-br-ra.sh ${D}${libexecdir}/ + install -m0644 ${WORKDIR}/gbmc-br-ra.service ${D}${systemd_system_unitdir}/ } do_rm_work:prepend() { diff --git a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network.in b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network.in index d77557e8e3..dab65a91b2 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network.in +++ b/meta-google/recipes-google/networking/gbmc-bridge/-bmc-gbmcbr.network.in @@ -6,10 +6,18 @@ IPv6AcceptRA=true LLMNR=true MulticastDNS=true LinkLocalAddressing=ipv6 -IPv6PrefixDelegation=yes +IPv6SendRA=yes @ADDR@ [IPv6AcceptRA] DHCPv6Client=false RouteMetric=1056 -[IPv6PrefixDelegation] +[IPv6SendRA] RouterLifetimeSec=0 +[RoutingPolicyRule] +To=fdb5:481:10ce::/64 +Table=main +Priority=500 +[RoutingPolicyRule] +To=fe80::/64 +Table=main +Priority=500 diff --git a/meta-google/recipes-google/networking/gbmc-bridge/50-gbmc-psu-hardreset.sh b/meta-google/recipes-google/networking/gbmc-bridge/50-gbmc-psu-hardreset.sh.in index c0974a00d1..588efcb351 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge/50-gbmc-psu-hardreset.sh +++ b/meta-google/recipes-google/networking/gbmc-bridge/50-gbmc-psu-hardreset.sh.in @@ -17,6 +17,8 @@ gbmc_psu_hardreset_needed= +COORDINATED_POWERCYCLE=@COORDINATED_POWERCYCLE@ + gbmc_psu_hardreset_hook() { # We don't always need a powercycle, allow skipping if [ -z "${gbmc_psu_hardreset_needed-}" ]; then @@ -24,8 +26,13 @@ gbmc_psu_hardreset_hook() { return 0 fi - echo "Powercycling" >&2 - systemctl start gbmc-psu-hardreset.target || return + if [[ "${COORDINATED_POWERCYCLE}" == "true" ]]; then + echo "Requesting powercycle" >&2 + update-dhcp-status 'POWERCYCLE' "netboot powercycle" || return + else + echo "Powercycling" >&2 + systemctl start gbmc-psu-hardreset.target || return + fi # Ensure that we don't continue the DHCP process while waiting for the # powercycle. diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ensure-ra.sh b/meta-google/recipes-google/networking/gbmc-bridge/51-gbmc-reboot.sh index 60e33d89b3..41dd883d06 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ensure-ra.sh +++ b/meta-google/recipes-google/networking/gbmc-bridge/51-gbmc-reboot.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2021 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,15 +13,23 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Every 30 seconds, send out an RA so that the kernel will receive a response. -# This ensures that all BMCs (even ones that think they are routers) get updated -# information from the other systems on the network. -w=30 -while true; do - start=$SECONDS - rdisc6 -m gbmcbr -r 1 -w $(( w * 1000 )) >/dev/null 2>/dev/null - # If rdisc6 exits early we still want to wait the full `w` time before - # starting again. - (( timeout = start + w - SECONDS )) - sleep $(( timeout < 0 ? 0 : timeout )) -done +[ -n "${gbmc_reboot-}" ] && return + +gbmc_reboot_needed= + +gbmc_reboot_hook() { + # We don't always need a warm reset, allow skipping + if [ -z "${gbmc_reboot_needed-}" ]; then + echo "Skipping bmc reboot" >&2 + return 0 + fi + + update-dhcp-status 'ONGOING' "triggerring bmc reboot" + + reboot -f + exit 0 +} + +GBMC_BR_DHCP_HOOKS+=(gbmc_reboot_hook) + +gbmc_reboot=1 diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.service b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.service index 60ea0fb9ea..48f53abde7 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.service +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.service @@ -1,14 +1,17 @@ [Unit] Description=gBMC DHCP Client -After=network.target +After=network.target dhcp-done.service +Wants=dhcp-done.service StartLimitIntervalSec=10 StartLimitBurst=3 [Service] +Environment=INTF=gbmcbr +EnvironmentFile=-/run/gbmc-br-dhcp.env Restart=on-failure RestartSec=5 -ExecCondition=/bin/bash -c "! /bin/systemctl is-active -q dhcp-done@*" -ExecStart=/usr/bin/udhcpc6 -f -q -O fqdn -O bootfile_url -O bootfile_param -i gbmcbr -s /usr/libexec/gbmc-br-dhcp.sh +ExecStartPre=/usr/bin/update-dhcp-status 'ONGOING' 'Starting dhcp process' +ExecStart=/usr/bin/udhcpc6 -f -q -O fqdn -O bootfile_url -O bootfile_param -i $INTF -s /usr/libexec/gbmc-br-dhcp.sh [Install] WantedBy=multi-user.target diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.sh b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.sh index 4360e11277..c31090b656 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.sh +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.sh @@ -42,21 +42,26 @@ if [ "$1" = bound ]; then # shellcheck disable=SC2154 echo "DHCPv6(gbmcbr): $ipv6/128" >&2 + update-dhcp-status 'ONGOING' "Received dhcp response ${ipv6}" pfx_bytes=() ip_to_bytes pfx_bytes "$ipv6" # Ensure we are a BMC and have a suffix nibble, the 0th index is reserved if (( pfx_bytes[8] != 0xfd || (pfx_bytes[9] & 0xf) == 0 )); then - echo "Invalid address" >&2 + echo "Invalid address prefix ${ipv6}" >&2 + update-dhcp-status 'ONGOING' "Invalid address prefix ${ipv6}" exit 1 fi # Ensure we don't have more than a /80 address for (( i = 10; i < 16; ++i )); do if (( pfx_bytes[i] != 0 )); then - echo "Invalid address" >&2 + echo "Invalid address ${ipv6}" >&2 + update-dhcp-status 'ONGOING' "Invalid address ${ipv6}" exit 1 fi done + update-dhcp-status 'ONGOING' "Setting hostname ${fqdn} and ip ${ipv6}" + pfx="$(ip_bytes_to_str pfx_bytes)" gbmc_br_set_ip "$pfx" || exit @@ -70,11 +75,13 @@ if [ "$1" = bound ]; then # If any of our hooks had expectations we should fail here if [ "${#GBMC_BR_DHCP_OUTSTANDING[@]}" -gt 0 ]; then echo "Not done with DHCP process: ${!GBMC_BR_DHCP_OUTSTANDING[*]}" >&2 + update-dhcp-status 'ONGOING' "Outstanding DHCP hooks ${!GBMC_BR_DHCP_OUTSTANDING[*]}" exit 1 fi # Ensure that the installer knows we have completed processing DHCP by # running a service that reports completion - echo 'Start DHCP Done' >&2 - systemctl start dhcp-done@DONE --no-block + echo 'Signaling dhcp done' >&2 + update-dhcp-status 'DONE' "Netboot finished" + fi diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ensure-ra.service b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ensure-ra.service deleted file mode 100644 index 7f97cea48d..0000000000 --- a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ensure-ra.service +++ /dev/null @@ -1,5 +0,0 @@ -[Service] -ExecStart=/usr/libexec/gbmc-br-ensure-ra.sh - -[Install] -WantedBy=multi-user.target diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-gw-src.sh b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-gw-src.sh index 3c57b66af3..5865946e04 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-gw-src.sh +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-gw-src.sh @@ -17,9 +17,10 @@ # shellcheck source=meta-google/recipes-google/networking/network-sh/lib.sh source /usr/share/network/lib.sh || exit +# shellcheck source=meta-google/recipes-google/networking/gbmc-net-common/gbmc-net-lib.sh +source /usr/share/gbmc-net-lib.sh || exit -gbmc_br_gw_src_ip_stateful= -gbmc_br_gw_src_ip_stateless= +declare -A gbmc_br_gw_src_ips=() declare -A gbmc_br_gw_src_routes=() gbmc_br_gw_defgw= @@ -32,6 +33,11 @@ gbmc_br_set_router() { break fi done + # Make becoming a router sticky, if we ever have a default route we are + # always treated as a router. Otherwise, we end up reloading unnecessarily + # a number of times. The reload causes the network configuration to be + # reappplied with packet drops for a short amount of time. + [[ -z $defgw ]] && return [[ $defgw == "$gbmc_br_gw_defgw" ]] && return gbmc_br_gw_defgw="$defgw" @@ -40,27 +46,44 @@ gbmc_br_set_router() { local file for file in "${files[@]}"; do mkdir -p "$(dirname "$file")" - printf '[IPv6PrefixDelegation]\nRouterLifetimeSec=30\n' >"$file" + printf '[IPv6SendRA]\nRouterLifetimeSec=120\n' >"$file" done else rm -f "${files[@]}" fi - if [[ $(systemctl is-active systemd-networkd) != inactive ]]; then - networkctl reload && networkctl reconfigure gbmcbr - fi + # shellcheck disable=SC2119 + gbmc_net_networkd_reload } gbmc_br_gw_src_update() { - local gbmc_br_gw_src_ip="${gbmc_br_gw_src_ip_stateful:-$gbmc_br_gw_src_ip_stateless}" - [[ -n $gbmc_br_gw_src_ip ]] || return + # Pick the shortest address, we always want to use the most root level + # The order of preference looks roughly like + # 1. Root /64 address (2620:15c:2c3:aaae::/64) + # This is generally used by the OOB RJ45 port and is our primary preference + # 2. BMC subordonate root (2620:15c:2c3:aaae:fd01::/80) + # From the NIC over NCSI with the /64 shared with the CN + # 3. BMC stateless (2620:15c:2c3:aaae:fd00:3c8d:20dc:263e/80) + # From the NIC, but derived from the MAC and typically never used + # + local new_src= + local new_len=16 + local ip + for ip in "${!gbmc_br_gw_src_ips[@]}"; do + local ip_len="${gbmc_br_gw_src_ips["$ip"]}" + if (( ip_len < new_len )); then + new_src="$ip" + new_len="$ip_len" + fi + done + (( new_len >= 16 )) && return local route for route in "${!gbmc_br_gw_src_routes[@]}"; do - [[ $route != *" src $gbmc_br_gw_src_ip "* ]] || continue - echo "gBMC Bridge Updating GW source [$gbmc_br_gw_src_ip]: $route" >&2 + [[ $route != *" src $new_src "* ]] || continue + echo "gBMC Bridge Updating GW source [$new_src]: $route" >&2 # shellcheck disable=SC2086 - ip route change $route src "$gbmc_br_gw_src_ip" && \ + ip route change $route src "$new_src" && \ unset 'gbmc_br_gw_src_routes[$route]' done } @@ -83,8 +106,8 @@ gbmc_br_gw_src_hook() { gbmc_br_gw_src_update gbmc_br_set_router fi - # Match only global IP addresses on the bridge that match the BMC stateless - # prefix (<mpfx>:fd00:). So 2002:af4:3480:2248:fd00:6345:3069:9186 would be + # Match only global IP addresses on the bridge that are non-ULA addresses. + # So 2002:af4:3480:2248:fd00:6345:3069:9186 would be # matched as the preferred source IP for outoging traffic. elif [[ $change == addr && $intf == gbmcbr && $scope == global ]] && [[ $fam == inet6 && $flags != *tentative* ]]; then @@ -93,22 +116,23 @@ gbmc_br_gw_src_hook() { echo "gBMC Bridge Ensure RA Invalid IP: $ip" >&2 return 1 fi - # Ignore ULAs and non-gBMC addresses - if (( (ip_bytes[0] & 0xfe) == 0xfc || ip_bytes[8] != 0xfd )); then + # Ignore ULAs + if (( (ip_bytes[0] & 0xfe) == 0xfc )); then return 0 fi - if (( (ip_bytes[9] & 0xf) != 0 )); then - local -n gbmc_br_gw_src_ip=gbmc_br_gw_src_ip_stateful - else - local -n gbmc_br_gw_src_ip=gbmc_br_gw_src_ip_stateless - fi - if [[ $action == add && $ip != "$gbmc_br_gw_src_ip" ]]; then - gbmc_br_gw_src_ip="$ip" - gbmc_br_gw_src_update - fi - if [[ $action == del && $ip == "$gbmc_br_gw_src_ip" ]]; then - gbmc_br_gw_src_ip= + if [[ $action == add ]]; then + local i=0 + local non_zero=0 + for (( i=0; i<16; ++i )); do + if (( ip_bytes[i] != 0 )); then + non_zero="$i" + fi + done + gbmc_br_gw_src_ips["$ip"]="$non_zero" + elif [[ $action == del ]]; then + unset 'gbmc_br_gw_src_ips[$ip]' fi + gbmc_br_gw_src_update fi } diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-hostname.service b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-hostname.service new file mode 100644 index 0000000000..9841419454 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-hostname.service @@ -0,0 +1,8 @@ +[Unit] +Before=systemd-networkd.service + +[Service] +ExecStart=/usr/libexec/gbmc-br-hostname.sh + +[Install] +WantedBy=multi-user.target diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-hostname.sh b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-hostname.sh new file mode 100755 index 0000000000..d680e148f4 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-hostname.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# shellcheck source=meta-google/recipes-google/networking/gbmc-net-common/gbmc-net-lib.sh +source /usr/share/gbmc-net-lib.sh || exit + +oldname= +while read -r _; do + # Don't bother parsing the output, just read the final hostname + name="$(</etc/hostname)" || continue + [[ "$oldname" == "$name" ]] && continue + oldname="$name" + echo "Updating BMC RA Hostname $name" >&2 + + contents='[IPv6SendRA]'$'\n'"Domains=$name" + for netfile in /run/systemd/network/{00,}-bmc-gbmcbr.network.d/60-domains.conf; do + mkdir -p "$(dirname "$netfile")" + printf '%s' "$contents" >"$netfile" + done + + # shellcheck disable=SC2119 + gbmc_net_networkd_reload +done < <(dbus-monitor --system "type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged',arg0='org.freedesktop.hostname1'") diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-lib.sh b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-lib.sh index 1b31ef9f6f..912a3c119d 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-lib.sh +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-lib.sh @@ -15,9 +15,10 @@ [ -n "${gbmc_br_lib_init-}" ] && return -# SC can't find this path during repotest -# shellcheck disable=SC1091 +# shellcheck source=meta-google/recipes-google/networking/network-sh/lib.sh source /usr/share/network/lib.sh || exit +# shellcheck source=meta-google/recipes-google/networking/gbmc-net-common/gbmc-net-lib.sh +source /usr/share/gbmc-net-lib.sh || exit # A list of functions which get executed for each configured IP. # These are configured by the files included below. @@ -49,16 +50,10 @@ gbmc_br_run_hooks() { done } -gbmc_br_reload() { - if [ "$(systemctl is-active systemd-networkd)" != 'inactive' ]; then - networkctl reload && networkctl reconfigure gbmcbr - fi -} - gbmc_br_no_ip() { echo "Runtime removing gbmcbr IP" >&2 rm -f /run/systemd/network/{00,}-bmc-gbmcbr.network.d/50-public.conf - gbmc_br_reload + gbmc_net_networkd_reload gbmcbr } gbmc_br_reload_ip() { @@ -91,11 +86,11 @@ gbmc_br_reload_ip() { Address=$pfx/128 [IPv6Prefix] Prefix=$stateless_pfx/80 -PreferredLifetimeSec=60 -ValidLifetimeSec=60 +PreferredLifetimeSec=120 +ValidLifetimeSec=120 [IPv6RoutePrefix] Route=$pfx/80 -LifetimeSec=60 +LifetimeSec=120 [Route] Destination=$stateless_pfx/76 Type=unreachable @@ -109,7 +104,7 @@ EOF printf '%s' "$contents" >"$file" done - gbmc_br_reload + gbmc_net_networkd_reload gbmcbr } gbmc_br_set_ip() { diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-nft.sh b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-nft.sh index 7aa2158989..79ea76f974 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-nft.sh +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-nft.sh @@ -57,8 +57,11 @@ gbmc_br_nft_hook() { if (( ip_bytes[8] != 0xfd )); then return 0 fi + + (( ip_bytes[9] &= 0xf0 )) + local i - for (( i=9; i<16; i++ )); do + for (( i=10; i<16; i++ )); do ip_bytes["$i"]=0 done pfx="$(ip_bytes_to_str ip_bytes)/76" diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ra.service b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ra.service new file mode 100644 index 0000000000..08fd15fa4f --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ra.service @@ -0,0 +1,13 @@ +[Unit] +Description=gBMC Bridge RA Discovery +After=network.target +StartLimitIntervalSec=10 +StartLimitBurst=3 + +[Service] +Restart=always +RestartSec=5 +ExecStart=/usr/libexec/gbmc-br-ra.sh + +[Install] +WantedBy=multi-user.target diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ra.sh.in b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ra.sh.in new file mode 100755 index 0000000000..66d7a7d2da --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ra.sh.in @@ -0,0 +1,42 @@ +#!/bin/bash +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# shellcheck source=meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-lib.sh +source /usr/share/gbmc-br-lib.sh || exit + +update_rtr() { + true +} + +update_fqdn() { + (( IP_OFFSET == 0 )) && return + default_update_fqdn "$@" +} + +update_pfx() { + local pfx="$1" + (( IP_OFFSET == 0 )) && return + gbmc_br_set_ip "$pfx" || true + echo "IP $pfx set on $RA_IF" >&2 +} + +RA_IF=gbmcbr +IP_OFFSET=@IP_OFFSET@ +# Use the lowest priority, except for kernel RA discovered routes. +# We want closer NICs to provide a default route if existing. +ROUTE_METRIC=1000 + +# shellcheck source=meta-google/recipes-google/networking/gbmc-net-common/gbmc-ra.sh +source /usr/share/gbmc-ra.sh || exit diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ula.sh b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ula.sh index 42bb566c8a..b79e25fe4a 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ula.sh +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ula.sh @@ -18,53 +18,81 @@ # shellcheck source=meta-google/recipes-google/networking/network-sh/lib.sh source /usr/share/network/lib.sh || exit -gbmc_br_ula_init= -gbmc_br_ula_mac= +declare -A gbmc_br_ulas=() -gbmc_br_ula_update() { - [[ -n $gbmc_br_ula_init ]] || return +# BITs set for address suffixes +GBMC_BR_ULA_SFX_HAS_LL=1 +GBMC_BR_ULA_SFX_HAS_ULA=2 - echo "gBMC Bridge ULA MAC: ${gbmc_br_ula_mac:-(deleted)}" >&2 - - local addr= - contents='[Network]'$'\n' - if [[ -n $gbmc_br_ula_mac ]]; then - local sfx - if sfx="$(mac_to_eui64 "$gbmc_br_ula_mac")" && - addr="$(ip_pfx_concat "fdb5:0481:10ce::/64" "$sfx")"; then - contents+="Address=$addr"$'\n' +gbmc_br_ula_cleanup() { + local addr + for addr in "${!gbmc_br_ulas[@]}"; do + local val="${gbmc_br_ulas["$addr"]}" + if (( val & GBMC_BR_ULA_SFX_HAS_LL == 0 )); then + echo "Removing Stale ULA: $addr" >&2 + ip addr del "$addr"/64 dev gbmcbr || true fi - fi - - local netfile - for netfile in /run/systemd/network/{00,}-bmc-gbmcbr.network.d/60-ula.conf; do - mkdir -p "$(dirname "$netfile")" - printf '%s' "$contents" >"$netfile" done +} - # Ensure that systemd-networkd performs a reconfiguration as it doesn't - # currently check the mtime of drop-in files. - touch -c /lib/systemd/network/*-bmc-gbmcbr.network +gbmc_br_ula_is_ll() { + # shellcheck disable=SC2178 + local -n bytes="$1" + (( bytes[0] == 0xfe && bytes[1] == 0x80 && bytes[2] == 0x00 && + bytes[3] == 0x00 && bytes[4] == 0x00 && bytes[5] == 0x00 && + bytes[6] == 0x00 && bytes[7] == 0x00 )) +} - if [[ $(systemctl is-active systemd-networkd) != inactive ]]; then - networkctl reload - networkctl reconfigure gbmcbr - fi +gbmc_br_ula_is_ula() { + # shellcheck disable=SC2178 + local -n bytes="$1" + (( bytes[0] == 0xfd && bytes[1] == 0xb5 && bytes[2] == 0x04 && + bytes[3] == 0x81 && bytes[4] == 0x10 && bytes[5] == 0xce && + bytes[6] == 0x00 && bytes[7] == 0x00 )) } gbmc_br_ula_hook() { # shellcheck disable=SC2154 if [[ $change == init ]]; then - gbmc_br_ula_init=1 - gbmc_br_ula_update - elif [[ $change == link && $intf == gbmcbr ]]; then - if [[ $action == add && $mac != "$gbmc_br_ula_mac" ]]; then - gbmc_br_ula_mac="$mac" - gbmc_br_ula_update + gbmc_br_ula_cleanup + elif [[ $change == addr && $intf == gbmcbr && $fam == inet6 ]]; then + local pfx_bytes=() + ip_to_bytes pfx_bytes "$ip" || return + local val=0 + if gbmc_br_ula_is_ll pfx_bytes; then + val="$GBMC_BR_ULA_SFX_HAS_LL" + elif gbmc_br_ula_is_ula pfx_bytes; then + val="$GBMC_BR_ULA_SFX_HAS_ULA" + else + return 0 + fi + # Force all addresses into what they would be as a ULA so that we can + # store bits about the assigned addresses on the interface + pfx_bytes[0]=0xfd + pfx_bytes[1]=0xb5 + pfx_bytes[2]=0x04 + pfx_bytes[3]=0x81 + pfx_bytes[4]=0x10 + pfx_bytes[5]=0xce + addr="$(ip_bytes_to_str pfx_bytes)" + local old=${gbmc_br_ulas["$addr"]-0} + if [[ $action == add ]]; then + val=$((old | val)) + elif [[ $action == del ]]; then + val=$((old & ~val)) fi - if [[ $action == del && $mac == "$gbmc_br_ula_mac" ]]; then - gbmc_br_ula_mac= - gbmc_br_ula_update + gbmc_br_ulas["$addr"]=$val + if (( val == GBMC_BR_ULA_SFX_HAS_LL )); then + # We have a link local address but no ULA, so we need to add the ULA + echo "Adding ULA: $addr" >&2 + ip addr replace "$addr"/64 dev gbmcbr + elif (( val == GBMC_BR_ULA_SFX_HAS_ULA )); then + # We have a ULA without a link local, so we should not longer have this ULA + echo "Removing ULA: $addr" >&2 + ip addr del "$addr"/64 dev gbmcbr || true + elif (( val == 0 )); then + # Cleanup the map if we no longer have any addresses for the suffix + unset 'gbmc_br_ulas[$addr]' fi fi } diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-start-dhcp.sh b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-start-dhcp.sh index c6fddbb9cf..b968573daf 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-start-dhcp.sh +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-start-dhcp.sh @@ -15,10 +15,6 @@ systemctl stop gbmc-br-dhcp -# in some cases dhcp-done might be run already, in this case we want -# a powercycle for a clean install -systemctl is-active -q dhcp-done@* && exit 1 - # stop dhcp term service to prevent race condition systemctl is-active --quiet gbmc-br-dhcp-term && systemctl stop gbmc-br-dhcp-term diff --git a/meta-google/recipes-google/networking/gbmc-net-common.bb b/meta-google/recipes-google/networking/gbmc-net-common.bb new file mode 100644 index 0000000000..1a3ca7722c --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-net-common.bb @@ -0,0 +1,27 @@ +SUMMARY = "gBMC common networking components" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +SRC_URI += " \ + file://gbmc-net-lib.sh \ + file://gbmc-ra.sh \ + " +S = "${WORKDIR}" + +FILES:${PN} += " \ + ${datadir}/ \ + " + +RDEPENDS:${PN}:append = " \ + bash \ + network-sh \ + ndisc6-rdisc6 \ + " + +do_install() { + install -d -m0755 ${D}${datadir} + install -m0644 ${S}/gbmc-net-lib.sh ${D}${datadir}/ + install -m0644 ${S}/gbmc-ra.sh ${D}${datadir}/ +} + diff --git a/meta-google/recipes-google/networking/gbmc-net-common/gbmc-net-lib.sh b/meta-google/recipes-google/networking/gbmc-net-common/gbmc-net-lib.sh new file mode 100644 index 0000000000..6e4ba365e0 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-net-common/gbmc-net-lib.sh @@ -0,0 +1,31 @@ +#!/bin/bash +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +[ -n "${gbmc_net_lib_init-}" ] && return + +gbmc_net_networkd_reload() { + if [ "$(systemctl is-active systemd-networkd)" != 'inactive' ]; then + echo "Reloading networkd + reconfiguring ($*) from $(caller 0)" >&2 + networkctl reload || return + local st=0 + local intf + for intf in "$@"; do + networkctl reconfigure "$intf" || st=$? + done + return $st + fi +} + +gbmc_net_lib_init=1 diff --git a/meta-google/recipes-google/networking/gbmc-net-common/gbmc-ra.sh b/meta-google/recipes-google/networking/gbmc-net-common/gbmc-ra.sh new file mode 100644 index 0000000000..280083a8c9 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-net-common/gbmc-ra.sh @@ -0,0 +1,188 @@ +#!/bin/bash +# Copyright 2021 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# shellcheck source=meta-google/recipes-google/networking/network-sh/lib.sh +source /usr/share/network/lib.sh || exit +# shellcheck source=meta-google/recipes-google/networking/gbmc-net-common/gbmc-net-lib.sh +source /usr/share/gbmc-net-lib.sh || exit + +: "${RA_IF:?No RA interface set}" +: "${IP_OFFSET=?1}" +: "${ROUTE_METRIC:?No Metric set}" + +# We would prefer empty string but it's easier for associative array handling +# to use invalid +old_rtr=invalid +old_mac=invalid +old_pfx=invalid +old_fqdn=invalid + +default_update_rtr() { + local rtr="$1" + local mac="$2" + + if ip addr show | grep -q "^[ ]*inet6 $rtr/"; then + echo "Router is ourself, ignoring" >&2 + return 0 + fi + + # In case we don't have a base network file, make one + # this is intentionally 00- as it will not preceed /etc/systemd/network/00-* + # or /lib/systemd/network/-* files. + local file=/run/systemd/network/00-bmc-$RA_IF.network + printf '[Match]\nName=%s\n[Network]\nDHCP=false\nIPv6AcceptRA=false\nLinkLocalAddressing=yes' \ + "$RA_IF" >"$file" + + # Override any existing gateway information within files + # Make sure we cover `00-*` and `-*` files + for file in /run/systemd/network/{00,}-bmc-$RA_IF.network; do + mkdir -p "$file.d" + printf '[Route]\nGateway=%s\nGatewayOnLink=true\nMetric=%d\n[Neighbor]\nMACAddress=%s\nAddress=%s' \ + "$rtr" "$ROUTE_METRIC" "$mac" "$rtr" >"$file.d"/10-gateway.conf + done + + # Don't force networkd to reload as this can break phosphor-networkd + # Fall back to reload only if ip link commands fail + (ip -6 route replace default via "$rtr" onlink dev "$RA_IF" metric "$ROUTE_METRIC" && \ + ip -6 neigh replace "$rtr" dev "$RA_IF" lladdr "$mac") || \ + gbmc_net_networkd_reload "$RA_IF" || true + + echo "Set router $rtr on $RA_IF" >&2 +} + +default_update_fqdn() { + local fqdn="$1" + [ -z "$fqdn" ] && return + hostnamectl set-hostname "$fqdn" || true + echo "Set hostname $fqdn on $RA_IF" >&2 +} + +retries=1 +min_w=10 +declare -A rtrs +rtrs=() +while true; do + # shellcheck disable=SC2206 + data=(${rtrs["${old_rtr}"]-}) + curr_dl="${data[1]-$(( min_w + SECONDS ))}" + args=(-m "$RA_IF" -w $(( (curr_dl - SECONDS) * 1000 ))) + if (( retries > 0 )); then + args+=(-r "$retries") + else + args+=(-d) + fi + while read -r line; do + # `script` terminates all lines with a CRLF, remove it + line="${line:0:-1}" + # shellcheck disable=SC2026 + if [ -z "$line" ]; then + lifetime=-1 + mac= + hextet= + pfx= + host= + domain= + elif [[ "$line" =~ ^Router' 'lifetime' '*:' '*([0-9]*) ]]; then + lifetime="${BASH_REMATCH[1]}" + elif [[ "$line" =~ ^Source' 'link-layer' 'address' '*:' '*([a-fA-F0-9:]*)$ ]]; then + mac="${BASH_REMATCH[1]}" + elif [[ "$line" =~ ^Prefix' '*:' '*(.*)/([0-9]+)$ ]]; then + t_pfx="${BASH_REMATCH[1]}" + t_pfx_len="${BASH_REMATCH[2]}" + ip_to_bytes t_pfx_b "$t_pfx" || continue + (( (t_pfx_len == 76 || t_pfx_len == 80) && (t_pfx_b[8] & 0xfd) == 0xfd )) || continue + (( t_pfx_b[9] &= 0xf0 )) + (( t_pfx_b[9] |= IP_OFFSET )) + hextet="fd$(printf '%02x' "${t_pfx_b[9]}")" + pfx="$(ip_bytes_to_str t_pfx_b)" + elif [[ "$line" =~ ^'DNS search list'' '*:' '*([^.]+)(.*[.]google[.]com)' '*$ ]]; then + # Ideally, we use PCRE and with lookahead and can do this in a single regex + # ^([a-zA-Z0-9-]+(?=-n[a-fA-F0-9]{1,4})|[a-zA-Z0-9-]+(?!-n[a-fA-F0-9]{1,4}))[^.]*[.]((?:[a-zA-Z0-9]*[.])*google[.]com)$ + # Instead we do multiple steps to extract the needed info + host="${BASH_REMATCH[1]}" + domain="${BASH_REMATCH[2]#.}" + if [[ "$host" =~ (-n[a-fA-F0-9]{1,4})$ ]]; then + host="${host%"${BASH_REMATCH[1]}"}" + fi + elif [[ "$line" =~ ^from' '(.*)$ ]]; then + rtr="${BASH_REMATCH[1]}" + # Only valid default routers can be considered, 0 lifetime implies + # a non-default router + (( lifetime > 0 )) || continue + + dl=$((lifetime + SECONDS)) + fqdn= + if [[ -n $host && -n $hextet && -n $domain ]]; then + fqdn="$host-n$hextet.$domain" + fi + rtrs["$rtr"]="$mac $dl $pfx $fqdn" + # We have some notoriously noisy lab environments with many routers being broadcast + # We always prefer "fe80::1" in prod and labs for routing, so prefer that gateway. + # We also want to take the first router we find to speed up acquisition on boot. + if [[ "$rtr" = "fe80::1" || "$old_rtr" = "invalid" ]]; then + if [[ "$rtr" != "$old_rtr" && "$mac" != "$old_mac" ]]; then + echo "Got defgw $rtr at $mac on $RA_IF" >&2 + update_rtr "$rtr" "$mac" || true + retries=-1 + old_mac="$mac" + old_rtr="$rtr" + fi + fi + # Only update router properties if we use this router + [[ "$rtr" == "$old_rtr" ]] || continue + if [[ $pfx != "$old_pfx" ]]; then + echo "Got PFX $pfx from $rtr on $RA_IF" >&2 + old_pfx="$pfx" + update_pfx "$pfx" || true + fi + if [[ $fqdn != "$old_fqdn" ]]; then + echo "Got FQDN $fqdn from $rtr on $RA_IF" >&2 + old_fqdn="$fqdn" + update_fqdn "$fqdn" || true + fi + fi + done < <(exec script -q -c "rdisc6 ${args[*]}" /dev/null 2>/dev/null) + # Purge any expired routers + for rtr in "${!rtrs[@]}"; do + # shellcheck disable=SC2206 + data=(${rtrs["$rtr"]}) + dl=${data[1]} + if (( dl <= SECONDS )); then + unset "rtrs[$rtr]" + fi + done + # Consider changing the gateway if the old one doesn't send RAs for the entire period + # This ensures we don't flip flop between multiple defaults if they exist. + if [[ "$old_rtr" != "invalid" && -z "${rtrs["$old_rtr"]-}" ]]; then + echo "Old router $old_rtr disappeared" >&2 + old_rtr=invalid + for rtr in "${!rtrs[@]}"; do + # shellcheck disable=SC2206 + data=(${rtrs["$rtr"]}) + mac=${data[0]} + dl=${data[1]} + pfx=${data[2]} + fqdn=${data[3]} + update_rtr "$rtr" "$mac" || true + update_pfx "$pfx" || true + update_fqdn "$fqdn" || true + break + done + fi + + # If rdisc6 exits early we still want to wait for the deadline before retrying + (( timeout = curr_dl - SECONDS )) + sleep $(( timeout < 0 ? 0 : timeout )) +done diff --git a/meta-google/recipes-google/networking/gbmc-nic-config.bb b/meta-google/recipes-google/networking/gbmc-nic-config.bb new file mode 100644 index 0000000000..e804e2628d --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config.bb @@ -0,0 +1,79 @@ +SUMMARY = "Configured gBMC non-NCSI interface" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +GBMC_EXT_NICS ?= "" +GBMC_DHCP_RELAY ??= "${@'' if int(d.getVar('FLASH_SIZE')) < 65536 else '1'}" + +inherit systemd + +SRC_URI += " \ + file://50-gbmc-nic.rules \ + file://50-gbmc-nic.rules.in \ + file://-bmc-nic.network.in \ + file://gbmc-nic-neigh.sh.in \ + file://gbmc-nic-ra.sh \ + file://gbmc-nic-ra@.service \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcbrnicdhcp.netdev'} \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcbrnicdhcp.network'} \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcnicdhcp.netdev'} \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://-bmc-gbmcnicdhcp.network'} \ + ${@'' if d.getVar('GBMC_DHCP_RELAY') != '1' else 'file://gbmc-nic-dhcrelay.service.in'} \ + " +S = "${WORKDIR}" + +FILES:${PN} += " \ + ${systemd_unitdir}/network \ + ${sysconfdir}/nftables \ + ${systemd_system_unitdir} \ + ${datadir}/gbmc-ip-monitor \ + " + +RDEPENDS:${PN}:append = " \ + bash \ + gbmc-ip-monitor \ + gbmc-net-common \ + nftables-systemd \ + " + +do_install() { + netdir=${D}${systemd_unitdir}/network + install -d -m0755 $netdir + nftdir=${D}${sysconfdir}/nftables + install -d -m0755 $nftdir + unitdir=${D}${systemd_system_unitdir} + install -d -m0755 $unitdir + wantdir=$unitdir/multi-user.target.wants + install -d -m0755 $wantdir + + install -d -m0755 ${D}${libexecdir} + install -m0755 ${WORKDIR}/gbmc-nic-ra.sh ${D}${libexecdir}/ + install -m0644 ${WORKDIR}/gbmc-nic-ra@.service $unitdir/ + + mondir=${D}${datadir}/gbmc-ip-monitor + install -d -m0755 $mondir + sed 's,@IFS@,${GBMC_EXT_NICS},g' <${WORKDIR}/gbmc-nic-neigh.sh.in \ + >$mondir/gbmc-nic-neigh.sh + + uppers= + for intf in ${GBMC_EXT_NICS}; do + sed "s,@IF@,$intf,g" <${WORKDIR}/50-gbmc-nic.rules.in >$nftdir/50-gbmc-$intf.rules + sed "s,@IF@,$intf,g" <${WORKDIR}/-bmc-nic.network.in >$netdir/-bmc-$intf.network + uppers="$uppers -u ff02::1:2%%$intf" + ln -sv ../gbmc-nic-ra@.service $wantdir/gbmc-nic-ra@$intf.service + done + + if [ "${GBMC_DHCP_RELAY}" = 1 ]; then + install -m0644 ${WORKDIR}/-bmc-gbmcbrnicdhcp.network $netdir/ + install -m0644 ${WORKDIR}/-bmc-gbmcbrnicdhcp.netdev $netdir/ + install -m0644 ${WORKDIR}/-bmc-gbmcnicdhcp.network $netdir/ + install -m0644 ${WORKDIR}/-bmc-gbmcnicdhcp.netdev $netdir/ + install -m0644 ${WORKDIR}/50-gbmc-nic.rules $nftdir/ + + sed "s,@UPPERS@,$uppers,g" <${WORKDIR}/gbmc-nic-dhcrelay.service.in \ + >$unitdir/gbmc-nic-dhcrelay.service + ln -sv ../gbmc-nic-dhcrelay.service $wantdir/ + fi +} + diff --git a/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcbrnicdhcp.netdev b/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcbrnicdhcp.netdev new file mode 100644 index 0000000000..1d9ca4a734 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcbrnicdhcp.netdev @@ -0,0 +1,5 @@ +[NetDev] +Name=gbmcbrnicdhcp +Kind=veth +[Peer] +Name=gbmcnicdhcp diff --git a/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcbrnicdhcp.network b/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcbrnicdhcp.network new file mode 100644 index 0000000000..73212db0c3 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcbrnicdhcp.network @@ -0,0 +1,4 @@ +[Match] +Name=gbmcbrnicdhcp +[Network] +Bridge=gbmcbr diff --git a/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcnicdhcp.netdev b/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcnicdhcp.netdev new file mode 100644 index 0000000000..24a78fbfa4 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcnicdhcp.netdev @@ -0,0 +1,5 @@ +[NetDev] +Name=gbmcnicdhcp +Kind=veth +[Peer] +Name=gbmcbrnicdhcp diff --git a/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcnicdhcp.network b/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcnicdhcp.network new file mode 100644 index 0000000000..1eae55a662 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-gbmcnicdhcp.network @@ -0,0 +1,9 @@ +[Match] +Name=gbmcnicdhcp +[Network] +DHCP=false +IPv6AcceptRA=false +LLMNR=false +MulticastDNS=false +LinkLocalAddressing=ipv6 +Address=fdb5:0481:10ce::3/64 diff --git a/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-nic.network.in b/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-nic.network.in new file mode 100644 index 0000000000..08c2eee178 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config/-bmc-nic.network.in @@ -0,0 +1,8 @@ +[Match] +Name=@IF@ +[Network] +DHCP=false +IPv6AcceptRA=false +LLMNR=false +MulticastDNS=false +LinkLocalAddressing=ipv6 diff --git a/meta-google/recipes-google/networking/gbmc-nic-config/50-gbmc-nic.rules b/meta-google/recipes-google/networking/gbmc-nic-config/50-gbmc-nic.rules new file mode 100644 index 0000000000..cbedfb9710 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config/50-gbmc-nic.rules @@ -0,0 +1,8 @@ +table inet filter { + chain nic_dhcp_input { + type filter hook input priority 0; policy drop; + iifname != gbmcnicdhcp accept + ip6 nexthdr icmpv6 accept + udp dport 547 accept + } +} diff --git a/meta-google/recipes-google/networking/gbmc-nic-config/50-gbmc-nic.rules.in b/meta-google/recipes-google/networking/gbmc-nic-config/50-gbmc-nic.rules.in new file mode 100644 index 0000000000..feba64d292 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config/50-gbmc-nic.rules.in @@ -0,0 +1,19 @@ +table inet filter { + chain @IF@_input { + type filter hook input priority 0; policy drop; + iifname != @IF@ accept + ct state established accept + udp dport 547 accept + jump gbmc_br_pub_input + } + chain gbmc_br_pub_input { + ip6 nexthdr icmpv6 accept + } + chain @IF@_forward { + type filter hook forward priority 0; policy drop; + iifname != @IF@ accept + oifname != gbmcbr drop + ip6 daddr fdb5:0481:10ce::/64 drop + ip6 saddr fdb5:0481:10ce::/64 drop + } +} diff --git a/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-dhcrelay.service.in b/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-dhcrelay.service.in new file mode 100644 index 0000000000..8571ae1e67 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-dhcrelay.service.in @@ -0,0 +1,13 @@ +[Unit] +Description=gBMC DHCP Relay Agent Daemon +After=network.target +StartLimitIntervalSec=10 +StartLimitBurst=3 + +[Service] +Restart=always +RestartSec=5 +ExecStart=/usr/sbin/dhcrelay -d --no-pid -l gbmcnicdhcp @UPPERS@ + +[Install] +WantedBy=multi-user.target diff --git a/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-neigh.sh.in b/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-neigh.sh.in new file mode 100644 index 0000000000..d7c0f023b7 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-neigh.sh.in @@ -0,0 +1,98 @@ +#!/bin/bash +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +[[ -n ${gbmc_nic_neigh_lib-} ]] && return + +# shellcheck source=meta-google/recipes-google/networking/network-sh/lib.sh +source /usr/share/network/lib.sh || exit +# shellcheck source=meta-google/recipes-google/networking/gbmc-net-common/gbmc-net-lib.sh +source /usr/share/gbmc-net-lib.sh || exit + +gbmc_nic_neigh_intfs=(@IFS@) +gbmc_nic_neigh_addr= + +gbmc_nic_neigh_set() { + local act="$1" + local ip="$2" + + echo "gBMC NIC Neigh $act $ip: ${gbmc_nic_neigh_intfs[*]}" >&2 + + local intf + local failed_intfs=() + for intf in "${gbmc_nic_neigh_intfs[@]}"; do + # In case we don't have a base network file, make one + # this is intentionally 00- as it will not preceed /etc/systemd/network/00-* + # or /lib/systemd/network/-* files. + local file=/run/systemd/network/00-bmc-$intf.network + printf '[Match]\nName=%s\n[Network]\nDHCP=false\nIPv6AcceptRA=false\nLinkLocalAddressing=yes' \ + "$intf" >"$file" + + # Override any existing gateway information within files + # Make sure we cover `00-*` and `-*` files + for file in /run/systemd/network/{00,}-bmc-"$intf".network; do + mkdir -p "$file.d" + if [[ "$act" == add ]]; then + printf '[Network]\nIPv6ProxyNDP=yes\nIPv6ProxyNDPAddress=%s\n' \ + "$ip" >"$file.d"/10-nic-neigh.conf + else + rm -f "$file.d"/10-nic-neigh.conf + fi + done + + sysctl net.ipv6.conf."$intf".proxy_ndp=1 >/dev/null && \ + ip -6 neigh "$act" proxy "$ip" dev "$intf" || \ + failed_intfs+=("$intf") + done + [[ "$act" == del ]] && return + if (( "${#failed_intfs[@]}" > 0 )); then + gbmc_net_networkd_reload "${failed_intfs[@]}" + fi +} + +gbmc_nic_neigh_hook() { + # shellcheck disable=SC2154 + if [[ $change == addr && $intf == gbmcbr && $scope == global ]] && + [[ $fam == inet6 && $flags != *tentative* ]]; then + local ip_bytes=() + if ! ip_to_bytes ip_bytes "$ip"; then + echo "gBMC Bridge Ensure RA Invalid IP: $ip" >&2 + return 1 + fi + # Ignore ULAs + if (( (ip_bytes[0] & 0xfe) == 0xfc )); then + return 0 + fi + # Addresses must be /64 to the upstack switch + for (( i = 8; i < 16; ++i )); do + if (( ip_bytes[i] != 0 )); then + return 0 + fi + done + if [[ $action == add && "$gbmc_nic_neigh_addr" != "$ip" ]]; then + if [ -n "$gbmc_nic_neigh_addr" ]; then + gbmc_nic_neigh_set del "$gbmc_nic_neigh_addr" + fi + gbmc_nic_neigh_addr="$ip" + gbmc_nic_neigh_set add "$ip" + elif [[ $action == del && "$gbmc_nic_neigh_addr" == "$ip" ]]; then + gbmc_nic_neigh_addr= + gbmc_nic_neigh_set del "$ip" + fi + fi +} + +GBMC_IP_MONITOR_HOOKS+=(gbmc_nic_neigh_hook) + +gbmc_nic_neigh_lib=1 diff --git a/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-ra.sh b/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-ra.sh new file mode 100755 index 0000000000..98239c33f6 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-ra.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +update_rtr() { + default_update_rtr "$@" +} + +update_fqdn() { + true +} + +update_pfx() { + true +} + +RA_IF=$1 +IP_OFFSET=0 +# This is guaranteed to be closer to the ToR than NCSI, for reliability +# and bandwidth we want to prefer this path. +ROUTE_METRIC=800 + +# shellcheck source=meta-google/recipes-google/networking/gbmc-net-common/gbmc-ra.sh +source /usr/share/gbmc-ra.sh || exit diff --git a/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-ra@.service b/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-ra@.service new file mode 100644 index 0000000000..54d77dfeb7 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-nic-config/gbmc-nic-ra@.service @@ -0,0 +1,13 @@ +[Unit] +Description=gBMC %i RA Discovery +After=network.target +StartLimitIntervalSec=10 +StartLimitBurst=3 + +[Service] +Restart=always +RestartSec=5 +ExecStart=/usr/libexec/gbmc-nic-ra.sh %i + +[Install] +WantedBy=multi-user.target diff --git a/meta-google/recipes-google/systemd/files/40-gbmc-sysctl.conf b/meta-google/recipes-google/systemd/files/40-gbmc-sysctl.conf index ee4b4859a7..5b3fa9e43d 100644 --- a/meta-google/recipes-google/systemd/files/40-gbmc-sysctl.conf +++ b/meta-google/recipes-google/systemd/files/40-gbmc-sysctl.conf @@ -1 +1,3 @@ kernel.oops_all_cpu_backtrace = 1 +# limit PID numbers to 32k for metrics collector +kernel.pid_max = 32768 diff --git a/meta-google/recipes-phosphor/flash/gbmc-update/40-gbmc-upgrade.sh b/meta-google/recipes-phosphor/flash/gbmc-update/40-gbmc-upgrade.sh index d671e81f16..a379effbc2 100644 --- a/meta-google/recipes-phosphor/flash/gbmc-update/40-gbmc-upgrade.sh +++ b/meta-google/recipes-phosphor/flash/gbmc-update/40-gbmc-upgrade.sh @@ -55,6 +55,7 @@ gbmc_upgrade_dl_unpack() { stime=5 while true; do local st=() + update-dhcp-status 'ONGOING' "downloading and unpacking from ${bootfile_url}, remaining time $(( timeout - SECONDS ))" curl -LSsk --max-time $((timeout - SECONDS)) "$bootfile_url" | tar "${tflags[@]}" --wildcards --warning=none -xC "$tmpdir" "${GBMC_UPGRADE_UNPACK_FILES[@]}" 2>"$tmpdir"/tarerr \ && st=("${PIPESTATUS[@]}") || st=("${PIPESTATUS[@]}") diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend index e240c916bf..094165f854 100644 --- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -17,6 +17,8 @@ OBMC_IMAGE_EXTRA_INSTALL:append:gbmc:dev = " gbmc-dev-ssh-key" OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = \ '${@"" if not d.getVar("GBMC_NCSI_IF_NAME") else " gbmc-ncsi-config"}' OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = \ + '${@"" if not d.getVar("GBMC_EXT_NICS") else " gbmc-nic-config"}' +OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = \ '${@"" if not d.getVar("GBMC_MAC_EEPROM_OF_NAME") else " gbmc-mac-config"}' OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = \ '${@"" if not d.getVar("GBMC_ETHER_MAP") else " gbmc-nic-rename"}' diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 6e25fc2e2b..6d93c2796b 100644 --- a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -62,7 +62,7 @@ do_install:append:gbmc() { # Set entity-map.json to empty json for gBMC by default. # Each system will override it if needed. - if [[ "${ENTITY_MAPPING}" != "default" ]]; then + if [ "${ENTITY_MAPPING}" != "default" ]; then echo "[]" > ${D}${datadir}/ipmi-providers/entity-map.json fi } diff --git a/meta-hpe/meta-common/recipes-hpe/vehci/host-ehci-owner-reset/host-ehci-owner-reset@.service b/meta-hpe/meta-common/recipes-hpe/vehci/host-ehci-owner-reset/host-ehci-owner-reset@.service index 2a44b9f481..411fbe9624 100644 --- a/meta-hpe/meta-common/recipes-hpe/vehci/host-ehci-owner-reset/host-ehci-owner-reset@.service +++ b/meta-hpe/meta-common/recipes-hpe/vehci/host-ehci-owner-reset/host-ehci-owner-reset@.service @@ -1,7 +1,7 @@ [Unit] Description=GXP EHCI Owner Reset Service -Wants=start-ipkvm.service -After=start-ipkvm.service +Wants=obmc-ikvm.service +After=obmc-ikvm.service StartLimitIntervalSec=0 [Service] diff --git a/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm/start-ipkvm.service b/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm.service index f477507a62..f477507a62 100644 --- a/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm/start-ipkvm.service +++ b/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm.service diff --git a/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm_git.bbappend b/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm_git.bbappend index 97d4ca39f0..bad9a92fd4 100644 --- a/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm_git.bbappend +++ b/meta-hpe/meta-common/recipes-phosphor/recipes-graphics/obmc-ikvm_git.bbappend @@ -1,13 +1,13 @@ FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" -SRC_URI += " file://start-ipkvm.service " +SRC_URI += " file://obmc-ikvm.service " SRC_URI += " file://create_usbhid.sh " FILES:${PN} += " \ - ${systemd_system_unitdir}/start-ipkvm.service \ + ${systemd_system_unitdir}/obmc-ikvm.service \ ${bindir}/create_usbhid.sh \ " do_install:append () { - install -D -m 0644 ${WORKDIR}/start-ipkvm.service ${D}${systemd_system_unitdir} + install -D -m 0644 ${WORKDIR}/obmc-ikvm.service ${D}${systemd_system_unitdir} install -D -m 0755 ${WORKDIR}/create_usbhid.sh ${D}${bindir} } diff --git a/meta-hpe/meta-dl360-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh b/meta-hpe/meta-dl360-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh index 3c1bb0fd3e..55dd0c73ca 100644 --- a/meta-hpe/meta-dl360-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh +++ b/meta-hpe/meta-dl360-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh @@ -1,4 +1,5 @@ #!/bin/sh +# shellcheck disable=SC3061 dbus-monitor --system --profile "type='method_call',path='/xyz/openbmc_project/state/host0',interface='org.freedesktop.DBus.Properties',member='Set'" | awk '/xyz.openbmc_project.State.Host/ { print "DONE" }' | while read -r; do /usr/bin/dl360Start.sh done diff --git a/meta-hpe/meta-rl300-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh b/meta-hpe/meta-rl300-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh index c38c087588..99e4706a84 100644 --- a/meta-hpe/meta-rl300-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh +++ b/meta-hpe/meta-rl300-g11/recipes-hpe/power-sequencing/files/ipmi-power-button-monitoring.sh @@ -1,4 +1,5 @@ #!/bin/sh +# shellcheck disable=SC3061 dbus-monitor --system --profile "type='method_call',path='/xyz/openbmc_project/state/host0',interface='org.freedesktop.DBus.Properties',member='Set'" | awk '/xyz.openbmc_project.State.Host/ { print "DONE" }' | while read -r ; do /usr/bin/rl300Start.sh done diff --git a/meta-ibm/conf/machine/huygens.conf b/meta-ibm/conf/machine/huygens.conf index a5f6cd0c3c..c59d29f3d9 100644 --- a/meta-ibm/conf/machine/huygens.conf +++ b/meta-ibm/conf/machine/huygens.conf @@ -1,5 +1,6 @@ MACHINEOVERRIDES =. "pstbmc:" require conf/machine/pstbmc.conf +require conf/distro/include/chrony.inc # Focus Huygens initially on a multi-BMC setup for integrating # BMC to BMC redundancy logic. Remove anything host or chassis diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 5b968c130a..a654a55b7f 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -25,6 +25,7 @@ require conf/distro/include/openpower-virtual-pnor.inc require conf/distro/include/openpower-hostfw-over-pldm.inc require conf/distro/include/ibm-mpreboot.inc require conf/distro/include/ibm-yaml.inc +require conf/distro/include/google-authenticator-libpam.inc include conf/distro/include/extra-dev-debug-tools.inc DISTRO_FEATURES += "ibm-service-account-policy" MACHINE_FEATURES += "phal tpm2" diff --git a/meta-ibm/conf/templates/default/bblayers.conf.sample b/meta-ibm/conf/templates/default/bblayers.conf.sample index 9ce105376d..bcaad7b5e2 100644 --- a/meta-ibm/conf/templates/default/bblayers.conf.sample +++ b/meta-ibm/conf/templates/default/bblayers.conf.sample @@ -11,6 +11,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-networking \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-security/meta-tpm \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ diff --git a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend index 864cf0ecc0..8383e30d89 100644 --- a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend +++ b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend @@ -25,14 +25,14 @@ do_install:append:p10bmc() { 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 + printf "\nEEPROM=/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a400.i2c/i2c-11/11-0051/eeprom" >> ${DEST}/inventory } do_install:append:witherspoon-tacoma() { DEST=${D}${inventory_envdir} printf "FRUS=BMC,ETHERNET" > ${DEST}/inventory printf "\nPATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0" >> ${DEST}/inventory - printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a600.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory + printf "\nEEPROM=/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a600.i2c/i2c-11/11-0051/eeprom" >> ${DEST}/inventory } pkg_postinst:${PN}:p10bmc() { diff --git a/meta-ibm/meta-genesis3/recipes-phosphor/leds/gen3-led-manager-config/led.yaml b/meta-ibm/meta-genesis3/recipes-phosphor/leds/gen3-led-manager-config/led.yaml index 3f54ef7667..2f607212bb 100644 --- a/meta-ibm/meta-genesis3/recipes-phosphor/leds/gen3-led-manager-config/led.yaml +++ b/meta-ibm/meta-genesis3/recipes-phosphor/leds/gen3-led-manager-config/led.yaml @@ -1,375 +1,501 @@ bmc_booted: power: Action: 'On' + Priority: 'Blink' LED_ID_DWR_FRNT_P: Action: 'Off' + Priority: 'Blink' LED_ID_DWR_BACK_P: Action: 'Off' + Priority: 'Blink' power_on: power: Action: 'On' + Priority: 'Blink' led_id_dwr: LED_ID_DWR_FRNT_P: Action: 'On' + Priority: 'Blink' LED_ID_DWR_BACK_P: Action: 'On' + Priority: 'Blink' led_pwr_dwr: LED_PWR_DWR_FRNT: Action: 'On' + Priority: 'Blink' LED_PWR_DWR_BACK: Action: 'On' + Priority: 'Blink' led_id_cpu0: LED_ID_CPU0: Action: 'On' + Priority: 'Blink' led_id_cpu1: LED_ID_CPU1: Action: 'On' + Priority: 'Blink' led_id_cpu2: LED_ID_CPU2: Action: 'On' + Priority: 'Blink' led_id_cpu3: LED_ID_CPU3: Action: 'On' + Priority: 'Blink' led_rssd01_power: rssd01_power_green: Action: 'On' + Priority: 'Blink' led_rssd02_power: rssd02_power_green: Action: 'On' + Priority: 'Blink' led_rssd03_power: rssd03_power_green: Action: 'On' + Priority: 'Blink' led_rssd04_power: rssd04_power_green: Action: 'On' + Priority: 'Blink' led_rssd05_power: rssd05_power_green: Action: 'On' + Priority: 'Blink' led_rssd06_power: rssd06_power_green: Action: 'On' + Priority: 'Blink' led_rssd07_power: rssd07_power_green: Action: 'On' + Priority: 'Blink' led_rssd08_power: rssd08_power_green: Action: 'On' + Priority: 'Blink' led_rssd09_power: rssd09_power_green: Action: 'On' + Priority: 'Blink' led_rssd10_power: rssd10_power_green: Action: 'On' + Priority: 'Blink' led_rssd11_power: rssd11_power_green: Action: 'On' + Priority: 'Blink' led_rssd12_power: rssd12_power_green: Action: 'On' + Priority: 'Blink' led_rssd13_power: rssd13_power_green: Action: 'On' + Priority: 'Blink' led_rssd14_power: rssd14_power_green: Action: 'On' + Priority: 'Blink' led_rssd15_power: rssd15_power_green: Action: 'On' + Priority: 'Blink' led_rssd16_power: rssd16_power_green: Action: 'On' + Priority: 'Blink' led_rssd17_power: rssd17_power_green: Action: 'On' + Priority: 'Blink' led_rssd18_power: rssd18_power_green: Action: 'On' + Priority: 'Blink' led_rssd19_power: rssd19_power_green: Action: 'On' + Priority: 'Blink' led_rssd20_power: rssd20_power_green: Action: 'On' + Priority: 'Blink' led_rssd21_power: rssd21_power_green: Action: 'On' + Priority: 'Blink' led_rssd22_power: rssd22_power_green: Action: 'On' + Priority: 'Blink' led_rssd23_power: rssd23_power_green: Action: 'On' + Priority: 'Blink' led_rssd24_power: rssd24_power_green: Action: 'On' + Priority: 'Blink' led_rssd25_power: rssd25_power_green: Action: 'On' + Priority: 'Blink' led_rssd26_power: rssd26_power_green: Action: 'On' + Priority: 'Blink' led_rssd27_power: rssd27_power_green: Action: 'On' + Priority: 'Blink' led_rssd28_power: rssd28_power_green: Action: 'On' + Priority: 'Blink' led_rssd29_power: rssd29_power_green: Action: 'On' + Priority: 'Blink' led_rssd30_power: rssd30_power_green: Action: 'On' + Priority: 'Blink' led_rssd31_power: rssd31_power_green: Action: 'On' + Priority: 'Blink' led_rssd32_power: rssd32_power_green : Action: 'On' + Priority: 'Blink' led_m2_ssb_ssd1_power: m2_ssb_ssd1_power_green: Action: 'On' + Priority: 'Blink' led_m2_ssb_ssd2_power: m2_ssb_ssd2_power_green: Action: 'On' + Priority: 'Blink' led_id_dimm_a0: LED_ID_DIMM_A0: Action: 'On' + Priority: 'Blink' led_id_dimm_a1: LED_ID_DIMM_A1: Action: 'On' + Priority: 'Blink' led_id_dimm_b0: LED_ID_DIMM_B0: Action: 'On' + Priority: 'Blink' led_id_dimm_b1: LED_ID_DIMM_B1: Action: 'On' + Priority: 'Blink' led_id_dimm_c0: LED_ID_DIMM_C0: Action: 'On' + Priority: 'Blink' led_id_dimm_c1: LED_ID_DIMM_C1: Action: 'On' + Priority: 'Blink' led_id_dimm_d0: LED_ID_DIMM_D0: Action: 'On' + Priority: 'Blink' led_id_dimm_d1: LED_ID_DIMM_D1: Action: 'On' + Priority: 'Blink' led_id_dimm_e0: LED_ID_DIMM_E0: Action: 'On' + Priority: 'Blink' led_id_dimm_e1: LED_ID_DIMM_E1: Action: 'On' + Priority: 'Blink' led_id_dimm_f0: LED_ID_DIMM_F0: Action: 'On' + Priority: 'Blink' led_id_dimm_f1: LED_ID_DIMM_F1: Action: 'On' + Priority: 'Blink' led_id_dimm_g0: LED_ID_DIMM_G0: Action: 'On' + Priority: 'Blink' led_id_dimm_g1: LED_ID_DIMM_G1: Action: 'On' + Priority: 'Blink' led_id_dimm_h0: LED_ID_DIMM_H0: Action: 'On' + Priority: 'Blink' led_id_dimm_h1: LED_ID_DIMM_H1: Action: 'On' + Priority: 'Blink' led_id_dimm_j0: LED_ID_DIMM_J0: Action: 'On' + Priority: 'Blink' led_id_dimm_j1: LED_ID_DIMM_J1: Action: 'On' + Priority: 'Blink' led_id_dimm_k0: LED_ID_DIMM_K0: Action: 'On' + Priority: 'Blink' led_id_dimm_k1: LED_ID_DIMM_K1: Action: 'On' + Priority: 'Blink' led_id_dimm_l0: LED_ID_DIMM_L0: Action: 'On' + Priority: 'Blink' led_id_dimm_l1: LED_ID_DIMM_L1: Action: 'On' + Priority: 'Blink' led_id_dimm_m0: LED_ID_DIMM_M0: Action: 'On' + Priority: 'Blink' led_id_dimm_m1: LED_ID_DIMM_M1: Action: 'On' + Priority: 'Blink' led_id_dimm_n0: LED_ID_DIMM_N0: Action: 'On' + Priority: 'Blink' led_id_dimm_n1: LED_ID_DIMM_N1: Action: 'On' + Priority: 'Blink' led_id_dimm_p0: LED_ID_DIMM_P0: Action: 'On' + Priority: 'Blink' led_id_dimm_p1: LED_ID_DIMM_P1: Action: 'On' + Priority: 'Blink' led_id_dimm_q0: LED_ID_DIMM_Q0: Action: 'On' + Priority: 'Blink' led_id_dimm_q1: LED_ID_DIMM_Q1: Action: 'On' + Priority: 'Blink' led_id_dimm_r0: LED_ID_DIMM_R0: Action: 'On' + Priority: 'Blink' led_id_dimm_r1: LED_ID_DIMM_R1: Action: 'On' + Priority: 'Blink' led_id_dimm_s0: LED_ID_DIMM_S0: Action: 'On' + Priority: 'Blink' led_id_dimm_s1: LED_ID_DIMM_S1: Action: 'On' + Priority: 'Blink' led_id_dimm_t0: LED_ID_DIMM_T0: Action: 'On' + Priority: 'Blink' led_id_dimm_t1: LED_ID_DIMM_T1: Action: 'On' + Priority: 'Blink' led_id_dimm_u0: LED_ID_DIMM_U0: Action: 'On' + Priority: 'Blink' led_id_dimm_u1: LED_ID_DIMM_U1: Action: 'On' + Priority: 'Blink' led_id_dimm_v0: LED_ID_DIMM_V0: Action: 'On' + Priority: 'Blink' led_id_dimm_v1: LED_ID_DIMM_V1: Action: 'On' + Priority: 'Blink' led_id_dimm_w0: LED_ID_DIMM_W0: Action: 'On' + Priority: 'Blink' led_id_dimm_w1: LED_ID_DIMM_W1: Action: 'On' + Priority: 'Blink' led_id_dimm_x0: LED_ID_DIMM_X0: Action: 'On' + Priority: 'Blink' led_id_dimm_x1: LED_ID_DIMM_X1: Action: 'On' + Priority: 'Blink' led_id_dimm_y0: LED_ID_DIMM_Y0: Action: 'On' + Priority: 'Blink' led_id_dimm_y1: LED_ID_DIMM_Y1: Action: 'On' + Priority: 'Blink' led_id_dimm_z0: LED_ID_DIMM_Z0: Action: 'On' + Priority: 'Blink' led_id_dimm_z1: LED_ID_DIMM_Z1: Action: 'On' + Priority: 'Blink' led_id_rssd01: LED_ID_RSSD01: Action: 'On' + Priority: 'Blink' led_id_rssd02: LED_ID_RSSD02: Action: 'On' + Priority: 'Blink' led_id_rssd03: LED_ID_RSSD03: Action: 'On' + Priority: 'Blink' led_id_rssd04: LED_ID_RSSD04: Action: 'On' + Priority: 'Blink' led_id_rssd05: LED_ID_RSSD05: Action: 'On' + Priority: 'Blink' led_id_rssd06: LED_ID_RSSD06: Action: 'On' + Priority: 'Blink' led_id_rssd07: LED_ID_RSSD07: Action: 'On' + Priority: 'Blink' led_id_rssd08: LED_ID_RSSD08: Action: 'On' + Priority: 'Blink' led_id_rssd09: LED_ID_RSSD09: Action: 'On' + Priority: 'Blink' led_id_rssd10: LED_ID_RSSD10: Action: 'On' + Priority: 'Blink' led_id_rssd11: LED_ID_RSSD11: Action: 'On' + Priority: 'Blink' led_id_rssd12: LED_ID_RSSD12: Action: 'On' + Priority: 'Blink' led_id_rssd13: LED_ID_RSSD13: Action: 'On' + Priority: 'Blink' led_id_rssd14: LED_ID_RSSD14: Action: 'On' + Priority: 'Blink' led_id_rssd15: LED_ID_RSSD15: Action: 'On' + Priority: 'Blink' led_id_rssd16: LED_ID_RSSD16: Action: 'On' + Priority: 'Blink' led_id_rssd17: LED_ID_RSSD17: Action: 'On' + Priority: 'Blink' led_id_rssd18: LED_ID_RSSD18: Action: 'On' + Priority: 'Blink' led_id_rssd19: LED_ID_RSSD19: Action: 'On' + Priority: 'Blink' led_id_rssd20: LED_ID_RSSD20: Action: 'On' + Priority: 'Blink' led_id_rssd21: LED_ID_RSSD21: Action: 'On' + Priority: 'Blink' led_id_rssd22: LED_ID_RSSD22: Action: 'On' + Priority: 'Blink' led_id_rssd23: LED_ID_RSSD23: Action: 'On' + Priority: 'Blink' led_id_rssd24: LED_ID_RSSD24: Action: 'On' + Priority: 'Blink' led_id_rssd25: LED_ID_RSSD25: Action: 'On' + Priority: 'Blink' led_id_rssd26: LED_ID_RSSD26: Action: 'On' + Priority: 'Blink' led_id_rssd27: LED_ID_RSSD27: Action: 'On' + Priority: 'Blink' led_id_rssd28: LED_ID_RSSD28: Action: 'On' + Priority: 'Blink' led_id_rssd29: LED_ID_RSSD29: Action: 'On' + Priority: 'Blink' led_id_rssd30: LED_ID_RSSD30: Action: 'On' + Priority: 'Blink' led_id_rssd31: LED_ID_RSSD31: Action: 'On' + Priority: 'Blink' led_id_rssd32: LED_ID_RSSD32: Action: 'On' + Priority: 'Blink' diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml b/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml index 3b7d40456e..e644804755 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml +++ b/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml @@ -3,31 +3,38 @@ BmcBooted: Action: 'Blink' DutyOn: 50 Period: 0 + Priority: 'Blink' PowerOn: power: Action: 'On' DutyOn: 50 Period: 0 + Priority: 'Blink' EnclosureFault: identify: Action: 'On' DutyOn: 50 Period: 0 + Priority: 'Blink' EnclosureIdentify: identify: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' LampTest: heartbeat: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' identify: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' power: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/occ-hwmon@50.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/occ-hwmon@50.conf index d8faf2f15e..d8faf2f15e 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/occ-hwmon@50.conf +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/occ-hwmon@50.conf diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/rtc@68.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@40/rtc@68.conf index 8b6053e337..8b6053e337 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/rtc@68.conf +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@40/rtc@68.conf diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@c0/tmp423@4c.conf index 3166f32f1e..3166f32f1e 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@c0/tmp423@4c.conf diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 573c0b8694..561da5140d 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,11 +1,11 @@ FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" NAMES = " \ - bus@1e78a000/i2c-bus@40/rtc@68 \ - bus@1e78a000/i2c-bus@c0/tmp423@4c \ - bus@1e78a000/i2c-bus@100/occ-hwmon@50 \ + bus@1e78a000/i2c@40/rtc@68 \ + bus@1e78a000/i2c@c0/tmp423@4c \ + bus@1e78a000/i2c@100/occ-hwmon@50 \ " -ITEMSFMT = "ahb/apb/{0}.conf" +ITEMSFMT = "ahb/apb@1e780000/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config/led.yaml b/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config/led.yaml index b2e96c2504..4442cd5070 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config/led.yaml +++ b/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config/led.yaml @@ -24,6 +24,7 @@ enclosure_identify: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' # The Op Panel on the Romulus system holds a multicolor LED. # Both the 'fault' and 'identify' gpios are wired to the same LED. @@ -37,6 +38,7 @@ lamp_test: Priority: 'Blink' identify: Action: 'On' + Priority: 'Blink' # All kinds of faults using the same action as enclosure_fault Fan0Fault: diff --git a/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml b/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml index 02bb3d8bbc..156d1e5d79 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml +++ b/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml @@ -1,5 +1,5 @@ # TODO: Add i2c devices like -# /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052: /system/chassis/motherboard +# /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0052: /system/chassis/motherboard /sys/devices/platform/gpio-fsi/fsi0/slave@00:00/raw: /system/chassis/motherboard/cpu0 /sys/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/raw: /system/chassis/motherboard/cpu1 diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/w83773g@4c.conf index 86a802698a..86a802698a 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf +++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/w83773g@4c.conf diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf index 374115ca57..374115ca57 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 703cac279b..67e0350578 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -3,10 +3,10 @@ FILESEXTRAPATHS:prepend:romulus := "${THISDIR}/${PN}:" EXTRA_OEMESON:append:romulus = " -Dnegative-errno-on-fail=true" CHIPS = " \ - bus@1e78a000/i2c-bus@440/w83773g@4c \ + bus@1e78a000/i2c@440/w83773g@4c \ pwm-tacho-controller@1e786000 \ " -ITEMSFMT = "ahb/apb/{0}.conf" +ITEMSFMT = "ahb/apb@1e780000/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" diff --git a/meta-ibm/meta-sbp1/recipes-phosphor/leds/sbp1-led-manager-config/led.yaml b/meta-ibm/meta-sbp1/recipes-phosphor/leds/sbp1-led-manager-config/led.yaml index 0171fa88af..42a9cabdae 100644 --- a/meta-ibm/meta-sbp1/recipes-phosphor/leds/sbp1-led-manager-config/led.yaml +++ b/meta-ibm/meta-sbp1/recipes-phosphor/leds/sbp1-led-manager-config/led.yaml @@ -1,493 +1,656 @@ bmc_booted: LED_BMC_READY: Action: 'On' + Priority: 'Blink' LED_ID_DWR_FRNT_P: Action: 'Off' + Priority: 'Blink' LED_ID_DWR_BACK_P: Action: 'Off' + Priority: 'Blink' led_id_dwr: LED_ID_DWR_FRNT_P: Action: 'On' + Priority: 'Blink' LED_ID_DWR_BACK_P: Action: 'On' + Priority: 'Blink' led_pwr_dwr: LED_PWR_DWR_FRNT: Action: 'On' + Priority: 'Blink' LED_PWR_DWR_BACK: Action: 'On' + Priority: 'Blink' led_id_tpm: LED_ID_TPM: Action: 'On' + Priority: 'Blink' led_id_bat: LED_ID_BAT: Action: 'On' + Priority: 'Blink' led_id_mgmt_port2: LED_ID_MGMT_PORT2: Action: 'On' + Priority: 'Blink' led_id_mgmt_port1: LED_ID_MGMT_PORT1: Action: 'On' + Priority: 'Blink' led_id_nic1_port1: LED_ID_NIC1_PORT1: Action: 'On' + Priority: 'Blink' led_id_nic1_port2: LED_ID_NIC1_PORT2: Action: 'On' + Priority: 'Blink' led_id_nic2_port1: LED_ID_NIC2_PORT1: Action: 'On' + Priority: 'Blink' led_id_nic2_port2: LED_ID_NIC2_PORT2: Action: 'On' + Priority: 'Blink' led_id_m2_ssd2: LED_ID_M2_SSD2: Action: 'On' + Priority: 'Blink' led_id_m2_ssd1: LED_ID_M2_SSD1: Action: 'On' + Priority: 'Blink' led_id_cpu0: LED_ID_CPU0: Action: 'On' + Priority: 'Blink' led_id_cpu1: LED_ID_CPU1: Action: 'On' + Priority: 'Blink' led_id_cpu2: LED_ID_CPU2: Action: 'On' + Priority: 'Blink' led_id_cpu3: LED_ID_CPU3: Action: 'On' + Priority: 'Blink' led_id_dimm_c0a1: LED_ID_DIMM_C0A1: Action: 'On' + Priority: 'Blink' led_id_dimm_c0a2: LED_ID_DIMM_C0A2: Action: 'On' + Priority: 'Blink' led_id_dimm_c0b1: LED_ID_DIMM_C0B1: Action: 'On' + Priority: 'Blink' led_id_dimm_c0b2: LED_ID_DIMM_C0B2: Action: 'On' + Priority: 'Blink' led_id_dimm_c0c1: LED_ID_DIMM_C0C1: Action: 'On' + Priority: 'Blink' led_id_dimm_c0c2: LED_ID_DIMM_C0C2: Action: 'On' + Priority: 'Blink' led_id_dimm_c0d1: LED_ID_DIMM_C0D1: Action: 'On' + Priority: 'Blink' led_id_dimm_c0d2: LED_ID_DIMM_C0D2: Action: 'On' + Priority: 'Blink' led_id_dimm_c0e1: LED_ID_DIMM_C0E1: Action: 'On' + Priority: 'Blink' led_id_dimm_c0e2: LED_ID_DIMM_C0E2: Action: 'On' + Priority: 'Blink' led_id_dimm_c0f1: LED_ID_DIMM_C0F1: Action: 'On' + Priority: 'Blink' led_id_dimm_c0f2: LED_ID_DIMM_C0F2: Action: 'On' + Priority: 'Blink' led_id_dimm_c0g1: LED_ID_DIMM_C0G1: Action: 'On' + Priority: 'Blink' led_id_dimm_c0g2: LED_ID_DIMM_C0G2: Action: 'On' + Priority: 'Blink' led_id_dimm_c0h1: LED_ID_DIMM_C0H1: Action: 'On' + Priority: 'Blink' led_id_dimm_c0h2: LED_ID_DIMM_C0H2: Action: 'On' + Priority: 'Blink' led_id_dimm_c1a1: LED_ID_DIMM_C1A1: Action: 'On' + Priority: 'Blink' led_id_dimm_c1a2: LED_ID_DIMM_C1A2: Action: 'On' + Priority: 'Blink' led_id_dimm_c1b1: LED_ID_DIMM_C1B1: Action: 'On' + Priority: 'Blink' led_id_dimm_c1b2: LED_ID_DIMM_C1B2: Action: 'On' + Priority: 'Blink' led_id_dimm_c1c1: LED_ID_DIMM_C1C1: Action: 'On' + Priority: 'Blink' led_id_dimm_c1c2: LED_ID_DIMM_C1C2: Action: 'On' + Priority: 'Blink' led_id_dimm_c1d1: LED_ID_DIMM_C1D1: Action: 'On' + Priority: 'Blink' led_id_dimm_c1d2: LED_ID_DIMM_C1D2: Action: 'On' + Priority: 'Blink' led_id_dimm_c1e1: LED_ID_DIMM_C1E1: Action: 'On' + Priority: 'Blink' led_id_dimm_c1e2: LED_ID_DIMM_C1E2: Action: 'On' + Priority: 'Blink' led_id_dimm_c1f1: LED_ID_DIMM_C1F1: Action: 'On' + Priority: 'Blink' led_id_dimm_c1f2: LED_ID_DIMM_C1F2: Action: 'On' + Priority: 'Blink' led_id_dimm_c1g1: LED_ID_DIMM_C1G1: Action: 'On' + Priority: 'Blink' led_id_dimm_c1g2: LED_ID_DIMM_C1G2: Action: 'On' + Priority: 'Blink' led_id_dimm_c1h1: LED_ID_DIMM_C1H1: Action: 'On' + Priority: 'Blink' led_id_dimm_c1h2: LED_ID_DIMM_C1H2: Action: 'On' + Priority: 'Blink' led_id_dimm_c2a1: LED_ID_DIMM_C2A1: Action: 'On' + Priority: 'Blink' led_id_dimm_c2a2: LED_ID_DIMM_C2A2: Action: 'On' + Priority: 'Blink' led_id_dimm_c2b1: LED_ID_DIMM_C2B1: Action: 'On' + Priority: 'Blink' led_id_dimm_c2b2: LED_ID_DIMM_C2B2: Action: 'On' + Priority: 'Blink' led_id_dimm_c2c1: LED_ID_DIMM_C2C1: Action: 'On' + Priority: 'Blink' led_id_dimm_c2c2: LED_ID_DIMM_C2C2: Action: 'On' + Priority: 'Blink' led_id_dimm_c2d1: LED_ID_DIMM_C2D1: Action: 'On' + Priority: 'Blink' led_id_dimm_c2d2: LED_ID_DIMM_C2D2: Action: 'On' + Priority: 'Blink' led_id_dimm_c2e1: LED_ID_DIMM_C2E1: Action: 'On' + Priority: 'Blink' led_id_dimm_c2e2: LED_ID_DIMM_C2E2: Action: 'On' + Priority: 'Blink' led_id_dimm_c2f1: LED_ID_DIMM_C2F1: Action: 'On' + Priority: 'Blink' led_id_dimm_c2f2: LED_ID_DIMM_C2F2: Action: 'On' + Priority: 'Blink' led_id_dimm_c2g1: LED_ID_DIMM_C2G1: Action: 'On' + Priority: 'Blink' led_id_dimm_c2g2: LED_ID_DIMM_C2G2: Action: 'On' + Priority: 'Blink' led_id_dimm_c2h1: LED_ID_DIMM_C2H1: Action: 'On' + Priority: 'Blink' led_id_dimm_c2h2: LED_ID_DIMM_C2H2: Action: 'On' + Priority: 'Blink' led_id_dimm_c3a1: LED_ID_DIMM_C3A1: Action: 'On' + Priority: 'Blink' led_id_dimm_c3a2: LED_ID_DIMM_C3A2: Action: 'On' + Priority: 'Blink' led_id_dimm_c3b1: LED_ID_DIMM_C3B1: Action: 'On' + Priority: 'Blink' led_id_dimm_c3b2: LED_ID_DIMM_C3B2: Action: 'On' + Priority: 'Blink' led_id_dimm_c3c1: LED_ID_DIMM_C3C1: Action: 'On' + Priority: 'Blink' led_id_dimm_c3c2: LED_ID_DIMM_C3C2: Action: 'On' + Priority: 'Blink' led_id_dimm_c3d1: LED_ID_DIMM_C3D1: Action: 'On' + Priority: 'Blink' led_id_dimm_c3d2: LED_ID_DIMM_C3D2: Action: 'On' + Priority: 'Blink' led_id_dimm_c3e1: LED_ID_DIMM_C3E1: Action: 'On' + Priority: 'Blink' led_id_dimm_c3e2: LED_ID_DIMM_C3E2: Action: 'On' + Priority: 'Blink' led_id_dimm_c3f1: LED_ID_DIMM_C3F1: Action: 'On' + Priority: 'Blink' led_id_dimm_c3f2: LED_ID_DIMM_C3F2: Action: 'On' + Priority: 'Blink' led_id_dimm_c3g1: LED_ID_DIMM_C3G1: Action: 'On' + Priority: 'Blink' led_id_dimm_c3g2: LED_ID_DIMM_C3G2: Action: 'On' + Priority: 'Blink' led_id_dimm_c3h1: LED_ID_DIMM_C3H1: Action: 'On' + Priority: 'Blink' led_id_dimm_c3h2: LED_ID_DIMM_C3H2: Action: 'On' + Priority: 'Blink' led_id_rssd01: LED_ID_RSSD01: Action: 'On' + Priority: 'Blink' led_id_rssd02: LED_ID_RSSD02: Action: 'On' + Priority: 'Blink' led_id_rssd03: LED_ID_RSSD03: Action: 'On' + Priority: 'Blink' led_id_rssd04: LED_ID_RSSD04: Action: 'On' + Priority: 'Blink' led_id_rssd05: LED_ID_RSSD05: Action: 'On' + Priority: 'Blink' led_id_rssd06: LED_ID_RSSD06: Action: 'On' + Priority: 'Blink' led_id_rssd07: LED_ID_RSSD07: Action: 'On' + Priority: 'Blink' led_id_rssd08: LED_ID_RSSD08: Action: 'On' + Priority: 'Blink' led_id_rssd09: LED_ID_RSSD09: Action: 'On' + Priority: 'Blink' led_id_rssd10: LED_ID_RSSD10: Action: 'On' + Priority: 'Blink' led_id_rssd11: LED_ID_RSSD11: Action: 'On' + Priority: 'Blink' led_id_rssd12: LED_ID_RSSD12: Action: 'On' + Priority: 'Blink' led_id_rssd13: LED_ID_RSSD13: Action: 'On' + Priority: 'Blink' led_id_rssd14: LED_ID_RSSD14: Action: 'On' + Priority: 'Blink' led_id_rssd15: LED_ID_RSSD15: Action: 'On' + Priority: 'Blink' led_id_rssd16: LED_ID_RSSD16: Action: 'On' + Priority: 'Blink' led_id_rssd17: LED_ID_RSSD17: Action: 'On' + Priority: 'Blink' led_id_rssd18: LED_ID_RSSD18: Action: 'On' + Priority: 'Blink' led_id_rssd19: LED_ID_RSSD19: Action: 'On' + Priority: 'Blink' led_id_rssd20: LED_ID_RSSD20: Action: 'On' + Priority: 'Blink' led_id_rssd21: LED_ID_RSSD21: Action: 'On' + Priority: 'Blink' led_id_rssd22: LED_ID_RSSD22: Action: 'On' + Priority: 'Blink' led_id_rssd23: LED_ID_RSSD23: Action: 'On' + Priority: 'Blink' led_id_rssd24: LED_ID_RSSD24: Action: 'On' + Priority: 'Blink' led_id_rssd25: LED_ID_RSSD25: Action: 'On' + Priority: 'Blink' led_id_rssd26: LED_ID_RSSD26: Action: 'On' + Priority: 'Blink' led_id_rssd27: LED_ID_RSSD27: Action: 'On' + Priority: 'Blink' led_id_rssd28: LED_ID_RSSD28: Action: 'On' + Priority: 'Blink' led_id_rssd29: LED_ID_RSSD29: Action: 'On' + Priority: 'Blink' led_id_rssd30: LED_ID_RSSD30: Action: 'On' + Priority: 'Blink' led_id_rssd31: LED_ID_RSSD31: Action: 'On' + Priority: 'Blink' led_id_rssd32: LED_ID_RSSD32: Action: 'On' + Priority: 'Blink' led_id_fan_asm01: LED_ID_FAN_ASM01: Action: 'On' + Priority: 'Blink' led_id_fan_asm02: LED_ID_FAN_ASM02: Action: 'On' + Priority: 'Blink' led_id_fan_asm03: LED_ID_FAN_ASM03: Action: 'On' + Priority: 'Blink' led_id_fan_asm04: LED_ID_FAN_ASM04: Action: 'On' + Priority: 'Blink' led_id_fan_asm05: LED_ID_FAN_ASM05: Action: 'On' + Priority: 'Blink' led_id_fan_asm06: LED_ID_FAN_ASM06: Action: 'On' + Priority: 'Blink' led_id_fan_asm07: LED_ID_FAN_ASM07: Action: 'On' + Priority: 'Blink' led_id_fan_asm08: LED_ID_FAN_ASM08: Action: 'On' + Priority: 'Blink' led_id_fan_asm09: LED_ID_FAN_ASM09: Action: 'On' + Priority: 'Blink' led_id_fan_asm10: LED_ID_FAN_ASM10: Action: 'On' + Priority: 'Blink' led_id_fan_asm11: LED_ID_FAN_ASM11: Action: 'On' + Priority: 'Blink' led_id_fan_asm12: LED_ID_FAN_ASM12: Action: 'On' + Priority: 'Blink' led_rssd01_power: rssd01_power_green: Action: 'On' + Priority: 'Blink' led_rssd02_power: rssd02_power_green: Action: 'On' + Priority: 'Blink' led_rssd03_power: rssd03_power_green: Action: 'On' + Priority: 'Blink' led_rssd04_power: rssd04_power_green: Action: 'On' + Priority: 'Blink' led_rssd05_power: rssd05_power_green: Action: 'On' + Priority: 'Blink' led_rssd06_power: rssd06_power_green: Action: 'On' + Priority: 'Blink' led_rssd07_power: rssd07_power_green: Action: 'On' + Priority: 'Blink' led_rssd08_power: rssd08_power_green: Action: 'On' + Priority: 'Blink' led_rssd09_power: rssd09_power_green: Action: 'On' + Priority: 'Blink' led_rssd10_power: rssd10_power_green: Action: 'On' + Priority: 'Blink' led_rssd11_power: rssd11_power_green: Action: 'On' + Priority: 'Blink' led_rssd12_power: rssd12_power_green: Action: 'On' + Priority: 'Blink' led_rssd13_power: rssd13_power_green: Action: 'On' + Priority: 'Blink' led_rssd14_power: rssd14_power_green: Action: 'On' + Priority: 'Blink' led_rssd15_power: rssd15_power_green: Action: 'On' + Priority: 'Blink' led_rssd16_power: rssd16_power_green: Action: 'On' + Priority: 'Blink' led_rssd17_power: rssd17_power_green: Action: 'On' + Priority: 'Blink' led_rssd18_power: rssd18_power_green: Action: 'On' + Priority: 'Blink' led_rssd19_power: rssd19_power_green: Action: 'On' + Priority: 'Blink' led_rssd20_power: rssd20_power_green: Action: 'On' + Priority: 'Blink' led_rssd21_power: rssd21_power_green: Action: 'On' + Priority: 'Blink' led_rssd22_power: rssd22_power_green: Action: 'On' + Priority: 'Blink' led_rssd23_power: rssd23_power_green: Action: 'On' + Priority: 'Blink' led_rssd24_power: rssd24_power_green: Action: 'On' + Priority: 'Blink' led_rssd25_power: rssd25_power_green: Action: 'On' + Priority: 'Blink' led_rssd26_power: rssd26_power_green: Action: 'On' + Priority: 'Blink' led_rssd27_power: rssd27_power_green: Action: 'On' + Priority: 'Blink' led_rssd28_power: rssd28_power_green: Action: 'On' + Priority: 'Blink' led_rssd29_power: rssd29_power_green: Action: 'On' + Priority: 'Blink' led_rssd30_power: rssd30_power_green: Action: 'On' + Priority: 'Blink' led_rssd31_power: rssd31_power_green: Action: 'On' + Priority: 'Blink' led_rssd32_power: rssd32_power_green: Action: 'On' + Priority: 'Blink' led_m2_ssb_ssd1_power: m2_ssb_ssd1_power_green: Action: 'On' + Priority: 'Blink' led_m2_ssb_ssd2_power: m2_ssb_ssd2_power_green: Action: 'On' + Priority: 'Blink' diff --git a/meta-ibm/meta-system1/conf/machine/system1.conf b/meta-ibm/meta-system1/conf/machine/system1.conf index 922e04c79e..c759f367ec 100644 --- a/meta-ibm/meta-system1/conf/machine/system1.conf +++ b/meta-ibm/meta-system1/conf/machine/system1.conf @@ -13,7 +13,9 @@ include conf/distro/include/extra-dev-debug-tools.inc MACHINE_FEATURES += "\ obmc-phosphor-chassis-mgmt \ + obmc-host-ipmi \ " +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" VIRTUAL-RUNTIME_obmc-sensors-hwmon = "dbus-sensors" diff --git a/meta-ibm/meta-system1/recipes-kernel/linux/linux-aspeed/system1.cfg b/meta-ibm/meta-system1/recipes-kernel/linux/linux-aspeed/system1.cfg index c6406aff2f..a6a7d3cdf1 100644 --- a/meta-ibm/meta-system1/recipes-kernel/linux/linux-aspeed/system1.cfg +++ b/meta-ibm/meta-system1/recipes-kernel/linux/linux-aspeed/system1.cfg @@ -44,3 +44,4 @@ CONFIG_SENSORS_PLI1209BC=y CONFIG_SENSORS_PLI1209BC_REGULATOR=y CONFIG_TCG_TPM=y CONFIG_TCG_TIS_I2C=y +CONFIG_GPIO_ASPEED_SGPIO=y diff --git a/meta-ibm/meta-system1/recipes-phosphor/flash/bios-version.bb b/meta-ibm/meta-system1/recipes-phosphor/flash/bios-version.bb new file mode 100644 index 0000000000..99336c4819 --- /dev/null +++ b/meta-ibm/meta-system1/recipes-phosphor/flash/bios-version.bb @@ -0,0 +1,26 @@ +SUMMARY = "YAML configuration for IBM System1" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd + +RDEPENDS:${PN} += "bash flashrom" + +SRC_URI += " \ + file://bios-version.sh \ + file://bios-version.service \ + " + +do_install:append() { + install -d ${D}/${sbindir} + install -m 0755 ${WORKDIR}/bios-version.sh ${D}/${sbindir}/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/bios-version.service ${D}${systemd_system_unitdir}/ +} + +SYSTEMD_SERVICE:${PN} += "bios-version.service" + +FILES:${PN} += "${systemd_system_unitdir}/bios-version.service ${sbindir}/bios-version.sh" + diff --git a/meta-ibm/meta-system1/recipes-phosphor/flash/bios-version/bios-version.service b/meta-ibm/meta-system1/recipes-phosphor/flash/bios-version/bios-version.service new file mode 100644 index 0000000000..edcb861c56 --- /dev/null +++ b/meta-ibm/meta-system1/recipes-phosphor/flash/bios-version/bios-version.service @@ -0,0 +1,12 @@ +[Unit] +Description=Update current Host FW version +After=xyz.openbmc_project.Software.Version.service +Wants=xyz.openbmc_project.Software.Version.service + +[Service] +Type=oneshot +RemainAfterExit=no +ExecStart=/bin/bash /usr/sbin/bios-version.sh + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/meta-system1/recipes-phosphor/flash/bios-version/bios-version.sh b/meta-ibm/meta-system1/recipes-phosphor/flash/bios-version/bios-version.sh new file mode 100644 index 0000000000..16b0dd51e6 --- /dev/null +++ b/meta-ibm/meta-system1/recipes-phosphor/flash/bios-version/bios-version.sh @@ -0,0 +1,58 @@ +#!/bin/bash +set -e + +# Find the GPIO pin associated with "pch-ready" +GPIO_PIN=$(gpiofind "pch-ready") + +if [ -z "${GPIO_PIN}" ]; then + echo "gpio 'pch-ready' not found in device tree. Exiting." + exit 0 +fi + +# Read the value of the GPIO pin +GPIO_CHIP=$(echo "$GPIO_PIN" | cut -d' ' -f1) # Extract gpiochip +GPIO_LINE=$(echo "$GPIO_PIN" | cut -d' ' -f2) # Extract line offset +GPIO_VALUE=$(gpioget "$GPIO_CHIP" "$GPIO_LINE") + +if [ "${GPIO_VALUE}" != "0" ]; then + echo "PCH is not on standby. Exiting host firmware version read." + exit 0 +fi + +# Fetch the MTD device number for the specified espi flash device +DEVICE_NAME="espi-flash-mafs" +MTD_DEVICE_NUMBER=$(grep "$DEVICE_NAME" /proc/mtd | awk -F: '{print $1}' | awk -F'mtd' '{print $2}') + +if [ -n "$MTD_DEVICE_NUMBER" ]; then + echo "Found MTD device number: $MTD_DEVICE_NUMBER" +else + echo "Error: MTD device with name '$DEVICE_NAME' not found!" + exit 0 +fi + +BIOS_FILE="$(mktemp)" +flashrom -p linux_mtd:dev="${MTD_DEVICE_NUMBER}" --ifd -i bios -r "${BIOS_FILE}" + +bios_version=$(strings "${BIOS_FILE}" | grep COREBOOT_EXTR | head -n 1 | awk '{ print $3}' | sed 's/"//g' | sed 's/^-\(.*\)/\1/') + +if [ "${bios_version}" == "" ] ; then + bios_version=$(strings "${BIOS_FILE}" | grep COREBOOT_VERS | head -n 1 | awk '{ print $3}' | sed 's/"//g' | sed 's/^-\(.*\)/\1/') +fi + +# Clean up the temporary BIOS file +rm "${BIOS_FILE}" + +# If BIOS version is found, cache it and update the BMC property +if [ "${bios_version}" != "" ] ; then + if [ -f /var/cache/bios_version ] ; then + rm /var/cache/bios_version + fi + + echo "coreboot-${bios_version}" > /var/cache/bios_version +fi + +if [ -f /var/cache/bios_version ] ; then + busctl set-property xyz.openbmc_project.Software.BMC.Updater \ + /xyz/openbmc_project/software/bios_active \ + xyz.openbmc_project.Software.Version Version s "$(cat /var/cache/bios_version)" +fi diff --git a/meta-ibm/meta-system1/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ibm/meta-system1/recipes-phosphor/flash/phosphor-software-manager_%.bbappend new file mode 100644 index 0000000000..226181ac4e --- /dev/null +++ b/meta-ibm/meta-system1/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -0,0 +1 @@ +RDEPENDS:${PN} += "bash flashrom bios-version" diff --git a/meta-ibm/meta-system1/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-system1/recipes-phosphor/images/obmc-phosphor-image.bbappend index 14fde27c60..15ef8726c7 100644 --- a/meta-ibm/meta-system1/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-system1/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -2,3 +2,4 @@ IMAGE_FEATURES:remove = " \ obmc-leds \ " +OBMC_IMAGE_EXTRA_INSTALL:append:system1 = " phosphor-ipmi-blobs smbios-mdr" diff --git a/meta-ibm/meta-system1/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-system1/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index b6e34c464c..08750f090d 100644 --- a/meta-ibm/meta-system1/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-system1/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,14 +1,17 @@ PACKAGES += " \ ${PN}-system \ ${PN}-chassis \ + ${PN}-flash \ " PROVIDES += " \ virtual/obmc-system-mgmt \ virtual/obmc-chassis-mgmt \ + virtual/obmc-flash-mgmt \ " RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" SUMMARY:${PN}-chassis = "OpenPOWER Chassis" RDEPENDS:${PN}-chassis = " \ @@ -19,4 +22,9 @@ RDEPENDS:${PN}-chassis = " \ phosphor-skeleton-control-power \ " +SUMMARY:${PN}-flash = "System1 Flash" +RDEPENDS:${PN}-flash = " \ + phosphor-software-manager \ + " + RDEPENDS:${PN}-inventory:append = " entity-manager" diff --git a/meta-ibm/meta-system1/recipes-phosphor/smbios/smbios-mdr_git.bbappend b/meta-ibm/meta-system1/recipes-phosphor/smbios/smbios-mdr_git.bbappend new file mode 100644 index 0000000000..bafc873cb7 --- /dev/null +++ b/meta-ibm/meta-system1/recipes-phosphor/smbios/smbios-mdr_git.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:append = " smbios-ipmi-blob" diff --git a/meta-ibm/recipes-extended/pam/libpam/pam.d/common-account b/meta-ibm/recipes-extended/pam/libpam/pam.d/common-account new file mode 100644 index 0000000000..f9759d5f5f --- /dev/null +++ b/meta-ibm/recipes-extended/pam/libpam/pam.d/common-account @@ -0,0 +1,29 @@ +# +# /etc/pam.d/common-account - authorization settings common to all services +# +# This file is included from other service-specific PAM config files, +# and should contain a list of the authorization modules that define +# the central access policy for use on the system. The default is to +# only deny service to users whose accounts are expired in /etc/shadow. +# +# As of pam 1.0.1-6, this file is managed by pam-auth-update by default. +# To take advantage of this, it is recommended that you configure any +# local modules either before or after the default block, and use +# pam-auth-update to manage selection of other modules. See +# pam-auth-update(8) for details. +# + +# here are the per-package modules (the "Primary" block) +account [success=ignore default=ignore] pam_google_authenticator.so +account [success=2 new_authtok_reqd=done default=ignore] pam_unix.so +-account [success=1 new_authtok_reqd=done default=ignore] pam_ldap.so ignore_unknown_user ignore_authinfo_unavail +# here's the fallback if no module succeeds +account requisite pam_deny.so +# Announce if faillock is blocking access +account required pam_faillock.so +# prime the stack with a positive return value if there isn't one already; +# this avoids us returning an error just because nothing sets a success code +# since the modules above will each just jump around +account required pam_permit.so +# and here are more per-package modules (the "Additional" block) +# end of pam-auth-update config diff --git a/meta-ibm/recipes-extended/pam/libpam/pam.d/common-auth b/meta-ibm/recipes-extended/pam/libpam/pam.d/common-auth new file mode 100644 index 0000000000..4d080c62ee --- /dev/null +++ b/meta-ibm/recipes-extended/pam/libpam/pam.d/common-auth @@ -0,0 +1,22 @@ +# +# /etc/pam.d/common-auth - authentication settings common to all services +# +# This file is included from other service-specific PAM config files, +# and should contain a list of the authentication modules that define +# the central authentication scheme for use on the system +# (e.g., /etc/shadow, LDAP, Kerberos, etc.). The default is to use the +# traditional Unix authentication mechanisms. + +# here are the per-package modules (the "Primary" block) +# Try for local user first, and then try for ldap +auth required pam_google_authenticator.so nullok +auth [success=3 default=ignore] pam_unix.so quiet +-auth [success=2 default=ignore] pam_ldap.so ignore_unknown_user ignore_authinfo_unavail +# Control gets here when no authentication module succeeds. Increment the +# failure tally and return failure status to PAM. +auth [default=die] pam_faillock.so authfail +auth requisite pam_deny.so +# Control gets here when authentication succeeds. Check if the user is locked +# out due to consecutive authentication failures and return status accordingly. +auth required pam_faillock.so authsucc +# and here are more per-package modules (the "Additional" block) diff --git a/meta-ibm/recipes-extended/pam/libpam_%.bbappend b/meta-ibm/recipes-extended/pam/libpam_%.bbappend new file mode 100644 index 0000000000..676898f780 --- /dev/null +++ b/meta-ibm/recipes-extended/pam/libpam_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend:df-google-authenticator-libpam := "${THISDIR}/${PN}:" +SRC_URI:append:df-google-authenticator-libpam = " \ + file://pam.d/common-account \ + file://pam.d/common-auth \ +" diff --git a/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh b/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh index c35a61bdb8..e34d218613 100644 --- a/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh @@ -6,7 +6,7 @@ status=0 max_retries=3 driver_path="/sys/bus/i2c/drivers/ir35221/" -platform_path="/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/" +platform_path="/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/" unbind_driver () { echo "$1" > $driver_path/unbind @@ -58,22 +58,22 @@ then fi elif [ "$1" = "bind" ] then - if [ -e $platform_path/1e78a140.i2c-bus/i2c-4/4-0070 ] + if [ -e $platform_path/1e78a140.i2c/i2c-4/4-0070 ] then bind_driver "4-0070" fi - if [ -e $platform_path/1e78a140.i2c-bus/i2c-4/4-0071 ] + if [ -e $platform_path/1e78a140.i2c/i2c-4/4-0071 ] then bind_driver "4-0071" fi - if [ -e $platform_path/1e78a180.i2c-bus/i2c-5/5-0070 ] + if [ -e $platform_path/1e78a180.i2c/i2c-5/5-0070 ] then bind_driver "5-0070" fi - if [ -e $platform_path/1e78a180.i2c-bus/i2c-5/5-0071 ] + if [ -e $platform_path/1e78a180.i2c/i2c-5/5-0071 ] then bind_driver "5-0071" fi diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf index 638ae7e5d9..a5ba3f3284 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf @@ -2,4 +2,3 @@ lpc-address = 0x3f8 sirq = 4 local-tty = ttyS0 local-tty-baud = 115200 -logsize = 256k diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf index 638ae7e5d9..85e212a06b 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf @@ -1,5 +1,4 @@ lpc-address = 0x3f8 sirq = 4 -local-tty = ttyS0 local-tty-baud = 115200 logsize = 256k diff --git a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend index df135f47f6..68fbf6051e 100644 --- a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend +++ b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend @@ -23,7 +23,7 @@ python link_ibm_plugins() { op_plugins = os.listdir(source_path) for op_plugin in op_plugins: op_plugin_name = os.path.join(source_path, op_plugin) - install_dreport_user_script(op_plugin_name, d) + install_dreport_user_script("dreport.conf", op_plugin_name, d) } #Install dump header script from dreport/ibm.d to dreport/include.d diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml index 20dc31c408..adcb892d7e 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml @@ -3,7 +3,7 @@ methods: - type: gpio key: 5 - physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060 devpath: /dev/input/by-path/platform-gpio-keys-polled-event - type: tach sensors: @@ -16,7 +16,7 @@ methods: - type: gpio key: 6 - physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060 devpath: /dev/input/by-path/platform-gpio-keys-polled-event - type: tach sensors: @@ -29,7 +29,7 @@ methods: - type: gpio key: 7 - physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060 devpath: /dev/input/by-path/platform-gpio-keys-polled-event - type: tach sensors: @@ -42,7 +42,7 @@ methods: - type: gpio key: 8 - physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060 devpath: /dev/input/by-path/platform-gpio-keys-polled-event - type: tach sensors: @@ -56,7 +56,7 @@ methods: - type: gpio key: 9 - physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060 + physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060 devpath: /dev/input/by-path/platform-gpio-keys-polled-event rpolicy: type: anyof diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index 0029ee7238..cc4a20d9cd 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -3,6 +3,7 @@ OBMC_IMAGE_EXTRA_INSTALL:remove:witherspoon-tacoma = " liberation-fonts uart-ren OBMC_IMAGE_EXTRA_INSTALL:append:p10bmc = " mboxd" # No host firmware related features for huygens wanted yet OBMC_IMAGE_EXTRA_INSTALL:remove:huygens = " mboxd" +OBMC_IMAGE_EXTRA_INSTALL:append:df-chrony = " chrony" IMAGE_FEATURES:append = " obmc-dbus-monitor" diff --git a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend index 0116afa896..f3d55c2558 100644 --- a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -11,12 +11,15 @@ EXTRA_OEMESON:append = " \ EXTRA_OEMESON:append:p10bmc = " \ -Dkvm=disabled \ -Dvm-websocket=disabled \ + -Dredfish-allow-deprecated-power-thermal=disabled \ + -Dhypervisor-computer-system=enabled \ " PACKAGECONFIG:remove:p10bmc = "mutual-tls-auth" EXTRA_OEMESON:append:witherspoon-tacoma = " \ -Dkvm=disabled \ -Dvm-websocket=disabled \ + -Dhypervisor-computer-system=enabled \ " PACKAGECONFIG:remove:witherspoon-tacoma = "mutual-tls-auth" diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-2u_associations.json index 2866c7a52f..50ed82fef4 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-2u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-2u_associations.json @@ -477,14 +477,14 @@ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector0", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector1", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector2", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector3", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector0", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector1", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector2", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector3", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme2", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme4", @@ -2681,6 +2681,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3" + ] } ] }, @@ -2721,6 +2735,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3" + ] } ] }, @@ -2741,6 +2769,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3" + ] } ] }, @@ -3002,6 +3044,8 @@ }, "paths": [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector2", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector4", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector5" ] @@ -3042,6 +3086,8 @@ }, "paths": [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector2", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector4", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector5" ] diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-4u_associations.json index cd4da06d8e..8290797bb4 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-4u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-4u_associations.json @@ -486,18 +486,18 @@ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4/cxp_bot", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_top", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_bot", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector0", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector1", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector2", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector3", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector0", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector1", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector2", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector3", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme0", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme1", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme2", @@ -2827,6 +2827,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3" + ] } ] }, @@ -2867,6 +2881,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3" + ] } ] }, @@ -2887,6 +2915,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3" + ] } ] }, @@ -3148,6 +3190,10 @@ }, "paths": [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector4", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector5" ] @@ -3188,6 +3234,10 @@ }, "paths": [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector4", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector5" ] diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json index 446cd9363a..daf792500c 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json @@ -1233,6 +1233,20 @@ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C8_Temp", "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C8_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3" + ] } ] }, @@ -1269,6 +1283,20 @@ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp", "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3" + ] } ] }, @@ -1287,6 +1315,20 @@ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp", "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3" + ] } ] }, diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,fuji_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,fuji_associations.json index 437cf05c5d..37971176b4 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,fuji_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,fuji_associations.json @@ -1233,6 +1233,20 @@ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C8_Temp", "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C8_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3" + ] } ] }, @@ -1269,6 +1283,20 @@ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp", "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3" + ] } ] }, @@ -1287,6 +1315,20 @@ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp", "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3" + ] } ] }, diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json index 931f6d5d47..3559bbfea0 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json @@ -478,14 +478,14 @@ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector0", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector1", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector2", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector3", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector0", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector1", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector2", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector3", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme2", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme4", @@ -2682,6 +2682,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3" + ] } ] }, @@ -2722,6 +2736,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3" + ] } ] }, @@ -2742,6 +2770,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3" + ] } ] }, @@ -3003,6 +3045,8 @@ }, "paths": [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector2", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector4", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector5" ] @@ -3043,6 +3087,8 @@ }, "paths": [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector2", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector4", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector5" ] diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json index 2281d86e43..5a90e2c35f 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json @@ -486,18 +486,18 @@ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4/cxp_bot", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_top", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_bot", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector0", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector1", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector2", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector3", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2", "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector0", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector1", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector2", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector3", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme0", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme1", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme2", @@ -2827,6 +2827,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3" + ] } ] }, @@ -2867,6 +2881,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3" + ] } ] }, @@ -2887,6 +2915,20 @@ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp", "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Local_Temp" ] + }, + { + "types": + { + "rType": "connected_to", + "fType": "connecting" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3" + ] } ] }, @@ -3148,6 +3190,10 @@ }, "paths": [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector4", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector5" ] @@ -3188,6 +3234,10 @@ }, "paths": [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector3", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector4", "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector5" ] @@ -5013,7 +5063,7 @@ "paths": [ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0", - "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0" + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0" ] }, { diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 16cb426589..d9761da117 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -4,10 +4,14 @@ SRC_URI:append:ibm-ac-server = " file://associations.json" DEPENDS:append:ibm-ac-server = " inventory-cleanup" PACKAGECONFIG:append:p10bmc = " associations" +DEPENDS:remove:p10bmc = " phosphor-inventory-manager-assettag" SRC_URI:append:p10bmc = " \ file://ibm,rainier-2u_associations.json \ file://ibm,rainier-4u_associations.json \ file://ibm,everest_associations.json \ + file://ibm,blueridge-2u_associations.json \ + file://ibm,blueridge-4u_associations.json \ + file://ibm,fuji_associations.json \ " do_install:append:ibm-ac-server() { @@ -20,4 +24,7 @@ do_install:append:p10bmc() { install -m 0755 ${WORKDIR}/ibm,rainier-2u_associations.json ${D}${base_datadir}/ibm,rainier-2u_associations.json install -m 0755 ${WORKDIR}/ibm,rainier-4u_associations.json ${D}${base_datadir}/ibm,rainier-4u_associations.json install -m 0755 ${WORKDIR}/ibm,everest_associations.json ${D}${base_datadir}/ibm,everest_associations.json + install -m 0755 ${WORKDIR}/ibm,blueridge-2u_associations.json ${D}${base_datadir}/ibm,blueridge-2u_associations.json + install -m 0755 ${WORKDIR}/ibm,blueridge-4u_associations.json ${D}${base_datadir}/ibm,blueridge-4u_associations.json + install -m 0755 ${WORKDIR}/ibm,fuji_associations.json ${D}${base_datadir}/ibm,fuji_associations.json } diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json b/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json index 123aa6df99..5da4886683 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json @@ -9996,7 +9996,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-11/11-0064": { + "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-11/11-0064": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure", @@ -10017,7 +10017,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": { + "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0068": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure", @@ -10038,70 +10038,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0060F", - "ComponentInstance": 0, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from power supply 0", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-11/11-0064": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0059F", - "ComponentInstance": null, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from the power sequencer chip on the system backplane", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0060F", - "ComponentInstance": 1, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from power supply 1", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": { + "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0069": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure", @@ -17094,196 +17031,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0057F", - "ComponentInstance": null, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from the fan control device on the system backplane", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0060F", - "ComponentInstance": 1, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from power supply 1", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0060F", - "ComponentInstance": 0, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from power supply 0", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0076": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0053F", - "ComponentInstance": null, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from the ambient temperature sensor on the system backplane", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0077": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0052F", - "ComponentInstance": null, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from the ambient temperature sensor on the system backplane", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-4/4-0070": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0054F", - "ComponentInstance": 0, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from the CPU 0 VDD/VCS VRM on the system backplane", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-4/4-0071": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0055F", - "ComponentInstance": 1, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from the CPU 1 VDN/VDDR VRM on the system backplane", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-5/5-0070": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0054F", - "ComponentInstance": 1, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from the CPU 1 VDD/VCS VRM on the system backplane", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-9/9-004a": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0056F", - "ComponentInstance": null, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to read from the PCIE temperature sensor on the system backplane", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": { + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0052": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", @@ -17304,7 +17052,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": { + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0068": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", @@ -17325,7 +17073,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": { + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0069": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", @@ -17346,7 +17094,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0076": { + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0076": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", @@ -17367,7 +17115,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0077": { + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0077": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", @@ -17388,7 +17136,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-4/4-0070": { + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-4/4-0070": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", @@ -17409,7 +17157,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-4/4-0071": { + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-4/4-0071": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", @@ -17430,7 +17178,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-5/5-0070": { + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-5/5-0070": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", @@ -17451,7 +17199,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-9/9-004a": { + "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-9/9-004a": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure", @@ -19572,28 +19320,7 @@ "UserAction": null, "VMMigrationFlag": null }, - "xyz.openbmc_project.Sensor.Device.Error.WriteFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": { - "AffectedLEDs": null, - "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", - "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.WriteFailure", - "CallHomeCandidate": false, - "CommonEventID": "FQPSPCR0058F", - "ComponentInstance": null, - "DateAdded": null, - "DateReviewed": null, - "EventType": "Communication Failure/Timeout", - "Internal": false, - "LengthyDescription": null, - "LogSource": "BMC", - "Message": "Failed to write to the fan control device on the system backplane", - "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard", - "RelatedEventIDs": {}, - "Serviceable": false, - "Severity": "Warning", - "UserAction": null, - "VMMigrationFlag": null - }, - "xyz.openbmc_project.Sensor.Device.Error.WriteFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": { + "xyz.openbmc_project.Sensor.Device.Error.WriteFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0052": { "AffectedLEDs": null, "AffectedSubsystem": "Systems Management - Core / Virtual Appliance", "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.WriteFailure", diff --git a/meta-ibm/recipes-phosphor/network/network/ncsi-wait-and-set-speed b/meta-ibm/recipes-phosphor/network/network/ncsi-wait-and-set-speed index e435831ab6..b18bfec7e5 100644 --- a/meta-ibm/recipes-phosphor/network/network/ncsi-wait-and-set-speed +++ b/meta-ibm/recipes-phosphor/network/network/ncsi-wait-and-set-speed @@ -22,7 +22,7 @@ do echo "attempt number $i: setting $netIface to 1 gigabit" rc=0 # package 0, channel 0, oem command, see Intel I210 datasheet section 10.6.3.10.1 - /usr/libexec/ncsi-netlink-ifindex "$netIface" -p 0 -c 0 -o 00000157200001 || rc=$? + /usr/libexec/ncsi-netlink-ifindex "$netIface" -p 0 -c 0 -o 5000000157200001 || rc=$? if [ $rc -ne 0 ]; then echo "error code is $rc setting $netIface to 1 gigabit, sleep and retry" sleep 5 diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785b@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785b@52.conf deleted file mode 100644 index 5046f075d4..0000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785b@52.conf +++ /dev/null @@ -1,9 +0,0 @@ -LABEL_fan1 = "fan0_0" - -LABEL_fan2 = "fan1_0" - -LABEL_fan3 = "fan0_1" - -LABEL_fan4 = "fan1_1" - -TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@5a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005a.conf index a07d5f75c0..a07d5f75c0 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@5a.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005a.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@5b.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005b.conf index 3850b525aa..3850b525aa 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@5b.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005b.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0068.conf index bac21768b5..bac21768b5 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0068.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0069.conf index 161d7e7ced..161d7e7ced 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0069.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006a.conf index 148c527555..148c527555 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6a.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006a.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6b.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006b.conf index 19309dda9f..19309dda9f 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6b.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006b.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6d.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006d.conf index 148c527555..148c527555 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@6d.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006d.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a400.i2c/i2c-7/7-0052.conf index c3b9db1468..ade9dc8b6f 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a400.i2c/i2c-7/7-0052.conf @@ -1,25 +1,37 @@ LABEL_fan1 = "fan0_0" +MAXVALUE_fan1 = "18000" LABEL_fan2 = "fan1_0" +MAXVALUE_fan2 = "18000" LABEL_fan3 = "fan2_0" +MAXVALUE_fan3 = "18000" LABEL_fan4 = "fan3_0" +MAXVALUE_fan4 = "18000" LABEL_fan5 = "fan4_0" +MAXVALUE_fan5 = "18000" LABEL_fan6 = "fan5_0" +MAXVALUE_fan6 = "18000" LABEL_fan7 = "fan0_1" +MAXVALUE_fan7 = "18000" LABEL_fan8 = "fan1_1" +MAXVALUE_fan8 = "18000" LABEL_fan9 = "fan2_1" +MAXVALUE_fan9 = "18000" LABEL_fan10 = "fan3_1" +MAXVALUE_fan10 = "18000" LABEL_fan11 = "fan4_1" +MAXVALUE_fan11 = "18000" LABEL_fan12 = "fan5_1" +MAXVALUE_fan12 = "18000" TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-mux@70/i2c@3/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a780.i2c/i2c-14/i2c-30/30-0052.conf index d3df21599d..1e9d91a2ff 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-mux@70/i2c@3/max31785@52.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a780.i2c/i2c-14/i2c-30/30-0052.conf @@ -1,17 +1,25 @@ LABEL_fan1 = "fan0_0" +MAXVALUE_fan1 = "11300" LABEL_fan2 = "fan1_0" +MAXVALUE_fan2 = "11300" LABEL_fan3 = "fan2_0" +MAXVALUE_fan3 = "11300" LABEL_fan4 = "fan3_0" +MAXVALUE_fan4 = "11300" LABEL_fan5 = "fan0_1" +MAXVALUE_fan5 = "11300" LABEL_fan6 = "fan1_1" +MAXVALUE_fan6 = "11300" LABEL_fan7 = "fan2_1" +MAXVALUE_fan7 = "11300" LABEL_fan8 = "fan3_1" +MAXVALUE_fan8 = "11300" TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf index 0b97ed559a..0b97ed559a 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf index 2fadbdec08..2fadbdec08 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf index e463b517cc..e463b517cc 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/dps310@76.conf index d685863f84..d685863f84 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/dps310@76.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/si7021a20@20.conf index c8a7290675..c8a7290675 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/si7021a20@20.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/tmp275@48.conf index ef2b46d537..ef2b46d537 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/tmp275@48.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35219@70.conf index 7d2f2ef2aa..7d2f2ef2aa 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35219@70.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@71.conf index ca77937227..ca77937227 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@71.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@72.conf index 7b6b356a44..7b6b356a44 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@72.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35219@70.conf index 5e0c63d340..5e0c63d340 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35219@70.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@71.conf index 836eef63bd..836eef63bd 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@71.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@72.conf index 213f648457..213f648457 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@72.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@48.conf index a96bb93a80..a96bb93a80 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@48.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@4a.conf index 188898b364..188898b364 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@4a.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/bmp280@77.conf index cdf8b47269..cdf8b47269 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/bmp280@77.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/dps310@76.conf index cdf8b47269..cdf8b47269 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/dps310@76.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/max31785@52.conf index d3df21599d..f10532f981 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/max31785@52.conf @@ -1,17 +1,25 @@ LABEL_fan1 = "fan0_0" +MAXVALUE_fan1 = "10500" LABEL_fan2 = "fan1_0" +MAXVALUE_fan2 = "10500" LABEL_fan3 = "fan2_0" +MAXVALUE_fan3 = "10500" LABEL_fan4 = "fan3_0" +MAXVALUE_fan4 = "10500" LABEL_fan5 = "fan0_1" +MAXVALUE_fan5 = "10500" LABEL_fan6 = "fan1_1" +MAXVALUE_fan6 = "10500" LABEL_fan7 = "fan2_1" +MAXVALUE_fan7 = "10500" LABEL_fan8 = "fan3_1" +MAXVALUE_fan8 = "10500" TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@68.conf index e463b517cc..e463b517cc 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@68.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@69.conf index 2fadbdec08..2fadbdec08 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@69.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@70.conf index c5344aeb6c..c5344aeb6c 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@70.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@71.conf index 23746aa112..23746aa112 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@71.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@70.conf index e7d8aaf232..e7d8aaf232 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@70.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@71.conf index 30ec05dbbb..30ec05dbbb 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@71.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@500/tmp275@4a.conf index 3af092867d..3af092867d 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@500/tmp275@4a.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/bmp280@77.conf index cdf8b47269..cdf8b47269 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/bmp280@77.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/dps310@76.conf index cdf8b47269..cdf8b47269 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/dps310@76.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf index d3df21599d..f10532f981 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf @@ -1,17 +1,25 @@ LABEL_fan1 = "fan0_0" +MAXVALUE_fan1 = "10500" LABEL_fan2 = "fan1_0" +MAXVALUE_fan2 = "10500" LABEL_fan3 = "fan2_0" +MAXVALUE_fan3 = "10500" LABEL_fan4 = "fan3_0" +MAXVALUE_fan4 = "10500" LABEL_fan5 = "fan0_1" +MAXVALUE_fan5 = "10500" LABEL_fan6 = "fan1_1" +MAXVALUE_fan6 = "10500" LABEL_fan7 = "fan2_1" +MAXVALUE_fan7 = "10500" LABEL_fan8 = "fan3_1" +MAXVALUE_fan8 = "10500" TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf index e463b517cc..e463b517cc 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf index 2fadbdec08..2fadbdec08 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@70.conf index c5344aeb6c..c5344aeb6c 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@70.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@71.conf index 23746aa112..23746aa112 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@71.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@70.conf index e7d8aaf232..e7d8aaf232 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@70.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@71.conf index 30ec05dbbb..30ec05dbbb 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@71.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/tmp275@4a.conf index 3af092867d..3af092867d 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/tmp275@4a.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index ebde5574f4..f86367aad8 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -5,45 +5,45 @@ SRC_URI:append:ibm-ac-server = " \ " CHIPS:witherspoon = " \ - bus@1e78a000/i2c-bus@100/max31785@52 \ - bus@1e78a000/i2c-bus@100/power-supply@68 \ - bus@1e78a000/i2c-bus@100/power-supply@69 \ - bus@1e78a000/i2c-bus@100/bmp280@77 \ - bus@1e78a000/i2c-bus@100/dps310@76 \ - bus@1e78a000/i2c-bus@140/ir35221@70 \ - bus@1e78a000/i2c-bus@140/ir35221@71 \ - bus@1e78a000/i2c-bus@180/ir35221@70 \ - bus@1e78a000/i2c-bus@180/ir35221@71 \ - bus@1e78a000/i2c-bus@380/tmp275@4a \ + bus@1e78a000/i2c@100/max31785@52 \ + bus@1e78a000/i2c@100/power-supply@68 \ + bus@1e78a000/i2c@100/power-supply@69 \ + bus@1e78a000/i2c@100/bmp280@77 \ + bus@1e78a000/i2c@100/dps310@76 \ + bus@1e78a000/i2c@140/ir35221@70 \ + bus@1e78a000/i2c@140/ir35221@71 \ + bus@1e78a000/i2c@180/ir35221@70 \ + bus@1e78a000/i2c@180/ir35221@71 \ + bus@1e78a000/i2c@380/tmp275@4a \ " CHIPS:witherspoon-tacoma = " \ - bus@1e78a000/i2c-bus@200/max31785@52 \ - bus@1e78a000/i2c-bus@200/power-supply@68 \ - bus@1e78a000/i2c-bus@200/power-supply@69 \ - bus@1e78a000/i2c-bus@200/bmp280@77 \ - bus@1e78a000/i2c-bus@200/dps310@76 \ - bus@1e78a000/i2c-bus@280/ir35221@70 \ - bus@1e78a000/i2c-bus@280/ir35221@71 \ - bus@1e78a000/i2c-bus@300/ir35221@70 \ - bus@1e78a000/i2c-bus@300/ir35221@71 \ - bus@1e78a000/i2c-bus@500/tmp275@4a \ + bus@1e78a000/i2c@200/max31785@52 \ + bus@1e78a000/i2c@200/power-supply@68 \ + bus@1e78a000/i2c@200/power-supply@69 \ + bus@1e78a000/i2c@200/bmp280@77 \ + bus@1e78a000/i2c@200/dps310@76 \ + bus@1e78a000/i2c@280/ir35221@70 \ + bus@1e78a000/i2c@280/ir35221@71 \ + bus@1e78a000/i2c@300/ir35221@70 \ + bus@1e78a000/i2c@300/ir35221@71 \ + bus@1e78a000/i2c@500/tmp275@4a \ " CHIPS:p10bmc = " \ - bus@1e78a000/i2c-bus@200/power-supply@68 \ - bus@1e78a000/i2c-bus@200/power-supply@69 \ - bus@1e78a000/i2c-bus@200/power-supply@6a \ - bus@1e78a000/i2c-bus@200/power-supply@6d \ - bus@1e78a000/i2c-bus@200/power-supply@6b \ - bus@1e78a000/i2c-bus@200/power-supply@5a \ - bus@1e78a000/i2c-bus@200/power-supply@5b \ - bus@1e78a000/i2c-bus@400/max31785@52 \ - bus@1e78a000/i2c-bus@400/max31785b@52 \ - bus@1e78a000/i2c-bus@780/i2c-mux@70/i2c@3/max31785@52 \ + 1e78a200.i2c/i2c-3/3-0068 \ + 1e78a200.i2c/i2c-3/3-0069 \ + 1e78a200.i2c/i2c-3/3-006a \ + 1e78a200.i2c/i2c-3/3-006d \ + 1e78a200.i2c/i2c-3/3-006b \ + 1e78a200.i2c/i2c-3/3-005a \ + 1e78a200.i2c/i2c-3/3-005b \ + 1e78a400.i2c/i2c-7/7-0052 \ + 1e78a780.i2c/i2c-14/i2c-30/30-0052 \ " -ITEMSFMT = "ahb/apb/{0}.conf" +ITEMSFMT = "ahb/apb@1e780000/{0}.conf" +ITEMSFMT:p10bmc = "devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" OCCS = " \ @@ -63,3 +63,4 @@ PACKAGECONFIG:append:ibm-ac-server = " max31785-msl" SYSTEMD_ENVIRONMENT_FILE:max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" SYSTEMD_LINK:max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" +PACKAGECONFIG:append:p10bmc = " use-dev-path" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/sbp1/virtual_sensor_config.json b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/sbp1/virtual_sensor_config.json index 4386501424..c33a0eb2fd 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/sbp1/virtual_sensor_config.json +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/sbp1/virtual_sensor_config.json @@ -21,34 +21,13 @@ { "ParamName": "P0", "Desc": { - "Name": "BCM0_Input_Power", - "SensorType": "power" - } - }, - { - "ParamName": "P1", - "Desc": { - "Name": "BCM1_Input_Power", - "SensorType": "power" - } - }, - { - "ParamName": "P2", - "Desc": { - "Name": "BCM2_Input_Power", - "SensorType": "power" - } - }, - { - "ParamName": "P3", - "Desc": { - "Name": "BCM3_Input_Power", + "Name": "P380V_INPUT_POWER_TOTAL", "SensorType": "power" } } ] }, - "Expression": "sumIgnoreNaN(P0, P1, P2, P3)" + "Expression": "P0" }, { "Desc": { @@ -437,5 +416,4346 @@ ] }, "Expression": "ifNan(P0 / (V0 * 0.9), 0)" + }, + { + "Desc": { + "Name": "PVCORE_NIC1_Input_Current", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "PVCORE_NIC1_Output_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "PVCORE_NIC1_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "PVCORE_NIC1_Input_Voltage", + "SensorType": "voltage" + } + } + ], + "ConstParam": [ + { + "ParamName": "O", + "Value": 0.35 + }, + { + "ParamName": "R", + "Value": 0.0041 + } + ] + }, + "Expression": "(P3 > 0) ? ((O + P1 + R * P2 * P2) / P3) : 0" + }, + { + "Desc": { + "Name": "PVCORE_NIC2_Input_Current", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "PVCORE_NIC2_Output_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "PVCORE_NIC2_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "PVCORE_NIC2_Input_Voltage", + "SensorType": "voltage" + } + } + ], + "ConstParam": [ + { + "ParamName": "O", + "Value": 0.35 + }, + { + "ParamName": "R", + "Value": 0.0041 + } + ] + }, + "Expression": "(P3 > 0) ? ((O + P1 + R * P2 * P2) / P3) : 0" + }, + { + "Desc": { + "Name": "P1V2_NIC_Input_Current", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "P1V2_NIC_Output_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "P1V2_NIC_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "P1V2_NIC_Input_Voltage", + "SensorType": "voltage" + } + } + ], + "ConstParam": [ + { + "ParamName": "O", + "Value": 0.44 + }, + { + "ParamName": "R", + "Value": 0.0045 + } + ] + }, + "Expression": "(P3 > 0) ? ((O + P1 + R * P2 * P2) / P3) : 0" + }, + { + "Desc": { + "Name": "P1V8_NIC_Input_Current", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "P1V8_NIC_Output_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "P1V8_NIC_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "P1V8_NIC_Input_Voltage", + "SensorType": "voltage" + } + } + ], + "ConstParam": [ + { + "ParamName": "O", + "Value": 0.66 + }, + { + "ParamName": "R", + "Value": 0.00505 + } + ] + }, + "Expression": "(P3 > 0) ? ((O + P1 + R * P2 * P2) / P3) : 0" + }, + { + "Desc": { + "Name": "P3V3_NIC_Input_Current", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "P3V3_NIC_Output_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "P3V3_NIC_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "P3V3_NIC_Input_Voltage", + "SensorType": "voltage" + } + } + ], + "ConstParam": [ + { + "ParamName": "O", + "Value": 0.90 + }, + { + "ParamName": "R", + "Value": 0.00675 + } + ] + }, + "Expression": "(P3 > 0) ? ((O + P1 + R * P2 * P2) / P3) : 0" + }, + { + "Desc": { + "Name": "P5V_AUX_Input_Current", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "P5V_AUX_Output_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "P5V_AUX_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "P5V_AUX_Input_Voltage", + "SensorType": "voltage" + } + } + ], + "ConstParam": [ + { + "ParamName": "O", + "Value": 1.25 + }, + { + "ParamName": "R", + "Value": 0.0079 + } + ] + }, + "Expression": "(P3 > 0) ? ((O + P1 + R * P2 * P2) / P3) : 0" + }, + { + "Desc": { + "Name": "P3V3_AUX_Input_Current", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "P3V3_AUX_Output_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "P3V3_AUX_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "P3V3_AUX_Input_Voltage", + "SensorType": "voltage" + } + } + ], + "ConstParam": [ + { + "ParamName": "O", + "Value": 0.90 + }, + { + "ParamName": "R", + "Value": 0.00675 + } + ] + }, + "Expression": "(P3 > 0) ? ((O + P1 + R * P2 * P2) / P3) : 0" + }, + { + "Desc": { + "Name": "P1V8_PCH_AUX_Input_Current", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "P1V8_PCH_AUX_Output_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "P1V8_PCH_AUX_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "P1V8_PCH_AUX_Input_Voltage", + "SensorType": "voltage" + } + } + ], + "ConstParam": [ + { + "ParamName": "O", + "Value": 0.40 + }, + { + "ParamName": "R", + "Value": 0.022 + } + ] + }, + "Expression": "(P3 > 0) ? ((O + P1 + R * P2 * P2) / P3) : 0" + }, + { + "Desc": { + "Name": "P1V05_PCH_AUX_Input_Current", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "P1V05_PCH_AUX_Output_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "P1V05_PCH_AUX_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "P1V05_PCH_AUX_Input_Voltage", + "SensorType": "voltage" + } + } + ], + "ConstParam": [ + { + "ParamName": "O", + "Value": 0.40 + }, + { + "ParamName": "R", + "Value": 0.0042 + } + ] + }, + "Expression": "(P3 > 0) ? ((O + P1 + R * P2 * P2) / P3) : 0" + }, + { + "Desc": { + "Name": "P12V_CURRENT_CPUs", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "PVCCINFAON_PVCCFA_EHV_CPU0_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "PVCCINFAON_PVCCFA_EHV_CPU1_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "PVCCINFAON_PVCCFA_EHV_CPU2_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "PVCCINFAON_PVCCFA_EHV_CPU3_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P4", + "Desc": { + "Name": "PVCCIN_PVCCFA_EHV_FIVRA_CPU0_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P5", + "Desc": { + "Name": "PVCCIN_PVCCFA_EHV_FIVRA_CPU0_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P6", + "Desc": { + "Name": "PVCCIN_PVCCFA_EHV_FIVRA_CPU0_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P7", + "Desc": { + "Name": "PVCCIN_PVCCFA_EHV_FIVRA_CPU0_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P8", + "Desc": { + "Name": "PVNN_MAIN_CPU0_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P9", + "Desc": { + "Name": "PVNN_MAIN_CPU1_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P10", + "Desc": { + "Name": "PVNN_MAIN_CPU2_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P11", + "Desc": { + "Name": "PVNN_MAIN_CPU3_Input_Current", + "SensorType": "current" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11)" + }, + { + "Desc": { + "Name": "P12V_POWER_CPUs", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "P12V_CURRENT_CPUs", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "P12V", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "P12V_CURRENT_DIMMs", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "CPU0_DIMM_12V_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "CPU1_DIMM_12V_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "CPU2_DIMM_12V_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "CPU3_DIMM_12V_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P4", + "Desc": { + "Name": "PVCCD_HV_CPU0_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P5", + "Desc": { + "Name": "PVCCD_HV_CPU1_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P6", + "Desc": { + "Name": "PVCCD_HV_CPU2_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P7", + "Desc": { + "Name": "PVCCD_HV_CPU3_Input_Current", + "SensorType": "current" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0, P1, P2, P3, P4, P5, P6, P7)" + }, + { + "Desc": { + "Name": "P12V_POWER_DIMMs", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "P12V_CURRENT_DIMMs", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "P12V", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "P12V_CURRENT_FANs", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN1_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_FAN2_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_FAN3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P4", + "Desc": { + "Name": "SSB_FAN4_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P5", + "Desc": { + "Name": "SSB_FAN5_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P6", + "Desc": { + "Name": "SSB_FAN6_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P7", + "Desc": { + "Name": "SSB_FAN7_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P8", + "Desc": { + "Name": "SSB_FAN8_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P9", + "Desc": { + "Name": "SSB_FAN9_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P10", + "Desc": { + "Name": "SSB_FAN10_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P11", + "Desc": { + "Name": "SSB_FAN11_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P12", + "Desc": { + "Name": "SSB_FAN12_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P13", + "Desc": { + "Name": "SSB_FAN13_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P14", + "Desc": { + "Name": "SSB_FAN14_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P15", + "Desc": { + "Name": "SSB_FAN15_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P16", + "Desc": { + "Name": "SSB_FAN16_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P17", + "Desc": { + "Name": "SSB_FAN17_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P18", + "Desc": { + "Name": "SSB_FAN18_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P19", + "Desc": { + "Name": "SSB_FAN19_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P20", + "Desc": { + "Name": "SSB_FAN20_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P21", + "Desc": { + "Name": "SSB_FAN21_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P22", + "Desc": { + "Name": "SSB_FAN22_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P23", + "Desc": { + "Name": "SSB_FAN23_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P24", + "Desc": { + "Name": "SSB_FAN24_Output_Current", + "SensorType": "current" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22, P23, P24)" + }, + { + "Desc": { + "Name": "P12V_POWER_FANs", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "P12V_CURRENT_FANs", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "P12V", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "P12V_CURRENT_RSSDs", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD01_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD02_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD03_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P4", + "Desc": { + "Name": "SSB_RSSD04_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P5", + "Desc": { + "Name": "SSB_RSSD05_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P6", + "Desc": { + "Name": "SSB_RSSD06_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P7", + "Desc": { + "Name": "SSB_RSSD07_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P8", + "Desc": { + "Name": "SSB_RSSD08_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P9", + "Desc": { + "Name": "SSB_RSSD09_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P10", + "Desc": { + "Name": "SSB_RSSD10_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P11", + "Desc": { + "Name": "SSB_RSSD11_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P12", + "Desc": { + "Name": "SSB_RSSD12_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P13", + "Desc": { + "Name": "SSB_RSSD13_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P14", + "Desc": { + "Name": "SSB_RSSD14_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P15", + "Desc": { + "Name": "SSB_RSSD15_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P16", + "Desc": { + "Name": "SSB_RSSD16_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P17", + "Desc": { + "Name": "SSB_RSSD17_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P18", + "Desc": { + "Name": "SSB_RSSD18_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P19", + "Desc": { + "Name": "SSB_RSSD19_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P20", + "Desc": { + "Name": "SSB_RSSD20_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P21", + "Desc": { + "Name": "SSB_RSSD21_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P22", + "Desc": { + "Name": "SSB_RSSD22_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P23", + "Desc": { + "Name": "SSB_RSSD23_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P24", + "Desc": { + "Name": "SSB_RSSD24_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P25", + "Desc": { + "Name": "SSB_RSSD25_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P26", + "Desc": { + "Name": "SSB_RSSD26_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P27", + "Desc": { + "Name": "SSB_RSSD27_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P28", + "Desc": { + "Name": "SSB_RSSD28_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P29", + "Desc": { + "Name": "SSB_RSSD29_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P30", + "Desc": { + "Name": "SSB_RSSD30_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P31", + "Desc": { + "Name": "SSB_RSSD31_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P32", + "Desc": { + "Name": "SSB_RSSD32_P12V_Output_Current", + "SensorType": "current" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22, P23, P24, P25, P26, P27, P28, P29, P30, P31, P32)" + }, + { + "Desc": { + "Name": "P12V_POWER_RSSDs", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "P12V_CURRENT_RSSDs", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "P12V", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "P12V_CURRENT_AUX", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "P1V05_PCH_AUX_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "P3V3_AUX_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "P5V_AUX_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "P1V8_PCH_AUX_Input_Current", + "SensorType": "current" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0, P1, P2, P3)" + }, + { + "Desc": { + "Name": "P12V_POWER_AUX", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "P12V_CURRENT_AUX", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "P12V", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "P12V_CURRENT_NICs", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "P1V2_NIC_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "P1V8_NIC_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "P3V3_NIC_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "PVCORE_NIC1_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P4", + "Desc": { + "Name": "PVCORE_NIC2_Input_Current", + "SensorType": "current" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0, P1, P2, P3, P4)" + }, + { + "Desc": { + "Name": "P12V_POWER_NICs", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "P12V_CURRENT_NICs", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "P12V", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "P12V_POWER_TOTAL", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "P12V_POWER_AUX", + "SensorType": "power" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "P12V_POWER_CPUs", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "P12V_POWER_DIMMs", + "SensorType": "power" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "P12V_POWER_RSSDs", + "SensorType": "power" + } + }, + { + "ParamName": "P4", + "Desc": { + "Name": "P12V_POWER_FANs", + "SensorType": "power" + } + }, + { + "ParamName": "P5", + "Desc": { + "Name": "P12V_POWER_NICs", + "SensorType": "power" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0, P1, P2, P3, P4, P5)" + }, + { + "Desc": { + "Name": "P12V_CURRENT_TOTAL", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "P12V_CURRENT_NICs", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "P12V_CURRENT_AUX", + "SensorType": "current" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "P12V_CURRENT_RSSDs", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "P12V_CURRENT_FANs", + "SensorType": "current" + } + }, + { + "ParamName": "P4", + "Desc": { + "Name": "P12V_CURRENT_CPUs", + "SensorType": "current" + } + }, + { + "ParamName": "P5", + "Desc": { + "Name": "P12V_CURRENT_DIMMs", + "SensorType": "current" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0, P1, P2, P3, P4, P5)" + }, + { + "Desc": { + "Name": "P380V_INPUT_POWER_TOTAL", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "BCM0_Input_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "BCM1_Input_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "BCM2_Input_Power", + "SensorType": "power" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "BCM3_Input_Power", + "SensorType": "power" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0, P1, P2, P3)" + }, + { + "Desc": { + "Name": "P380V_INPUT_CURRENT_TOTAL", + "SensorType": "current" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "BCM0_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "BCM1_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "BCM2_Input_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "BCM3_Input_Current", + "SensorType": "current" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0, P1, P2, P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD01_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD01_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD01_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD01_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD01_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD02_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD02_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD02_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD02_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD02_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD03_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD03_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD03_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD03_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD03_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD04_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD04_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD04_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD04_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD04_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD05_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD05_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD05_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD05_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD05_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD06_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD06_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD06_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD06_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD06_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD07_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD07_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD07_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD07_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD07_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD08_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD08_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD08_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD08_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD08_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD09_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD09_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD09_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD09_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD09_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD10_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD10_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD10_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD10_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD10_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD11_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD11_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD11_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD11_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD11_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD12_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD12_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD12_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD12_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD12_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD13_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD13_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD13_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD13_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD13_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD14_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD14_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD14_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD14_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD14_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD15_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD15_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD15_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD15_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD15_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD16_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD16_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD16_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD16_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD16_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD17_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD17_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD17_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD17_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD17_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD18_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD18_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD18_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD18_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD18_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD19_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD19_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD19_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD19_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD19_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD20_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD20_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD20_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD20_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD20_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD21_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD21_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD21_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD21_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD21_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD22_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD22_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD22_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD22_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD22_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD23_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD23_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD23_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD23_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD23_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD24_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD24_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD24_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD24_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD24_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD25_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD25_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD25_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD25_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD25_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD26_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD26_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD26_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD26_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD26_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD27_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD27_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD27_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD27_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD27_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD28_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD28_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD28_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD28_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD28_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD29_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD29_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD29_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD29_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD29_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD30_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD30_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD30_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD30_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD30_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD31_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD31_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD31_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD31_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD31_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_RSSD32_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_RSSD32_P12V_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_RSSD32_P12V_Output_Voltage", + "SensorType": "voltage" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "SSB_RSSD32_P3V3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "SSB_RSSD32_P3V3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "sumIgnoreNaN(P0 * P1, P2 * P3)" + }, + { + "Desc": { + "Name": "SSB_FAN1_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN1_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN1_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN2_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN2_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN2_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN3_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN3_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN3_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN4_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN4_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN4_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN5_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN5_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN5_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN6_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN6_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN6_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN7_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN7_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN7_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN8_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN8_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN8_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN9_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN9_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN9_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN10_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN10_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN10_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN11_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN11_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN11_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN12_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN12_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN12_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN13_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN13_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN13_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN14_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN14_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN14_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN15_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN15_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN15_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN16_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN16_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN16_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN17_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN17_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN17_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN18_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN18_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN18_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN19_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN19_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN19_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN20_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN20_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN20_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN21_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN21_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN21_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN22_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN22_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN22_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN23_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN23_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN23_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_FAN24_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_FAN24_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_FAN24_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_SSD1_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_SSD1_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_SSD1_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_SSD2_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_SSD2_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_SSD2_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_AUX_P3V3_PCH_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_AUX_P3V3_PCH_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_AUX_P3V3_PCH_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" + }, + { + "Desc": { + "Name": "SSB_AUX_PVDRV_Output_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/IBM_SBP1_Baseboard" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P0", + "Desc": { + "Name": "SSB_AUX_PVDRV_Output_Current", + "SensorType": "current" + } + }, + { + "ParamName": "P1", + "Desc": { + "Name": "SSB_AUX_PVDRV_Output_Voltage", + "SensorType": "voltage" + } + } + ] + }, + "Expression": "P0 * P1" } ] diff --git a/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/system1/gpio_defs.json b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/system1/gpio_defs.json index ef09c7540d..1da7674314 100644 --- a/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/system1/gpio_defs.json +++ b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/system1/gpio_defs.json @@ -20,6 +20,11 @@ "name": "POWER_BUTTON", "pin": "X6", "direction": "in" + }, + { + "name": "RESET_BUTTON", + "pin": "F0", + "direction": "in" } ] } diff --git a/meta-ibm/recipes-support/chrony/chrony/huygens/chrony.conf b/meta-ibm/recipes-support/chrony/chrony/huygens/chrony.conf new file mode 100644 index 0000000000..4d93116ce9 --- /dev/null +++ b/meta-ibm/recipes-support/chrony/chrony/huygens/chrony.conf @@ -0,0 +1,44 @@ +# Load config files matching the /etc/chrony/conf.d/*.conf pattern. +confdir /etc/chrony/conf.d + +# Use a local timeserver in preference to the pool, if it's reachable. +server master iburst + +# Sync to pulse-per-second from an onboard GPS. +#refclock PPS /dev/pps0 poll 0 prefer +# You'll want to enable CONFIG_PPS and CONFIG_PPS_CLIENT_GPIO in your kernel, +# and an entry something like this in your device tree: +# pps { +# compatible = "pps-gpio"; +# gpios = <&ps7_gpio_0 56 0>; +# }; + +# Load source files matching the /etc/chrony/sources.d/*.sources pattern. +# These can be reloaded using 'chronyc reload sources'. +sourcedir /etc/chrony/sources.d + +# In first three updates step the system clock instead of slew +# if the adjustment is larger than 1 second. +makestep 1.0 3 + +# Record the rate at which the system clock gains/loses time, +# improving accuracy after reboot +driftfile /var/lib/chrony/drift + +# Allow NTP client access from local network. +# This value can be changed based on the IP address range of the redundant BMCs. +allow 10 + +# Serve time even if not synchronized to any NTP server. +local stratum 8 + +# Specify directory for log files. +logdir /var/log/chrony + +# Enable clients to make it easier to track it and keep their clocks close +# together even when large offset or frequency corrections are applied to +# the server’s clock. +smoothtime 20 0.01 + +# Select which information is logged. +#log measurements statistics tracking diff --git a/meta-ibm/recipes-support/chrony/chrony/huygens/chronyd.service b/meta-ibm/recipes-support/chrony/chrony/huygens/chronyd.service new file mode 100644 index 0000000000..1dd23d4168 --- /dev/null +++ b/meta-ibm/recipes-support/chrony/chrony/huygens/chronyd.service @@ -0,0 +1,48 @@ +[Unit] +Description=NTP client/server +Documentation=man:chronyd(8) man:chrony.conf(5) +After=ntpdate.service sntp.service ntpd.service +Conflicts=ntpd.service +ConditionCapability=CAP_SYS_TIME + +[Service] +Type=forking +PIDFile=/run/chrony/chronyd.pid +EnvironmentFile=-/etc/default/chronyd +ExecStart=/usr/sbin/chronyd $OPTIONS + +CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE +CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_KILL CAP_LEASE CAP_LINUX_IMMUTABLE +CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_MKNOD CAP_SYS_ADMIN +CapabilityBoundingSet=~CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_PACCT +CapabilityBoundingSet=~CAP_SYS_PTRACE CAP_SYS_RAWIO CAP_SYS_TTY_CONFIG CAP_WAKE_ALARM +DeviceAllow=char-pps rw +DeviceAllow=char-ptp rw +DeviceAllow=char-rtc rw +DevicePolicy=closed +LockPersonality=yes +MemoryDenyWriteExecute=yes +NoNewPrivileges=yes +PrivateTmp=yes +ProtectControlGroups=yes +ProtectHome=yes +ProtectHostname=yes +ProtectKernelLogs=yes +ProtectKernelModules=yes +ProtectKernelTunables=yes +ProtectProc=invisible +ProtectSystem=strict +ReadWritePaths=/run /var/lib/chrony -/var/log +RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +RestrictNamespaces=yes +RestrictSUIDSGID=yes +SystemCallArchitectures=native +SystemCallFilter=~@cpu-emulation @debug @module @mount @obsolete @raw-io @reboot @swap + +# Adjust restrictions for /usr/sbin/sendmail (mailonchange directive) +NoNewPrivileges=no +ReadWritePaths=-/var/spool +RestrictAddressFamilies=AF_NETLINK + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/recipes-support/chrony/chrony_%.bbappend b/meta-ibm/recipes-support/chrony/chrony_%.bbappend new file mode 100644 index 0000000000..1e8851169a --- /dev/null +++ b/meta-ibm/recipes-support/chrony/chrony_%.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/chrony:" + +install_chrony_configuration() { + install -D -m 0644 ${WORKDIR}/chronyd.service ${D}${systemd_system_unitdir}/chronyd.service + install -m 644 -D ${WORKDIR}/chrony.conf ${D}${sysconfdir}/chrony.conf +} + +SRC_URI:append:df-chrony = " file://chronyd.service" +SRC_URI:append:df-chrony = " file://chrony.conf" +do_install:append:huygens() { + install_chrony_configuration +} diff --git a/meta-ieisystems/COPYING.MIT b/meta-ieisystem/COPYING.MIT index 89de354795..89de354795 100644 --- a/meta-ieisystems/COPYING.MIT +++ b/meta-ieisystem/COPYING.MIT diff --git a/meta-ieisystems/COPYING.apache-2.0 b/meta-ieisystem/COPYING.apache-2.0 index 67db858821..67db858821 100644 --- a/meta-ieisystems/COPYING.apache-2.0 +++ b/meta-ieisystem/COPYING.apache-2.0 diff --git a/meta-ieisystems/LICENSE b/meta-ieisystem/LICENSE index 1dab391387..b9d4f1e640 100644 --- a/meta-ieisystems/LICENSE +++ b/meta-ieisystem/LICENSE @@ -1,4 +1,4 @@ -Different components of meta-ieisystems are under different licenses +Different components of meta-ieisystem are under different licenses (a mix of MIT and Apache-2.0). Please see: COPYING.Apache-2.0 diff --git a/meta-ieisystems/OWNERS b/meta-ieisystem/OWNERS index 2df0440475..2df0440475 100644 --- a/meta-ieisystems/OWNERS +++ b/meta-ieisystem/OWNERS diff --git a/meta-ieisystem/conf/layer.conf b/meta-ieisystem/conf/layer.conf new file mode 100644 index 0000000000..1771003e5e --- /dev/null +++ b/meta-ieisystem/conf/layer.conf @@ -0,0 +1,10 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "ieisystem-layer" +BBFILE_PATTERN_ieisystem-layer = "^${LAYERDIR}/" +LAYERSERIES_COMPAT_ieisystem-layer = "nanbield scarthgap" diff --git a/meta-ieisystem/conf/machine/include/ieisystem.inc b/meta-ieisystem/conf/machine/include/ieisystem.inc new file mode 100644 index 0000000000..627aab0893 --- /dev/null +++ b/meta-ieisystem/conf/machine/include/ieisystem.inc @@ -0,0 +1 @@ +VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors" diff --git a/meta-ieisystems/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf b/meta-ieisystem/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf index 2570a9a199..2570a9a199 100644 --- a/meta-ieisystems/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf +++ b/meta-ieisystem/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf diff --git a/meta-ieisystems/meta-fp5280g3/conf/layer.conf b/meta-ieisystem/meta-fp5280g3/conf/layer.conf index 057258b0c0..057258b0c0 100644 --- a/meta-ieisystems/meta-fp5280g3/conf/layer.conf +++ b/meta-ieisystem/meta-fp5280g3/conf/layer.conf diff --git a/meta-ieisystems/meta-fp5280g3/conf/machine/fp5280g3.conf b/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf index 0e81ea0553..555a6484c8 100644 --- a/meta-ieisystems/meta-fp5280g3/conf/machine/fp5280g3.conf +++ b/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf @@ -1,15 +1,16 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = " \ - aspeed/${KMACHINE}-bmc-ieisystems-${MACHINE}.dtb \ + aspeed/${KMACHINE}-bmc-ieisystem-${MACHINE}.dtb \ " UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig" UBOOT_DEVICETREE = "ast2600-evb" -#UBOOT_DEVICETREE = "ast2600-ieisystems-fp5280g3" +#UBOOT_DEVICETREE = "ast2600-ieisystem-fp5280g3" SPL_BINARY = "spl/u-boot-spl.bin" require conf/distro/include/phosphor-mmc.inc require conf/machine/include/ast2600.inc +require conf/machine/include/ieisystem.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/distro/include/pldm.inc diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/bblayers.conf.sample b/meta-ieisystem/meta-fp5280g3/conf/templates/default/bblayers.conf.sample index 8b2699e383..d8485a5c17 100644 --- a/meta-ieisystems/meta-fp5280g3/conf/templates/default/bblayers.conf.sample +++ b/meta-ieisystem/meta-fp5280g3/conf/templates/default/bblayers.conf.sample @@ -14,6 +14,6 @@ BBLAYERS ?= " \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ieisystems \ - ##OEROOT##/meta-ieisystems/meta-fp5280g3 \ + ##OEROOT##/meta-ieisystem \ + ##OEROOT##/meta-ieisystem/meta-fp5280g3 \ " diff --git a/meta-ieisystem/meta-fp5280g3/conf/templates/default/conf-notes.txt b/meta-ieisystem/meta-fp5280g3/conf/templates/default/conf-notes.txt new file mode 100644 index 0000000000..9b3c01a556 --- /dev/null +++ b/meta-ieisystem/meta-fp5280g3/conf/templates/default/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/local.conf.sample b/meta-ieisystem/meta-fp5280g3/conf/templates/default/local.conf.sample index 279569a9be..279569a9be 100644 --- a/meta-ieisystems/meta-fp5280g3/conf/templates/default/local.conf.sample +++ b/meta-ieisystem/meta-fp5280g3/conf/templates/default/local.conf.sample diff --git a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg index 6c3da1a91b..6c3da1a91b 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg +++ b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg diff --git a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend index 41a58934ce..41a58934ce 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb index cc872bd2de..cc872bd2de 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml index 8da9acad79..8da9acad79 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml index 745095e197..745095e197 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml index 4878d52977..4878d52977 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml index cfc14d02d7..cfc14d02d7 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb index 9dd7181d83..9dd7181d83 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml index 88b781911b..88b781911b 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend index bf8e2bf5a0..bf8e2bf5a0 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 6689276c69..6689276c69 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend index cdeb23680e..cdeb23680e 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 1b6c91265f..1b6c91265f 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json index e77a553638..e77a553638 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json index 36d9babdb3..36d9babdb3 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json index eb5bc2a2ec..eb5bc2a2ec 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index f5a790801d..f5a790801d 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index d06de11c26..d06de11c26 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json index f60fb6e161..f60fb6e161 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index a4a9551732..a4a9551732 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp index 6bf4409c78..6bf4409c78 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf index 04c1245801..04c1245801 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend index 92b8546806..92b8546806 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend index 6fc8a98fe7..6fc8a98fe7 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend index 8b6248a461..8b6248a461 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend index 136847d442..136847d442 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index e0bd907a4d..e622f7efd7 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -6,16 +6,8 @@ RDEPENDS:${PN}-inventory:append = " \ " RDEPENDS:${PN}-extras:append = " \ - dbus-sensors \ srvcfg-manager \ biosconfig-manager \ phosphor-host-postd \ - phosphor-virtual-sensor \ libmctp \ - tzdata-core \ - iei-ipmi-oem \ - " - -RDEPENDS:${PN}-devtools:append = " \ - ipmitool \ " diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend index 0eb993d305..0eb993d305 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend diff --git a/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/dbus-sensors_%.bbappend new file mode 100644 index 0000000000..71dd783fd2 --- /dev/null +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -0,0 +1,8 @@ +PACKAGECONFIG = " \ + adcsensor \ + fansensor \ + hwmontempsensor \ + nvmesensor \ + psusensor \ + " + diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json index e790c639ad..e790c639ad 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 9bfbdcb934..9bfbdcb934 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml index c1dd14ba85..c1dd14ba85 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index e603990c2f..e603990c2f 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend diff --git a/meta-ieisystems/meta-nf5280m7/conf/layer.conf b/meta-ieisystem/meta-nf5280m7/conf/layer.conf index f0f36da335..f0f36da335 100644 --- a/meta-ieisystems/meta-nf5280m7/conf/layer.conf +++ b/meta-ieisystem/meta-nf5280m7/conf/layer.conf diff --git a/meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf b/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf index 2f020adde1..45799c2e6b 100644 --- a/meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf +++ b/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf @@ -1,12 +1,12 @@ # Add a device tree for nf5280m7 KMACHINE = "aspeed" KERNEL_DEVICETREE = " \ - aspeed/${KMACHINE}-bmc-ieisystems-${MACHINE}.dtb \ + aspeed/${KMACHINE}-bmc-ieisystem-${MACHINE}.dtb \ " UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" UBOOT_DEVICETREE = "ast2600-evb" -# UBOOT_DEVICETREE = "${UMACHINE}-ieisystems-${MACHINE}" +# UBOOT_DEVICETREE = "${UMACHINE}-ieisystem-${MACHINE}" SPL_BINARY = "spl/u-boot-spl.bin" require conf/machine/include/ast2600.inc @@ -15,3 +15,8 @@ require conf/machine/include/obmc-bsp-common.inc FLASH_SIZE = "65536" SOCSEC_SIGN_ENABLE = "0" + +require conf/machine/include/ieisystem.inc + +VIRTUAL-RUNTIME_obmc-inventory-manager ?= "entity-manager" + diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample b/meta-ieisystem/meta-nf5280m7/conf/templates/default/bblayers.conf.sample index 6297743d11..46100128ed 100644 --- a/meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample +++ b/meta-ieisystem/meta-nf5280m7/conf/templates/default/bblayers.conf.sample @@ -14,7 +14,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-ieisystems \ - ##OEROOT##/meta-ieisystems/meta-nf5280m7 \ + ##OEROOT##/meta-ieisystem \ + ##OEROOT##/meta-ieisystem/meta-nf5280m7 \ " diff --git a/meta-ieisystem/meta-nf5280m7/conf/templates/default/conf-notes.txt b/meta-ieisystem/meta-nf5280m7/conf/templates/default/conf-notes.txt new file mode 100644 index 0000000000..9b3c01a556 --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/conf/templates/default/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/local.conf.sample b/meta-ieisystem/meta-nf5280m7/conf/templates/default/local.conf.sample index 033b6bbde2..033b6bbde2 100644 --- a/meta-ieisystems/meta-nf5280m7/conf/templates/default/local.conf.sample +++ b/meta-ieisystem/meta-nf5280m7/conf/templates/default/local.conf.sample diff --git a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg index e1299422a2..e1299422a2 100644 --- a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg +++ b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg diff --git a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend index 6a0c70228b..6a0c70228b 100644 --- a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb new file mode 100644 index 0000000000..bde5908e62 --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb @@ -0,0 +1,37 @@ +SUMMARY = "YAML configuration for NF5280M7" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch + +SRC_URI = " \ + file://nf5280m7-ipmi-fru.yaml \ + file://nf5280m7-ipmi-fru-properties.yaml \ + file://nf5280m7-ipmi-inventory-sensors.yaml \ + file://nf5280m7-ipmi-sensors.yaml \ + " + +S = "${WORKDIR}" + +do_install() { + cat nf5280m7-ipmi-fru.yaml > fru-read.yaml + + install -m 0644 -D nf5280m7-ipmi-fru-properties.yaml \ + ${D}${datadir}/${BPN}/ipmi-extra-properties.yaml + install -m 0644 -D fru-read.yaml \ + ${D}${datadir}/${BPN}/ipmi-fru-read.yaml + install -m 0644 -D nf5280m7-ipmi-inventory-sensors.yaml \ + ${D}${datadir}/${BPN}/ipmi-inventory-sensors.yaml + install -m 0644 -D nf5280m7-ipmi-sensors.yaml \ + ${D}${datadir}/${BPN}/ipmi-sensors.yaml +} + +FILES:${PN}-dev = " \ + ${datadir}/${BPN}/ipmi-extra-properties.yaml \ + ${datadir}/${BPN}/ipmi-fru-read.yaml \ + ${datadir}/${BPN}/ipmi-inventory-sensors.yaml \ + ${datadir}/${BPN}/ipmi-sensors.yaml \ + " + +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml new file mode 100644 index 0000000000..d9edbf3996 --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml @@ -0,0 +1,85 @@ +/system: + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' +/system/chassis: + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' +/system/chassis/motherboard: + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' + +/system/chassis/hddbp0: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' + +/system/chassis/hddbp1: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' + +/system/chassis/hddbp2: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' + +/system/chassis/hddbp3: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' + +/system/chassis/hddbp4: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' + +/system/chassis/hddbp5: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' + +/system/chassis/hddbp6: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' + +/system/chassis/hddbp7: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml new file mode 100644 index 0000000000..95088ed99c --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml @@ -0,0 +1,356 @@ +0: + /system: + entityID: 6 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.AssetTag: + AssetTag: + IPMIFruProperty: Asset Tag + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + xyz.openbmc_project.Inventory.Decorator.VendorInformation: + FRUFileID: + IPMIFruProperty: FRU File ID + IPMIFruSection: Product + CustomField1: + IPMIFruProperty: Custom Field 1 + IPMIFruSection: Product + CustomField2: + IPMIFruProperty: Custom Field 2 + IPMIFruSection: Product + CustomField3: + IPMIFruProperty: Custom Field 3 + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Item.System: + /system/chassis/motherboard: + entityID: 7 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.VendorInformation: + FRUFileID: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board + CustomField1: + IPMIFruProperty: Custom Field 1 + IPMIFruSection: Board + CustomField2: + IPMIFruProperty: Custom Field 2 + IPMIFruSection: Board + CustomField3: + IPMIFruProperty: Custom Field 3 + IPMIFruSection: Board + /system/chassis: + entityID: 7 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Chassis + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Chassis + Model: + IPMIFruProperty: Type + IPMIFruSection: Chassis + xyz.openbmc_project.Inventory.Decorator.VendorInformation: + CustomField1: + IPMIFruProperty: Custom Field 1 + IPMIFruSection: Chassis + CustomField2: + IPMIFruProperty: Custom Field 2 + IPMIFruSection: Chassis + CustomField3: + IPMIFruProperty: Custom Field 3 + IPMIFruSection: Chassis +9: + /system/chassis/hddbp0: + entityID: 17 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board +10: + /system/chassis/hddbp1: + entityID: 18 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board +11: + /system/chassis/hddbp2: + entityID: 19 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board +12: + /system/chassis/hddbp3: + entityID: 20 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board +13: + /system/chassis/hddbp4: + entityID: 21 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board +14: + /system/chassis/hddbp5: + entityID: 22 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board +15: + /system/chassis/hddbp6: + entityID: 23 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board +16: + /system/chassis/hddbp7: + entityID: 24 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board +30: + /xyz/openbmc_project/sensors/power/PSU0: + entityID: 25 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Model Number + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Name + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + IPMIFruSection: Product +31: + /xyz/openbmc_project/sensors/power/PSU1: + entityID: 26 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Model Number + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Name + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + IPMIFruSection: Product diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml new file mode 100644 index 0000000000..388f9c50d3 --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml @@ -0,0 +1,220 @@ +/xyz/openbmc_project/sensors/temperature/Inlet_Temp: + sensorID: 1 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/Outlet_Temp: + sensorID: 2 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/CPU0_Temp: + sensorID: 3 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/CPU1_Temp: + sensorID: 4 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/control/Fan_Redundant: + sensorID: 5 + sensorType: 4 + eventReadingType: 11 + offset: 8 +/xyz/openbmc_project/sensors/temperature/PCH_Temp: + sensorID: 13 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/PSU0_Temp: + sensorID: 34 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/PSU1_Temp: + sensorID: 35 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/SYS_12V: + sensorID: 46 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/SYS_5V: + sensorID: 47 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/SYS_3V3: + sensorID: 48 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/PVNN_MAIN_CPU0: + sensorID: 49 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/PVNN_MAIN_CPU1: + sensorID: 50 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/RTC_Battery: + sensorID: 78 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/P12V_CPU0_DIMM: + sensorID: 79 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/P12V_CPU1_DIMM: + sensorID: 80 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/PVNN_PCH_STBY: + sensorID: 81 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/P1V05_PCH_STBY: + sensorID: 82 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/PVCCIN_CPU0: + sensorID: 83 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/PVCCIN_CPU1: + sensorID: 84 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/PVCCINFAON_CPU0: + sensorID: 85 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/PVCCINFAON_CPU1: + sensorID: 86 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/PVCCD_HV_CPU0: + sensorID: 87 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/voltage/PVCCD_HV_CPU1: + sensorID: 88 + sensorType: 2 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/State/PSU0_Status: + sensorID: 93 + sensorType: 8 + eventReadingType: 111 + offset: 8 +/xyz/openbmc_project/State/PSU1_Status: + sensorID: 94 + sensorType: 8 + eventReadingType: 111 + offset: 8 +/xyz/openbmc_project/State/PSU_Mismatch: + sensorID: 95 + sensorType: 8 + eventReadingType: 111 + offset: 8 +/xyz/openbmc_project/State/PSU_Redundant: + sensorID: 96 + sensorType: 8 + eventReadingType: 11 + offset: 8 +/xyz/openbmc_project/inventory/system/chassis/motherboard: + sensorID: 140 + sensorType: 199 + eventReadingType: 3 + offset: 0 +/xyz/openbmc_project/inventory/system: + sensorID: 144 + sensorType: 18 + eventReadingType: 111 + offset: 2 +/xyz/openbmc_project/sensors/temperature/OCP_NIC_TEMP: + sensorID: 200 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/OCP_SFP_TEMP: + sensorID: 201 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/PCIE_NIC_TEMP: + sensorID: 202 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/PCIE_SFP_TEMP: + sensorID: 203 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/GPU_TEMP: + sensorID: 204 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/control/host0/restart_cause: + sensorID: 232 + sensorType: 29 + eventReadingType: 111 + offset: 8 +/xyz/openbmc_project/sensors/temperature/CPU0_DTS_Margin: + sensorID: 234 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/CPU1_DTS_Margin: + sensorID: 235 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/NVMe_MAX_Temp: + sensorID: 248 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/power/PWR_CAP_Fail: + sensorID: 252 + sensorType: 18 + eventReadingType: 7 + offset: 8 +/xyz/openbmc_project/sensors/State/BMC_I2C: + sensorID: 253 + sensorType: 27 + eventReadingType: 111 + offset: 2 +/xyz/openbmc_project/State/SystemFirmware: + sensorID: 254 + sensorType: 15 + eventReadingType: 111 + offset: 0 +/xyz/openbmc_project/sensors/temperature/Raid_SAS_Temp: + sensorID: 205 + sensorType: 1 + eventReadingType: 1 + offset: 0 +/xyz/openbmc_project/sensors/temperature/HDD_Temp: + sensorID: 206 + sensorType: 1 + eventReadingType: 1 + offset: 0 diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml new file mode 100644 index 0000000000..d40de52b1b --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml @@ -0,0 +1,1475 @@ +1: + bExp: 0 + entityID: 55 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/Inlet_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +2: + bExp: 0 + entityID: 3 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/Outlet_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +3: + bExp: 0 + entityID: 3 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/CPU0_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + sensorName: CPU0_Temp + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +4: + bExp: 0 + entityID: 3 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/CPU1_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + sensorName: CPU1_Temp + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +13: + bExp: 0 + entityID: 3 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/PCH_Temp + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +14: + bExp: 0 + entityID: 29 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan0_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +15: + bExp: 0 + entityID: 29 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan0_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +16: + bExp: 0 + entityID: 29 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan1_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +17: + bExp: 0 + entityID: 29 + entityInstance: 4 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan1_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +18: + bExp: 0 + entityID: 29 + entityInstance: 5 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan2_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +19: + bExp: 0 + entityID: 29 + entityInstance: 6 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan2_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +20: + bExp: 0 + entityID: 29 + entityInstance: 7 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan3_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +21: + bExp: 0 + entityID: 29 + entityInstance: 8 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan3_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +22: + bExp: 0 + entityID: 29 + entityInstance: 9 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan4_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +23: + bExp: 0 + entityID: 29 + entityInstance: 10 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan4_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +24: + bExp: 0 + entityID: 29 + entityInstance: 11 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan5_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +25: + bExp: 0 + entityID: 29 + entityInstance: 12 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan5_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +26: + bExp: 0 + entityID: 29 + entityInstance: 13 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan6_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +27: + bExp: 0 + entityID: 29 + entityInstance: 14 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan6_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +28: + bExp: 0 + entityID: 29 + entityInstance: 15 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan7_0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +29: + bExp: 0 + entityID: 29 + entityInstance: 16 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 137 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/fan_tach/fan7_1 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 4 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +34: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/PSU0_Temp + rExp: 0 + readingType: readingData + sensorName: PSU0_Temp + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +35: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/PSU1_Temp + rExp: 0 + readingType: readingData + sensorName: PSU1_Temp + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +36: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/voltage/PSU0_VIN + rExp: 0 + readingType: readingData + sensorName: PSU0_VIN + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +37: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/voltage/PSU1_VIN + rExp: 0 + readingType: readingData + sensorName: PSU1_VIN + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +38: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 6 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/voltage/PSU0_VOUT + rExp: -2 + readingType: readingData + sensorName: PSU0_VOUT + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +39: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 6 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/voltage/PSU1_VOUT + rExp: -2 + readingType: readingData + sensorName: PSU1_VOUT + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +46: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 6 + path: /xyz/openbmc_project/sensors/voltage/SYS_12V + rExp: -2 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +47: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 3 + path: /xyz/openbmc_project/sensors/voltage/SYS_5V + rExp: -2 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +48: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 2 + path: /xyz/openbmc_project/sensors/voltage/SYS_3V3 + rExp: -2 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +49: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 0x09 + path: /xyz/openbmc_project/sensors/voltage/PVNN_MAIN_CPU0 + rExp: -3 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +50: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 0x09 + path: /xyz/openbmc_project/sensors/voltage/PVNN_MAIN_CPU1 + rExp: -3 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +51: + bExp: 0 + entityID: 3 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 4 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/power/CPU0_Power + offsetB: 0 + rExp: 0 + readingType: readingData + sensorName: CPU0_Power + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +52: + bExp: 0 + entityID: 3 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 4 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/power/CPU1_Power + offsetB: 0 + rExp: 0 + readingType: readingData + sensorName: CPU1_Power + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +53: + bExp: 0 + entityID: 32 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 3 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/power/CPU0_DIMM_Power + offsetB: 0 + rExp: 0 + readingType: readingData + sensorName: CPU0_DIMM_Power + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +54: + bExp: 0 + entityID: 32 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 3 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/power/CPU1_DIMM_Power + offsetB: 0 + rExp: 0 + readingType: readingData + sensorName: CPU1_DIMM_Power + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +61: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 8 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/power/Total_Power + rExp: 0 + readingType: readingData + sensorName: Total_Power + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +66: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 8 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/power/PSU0_PIN + rExp: 0 + readingType: readingData + sensorName: PSU0_PIN + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +67: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 8 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/power/PSU1_PIN + rExp: 0 + readingType: readingData + sensorName: PSU1_PIN + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +68: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 8 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/power/PSU0_POUT + rExp: 0 + readingType: readingData + sensorName: PSU0_POUT + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +69: + bExp: 0 + entityID: 10 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 8 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/power/PSU1_POUT + rExp: 0 + readingType: readingData + sensorName: PSU1_POUT + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +78: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 2 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/voltage/RTC_Battery + rExp: -2 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +79: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 6 + path: /xyz/openbmc_project/sensors/voltage/P12V_CPU0_DIMM + rExp: -2 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +80: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 6 + path: /xyz/openbmc_project/sensors/voltage/P12V_CPU1_DIMM + rExp: -2 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +81: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 0x09 + path: /xyz/openbmc_project/sensors/voltage/PVNN_PCH_STBY + rExp: -3 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +82: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 0x09 + path: /xyz/openbmc_project/sensors/voltage/P1V05_PCH_STBY + rExp: -3 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +83: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 0x09 + path: /xyz/openbmc_project/sensors/voltage/PVCCIN_CPU0 + rExp: -3 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +84: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 0x09 + path: /xyz/openbmc_project/sensors/voltage/PVCCIN_CPU1 + rExp: -3 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +85: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 0x09 + path: /xyz/openbmc_project/sensors/voltage/PVCCINFAON_CPU0 + rExp: -3 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +86: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 0x09 + path: /xyz/openbmc_project/sensors/voltage/PVCCINFAON_CPU1 + rExp: -3 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +87: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 0x09 + path: /xyz/openbmc_project/sensors/voltage/PVCCD_HV_CPU0 + rExp: -3 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +88: + bExp: 0 + entityID: 7 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 0x09 + path: /xyz/openbmc_project/sensors/voltage/PVCCD_HV_CPU1 + rExp: -3 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 2 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +89: + bExp: 0 + entityID: 20 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + mutability: Mutability::Write|Mutability::Read + multiplierM: 1 + path: /xyz/openbmc_project/sensors/power/FAN_Power + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +93: + entityID: 10 + entityInstance: 0 + interfaces: + com.inspur.Sensor.Status: + EventData: + Offsets: + 0xFF: + type: uint16_t + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/State/PSU0_Status + readingType: readingData + sensorNamePattern: nameLeaf + sensorReadingType: 111 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties +94: + entityID: 10 + entityInstance: 0 + interfaces: + com.inspur.Sensor.Status: + EventData: + Offsets: + 0xFF: + type: uint16_t + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/State/PSU1_Status + readingType: readingData + sensorNamePattern: nameLeaf + sensorReadingType: 111 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties +95: + entityID: 10 + entityInstance: 0 + interfaces: + com.inspur.Sensor.Status: + EventData: + Offsets: + 0xFF: + type: uint16_t + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/State/PSU_Mismatch + readingType: readingData + sensorNamePattern: nameLeaf + sensorReadingType: 111 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties +96: + entityID: 10 + entityInstance: 0 + interfaces: + com.inspur.Sensor.Status: + EventData: + Offsets: + 0xFF: + type: uint16_t + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/State/PSU_Redundant + readingType: readingData + sensorNamePattern: nameLeaf + sensorReadingType: 11 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties +200: + bExp: 0 + entityID: 11 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/OCP_NIC_TEMP + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +201: + bExp: 0 + entityID: 11 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/OCP_SFP_TEMP + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +202: + bExp: 0 + entityID: 11 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/PCIE_NIC_TEMP + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +203: + bExp: 0 + entityID: 11 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/PCIE_SFP_TEMP + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +204: + bExp: 0 + entityID: 11 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/GPU_Temp + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +205: + bExp: 0 + entityID: 4 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/Raid_SAS_Temp + rExp: 0 + readingType: readingData + sensorName: Raid_Card_Temp + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +206: + bExp: 0 + entityID: 4 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/HDD_Temp + rExp: 0 + readingType: readingData + sensorName: HDD_MAX_Temp + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +232: + entityID: 7 + entityInstance: 0 + interfaces: + com.inspur.Sensor.Status: + EventData: + Offsets: + 0xFF: + type: uint16_t + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/control/host0/restart_cause + recordType: 3 + sensorName: System_Restart + readingType: readingData + sensorNamePattern: nameLeaf + sensorReadingType: 111 + sensorType: 29 + serviceInterface: org.freedesktop.DBus.Properties +234: + bExp: 0 + entityID: 3 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/CPU0_DTS_Margin + offsetB: 0 + rExp: 0 + readingType: readingData + sensorName: CPU0_DTS_Margin + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +235: + bExp: 0 + entityID: 3 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/CPU1_DTS_Margin + offsetB: 0 + rExp: 0 + readingType: readingData + sensorName: CPU1_DTS_Margin + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +248: + bExp: 0 + entityID: 4 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/NVMe_MAX_Temp + rExp: 0 + readingType: readingData + sensorName: NVMe_MAX_Temp + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +252: + entityID: 7 + entityInstance: 0 + interfaces: + com.inspur.Sensor.Status: + EventData: + Offsets: + 0xFF: + type: uint16_t + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/power/PWR_CAP_Fail + readingType: readingData + sensorNamePattern: nameLeaf + sensorReadingType: 7 + sensorType: 18 + serviceInterface: org.freedesktop.DBus.Properties +253: + entityID: 7 + entityInstance: 0 + interfaces: + com.inspur.Sensor.Status: + EventData: + Offsets: + 0xFF: + type: uint16_t + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/sensors/State/BMC_I2C + readingType: readingData + sensorNamePattern: nameLeaf + sensorReadingType: 111 + sensorType: 27 + serviceInterface: org.freedesktop.DBus.Properties diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend new file mode 100644 index 0000000000..1b6c91265f --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json new file mode 100644 index 0000000000..c4fba64f67 --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json @@ -0,0 +1,38 @@ +{ + "inlet": [ + { + "instance": 0, + "dbus": "/xyz/openbmc_project/sensors/temperature/Inlet_Temp", + "record_id": 1 + } + ], + "baseboard": [ + { + "instance": 0, + "dbus": "/xyz/openbmc_project/sensors/temperature/Outlet_Temp", + "record_id": 2 + } + ], + "cpu": [ + { + "instance": 1, + "dbus": "/xyz/openbmc_project/sensors/temperature/CPU0_Temp", + "record_id": 3 + }, + { + "instance": 1, + "dbus": "/xyz/openbmc_project/sensors/temperature/CPU1_Temp", + "record_id": 4 + }, + { + "instance": 1, + "dbus": "/xyz/openbmc_project/sensors/temperature/CPU0_DTS_Margin", + "record_id": 234 + }, + { + "instance": 1, + "dbus": "/xyz/openbmc_project/sensors/temperature/CPU1_DTS_Margin", + "record_id": 235 + } + ] +} diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json new file mode 100644 index 0000000000..a9aedf15fc --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json @@ -0,0 +1,8 @@ +{ + "id": 0, + "revision": 128, + "addn_dev_support": 191, + "manuf_id": 61847, + "prod_id": 123, + "aux": 0 +} diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 0000000000..8bc2c548a9 --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,6 @@ +DEPENDS:append: = " nf5280m7-yaml-config" + +EXTRA_OECONF:append = " \ + YAML_GEN=${STAGING_DIR_HOST}${datadir}/nf5280m7-yaml-config/ipmi-fru-read.yaml \ + PROP_YAML=${STAGING_DIR_HOST}${datadir}/nf5280m7-yaml-config/ipmi-extra-properties.yaml \ + " diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 0000000000..e16e2bb079 --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,7 @@ +DEPENDS:append = " nf5280m7-yaml-config" + +EXTRA_OEMESON= " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/nf5280m7-yaml-config/ipmi-sensors.yaml \ + -Dinvsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/nf5280m7-yaml-config/ipmi-inventory-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/nf5280m7-yaml-config/ipmi-fru-read.yaml \ + " diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json index eef9cf4a46..eef9cf4a46 100644 --- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index 6b12a398f7..6b12a398f7 100644 --- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 3586206559..4eb9c914c9 100644 --- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -36,7 +36,4 @@ RDEPENDS:${PN}-flash = " \ SUMMARY:${PN}-system = "IEI System" RDEPENDS:${PN}-system = " \ - entity-manager \ - iei-ipmi-oem \ - ipmitool \ " diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/dbus-sensors_%.bbappend new file mode 100644 index 0000000000..0cd9e07b61 --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -0,0 +1,10 @@ +PACKAGECONFIG = " \ + adcsensor \ + fansensor \ + hwmontempsensor \ + intelcpusensor \ + ipmbsensor \ + nvmesensor \ + pciesensor \ + psuensor \ + " diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json new file mode 100644 index 0000000000..f07080e075 --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json @@ -0,0 +1,131 @@ +[ + { + "Desc": { + "Name": "Total_Power", + "SensorType": "power" + }, + "Associations": [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/chassis" + ] + ], + "Params": { + "DbusParam": [ + { + "ParamName": "P1", + "Desc": { + "Name": "PSU0_PIN", + "SensorType": "power" + } + }, + { + "ParamName": "P2", + "Desc": { + "Name": "PSU1_PIN", + "SensorType": "power" + } + }, + { + "ParamName": "P3", + "Desc": { + "Name": "PSU2_PIN", + "SensorType": "power" + } + }, + { + "ParamName": "P4", + "Desc": { + "Name": "PSU3_PIN", + "SensorType": "power" + } + } + ] + }, + "Expression": "(P1 > 0 ? P1:0) + (P2 > 0 ? P2:0) + (P3 > 0 ? P3:0) + (P4 > 0 ? P4:0)" + }, + { + "Desc": { + "Name": "GPU_Temp", + "SensorType": "temperature", + "MinValue": -128, + "MaxValue": 127 + }, + "Params": { + "DbusParam": [ + { + "ParamName": "n0", + "Desc": { + "Name": "R_PCIE0_GPU_Temp", + "SensorType": "temperature" + } + }, + { + "ParamName": "n1", + "Desc": { + "Name": "R_PCIE1_GPU_Temp", + "SensorType": "temperature" + } + }, + { + "ParamName": "n2", + "Desc": { + "Name": "R_PCIE2_GPU_Temp", + "SensorType": "temperature" + } + }, + { + "ParamName": "n3", + "Desc": { + "Name": "R_PCIE3_GPU_Temp", + "SensorType": "temperature" + } + }, + { + "ParamName": "n4", + "Desc": { + "Name": "R_PCIE4_GPU_Temp", + "SensorType": "temperature" + } + }, + { + "ParamName": "n5", + "Desc": { + "Name": "R_PCIE5_GPU_Temp", + "SensorType": "temperature" + } + }, + { + "ParamName": "n6", + "Desc": { + "Name": "R_PCIE6_GPU_Temp", + "SensorType": "temperature" + } + }, + { + "ParamName": "n7", + "Desc": { + "Name": "R_PCIE7_GPU_Temp", + "SensorType": "temperature" + } + }, + { + "ParamName": "n8", + "Desc": { + "Name": "R_PCIE8_GPU_Temp", + "SensorType": "temperature" + } + }, + { + "ParamName": "n9", + "Desc": { + "Name": "R_PCIE9_GPU_Temp", + "SensorType": "temperature" + } + } + ] + }, + "Expression": "max(0,n0, n1, n2, n3,n4,n5,n6,n7,n8,n9)" + } +] diff --git a/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 0000000000..9bfbdcb934 --- /dev/null +++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append = " file://virtual_sensor_config.json" + +do_install:append() { + install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/ +} diff --git a/meta-ieisystems/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend b/meta-ieisystem/recipes-extended/timezone/tzdata.bbappend index 0bcd774c58..0bcd774c58 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend +++ b/meta-ieisystem/recipes-extended/timezone/tzdata.bbappend diff --git a/meta-ieisystem/recipes-ieisystem/bmcweb/bmcweb_%.bbappend b/meta-ieisystem/recipes-ieisystem/bmcweb/bmcweb_%.bbappend new file mode 100644 index 0000000000..925d189036 --- /dev/null +++ b/meta-ieisystem/recipes-ieisystem/bmcweb/bmcweb_%.bbappend @@ -0,0 +1,4 @@ +EXTRA_OEMESON:append = " \ + -Dinsecure-enable-redfish-query=enabled \ + -Dredfish-host-logger=disabled \ + " diff --git a/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb b/meta-ieisystem/recipes-ieisystem/ipmi/iei-ipmi-oem_git.bb index 4e0f8af8f3..24d9ad2720 100644 --- a/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb +++ b/meta-ieisystem/recipes-ieisystem/ipmi/iei-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/iei-ipmi-oem;branch=master;protocol=https" -SRCREV = "0917ac423df7a3ae700bbb21fac32f540cb58682" +SRCREV = "93b6a33320ab0494d4732c1190c6821ec7149cac" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-ieisystem/recipes-ieisystem/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/recipes-ieisystem/packagegroups/packagegroup-obmc-apps.bbappend new file mode 100644 index 0000000000..3289f790e5 --- /dev/null +++ b/meta-ieisystem/recipes-ieisystem/packagegroups/packagegroup-obmc-apps.bbappend @@ -0,0 +1,11 @@ +RDEPENDS:${PN}-extras:append = " \ + iei-ipmi-oem \ + phosphor-virtual-sensor \ + trace-enable \ + tzdata-core \ + " + +RDEPENDS:${PN}-devtools:append = " \ + ipmitool \ + " + diff --git a/meta-ieisystem/recipes-ieisystem/settings/phosphor-settings-manager/powerOnHours.override.yml b/meta-ieisystem/recipes-ieisystem/settings/phosphor-settings-manager/powerOnHours.override.yml new file mode 100644 index 0000000000..8253ac5f76 --- /dev/null +++ b/meta-ieisystem/recipes-ieisystem/settings/phosphor-settings-manager/powerOnHours.override.yml @@ -0,0 +1,6 @@ +--- +/xyz/openbmc_project/state/chassis0: + - Interface: xyz.openbmc_project.State.PowerOnHours + Properties: + POHCounter: + Default: 0 diff --git a/meta-ieisystem/recipes-ieisystem/settings/phosphor-settings-manager_%.bbappend b/meta-ieisystem/recipes-ieisystem/settings/phosphor-settings-manager_%.bbappend new file mode 100644 index 0000000000..db37472dc0 --- /dev/null +++ b/meta-ieisystem/recipes-ieisystem/settings/phosphor-settings-manager_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append = " \ + file://powerOnHours.override.yml \ + " diff --git a/meta-ieisystem/recipes-ieisystem/trace-enable/trace-enable.bbappend b/meta-ieisystem/recipes-ieisystem/trace-enable/trace-enable.bbappend new file mode 100644 index 0000000000..36facc5356 --- /dev/null +++ b/meta-ieisystem/recipes-ieisystem/trace-enable/trace-enable.bbappend @@ -0,0 +1,4 @@ +TRACE_EVENTS:append = " \ + i2c \ + i2c_slave \ +" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/pca9541a@70/i2c-arb/hotswap@54.conf index 8e27a12b11..8e27a12b11 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/pca9541a@70/i2c-arb/hotswap@54.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@30.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/power-brick@30.conf index 4416f54a11..4416f54a11 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@30.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/power-brick@30.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@6a.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/power-brick@6a.conf index 4416f54a11..4416f54a11 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@6a.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/power-brick@6a.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@40.conf index f46a59d8bc..f46a59d8bc 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@40.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@41.conf index f6efffb804..f6efffb804 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@41.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@43.conf index d446403ae7..d446403ae7 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@43.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@60.conf index f928e6a0f4..f928e6a0f4 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@60.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@64.conf index 4f93e44251..4f93e44251 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/vrm@64.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@40.conf index 3524508d3b..3524508d3b 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@40.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@41.conf index 9d244ba3dc..9d244ba3dc 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@41.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@42.conf index b40901a882..b40901a882 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@42.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@60.conf index 67b09ba361..67b09ba361 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@60.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@64.conf index b9c76dc546..b9c76dc546 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@340/vrm@64.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@40/ucd90160@64.conf index 58a9a91706..58a9a91706 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@40/ucd90160@64.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf index 3765a6cf4d..3765a6cf4d 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 07b7a382c6..dcdd6fcd89 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,21 +1,21 @@ FILESEXTRAPATHS:prepend:zaius := "${THISDIR}/${PN}:" -ZAIUS_CHIPS = "bus@1e78a000/i2c-bus@40/ucd90160@64" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54" +ZAIUS_CHIPS = "bus@1e78a000/i2c@40/ucd90160@64" +ZAIUS_CHIPS += " bus@1e78a000/i2c@300/pca9541a@70/i2c-arb/hotswap@54" ZAIUS_CHIPS += " pwm-tacho-controller@1e786000" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/power-brick@30" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/power-brick@6a" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@40" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@41" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@43" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@60" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@64" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@40" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@41" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@42" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@60" -ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@64" -ZAIUS_ITEMSFMT = "ahb/apb/{0}.conf" +ZAIUS_CHIPS += " bus@1e78a000/i2c@300/power-brick@30" +ZAIUS_CHIPS += " bus@1e78a000/i2c@300/power-brick@6a" +ZAIUS_CHIPS += " bus@1e78a000/i2c@300/vrm@40" +ZAIUS_CHIPS += " bus@1e78a000/i2c@300/vrm@41" +ZAIUS_CHIPS += " bus@1e78a000/i2c@300/vrm@43" +ZAIUS_CHIPS += " bus@1e78a000/i2c@300/vrm@60" +ZAIUS_CHIPS += " bus@1e78a000/i2c@300/vrm@64" +ZAIUS_CHIPS += " bus@1e78a000/i2c@340/vrm@40" +ZAIUS_CHIPS += " bus@1e78a000/i2c@340/vrm@41" +ZAIUS_CHIPS += " bus@1e78a000/i2c@340/vrm@42" +ZAIUS_CHIPS += " bus@1e78a000/i2c@340/vrm@60" +ZAIUS_CHIPS += " bus@1e78a000/i2c@340/vrm@64" +ZAIUS_ITEMSFMT = "ahb/apb@1e780000/{0}.conf" ZAIUS_ITEMS = "${@compose_list(d, 'ZAIUS_ITEMSFMT', 'ZAIUS_CHIPS')}" ZAIUS_ITEMS += "iio-hwmon.conf iio-hwmon-battery.conf" diff --git a/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb index 9c2335263f..1b092eb46c 100644 --- a/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/openbmc/host-error-monitor;branch=master;protocol=ht DEPENDS = "boost sdbusplus libgpiod libpeci phosphor-dbus-interfaces" PV = "0.1+git${SRCPV}" -SRCREV = "a6895608d542a3ad8bfd249a774877d0a2dcf43c" +SRCREV = "a4f8e5fe0deae7eee2a55a860648675089476af4" S = "${WORKDIR}/git" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 2953b73ca6..f41ee5f8db 100755 --- a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem;branch=master;protocol=https" -SRCREV = "4c0424026539c153b1b63648adfd306580a96d40" +SRCREV = "9890d29df9cc5f630ab35bfe53eb27eb83e6bc66" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb index 33c74f8b24..e2c75bb129 100644 --- a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb @@ -8,7 +8,7 @@ inherit cmake systemd pkgconfig SRC_URI = "git://github.com/openbmc/pfr-manager;branch=master;protocol=https" PV = "0.1+git${SRCPV}" -SRCREV = "76b85dba1dc3e58fb35d740d3a0fa809b07a9113" +SRCREV = "1695ee330bc54df35f537b4026bf1e2426ce9d28" S = "${WORKDIR}/git" diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml b/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml index 813ffbfd44..db5e776675 100755 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml +++ b/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml @@ -5,32 +5,41 @@ power_on: status_ok: status_green: Action: 'On' + Priority: 'Blink' status_amber: Action: 'Off' + Priority: 'Blink' status_degraded: status_green: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' status_amber: Action: 'Off' + Priority: 'Blink' status_non_critical: status_green: Action: 'Off' + Priority: 'Blink' status_amber: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' status_critical: status_green: Action: 'Off' + Priority: 'Blink' status_amber: Action: 'On' + Priority: 'Blink' enclosure_identify: identify: Action: 'On' + Priority: 'Blink' diff --git a/meta-inventec/meta-starscream/recipes-phosphor/leds/starscream-led-manager-config/led.yaml b/meta-inventec/meta-starscream/recipes-phosphor/leds/starscream-led-manager-config/led.yaml index 73bdd880c2..55fa74cc06 100644 --- a/meta-inventec/meta-starscream/recipes-phosphor/leds/starscream-led-manager-config/led.yaml +++ b/meta-inventec/meta-starscream/recipes-phosphor/leds/starscream-led-manager-config/led.yaml @@ -3,13 +3,16 @@ bmc_booted: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' enclosure_identify: UID_LED: Action: 'On' + Priority: 'Blink' enclosure_identify_blink: UID_LED: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' diff --git a/meta-nuvoton/conf/machine/evb-npcm845.conf b/meta-nuvoton/conf/machine/evb-npcm845.conf index 92641abb06..b6a4778d1a 100644 --- a/meta-nuvoton/conf/machine/evb-npcm845.conf +++ b/meta-nuvoton/conf/machine/evb-npcm845.conf @@ -18,8 +18,6 @@ FLASH_KERNEL_OFFSET:flash-65536 = "4096" FLASH_ROFS_OFFSET:flash-65536 = "12288" FLASH_RWFS_OFFSET:flash-65536 = "61440" -BB_ALIGN = "524288" - IMAGE_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot" IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \ 'phosphor-mmc', \ diff --git a/meta-nuvoton/conf/machine/include/igps-keys.inc b/meta-nuvoton/conf/machine/include/igps-keys.inc deleted file mode 100644 index dcc5f7ce31..0000000000 --- a/meta-nuvoton/conf/machine/include/igps-keys.inc +++ /dev/null @@ -1,20 +0,0 @@ -# There are two valid types: "openssl" or "HSM". -# Currently, default support openssl only. -SIGN_TYPE ?= "openssl" - -KEY_BB_INDEX ?= "1" -SKMT_BL31_KEY_INDEX ?= "1" -SKMT_BL32_KEY_INDEX ?= "1" -SKMT_BL33_KEY_INDEX ?= "1" - -KEY_BB_ID ?= "11" -KEY_BL31_ID ?= "11" -KEY_OPTEE_ID ?= "11" -KEY_UBOOT_ID ?= "11" - -KEY_FOLDER ?= "" -KEY_FOLDER_DEFAULT ?= "${DEPLOY_DIR_IMAGE}/${SIGN_TYPE}" -KEY_BB ?= "skmt_ecc_key_1.der" -KEY_BL31 ?= "skmt_ecc_key_1.der" -KEY_OPTEE ?= "skmt_ecc_key_1.der" -KEY_UBOOT ?= "skmt_ecc_key_1.der" diff --git a/meta-nuvoton/conf/machine/include/npcm8xx.inc b/meta-nuvoton/conf/machine/include/npcm8xx.inc index 218b81fe29..84f4bdfb14 100644 --- a/meta-nuvoton/conf/machine/include/npcm8xx.inc +++ b/meta-nuvoton/conf/machine/include/npcm8xx.inc @@ -3,7 +3,6 @@ #@DESCRIPTION: Common machine configuration for Nuvoton NPCM8XX Chip require conf/machine/include/nuvoton.inc -require conf/machine/include/igps-keys.inc KERNEL_IMAGETYPE ?= "Image" @@ -29,14 +28,6 @@ FLASH_UBI_RWFS_TXT_SIZE ?= "6MiB" SERIAL_CONSOLES ?= "115200;ttyS0" -BB_ALIGN ?= "524288" -ATF_ALIGN ?= "4096" -OPTEE_ALIGN ?= "4096" -UBOOT_ALIGN ?= "4096" -ALIGN_END ?= "4096" -PAD_ALIGN ?= "32" -SA_ALIGN ?= "524288" - SOC_FAMILY = "npcm8xx" include conf/machine/include/soc-family.inc MACHINEOVERRIDES .= ":npcm8xx" @@ -57,8 +48,6 @@ TFA_BUILD_TARGET = "bl31" OPTEEMACHINE ?= "nuvoton" -SECURED_IMAGE ?= "True" - TIP_IMAGE ?= "True" SA_TIP_IMAGE ?= "False" diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-evb-npcm845/packagegroups/packagegroup-evb-npcm845-apps.bb b/meta-nuvoton/meta-evb-npcm845/recipes-evb-npcm845/packagegroups/packagegroup-evb-npcm845-apps.bb index 8350267e8c..d0cd5d496d 100644 --- a/meta-nuvoton/meta-evb-npcm845/recipes-evb-npcm845/packagegroups/packagegroup-evb-npcm845-apps.bb +++ b/meta-nuvoton/meta-evb-npcm845/recipes-evb-npcm845/packagegroups/packagegroup-evb-npcm845-apps.bb @@ -57,4 +57,5 @@ RDEPENDS:${PN}-system = " \ phosphor-image-signing \ optee-client \ optee-test \ + persistent-net-name \ " diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml index 9ae22d348c..c220a6f99f 100644 --- a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml +++ b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/leds/evb-npcm845-led-manager-config/led.yaml @@ -3,15 +3,19 @@ BmcBooted: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' PowerOn: identify: Action: 'On' + Priority: 'Blink' EnclosureFault: identify: Action: 'On' + Priority: 'Blink' EnclosureIdentify: identify: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/network/persistent-net-name.bb b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/network/persistent-net-name.bb new file mode 100644 index 0000000000..da2ef5aa36 --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/network/persistent-net-name.bb @@ -0,0 +1,15 @@ +SUMMARY = "udev rules for persistent net name" +DESCRIPTION = "udev rules for persistent net name" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +S = "${WORKDIR}" +SRC_URI += "file://85-persistent-net.rules" + +RDEPENDS:${PN} += "udev" + +do_install() { + install -d ${D}/${base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/85-persistent-net.rules ${D}/${base_libdir}/udev/rules.d +} diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/network/persistent-net-name/85-persistent-net.rules b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/network/persistent-net-name/85-persistent-net.rules new file mode 100644 index 0000000000..46da4ec850 --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/network/persistent-net-name/85-persistent-net.rules @@ -0,0 +1,6 @@ +ACTION=="remove", GOTO="persistent_net_end" +SUBSYSTEM!="net", GOTO="persistent_net_end" + +ENV{ID_NET_NAME_ONBOARD}!="", NAME="eth%n" + +LABEL="persistent_net_end" diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-x86/chassis/x86-power-control/power-config-host0.json b/meta-nuvoton/meta-evb-npcm845/recipes-x86/chassis/x86-power-control/power-config-host0.json new file mode 100644 index 0000000000..b075603a01 --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-x86/chassis/x86-power-control/power-config-host0.json @@ -0,0 +1,52 @@ +{ + "gpio_configs":[ + { + "Name" : "NMIButton", + "LineName" : "NMI_BUTTON", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "NMIOut", + "LineName" : "NMI_OUT", + "Type" : "GPIO", + "Polarity" : "ActiveHigh" + }, + { + "Name" : "PostComplete", + "LineName" : "POST_COMPLETE", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "PowerButton", + "LineName" : "POWER_BUTTON", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "PowerOk", + "LineName" : "PS_PWROK", + "Type" : "GPIO", + "Polarity" : "ActiveHigh" + }, + { + "Name" : "PowerOut", + "LineName" : "POWER_OUT", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "ResetButton", + "LineName" : "RESET_BUTTON", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "ResetOut", + "LineName" : "RESET_OUT", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + } + ] + } diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-nuvoton/meta-evb-npcm845/recipes-x86/chassis/x86-power-control_%.bbappend new file mode 100644 index 0000000000..d4eeb3d537 --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-x86/chassis/x86-power-control_%.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append = " file://power-config-host0.json" + +do_install:append () { + install -m 0755 -d ${D}/${datadir}/${BPN} + install -m 0644 -D ${WORKDIR}/*.json \ + ${D}/${datadir}/${BPN}/ +} diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.8.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.8.bb deleted file mode 100644 index 17a94bef91..0000000000 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.8.bb +++ /dev/null @@ -1,3 +0,0 @@ -SRCREV = "e18737d17d4cf5e7768598a291a7ef2b8a07a776" - -require npcm8xx-bootblock.inc diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.5.1.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.5.1.bb new file mode 100644 index 0000000000..073f943b6c --- /dev/null +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.5.1.bb @@ -0,0 +1,3 @@ +SRCREV = "e5d886049b1b06c61a6df792c8f4617c572abce1" + +require npcm8xx-bootblock.inc diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootloader/settings.json b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootloader/settings.json new file mode 100644 index 0000000000..8a741dcb4b --- /dev/null +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootloader/settings.json @@ -0,0 +1,13 @@ +{ + "BootBlockAndHeader.xml": + { + "MC_CONFIG": "0x04" + }, + "key_setting_edit_me.py": + { + "COMBO1_OFFSET": "2048*1024" + }, + "BootBlockAndHeader_no_tip.xml": + { + } +} diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootloader_04.01.04.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootloader_04.01.04.bb new file mode 100644 index 0000000000..e18643184b --- /dev/null +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootloader_04.01.04.bb @@ -0,0 +1,93 @@ +SUMMARY = "Nuvoton NPCM8XX bootloader" +DESCRIPTION = "This is front end recipe for NPCM8XX IGPS. It replace \ +original IGPS recipe which need implement many redundant function in \ +recipe or class. After we add some hook in IGPS, now we can generate \ +full bootbloader by IGPS script. We only need collect all built images \ +from deploy folder, put them to IGPS input folder, and run script." +HOMEPAGE = "https://github.com/Nuvoton-Israel/igps-npcm8xx" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +IGPS_BRANCH ?= "main" +SRC_URI = " \ + git://github.com/Nuvoton-Israel/igps-npcm8xx;branch=${IGPS_BRANCH};protocol=https \ +" +SRCREV = "d3b7edaca6748b95e7fdcdf7b2fd1b06ce438f96" + +S = "${WORKDIR}/git" + +DEPENDS = "npcm7xx-bingo-native openssl-native" +inherit obmc-phosphor-utils +inherit python3native deploy +FILE_FMT = "file://{}" + +# Sign keys, replace them for production +IGPS_KEYS = "" +# Configuration files, clean them if no need +IGPS_CSVS = "" +IGPS_SETTINGS = "settings.json" +IGPS_CONFS = "${IGPS_KEYS} ${IGPS_CSVS} ${IGPS_SETTINGS}" +SRC_URI += "${@compose_list(d, 'FILE_FMT', 'IGPS_CONFS')}" + +IGPS_SCRIPT_BASE = "${S}/py_scripts/ImageGeneration" +BB_BIN = "arbel_a35_bootblock" +BB_BIN .= "${@'_no_tip.bin' if d.getVar("TIP_IMAGE") != 'True' else '.bin'}" + +do_configure[dirs] = "${WORKDIR}" +do_configure() { + KEY_FOLDER=${IGPS_SCRIPT_BASE}/keys/openssl + CSV_FOLDER=${IGPS_SCRIPT_BASE}/inputs/registers + # keys + install -d ${KEY_FOLDER} + if [ -n "${IGPS_KEYS}" ];then + cp -v ${IGPS_KEYS} ${KEY_FOLDER} + fi + + # csv files + install -d ${CSV_FOLDER} + if [ -n "${IGPS_CSVS}" ];then + cp -v ${IGPS_CSVS} ${CSV_FOLDER} + fi + + # change customized settings for XML and key setting + if [ -n "${IGPS_SETTINGS}" ];then + cd ${S} + python3 ${IGPS_SCRIPT_BASE}/config_replacer.py ${WORKDIR}/${IGPS_SETTINGS} + fi +} + +do_compile[depends] += " \ + npcm8xx-tip-fw:do_deploy npcm8xx-bootblock:do_deploy \ + trusted-firmware-a:do_deploy optee-os:do_deploy \ + u-boot-nuvoton:do_deploy" +do_compile() { + # copy Openbmc built images + cd ${DEPLOY_DIR_IMAGE} + cp -v ${BB_BIN} bl31.bin tee.bin u-boot.bin ${IGPS_SCRIPT_BASE}/inputs + + cd ${IGPS_SCRIPT_BASE} + install -d output_binaries/tmp + install -d inputs/key_input + if [ "${TIP_IMAGE}" = "True" ] || [ "${SA_TIP_IMAGE}" = "True" ];then + # Do not sign combo0 image again + python3 ${S}/py_scripts/GenerateAll.py openssl ${DEPLOY_DIR_IMAGE} + else + # for No TIP, we can run IGPS script directly + python3 ${S}/py_scripts/GenerateAll.py openssl + fi +} + +do_deploy() { + OUT=${IGPS_SCRIPT_BASE}/output_binaries + BOOTLOADER=u-boot.bin.merged + install -d ${DEPLOYDIR} + if [ "${SA_TIP_IMAGE}" = "True" ];then + install -m 644 ${OUT}/Secure/image_no_tip_SA.bin ${DEPLOYDIR}/${BOOTLOADER} + elif [ "${TIP_IMAGE}" = "True" ];then + install -m 644 ${OUT}/Secure/Kmt_TipFwL0_Skmt_TipFwL1_BootBlock_BL31_Tee_uboot.bin ${DEPLOYDIR}/${BOOTLOADER} + else + install -m 644 ${OUT}/Basic/image_no_tip.bin ${DEPLOYDIR}/${BOOTLOADER} + fi +} +addtask deploy before do_build after do_compile +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.01.03.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.01.03.bb deleted file mode 100644 index 78210af9d3..0000000000 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.01.03.bb +++ /dev/null @@ -1,4 +0,0 @@ -# tag IGPS_04.01.03 -SRCREV = "ae5ddb6c8ff350835d411b9e3bfb4443db596067" - -require npcm8xx-igps.inc diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps.inc b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps.inc deleted file mode 100644 index 7c043f808f..0000000000 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps.inc +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Image Generation and Programming Scripts for NPCM8XX (Arbel) devices" -DESCRIPTION = "Image Generation and Programming Scripts for NPCM8XX (Arbel) devices" -HOMEPAGE = "https://github.com/Nuvoton-Israel/igps-npcm8xx" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -IGPS_BRANCH ?= "main" -SRC_URI = " \ - git://github.com/Nuvoton-Israel/igps-npcm8xx;branch=${IGPS_BRANCH};protocol=https \ -" - -S = "${WORKDIR}/git" - -DEST = "${D}${datadir}/${BPN}" - -# Adjust paths for use with bitbake -do_patch() { - sed -i -e 's,output_binaries/tmp/,,g' ${S}/py_scripts/ImageGeneration/references/*.xml \ - ${S}/py_scripts/ImageGeneration/inputs/*.xml -} - -do_install() { - install -d ${DEST} - if [ "${TIP_IMAGE}" = "True" ] ; then - install py_scripts/ImageGeneration/references/BootBlockAndHeader_${DEVICE_GEN}_${IGPS_MACHINE}.xml ${DEST} - else - install py_scripts/ImageGeneration/references/BootBlockAndHeader_${DEVICE_GEN}_${IGPS_MACHINE}_NoTip.xml ${DEST} - fi - install py_scripts/ImageGeneration/references/UbootHeader_${DEVICE_GEN}.xml ${DEST} - install py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml ${DEST} - install py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml ${DEST} - install py_scripts/ImageGeneration/asn1.py ${DEST} - install py_scripts/ImageGeneration/BinarySignatureGenerator.py ${DEST} -} - -inherit deploy - -do_deploy () { - # copy default keys to deploy folder - install -d ${DEPLOYDIR} - cp -vur py_scripts/ImageGeneration/keys/${SIGN_TYPE} ${DEPLOYDIR}/ -} - -inherit native - -addtask deploy before do_build after do_compile diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.7.1.0.6.0.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.7.2.0.6.1.bb index 90f074f157..081840bc86 100644 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.7.1.0.6.0.bb +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.7.2.0.6.1.bb @@ -1,4 +1,4 @@ -SRCREV = "bdbfc0324150c4471c77bafc2cf5f6f3c64cf814" +SRCREV = "594b67c9b2c72cc83415d4deca55dcc8f0aeb09a" OUTPUT_BIN = "output_binaries_${DEVICE_GEN}_${IGPS_MACHINE}" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc index 78f8e092e6..0f1336bed4 100644 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" UBRANCH = "npcm-v2023.10" SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH};protocol=https" -SRCREV = "fb62cf0fb4b97420ca20e9ccb0e12fa8e59213d3" +SRCREV = "1f004b08f0a2cea41f141e8fe1a6d20923094d1b" S = "${WORKDIR}/git" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2021.04.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2021.04.bb index 4f06ecf2a0..e72a92fd59 100644 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2021.04.bb +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2021.04.bb @@ -1,7 +1,8 @@ require u-boot-common-nuvoton_${PV}.inc +require recipes-bsp/u-boot/u-boot-configure.inc SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" -DEPENDS = "mtd-utils bison-native" +DEPENDS += "mtd-utils bison-native" RDEPENDS:${PN} = "udev-nuvoton-mtd-partitions" PROVIDES += "u-boot-fw-utils" @@ -15,7 +16,6 @@ EXTRA_OEMAKE:class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" inherit uboot-config do_compile () { - oe_runmake ${UBOOT_MACHINE} oe_runmake envtools } diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2023.10.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2023.10.bb index 4f06ecf2a0..e72a92fd59 100644 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2023.10.bb +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2023.10.bb @@ -1,7 +1,8 @@ require u-boot-common-nuvoton_${PV}.inc +require recipes-bsp/u-boot/u-boot-configure.inc SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" -DEPENDS = "mtd-utils bison-native" +DEPENDS += "mtd-utils bison-native" RDEPENDS:${PN} = "udev-nuvoton-mtd-partitions" PROVIDES += "u-boot-fw-utils" @@ -15,7 +16,6 @@ EXTRA_OEMAKE:class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" inherit uboot-config do_compile () { - oe_runmake ${UBOOT_MACHINE} oe_runmake envtools } diff --git a/meta-nuvoton/recipes-kernel/linux/OWNERS b/meta-nuvoton/recipes-kernel/linux/OWNERS new file mode 100644 index 0000000000..6b28ba6cb9 --- /dev/null +++ b/meta-nuvoton/recipes-kernel/linux/OWNERS @@ -0,0 +1,3 @@ +inherited: true +owners: +- andrew@codeconstruct.com.au diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb index ffdd235f5b..fe51d334f3 100644 --- a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb +++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb @@ -1,6 +1,6 @@ -KBRANCH ?= "dev-6.1" -LINUX_VERSION ?= "6.1.29" +KBRANCH ?= "dev-6.6" +LINUX_VERSION ?= "6.6.52" -SRCREV="1ac953dfce37295181915ee4974511a814756e37" +SRCREV="932df9afc2f024ddd310c964b6adbafd05c77723" require linux-nuvoton.inc diff --git a/meta-openpower/recipes-bsp/ipl/ipl_git.bb b/meta-openpower/recipes-bsp/ipl/ipl_git.bb index 59cb749a2b..e74987cb21 100644 --- a/meta-openpower/recipes-bsp/ipl/ipl_git.bb +++ b/meta-openpower/recipes-bsp/ipl/ipl_git.bb @@ -12,7 +12,7 @@ inherit autotools pkgconfig S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/ipl;branch="main";protocol=https" -SRCREV = "d6c5ff27426b2cedc7c2d29c6888b40ad96ef381" +SRCREV = "1e1ec57270b52d0546b3998dbeacbdbd586a707b" DEPENDS = " \ libekb pdbg autoconf-archive guard pdata \ diff --git a/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb index 306798374e..b2a8727928 100644 --- a/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb +++ b/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/open-power/pdbg.git;branch=master;protocol=https" -SRCREV = "f429a97edc64114ffe18530a338682b6e5928195" +SRCREV = "7cb2aa1a28012e79c0c6dcab8143087ccbdab904" DEPENDS += "dtc-native" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc index 019dcd3c74..ebc1281449 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-debug-collector;branch=master;protocol=https" -SRCREV = "f4e898ab91f2b4f767300781009d0b3a7de5f4dd" +SRCREV = "c14bf2c9518d8d2b20944d0f097db7d2e22ddc00" diff --git a/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend index 3f505c3f67..c8bccd1d63 100644 --- a/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend +++ b/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend @@ -11,7 +11,7 @@ python link_openpower_plugins() { op_plugins = os.listdir(source_path) for op_plugin in op_plugins: op_plugin_name = os.path.join(source_path, op_plugin) - install_dreport_user_script(op_plugin_name, d) + install_dreport_user_script("dreport.conf", op_plugin_name, d) } DEBUG_COLLECTOR_INSTALL_POSTFUNCS ?= "" diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 83548a7c49..cf9aaaac57 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -67,7 +67,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/openpower-pnor-code-mgmt;branch=master;protocol=https" -SRCREV = "96442c882548d1ae0014d8cbc662e9f8a9225c9b" +SRCREV = "f8e024296d02170b360c894349d900acfd940a4d" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 7c528ee83c..ba12b3f5ac 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI = "git://github.com/openbmc/openpower-proc-control;branch=master;protocol=https" -SRCREV = "01e2f5c69978756418480ea68edbdfdf504b7af8" +SRCREV = "1e43be06b83f426360cab248c60822c242bbd544" DEPENDS += " \ phosphor-logging \ diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb index 76173500d4..392b30a8bf 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb @@ -20,7 +20,7 @@ HOSTIPMI_PROVIDER_LIBRARY += "libhiomap.so" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/openpower-host-ipmi-flash;branch=master;protocol=https" -SRCREV = "564efaea8521f035c6a0c8c371121acec87027a6" +SRCREV = "91f5e37e6f390a5389de4e3a35f664db768ec4c9" EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc index 922e601f2f..11fe19ebaf 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-host-ipmi-oem" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/openpower-host-ipmi-oem;branch=master;protocol=https" -SRCREV = "11b2dbaa3ea542253f6cff6d937a780d169e27eb" +SRCREV = "d9c74acdedc0d92f49c5df03de5b60e53f83c133" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 35e11fd7f7..1261c6790a 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags;branch=master;protocol=https" -SRCREV = "0c1487cb3db64d0781a7a36d78d3d810d1d79c9c" +SRCREV = "a0c724d3d425032213dbd48247d93cc76d61a331" S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc index a569a19cec..87973f33f2 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -2,5 +2,5 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-libhei;branch=master;protocol=https" -SRCREV = "c0115566a038eb2722b74b9ab004c26272388d1f" +SRCREV = "e2e645e8c5e7469573d5bbae080bf553897052e4" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index fa06b7f102..1ec07e0de9 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control;branch=master;protocol=https" -SRCREV = "aeba51cd82278629fb78cbd3cd7dff53ba083c88" +SRCREV = "9a8fe27557808f1f48d2a9a040290a52a7998e76" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 14914f464a..90940ca276 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,7 +2,7 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser;branch=master;protocol=https" -SRCREV = "893bf5debaea1ad9510e5631bd29a0a9cda4c83f" +SRCREV = "78b2cd679b4ea4e9700c8e0150e4f0adc67d22f4" DEPENDS += "\ nlohmann-json \ cli11 \ diff --git a/meta-phosphor/OWNERS b/meta-phosphor/OWNERS index 28212037dd..f93a3f5261 100644 --- a/meta-phosphor/OWNERS +++ b/meta-phosphor/OWNERS @@ -3,8 +3,3 @@ owners: - ed@tanous.net - geissonator@yahoo.com - patrick@stwcx.xyz - -matchers: -- partial_regex: recipes-phosphor/initrdscripts - reviewers: - - zev@bewilderbeest.net diff --git a/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass b/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass index 56aa082823..4d593a03ee 100644 --- a/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass +++ b/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass @@ -1,291 +1,34 @@ -UBOOT_BINARY := "u-boot.${UBOOT_SUFFIX}" -BB_HEADER_BINARY := "BootBlockAndHeader.bin" -BL31_HEADER_BINARY := "bl31AndHeader.bin" -OPTEE_HEADER_BINARY := "teeAndHeader.bin" -KMT_TIPFW_BINARY := "Kmt_TipFwL0_Skmt_TipFwL1.bin" -KMT_TIPFW_BB_BINARY = "Kmt_TipFw_BootBlock.bin" -KMT_TIPFW_BB_BL31_BINARY = "Kmt_TipFw_BootBlock_BL31.bin" -KMT_TIPFW_BB_BL31_TEE_BINARY = "Kmt_TipFw_BootBlock_BL31_Tee.bin" -KMT_TIPFW_BB_UBOOT_BINARY = "u-boot.bin.merged" -SA_KMT_TIPFW_BINARY := "SA_Kmt_TipFwL0.bin" - -BB_BL31_BINARY = "BootBlock_BL31_no_tip.bin" -BB_BL31_TEE_BINARY = "BootBlock_BL31_Tee_no_tip.bin" -BB_BL31_TEE_UBOOT_BINARY = "BootBlock_BL31_Tee_Uboot_no_tip.bin" -BB_BL31_TEE_UBOOT_SA_BINARY = "BootBlock_BL31_Tee_Uboot_no_tip_SA.bin" - -FULL_SUFFIX = "full" MERGED_SUFFIX = "merged" UBOOT_SUFFIX:append = ".${MERGED_SUFFIX}" -UBOOT_HEADER_BINARY := "${UBOOT_BINARY}.${FULL_SUFFIX}" - -IGPS_DIR = "${STAGING_DIR_NATIVE}/${datadir}/npcm8xx-igps" - -BB_BIN = "arbel_a35_bootblock.bin" -BL31_BIN = "bl31.bin" -OPTEE_BIN = "tee.bin" -UBOOT_BIN = "u-boot.bin" -BB_NO_TIP_BIN = "arbel_a35_bootblock_no_tip.bin" FIT_KERNEL_COMP_ALG:df-obmc-static-norootfs = "gzip" FIT_KERNEL_COMP_ALG_EXTENSION:df-obmc-static-norootfs = ".gz" -# Align images if needed -python do_pad_binary() { - TIP_IMAGE = d.getVar('TIP_IMAGE', True) - def Pad_bin_file_inplace(inF, align): - padding_size = 0 - - F_size = os.path.getsize(inF) - - if ((F_size % align) == 0): - return - - padding_size = align - (F_size % align) - - infile = open(inF, "ab") - infile.seek(0, 2) - infile.write(b'\x00' * padding_size) - infile.close() - - if TIP_IMAGE == "True": - Pad_bin_file_inplace(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - '%s' % d.getVar('BB_BIN',True)), int(d.getVar('PAD_ALIGN', True))) - else: - Pad_bin_file_inplace(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - '%s' % d.getVar('BB_NO_TIP_BIN',True)), int(d.getVar('PAD_ALIGN', True))) - - Pad_bin_file_inplace(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - '%s' % d.getVar('BL31_BIN',True)), int(d.getVar('PAD_ALIGN', True))) - - Pad_bin_file_inplace(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - '%s' % d.getVar('OPTEE_BIN',True)), int(d.getVar('PAD_ALIGN', True))) - - Pad_bin_file_inplace(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - '%s' % d.getVar('UBOOT_BIN',True)), int(d.getVar('PAD_ALIGN', True))) -} - -# Prepare the Bootblock and U-Boot images using npcm8xx-bingo -do_prepare_bootloaders() { - local olddir="$(pwd)" - cd ${DEPLOY_DIR_IMAGE} - - bingo ${IGPS_DIR}/BL31_AndHeader.xml \ - -o ${BL31_HEADER_BINARY} - - bingo ${IGPS_DIR}/OpTeeAndHeader.xml \ - -o ${OPTEE_HEADER_BINARY} - - if [ "${TIP_IMAGE}" = "True" ]; then - bingo ${IGPS_DIR}/BootBlockAndHeader_${DEVICE_GEN}_${IGPS_MACHINE}.xml \ - -o ${BB_HEADER_BINARY} - else - bingo ${IGPS_DIR}/BootBlockAndHeader_${DEVICE_GEN}_${IGPS_MACHINE}_NoTip.xml \ - -o ${BB_HEADER_BINARY} - fi - - bingo ${IGPS_DIR}/UbootHeader_${DEVICE_GEN}.xml \ - -o ${UBOOT_HEADER_BINARY} - - cd "$olddir" -} - -check_keys() { - if [ -n "${KEY_FOLDER}" ]; then - echo "local" - else - echo "default" - fi -} - -# Sign images for secure os be enabled and TIP mode only -do_sign_binary() { - if [ "${SECURED_IMAGE}" != "True" -o "${TIP_IMAGE}" != "True" ]; then - return - fi - checked=`check_keys` - if [ "${checked}" = "local" ]; then - bbnote "Sign image with local keys" - key_bb=${KEY_FOLDER}/${KEY_BB} - key_bl31=${KEY_FOLDER}/${KEY_BL31} - key_optee=${KEY_FOLDER}/${KEY_OPTEE} - key_uboot=${KEY_FOLDER}/${KEY_UBOOT} - else - bbnote "Sign image with default keys" - key_bb=${KEY_FOLDER_DEFAULT}/${KEY_BB} - key_bl31=${KEY_FOLDER_DEFAULT}/${KEY_BL31} - key_optee=${KEY_FOLDER_DEFAULT}/${KEY_OPTEE} - key_uboot=${KEY_FOLDER_DEFAULT}/${KEY_UBOOT} - fi - bbnote "BB sign key from ${checked}: ${key_bb}" - bbnote "BL31 sign key from ${checked}: ${key_bl31}" - bbnote "OPTEE sign key from ${checked}: ${key_optee}" - bbnote "UBOOT sign key from ${checked}: ${key_uboot}" - # Used to embed the key index inside the image, usually at offset 0x140 - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Replace_binary_single_byte \ - ${DEPLOY_DIR_IMAGE}/${BB_HEADER_BINARY} 140 ${KEY_BB_INDEX} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Replace_binary_single_byte \ - ${DEPLOY_DIR_IMAGE}/${BL31_HEADER_BINARY} 140 ${SKMT_BL31_KEY_INDEX} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Replace_binary_single_byte \ - ${DEPLOY_DIR_IMAGE}/${OPTEE_HEADER_BINARY} 140 ${SKMT_BL32_KEY_INDEX} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Replace_binary_single_byte \ - ${DEPLOY_DIR_IMAGE}/${UBOOT_HEADER_BINARY} 140 ${SKMT_BL33_KEY_INDEX} - - # Sign specific image with specific key - res=`python3 ${IGPS_DIR}/BinarySignatureGenerator.py Sign_binary \ - ${DEPLOY_DIR_IMAGE}/${BB_HEADER_BINARY} 112 ${key_bb} 16 \ - ${DEPLOY_DIR_IMAGE}/${BB_HEADER_BINARY} ${SIGN_TYPE} 0 ${KEY_BB_ID} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Sign_binary \ - ${DEPLOY_DIR_IMAGE}/${BL31_HEADER_BINARY} 112 ${key_bl31} 16 \ - ${DEPLOY_DIR_IMAGE}/${BL31_HEADER_BINARY} ${SIGN_TYPE} 0 ${KEY_BL31_ID} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Sign_binary \ - ${DEPLOY_DIR_IMAGE}/${OPTEE_HEADER_BINARY} 112 ${key_optee} 16 \ - ${DEPLOY_DIR_IMAGE}/${OPTEE_HEADER_BINARY} ${SIGN_TYPE} 0 ${KEY_OPTEE_ID} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Sign_binary \ - ${DEPLOY_DIR_IMAGE}/${UBOOT_HEADER_BINARY} 112 ${key_uboot} 16 \ - ${DEPLOY_DIR_IMAGE}/${UBOOT_HEADER_BINARY} ${SIGN_TYPE} 0 ${KEY_UBOOT_ID}` - - # Stop full image build process when sign binary got failed - set +e - err=`echo $res | grep -E "missing|Invalid|failed"` - if [ -n "${err}" ]; then - bbfatal "Sign binary failed: keys are not found or invalid. Please check your KEY_FOLDER and KEY definition." - fi - set -e -} - -python do_merge_bootloaders() { - TIP_IMAGE = d.getVar('TIP_IMAGE', True) - SA_TIP_IMAGE = d.getVar('SA_TIP_IMAGE', True) - def Merge_bin_files_and_pad(inF1, inF2, outF, align, align_end): - padding_size = 0 - padding_size_end = 0 - F1_size = os.path.getsize(inF1) - F2_size = os.path.getsize(inF2) - - if ((F1_size % align) != 0): - padding_size = align - (F1_size % align) - - if ((F2_size % align_end) != 0): - padding_size_end = align_end - (F2_size % align_end) - - with open(outF, "wb") as file3: - with open(inF1, "rb") as file1: - data = file1.read() - file3.write(data) - - file3.write(b'\xFF' * padding_size) - - with open(inF2, "rb") as file2: - data = file2.read() - file3.write(data) - - file3.write(b'\xFF' * padding_size_end) - - if TIP_IMAGE == "True": - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BINARY',True)), - int(d.getVar('BB_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BL31_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BL31_BINARY',True)), - int(d.getVar('ATF_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BL31_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('OPTEE_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BL31_TEE_BINARY',True)), - int(d.getVar('OPTEE_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BL31_TEE_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('UBOOT_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_UBOOT_BINARY',True)), - int(d.getVar('UBOOT_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - else: - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BL31_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_BINARY',True)), - int(d.getVar('ATF_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('OPTEE_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_BINARY',True)), - int(d.getVar('OPTEE_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('UBOOT_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_UBOOT_BINARY',True)), - int(d.getVar('UBOOT_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - if SA_TIP_IMAGE == "True": - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_UBOOT_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('SA_KMT_TIPFW_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_UBOOT_SA_BINARY',True)), - int(d.getVar('SA_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - os.rename(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_UBOOT_SA_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_UBOOT_BINARY',True))) - else: - os.rename(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_UBOOT_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_UBOOT_BINARY',True))) -} - -do_pad_binary[depends] += " \ - ${@'npcm8xx-tip-fw:do_deploy' if d.getVar('TIP_IMAGE', True) == 'True' or d.getVar('SA_TIP_IMAGE', True) == 'True' else ''} \ - npcm8xx-bootblock:do_deploy \ - u-boot-nuvoton:do_deploy \ - trusted-firmware-a:do_deploy \ - optee-os:do_deploy \ - npcm7xx-bingo-native:do_populate_sysroot \ - npcm8xx-igps-native:do_populate_sysroot \ - " - # link images for we only need to flash partial image with idea name do_generate_ext4_tar:append() { - cd ${DEPLOY_DIR_IMAGE} - ln -sf ${UBOOT_BINARY}.${MERGED_SUFFIX} image-u-boot - ln -sf ${DEPLOY_DIR_IMAGE}/${FLASH_KERNEL_IMAGE} image-kernel - ln -sf ${S}/ext4/${IMAGE_LINK_NAME}.${FLASH_EXT4_BASETYPE}.zst image-rofs - ln -sf ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.rwfs.${FLASH_EXT4_OVERLAY_BASETYPE} image-rwfs - ln -sf ${IMAGE_NAME}.rootfs.wic.gz image-emmc.gz -} - -addtask do_pad_binary before do_prepare_bootloaders -addtask do_sign_binary before do_merge_bootloaders after do_prepare_bootloaders -addtask do_prepare_bootloaders before do_generate_static after do_generate_rwfs_static -addtask do_prepare_bootloaders before do_generate_static_norootfs after do_image_cpio -addtask do_merge_bootloaders before do_generate_static after do_sign_binary -addtask do_merge_bootloaders before do_generate_static_norootfs after do_sign_binary -addtask do_merge_bootloaders before do_generate_ext4_tar after do_prepare_bootloaders - -# Include the full bootblock and u-boot in the final static image -python do_generate_static:append() { - _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - 'u-boot.%s' % d.getVar('UBOOT_SUFFIX',True)), - int(d.getVar('FLASH_UBOOT_OFFSET', True)), - int(d.getVar('FLASH_KERNEL_OFFSET', True))) -} - -do_make_ubi:append() { - # Concatenate the uboot and ubi partitions - dd bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} \ - if=${DEPLOY_DIR_IMAGE}/u-boot.${UBOOT_SUFFIX} \ - of=${IMGDEPLOYDIR}/${IMAGE_NAME}.ubi.mtd -} + cd ${S}/ext4 + install -m 644 image-u-boot ${IMGDEPLOYDIR}/image-u-boot + cd ${IMGDEPLOYDIR} + ln -sf ${IMAGE_LINK_NAME}.wic.gz image-emmc.gz + ln -sf ${FLASH_KERNEL_IMAGE} image-kernel + ln -sf ${IMAGE_LINK_NAME}.rwfs.${FLASH_EXT4_OVERLAY_BASETYPE} image-rwfs +} + +# clean up image-u-boot because we may generate different size bootbloder +# with different build flags. Function do_generate_image_uboot_file use +# notrunc flag which may generate redundant image if we don't clean deploy. +do_clean_image_uboot() { + rm -rf ${IMGDEPLOYDIR}/image-u-boot +} + +addtask do_clean_image_uboot after do_rootfs +do_make_ubi[depends] += "npcm8xx-bootloader:do_deploy" +do_generate_ubi_tar[depends] += "npcm8xx-bootloader:do_deploy" +do_generate_static_tar[depends] += "npcm8xx-bootloader:do_deploy" +do_generate_static[depends] += " \ + npcm8xx-bootloader:do_deploy \ + ${PN}:do_clean_image_uboot \ +" +do_generate_static_norootfs[depends] += "npcm8xx-bootloader:do_deploy" +do_generate_ext4_tar[depends] += "npcm8xx-bootloader:do_deploy" -do_make_ubi[depends] += "${PN}:do_prepare_bootloaders" -do_generate_ubi_tar[depends] += "${PN}:do_prepare_bootloaders" -do_generate_ubi_tar[depends] += "${PN}:do_merge_bootloaders" -do_generate_static_tar[depends] += "${PN}:do_prepare_bootloaders" -do_generate_static_tar[depends] += "${PN}:do_merge_bootloaders" -do_generate_static_norootfs[depends] += "${PN}:do_prepare_bootloaders" -do_generate_static_norootfs[depends] += "${PN}:do_merge_bootloaders" -do_generate_ext4_tar[depends] += "${PN}:do_prepare_bootloaders" -do_generate_ext4_tar[depends] += "${PN}:do_merge_bootloaders" diff --git a/meta-phosphor/classes/phosphor-debug-collector.bbclass b/meta-phosphor/classes/phosphor-debug-collector.bbclass index d5d49a2dbb..ca1a003ea4 100644 --- a/meta-phosphor/classes/phosphor-debug-collector.bbclass +++ b/meta-phosphor/classes/phosphor-debug-collector.bbclass @@ -1,5 +1,67 @@ -bmc_dump_path="/var/lib/phosphor-debug-collector/dumps" +bmc_dump_path = "/var/lib/phosphor-debug-collector/dumps" dreport_plugin_dir = "${datadir}/dreport.d/plugins.d" dreport_include_dir = "${datadir}/dreport.d/include.d" dreport_conf_dir = "${datadir}/dreport.d/conf.d" dreport_dir = "${datadir}/dreport.d/" + +# Make the links for a single user plugin script +# Create user directories based on the dump type value in the config section +# Create softlinks for the base scripts in the user directories +def install_dreport_user_script(dreport_conf, script_path, d): + import re + import configparser + + #Set variables + config = ("config:") + section = "DumpType" + + #Read the user types from the dreport_conf file + configure = configparser.ConfigParser() + conf_dir = d.getVar('D', True) + d.getVar('dreport_conf_dir', True) + confsource = os.path.join(conf_dir, dreport_conf) + configure.read(confsource) + + #Extract the script name, and open the user script file + dreport_dir = d.getVar('D', True) + d.getVar('dreport_dir', True) + script = os.path.basename(script_path) + file = open(script_path, "r") + + #softlink to the script + srclink = os.path.join(d.getVar('dreport_plugin_dir', True), script) + + for line in file: + if not config in line: + continue + + revalue = re.search('[0-9]+.[0-9]+', line) + if not revalue: + bb.warn("Invalid format for config value =%s" % line) + continue + + #Regex search to identify which directories get softlinks to the script + parse_value = revalue.group(0) + config_values = re.split(r'\W+', parse_value, 1) + if(len(config_values) != 2): + bb.warn("Invalid config value=%s" % parse_value) + break; + priority = config_values[1] + types = [int(d) for d in str(config_values[0])] + + #For every dump type identified from 'types',create softlink to script + for type in types: + if not configure.has_option(section, str(type)): + bb.warn("Invalid dump type id =%s" % (str(type))) + continue + + #create directories based on the usertype + typestr = configure.get(section, str(type)) + destdir = os.path.join(dreport_dir, ("pl_" + typestr + ".d")) + if not os.path.exists(destdir): + os.makedirs(destdir) + + #Create softlinks to the user script in the directories + linkname = "E" + priority + script + destlink = os.path.join(destdir, linkname) + os.symlink(srclink, destlink) + + file.close() diff --git a/meta-phosphor/conf/distro/include/chrony.inc b/meta-phosphor/conf/distro/include/chrony.inc new file mode 100644 index 0000000000..a3d7ed964c --- /dev/null +++ b/meta-phosphor/conf/distro/include/chrony.inc @@ -0,0 +1,2 @@ +DISTRO_FEATURES += "chrony" +DISTROOVERRIDES .= ":df-chrony" diff --git a/meta-phosphor/conf/distro/include/google-authenticator-libpam.inc b/meta-phosphor/conf/distro/include/google-authenticator-libpam.inc new file mode 100644 index 0000000000..9b023c4cf7 --- /dev/null +++ b/meta-phosphor/conf/distro/include/google-authenticator-libpam.inc @@ -0,0 +1,2 @@ +DISTRO_FEATURES += "google-authenticator-libpam" +DISTROOVERRIDES .= ":df-google-authenticator-libpam" diff --git a/meta-phosphor/docs/supported-machines.md b/meta-phosphor/docs/supported-machines.md new file mode 100644 index 0000000000..b2ae21f597 --- /dev/null +++ b/meta-phosphor/docs/supported-machines.md @@ -0,0 +1,97 @@ +# Supported machines + +The following machine product or codenames have some code which has been +contributed to the project for support. The specific level of functionality +supported is unknown and has no level of warranty, promise of future +development, or bug-fix guarantee. + +Systems which are actively developed and maintained by vendors are often +covered by [Jenkins](https://jenkins.openbmc.org/job/ci-openbmc/) CI testing. + +## List + +* amd + * daytonax + * ethanolx +* ampere + * mtjade + * mtmitchell +* asrock + * e3c246d4i + * e3c256d4i + * romed8hm3 + * spc621d8hm3 + * x570d4u +* bytedance + * g220a +* delta + * ahe50dc +* evb + * evb-ast2500 + * evb-ast2600 + * evb-npcm750 + * evb-npcm845 + * fvp +* facebook + * bletchley + * catalina + * greatlakes + * harma + * minerva + * tiogapass + * ventura + * yosemite4 + * yosemite4n + * yosemitev2 +* fii + * kudo + * mori +* hpe + * dl360-g11 + * dl360poc + * dl385-g11 + * rl300-g11 +* ibm + * genesis3 + * huygens + * p10bmc + * palmetto + * pstbmc + * romulus + * sbp1 + * system1 + * witherspoon + * witherspoon-tacoma +* ieisystem + * fp5280g3 + * nf5280m7 +* ingrasys + * zaius +* intel + * s2600wf +* inventec + * starscream + * transformers +* qualcomm + * qcom-dc-scm-v1 +* quanta + * f0b + * gbs + * olympus-nuvoton + * quanta-q71l + * s6q +* supermicro + * x11spi +* tyan + * s7106 + * s8036 +* ufispace + * ncplite +* wistron + * lannister +* yadro + * nicole + * tatlin-archive-x86 + * vegman-n110 + * vegman-rx20 + * vegman-sx20 diff --git a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb index 9c514612bd..b6bf39baba 100644 --- a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb +++ b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "C++ bindings for linux gpio APIs." HOMEPAGE = "http://github.com/openbmc/gpioplus" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRCREV = "05f530218be779630e9d428ef44b073caad4f2d5" +SRCREV = "b80c584ead512ad89d5544b16b5d10074d6e510e" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-extended/libbej/libbej_git.bb b/meta-phosphor/recipes-extended/libbej/libbej_git.bb index 4a5e559e91..bb1f0050f5 100644 --- a/meta-phosphor/recipes-extended/libbej/libbej_git.bb +++ b/meta-phosphor/recipes-extended/libbej/libbej_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Binary Encoded JSON library" DESCRIPTION = "Used to decode Redfish Device Enablement (RDE) BEJ" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRCREV = "2bc745a3a01c21b44f8b3cf9e831a94cc330c649" +SRCREV = "be27f2e9bfab32d9281496614e3d15a49a4c6aa9" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb index f682b62c95..71af2be9c9 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb @@ -9,6 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" DEPENDS += " \ ${PYTHON_PN}-inflection-native \ + ${PYTHON_PN}-jsonschema-native \ ${PYTHON_PN}-mako-native \ ${PYTHON_PN}-pyyaml-native \ " diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index c4e7efdb96..e133d324b0 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc @@ -3,4 +3,4 @@ PR = "r1" PV ?= "1.0+git${SRCPV}" SRC_URI += "git://github.com/openbmc/sdbusplus;branch=master;protocol=https" -SRCREV = "03b2c26c8d0b97e943a0418378abbe4828184423" +SRCREV = "ebe01794cde319728a1734d88f9ff61f597c707b" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index 28b76d0e20..e000c40ed5 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -4,6 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS += " \ ${PYTHON_PN}-inflection-native \ + ${PYTHON_PN}-jsonschema-native \ ${PYTHON_PN}-mako-native \ ${PYTHON_PN}-pyyaml-native \ boost \ diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb index eca01928fe..cc95eea482 100644 --- a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb +++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb @@ -7,7 +7,7 @@ DEPENDS += " \ stdplus \ systemd \ " -SRCREV = "ac794347f1d7c5ad5368a502ec913490127db53b" +SRCREV = "18db9a3e47e7ebdedae5b698bfb1068366ff6824" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb index 8d7789b346..eb467ad484 100644 --- a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb +++ b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb @@ -8,7 +8,7 @@ DEPENDS += " \ fmt \ liburing \ " -SRCREV = "7aa2a42be328438726a2aff665d649444a1a54d4" +SRCREV = "d8e0af50b1ace047186156bc56e8ff998344c1de" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb index 94d9c56e86..68ac08fb04 100644 --- a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb +++ b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb @@ -3,12 +3,12 @@ DESCRIPTION = "obmc-ikvm is a vncserver for JPEG-serving V4L2 devices to allow i LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e" DEPENDS = " libvncserver systemd sdbusplus phosphor-logging phosphor-dbus-interfaces" -SRCREV = "1ece8e3c72c256af0b921ce0eed296b00364d79d" +SRCREV = "8e68affb7b8007d6d8cea5e7eb17b0fe0f546a35" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/obmc-ikvm;branch=master;protocol=https" -SYSTEMD_SERVICE:${PN} += "start-ipkvm.service" +SYSTEMD_SERVICE:${PN} += "obmc-ikvm.service" S = "${WORKDIR}/git" inherit pkgconfig meson systemd diff --git a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb index c7d3e510e8..a28ba03549 100644 --- a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb @@ -14,7 +14,7 @@ DEPENDS = " boost \ phosphor-logging \ sdbusplus \ systemd " -SRCREV = "c65f0a3aa1b77917006918908681350def2140e3" +SRCREV = "ea6a65f0e893ef608135e7ab871a22349edaa3a2" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb index c5b87644df..bc070842ad 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -11,7 +11,7 @@ DEPENDS = " \ sdbusplus \ sdeventplus \ " -SRCREV = "5d4f7932b3456f34745d344af5f5e2512557b772" +SRCREV = "cbbec8d9907cba4f2d76af065055e5f5333bd064" PACKAGECONFIG ??= "bmcweb-cert authority-cert" PACKAGECONFIG[ibm-hypervisor-cert] = "-Dca-cert-extension=enabled,-Dca-cert-extension=disabled" PACKAGECONFIG[bmcweb-cert] = "-Dconfig-bmcweb=enabled,-Dconfig-bmcweb=disabled" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb index 01585b755b..aa260f34e2 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb @@ -9,7 +9,7 @@ DEPENDS += " \ phosphor-dbus-interfaces \ phosphor-logging \ " -SRCREV = "010035ee96cd6b32d1bff77eb5110d030f4e2684" +SRCREV = "d36b6b1d3887f8545b1558f8f0d946a9c9785a72" PACKAGECONFIG ??= "signals handler" PACKAGECONFIG[signals] = ",,gpioplus nlohmann-json," PACKAGECONFIG[handler] = ",,,${VIRTUAL-RUNTIME_obmc-host-state-manager} ${VIRTUAL-RUNTIME_obmc-chassis-state-manager}" diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 7af2351bea..1de26ee1e3 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" DEPENDS = "boost \ dbus \ nlohmann-json \ + phosphor-logging \ sdbusplus \ valijson \ " -SRCREV = "0a78b90d2fce79b205a18da80d2a10998599ff15" +SRCREV = "733fceee89c56aca8c7291d9049cdd6f3b95c7bf" PACKAGECONFIG ??= "ipmi-fru" PACKAGECONFIG[ipmi-fru] = "-Dfru-device=true, -Dfru-device=false, i2c-tools," PACKAGECONFIG[validate-json] = "-Dvalidate-json=true, \ diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 517cc7982f..968cb48adb 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -4,13 +4,16 @@ HOMEPAGE = "http://github.com/openbmc/obmc-console" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" DEPENDS += "autoconf-archive-native \ + iniparser \ systemd \ + libgpiod \ " -SRCREV = "46d9ef298f2e26f4c513fedff3b8a26fdf4b2d35" +SRCREV = "6498f9fa9792ef0c14dab4aca3d38a674f6402cd" PACKAGECONFIG ??= "udev ssh" PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev" PACKAGECONFIG[concurrent-servers] = "-Dconcurrent-servers=true,-Dconcurrent-servers=false," PACKAGECONFIG[ssh] = "-Dssh=enabled,-Dssh=disabled" +EXTRA_OEMESON = "-Dtests=false" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb index 7b493b1361..4f6b1aac1a 100644 --- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb @@ -8,7 +8,7 @@ DEPENDS += "sdbusplus" DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-dbus-interfaces" -SRCREV = "e101030b37eb8f64616a33eb0ef71d67a19bf7d7" +SRCREV = "c0e77cf805dbc85608b92ec593513f111619e5b8" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/dbus-top/dbus-top_git.bb b/meta-phosphor/recipes-phosphor/dbus-top/dbus-top_git.bb index a274407c24..39248dc66f 100644 --- a/meta-phosphor/recipes-phosphor/dbus-top/dbus-top_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus-top/dbus-top_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/dbus-top;protocol=https;branch=main" -SRCREV = "0725dbb8eca6a47d6167f58643aabe85cf3d5607" +SRCREV = "e74a788268d51f2f0f95e09840f96cf83aab9090" S = "${WORKDIR}/git" inherit meson pkgconfig diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 3289f4cfdf..fc19caa5b8 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -7,7 +7,7 @@ DEPENDS += " \ sdbusplus \ systemd \ " -SRCREV = "e2c9bc74f2b8c0e78c305894289f8938d75ee108" +SRCREV = "5133c7bfa8127e8a4ea339c439675ad018911363" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb index b648966f7e..9fc30fa6b5 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -16,7 +16,7 @@ DEPENDS += " \ ${PYTHON_PN}-setuptools-native \ ${PYTHON_PN}-mako-native \ " -SRCREV = "7fe55e91370572fe92b52cf511e18bcbe529bab1" +SRCREV = "eab4f8c0a047e1aaedf74d6144d83132d1b003de" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb index 0a2f77ccb1..653468450a 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb @@ -9,7 +9,7 @@ DEPENDS += "libtinyxml2" DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" DEPENDS += "cli11" -SRCREV = "fb853663a2e3ca3366bf96a21a0a045f69d7ed2a" +SRCREV = "7a93d516522f58b887a05cc93ff27a6674601e5f" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 1af0a71ba3..87a1838b42 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector;branch=master;protocol=https" -SRCREV = "50646c2de021b8cfba21d63f656f5ad559cb2818" +SRCREV = "973b291eb264ae8de4119c8d62fd16230926d257" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index c28aa3bb1a..c16dd87ea7 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -126,49 +126,7 @@ install_dreport_include_scripts() { install -m 0755 ${S}/tools/dreport.d/include.d/* \ ${D}${dreport_include_dir}/ } -# Make the links for a single user plugin script -# Create user directories based on the dump type value in the config section -# Create softlinks for the base scripts in the user directories -def install_dreport_user_script(script_path, d): - import re - import configparser - #Read the user types from the dreport.conf file - configure = configparser.ConfigParser() - conf_dir = d.getVar('D', True) + d.getVar('dreport_conf_dir', True) - confsource = os.path.join(conf_dir, "dreport.conf") - configure.read(confsource) - config = ("config:") - section = "DumpType" - dreport_dir = d.getVar('D', True) + d.getVar('dreport_dir', True) - script = os.path.basename(script_path) - srclink = os.path.join(d.getVar('dreport_plugin_dir', True), script) - file = open(script_path, "r") - for line in file: - if not config in line: - continue - revalue = re.search('[0-9]+.[0-9]+', line) - if not revalue: - bb.warn("Invalid format for config value =%s" % line) - continue - parse_value = revalue.group(0) - config_values = re.split(r'\W+', parse_value, 1) - if(len(config_values) != 2): - bb.warn("Invalid config value=%s" % parse_value) - break; - priority = config_values[1] - types = [int(d) for d in str(config_values[0])] - for type in types: - if not configure.has_option(section, str(type)): - bb.warn("Invalid dump type id =%s" % (str(type))) - continue - typestr = configure.get(section, str(type)) - destdir = os.path.join(dreport_dir, ("pl_" + typestr + ".d")) - if not os.path.exists(destdir): - os.makedirs(destdir) - linkname = "E" + priority + script - destlink = os.path.join(destdir, linkname) - os.symlink(srclink, destlink) - file.close() + #Make the links for all the plugins python install_dreport_user_scripts() { source = d.getVar('S', True) @@ -176,5 +134,5 @@ python install_dreport_user_scripts() { scripts = os.listdir(source_path) for script in scripts: srcname = os.path.join(source_path, script) - install_dreport_user_script(srcname, d) + install_dreport_user_script("dreport.conf", srcname, d) } diff --git a/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb b/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb index 92016d4805..94603bfbbe 100644 --- a/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb +++ b/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb @@ -6,7 +6,7 @@ DEPENDS += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" -SRCREV = "bb764e49c9cc589d2d5c6478a4f3923bd5acc998" +SRCREV = "28b153cbb9ab588b97f801d29f29d2d0ccbce47a" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 6e9c54c55e..1ca3009afc 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence;branch=master;protocol=https" -SRCREV = "99914e5e9ce30f6a6b7346fcf592e4b2845b5174" +SRCREV = "35fb3a0508c4d279f9b491ed58c8c69fa588ad68" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index fc7ae48d45..cd43826566 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -17,7 +17,7 @@ DEPENDS += "cli11" DEPENDS += "boost" # We depend on this to be built first so we can build our providers. DEPENDS += "phosphor-ipmi-host" -SRCREV = "5d897e2a20a5107d4677d4da4b1ec9b0eab9e006" +SRCREV = "bd63bcaca2ac9edf1778136cf240e3bbe8b31566" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/flash/files/OpenBMC.priv b/meta-phosphor/recipes-phosphor/flash/files/OpenBMC.priv index 223d318098..e1ea01d75c 100644 --- a/meta-phosphor/recipes-phosphor/flash/files/OpenBMC.priv +++ b/meta-phosphor/recipes-phosphor/flash/files/OpenBMC.priv @@ -1,16 +1,61 @@ +!!! Important WARNING About This Private Key !!! + +DO NOT STRIP THIS WARNING FROM THIS PRIVATE KEY + +This private key is being intentionally released to enable the developer +community to sign code images. For true security, a different set of production +signing keys should be used, and the private production signing key should be +carefully guarded. + -----BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAPvSDLu6slkP1gri -PaeQXL9ysD69J/HjbBCIQ0RPfeWBb75US1tRTjPP0Ub8CtH8ExVf8iF1ulsZA78B -zIjBYZVp9pyD6LbpZ/hjV7rIH6dTNhoVpdA+F8LzmQ7cyhHG8l2JMvdunwF2uX5k -D4WDcZt/ITKZNQNavPtmIyD5HprdAgMBAAECgYEAuQkTSi5ZNpAoWz76xtGRFSwU -zUT4wQi3Mz6tDtjKTYXasiQGa0dHC1M9F8fDu6BZ9W7W4Dc9hArRcdzEighuxoI/ -nZI/0uL89iUEywnDEIHuS6D5JlZaj86/nx9YvQnO8F/seM+MX0EAWVrd5wC7aAF1 -h6Fu7ykZB4ggUjQAWwECQQD+AUiDOEO+8btLJ135dQfSGc5VFcZiequnKWVm6uXt -rX771hEYjYMjLqWGFg9G4gE3GuABM5chMINuQQUivy8tAkEA/cxfy19XkjtqcMgE -x/UDt6Nr+Ky/tk+4Y65WxPRDas0uxFOPk/vEjgVmz1k/TAy9G4giisluTvtmltr5 -DCLocQJBAJnRHx9PiD7uVhRJz6/L/iNuOzPtTsi+Loq5F83+O6T15qsM1CeBMsOw -cM5FN5UeMcwz+yjfHAsePMkcmMaU7jUCQHlg9+N8upXuIo7Dqj2zOU7nMmkgvSNE -5yuNImRZabC3ZolwaTdd7nf5r1y1Eyec5Ag5yENV6JKPe1Xkbb1XKJECQDngA0h4 -6ATvfP1Vrx4CbP11eKXbCsZ9OGPHSgyvVjn68oY5ZP3uPsIattoN7dE2BRfuJm7m -F0nIdUAhR0yTfKM= +MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQDO7vWM6ZOylO6T +lxDiRWgKCFauAxMVM4A7NmgZxfV73xqTzAtIzzF9CIKUEhqMT4LhNy1rU2oUUivH +4BZO2oC6yFafEPVla2oYAeWtXJmQTixYgJplKQCtLzFtb57DQJpl9Od0RVFC61yg +4LihsiENnRjncLPP7OkL68ssiELu+WxazDtewmVYQEHOMWQa2zDh9yrWsblLAyo4 +gsG9rdwWjqIUnZkoeJuT7zks4Jes4qAtQUuZhCxMcvwvOq8od3e4nLVFnyUOGMpE +jdDDGddKh5e+9BJGqkfsLCT9UFTYi62Ifuxl1Gp963cZLapJS0CneHIrG3gapiCO +ea4TH/xySfts2jpl7DnEIUo3Qs0rZrOLQDLVVXvRJvHdsVoZcSRCD8Jf0YTQ6tT7 +j3ejUOH8j3DGkgKRHGtH7yyCgmDyPYVQdEu3q4E1NBwODAyxppYGBqkwpSGRnf6q +E6i5rQJuoPCm3rb9ZmoHVzeb8HW3ofYfNnZNuae/2LdEtJ/cFs8ILXP5AKiaKpmS +H4GB8GUcgRMITGI1pcXhevO2wHi0ReJkme+m5GpuVIg9LpTs6YvvNoFeu6ux7up/ +TjTa+Zdy3tLUZvvIIlS2Asu32uiGBFjZ2WiLeHq+ScaDsSyEJQkoYLqv+3MoPKhy +iX4yanZCwG3yx68RDe9qQBt6WXqAEwIDAQABAoICAA6OxAqKQiA9lv0eEwuAC34t +MP/j6ntC2MIRpUgu44K34tRD9gVEwjwEFb+Z+HEnhNMYQSM8RomwcDELBDa+63B4 +eJOPK1xbrqaKt6A3E/yRa1A8l+AG/uuwFr+WqyocSOBkVsYYvEtDaIxO0t5ZPDcL +dr2NcbDuf0Sd7XiwC1lphaRrmr+jWGLZfmellN/IzMsQytw4u4rZ6aX5GO0hpoqV +tTRTE/vDZFqHaVPNZw48ET2tysY9hKpKKpCeBcWIhg0gRSZlOEOiHdStz2JyVnGB +UX0XCZQcFZw5TM7fUGC9jtM77qCJTYaXQpUsX77xQtalRA7hS1VAm6i6SbNBvE4j +le2JWBmOCbh9A/Dqnxh/3R2ZpsbffMG3O4KLkObquP8QGsItxwZYm4Bo37/HS6ki +1Ilym014DUT1+mTybi+2TjlPgh2LeECo1lbgFRJ/p9Vs7TJV2jeVPKDHF72cVvp2 +Ly6dGQVtBPz7/HpvxwYA5TJstNWgiU1sZPwgVzhgeZEKt5DO3Da6DVoXt96/tHk4 +577MA9P4qYLJldq5rfFW3IeyGUjLZ1yLmmDWj2Hz2IQe/YqrHHQH5UO6xxhrjuCa +FrAOv7wJxmmbhZ9AptmR0PnmTU79LM8gxyNY9nn0R+XMJd/3UvrrjzJWw+LUGdhC +zG0pF0JGMb71wHwlmmUpAoIBAQDyUHAcpgWtCl70qVpHnAG6WnsRP6ZS0dtBjqnN +l9GachlNLOyQHfKcs7Vj7dkrcumSTbZ7zzgsazQcwfJMEvVq2RS8iTrtKAq+yYmj +uejaJ3gAuiaU5Shv9PL+P25zGlwJtqEADYjiSrzO1ZRgM1M31tlH7f0wjYIrV6LP +5P5HYFVDFujsiWY9oUZ+PFaCWPRQ2P47zF3ocbiqD9TbFSwNfq5B2WPLCURExQAh +XT/GH8Devz2M79CWKjvDMQutZ8dcLZx6JNhpre5JoNbAxE2u9jIM++srSb41zArE +2lcy2tqNAWJV5jhFz5DZ451kvz7AKLaehWYj7D+TvX4V4UwpAoIBAQDanvWQCoop +Loh5s5tYwHB/iFE+jzVvyrytfRcDIjrBaCDCQrObgh/fllk44h9DpKHbM4nYlMpU +GXOsQCVkE/SiJakzeXfoecCJ3ebp+mlBILs79AWlfETJFLx1FKJQOQoraoICVFxx +jcI/OvGlABRLvRYhNnq22//IgLlyKWfO0yS6FASIjriIjDwibKZqHt+DJ98Lv2d+ +1fsOw/Ai7e2e3nK0+2vmXusZAwpcPuTYb+5LOnHE7GbPecuM22BSTiUAekoHq3/k +fdYw+od4B4BJB0bAnRVu7y+TQXRkZ462RvP05AYXUzudjknv48mFuBslrybr3f50 +aIwtFADeJrHbAoIBAQCYcEwnabaWZrjX+BZoiFd58eQMNNugrI7fzi06vrDJFdCf +AY0NGRoAxPlvFTmTIOaZ+LO9bd5r60FMeiLBAwhLoKdv+HEOsysXXVhunM1FOKFA +69rLvuJSlGmt0x/b35BZOABPNTSRD+15vVlrr75BmbL1kl2/BrcGJ0qwuOHS62KY +IziDXejpCqV7UuAlfmqs1eYSnn3RdoFy0yTYcphVIQXlPSqPl5PQI5LyamRtcpp2 +Rx8ko9W4MneIUzmCbJA5iCQxny5aRWZsAXg4qwYn9JAGJRGMGQdFdsirkKRcxNvK +6zz+xydNm8gHmy7wK3QBlVtVnJxmKwDQI9zHTQYJAoIBAQDVKrXJ81zv9r1/3U8V +5N5MnACL/VtfW9FJYHU1ywR7XSrEAAHdGa42dwUcX++YJ0ji0YgRNFNsWTzesdVD +lemsyQgIduIiPcUtKL9lWZOTu3SVasSurVLstllj1/DERDnUR4/o8ZUJ6+2Bddn0 +xvUDPKX9UH+rGSx4tnscA5+CnYJsJeSdunvYONTRxBsn0l6iJhhn/gPOOpsHtKnL +hS9y/vfd3GFDST33L23EsFa3a7xwgdY460D8AIgnGij7V9Lgel0AyYp0ovZc34uD +z9yYWI32dbRWbMZ40RPKaudOeDSbjlMaH0A7ymfxjqwKxI9D2VscFWNs4hv8QErw +Uc6NAoIBAQCmWWyARU/x4m7K4vNAWjD2Qx6R7PAdLs/6ZBqWw0RSpRHlYr73Qggw +dCK+LrsR0O7y1KW2WUfrJmzHEdFQEYcZ1vZWeN85dMLVhYmazSXlaIegRE4FmMUa +DbzViUJA60Y4D/l6QWqdhxdZZe81QgqyLPXAv/e5esxRIi8yvEYhCx4pq7QtWYBm +tvQnPaZd8emlKARivF2ecGDlWzhf4NotDDtFRT4jOHZKUC58uVjbiXJ445Vimqlb +Da7noVGwDQ93Ib1qyAilzFY5gWDeMyCnSQpnlVRHQ/8vlwLDsZs1kVau6k8WlcpM +JbmuCRNy7YvALVTzyQsQ4yw87BoONt1L -----END PRIVATE KEY----- diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 5589f02849..ac7075b7a8 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt;branch=master;protocol=https" -SRCREV = "2311b64c99b39fc28060c38e8a4d8e30b8fad075" +SRCREV = "c111b93ced1760d90e5c84598f67367383387f8c" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index c53c8740f8..8579500e78 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -75,7 +75,7 @@ RPROVIDES:${PN}-version += " \ virtual-obmc-image-manager \ " -FILES:${PN}-version += "${bindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf" +FILES:${PN}-version += "${bindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf ${bindir}/phosphor-software-manager " FILES:${PN}-download-mgr += "${bindir}/phosphor-download-manager" FILES:${PN}-updater += " \ ${bindir}/phosphor-image-updater \ @@ -100,7 +100,10 @@ ALLOW_EMPTY:${PN} = "1" PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}" DBUS_PACKAGES = "${SOFTWARE_MGR_PACKAGES}" -DBUS_SERVICE:${PN}-version += "xyz.openbmc_project.Software.Version.service" +DBUS_SERVICE:${PN}-version += " \ + xyz.openbmc_project.Software.Version.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'software-update-dbus-interface', 'xyz.openbmc_project.Software.Manager.service', '', d)} \ +" DBUS_SERVICE:${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service" DBUS_SERVICE:${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service" DBUS_SERVICE:${PN}-sync += "xyz.openbmc_project.Software.Sync.service" diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb index 23210b135b..6ed748619d 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -12,7 +12,7 @@ DEPENDS += "boost" DEPENDS += "libgpiod" DEPENDS += "cli11" DEPENDS += "nlohmann-json" -SRCREV = "9f8459a55d1f0cb42c5d99c0759b20739092b841" +SRCREV = "8377d59c61c653a34df1c3c4ca72219eceb0b43b" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb index 75f1d2a4af..550c41199f 100644 --- a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb @@ -8,7 +8,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" -SRCREV = "edc9b36980012f8eb6cf74e5e515f73d66f21441" +SRCREV = "ce8b5ae4e7fc1c88cdd85dab8c007cd14408d93f" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb index 67ccdb3e5f..a4a7fc9ada 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -8,7 +8,7 @@ DEPENDS += "sdeventplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "systemd" DEPENDS += "libgpiod" -SRCREV = "95aa444074ec354485cce3d8c858ea05814d1fb9" +SRCREV = "d62ef5594335929568318f2fbabc80bbf96cbdea" PACKAGECONFIG ?= "" PACKAGECONFIG[7seg] = "-D7seg=enabled,-D7seg=disabled,,udev" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index d85887b311..b50c4885e6 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -1,19 +1,20 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" DEPENDS = " \ - openssl \ - zlib \ boost \ - libpam \ - sdbusplus \ + cli11 \ gtest \ - nlohmann-json \ + libpam \ libtinyxml2 \ nghttp2 \ + nlohmann-json \ + openssl \ + sdbusplus \ + zlib \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest', '', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gmock', '', d)} \ " -SRCREV = "ff0a08815ee289a7a67c31e9bb460cb240daad67" +SRCREV = "26d3b0fb502ba522c33621e43c9679d47c7db2d2" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/bmcweb.git;branch=master;protocol=https" @@ -32,13 +33,13 @@ PACKAGECONFIG ??= "mutual-tls-auth" PACKAGECONFIG[insecure-redfish-expand]="-Dinsecure-enable-redfish-query=enabled" PACKAGECONFIG[mutual-tls-auth]="-Dmutual-tls-auth=enabled,-Dmutual-tls-auth=disabled" -MUTUAL_TLS_PARSING="username" +MUTUAL_TLS_PARSING="CommonName" EXTRA_OEMESON = " \ --buildtype=minsize \ -Dtests=${@bb.utils.contains('PTEST_ENABLED', '1', 'enabled', 'disabled', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'mutual-tls-auth', \ - '-Dmutual-tls-common-name-parsing=' + d.getVar('MUTUAL_TLS_PARSING', True), \ + '-Dmutual-tls-common-name-parsing-default=' + d.getVar('MUTUAL_TLS_PARSING', True), \ '', d)} \ " diff --git a/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb index b3afd4b704..0b43f8a8a3 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS += "systemd" DEPENDS += "autoconf-archive-native" -SRCREV = "99f391bafe6ecb91ea46515808431f185ceb0a32" +SRCREV = "8375b7842d5a06cbb7d87abf2dbdd6b56d48c693" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index 8df06ee33d..c5485522b3 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-inventory-manager;branch=master;protocol=https" -SRCREV = "58a0c359fb9984698a702a3580ddee0a848c05e3" +SRCREV = "d8fba8bec76389c4a21d000fb17b07a9cea3bf0c" diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index cbd7fd4b21..b2f097b03d 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "This package provides a library for the BMC and host for core blo HOMEPAGE = "http://github.com/openbmc/ipmi-blob-tool" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "e78b3180042572c57d6fbe74d3b93a52ea9f553b" +SRCREV = "b80a025088d489253a1d7ead5de5e097484e8a52" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb index cfc52a916a..f1ace8dcf7 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb @@ -7,7 +7,7 @@ DEPENDS += "phosphor-ipmi-blobs" DEPENDS += "phosphor-logging" DEPENDS += "nanopb-generator-native" DEPENDS += "nanopb-runtime" -SRCREV = "7e145862d173042a5a7ee7b031a4066192ff77fd" +SRCREV = "719b65fd9eac8517029d89d300de11c2cc787bcc" PACKAGECONFIG ??= "" PACKAGECONFIG[blobtool] = "-Dblobtool=enabled,-Dblobtool=disabled" PV = "1.0+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb index 7232dc41e1..659e4c122a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -8,7 +8,7 @@ DEPENDS += " \ phosphor-ipmi-host \ phosphor-logging \ " -SRCREV = "0dea6fa8342c7649c91c3fbc7adf15ec02f9bd7d" +SRCREV = "97e69ca106fc2415f89370eea36fb674435b5bdb" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb index 0b43397bd4..e3df5a6280 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS += "systemd" PROVIDES += "virtual/obmc-host-ipmi-hw" -SRCREV = "fc0fa20df27a48437575f0486b67883513b5cc1e" +SRCREV = "53757b38f3e6d9f504fb8d5ce2db32ac5a034b8a" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb index 103bdbd42b..fae2ccb90a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-ethstats" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS += "phosphor-ipmi-host" -SRCREV = "472df7ed943c0583e4b4cb888a01231795bd3dbe" +SRCREV = "ed0a15ed70567aa78a569d1b5fa907628c7b905c" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index cd57160bde..0b195c3fc3 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -10,7 +10,7 @@ DEPENDS += " \ systemd \ ipmi-blob-tool \ " -SRCREV = "166b4f19bd1c3937ef7c1a18ad9981edf5c036a0" +SRCREV = "42a44c281cce08be0ca6251955f4fb73d30c8ced" PACKAGECONFIG ?= "cleanup-delete" PACKAGECONFIG[cleanup-delete] = "-Dcleanup-delete=enabled,-Dcleanup-delete=disabled" # If using static-layout, reboot-update is a good option to handle updating. diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc index 6890733ad5..b0bab2f94e 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser" LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" SRC_URI += "git://github.com/openbmc/ipmi-fru-parser;branch=master;protocol=https" -SRCREV = "bc5725d02de2dec594c6ce972fa1cc077eed27db" +SRCREV = "a3cc22866bfe738b9fa25ca43f27fe76093ad11a" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 596e178aea..299fa9353b 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid;branch=master;protocol=https" -SRCREV = "42f64efc1eb8d6c09fb55777da2e6b6305cda3db" +SRCREV = "e7ef94d350cd156c54a5789ce7d53eb1a55f7da9" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb index 513ee50985..d9b99d2ab9 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb @@ -8,7 +8,7 @@ DEPENDS = "sdbusplus \ i2c-tools \ boost \ nlohmann-json" -SRCREV = "524f753f54d33984ea9d85dc940f647c66a74aa6" +SRCREV = "9898d612c3f3fbacd08daff934a83bdb2a7c0dd5" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/ipmbbridge.git;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb index aa6e57f4da..9a7e25893b 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb @@ -9,7 +9,7 @@ DEPENDS += " \ systemd \ " PROVIDES += "virtual/obmc-host-ipmi-hw" -SRCREV = "e0602aaf7c721438bba08b3a5edaedaa3e427346" +SRCREV = "c0c95be197cc6f863b0c11ca7726f8e34b74f370" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb index e2ef1eb646..180ad630da 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS += "cli11" DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-host" -SRCREV = "426fcab8ba80e9e2f7ec205ac3a97482919d8055" +SRCREV = "8425624a9046f5a853e8596cc74441e622028494" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb index afa830d0af..4577d7439a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb @@ -7,7 +7,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "sdbusplus" DEPENDS += "cli11" PROVIDES += "virtual/obmc-host-ipmi-hw" -SRCREV = "98f55c73fa8b7b744d3c5d3c0cd1792bf7536cab" +SRCREV = "7ead0d3d83fa3b54c44c4a9f931defe626b5714b" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 487fccef5e..204c58a459 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager;branch=master;protocol=https" -SRCREV = "94e894cb0286404821a34db04b711d7dfc4b9fd6" +SRCREV = "3197f3a0228483b235c8a2fa8c6227ad6c8edf50" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index 3c427f6735..4a571a7306 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -4,6 +4,7 @@ DEPENDS += "${PYTHON_PN}-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "${PYTHON_PN}-inflection-native" DEPENDS += "cli11" +DEPENDS += "libcereal" DEPENDS += "nlohmann-json" DEPENDS += "phosphor-logging" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index 5718106c89..afde60ec84 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -8,7 +8,8 @@ DEPENDS += "sdbusplus" DEPENDS += "systemd" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "boost" -SRCREV = "29bd56b16682ef75ca5ac856bd7c72281c90e892" +DEPENDS += "phosphor-logging" +SRCREV = "db82c0f8b1169ab77986da5779c4bef54a61aaaa" PV = "1.0+git${SRCPV}" PR = "r1" @@ -21,4 +22,7 @@ inherit obmc-phosphor-dbus-service EXTRA_OEMESON:append = " -Dtests=disabled" -SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.led.controller@.service" +SYSTEMD_SERVICE:${PN} += "phosphor-ledcontroller.service" + +FILES:${PN} += "/usr/lib/systemd/system/sysfs-led@.service" +FILES:${PN} += "/usr/share/dbus-1/system-services/xyz.openbmc_project.LED.Controller.service" diff --git a/meta-phosphor/recipes-phosphor/libcper/libcper_git.bb b/meta-phosphor/recipes-phosphor/libcper/libcper_git.bb new file mode 100644 index 0000000000..27eb13f5f6 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/libcper/libcper_git.bb @@ -0,0 +1,22 @@ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a832eda17114b48ae16cda6a500941c2" + +DEPENDS = " \ + json-c \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest', '', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'gmock', '', d)} \ + " + +PV = "1.0+git${SRCPV}" +SRCREV = "b07061ab5466aece03605409820711ead76fc191" + +SRC_URI = "git://github.com/openbmc/libcper.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" + +inherit pkgconfig meson ptest + +EXTRA_OEMESON = " \ + -Dtests=${@bb.utils.contains('PTEST_ENABLED', '1', 'enabled', 'disabled', d)} \ +" + diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index 50d4762eeb..5b4ca77244 100644 --- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" DEPENDS += "autoconf-archive-native \ systemd \ " -SRCREV = "b3de343e8b8952d337102df130a02dd13cce5b83" +SRCREV = "2f1a1f66dae8752e386d55ab25f244d88d626e8c" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} pcap" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, \ --without-systemdsystemunitdir,systemd" diff --git a/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb b/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb index b7a15ac770..08d4dacde6 100644 --- a/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb +++ b/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "PLDM library implementing various PLDM specifications" HOMEPAGE = "https://github.com/openbmc/libpldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "9e3a5d456ec5e029cdbe0939dccbd17f033a54a5" +SRCREV = "3f877481a2447709d34ec2ccf1a5ad69958514eb" LIBPLDM_ABI_DEVELOPMENT = "deprecated,stable,testing" LIBPLDM_ABI_MAINTENANCE = "stable,testing" LIBPLDM_ABI_PRODUCTION = "deprecated,stable" diff --git a/meta-phosphor/recipes-phosphor/logging/bios-bmc-smm-error-logger_git.bb b/meta-phosphor/recipes-phosphor/logging/bios-bmc-smm-error-logger_git.bb index e6477666da..b9914b06b1 100644 --- a/meta-phosphor/recipes-phosphor/logging/bios-bmc-smm-error-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/bios-bmc-smm-error-logger_git.bb @@ -11,7 +11,7 @@ DEPENDS += " \ sdbusplus \ phosphor-dbus-interfaces \ " -SRCREV = "5de90619619115af21ffa5c7bae279e88bd86429" +SRCREV = "3c49693bf3929992d370a4846a7ef9c1113f2ce5" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index ad827b6d4c..646d912f9f 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -9,7 +9,7 @@ DEPENDS += " \ phosphor-logging \ zlib \ " -SRCREV = "4226d7a064a61ef677f7c94b07831f793a0558ea" +SRCREV = "87c333ed0fb748ad30374fecb828da12c0e8f808" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 5c41888691..e3ab48a27f 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -16,7 +16,7 @@ DEPENDS += "libcereal" DEPENDS += "sdeventplus" DEPENDS += "packagegroup-obmc-yaml-providers" DEPENDS += "dbus" -SRCREV = "7cc55b582ed88b0525d6243e2a907ffaa7c0e156" +SRCREV = "70e8a11beb0b2783f609872a197b1dbca6636009" PACKAGECONFIG ??= "" PACKAGECONFIG[openpower-pels] = " \ -Dopenpower-pel-extension=enabled, \ diff --git a/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb b/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb index 0d87fad694..03c3081fc1 100644 --- a/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb +++ b/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-misc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS = "systemd" -SRCREV = "0100b593165a56bca6713541efc9918d84a9d582" +SRCREV = "b68e2285f2ebab000f3d0d7d7cdc6693b09c7e93" PACKAGECONFIG ??= " \ first-boot-set-hostname \ first-boot-set-mac \ diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index 8925a62e7b..14ee547138 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -10,7 +10,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "phosphor-logging" DEPENDS += "libnl" DEPENDS += "stdplus" -SRCREV = "d92826d2db5a80798436c64b9eb92508ee65788a" +SRCREV = "dce7fe7732d9c839826ea0b0682eb94eaea6c486" PACKAGECONFIG ??= "uboot-env default-link-local-autoconf default-ipv6-accept-ra persist-mac" PACKAGECONFIG[uboot-env] = "-Duboot-env=true,-Duboot-env=false,,${UBOOT_ENV_RDEPENDS}" PACKAGECONFIG[default-link-local-autoconf] = "-Ddefault-link-local-autoconf=true,-Ddefault-link-local-autoconf=false,," diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb index f108484c01..73e9616697 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb @@ -8,7 +8,7 @@ DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "phosphor-logging" DEPENDS += "net-snmp" -SRCREV = "673d9ce83ab479c9778cf9f16b012d15c7111fa9" +SRCREV = "8de81777d7c990e56b60586080ae9fff22512632" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb b/meta-phosphor/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb new file mode 100644 index 0000000000..43ed8654e3 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Phosphor U-Boot environment manager" +DESCRIPTION = "Daemon to read or write U-Boot environment variables" + +PV = "1.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI = "git://github.com/openbmc/phosphor-u-boot-env-mgr.git;branch=master;protocol=https" + +SRCREV = "516faacd7f8d224f15cc041cc486290b43cf4911" + +inherit meson systemd pkgconfig +SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.U_Boot.Environment.Manager.service" + +DEPENDS = "boost sdbusplus phosphor-logging" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb index 2ba9a46658..d920807c9a 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -2,7 +2,7 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm;branch=master;protocol=https" -SRCREV = "079e776975ca6ef8635aff40bea71e1389242fb4" +SRCREV = "22aed8fb4fe23f8ec46a2208c568240e8c9e6f02" SUMMARY = "PLDM Stack" DESCRIPTION = "Implementation of the PLDM specifications" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index cd46c48664..7d01bd4d30 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power;branch=master;protocol=https" -SRCREV = "ab73001a784c80b2e6bd59e21607e7849d0e7983" +SRCREV = "df2f4cb8883e4876ce9a13ce21340cf41390f324" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb index 5dd85b3be4..87f74af41c 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb @@ -10,7 +10,7 @@ DEPENDS = " \ sdbusplus \ openssl \ " -SRCREV = "760053d8a9a840ce92628f50275daae8eed51a6f" +SRCREV = "fb86e7947e455a33ffd04a8653f520c1b3ac2352" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb index f63ee612f6..1f7d585ceb 100644 --- a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb @@ -14,7 +14,7 @@ DEPENDS += " \ sdbusplus \ systemd \ " -SRCREV = "9fa224c5eadf64505ef2c41334f7125fe899176b" +SRCREV = "9c495c62baa219f3cc60935cd5a46657846d7232" PACKAGECONFIG ??= "" PACKAGECONFIG[log-threshold] = "-Dlog-threshold=true,-Dlog-threshold=false," PACKAGECONFIG[log-pulse] = "-Dlog-pulse=true,-Dlog-pulse=false," @@ -22,6 +22,7 @@ PACKAGECONFIG[log-watchdog] = "-Dlog-watchdog=true,-Dlog-watchdog=false," PACKAGECONFIG[log-alarm] = "-Dlog-alarm=true,-Dlog-alarm=false," PACKAGECONFIG[log-host] = "-Dlog-host=true,-Dlog-host=false," PACKAGECONFIG[send-to-logger] = "-Dsend-to-logger=true,-Dsend-to-logger=false,phosphor-logging" +PACKAGECONFIG[sel-delete] = "-Dsel-delete=true,-Dsel-delete=false" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=https;branch=master" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 4a1cae8f04..5142445990 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -11,7 +11,7 @@ DEPENDS = " \ phosphor-logging \ sdbusplus \ " -SRCREV = "e8a14e91eefb21dc4bfa754c57212504f7fddb09" +SRCREV = "416c96a673bdd484985b6a91f2c32bd090a50a08" PACKAGECONFIG ??= " \ adcsensor \ intelcpusensor \ diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index 906782e100..cf5ded0484 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -11,10 +11,11 @@ DEPENDS += " \ gpioplus \ cli11 \ " -SRCREV = "8df95be4e93cd2f2596a8acb1a79cdc0834da26e" +SRCREV = "02e598ab445833e0ce615f88ac0aed7288a100e0" PACKAGECONFIG ??= "" # Meson configure option to enable/disable max31785-msl PACKAGECONFIG[max31785-msl] = "-Denable-max31785-msl=true, -Denable-max31785-msl=false" +PACKAGECONFIG[use-dev-path] = "-Dalways-use-devpath=enabled, -Dalways-use-devpath=disabled" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index 910e66adda..8dc290a24e 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -8,7 +8,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" -SRCREV = "3b2e5a9b2f56e37982add882c208e50a9d41d080" +SRCREV = "f89f153959054cf67a4b9d18ad4369991f15b951" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb index 23c68352a5..7e0a84130a 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -10,7 +10,7 @@ DEPENDS:append = "\ phosphor-logging \ sdbusplus \ " -SRCREV = "5f07fa36bbca2e9c02cb2b7f1dba0fa618a48cf9" +SRCREV = "60fab695b07ecf8fd256a34ba8f3d1f8bebc24d9" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc index 921393cb1d..d742e694d3 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-settingsd" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-settingsd;branch=master;protocol=https" -SRCREV = "ef9bd93591f27d2aa9e1faf31297c46abca546da" +SRCREV = "ccf712f6b70c67012161bc72c5bb6dc00218228d" diff --git a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb index aed878ee81..bd480a86c9 100644 --- a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb +++ b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb @@ -10,7 +10,7 @@ DEPENDS += " \ phosphor-dbus-interfaces \ phosphor-logging \ " -SRCREV = "0fe13aba22a36e0b0b6a369c010ff637b43b4d63" +SRCREV = "1d73dccc89f0bb9d1dce3543e5af6b3e3087d5f4" PACKAGECONFIG[smbios-no-dimm] = "-Ddimm-dbus=disabled,-Ddimm-dbus=enabled" PACKAGECONFIG[cpuinfo] = "-Dcpuinfo=enabled,-Dcpuinfo=disabled,i2c-tools" PACKAGECONFIG[cpuinfo-peci] = "-Dcpuinfo-peci=enabled,-Dcpuinfo-peci=disabled,libpeci" diff --git a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb index ba057e3078..aac225dace 100644 --- a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -12,7 +12,7 @@ DEPENDS = " \ sdbusplus \ systemd \ " -SRCREV = "ee190f032091dda63053a82e90866244f09ed54b" +SRCREV = "de87972682912d5f50dc31d313aa7505e7325070" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb index fbfbbc608c..85091ede30 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb @@ -4,7 +4,7 @@ interface /xyz/openbmc_project/state/boot/raw by snoopd daemon and save them \ in a file under /var/lib for history." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "4653cd492616bc88da1ad24cf9bd684975cab2b5" +SRCREV = "9c2e871da99ce5cb7477ffbe3518ad9c2bc2da8a" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 970eab4978..7e240231fe 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -266,6 +266,6 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OB SYSTEMD_LINK[vardeps] += "OBMC_CHASSIS_INSTANCES OBMC_HOST_INSTANCES" SRC_URI = "git://github.com/openbmc/phosphor-state-manager;branch=master;protocol=https" -SRCREV = "3c1351cc2b63178876ef68f4107c9804d2e17dcc" +SRCREV = "2eb6029cd9696b1db92c59e85a6752ac4ba4a5a0" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb b/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb index b4f73bdf71..63912e4883 100644 --- a/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb +++ b/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb @@ -9,7 +9,7 @@ DEPENDS += "openssl" DEPENDS += "phosphor-logging" DEPENDS += "sdbusplus" DEPENDS += "stdplus" -SRCREV = "d4554f2a17686e36a77ac4a3619efd685fcbb15c" +SRCREV = "55d960bfe72a2e94707e332b7acf8561f2a55680" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 92f6586e96..8a7f938e58 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -9,7 +9,7 @@ DEPENDS = "boost \ phosphor-logging \ sdbusplus \ systemd" -SRCREV = "4444a13c9af8d581797bd43f378be51a614d60f5" +SRCREV = "b47b7db48c4f883eb191077848d55d96bd884607" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/telemetry;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb index 23006ae2a5..b36a5760d8 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -9,7 +9,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "boost" DEPENDS += "nss-pam-ldapd" DEPENDS += "systemd" -SRCREV = "af1594c90627b78d1a92bb16a0d826b12a0d182c" +SRCREV = "e7d4559b0173596f29ceb5ba7da653b023067783" PV = "1.0+git${SRCPV}" PR = "r1" @@ -43,6 +43,7 @@ FILES:${PN} += " \ " USERADD_PACKAGES = "${PN} phosphor-ldap" +RDEPENDS:${PN}:append:df-google-authenticator-libpam = " pam-google-authenticator google-authenticator-libpam" PACKAGE_BEFORE_PN = "phosphor-ldap" DBUS_PACKAGES = "${USERADD_PACKAGES}" diff --git a/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service b/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service index 0749f128a4..022d38a59e 100644 --- a/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service +++ b/meta-phosphor/recipes-phosphor/video/uart-render-controller/uart-render-controller.service @@ -6,8 +6,8 @@ After=xyz.openbmc_project.State.Host@0.service [Service] ExecStart=/usr/sbin/obmc-uart-render-controller \ - /sys/devices/platform/ahb/ahb:apb/1e6e6000.display/vga_pw \ - /sys/devices/platform/ahb/ahb:apb/1e6e6000.display/dac_mux \ + /sys/devices/platform/ahb/1e6e0000.apb/1e6e6000.display/vga_pw \ + /sys/devices/platform/ahb/1e6e0000.apb/1e6e6000.display/dac_mux \ fbterm.service [Install] diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb index b1938371ad..270cb8c3e7 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb @@ -17,7 +17,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "systemd" SRC_URI = "git://github.com/openbmc/phosphor-watchdog;branch=master;protocol=https" -SRCREV = "e3d2ddc3c09b77adf5d87e70aba5d9da671b41fb" +SRCREV = "923a9080fdbed58d233b307a1f9e6965530ddfa1" S = "${WORKDIR}/git" EXTRA_OEMESON = " \ diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 0de894cdc4..42cf1be949 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS:prepend = "nodejs-native " -SRCREV = "8841b7d463a5272a87faaa14cb103f778a772770" +SRCREV = "f4e79739d360ba47587427413dcc6e5bdf4182b7" PV = "1.0+git${SRCPV}" # This recipe requires online access to build, as it uses NPM for dependency # management and resolution. diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb index 7e451a5387..80670eef26 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "1cc7921fb3229ee61c3162c2b6cbc8db1231cb34" +SRCREV = "c6d756565e5e88656ac58d518347d43f1052ed58" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=https;branch=master" diff --git a/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb b/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb index be35a51790..692b595c03 100644 --- a/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb +++ b/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb @@ -2,7 +2,7 @@ SUMMARY = "PECI Library" DESCRIPTION = "PECI Library" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" -SRCREV = "5302b933aca5417c3e7aabcdde4d05d2ea5c3bd3" +SRCREV = "c96261ef6c7428ede3d3b878d9acdfb9365014cd" PACKAGECONFIG ??= "" PACKAGECONFIG[dbus-raw-peci] = "-Draw-peci='enabled',-Draw-peci='disabled',boost sdbusplus" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb index ff794c756e..93a6dbb753 100644 --- a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb +++ b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb @@ -4,7 +4,7 @@ and provides it on D-Bus" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" DEPENDS = "boost sdbusplus libpeci" -SRCREV = "9af905e5be7d3aedfe46d52fb15ed8c2ae847824" +SRCREV = "39c664c9d849214cb5a2f938ef9bce7074741270" PV = "0.1+git${SRCPV}" PACKAGECONFIG ??= "" diff --git a/meta-phosphor/scripts/generate-machine-list b/meta-phosphor/scripts/generate-machine-list new file mode 100755 index 0000000000..df3a76974f --- /dev/null +++ b/meta-phosphor/scripts/generate-machine-list @@ -0,0 +1,23 @@ +#!/bin/bash -e + +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +obmc_dir=${script_dir}/../../ + +cd "$obmc_dir" + +cat > meta-phosphor/docs/supported-machines.md << EOF +# Supported machines + +The following machine product or codenames have some code which has been +contributed to the project for support. The specific level of functionality +supported is unknown and has no level of warranty, promise of future +development, or bug-fix guarantee. + +Systems which are actively developed and maintained by vendors are often +covered by [Jenkins](https://jenkins.openbmc.org/job/ci-openbmc/) CI testing. + +## List + +EOF + +./setup machines >> meta-phosphor/docs/supported-machines.md diff --git a/meta-phosphor/scripts/run-repotest b/meta-phosphor/scripts/run-repotest index 6cd0db2726..8458236790 100755 --- a/meta-phosphor/scripts/run-repotest +++ b/meta-phosphor/scripts/run-repotest @@ -36,7 +36,6 @@ git ls-files -- \ echo "\ meta-aspeed/recipes-aspeed/python/socsec/0001-otptool-Define-value_start-in-rev_id-path.patch meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch -meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-board-aspeed-Add-Mux-for-yosemitev2.patch meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed-sdk/0002-spl-host-console-handle.patch meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps/0001-Set-FIU0_DRD_CFG-and-FIU_Clk_divider-for-gbmc-hoth.patch @@ -165,4 +164,10 @@ for f in $non_bbfiles; do done +# Regenerate supported machines list. +meta-phosphor/scripts/generate-machine-list +if ! git --no-pager diff --exit-code ; then + echo "Changes to supported-machines.md necessary due to new meta-layer support." +fi + echo "Repo test passed" diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@40.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ina219@40.conf index c9ff626e71..c9ff626e71 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@40.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ina219@40.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@41.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ina219@41.conf index 68661c4f68..68661c4f68 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@41.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ina219@41.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@67.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53622@67.conf index 2b8aafa9ef..2b8aafa9ef 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@67.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53622@67.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@77.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53622@77.conf index 2ce311c4f2..2ce311c4f2 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@77.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53622@77.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@62.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@62.conf index d77581ff18..d77581ff18 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@62.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@62.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@64.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@64.conf index 2a6b47b74b..2a6b47b74b 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@64.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@64.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@72.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@72.conf index 7f443d4ae8..7f443d4ae8 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@72.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@72.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@74.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@74.conf index 7d55f27303..7d55f27303 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@74.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53659@74.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@60.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53679@60.conf index 13b0229928..13b0229928 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@60.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53679@60.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@70.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53679@70.conf index a1271c7a09..a1271c7a09 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@70.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/tps53679@70.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4c.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@1c0/tmp421@4c.conf index eebfaedf54..eebfaedf54 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4c.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@1c0/tmp421@4c.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@4c.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp421@4c.conf index a0cd50a1d7..a0cd50a1d7 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@4c.conf +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp421@4c.conf diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 1066cb2150..4fca027cca 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -3,18 +3,18 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" EXTRA_OEMESON:append:f0b = " -Dnegative-errno-on-fail=true" NAME = " \ - bus@1e78a000/i2c-bus@80/tmp421@4c \ - bus@1e78a000/i2c-bus@1c0/tmp421@4c \ - bus@1e78a000/i2c-bus@180/tps53679@60\ - bus@1e78a000/i2c-bus@180/tps53659@62\ - bus@1e78a000/i2c-bus@180/tps53659@64\ - bus@1e78a000/i2c-bus@180/tps53679@70\ - bus@1e78a000/i2c-bus@180/tps53659@72\ - bus@1e78a000/i2c-bus@180/tps53659@74\ - bus@1e78a000/i2c-bus@180/ina219@40\ - bus@1e78a000/i2c-bus@180/ina219@41\ + bus@1e78a000/i2c@80/tmp421@4c \ + bus@1e78a000/i2c@1c0/tmp421@4c \ + bus@1e78a000/i2c@180/tps53679@60\ + bus@1e78a000/i2c@180/tps53659@62\ + bus@1e78a000/i2c@180/tps53659@64\ + bus@1e78a000/i2c@180/tps53679@70\ + bus@1e78a000/i2c@180/tps53659@72\ + bus@1e78a000/i2c@180/tps53659@74\ + bus@1e78a000/i2c@180/ina219@40\ + bus@1e78a000/i2c@180/ina219@41\ " -ITEMSFMT = "ahb/apb/{0}.conf" +ITEMSFMT = "ahb/apb@1e780000/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAME')}" diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index d77ee5055c..029cd301cd 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -1,5 +1,5 @@ KMACHINE = "nuvoton" -KERNEL_DEVICETREE = "${KMACHINE}-npcm730-gbs.dtb" +KERNEL_DEVICETREE = "nuvoton/${KMACHINE}-npcm730-gbs.dtb" UBOOT_MACHINE = "PolegSVB_spinor_minimal_config" UBOOT_DEVICETREE = "nuvoton-npcm730-gbs" diff --git a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-failsafe.sh b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-failsafe.sh index 8d6f774c84..4b20341086 100644 --- a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-failsafe.sh +++ b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-failsafe.sh @@ -22,7 +22,7 @@ if [ -z "$target_pwm" ]; then exit 1 fi -zone_num="$(busctl tree xyz.openbmc_project.State.FanCtrl | grep -c zone)" +zone_num="$(busctl tree xyz.openbmc_project.State.FanCtrl | grep -c -E 'zone[0-9]$')" result=0 for (( i = 0; i < zone_num; i++ )); do diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore/config.json b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore/config.json index c1dccec156..93880922fe 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore/config.json +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore/config.json @@ -1,6 +1,6 @@ [{ "blobBaseId": "/skm/hss/", - "sysFilePath": "/sys/class/i2c-adapter/i2c-5/5-0050/eeprom", + "sysFilePath": "/sys/bus/i2c/devices/5-0050/eeprom", "offsetBytes": 256, "maxSizeBytes": 512 }] diff --git a/meta-quanta/meta-gbs/recipes-phosphor/leds/gbs-led-manager-config/led.yaml b/meta-quanta/meta-gbs/recipes-phosphor/leds/gbs-led-manager-config/led.yaml index 411e0d4c6f..2770765c91 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/leds/gbs-led-manager-config/led.yaml +++ b/meta-quanta/meta-gbs/recipes-phosphor/leds/gbs-led-manager-config/led.yaml @@ -3,12 +3,14 @@ bmc_booted: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' enclosure_identify: attention: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' enclosure_fault: bmc_fault: @@ -22,218 +24,268 @@ boot_status_inactive: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' boot_status_standby: sys_boot_status: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_0_locate: led_u2_0_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_0_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_1_locate: led_u2_1_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_1_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_2_locate: led_u2_2_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_2_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_3_locate: led_u2_3_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_3_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_4_locate: led_u2_4_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_4_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_5_locate: led_u2_5_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_5_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_6_locate: led_u2_6_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_6_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_7_locate: led_u2_7_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_7_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_8_locate: led_u2_8_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_8_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_9_locate: led_u2_9_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_9_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_10_locate: led_u2_10_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_10_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_11_locate: led_u2_11_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_11_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_12_locate: led_u2_12_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_12_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_13_locate: led_u2_13_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_13_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_14_locate: led_u2_14_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_14_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_15_locate: led_u2_15_locate: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_15_fault: Action: 'Blink' DutyOn: 50 Period: 250 + Priority: 'Blink' led_u2_0_fault: led_u2_0_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_1_fault: led_u2_1_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_2_fault: led_u2_2_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_3_fault: led_u2_3_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_4_fault: led_u2_4_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_5_fault: led_u2_5_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_6_fault: led_u2_6_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_7_fault: led_u2_7_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_8_fault: led_u2_8_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_9_fault: led_u2_9_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_10_fault: led_u2_10_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_11_fault: led_u2_11_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_12_fault: led_u2_12_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_13_fault: led_u2_13_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_14_fault: led_u2_14_fault: Action: 'On' Period: 1000 + Priority: 'Blink' led_u2_15_fault: led_u2_15_fault: Action: 'On' - Period: 1000
\ No newline at end of file + Period: 1000 + Priority: 'Blink' diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/leds/olympus-nuvoton-led-manager-config/led.yaml b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/leds/olympus-nuvoton-led-manager-config/led.yaml index 3db5bc5b3c..6b899f9c90 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/leds/olympus-nuvoton-led-manager-config/led.yaml +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/leds/olympus-nuvoton-led-manager-config/led.yaml @@ -3,19 +3,23 @@ BmcBooted: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' PowerOn: identify: Action: 'On' DutyOn: 50 Period: 0 + Priority: 'Blink' EnclosureFault: identify: Action: 'On' DutyOn: 50 Period: 0 + Priority: 'Blink' EnclosureIdentify: identify: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh index 08b288083f..a89b7afb46 100755 --- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh +++ b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh @@ -12,7 +12,7 @@ function set_gpio_active_low() { echo "$2" > "/sys/class/gpio/gpio$1/direction" } -GPIO_BASE=$(cat /sys/devices/platform/ahb/ahb:apb/1e780000.gpio/gpio/*/base) +GPIO_BASE=$(cat /sys/devices/platform/ahb/1e780000.apb/1e780000.gpio/gpio/*/base) # FM_BMC_READY_N, GPIO Q4, active low set_gpio_active_low $((GPIO_BASE + 128 + 4)) high diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh index 5049f41f30..ab83c33280 100755 --- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh +++ b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh @@ -1,6 +1,6 @@ #!/bin/bash -GPIO_BASE=$(cat /sys/devices/platform/ahb/ahb:apb/1e780000.gpio/gpio/*/base) +GPIO_BASE=$(cat /sys/devices/platform/ahb/1e780000.apb/1e780000.gpio/gpio/*/base) GPIO_NUM=$((GPIO_BASE + 24 + 3)) echo 1 > /sys/class/gpio/gpio${GPIO_NUM}/value diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh index 2ae70de350..3b8c7d5561 100755 --- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh +++ b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh @@ -1,6 +1,6 @@ #!/bin/bash -GPIO_BASE=$(cat /sys/devices/platform/ahb/ahb:apb/1e780000.gpio/gpio/*/base) +GPIO_BASE=$(cat /sys/devices/platform/ahb/1e780000.apb/1e780000.gpio/gpio/*/base) GPIO_NUM=$((GPIO_BASE + 24 + 3)) echo 1 > /sys/class/gpio/gpio${GPIO_NUM}/value diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@0/psu@59.conf index 3416d32240..3416d32240 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@0/psu@59.conf diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@1/psu@58.conf index 261a0b0362..261a0b0362 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@1/psu@58.conf diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@2/psu@58.conf index 8749d4a247..8749d4a247 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@2/psu@58.conf diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@3/psu@59.conf index 9a314f77af..9a314f77af 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@3/psu@59.conf diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4c.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4c.conf index 4ac0ebfc9b..4ac0ebfc9b 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4c.conf +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4c.conf diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4e.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4e.conf index 504e4cfebc..504e4cfebc 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4e.conf +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4e.conf diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4f.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4f.conf index 10ec2653b5..10ec2653b5 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4f.conf +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@80/tmp75@4f.conf diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf index dfdecb40d4..dfdecb40d4 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 16cc2722aa..8b2c348f3f 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -5,11 +5,11 @@ FILESEXTRAPATHS:prepend:quanta-q71l := "${THISDIR}/${PN}:" # More conf files can be added as sensors are added. Q71L_PWM = "pwm-tacho-controller@1e786000" -Q71L_PWM_BASE = "ahb/apb/{0}.conf" +Q71L_PWM_BASE = "ahb/apb@1e780000/{0}.conf" Q71L_ITEMS += "${@compose_list(d, 'Q71L_PWM_BASE', 'Q71L_PWM')}" Q71L_TEMPS = "tmp75@4c tmp75@4e tmp75@4f" -Q71L_TEMPBASE = "ahb/apb/bus@1e78a000/i2c-bus@80/{0}.conf" +Q71L_TEMPBASE = "ahb/apb@1e780000/bus@1e78a000/i2c@80/{0}.conf" Q71L_ITEMS += "${@compose_list(d, 'Q71L_TEMPBASE', 'Q71L_TEMPS')}" @@ -17,7 +17,7 @@ Q71L_ITEMS += "iio-hwmon.conf" Q71L_ITEMS += "iio-hwmon-battery.conf" Q71L_PSUS = "0/psu@59 1/psu@58 2/psu@58 3/psu@59" -Q71L_PSUBASE = "ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@{0}.conf" +Q71L_PSUBASE = "ahb/apb@1e780000/bus@1e78a000/i2c@300/i2c-switch@70/i2c@{0}.conf" Q71L_ITEMS += "${@compose_list(d, 'Q71L_PSUBASE', 'Q71L_PSUS')}" ENVS = "obmc/hwmon/{0}" diff --git a/meta-quanta/meta-s6q/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-quanta/meta-s6q/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json index e7d935a2a5..929962980e 100644 --- a/meta-quanta/meta-s6q/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json +++ b/meta-quanta/meta-s6q/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json @@ -6,6 +6,7 @@ { "Name" : "bmc_heartbeat_n", "Action" : "Blink", + "Priority" : "Blink", "DutyOn" : 50, "Period" : 1000 } @@ -17,6 +18,7 @@ { "Name": "fm_id_led_n", "Action": "Blink", + "Priority" : "Blink", "DutyOn": 50, "Period": 250 } diff --git a/meta-ufispace/meta-ncplite/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ufispace/meta-ncplite/recipes-phosphor/state/phosphor-state-manager_%.bbappend index 5d304e356c..96604c94c4 100644 --- a/meta-ufispace/meta-ncplite/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ufispace/meta-ncplite/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,9 +1,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -DEPENDS += "gpioplus" -DEPENDS += "systemd" - -EXTRA_OEMESON:append = " -Dhost-gpios=enabled" +PACKAGECONFIG:append = " host-gpio" SRC_URI += " \ file://host-control \ @@ -65,17 +62,3 @@ do_install:append() { } FILES:${PN} += "${systemd_system_unitdir}/*" -FILES:${PN}-host += "${bindir}/phosphor-host-condition-gpio" -SYSTEMD_SERVICE:${PN}-host += "phosphor-host-condition-gpio@.service" - -pkg_postinst:${PN}-obmc-targets:prepend() { - mkdir -p $D$systemd_system_unitdir/multi-user.target.requires - LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service" - TARGET="../phosphor-host-condition-gpio@.service" - ln -s $TARGET $LINK -} - -pkg_prerm:${PN}-obmc-targets:prepend() { - LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service" - rm $LINK -} diff --git a/meta-yadro/meta-vegman/recipes-phosphor/leds/rx20-led-manager-config/led.yaml b/meta-yadro/meta-vegman/recipes-phosphor/leds/rx20-led-manager-config/led.yaml index bc5834eda1..5f42740db9 100644 --- a/meta-yadro/meta-vegman/recipes-phosphor/leds/rx20-led-manager-config/led.yaml +++ b/meta-yadro/meta-vegman/recipes-phosphor/leds/rx20-led-manager-config/led.yaml @@ -6,31 +6,40 @@ bmc_booted: status_ok: platform_status_green: Action: 'On' + Priority: 'Blink' platform_status_red: Action: 'Off' + Priority: 'Blink' status_degraded: platform_status_green: Action: 'Blink' + Priority: 'Blink' platform_status_red: Action: 'Blink' + Priority: 'Blink' status_non_critical: platform_status_green: Action: 'Off' + Priority: 'Blink' platform_status_red: Action: 'Blink' + Priority: 'Blink' status_critical: platform_status_green: Action: 'Off' + Priority: 'Blink' platform_status_red: Action: 'On' + Priority: 'Blink' enclosure_identify: platform_indicator_blue: Action: 'On' + Priority: 'Blink' # # May be asserted through IPMI or RedFish. @@ -38,12 +47,14 @@ enclosure_identify: enclosure_identify_blink: platform_indicator_blue: Action: 'On' + Priority: 'Blink' # # Asserted while firmware is flashing firmware_flashing: platform_indicator_blue: Action: 'Blink' + Priority: 'Blink' # # Power button indication @@ -51,28 +62,36 @@ firmware_flashing: power_standby: platform_power_green: Action: 'On' + Priority: 'Blink' platform_power_red: Action: 'On' + Priority: 'Blink' power_sequence: platform_power_green: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' platform_power_red: Action: 'Off' + Priority: 'Blink' power_on: platform_power_green: Action: 'On' + Priority: 'Blink' platform_power_red: Action: 'Off' + Priority: 'Blink' power_failure: platform_power_green: Action: 'Off' + Priority: 'Blink' platform_power_red: Action: 'On' + Priority: 'Blink' # # Temperature status @@ -80,26 +99,34 @@ power_failure: temp_ok: temp_status_green: Action: 'On' + Priority: 'Blink' temp_status_red: Action: 'Off' + Priority: 'Blink' temp_failure: temp_status_green: Action: 'Blink' + Priority: 'Blink' temp_status_red: Action: 'Blink' + Priority: 'Blink' temp_warn: temp_status_green: Action: 'On' + Priority: 'Blink' temp_status_red: Action: 'On' + Priority: 'Blink' temp_crit: temp_status_green: Action: 'Off' + Priority: 'Blink' temp_status_red: Action: 'On' + Priority: 'Blink' # # PSU status @@ -107,17 +134,23 @@ temp_crit: psu_ok: psu_status_green: Action: 'On' + Priority: 'Blink' psu_status_red: Action: 'Off' + Priority: 'Blink' psu_warn: psu_status_green: Action: 'Blink' + Priority: 'Blink' psu_status_red: Action: 'Blink' + Priority: 'Blink' psu_crit: psu_status_green: Action: 'Off' + Priority: 'Blink' psu_status_red: Action: 'Blink' + Priority: 'Blink' diff --git a/meta-yadro/meta-vegman/recipes-phosphor/leds/vegman-led-manager-config/led.yaml b/meta-yadro/meta-vegman/recipes-phosphor/leds/vegman-led-manager-config/led.yaml index 922d993a27..b97a438a68 100644 --- a/meta-yadro/meta-vegman/recipes-phosphor/leds/vegman-led-manager-config/led.yaml +++ b/meta-yadro/meta-vegman/recipes-phosphor/leds/vegman-led-manager-config/led.yaml @@ -9,34 +9,43 @@ bmc_booted: status_ok: platform_status_green: Action: 'Off' + Priority: 'Blink' platform_status_red: Action: 'Off' + Priority: 'Blink' status_degraded: platform_status_green: Action: 'Off' + Priority: 'Blink' platform_status_red: Action: 'Blink' DutyOn: 25 Period: 2000 + Priority: 'Blink' status_non_critical: platform_status_green: Action: 'Off' + Priority: 'Blink' platform_status_red: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' status_critical: platform_status_green: Action: 'Off' + Priority: 'Blink' platform_status_red: Action: 'On' + Priority: 'Blink' enclosure_identify: platform_indicator_blue: Action: 'On' + Priority: 'Blink' # # May be asserted through IPMI or RedFish. @@ -44,12 +53,14 @@ enclosure_identify: enclosure_identify_blink: platform_indicator_blue: Action: 'On' + Priority: 'Blink' # # Asserted while firmware is flashing firmware_flashing: platform_indicator_blue: Action: 'Blink' + Priority: 'Blink' # # Power button indication @@ -57,26 +68,34 @@ firmware_flashing: power_standby: platform_power_green: Action: 'On' + Priority: 'Blink' platform_power_red: Action: 'On' + Priority: 'Blink' power_sequence: platform_power_green: Action: 'Blink' DutyOn: 50 Period: 1000 + Priority: 'Blink' platform_power_red: Action: 'Off' + Priority: 'Blink' power_on: platform_power_green: Action: 'On' + Priority: 'Blink' platform_power_red: Action: 'Off' + Priority: 'Blink' power_failure: platform_power_green: Action: 'Off' + Priority: 'Blink' platform_power_red: Action: 'On' + Priority: 'Blink' diff --git a/poky/meta/recipes-connectivity/openssh/openssh/CVE-2024-6387.patch b/poky/meta/recipes-connectivity/openssh/openssh/CVE-2024-6387.patch new file mode 100644 index 0000000000..3e7c707100 --- /dev/null +++ b/poky/meta/recipes-connectivity/openssh/openssh/CVE-2024-6387.patch @@ -0,0 +1,27 @@ +Description: fix signal handler race condition +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/2070497 + +CVE: CVE-2024-6387 + +Upstream-Status: Backport +https://git.launchpad.net/ubuntu/+source/openssh/commit/?h=applied/ubuntu/jammy-devel&id=b059bcfa928df4ff2d103ae2e8f4e3136ee03efc + +Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> + +--- a/log.c ++++ b/log.c +@@ -452,12 +452,14 @@ void + sshsigdie(const char *file, const char *func, int line, int showfunc, + LogLevel level, const char *suffix, const char *fmt, ...) + { ++#if 0 + va_list args; + + va_start(args, fmt); + sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, + suffix, fmt, args); + va_end(args); ++#endif + _exit(1); + } + diff --git a/poky/meta/recipes-connectivity/openssh/openssh_9.7p1.bb b/poky/meta/recipes-connectivity/openssh/openssh_9.7p1.bb index d1468c59fc..e2c8ed6606 100644 --- a/poky/meta/recipes-connectivity/openssh/openssh_9.7p1.bb +++ b/poky/meta/recipes-connectivity/openssh/openssh_9.7p1.bb @@ -27,6 +27,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar file://add-test-support-for-busybox.patch \ file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \ file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch \ + file://CVE-2024-6387.patch \ " SRC_URI[sha256sum] = "490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd" @@ -15,10 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -if [ -z "$ZSH_NAME" ] && [ "$(basename -- "$0")" = "setup" ]; then - echo The script must be sourced, not executed - exit 1 -fi # Check if 'column' command is present COLUMN_CMD=$(which column || true) @@ -56,6 +52,9 @@ machine() { name=${cfg##*/} name=${name%.conf} tmpl=${cfg%/machine/*.conf} + vendor=${cfg%%/*} + vendor=${vendor##meta-} + vendor=${vendor%%-openbmc} if [ "$tmpl" = "poky/meta/conf" ]; then # This is a QEMU machine, use phosphor defaults. @@ -86,7 +85,7 @@ machine() { return fi else - echo "${name}" + echo "${vendor}/${name}" fi done @@ -96,12 +95,32 @@ machine() { if [ -z "$1" ]; then echo Target machine must be specified. Use one of: echo - machine | sort | sed "s/qemu[^[:space:]]*//" | "${COLUMN[@]}" -else - bld_dir=$2 - if [ -z "$2" ]; then - bld_dir="build/$1" - fi - machine "$1" "$bld_dir" + machine | sed "/qemu[^[:space:]]*/d" | sed "s#.*/##" | sort -h | "${COLUMN[@]}" + exit fi +if [ "$1" == "machines" ]; then + vendors="" + for m in $(machine | sort -h | sed "/qemu[^[:space:]]*/d"); do + vendor=${m%%/*} + machine=${m##*/} + + if [[ ! "$vendors" =~ -$vendor- ]]; then + vendors="$vendors -$vendor-" + echo "* $vendor" + fi + echo " * $machine" + done + exit +fi + +if [ -z "$ZSH_NAME" ] && [ "$(basename -- "$0")" = "setup" ]; then + echo The script must be sourced, not executed + exit 1 +fi + +bld_dir=$2 +if [ -z "$2" ]; then + bld_dir="build/$1" +fi +machine "$1" "$bld_dir" |