diff options
47 files changed, 408 insertions, 39 deletions
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index b94783939..28848681c 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-5.4" -LINUX_VERSION ?= "5.4.16" +LINUX_VERSION ?= "5.4.21" -SRCREV="86f83a82c7052073cba3db4549233e9c0641484b" +SRCREV="3589f2ee8207e6fdc8c0633b1965dd280a536282" require linux-aspeed.inc diff --git a/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh b/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh new file mode 100755 index 000000000..fd1c52b2a --- /dev/null +++ b/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh @@ -0,0 +1,142 @@ +#!/bin/bash + +set -e + +POWER_CMD="/usr/sbin/power-util mb" +IMAGE_FILE=$1/bios.bin +GPIO=389 + +IPMB_OBJ="xyz.openbmc_project.Ipmi.Channel.Ipmb" +IPMB_PATH="/xyz/openbmc_project/Ipmi/Channel/Ipmb" +IPMB_INTF="org.openbmc.Ipmb" +IPMB_CALL="sendRequest yyyyay" +ME_CMD_RECOVER="1 0x2e 0 0xdf 4 0x57 0x01 0x00 0x01" +ME_CMD_RESET="1 6 0 0x2 0" +SPI_DEV="1e630000.spi" +SPI_PATH="/sys/bus/platform/drivers/aspeed-smc" + +set_gpio_to_bmc() +{ + echo "switch bios GPIO to bmc" + if [ ! -d /sys/class/gpio/gpio$GPIO ]; then + cd /sys/class/gpio + echo $GPIO > export + cd gpio$GPIO + else + cd /sys/class/gpio/gpio$GPIO + fi + direc=`cat direction` + if [ $direc == "in" ]; then + echo "out" > direction + fi + data=`cat value` + if [ "$data" == "0" ]; then + echo 1 > value + fi + return 0 +} + +set_gpio_to_pch() +{ + echo "switch bios GPIO to pch" + if [ ! -d /sys/class/gpio/gpio$GPIO ]; then + cd /sys/class/gpio + echo $GPIO > export + cd gpio$GPIO + else + cd /sys/class/gpio/gpio$GPIO + fi + direc=`cat direction` + if [ $direc == "in" ]; then + echo "out" > direction + fi + data=`cat value` + if [ "$data" == "1" ]; then + echo 0 > value + fi + echo "in" > direction + echo $GPIO > /sys/class/gpio/unexport + return 0 +} + +echo "Bios upgrade started at $(date)" + +#Power off host server. +echo "Power off host server" +$POWER_CMD off +sleep 15 +if [ $($POWER_CMD status) != "off" ]; +then + echo "Host server didn't power off" + echo "Bios upgrade failed" + exit -1 +fi +echo "Host server powered off" + +#Set ME to recovery mode +echo "Set ME to recovery mode" +busctl call $IPMB_OBJ $IPMB_PATH $IPMB_INTF $IPMB_CALL $ME_CMD_RECOVER +sleep 5 + +#Flip GPIO to access SPI flash used by host. +echo "Set GPIO $GPIO to access SPI flash from BMC used by host" +set_gpio_to_bmc + +#Bind spi driver to access flash +echo "bind aspeed-smc spi driver" +echo -n $SPI_DEV > $SPI_PATH/bind +sleep 1 + +#Flashcp image to device. +if [ -e "$IMAGE_FILE" ]; +then + echo "Bios image is $IMAGE_FILE" + for d in mtd6 mtd7 ; do + if [ -e "/dev/$d" ]; then + mtd=`cat /sys/class/mtd/$d/name` + if [ $mtd == "pnor" ]; then + echo "Flashing bios image to $d..." + flashcp -v $IMAGE_FILE /dev/$d + if [ $? -eq 0 ]; then + echo "bios updated successfully..." + else + echo "bios update failed..." + fi + break + fi + echo "$d is not a pnor device" + fi + echo "$d not available" + done +else + echo "Bios image $IMAGE_FILE doesn't exist" +fi + +#Unbind spi driver +sleep 1 +echo "Unbind aspeed-smc spi driver" +echo -n $SPI_DEV > $SPI_PATH/unbind +sleep 10 + +#Flip GPIO back for host to access SPI flash +echo "Set GPIO $GPIO back for host to access SPI flash" +set_gpio_to_pch +sleep 5 + +#Reset ME to boot from new bios +echo "Reset ME to boot from new bios" +busctl call $IPMB_OBJ $IPMB_PATH $IPMB_INTF $IPMB_CALL $ME_CMD_RESET +sleep 10 + +#Power on server +echo "Power on server" +$POWER_CMD on +sleep 5 + +# Retry to power on once again if server didn't powered on +if [ $($POWER_CMD status) != "on" ]; +then + sleep 5 + echo "Powering on server again" + $POWER_CMD on +fi diff --git a/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service b/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service new file mode 100644 index 000000000..7e098908e --- /dev/null +++ b/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Flash Host Bios image %I to Host + +[Service] +Type=oneshot +RemainAfterExit=no +ExecStart=/usr/sbin/bios-update.sh /tmp/images/%i diff --git a/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend new file mode 100644 index 000000000..b2160acde --- /dev/null +++ b/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:" +SRC_URI += "file://bios-update.sh" + +PACKAGECONFIG_append = " flash_bios" +RDEPENDS_${PN} += "bash" + +do_install_append_tiogapass() { + install -d ${D}/${sbindir} + install -m 0755 ${WORKDIR}/bios-update.sh ${D}/${sbindir}/ +} diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/fb-powerctrl.bb b/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb index a46c44bbd..a46c44bbd 100644 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/fb-powerctrl.bb +++ b/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/LICENSE b/meta-facebook/recipes-fb/fb-powerctrl/files/LICENSE index 2caf82099..2caf82099 100644 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/LICENSE +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/LICENSE diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-gpio.service b/meta-facebook/recipes-fb/fb-powerctrl/files/host-gpio.service index 82ba12e8e..82ba12e8e 100644 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-gpio.service +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/host-gpio.service diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweroff.service b/meta-facebook/recipes-fb/fb-powerctrl/files/host-poweroff.service index d23ef909c..d23ef909c 100644 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweroff.service +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/host-poweroff.service diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweron.service b/meta-facebook/recipes-fb/fb-powerctrl/files/host-poweron.service index 446df3850..446df3850 100644 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweron.service +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/host-poweron.service diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/power-util b/meta-facebook/recipes-fb/fb-powerctrl/files/power-util index 30fa34cc8..30fa34cc8 100755 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/power-util +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/power-util diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/setup_gpio.sh b/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh index 2624abd0d..2624abd0d 100755 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/setup_gpio.sh +++ b/meta-facebook/recipes-fb/fb-powerctrl/files/setup_gpio.sh diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index 77d1e4570..77d1e4570 100755 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index a5dae1d9a..a5dae1d9a 100644 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf index 94f1dff85..94f1dff85 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend index 24b52d731..24b52d731 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index b70a42957..b70a42957 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 8a58a2da2..8a58a2da2 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json index eea3b4e20..eea3b4e20 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json index f079091d6..f079091d6 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json index 690f9e733..690f9e733 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend index b3205affa..b3205affa 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 4948cb4cb..4948cb4cb 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service index 3a22e56b9..3a22e56b9 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service index ddcb9dc62..ddcb9dc62 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service index f0f03a1cc..f0f03a1cc 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service index f7e93b82f..f7e93b82f 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index b0dcd093c..b0dcd093c 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml index 386f4b7c7..2efbb0c7d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml @@ -146,6 +146,34 @@ groups: - /temperature/gpu5 - /temperature/gpu6 - /temperature/gpu7 + - name: zone0_nvme + description: Group of nvme temperature sensors for zone 0 + type: /xyz/openbmc_project/sensors + members: + - /temperature/nvme0 + - /temperature/nvme1 + - /temperature/nvme2 + - /temperature/nvme3 + - /temperature/nvme4 + - /temperature/nvme5 + - /temperature/nvme6 + - /temperature/nvme7 + - /temperature/nvme8 + - /temperature/nvme9 + - /temperature/nvme10 + - /temperature/nvme11 + - /temperature/nvme12 + - /temperature/nvme13 + - /temperature/nvme14 + - /temperature/nvme15 + - /temperature/nvme16 + - /temperature/nvme17 + - /temperature/nvme18 + - /temperature/nvme19 + - /temperature/nvme20 + - /temperature/nvme21 + - /temperature/nvme22 + - /temperature/nvme23 matches: - name: propertiesChanged parameters: @@ -549,6 +577,11 @@ events: property: name: Value type: int64_t + - name: zone0_nvme + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t triggers: - name: init method: getProperties @@ -772,3 +805,36 @@ events: delta: value: 5 type: uint64_t + # Speed changes based on nvme temps + - name: set_net_increase_speed + groups: + - name: zone0_nvme + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 55 + type: int64_t + factor: + value: 1 + type: int64_t + delta: + value: 13 + type: uint64_t + - name: set_net_decrease_speed + groups: + - name: zone0_nvme + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + property: + value: 52 + type: int64_t + factor: + value: 3 + type: int64_t + delta: + value: 5 + type: uint64_t diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-0.conf new file mode 100644 index 000000000..d4f7e1d44 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-0.conf @@ -0,0 +1,6 @@ +INVENTORY=/system/chassis/motherboard/powersupply0 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=37 +NAME=powersupply0 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-1.conf new file mode 100644 index 000000000..029912ea5 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-1.conf @@ -0,0 +1,6 @@ +INVENTORY=/system/chassis/motherboard/powersupply1 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=59 +NAME=powersupply1 +DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf new file mode 100644 index 000000000..15390ce42 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0069 +INSTANCE=0 +INVENTORY=/system/chassis/motherboard/powersupply0 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=38 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf new file mode 100644 index 000000000..ce9f322a5 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf @@ -0,0 +1,6 @@ +DEVPATH=/sys/bus/i2c/devices/3-0068 +INSTANCE=1 +INVENTORY=/system/chassis/motherboard/powersupply1 +NUM_HISTORY_RECORDS=120 +SYNC_GPIO_PATH=/dev/gpiochip0 +SYNC_GPIO_NUM=38 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 dcc692f15..9fbd28708 100644 --- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb @@ -20,7 +20,7 @@ RDEPENDS_${PN} += "phosphor-network" RDEPENDS_${PN} += "phosphor-mapper" SRC_URI += "git://github.com/openbmc/phosphor-time-manager" -SRCREV = "c8babd347ee94464556c89c27d4bc1688d717e2a" +SRCREV = "248a709c83e80f81a687c971b79ff292c4778fb0" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 9b23ba3a6..840f49efb 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" -SRCREV = "934161873fa1c2d68b9685144741da132867c902" +SRCREV = "1891869f39fe66ee23f25ed31f43a2c327c48e09" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 95858f368..19d5c86f5 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "ac70637e290eeae1708efb19173ae074ca0178fe" +SRCREV = "363c23022eb3fb0cde577405e8a084a2e819b642" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index cd4139af3..871ac1348 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" -SRCREV = "86d8bd793968e9251f41dbb8eaea482490e68eb1" +SRCREV = "3165569a562983cf3c43b0b10c23e7695a031b56" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index d78f40db1..32ce93d7c 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" -SRCREV = "3518e18a0e70da1a9707bc071f14118b0d29166b" +SRCREV = "e0cf8fe1e2e20dd79391fe989a342bf018bcbb1b" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 2437c7131..e68b52fd0 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -54,7 +54,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "f15cbeb3f05c8930b3d1071604dbeeaf9f214d5b" +SRCREV = "51e927cc63034f998a2c6c54e7a324ab623d975a" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 6fc28d9c9..00730dde6 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "db914675d66e8f3adee6e00b801355f1ffc02ffe" +SRCREV = "e53193fa06a74c489f9c26ab1bd8c124f360c780" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 167eebda7..75db0c55c 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" -SRCREV = "7d3a9f1b54d2ae47f47371d962d2f234b82fadbc" +SRCREV = "dc72b62ad334da29e7bb790b91c77bb5736815a3" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 6c9d39b94..040f32113 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "241356e3dcff3e91393c858256ac29d003e6179e" +SRCREV = "14ce281a953e271ed10ae21a0fb03985e9ea45af" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 60625fab6..a8c4beec8 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "1b1c1005905c0d5a0145377718ad773fe08d0863" +SRCREV = "66f903fb69e8d8b9d7564e82a3daa3697cb92c54" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " diff --git a/meta-yadro/meta-nicole/conf/machine/nicole.conf b/meta-yadro/meta-nicole/conf/machine/nicole.conf index 35d94e4d0..11b35417d 100644 --- a/meta-yadro/meta-nicole/conf/machine/nicole.conf +++ b/meta-yadro/meta-nicole/conf/machine/nicole.conf @@ -10,8 +10,9 @@ require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/machine/include/p9.inc -IMAGE_FEATURES_remove = " obmc-fan-control obmc-fan-mgmt obmc-leds" +IMAGE_FEATURES_remove = " obmc-fan-control obmc-fan-mgmt" PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "nicole-openpower-fru-vpd-layout-native" PREFERRED_PROVIDER_virtual/openpower-fru-inventory = "nicole-openpower-fru-inventory-native" PREFERRED_PROVIDER_virtual/openpower-fru-properties = "nicole-openpower-fru-properties-native" +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "nicole-led-manager-config-native" diff --git a/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts b/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts index 0b146e3c8..0c8a9e783 100644 --- a/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts +++ b/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts @@ -54,6 +54,22 @@ leds { compatible = "gpio-leds"; + + power { + gpios = <&gpio ASPEED_GPIO(AA, 4) GPIO_ACTIVE_HIGH>; + }; + + identify { + gpios = <&gpio ASPEED_GPIO(AA, 7) GPIO_ACTIVE_HIGH>; + }; + + alarm_red { + gpios = <&gpio ASPEED_GPIO(AA, 3) GPIO_ACTIVE_HIGH>; + }; + + alarm_yellow { + gpios = <&gpio ASPEED_GPIO(AA, 1) GPIO_ACTIVE_HIGH>; + }; }; fsi: gpio-fsi { diff --git a/meta-yadro/meta-nicole/recipes-phosphor/leds/nicole-led-manager-config-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/leds/nicole-led-manager-config-native.bb new file mode 100644 index 000000000..da34c8bf7 --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-phosphor/leds/nicole-led-manager-config-native.bb @@ -0,0 +1,18 @@ +SUMMARY = "Phosphor LED Group Management for Nicole" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit native + +PROVIDES += "virtual/phosphor-led-manager-config-native" + +SRC_URI += "file://led.yaml" + +S = "${WORKDIR}" + +do_install() { + SRC=${S} + DEST=${D}${datadir}/phosphor-led-manager + install -D ${SRC}/led.yaml ${DEST}/led.yaml +} diff --git a/meta-yadro/meta-nicole/recipes-phosphor/leds/nicole-led-manager-config/led.yaml b/meta-yadro/meta-nicole/recipes-phosphor/leds/nicole-led-manager-config/led.yaml new file mode 100644 index 000000000..9ce2e2989 --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-phosphor/leds/nicole-led-manager-config/led.yaml @@ -0,0 +1,110 @@ +power_on: + power: + Action: 'On' + Priority: 'On' +enclosure_identify: + identify: + Action: 'Blink' + Priority: 'Blink' +enclosure_fault: &SYS_FAULT + alarm_red: + Action: 'Blink' + Priority: 'Blink' +enclosure_warning: &FRU_FAULT + alarm_yellow: + Action: 'Blink' + Priority: 'Blink' + +bmc_fault: + <<: *SYS_FAULT +motherboard_fault: + <<: *SYS_FAULT +system_fault: + <<: *SYS_FAULT + +cpu0_fault: + <<: *FRU_FAULT +cpu1_fault: + <<: *FRU_FAULT + +core0_fault: + <<: *FRU_FAULT +core1_fault: + <<: *FRU_FAULT +core2_fault: + <<: *FRU_FAULT +core3_fault: + <<: *FRU_FAULT +core4_fault: + <<: *FRU_FAULT +core5_fault: + <<: *FRU_FAULT +core6_fault: + <<: *FRU_FAULT +core7_fault: + <<: *FRU_FAULT +core8_fault: + <<: *FRU_FAULT +core9_fault: + <<: *FRU_FAULT +core10_fault: + <<: *FRU_FAULT +core11_fault: + <<: *FRU_FAULT +core12_fault: + <<: *FRU_FAULT +core13_fault: + <<: *FRU_FAULT +core14_fault: + <<: *FRU_FAULT +core15_fault: + <<: *FRU_FAULT +core16_fault: + <<: *FRU_FAULT +core17_fault: + <<: *FRU_FAULT +core18_fault: + <<: *FRU_FAULT +core19_fault: + <<: *FRU_FAULT +core20_fault: + <<: *FRU_FAULT +core21_fault: + <<: *FRU_FAULT +core22_fault: + <<: *FRU_FAULT +core23_fault: + <<: *FRU_FAULT + +dimm0_fault: + <<: *FRU_FAULT +dimm1_fault: + <<: *FRU_FAULT +dimm2_fault: + <<: *FRU_FAULT +dimm3_fault: + <<: *FRU_FAULT +dimm4_fault: + <<: *FRU_FAULT +dimm5_fault: + <<: *FRU_FAULT +dimm6_fault: + <<: *FRU_FAULT +dimm7_fault: + <<: *FRU_FAULT +dimm8_fault: + <<: *FRU_FAULT +dimm9_fault: + <<: *FRU_FAULT +dimm10_fault: + <<: *FRU_FAULT +dimm11_fault: + <<: *FRU_FAULT +dimm12_fault: + <<: *FRU_FAULT +dimm13_fault: + <<: *FRU_FAULT +dimm14_fault: + <<: *FRU_FAULT +dimm15_fault: + <<: *FRU_FAULT diff --git a/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json index 146b9af46..96644622b 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ b/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json @@ -39,33 +39,8 @@ "direction": "falling" }, { - "name": "BMC_CP0_RESET_N", - "pin": "A1", - "direction": "out" - }, - { - "name": "BMC_CP0_PERST_ENABLE_R", - "pin": "A3", - "direction": "out" - }, - { - "name": "BMC_THROTTLE", - "pin": "J3", - "direction": "out" - }, - { - "name": "IDBTN", - "pin": "Q7", - "direction": "out" - }, - { "name": "POWER_BUTTON", - "pin": "I3", - "direction": "both" - }, - { - "name": "RESET_BUTTON", - "pin": "J1", + "pin": "O2", "direction": "both" } ] |