From 195ba3c2078d17874e9f63b033e21071aa3faadc Mon Sep 17 00:00:00 2001 From: Mike Garrett Date: Thu, 18 Nov 2021 16:12:42 -0600 Subject: meta-hpe: Update SRCREV of U-Boot New I2C driver and FRU EEPROM detect and read Fetch MAC address for network boot of BMC Signed-off-by: Mike Garrett Change-Id: I8ff7fc7b40fa720babbc9912642f500086573743 --- meta-hpe/meta-gxp/recipes-bsp/u-boot/u-boot-common-gxp_2020.10.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-hpe/meta-gxp/recipes-bsp/u-boot/u-boot-common-gxp_2020.10.inc b/meta-hpe/meta-gxp/recipes-bsp/u-boot/u-boot-common-gxp_2020.10.inc index 2efeb9e09..d8f45ed78 100644 --- a/meta-hpe/meta-gxp/recipes-bsp/u-boot/u-boot-common-gxp_2020.10.inc +++ b/meta-hpe/meta-gxp/recipes-bsp/u-boot/u-boot-common-gxp_2020.10.inc @@ -7,7 +7,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "b139a8a9e6e89e4115741498d454847d99239eda" +SRCREV = "7e035b9bf331426919aa993a6bb1de3c837e5d3c" UBRANCH = "v2020.10-gxp-openbmc" SRC_URI = "git://github.com/HewlettPackard/gxp-uboot.git;branch=${UBRANCH}" -- cgit v1.2.3 From adbccbcfba95be603d690f800a9b39ee056472c9 Mon Sep 17 00:00:00 2001 From: Mike Garrett Date: Thu, 18 Nov 2021 16:17:30 -0600 Subject: meta-hpe: Move from 5.10 kernel to 5.14 with GXP support This is a temporary stop on the way to 5.15 Signed-off-by: Mike Garrett Change-Id: I5c750c61b3d3e1561eb4cfb53989bde9fd2b1e58 --- meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc | 1 + meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig | 3 +++ meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb | 10 ---------- meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb | 10 ++++++++++ 4 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb create mode 100644 meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc index 5d79797f7..dfa9e806f 100644 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc.inc @@ -21,4 +21,5 @@ require recipes-kernel/linux/linux-yocto.inc # From 4.16+ the COPYING file changed LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +KERNEL_FEATURES:remove = "phosphor-gpio-keys" diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig index cdd03e3f7..12e1eb636 100644 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig @@ -216,6 +216,7 @@ CONFIG_HPE_GXP_FN2=y CONFIG_HPE_GXP_CSM=y CONFIG_HPE_GXP_SROM=y CONFIG_HPE_GXP_CHIF=y +CONFIG_HPE_GXP_DBG=y CONFIG_PECI=y CONFIG_PECI_CHARDEV=y CONFIG_PECI_GXP=y @@ -277,3 +278,5 @@ CONFIG_DEBUG_UART_VIRT=0xF00000F0 CONFIG_DEBUG_UART_8250_SHIFT=0 CONFIG_EARLY_PRINTK=y CONFIG_TEST_KSTRTOX=y +CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y +CONFIG_FUSE_FS=y diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb deleted file mode 100644 index d0b5407ae..000000000 --- a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.10.bb +++ /dev/null @@ -1,10 +0,0 @@ -KBRANCH ?= "dev-5.10-gxp-openbmc" -LINUX_VERSION ?= "5.10.17" -SRCREV="8d942b456304d3a21597cda47387a45ace61a225" - -require linux-obmc.inc -require conf/machine/include/fitimage-sign.inc - -# OpenBMC loads in kernel features via other mechanisms so this check -# in the kernel-yocto.bbclass is not required -#KERNEL_DANGLING_FEATURES_WARN_ONLY="1" diff --git a/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb new file mode 100644 index 000000000..030a6fa93 --- /dev/null +++ b/meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc_5.14.bb @@ -0,0 +1,10 @@ +KBRANCH ?= "dev-5.14-gxp-openbmc" +LINUX_VERSION ?= "5.14.0" +SRCREV="6f1a2c5c0cc59692d5beafe5ff8a4c7539b82d7d" + +require linux-obmc.inc +require conf/machine/include/fitimage-sign.inc + +# OpenBMC loads in kernel features via other mechanisms so this check +# in the kernel-yocto.bbclass is not required +#KERNEL_DANGLING_FEATURES_WARN_ONLY="1" -- cgit v1.2.3 From dac74ad6e239d3848bd0b0a84e28d57f110ab882 Mon Sep 17 00:00:00 2001 From: Mike Garrett Date: Thu, 18 Nov 2021 16:22:24 -0600 Subject: meta-hpe: Fix pointer to hpe-common layer support Fixed the path to the common layer for HPE systems Signed-off-by: Mike Garrett Change-Id: I9f0b0d1445ccd7de72669a317a331a2aa7bb18f6 --- meta-hpe/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf index da14cfc28..1072f7d48 100644 --- a/meta-hpe/conf/layer.conf +++ b/meta-hpe/conf/layer.conf @@ -6,7 +6,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "hpe-layer" -BBFILE_PATTERN_hpe-layer := "^${LAYERDIR}/" +BBFILE_PATTERN_hpe-layer := "^${LAYERDIR}/meta-common/" LAYERSERIES_COMPAT_hpe-layer = "hardknott honister" # Provide a variable that points the base of the hpe layer. -- cgit v1.2.3 From 7ed3bf3ee9fbbfb6364f98322e078c231aefc4c0 Mon Sep 17 00:00:00 2001 From: Mike Garrett Date: Thu, 18 Nov 2021 16:25:41 -0600 Subject: meta-hpe: Update meta-hpe/README.md Fix to conform to new model where we don't commit to the meta-hpe repo Signed-off-by: Mike Garrett Change-Id: I38970e8f871ded204831d1009a5d9ba32349a483 --- meta-hpe/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-hpe/README.md b/meta-hpe/README.md index d2960f4d7..ef07653e0 100644 --- a/meta-hpe/README.md +++ b/meta-hpe/README.md @@ -39,7 +39,7 @@ meta-hpe patches are reviewed using the Gerrit instance at https://gerrit.openbmc-project.xyz. Please submit patches to Gerrit. More information about using Gerrit can be found -[here](https://github.com/openbmc/docs/blob/meta-hpe/master/CONTRIBUTING.md#submitting-changes-via-gerrit-server). +[here](https://github.com/openbmc/docs/blob/master/CONTRIBUTING.md#submitting-changes-via-gerrit-server). https://github.com/openbmc/meta-hpe is a hosting mirror only. GitHub pull requests are not monitored and will not be accepted. -- cgit v1.2.3 From 6e1b2189bacbfc60603b0834e488c53d7fe70a37 Mon Sep 17 00:00:00 2001 From: Charles Boyer Date: Mon, 22 Nov 2021 11:58:31 -0600 Subject: meta-fii/meta-kudo: Fix syntax in ampere-hostctrl.bb The new yocto syntax was missing from, https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/46289 Also removed an extra empty line from the recipe. Signed-off-by: Charles Boyer Change-Id: Id7684b24ecd2a51e7e2a28c10a76b61519ea0872 --- meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb index 327053cc9..af026f75e 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb @@ -73,7 +73,7 @@ SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHAS CHASSIS_POWERCYCLE_SVC = "ampere-chassis-powercycle.service" CHASSIS_POWERCYCLE_TGTFMT = "obmc-chassis-powercycle@{0}.target" CHASSIS_POWERCYCLE_FMT = "../${CHASSIS_POWERCYCLE_SVC}:${CHASSIS_POWERCYCLE_TGTFMT}.requires/${CHASSIS_POWERCYCLE_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERCYCLE_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERCYCLE_FMT', 'OBMC_CHASSIS_INSTANCES')}" TMPL = "phosphor-gpio-monitor@.service" INSTFMT = "phosphor-gpio-monitor@{0}.service" @@ -85,4 +85,3 @@ do_install() { install -d ${D}/usr/sbin install -m 0755 ${WORKDIR}/ampere_power_util.sh ${D}/${sbindir}/ampere_power_util.sh } - -- cgit v1.2.3 From b9d1f01934db8bffc1f442d604a4f3f9c586299b Mon Sep 17 00:00:00 2001 From: Oskar Senft Date: Tue, 16 Nov 2021 08:29:43 -0500 Subject: uart-render-controller: srcrev bump 26ac7f7bd6..08e854a6c4 Oskar Senft (1): Fix incorrect parsing of large values in VGA scratch register Signed-off-by: Oskar Senft Change-Id: I76419ff9ad9492a8c85626a62265a03abaed17a3 --- meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb b/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb index 62d19ec82..d3ad3c0a5 100644 --- a/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb +++ b/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb @@ -16,7 +16,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "systemd" RDEPENDS:${PN} += "fbterm" -SRCREV = "26ac7f7bd6af52db63451d3633bcf1b167eea3d1" +SRCREV = "08e854a6c425011d029e4e02241afee5060f15eb" PV = "0.1+git${SRCPV}" S = "${WORKDIR}/git" -- cgit v1.2.3 From 10a5e56222d874578ada8c9dbcf947c111301234 Mon Sep 17 00:00:00 2001 From: Charles Boyer Date: Mon, 22 Nov 2021 12:11:49 -0600 Subject: meta-fii/meta-kudo: Remove redundant provider for fan control The phosphor-pid-control package will be provided through obmc-fan-mgmt, so it does not need to be provided through obmc-fan-control as well. Signed-off-by: Charles Boyer Change-Id: I29ac8363056db866d6181d958d8a86e53605400d --- meta-fii/meta-kudo/conf/machine/kudo.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index b53cc46df..b6a99d813 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -29,7 +29,6 @@ MACHINE_FEATURES += " \ obmc-phosphor-chassis-mgmt \ " -PREFERRED_PROVIDER_virtual/obmc-fan-control = "phosphor-pid-control" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-kudo-apps" -- cgit v1.2.3 From cd91d80e889d8d2463883311b6454ba734fb2fce Mon Sep 17 00:00:00 2001 From: XP Chen Date: Wed, 1 Sep 2021 10:25:00 -0500 Subject: meta-fii/meta-kudo: Change watchdog action to power utility For shutdown, if it does not go through the power utility, the Chassis state will not change. For host reset, execute additional verification steps attached to the power utility service performing the host reboot. Signed-off-by: XP Chen Signed-off-by: Charles Boyer Change-Id: I2f67a34ba8cfd80fd3dde999baa329d44288bdfe --- .../watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service | 2 +- .../watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service index 9586368b5..1baf4ca30 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service @@ -4,5 +4,5 @@ Description=Watchdog power state power cycle shutdown [Service] Type=oneshot RemainAfterExit=no -ExecStart=/usr/bin/env kudo.sh rst shutdown +ExecStart=/usr/bin/env ampere_power_util.sh mb off SyslogIdentifier=phosphor-watchdog diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service index fb6614e49..b6d453f51 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service @@ -4,5 +4,5 @@ Description=Watchdog power state reset system [Service] Type=oneshot RemainAfterExit=no -ExecStart=/usr/bin/env kudo.sh rst system +ExecStart=/usr/bin/env ampere_power_util.sh mb force_reset SyslogIdentifier=phosphor-watchdog -- cgit v1.2.3 From a1e4489ca3959f5a162d8cb2f5c960c8c1708dea Mon Sep 17 00:00:00 2001 From: Charles Boyer Date: Tue, 23 Nov 2021 15:55:00 -0600 Subject: meta-fii/meta-kudo: Remove unused host reset services The ampere-host-reset.service and ampere-host-force-reset.service are not used. Host is reset with ampere-host-power-cycle.service. Signed-off-by: Charles Boyer Change-Id: Ie6c58c5c9d1179d79e5c5be307a37bdb263172ff --- meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb | 16 ---------------- .../host/ampere-hostctrl/ampere-host-force-reset.service | 11 ----------- .../host/ampere-hostctrl/ampere-host-reset.service | 10 ---------- 3 files changed, 37 deletions(-) delete mode 100644 meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-force-reset.service delete mode 100644 meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb index af026f75e..f8f85b3d5 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb @@ -10,13 +10,11 @@ inherit obmc-phosphor-systemd S = "${WORKDIR}" SRC_URI = "file://ampere-host-shutdown.service \ - file://ampere-host-reset.service \ file://ampere_power_util.sh \ file://ampere-chassis-poweroff.service \ file://ampere-chassis-poweron.service \ file://ampere-chassis-powercycle.service \ file://ampere-host-shutdown-ack.service \ - file://ampere-host-force-reset.service \ file://ampere-host-power-cycle.service \ " @@ -26,12 +24,10 @@ RDEPENDS:${PN} = "bash" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = " \ ampere-host-shutdown.service \ - ampere-host-reset.service \ ampere-chassis-poweroff.service \ ampere-chassis-poweron.service \ ampere-chassis-powercycle.service \ ampere-host-shutdown-ack.service \ - ampere-host-force-reset.service \ ampere-host-power-cycle.service \ " # host power control @@ -47,18 +43,6 @@ HOST_REBOOT_SVC_TGTFMT = "obmc-host-reboot@{0}.target" HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_SVC_TGTFMT}.requires/${HOST_REBOOT_SVC}" SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" -# overwrite the host reset to graceful reset -HOST_WARM_REBOOT_SOFT_SVC = "ampere-host-reset.service" -HOST_WARM_REBOOT_TGTFMT = "obmc-host-warm-reboot@{0}.target" -HOST_WARM_REBOOT_SOFT_SVC_FMT = "../${HOST_WARM_REBOOT_SOFT_SVC}:${HOST_WARM_REBOOT_TGTFMT}.requires/${HOST_WARM_REBOOT_SOFT_SVC}" -SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" - -# overwrite force reboot -HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset.service" -HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" -HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_TGT}" -SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" - # chassis power control CHASSIS_POWERON_SVC = "ampere-chassis-poweron.service" CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-force-reset.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-force-reset.service deleted file mode 100644 index 8a40baf7b..000000000 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-force-reset.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Ampere Computing LLC force reset host -Conflicts=obmc-chassis-poweroff@0.target -OnFailure=obmc-chassis-powerreset@0.target - -[Service] -RemainAfterExit=no -Type=oneshot -ExecStart=/usr/bin/env ampere_power_util.sh mb force_reset -SyslogIdentifier=ampere_power_util.sh - diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service deleted file mode 100644 index 2deb24d4f..000000000 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Ampere Computing LLC warm reset host -Conflicts=obmc-chassis-poweroff@0.target - -[Service] -RemainAfterExit=no -Type=oneshot -ExecStart=/usr/bin/env ampere_power_util.sh mb graceful_reset -SyslogIdentifier=ampere_power_util.sh - -- cgit v1.2.3 From 76f8aa61d66880a689f329af5cae5279d8e0feef Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 26 Nov 2021 09:22:45 +1030 Subject: linux-aspeed: Fixes for SCU IRQ, MDIO, clock, vga_pw Billy Tsai (1): irqchip/aspeed-scu: Replace update_bits with write_bits. Dylan Hung (1): mdio: aspeed: Fix "Link is Down" issue Joel Stanley (2): drm/aspeed: Fix vga_pw sysfs output clk/ast2600: Fix soc revision for AHB Change-Id: Idd8d89c4869faa8528f1c5066ec3ed467ea85911 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index a11f9ace0..e51e593d9 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.15" LINUX_VERSION ?= "5.15" -SRCREV="781a66e81bbb9081e74d9ba0fcee095fefa1048e" +SRCREV="58704e2943803ded612b42510874b63b518aa214" require linux-aspeed.inc -- cgit v1.2.3 From 56a2722a9a9c2da717e4a5ea565dec563bb4ace1 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 26 Nov 2021 09:48:50 +1030 Subject: linux-aspeed: Move to v5.15.5 stable release This includes security and bug fixes from the 5.15.1 through to 5.15.5 stable releases. Signed-off-by: Joel Stanley Change-Id: Ibe8c433439b5863b0d49934d4d43b239bdc736d7 --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index e51e593d9..3208f9c9b 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.15" -LINUX_VERSION ?= "5.15" +LINUX_VERSION ?= "5.15.5" -SRCREV="58704e2943803ded612b42510874b63b518aa214" +SRCREV="ebd46c8290139e545fbb16201b2b26851a657baa" require linux-aspeed.inc -- cgit v1.2.3 From c9016d09843a33e7e29476b126a994f3ae9fa99f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sun, 28 Nov 2021 18:20:50 +0000 Subject: phosphor-fan-presence: srcrev bump c024d78022..1a19eadd2a Matthew Barth (2): monitor:p10bmc:ibm,rainier-2u: Functional fan range update control: Correct same signal object subscription of actions Mike Capps (1): control: remove NaN from D-Bus properties Patrick Williams (1): sdbusplus: remove usage of deprecated alias Change-Id: I70629fddc971edfa6355913dc1fc615a06c78d12 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index cdd3e1f14..402efc2de 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" -SRCREV = "c024d780229822fe4eb5a948b4e5d76a8e28f3f9" +SRCREV = "1a19eadd2a5c86e3482400ffb3eef4108077cbe8" -- cgit v1.2.3 From 725861c4cd80d0b4c164955650bd26655198582a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 26 Nov 2021 14:40:27 +0000 Subject: openpower-vpd-parser: srcrev bump 88d2ae82af..37e72701aa Alpana Kumari (1): Set default dts for system boot up Priyanga Ramasamy (2): Move getPrintableValue api to utils VpdTool:Treat NULL char at the end as a terminator Change-Id: I4267564fb833685dd702cf655d8a417af0444d94 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index c26dc27f6..ff697866d 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ 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" -SRCREV = "88d2ae82af7fd97086c60fa9e39e0b4ee31a5974" +SRCREV = "37e72701aae400a419a58c82fd280485c71dba1e" -- cgit v1.2.3 From e745e7547ab8590464ea5fd19c5517a9e9074c84 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 25 Nov 2021 10:11:15 +0000 Subject: pldm: srcrev bump 77aef218a5..3d34b2c211 Brad Bishop (1): fw-update: tests: add missing dependency Eddie James (2): Rename IBM OEM state set header and install it Fix renamed IBM OEM state set header in pldmtool Manojkiran Eda (2): Update the clang-format file with latest Fix a bad error traces Sampa Misra (1): oem: refine support for VINI record Change-Id: I29157f556db05e36de5da92e88a46f7538f4d8b4 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 61962233c..a42b168a9 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 = "77aef218a514d34c03bc024d83f83e334035792e" +SRCREV = "3d34b2c21190aabce594b1b84f42569ba78cf8c7" -- cgit v1.2.3 From 97875d389159bafbe692fa24b470dbbd11900de0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 25 Nov 2021 04:21:22 +0000 Subject: libmctp: srcrev bump 663ec39ea1..e320669029 Jeremy Kerr (1): README: OWNERS is the new MAINTAINERS Change-Id: If4c5ab272fd144d309670e94c85f16b3a22b04bf Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index 214677690..29cc2206a 100644 --- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" SRC_URI = "git://github.com/openbmc/libmctp \ file://default" -SRCREV = "663ec39ea107c2a736f9bcb20cbfdfa623092ab1" +SRCREV = "e3206690296f9095f817dab880b9649f2d3032a8" DEPENDS += "autoconf-archive-native \ systemd \ -- cgit v1.2.3 From c66212716cf60a511a601e4da1fea7ad6d3d31ce Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 24 Nov 2021 00:30:55 +0000 Subject: phosphor-ipmi-blobs-binarystore: srcrev bump d6f65a1b52..a21027dcb1 Manojkiran Eda (1): Add OWNERS file Change-Id: Iba0e43ffaf15b07223b67c99804b1900b4426294 Signed-off-by: Andrew Geissler --- .../recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 45e393d0d..9e4b2a33f 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 @@ -20,7 +20,7 @@ PACKAGECONFIG[blobtool] = ",--disable-blobtool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore" -SRCREV = "d6f65a1b52d662dfe282ebddab840ce161be6c61" +SRCREV = "a21027dcb1a0396e57347ab1066821c4d8ba30b2" FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES:${PN}:append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From c575ab6e4ac0f2683a3dbf30dd1c613c07399b73 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 23 Nov 2021 19:02:07 +0000 Subject: phosphor-virtual-sensor: srcrev bump 333e5bf60c..b57d737081 Patrick Williams (1): sdbusplus: remove usage of deprecated alias Change-Id: I4d1efe13abb0fd8367471d351c0b818c947482eb Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9590c4db8..25c499875 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -16,7 +16,7 @@ DEPENDS += "nlohmann-json" DEPENDS += "exprtk" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" -SRCREV = "333e5bf60cdc34450617994f29901b6b131111fa" +SRCREV = "b57d7370815015ce8f04be16cee39c45b0770355" S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "phosphor-virtual-sensor.service" -- cgit v1.2.3 From 20a2b8bfdb9b59b5a1cb14aa95f7f9bc3ff9359a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 23 Nov 2021 19:01:22 +0000 Subject: phosphor-led-manager: srcrev bump d1fdc4f48d..f178c0f26d Patrick Williams (1): sdbusplus: remove usage of deprecated alias Change-Id: I088412fa2fbccbcef7fcb9c83d564b904256b71c Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 5132e45c4..51ef6d323 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 = "d1fdc4f48dfa3f156a61ce06b13b40913eef63e8" +SRCREV = "f178c0f26d41ddd732d5d3e3acbcec43fa7dc5b6" -- cgit v1.2.3 From c2b07ccefd0b761e51b72303416df9c5ca87f26d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 23 Nov 2021 18:11:18 +0000 Subject: phosphor-power: srcrev bump 2916ea52b3..a61c1aa0a2 Brandon Wyman (2): psu-ng: Add in detection of IOUT_OC fault psu-ng: Add code to detect VOUT_UV_FAULT Jim Wright (3): pseq: Call chassis hard power off on pgood fail pseq: Add logging of power on/off timeout entries pseq: Retrieve device info from entity manager Patrick Williams (1): sdbusplus: remove usage of deprecated alias Change-Id: I4431fee49fb9b585617398c95c387dd8cd2cad57 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 7f0d7b4d5..22fb7ba4d 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 = "2916ea52b3d4c9ba0d0d90c1e33f333aeb720047" +SRCREV = "a61c1aa0a2006dedf0752bf7efca364a86d4dd96" -- cgit v1.2.3 From 1f6908e665f2898bd3390f83f1049e1b07bc1966 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 23 Nov 2021 17:41:17 +0000 Subject: dbus-sensors: srcrev bump cb5af73f5d..00bd56d3a6 Ed Tanous (1): Fix possible seg faults in Cpu and tach Zhikui Ren (1): TachSensor: fix checkThresholds regression Change-Id: I020a3eb945504a642da61f7b25482bc1830610d0 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index c6b4df23d..d91283160 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 = "cb5af73f5ddf48c5f9455f41a39b44517089352f" +SRCREV = "00bd56d3a6176367b818d958e0177cab19a6e618" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 286f8ff563afd844e722fbd6131162984b1ba725 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 23 Nov 2021 01:21:00 +0000 Subject: phosphor-host-ipmid: srcrev bump 78fe1b14f6..9bb4a3867a Jason M. Bills (3): Update Host State Transition function Add Chassis State Transition interface Update IPMI Chassis Control command transition requests Vernon Mauery (1): Rework setNmiProperty to use yielding Dbus API Change-Id: Icc77d4988abb212645cfb6880db4584cd93784d6 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 201f52b9f..33e72458a 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 = "78fe1b14f60d55ae335369fb2c6e81ed9ac6d865" +SRCREV = "9bb4a3867ab1cc14605b6fc56a696b18bff80e20" -- cgit v1.2.3 From 37c324aaca093b253114c32a97dd8a2170071d76 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 22 Nov 2021 22:50:51 +0000 Subject: phosphor-pid-control: srcrev bump cca9c65988..457993f836 Patrick Williams (1): sdbusplus: remove usage of deprecated alias Change-Id: Id7813b300e9890b1c0eb83cc81038d5342023d58 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ea62216c5..2fa711c60 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -13,7 +13,7 @@ inherit systemd S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "cca9c659889d149c06e95bab4b8808db4f1e3eab" +SRCREV = "457993f836338aa0c13a32af803fcbc5227c81f3" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if -- cgit v1.2.3 From 5dd3b7b3f52694483d5a30f6ed2aaa2452820cc3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 22 Nov 2021 22:20:53 +0000 Subject: bmcweb: srcrev bump 8682c5ad05..0fd03ad472 George Liu (1): Update clang-format Jason M. Bills (1): Remove Jason as a maintainer Jonathan Doman (1): Remove obsolete Boost preprocessor options Change-Id: I517592e6c9ec832bbdda0df549331e3d2f78877e Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index e083eb460..ae7a2737d 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "8682c5ad05a9dff8ba3575ff5c4e8ceb535f6c5e" +SRCREV = "0fd03ad472d42eb35c15147e4c678d28b7f70c4a" S = "${WORKDIR}/git" -- cgit v1.2.3 From 34cee147e1fce677df14e78f21d6fa9f3fe0dade Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 22 Nov 2021 12:51:23 +0000 Subject: phosphor-networkd: srcrev bump 26c40a43b2..ee2cba8a7d sureshvijayv1 (1): Check eth intf existence before creating VLAN Change-Id: I4b79e03d36c08a72932c09327714f4d7e6f8477d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index 137e737c2..1d401bbb4 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -11,7 +11,7 @@ inherit python3native inherit systemd SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "26c40a43b2fde3898ba6786ab28af01cd9125805" +SRCREV = "ee2cba8a7d22ef4a251181087e9ef9bfc5c4b165" DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" -- cgit v1.2.3 From 95c8e66a67e59b54d59e649660e24cb2e5ed6098 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 19 Nov 2021 23:10:48 +0000 Subject: entity-manager: srcrev bump 7939a765cb..2c412eef8e Howard Chiu (1): Configurations: Bletchley: Add new json file for Facebook Change-Id: I66fb95ff603375bf1a89c39ccd5473ceef2385af Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 17ad49b7e..0ff73be7c 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "7939a765cb6f6e128c87ab61e2bd86d2cae0f9da" +SRCREV = "2c412eef8eb76bf2a998c9d193f2dc92aaec39f8" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From b34245b33ba362c8d559f38022b923e08f1b565e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 19 Nov 2021 19:00:26 +0000 Subject: openpower-occ-control: srcrev bump a7b74dc310..36313c71da Eddie James (1): Fix PLDM effector state set IDs Change-Id: Ibff63c7b2a9d314a95acad40a2a4bb7f139ec166 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index 93c2ae5bd..5a7c2ba00 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" -SRCREV = "a7b74dc31001884243556e4433d0bbfda3c09083" +SRCREV = "36313c71da39e7b9e115346054e5b6171f8bb2c6" -- cgit v1.2.3 From 89afe887e364b2ea89afb90ada724dabce07ae7d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 19 Nov 2021 14:31:00 +0000 Subject: phosphor-logging: srcrev bump c1ba04f2a6..a9e4f59664 Jonathan Doman (1): lg2: Reset format string for multiple uses Matt Spinler (1): elog-gen.py: Remove missing metadata print Sumit Kumar (1): PEL: Write terminating SRC to the progress SRC Change-Id: I5df8e53a70e15d5d2fa9f753a686088f27005512 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 891f295b0..8497f9c2f 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 = "c1ba04f2a6dc2269b8acfb289adaa72f3288a86d" +SRCREV = "a9e4f59664683a45d2c615e350cf2628b9fa41c9" S = "${WORKDIR}/git" -- cgit v1.2.3 From 6e124701258e4463f9170517b8d062aed3406306 Mon Sep 17 00:00:00 2001 From: GeorgeHuang Date: Wed, 24 Nov 2021 16:37:21 +0800 Subject: meta-quanta: gbs: Change the BIOS main flash label to bios-primary Change the BIOS main flash label to 'bios-primary' from 'pnor' for the bios-update.sh ref: https://github.com/openbmc/linux/commit/2eea476 Signed-off-by: GeorgeHuang Change-Id: I208a24cd5f7956cc3461986eb0aed0348c186ebf --- .../meta-gbs/recipes-gbs/gbs-bios-update/files/bios-update.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/files/bios-update.sh b/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/files/bios-update.sh index 36dfa452c..bf71e9452 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/files/bios-update.sh +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/files/bios-update.sh @@ -75,14 +75,14 @@ main() { fi echo "${KERNEL_FIU_ID}" > "${KERNEL_SYSFS_FIU}"/bind - # BIOS flash is labelled 'pnor' - pnor_mtd=$(findmtd pnor) - if [ -z "${pnor_mtd}" ]; then + # BIOS flash is labelled 'bios-primary' + bios_mtd=$(findmtd bios-primary) + if [ -z "${bios_mtd}" ]; then echo "Cannot find bios flash mtd partition!" exit 1 fi - flashcp -v $IMAGE_FILE /dev/"${pnor_mtd}" + flashcp -v $IMAGE_FILE /dev/"${bios_mtd}" if [ $? -eq 0 ]; then echo "bios update successfully..." else -- cgit v1.2.3 From 80433b761a87281e67f2a0befd34792bb8e6f02b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 30 Nov 2021 19:31:06 +0000 Subject: phosphor-host-ipmid: srcrev bump 9bb4a3867a..5aae092cab Johnathan Mantey (1): Modify default prefix assignment for Get LAN Config Params 56 & 59 Change-Id: I99e270fbce34b988c24d7f1cc5e644a454c6bcae Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 33e72458a..84f7e3ba2 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 = "9bb4a3867ab1cc14605b6fc56a696b18bff80e20" +SRCREV = "5aae092cab08279d45c7914c466314b356164b7c" -- cgit v1.2.3 From e6de5e85da8a5d476f9ea9c41737a4704adf36c6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 30 Nov 2021 19:21:59 +0000 Subject: webui-vue: srcrev bump 2a2e1021f4..5e5b48b0a4 Konstantin Aladyshev (3): Russian translations for the LED page Russian translations for the Dimms table Fix error in russian translations for the overview page Change-Id: Ibf7c80c276bd4bdcb6db29c493a3b3ae7679a5bd Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 1a3feedbe..1288efad4 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 = "2a2e1021f48e2a939859ba7f4ae86c5de6df5655" +SRCREV = "5e5b48b0a452b5b121b9221019cf7616545b188b" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " -- cgit v1.2.3 From 6e9f714ded4b1288e5254e3efa12802e8e35c32b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 30 Nov 2021 18:51:00 +0000 Subject: phosphor-fan-presence: srcrev bump 1a19eadd2a..8a8aa442e5 Matt Spinler (1): control: get_managed_objects action Matthew Barth (2): control:p10bmc: Add missing `fan inventory` monitor: Add ignoring feedback sensors above allowed max Change-Id: I308f1052230e13ee49cc7ee4e9c5f61af4693c21 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 402efc2de..731eeea20 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" -SRCREV = "1a19eadd2a5c86e3482400ffb3eef4108077cbe8" +SRCREV = "8a8aa442e51e2116ba27e71636bb9a3183502b10" -- cgit v1.2.3 From 418701ca0fb1be39608872de82e4eff8f11613fb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 30 Nov 2021 17:51:04 +0000 Subject: phosphor-logging: srcrev bump a9e4f59664..9368b714f2 Brandon Wyman (2): PEL: Add isolation procedure for power OC PEL: Add phosphor-power Output Over-current error Jayanth Othayoth (3): PEL: Add location code information support for sub FRUs PEL: Fix pdbg target traversal error path issues PEL: Add procedure callout for hwp errors Sumit Kumar (1): PEL: Fix for error - unable to read PEL ID file Change-Id: Iac6d6dc6a42faa33c203bfbb63f3707415b59b44 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 8497f9c2f..4e9b18a29 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 = "a9e4f59664683a45d2c615e350cf2628b9fa41c9" +SRCREV = "9368b714f2e4fb2cb3fe4536ffbe4488110d3731" S = "${WORKDIR}/git" -- cgit v1.2.3 From f77a0bab727a8a9c10824a203be6bbc56d741262 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 30 Nov 2021 08:21:31 +0000 Subject: pldm: srcrev bump 3d34b2c211..eea835a91b Tom Joseph (1): pldmtool: Add GetStatus firmware update command Change-Id: I0530e1ec1afd5e0bec87b59a0f24fc6ba6d1862d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index a42b168a9..630da0df9 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 = "3d34b2c21190aabce594b1b84f42569ba78cf8c7" +SRCREV = "eea835a91b3b574100cade108548a3278d79b6bf" -- cgit v1.2.3 From 210248c7ee7d9baf0086ae755353f409c6b91b25 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 29 Nov 2021 22:41:11 +0000 Subject: phosphor-networkd: srcrev bump ee2cba8a7d..329b5fba06 William A. Kennington III (3): network_manager: Add reload hooking ethernet_interface: Defer link down for MAC change ethernet_interface: Defer setting NIC enabled Change-Id: I2865dbb51e036eb923cfc2081a90516737bb3d82 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index 1d401bbb4..1dd268d23 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -11,7 +11,7 @@ inherit python3native inherit systemd SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "ee2cba8a7d22ef4a251181087e9ef9bfc5c4b165" +SRCREV = "329b5fba06acd63ce0fb9f43ea3f99b1542e862e" DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" -- cgit v1.2.3 From 06ad91217e14d2db6ce2db284366d19e3fe8db0c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 29 Nov 2021 22:00:26 +0000 Subject: openpower-hw-diags: srcrev bump 04f010abb7..5542ba38cb Zane Shelley (1): Fix MCC target paths in P10 RAS data files Change-Id: Ifb247825203bf5771c472df00d5c04fb97102fbb Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9bbba105e..f46b7ee26 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" -SRCREV = "04f010abb7946c18d6bb68c714ca6a4417845d8d" +SRCREV = "5542ba38cb71a14ccb9146d07bf1abada405a781" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2c925f4dfd3257411dcee9510d20874ef585c953 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 29 Nov 2021 20:50:26 +0000 Subject: openpower-occ-control: srcrev bump 36313c71da..432dc48607 Eddie James (1): pldm: Fix HRESET handling and incorrect entity ID Change-Id: I542c1bdf0b78f311f1d55249936c05ca0e1bafe0 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index 5a7c2ba00..e10131436 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" -SRCREV = "36313c71da39e7b9e115346054e5b6171f8bb2c6" +SRCREV = "432dc48607223e24250e1fc4fa6fb42456a6db62" -- cgit v1.2.3 From 87feb4f4a3b0c9d36c83ee3e57538c53ba6748c2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 29 Nov 2021 20:11:35 +0000 Subject: phosphor-power: srcrev bump a61c1aa0a2..7ee4d7e41d Brandon Wyman (2): PMBus: Fix "file" name for STATUS_FANS_1_2 psu-ng: Add in detection of fan faults Change-Id: Ia1e7fa4c7721c612c8e39eb85235b8794346f788 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 22fb7ba4d..206f8ef7a 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 = "a61c1aa0a2006dedf0752bf7efca364a86d4dd96" +SRCREV = "7ee4d7e41d301c99cef377028264124fe35b7baa" -- cgit v1.2.3 From 7ed4fd68354b6f808a075fbe44d740ddf7b72ade Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 29 Nov 2021 18:20:38 +0000 Subject: entity-manager: srcrev bump 2c412eef8e..1cf04c17b6 Jayaprakash Mutyala (1): Add HSBP FRU details in json configuration Kumar Thangavel (1): Move global variable to local variable. hsangani (1): Added JC42 JEDEC standard memory temp sensor support Change-Id: I81fdea46304fd9aa6c616b848f51bb602a465959 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 0ff73be7c..5a8b6c553 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "2c412eef8eb76bf2a998c9d193f2dc92aaec39f8" +SRCREV = "1cf04c17b63ad1b2f0e94c1398ab16b9d3221f5f" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From d5a729eb616fbead0d29d957ac2650bfcd0deed8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 5 Nov 2021 09:48:12 +0100 Subject: libpcre/libpcre2: correct SRC_URI http://ftp.pcre.org is down, take sources according to links on http://www.pcre.org (From OE-Core rev: 81ba0ba3e8d9c08b8dc69c24fb1d91446739229b) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie Signed-off-by: Andrew Geissler Change-Id: I6570f3bf5b813dc66e0960e9b3baa7df4cdae019 --- poky/meta/recipes-support/libpcre/libpcre2_10.37.bb | 4 +++- poky/meta/recipes-support/libpcre/libpcre_8.45.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/poky/meta/recipes-support/libpcre/libpcre2_10.37.bb b/poky/meta/recipes-support/libpcre/libpcre2_10.37.bb index e0ead59da..ccedf688d 100644 --- a/poky/meta/recipes-support/libpcre/libpcre2_10.37.bb +++ b/poky/meta/recipes-support/libpcre/libpcre2_10.37.bb @@ -10,7 +10,9 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=6b3022283c9a79238d521848ea9dcb4d" -SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2" +SRC_URI = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${PV}/pcre2-${PV}.tar.bz2" + +UPSTREAM_CHECK_URI = "https://github.com/PhilipHazel/pcre2/releases" SRC_URI[sha256sum] = "4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270" diff --git a/poky/meta/recipes-support/libpcre/libpcre_8.45.bb b/poky/meta/recipes-support/libpcre/libpcre_8.45.bb index 76b20f5f0..46fedbae4 100644 --- a/poky/meta/recipes-support/libpcre/libpcre_8.45.bb +++ b/poky/meta/recipes-support/libpcre/libpcre_8.45.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=b5d5d1a69a24ea2718263f1ff85a1c58" -SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ file://run-ptest \ file://Makefile \ " -- cgit v1.2.3 From 66f9d836985470806fc2fbebf37570d4a93c0a49 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 1 Dec 2021 23:10:41 +0000 Subject: entity-manager: srcrev bump 1cf04c17b6..5468c6e953 John Edward Broadbent (1): doc only: Fix broken link Change-Id: Ib9127a76484744dfd89521a00bb4ce9282eeb85d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 5a8b6c553..91d609ecf 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "1cf04c17b63ad1b2f0e94c1398ab16b9d3221f5f" +SRCREV = "5468c6e953f608331ff455fea51ce541ea2cd9f0" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From 8003ee08db26ea0d0864da82401c1b89bfbed9df Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 1 Dec 2021 19:31:38 +0000 Subject: pldm: srcrev bump eea835a91b..9e0265b527 Brad Bishop (3): pldm_visualise_pdrs.py: make use of --all pldm_visualise_pdrs.py: add support for ssh_config pldm_visualise_pdrs.py: add jump host support Change-Id: Id08c01b5f67f9277007b01714d86f41932cd17df Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 630da0df9..9c9e02a5b 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 = "eea835a91b3b574100cade108548a3278d79b6bf" +SRCREV = "9e0265b5273438f68ca30281f60e99831739fd73" -- cgit v1.2.3 From e1ca512b4d1ebaffa356b311888ad65e1a618e03 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 1 Dec 2021 19:00:49 +0000 Subject: phosphor-fan-presence: srcrev bump 8a8aa442e5..5934f097e6 Matt Spinler (2): control: Create parameter trigger control:p10bmc: OCC inactive fan floor event Matthew Barth (1): control:p10bmc: Add processor `core temps` groups Change-Id: I1b1d997a18a76f469f9a4d99476d316868126e19 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 731eeea20..fa92b58be 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" -SRCREV = "8a8aa442e51e2116ba27e71636bb9a3183502b10" +SRCREV = "5934f097e65de15d2eb0dcb780e88b39ef5661c0" -- cgit v1.2.3 From 0dca03e0db1fff55b104bfa35ef722477851c186 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 1 Dec 2021 19:21:26 +0000 Subject: phosphor-power: srcrev bump 7ee4d7e41d..b3ba516f3f Shawn McCarney (1): regulators: Enhance additional error data capture Change-Id: If80d282572fd103a516433d0d66d1bbd73863bd9 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 206f8ef7a..05ad13c55 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 = "7ee4d7e41d301c99cef377028264124fe35b7baa" +SRCREV = "b3ba516f3f418b9b1a98d4bd27210799383262b2" -- cgit v1.2.3 From 3c2b93723b81f25c526a5eb877e57222d8dae1c2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 1 Dec 2021 20:21:36 +0000 Subject: webui-vue: srcrev bump 5e5b48b0a4..cc79a53192 Gunnar Mills (1): Correct Dump file extension Konstantin Aladyshev (1): Fix DHCPv4 display Change-Id: I91ec7aed94763342ead389f11d2b696e17cb8ab3 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 1288efad4..da6467083 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 = "5e5b48b0a452b5b121b9221019cf7616545b188b" +SRCREV = "cc79a53192de73457cb4c8c3350d896d952bb106" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " -- cgit v1.2.3 From ecfdbb573e9d814302833aa93e595a49061b86b5 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 1 Dec 2021 18:10:49 +0000 Subject: bmcweb: srcrev bump 0fd03ad472..60c922dfac Brandon Kim (1): redfish-core: processor: Add Model, Microcode, Step Gunnar Mills (1): Move to 2021.3 Krzysztof Grobelny (1): Add Krzysztof as a reviewer Wludzik, Jozef (1): Sync Telmetry service with EventService Change-Id: I960d87f9a89025ddeea93c2459bb092c4587d5a1 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index ae7a2737d..cfb29ec44 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "0fd03ad472d42eb35c15147e4c678d28b7f70c4a" +SRCREV = "60c922dfacd5d1aeec8789e03edc91b47f4a6661" S = "${WORKDIR}/git" -- cgit v1.2.3 From fdcf317b76f38d722b0e07cbf58edae0acd17628 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 1 Dec 2021 01:01:13 +0000 Subject: dbus-sensors: srcrev bump 00bd56d3a6..daf6f56870 hsangani (1): Added JC42 JEDEC standard memory temp sensor support Change-Id: I1dc55d94aa2023874fe2ce2cb473e4e67115b809 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index d91283160..764053afc 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 = "00bd56d3a6176367b818d958e0177cab19a6e618" +SRCREV = "daf6f56870c6386ecb1c43b0b9aaa4cc78e4d424" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 9f2ba62e5604a59b88f1bdc8cdc86fb43e0243d5 Mon Sep 17 00:00:00 2001 From: "Lakshminarayana R. Kammath" Date: Wed, 3 Nov 2021 05:41:03 -0500 Subject: meta-ibm: Add enclosure_fault and enclosure_identify to the Association json Earlier enclosure_identify and enclosure_fault associations were missing in the inventory manager. With this checkin we are adding those associations. busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis xyz.openbmc_project.Association.Definitions Associations a(sss) 24 "fault_led_group" "fault_inventory_object" "/xyz/openbmc_project/led/groups/enclosure_fault" "identify_led_group" "identify_inventory_object" "/xyz/openbmc_project/led/groups/enclosure_identify" "chassis" "inventory" "/xyz/openbmc_project/inventory/system/chassis" .... After closely looking into all the LED's it was identified that enclosure_fault and enclosure_identify is missing in the association and this commit is to enable same Signed-off-by: Lakshminarayana R. Kammath Change-Id: I42728d994e9110c56c607aeea98623fe2613af92 --- .../p10bmc/ibm,everest_associations.json | 22 ++++++++++++++++++++++ .../p10bmc/ibm,rainier-2u_associations.json | 22 ++++++++++++++++++++++ .../p10bmc/ibm,rainier-4u_associations.json | 22 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) 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 7405ce1fc..68a0a6ac2 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 @@ -174,6 +174,28 @@ "path": "system/chassis", "endpoints": [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_identify" + ] + }, { "types": { 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 65f389998..b6f1ceaf3 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 @@ -255,6 +255,28 @@ "path": "system/chassis", "endpoints": [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_identify" + ] + }, { "types": { 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 5cda22d66..667c53c89 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 @@ -249,6 +249,28 @@ "path": "system/chassis", "endpoints": [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/enclosure_identify" + ] + }, { "types": { -- cgit v1.2.3 From 39d68d4071b8e9b61210e8bbe65d68a9662d0f34 Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Thu, 2 Dec 2021 19:16:20 +0300 Subject: Remove BBLAYERS_NON_REMOVABLE variable `BBLAYERS_NON_REMOVABLE` is obsolete and no longer required. As it said by Yocto documentation it can be used by `Hob` https://www.yoctoproject.org/docs/1.5.2/ref-manual/ref-manual.html#var-BBLAYERS_NON_REMOVABLE that already removed since Yocto-2.1 https://www.yoctoproject.org/tools-resources/projects/hob Change-Id: Ibc2d8268a9d837a81e9cf6b0131dba8d0a030a3f Signed-off-by: Alexander Filippov --- meta-amd/meta-ethanolx/conf/bblayers.conf.sample | 12 ------------ meta-ampere/meta-jade/conf/bblayers.conf.sample | 12 ------------ meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample | 11 ----------- meta-bytedance/meta-g220a/conf/bblayers.conf.sample | 12 ------------ .../meta-evb-ast2500/conf/bblayers.conf.sample | 15 --------------- .../meta-evb-ast2600/conf/bblayers.conf.sample | 12 ------------ .../meta-evb-npcm750/conf/bblayers.conf.sample | 14 -------------- meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample | 12 ------------ meta-facebook/meta-bletchley/conf/bblayers.conf.sample | 15 --------------- meta-facebook/meta-tiogapass/conf/bblayers.conf.sample | 14 -------------- meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample | 14 -------------- meta-fii/meta-kudo/conf/bblayers.conf.sample | 12 ------------ meta-hpe/meta-dl360poc/conf/bblayers.conf.sample | 13 ------------- meta-ibm/conf/bblayers.conf.sample | 13 ------------- meta-ibm/meta-palmetto/conf/bblayers.conf.sample | 12 ------------ meta-ibm/meta-romulus/conf/bblayers.conf.sample | 12 ------------ meta-ingrasys/meta-zaius/conf/bblayers.conf.sample | 13 ------------- meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample | 14 -------------- .../meta-transformers/conf/bblayers.conf.sample | 16 ---------------- meta-phosphor/conf/bblayers.conf.sample | 10 ---------- meta-quanta/meta-f0b/conf/bblayers.conf.sample | 12 ------------ meta-quanta/meta-gbs/conf/bblayers.conf.sample | 13 ------------- meta-quanta/meta-gsj/conf/bblayers.conf.sample | 13 ------------- .../meta-olympus-nuvoton/conf/bblayers.conf.sample | 13 ------------- meta-quanta/meta-q71l/conf/bblayers.conf.sample | 14 -------------- meta-yadro/meta-nicole/conf/bblayers.conf.sample | 13 ------------- 26 files changed, 336 deletions(-) diff --git a/meta-amd/meta-ethanolx/conf/bblayers.conf.sample b/meta-amd/meta-ethanolx/conf/bblayers.conf.sample index 2b8d624bc..be7eb7c0f 100644 --- a/meta-amd/meta-ethanolx/conf/bblayers.conf.sample +++ b/meta-amd/meta-ethanolx/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-amd \ ##OEROOT##/meta-amd/meta-ethanolx \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-amd \ - ##OEROOT##/meta-amd/meta-ethanolx \ - " diff --git a/meta-ampere/meta-jade/conf/bblayers.conf.sample b/meta-ampere/meta-jade/conf/bblayers.conf.sample index 6e0893eb3..6427c8b1b 100644 --- a/meta-ampere/meta-jade/conf/bblayers.conf.sample +++ b/meta-ampere/meta-jade/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-ampere \ ##OEROOT##/meta-ampere/meta-jade \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-ampere \ - ##OEROOT##/meta-ampere/meta-jade \ - " diff --git a/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample b/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample index 2f2b5f377..409a775a8 100644 --- a/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample +++ b/meta-asrock/meta-e3c246d4i/conf/bblayers.conf.sample @@ -16,14 +16,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-asrock \ ##OEROOT##/meta-asrock/meta-e3c246d4i \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-asrock \ - ##OEROOT##/meta-asrock/meta-e3c246d4i \ - " diff --git a/meta-bytedance/meta-g220a/conf/bblayers.conf.sample b/meta-bytedance/meta-g220a/conf/bblayers.conf.sample index 370d6456f..81b0a95f8 100644 --- a/meta-bytedance/meta-g220a/conf/bblayers.conf.sample +++ b/meta-bytedance/meta-g220a/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-bytedance \ ##OEROOT##/meta-bytedance/meta-g220a \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-bytedance \ - ##OEROOT##/meta-bytedance/meta-g220a \ - " diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample index 83c22c5b6..477be07f1 100644 --- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample @@ -20,18 +20,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-evb/meta-evb-aspeed \ ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-evb \ - ##OEROOT##/meta-evb/meta-evb-aspeed \ - ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2500 \ - " diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample index de8ab1312..145dac4f2 100644 --- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2600 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-evb/meta-evb-aspeed/meta-evb-ast2600 \ - " diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample index ee62cea41..96c16f311 100644 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample +++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample @@ -19,17 +19,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-evb/meta-evb-nuvoton \ ##OEROOT##/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-evb \ - ##OEROOT##/meta-evb/meta-evb-nuvoton \ - ##OEROOT##/meta-evb/meta-evb-nuvoton/meta-evb-npcm750 \ - " diff --git a/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample index 6e838d799..6c7bb92a6 100644 --- a/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample +++ b/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-raspberrypi \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-raspberrypi \ - " diff --git a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample b/meta-facebook/meta-bletchley/conf/bblayers.conf.sample index 3b24ed861..84dcddfbb 100644 --- a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample +++ b/meta-facebook/meta-bletchley/conf/bblayers.conf.sample @@ -20,18 +20,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-facebook \ ##OEROOT##/meta-facebook/meta-bletchley \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-security/meta-tpm \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-facebook \ - ##OEROOT##/meta-facebook/meta-bletchley \ - " diff --git a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample b/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample index d8d02ae93..2d4f102a8 100644 --- a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample +++ b/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample @@ -19,17 +19,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-facebook \ ##OEROOT##/meta-facebook/meta-tiogapass \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-facebook \ - ##OEROOT##/meta-facebook/meta-tiogapass \ - " diff --git a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample index 18dc94472..25e19f17f 100644 --- a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample +++ b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample @@ -19,17 +19,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-facebook \ ##OEROOT##/meta-facebook/meta-yosemitev2 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-facebook \ - ##OEROOT##/meta-facebook/meta-yosemitev2 \ - " diff --git a/meta-fii/meta-kudo/conf/bblayers.conf.sample b/meta-fii/meta-kudo/conf/bblayers.conf.sample index f8958b950..e16dfb9fa 100644 --- a/meta-fii/meta-kudo/conf/bblayers.conf.sample +++ b/meta-fii/meta-kudo/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-google \ ##OEROOT##/meta-fii/meta-kudo \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-google \ - ##OEROOT##/meta-fii/meta-kudo \ - " diff --git a/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample b/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample index ef28dc220..d75648063 100644 --- a/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample +++ b/meta-hpe/meta-dl360poc/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-hpe \ ##OEROOT##/meta-hpe/meta-dl360poc \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-hpe/meta-gxp \ - ##OEROOT##/meta-hpe \ - ##OEROOT##/meta-hpe/meta-dl360poc \ - " diff --git a/meta-ibm/conf/bblayers.conf.sample b/meta-ibm/conf/bblayers.conf.sample index 11b3f5980..4f70015be 100644 --- a/meta-ibm/conf/bblayers.conf.sample +++ b/meta-ibm/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openpower \ ##OEROOT##/meta-ibm \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security/meta-tpm \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm \ - " diff --git a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-ibm/meta-palmetto/conf/bblayers.conf.sample index b5c268c64..750b4763c 100644 --- a/meta-ibm/meta-palmetto/conf/bblayers.conf.sample +++ b/meta-ibm/meta-palmetto/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openpower \ ##OEROOT##/meta-ibm/meta-palmetto \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm/meta-palmetto \ - " diff --git a/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-ibm/meta-romulus/conf/bblayers.conf.sample index 1bb30353e..bf1f4e986 100644 --- a/meta-ibm/meta-romulus/conf/bblayers.conf.sample +++ b/meta-ibm/meta-romulus/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openpower \ ##OEROOT##/meta-ibm/meta-romulus \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ibm/meta-romulus \ - " diff --git a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample index 3ee615247..7a4e18983 100644 --- a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample +++ b/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-ingrasys \ ##OEROOT##/meta-ingrasys/meta-zaius \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-ingrasys \ - ##OEROOT##/meta-ingrasys/meta-zaius \ - " diff --git a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample b/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample index 9f5c27cd4..b3fc4469f 100644 --- a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample +++ b/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample @@ -19,17 +19,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-inspur \ ##OEROOT##/meta-inspur/meta-fp5280g2\ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-inspur \ - ##OEROOT##/meta-inspur/meta-fp5280g2 \ - " diff --git a/meta-inventec/meta-transformers/conf/bblayers.conf.sample b/meta-inventec/meta-transformers/conf/bblayers.conf.sample index c779683e2..783c90e88 100755 --- a/meta-inventec/meta-transformers/conf/bblayers.conf.sample +++ b/meta-inventec/meta-transformers/conf/bblayers.conf.sample @@ -20,19 +20,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-inventec \ ##OEROOT##/meta-inventec/meta-transformers \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-x86 \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-inventec \ - ##OEROOT##/meta-inventec/meta-transformers \ -" - diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/bblayers.conf.sample index 4c0c52e8c..d10e530a4 100644 --- a/meta-phosphor/conf/bblayers.conf.sample +++ b/meta-phosphor/conf/bblayers.conf.sample @@ -15,13 +15,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - " diff --git a/meta-quanta/meta-f0b/conf/bblayers.conf.sample b/meta-quanta/meta-f0b/conf/bblayers.conf.sample index db7f86a0d..252c26bc3 100644 --- a/meta-quanta/meta-f0b/conf/bblayers.conf.sample +++ b/meta-quanta/meta-f0b/conf/bblayers.conf.sample @@ -17,15 +17,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-f0b \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-f0b \ - " diff --git a/meta-quanta/meta-gbs/conf/bblayers.conf.sample b/meta-quanta/meta-gbs/conf/bblayers.conf.sample index 903833258..22757391f 100644 --- a/meta-quanta/meta-gbs/conf/bblayers.conf.sample +++ b/meta-quanta/meta-gbs/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-gbs \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-google \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-gbs \ - " diff --git a/meta-quanta/meta-gsj/conf/bblayers.conf.sample b/meta-quanta/meta-gsj/conf/bblayers.conf.sample index 1c895ea00..2746d9af1 100644 --- a/meta-quanta/meta-gsj/conf/bblayers.conf.sample +++ b/meta-quanta/meta-gsj/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-gsj \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-google \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-gsj \ - " diff --git a/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample index f7b4c2210..eb6cb8059 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample +++ b/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-olympus-nuvoton \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-google \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-olympus-nuvoton \ - " diff --git a/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-quanta/meta-q71l/conf/bblayers.conf.sample index 880ce33b1..b4411a4e0 100644 --- a/meta-quanta/meta-q71l/conf/bblayers.conf.sample +++ b/meta-quanta/meta-q71l/conf/bblayers.conf.sample @@ -19,17 +19,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-q71l \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-x86 \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-q71l \ - " diff --git a/meta-yadro/meta-nicole/conf/bblayers.conf.sample b/meta-yadro/meta-nicole/conf/bblayers.conf.sample index 776b1a90b..3ceae4949 100644 --- a/meta-yadro/meta-nicole/conf/bblayers.conf.sample +++ b/meta-yadro/meta-nicole/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-yadro \ ##OEROOT##/meta-yadro/meta-nicole \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-yadro \ - ##OEROOT##/meta-yadro/meta-nicole \ - " -- cgit v1.2.3 From 26f9276925b8c61df02d611156179b99a2359a42 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Tue, 26 Oct 2021 13:58:15 -0700 Subject: x86-power-control: Switch to meson build Change-Id: Ia32f0baf56fb7a3e035198ece7e74fe18f8fa05c Signed-off-by: Jason M. Bills --- meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend | 2 +- .../meta-common/recipes-x86/chassis/x86-power-control_%.bbappend | 2 +- meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend index 862f2f179..59f307877 100644 --- a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OECMAKE += "-DCHASSIS_SYSTEM_RESET=ON" +EXTRA_OEMESON += "-Dchassis-system-reset=enabled" SRC_URI:append:yosemitev2 = " file://power-config-host1.json" SRC_URI:append:yosemitev2 = " file://power-config-host2.json" diff --git a/meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend index b27f9080b..e4d066bc6 100644 --- a/meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-intel-openbmc/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,2 +1,2 @@ # Use PLT_RST to detect warm resets -EXTRA_OECMAKE:intel += "-DUSE_PLT_RST=ON" +EXTRA_OEMESON:intel += "-Duse-plt-rst=enabled" 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 04fd5dc63..f510f3550 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit cmake systemd +inherit meson systemd pkgconfig inherit obmc-phosphor-dbus-service def get_service(d): -- cgit v1.2.3 From d1bd828bbfcaa7629f64dbf97a5b504e3e6a2b1f Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 2 Dec 2021 11:51:59 +1030 Subject: linux-aspeed: Refresh defconfigs The defconfigs are regenerated using savedefconfig. No options are changed. An explanation as to why some are removed from the defconfig: - ZBOOT_ROM_TEXT and ZBOOT_ROM_BSS default to 0x0 (and we odn't use them) - SECOMMP is now on by default - BLK_DEV_BSG is now behind SCSI, which we do not enable - I2C_MUX is selected by the MEDIA subsystem - MCTP_LPC is gone - NET_VENDOR_AURORA is gone - PECI is not in the tree :( - ASPEED_LPC drivers are enabled by default The other options move their order but are still present. Change-Id: Ib03b6dab4804e354629b9bf7f4e0951b6131462c Signed-off-by: Joel Stanley --- .../linux/linux-aspeed/aspeed-g4/defconfig | 12 +++--------- .../linux/linux-aspeed/aspeed-g5/defconfig | 13 +++---------- .../linux/linux-aspeed/aspeed-g6/defconfig | 22 ++++------------------ 3 files changed, 10 insertions(+), 37 deletions(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig index 08ac6eb04..a9920dde4 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig @@ -3,6 +3,7 @@ CONFIG_KERNEL_XZ=y CONFIG_SYSVIPC=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 @@ -17,7 +18,6 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_UID16 is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_AIO is not set -CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set @@ -29,15 +29,10 @@ CONFIG_MACH_ASPEED_G4=y CONFIG_VMSPLIT_2G=y CONFIG_AEABI=y CONFIG_UACCESS_WITH_MEMCPY=y -CONFIG_SECCOMP=y # CONFIG_ATAGS is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_KEXEC=y -CONFIG_FIRMWARE_MEMMAP=y CONFIG_JUMP_LABEL=y CONFIG_STRICT_KERNEL_RWX=y -# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEBUG_FS is not set # CONFIG_MQ_IOSCHED_DEADLINE is not set # CONFIG_MQ_IOSCHED_KYBER is not set @@ -69,6 +64,7 @@ CONFIG_NET_NCSI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FIRMWARE_MEMMAP=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y CONFIG_MTD_PARTITIONED_MASTER=y @@ -186,8 +182,6 @@ CONFIG_RTC_DRV_PCF8523=y CONFIG_RTC_DRV_RV8803=y # CONFIG_VIRTIO_MENU is not set # CONFIG_IOMMU_SUPPORT is not set -CONFIG_ASPEED_LPC_CTRL=y -CONFIG_ASPEED_LPC_SNOOP=y CONFIG_IIO=y CONFIG_ASPEED_ADC=y CONFIG_MAX1363=y @@ -226,6 +220,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_GDB_SCRIPTS=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_FS=y +CONFIG_DEBUG_WX=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 @@ -235,6 +230,5 @@ CONFIG_WQ_WATCHDOG=y # CONFIG_SCHED_DEBUG is not set CONFIG_DEBUG_LIST=y CONFIG_FUNCTION_TRACER=y -CONFIG_DEBUG_WX=y CONFIG_DEBUG_USER=y # CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig index e194892f3..35eabcfe2 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -3,6 +3,7 @@ CONFIG_KERNEL_XZ=y CONFIG_SYSVIPC=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y CONFIG_PSI=y CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_IKCONFIG=y @@ -19,7 +20,6 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_UID16 is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_AIO is not set -CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set @@ -32,16 +32,11 @@ CONFIG_MACH_ASPEED_G5=y # CONFIG_CACHE_L2X0 is not set CONFIG_VMSPLIT_2G=y CONFIG_UACCESS_WITH_MEMCPY=y -CONFIG_SECCOMP=y # CONFIG_ATAGS is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_KEXEC=y # CONFIG_SUSPEND is not set -CONFIG_FIRMWARE_MEMMAP=y CONFIG_JUMP_LABEL=y CONFIG_STRICT_KERNEL_RWX=y -# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEBUG_FS is not set # CONFIG_MQ_IOSCHED_DEADLINE is not set # CONFIG_MQ_IOSCHED_KYBER is not set @@ -73,6 +68,7 @@ CONFIG_NET_NCSI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FIRMWARE_MEMMAP=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y CONFIG_MTD_PARTITIONED_MASTER=y @@ -148,7 +144,6 @@ CONFIG_HW_RANDOM_TIMERIOMEM=y CONFIG_DEVMEM_BOOTPARAM=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA9541=y CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_ASPEED=y @@ -210,8 +205,6 @@ CONFIG_RTC_DRV_PCF8523=y CONFIG_RTC_DRV_RV8803=y # CONFIG_VIRTIO_MENU is not set # CONFIG_IOMMU_SUPPORT is not set -CONFIG_ASPEED_LPC_CTRL=y -CONFIG_ASPEED_LPC_SNOOP=y CONFIG_ASPEED_XDMA=y CONFIG_IIO=y CONFIG_ASPEED_ADC=y @@ -255,6 +248,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_GDB_SCRIPTS=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_FS=y +CONFIG_DEBUG_WX=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 @@ -264,6 +258,5 @@ CONFIG_WQ_WATCHDOG=y # CONFIG_SCHED_DEBUG is not set CONFIG_DEBUG_LIST=y CONFIG_FUNCTION_TRACER=y -CONFIG_DEBUG_WX=y CONFIG_DEBUG_USER=y # CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index fa3507d5d..451afd81a 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -3,6 +3,7 @@ CONFIG_KERNEL_XZ=y CONFIG_SYSVIPC=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y CONFIG_PSI=y CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_IKCONFIG=y @@ -19,7 +20,6 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_UID16 is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_AIO is not set -CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set @@ -34,17 +34,12 @@ CONFIG_VMSPLIT_2G=y CONFIG_NR_CPUS=2 CONFIG_HIGHMEM=y CONFIG_UACCESS_WITH_MEMCPY=y -CONFIG_SECCOMP=y # CONFIG_ATAGS is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_KEXEC=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y -CONFIG_FIRMWARE_MEMMAP=y CONFIG_JUMP_LABEL=y -# CONFIG_BLK_DEV_BSG is not set # CONFIG_MQ_IOSCHED_DEADLINE is not set # CONFIG_MQ_IOSCHED_KYBER is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set @@ -75,6 +70,7 @@ CONFIG_NET_NCSI=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FIRMWARE_MEMMAP=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y CONFIG_MTD_PARTITIONED_MASTER=y @@ -86,7 +82,6 @@ CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_BLOCK=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y -CONFIG_MCTP_LPC=y CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=y CONFIG_MD=y @@ -98,7 +93,6 @@ CONFIG_NETCONSOLE=y # CONFIG_NET_VENDOR_AMAZON is not set # CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_VENDOR_AURORA is not set # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_CADENCE is not set # CONFIG_NET_VENDOR_CAVIUM is not set @@ -155,14 +149,13 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_ASPEED_KCS_IPMI_BMC=y CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y -CONFIG_IPMI_KCS_BMC_CDEV_RAW=y CONFIG_IPMI_KCS_BMC_SERIO=y +CONFIG_IPMI_KCS_BMC_CDEV_RAW=y CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y CONFIG_DEVMEM_BOOTPARAM=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MUX=y CONFIG_I2C_MUX_GPIO=y CONFIG_I2C_MUX_PCA9541=y CONFIG_I2C_MUX_PCA954x=y @@ -185,8 +178,6 @@ CONFIG_SENSORS_LM75=y CONFIG_SENSORS_NCT7904=y CONFIG_SENSORS_OCC_P8_I2C=y CONFIG_SENSORS_OCC_P9_SBE=y -CONFIG_SENSORS_PECI_CPUTEMP=y -CONFIG_SENSORS_PECI_DIMMTEMP=y CONFIG_PMBUS=y CONFIG_SENSORS_ADM1275=y CONFIG_SENSORS_IBM_CFFPS=y @@ -241,9 +232,6 @@ CONFIG_RTC_DRV_RV8803=y CONFIG_RTC_DRV_ASPEED=y # CONFIG_VIRTIO_MENU is not set # CONFIG_IOMMU_SUPPORT is not set -CONFIG_ASPEED_LPC_CTRL=y -CONFIG_ASPEED_LPC_SNOOP=y -CONFIG_ASPEED_P2A_CTRL=y CONFIG_ASPEED_XDMA=y CONFIG_IIO=y CONFIG_ASPEED_ADC=y @@ -257,8 +245,6 @@ CONFIG_FSI_MASTER_ASPEED=y CONFIG_FSI_SCOM=y CONFIG_FSI_SBEFIFO=y CONFIG_FSI_OCC=y -CONFIG_PECI=y -CONFIG_PECI_ASPEED=y CONFIG_EXT4_FS=y CONFIG_FANOTIFY=y CONFIG_OVERLAY_FS=y @@ -290,6 +276,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_GDB_SCRIPTS=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_FS=y +CONFIG_DEBUG_WX=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 @@ -300,6 +287,5 @@ CONFIG_WQ_WATCHDOG=y # CONFIG_SCHED_DEBUG is not set CONFIG_DEBUG_LIST=y CONFIG_FUNCTION_TRACER=y -CONFIG_DEBUG_WX=y CONFIG_DEBUG_USER=y # CONFIG_RUNTIME_TESTING_MENU is not set -- cgit v1.2.3 From 8401fb46b444a2be22d271f1fb10493081fa9e35 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Tue, 16 Nov 2021 04:33:55 -0600 Subject: openpower pdata srcrev bump ..79da01b670 Amitay Isaacs (7): libdtm: Optimize node search by path libdtm: Mark unmutable arguments with const libdtree: Add device tree library for attribute manipulation attribute: Archive the original attribute tool implementation attribute: Add new implementation based on libdtree attribute: Skip attributes for unmatched target for read command tests: Fix the attribute values for complex attribute Jayanth Othayoth (2): data/p10: Add devtree host reboot preserve attribute list Revert "data: p10: Changed default value as 1 for DISABLE_SECURITY" Signed-off-by: Jayanth Othayoth Change-Id: Ia753c160e4d45fdd3168fe384cec47dd3ae91d0e --- meta-openpower/recipes-bsp/pdata/pdata_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-bsp/pdata/pdata_git.bb b/meta-openpower/recipes-bsp/pdata/pdata_git.bb index 6ebfa3de6..f851de908 100644 --- a/meta-openpower/recipes-bsp/pdata/pdata_git.bb +++ b/meta-openpower/recipes-bsp/pdata/pdata_git.bb @@ -13,7 +13,7 @@ inherit autotools \ perlnative SRC_URI = "git://git@github.com/open-power/pdata;branch="main"" -SRCREV = "9d6b94bcd5bc52c435175e8e2c05555df6271e7e" +SRCREV = "79da01b670a8a2544fad3594290ba1b51f6117ae" DEPENDS = "pdbg \ libxml-simple-perl-native \ -- cgit v1.2.3 From 7bad693951d8c7cdf0236f8e5738381196297b24 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Tue, 16 Nov 2021 22:44:31 -0600 Subject: openpower: libekb srcrev bump 5ac6a46364..c1d1ff7f15 Jayanth Othayoth (2): plat: remove unused procedure callouts plat: update procedure callout strings with BMC defined names Signed-off-by: Jayanth Othayoth Change-Id: I808527a61586d9454b4650bd1ba51372c62836c3 --- meta-openpower/recipes-bsp/libekb/libekb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-bsp/libekb/libekb_git.bb b/meta-openpower/recipes-bsp/libekb/libekb_git.bb index 7c6a7ad2d..fe3630a98 100644 --- a/meta-openpower/recipes-bsp/libekb/libekb_git.bb +++ b/meta-openpower/recipes-bsp/libekb/libekb_git.bb @@ -17,7 +17,7 @@ inherit autotools \ SRCREV_FORMAT = "libekb_ekb" -SRCREV_libekb = "5ac6a46364dc065e058f0886d3ae5717eb8a52f1" +SRCREV_libekb = "c1d1ff7f1559d6cf2c6c1eda99a9133b4157d63b" SRCREV_ekb = "${EKB_REV}" SRC_URI = "git://git@github.com/open-power/libekb_p10;branch="main";name=libekb \ -- cgit v1.2.3 From f4f6f1701a9cbc5f62ceeb199b9c98fd9cdac391 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 2 Dec 2021 15:09:01 -0500 Subject: meta-phosphor: libmctp: add capture Packet capture support was recently added to libmctp. Add a PACKAGECONFIG for that. Change-Id: Ibcd4d69b4622887659cc360e215e70963cd20b6c Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index 29cc2206a..ddb5e1528 100644 --- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -26,6 +26,7 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemdsystemunitdir,systemd" PACKAGECONFIG[astlpc-raw-kcs] = "--enable-astlpc-raw-kcs,--disable-astlpc-raw-kcs,udev,udev" +PACKAGECONFIG[pcap] = "--enable-capture,--disable-capture,libpcap," CONFFILES:${PN} = "${sysconfdir}/default/mctp" -- cgit v1.2.3 From bc41c8fcc56367d382f9e5bdafaf54e4219c8b42 Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Thu, 2 Dec 2021 10:20:49 -0800 Subject: meta-google: hwmon: Enable update-functional-on-fail for gbmc Enabled `update-functional-on-fail` by default for gBMC. Change-Id: I54b4fbaceb65c09b7b9cb72d7b7dcb7d048c7eba Signed-off-by: Willy Tu --- meta-google/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 meta-google/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend diff --git a/meta-google/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-google/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend new file mode 100644 index 000000000..8987adf3d --- /dev/null +++ b/meta-google/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -0,0 +1,4 @@ +EXTRA_OEMESON:append:gbmc = " \ + -Dupdate-functional-on-fail=true \ + -Dnegative-errno-on-fail=false \ +" -- cgit v1.2.3 From 99df01f9b5a245890902c04de6701d90a055075d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 25 Nov 2021 02:01:40 +0000 Subject: x86-power-control: srcrev bump 48c94c5972..6ce234ecae Jason M. Bills (1): Remove CMake Change-Id: I0ea6f4ba883f4567ab75b069c94480771f1a4d8d Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f510f3550..0aaf40c50 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" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "48c94c59728023cdbff3bd62f203de3434af8b8a" +SRCREV = "6ce234ecaeef3558b97cb24020577996b38a4690" PV = "1.0+git${SRCPV}" -- cgit v1.2.3 From 7dfe7ac0921c827332ff1283b0106800d346ea2a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 3 Dec 2021 10:01:03 +0000 Subject: libmctp: srcrev bump e320669029..95cccaec5b Brad Bishop (2): utils: fix in/pipe utilities mctp-demux-daemon: sanity check pcap args Change-Id: I3b2a1cec8aa4063c3cde2f6705d8a27a5dde31df Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index ddb5e1528..2a61782d8 100644 --- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" SRC_URI = "git://github.com/openbmc/libmctp \ file://default" -SRCREV = "e3206690296f9095f817dab880b9649f2d3032a8" +SRCREV = "95cccaec5b8e38e320569125a827ccadd63479f3" DEPENDS += "autoconf-archive-native \ systemd \ -- cgit v1.2.3 From ae2543ec4ce6d80027b18e046413b38de39a584e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 3 Dec 2021 05:21:27 +0000 Subject: pldm: srcrev bump 9e0265b527..a6bf120793 Zach Clark (2): Remove hb_power_limit_enable_current and hb_power_limit_in_watts_current Define safe variant of decode_get_fru_record_table_resp Change-Id: I198bf4ce845d7a4d88b25fe7eaf459919f65fd53 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 9c9e02a5b..e9d1c5dbe 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 = "9e0265b5273438f68ca30281f60e99831739fd73" +SRCREV = "a6bf12079398a6eb91875aec28184939e493c4a3" -- cgit v1.2.3 From a528dd1a38b014d9d3e25536275eeec06b2d8b73 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 3 Dec 2021 01:30:54 +0000 Subject: bmcweb: srcrev bump 60c922dfac..6afb06d91f Gunnar Mills (1): Make OWNERS match MAINTAINERS Change-Id: I8da3c21f94abf47c159af760b6ad1d0fae13d81e Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index cfb29ec44..824d0ac8f 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "60c922dfacd5d1aeec8789e03edc91b47f4a6661" +SRCREV = "6afb06d91fbf0017840eb9189dc4f8ee771cb046" S = "${WORKDIR}/git" -- cgit v1.2.3 From d3ca2150bf58979706beb5942c9c22ba24be5f4a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 2 Dec 2021 23:51:14 +0000 Subject: phosphor-power: srcrev bump b3ba516f3f..7945dd2763 Jim Wright (1): pseq: Add base and UCD90320 device monitor classes Change-Id: I6d36a0ca2fc2bbc8144d987b137900e8afd8db4f Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 05ad13c55..310b98283 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 = "b3ba516f3f418b9b1a98d4bd27210799383262b2" +SRCREV = "7945dd2763cecdd19ddf1bfbff3595166cc0cc8b" -- cgit v1.2.3 From 1adf0c999172bf7e6cd96ed81b934947851934c2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 2 Dec 2021 19:30:31 +0000 Subject: openpower-hw-diags: srcrev bump 5542ba38cb..87cd2f5767 Zane Shelley (2): Add Hostboot scratch registers to PEL RAS data: add callouts for PEC targets Change-Id: Ia81fa54293d60244a9c021a1ae1b50ef897a94be Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f46b7ee26..5d36f401e 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" -SRCREV = "5542ba38cb71a14ccb9146d07bf1abada405a781" +SRCREV = "87cd2f5767321bfa88c104f32cd08c9386fb468a" S = "${WORKDIR}/git" -- cgit v1.2.3 From 4bd0aa01fa6058b59e0af8ca6390ae2e07d95be6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 2 Dec 2021 18:51:23 +0000 Subject: dbus-sensors: srcrev bump daf6f56870..04d050669c Arun P. Mohanan (1): cpuSensor:Check object validity in async callback Change-Id: I9b534174f75b061a75756719715a52e12e754d66 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 764053afc..4555095cd 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 = "daf6f56870c6386ecb1c43b0b9aaa4cc78e4d424" +SRCREV = "04d050669c95218230d9fb45385479df43fc1a0d" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From cb7b5fbcd8f662e00a10cfb492400215c592ccb2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 3 Dec 2021 03:41:23 +0000 Subject: phosphor-fan-presence: srcrev bump 5934f097e6..0cb48f3d9a Matthew Barth (5): control: Add zone ceiling to debug dump control: Remove iostream include from get_managed_objects action control:p10bmc: Add processor `ioring temp` groups control:p10bmc: Add all possible dimm temps groups control:p10bmc: Add processor `vdd vrm temps` groups Change-Id: Ie0a5751cd063282223f6692f3659695e39a5edb1 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index fa92b58be..904a02b8b 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" -SRCREV = "5934f097e65de15d2eb0dcb780e88b39ef5661c0" +SRCREV = "0cb48f3d9a730cead5b082817ec2c4143218e891" -- cgit v1.2.3 From c723e0c21e6ef1cfb20fc8ca35e7d474fcc28ccb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 2 Dec 2021 19:11:15 +0000 Subject: phosphor-networkd: srcrev bump 329b5fba06..c7cf25f740 William A. Kennington III (1): network_manager: Reloads should be delayed via timer Change-Id: I8242a8d86f88668905bd1625fcfe08f460b6251b Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index 1dd268d23..3ae79250b 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -11,7 +11,7 @@ inherit python3native inherit systemd SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "329b5fba06acd63ce0fb9f43ea3f99b1542e862e" +SRCREV = "c7cf25f7409a6e0fb33d06482d297d03b6dc6b60" DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" -- cgit v1.2.3 From a6d03d76f1b59d81a554352653cf441a5684a489 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 2 Dec 2021 14:41:34 +0000 Subject: service-config-manager: srcrev bump a1fe1a284d..c7d2253187 Joseph Reynolds (1): Add README Change-Id: I008ed7e43b004678730edf7e004eae5266551ee2 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a033239d9..44d911df5 100644 --- a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" SRC_URI = "git://github.com/openbmc/service-config-manager" -SRCREV = "a1fe1a284df3b652bbf55e69945e2fd2b4c7aded" +SRCREV = "c7d22531874868c7002eab263c5c66576db92b06" inherit meson pkgconfig systemd -- cgit v1.2.3 From 4bb391b2549a5f31502506ca7e199bc70200d8a6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 2 Dec 2021 13:40:46 +0000 Subject: openpower-vpd-parser: srcrev bump 37e72701aa..8c796818c2 Santosh Puranik (1): VPD Manager: Allow Full Inventory Paths Change-Id: Icb09591dfbb5ce92b7cefdf20fe267b4d4cbce37 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index ff697866d..82581d7e5 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ 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" -SRCREV = "37e72701aae400a419a58c82fd280485c71dba1e" +SRCREV = "8c796818c231b09d9ec33f123015e2e3097ef384" -- cgit v1.2.3 From 80a527e52c625e6bc71099397e0ef5400ee5ba52 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 1 Dec 2021 19:01:17 +0000 Subject: phosphor-logging: srcrev bump 9368b714f2..35e79a803c Matt Spinler (1): PEL: Emit InterfacesAdded on PEL.Entry iface Change-Id: Iae369f3df93f7b6a994d59e1966569660705e460 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 4e9b18a29..45fc183e0 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 = "9368b714f2e4fb2cb3fe4536ffbe4488110d3731" +SRCREV = "35e79a803c8b491f5a1a22c45a5a48805d49d706" S = "${WORKDIR}/git" -- cgit v1.2.3 From eefb1dde08064d8400a9107500dde5d26ebad63b Mon Sep 17 00:00:00 2001 From: Oskar Senft Date: Wed, 24 Nov 2021 15:19:25 -0500 Subject: obmc-console: Re-introduce OBMC_CONSOLE_HOST_TTY variable This change re-adds the OBMC_CONSOLE_HOST_TTY configuration variable to define the host TTY that the obmc-consoler-server should attach to. This allows individual machines to use a TTY different from the default ttyVUART0. Follow-up changes can then remove duplicate code in machine meta layers that work around the missing support for OBMC_CONSOLE_HOST_TTY. Tested: Ran a build for both cases with obmc-console.conf and a server.ttyS2.conf. Checked that the files got installed in the correct place with the expected names in both cases. Signed-off-by: Oskar Senft Change-Id: I4fc408577827a827ee10de4f5757726a1eec4a66 --- meta-phosphor/recipes-phosphor/console/obmc-console_git.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index dccc05cc3..97b197c93 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -38,6 +38,8 @@ SYSTEMD_SERVICE:${PN} += "obmc-console-ssh@.service \ FILES:${PN} += "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" +OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0" + do_install:append() { # Install the server configuration install -m 0755 -d ${D}${sysconfdir}/${BPN} @@ -47,15 +49,15 @@ do_install:append() { # Install the old-style server configuration install -m 0644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/ # Link the custom configuration to the required location - ln -sr ${D}${sysconfdir}/${BPN}.conf ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf - elif test -f "${WORKDIR}/server.ttyVUART0.conf" ; then + ln -sr ${D}${sysconfdir}/${BPN}.conf ${D}${sysconfdir}/${BPN}/server.${OBMC_CONSOLE_HOST_TTY}.conf + elif test -f "${WORKDIR}/server.${OBMC_CONSOLE_HOST_TTY}.conf" ; then # Remove the upstream-provided server configuration rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf # Install the package-provided new-style configuration - install -m 0644 ${WORKDIR}/server.ttyVUART0.conf ${D}${sysconfdir}/${BPN}/ + install -m 0644 ${WORKDIR}/server.${OBMC_CONSOLE_HOST_TTY}.conf ${D}${sysconfdir}/${BPN}/ else # Otherwise, remove socket-id from the shipped configuration to # align with the lack of a client configuration file - sed -ri '/^socket-id =/d' ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf + sed -ri '/^socket-id =/d' ${D}${sysconfdir}/${BPN}/server.${OBMC_CONSOLE_HOST_TTY}.conf fi } -- cgit v1.2.3 From 21e7e45b77e026689b72f182aca4ba2ffd5e0a36 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 5 Nov 2021 01:31:59 -0700 Subject: meta-google: gbmc-bridge: Provision NCSI deprecated addresses This scans the gbmcbr interface for public addresses, and adds the relevant addresses to the NCSI interface of the BMC. This is required for neighbor discovery to work from prod over the NCSI link, when the addresses do not already exist (BMC DHCP will not have them). Change-Id: I27ff0cd3c4750b752b35399b8a0288db5ac9fe28 Signed-off-by: William A. Kennington III --- .../ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in | 118 +++++++++++++++++++++ .../ncsi/files/gbmc-ncsi-ip-from-ra.sh.in | 16 --- .../recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in | 25 ----- .../recipes-google/ncsi/gbmc-ncsi-config.bb | 4 + 4 files changed, 122 insertions(+), 41 deletions(-) create mode 100644 meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in 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 new file mode 100644 index 000000000..da6f27a79 --- /dev/null +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in @@ -0,0 +1,118 @@ +# 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. + +[ -z "${gbmc_ncsi_br_deprecated_ips_lib-}" ] || return + +gbmc_ncsi_br_deprecated_ips_init= +gbmc_ncsi_br_deprecated_ips_confip= +gbmc_ncsi_br_deprecated_ips_lastip= + +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" ] || return + gbmc_ncsi_br_deprecated_ips_confip="$gbmc_ncsi_br_deprecated_ips_lastip" + + printf 'gBMC Bridge NCSI Deprecated Addrs: %s\n' \ + "${gbmc_ncsi_br_deprecated_ips_lastip:-(deleted)}" >&2 + + local contents= + if [ -n "$gbmc_ncsi_br_deprecated_ips_lastip" ]; then + local pfx_bytes=() + ip_to_bytes pfx_bytes "$gbmc_ncsi_br_deprecated_ips_lastip" + + local pfx="$(ip_bytes_to_str pfx_bytes)" + pfx_bytes[8]=0 + pfx_bytes[9]=0 + local host_pfx="$(ip_bytes_to_str pfx_bytes)" + read -r -d '' contents <"$file" + 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 + + if [ "$(systemctl is-active systemd-networkd)" != 'inactive' ]; then + networkctl reload && networkctl reconfigure @NCSI_IF@ + fi + + read -r -d '' contents <"$rfile" + systemctl reset-failed nftables && systemctl --no-block restart nftables || true +} + +gbmc_ncsi_br_deprecated_ips_hook() { + if [ "$change" = 'init' ]; then + gbmc_ncsi_br_deprecated_ips_init=1 + gbmc_ip_monitor_defer + elif [ "$change" = 'defer' ]; then + gbmc_ncsi_br_deprecated_ips_update + elif [ "$change" = 'addr' -a "$intf" = 'gbmcbr' ] && + [ "$scope" = 'global' -a "$fam" = 'inet6' ]; then + local pfx_bytes=() + ip_to_bytes pfx_bytes "$ip" || return + # No ULA Addresses + if (( pfx_bytes[0] & 0xfe == 0xfc )); then + return + fi + # We only want to allow a ::fd0x address, where x>0 + if (( pfx_bytes[8] != 0xfd || pfx_bytes[9] & 0xf == 0 )); then + return + fi + for (( i = 10; i < 16; ++i )); do + if (( pfx_bytes[i] != 0 )); then + return + fi + done + if [ "$action" = 'add' -a "$ip" != "$gbmc_ncsi_br_deprecated_ips_lastip" ]; then + gbmc_ncsi_br_deprecated_ips_lastip="$ip" + gbmc_ip_monitor_defer + fi + if [ "$action" = 'del' -a "$ip" = "$gbmc_ncsi_br_deprecated_ips_lastip" ]; then + gbmc_ncsi_br_deprecated_ips_lastip= + gbmc_ip_monitor_defer + fi + fi +} + +GBMC_IP_MONITOR_HOOKS+=(gbmc_ncsi_br_deprecated_ips_hook) + +gbmc_ncsi_br_deprecated_ips_lib=1 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 index 80bd34f04..6144617d4 100755 --- 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 @@ -70,7 +70,6 @@ EOF touch -c /lib/systemd/network/*-bmc-gbmcbr.network || true contents='[Network]'$'\n' - contents+="Address=$pfx/128"$'\n' contents+="Gateway=$rtr"$'\n' for file in /run/systemd/network/{00,}-bmc-"$NCSI_IF".network.d/49-public-ra.conf; do mkdir -p -m 755 "$(dirname "$file")" @@ -81,21 +80,6 @@ EOF if [ "$(systemctl is-active systemd-networkd)" != 'inactive' ]; then networkctl reload && networkctl reconfigure gbmcbr "$NCSI_IF" || true fi - - read -r -d '' contents <"$rfile" - systemctl reset-failed nftables && systemctl --no-block restart nftables || true } w=60 diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in index 7a630f5fe..30b2b65e4 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in @@ -35,35 +35,10 @@ gbmc_ncsi_nft_update() { fi local ip6="$gbmc_ncsi_nft_lastip6" - local pfx= if [ -n "$ip6" ]; then contents+=" ip6 daddr $ip6/128 goto ncsi_legacy_input"$'\n' - - local ip_bytes=() - ip_to_bytes ip_bytes "$ip6" - # If our address has enough spare bits for appending the BMC suffix - # then we add a rule that allows the BMC subnet. That is, we need a /64 - # as input. - local i - for (( i = 8; i < 16; i++ )); do - if (( ip_bytes[$i] != 0 )); then - ip_bytes=() - break - fi - done - if (( ${#ip_bytes[@]} != 0 )); then - ip_bytes[8]=0xfd - pfx="$(ip_bytes_to_str ip_bytes)" - contents+=" ip6 saddr != $pfx/76 ip6 daddr" - contents+=" $pfx/76 goto ncsi_gbmc_br_pub_input"$'\n' - fi fi - contents+=' }'$'\n' - contents+=' chain ncsi_forward {'$'\n' - if [ -n "$pfx" ]; then - contents+=" ip6 saddr != $pfx/76 ip6 daddr $pfx/76 accept"$'\n' - fi contents+=' }'$'\n' contents+='}'$'\n' diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb index 10ef56a76..0074a3172 100644 --- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb +++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb @@ -18,6 +18,7 @@ SRC_URI += " \ file://gbmc-ncsi-sslh.service \ file://gbmc-ncsi-nft.sh.in \ file://gbmc-ncsi-br-pub-addr.sh.in \ + file://gbmc-ncsi-br-deprecated-ips.sh.in \ file://gbmc-ncsi-set-nicenabled.service.in \ " @@ -100,6 +101,9 @@ do_install:append() { sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-br-pub-addr.sh.in \ >${WORKDIR}/gbmc-ncsi-br-pub-addr.sh install -m644 ${WORKDIR}/gbmc-ncsi-br-pub-addr.sh $mondir + sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-br-deprecated-ips.sh.in \ + >${WORKDIR}/gbmc-ncsi-br-deprecated-ips.sh + install -m644 ${WORKDIR}/gbmc-ncsi-br-deprecated-ips.sh $mondir sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-set-nicenabled.service.in \ >${D}${systemd_system_unitdir}/gbmc-ncsi-set-nicenabled.service -- cgit v1.2.3 From b174c185f31bf14d430e68bb868ccf14ff7d4be3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 3 Nov 2021 14:54:51 -0700 Subject: meta-google: gbmc-bridge: Implement DHCP This makes it possible for a BMC to acquire a public address via DHCP provisioning. None of the update processes are included yet. Change-Id: I51ca2aa4859bcd2b9e909dd5a0d9e66cfbd648af Signed-off-by: William A. Kennington III --- .../ncsi/files/gbmc-ncsi-br-pub-addr.sh.in | 2 + .../ncsi/files/gbmc-ncsi-clear-ip.sh.in | 26 ++++++ .../recipes-google/ncsi/gbmc-ncsi-config.bb | 8 ++ .../recipes-google/networking/gbmc-bridge.bb | 9 +- .../networking/gbmc-bridge/gbmc-br-dhcp.service | 13 +++ .../networking/gbmc-bridge/gbmc-br-dhcp.sh | 96 ++++++++++++++++++++++ 6 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 meta-google/recipes-google/ncsi/files/gbmc-ncsi-clear-ip.sh.in create mode 100644 meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.service create mode 100644 meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.sh diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-pub-addr.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-pub-addr.sh.in index 5adc41328..793403348 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-pub-addr.sh.in +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-pub-addr.sh.in @@ -63,6 +63,8 @@ Destination=$stateless_pfx/76 Type=unreachable Metric=1024 EOF + # Delete DHCP configured addresses if we have a host published address + rm -f /etc/systemd/network/{00,}-bmc-gbmcbr.network.d/50-public.conf fi local file diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-clear-ip.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-clear-ip.sh.in new file mode 100644 index 000000000..e17a5e200 --- /dev/null +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-clear-ip.sh.in @@ -0,0 +1,26 @@ +# 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. + +[ -z "${gbmc_ncsi_clear_ip-}" ] || exit + +source /usr/libexec/ncsid_lib.sh || exit + +gbmc_ncsi_clear_ip_hook() { + UpdateIP xyz.openbmc_project.Network '@NCSI_IF@' '0.0.0.0' '0' || true + UpdateIP xyz.openbmc_project.Network '@NCSI_IF@' '::' '0' || true +} + +GBMC_BR_DHCP_HOOKS+=(gbmc_ncsi_clear_ip_hook) + +gbmc_ncsi_clear_ip=1 diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb index 0074a3172..6e2582495 100644 --- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb +++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb @@ -20,6 +20,7 @@ SRC_URI += " \ file://gbmc-ncsi-br-pub-addr.sh.in \ file://gbmc-ncsi-br-deprecated-ips.sh.in \ file://gbmc-ncsi-set-nicenabled.service.in \ + file://gbmc-ncsi-clear-ip.sh.in \ " S = "${WORKDIR}" @@ -36,6 +37,7 @@ RDEPENDS:${PN} += " \ " FILES:${PN} += " \ + ${datadir}/gbmc-br-dhcp \ ${datadir}/gbmc-ip-monitor \ ${systemd_unitdir} \ " @@ -105,6 +107,12 @@ do_install:append() { >${WORKDIR}/gbmc-ncsi-br-deprecated-ips.sh install -m644 ${WORKDIR}/gbmc-ncsi-br-deprecated-ips.sh $mondir + dhcpdir=${D}${datadir}/gbmc-br-dhcp/ + install -d -m0755 $dhcpdir + sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-clear-ip.sh.in \ + >${WORKDIR}/gbmc-ncsi-clear-ip.sh + install -m644 ${WORKDIR}/gbmc-ncsi-clear-ip.sh $dhcpdir + sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-set-nicenabled.service.in \ >${D}${systemd_system_unitdir}/gbmc-ncsi-set-nicenabled.service diff --git a/meta-google/recipes-google/networking/gbmc-bridge.bb b/meta-google/recipes-google/networking/gbmc-bridge.bb index dea14f00b..5f79d468a 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge.bb +++ b/meta-google/recipes-google/networking/gbmc-bridge.bb @@ -20,6 +20,8 @@ SRC_URI += " \ file://gbmc-br-ensure-ra.service \ file://gbmc-br-gw-src.sh \ file://gbmc-br-nft.sh \ + file://gbmc-br-dhcp.sh \ + file://gbmc-br-dhcp.service \ " FILES:${PN}:append = " \ @@ -37,7 +39,10 @@ RDEPENDS:${PN}:append = " \ ndisc6-rdisc6 \ " -SYSTEMD_SERVICE:${PN} += "gbmc-br-ensure-ra.service" +SYSTEMD_SERVICE:${PN} += " \ + gbmc-br-ensure-ra.service \ + gbmc-br-dhcp.service \ + " GBMC_BR_MAC_ADDR ?= "" @@ -94,8 +99,10 @@ do_install() { install -d -m0755 ${D}${libexecdir} install -m0755 ${WORKDIR}/gbmc-br-ensure-ra.sh ${D}${libexecdir}/ + install -m0755 ${WORKDIR}/gbmc-br-dhcp.sh ${D}${libexecdir}/ install -d -m0755 ${D}${systemd_system_unitdir} install -m0755 ${WORKDIR}/gbmc-br-ensure-ra.service ${D}${systemd_system_unitdir}/ + install -m0755 ${WORKDIR}/gbmc-br-dhcp.service ${D}${systemd_system_unitdir}/ } do_rm_work:prepend() { 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 new file mode 100644 index 000000000..145f84b93 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.service @@ -0,0 +1,13 @@ +[Unit] +Description=gBMC DHCP Client +After=network.target +StartLimitIntervalSec=10 +StartLimitBurst=3 + +[Service] +Restart=always +RestartSec=5 +ExecStart=/usr/bin/udhcpc6 -f -q -O bootfile_url -O bootfile_param -i gbmcbr -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 new file mode 100644 index 000000000..beccc8658 --- /dev/null +++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.sh @@ -0,0 +1,96 @@ +#!/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. + +# A list of functions which get executed for each bound DHCP lease. +# These are configured by the files included below. +GBMC_BR_DHCP_HOOKS=() + +# Load configurations from a known location in the filesystem to populate +# hooks that are executed after each event. +shopt -s nullglob +for conf in /usr/share/gbmc-br-dhcp/*.sh; do + # SC doesn't like dynamic source loading + # shellcheck disable=SC1090 + source "$conf" +done + +gbmc_br_dhcp_run_hooks() { + local hook + for hook in "${GBMC_BR_DHCP_HOOKS[@]}"; do + "$hook" || continue + done +} + +# SC can't find this path during repotest +# shellcheck disable=SC1091 +source /usr/share/network/lib.sh || exit + +if [ "$1" = bound ]; then + # Variable is from the environment via udhcpc6 + # shellcheck disable=SC2154 + echo "DHCPv6(gbmcbr): $ipv6/128" >&2 + + 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 + exit + 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 + exit + fi + done + + pfx="$(ip_bytes_to_str pfx_bytes)" + (( pfx_bytes[9] &= 0xf0 )) + stateless_pfx="$(ip_bytes_to_str pfx_bytes)" + read -r -d '' contents <"$file" + 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 + + if [ "$(systemctl is-active systemd-networkd)" != 'inactive' ]; then + networkctl reload && networkctl reconfigure gbmcbr + fi + + gbmc_br_dhcp_run_hooks +fi -- cgit v1.2.3 From feb21b20bf5e5820f28eb336f6190713bde6c00f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 4 Dec 2021 19:10:37 +0000 Subject: phosphor-certificate-manager: srcrev bump 7f7b47bea7..13eba41aab Patrick Williams (3): certificate: reduce nested sdbusplus::object inheritence fix unused parameter warnings watch: fix uninitialized variable Change-Id: I5bcfcaab8bf79f238a1c76cf158090c9a68318df Signed-off-by: Andrew Geissler --- .../recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b858958f0..d9121fac6 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "7f7b47bea7bbd518d1ff5a306ecf3806cf8d0834" +SRCREV = "13eba41aaba1e704afe63db23e287518c1ae6dff" inherit autotools \ pkgconfig \ -- cgit v1.2.3 From fe850265c797eb91c97c708881a4f2fa2a5398e6 Mon Sep 17 00:00:00 2001 From: Logananth Sundararaj Date: Fri, 12 Nov 2021 21:11:57 +0530 Subject: meta-yosemiteV2:Fix x86-power-ctrl config files Corrected invalid gpio configurations for YosemiteV2. Dbus based gpio config change due code logic change in ipmbgpiosensor. Signed-off-by: Logananth Sundararaj Change-Id: I8bafd6b077471ef9910954d1342274fc075274fa --- .../x86-power-control/yosemitev2/power-config-host1.json | 2 +- .../x86-power-control/yosemitev2/power-config-host2.json | 10 +++++----- .../x86-power-control/yosemitev2/power-config-host3.json | 10 +++++----- .../x86-power-control/yosemitev2/power-config-host4.json | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host1.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host1.json index 8c8379e1e..708f95729 100644 --- a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host1.json +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host1.json @@ -31,7 +31,7 @@ { "Name" : "PowerOk", "DbusName" : "xyz.openbmc_project.IpmbSensor", - "Path" : "/xyz/openbmc_project/gpio/volt/1_CPU_Good", + "Path" : "/xyz/openbmc_project/gpio/ipmbGpioState/1_CPU_Good", "Interface" : "xyz.openbmc_project.Chassis.Control.Power", "Property" : "PGood", "Type" : "DBUS" diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host2.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host2.json index ebf7bf029..2455c620c 100644 --- a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host2.json +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host2.json @@ -2,28 +2,28 @@ "gpio_configs":[ { "Name" : "PostComplete", - "LineName" : "POST_COMPLETE", + "LineName" : "POST_COMPLETE2", "Type" : "GPIO", "Polarity" : "ActiveLow" }, { "Name" : "SlotPower", - "LineName" : "SLOT1_POWER", + "LineName" : "SLOT2_POWER", "Type" : "GPIO", "Polarity" : "ActiveLow" }, { "Name" : "PowerOut", - "LineName" : "POWER_OUT1", + "LineName" : "POWER_OUT2", "Type" : "GPIO", "Polarity" : "ActiveLow" }, { "Name" : "ResetOut", - "LineName" : "RESET_OUT1", + "LineName" : "RESET_OUT2", "Type" : "GPIO", "Polarity" : "ActiveLow" }, @@ -31,7 +31,7 @@ { "Name" : "PowerOk", "DbusName" : "xyz.openbmc_project.IpmbSensor", - "Path" : "/xyz/openbmc_project/gpio/volt/2_CPU_Good", + "Path" : "/xyz/openbmc_project/gpio/ipmbGpioState/2_CPU_Good", "Interface" : "xyz.openbmc_project.Chassis.Control.Power", "Property" : "PGood", "Type" : "DBUS" diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host3.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host3.json index 3631dc392..66077a238 100644 --- a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host3.json +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host3.json @@ -2,28 +2,28 @@ "gpio_configs":[ { "Name" : "PostComplete", - "LineName" : "POST_COMPLETE", + "LineName" : "POST_COMPLETE3", "Type" : "GPIO", "Polarity" : "ActiveLow" }, { "Name" : "SlotPower", - "LineName" : "SLOT1_POWER", + "LineName" : "SLOT3_POWER", "Type" : "GPIO", "Polarity" : "ActiveLow" }, { "Name" : "PowerOut", - "LineName" : "POWER_OUT1", + "LineName" : "POWER_OUT3", "Type" : "GPIO", "Polarity" : "ActiveLow" }, { "Name" : "ResetOut", - "LineName" : "RESET_OUT1", + "LineName" : "RESET_OUT3", "Type" : "GPIO", "Polarity" : "ActiveLow" }, @@ -31,7 +31,7 @@ { "Name" : "PowerOk", "DbusName" : "xyz.openbmc_project.IpmbSensor", - "Path" : "/xyz/openbmc_project/gpio/volt/3_CPU_Good", + "Path" : "/xyz/openbmc_project/gpio/ipmbGpioState/3_CPU_Good", "Interface" : "xyz.openbmc_project.Chassis.Control.Power", "Property" : "PGood", "Type" : "DBUS" diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host4.json b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host4.json index dac58ae34..0e7bc3c1c 100644 --- a/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host4.json +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/yosemitev2/power-config-host4.json @@ -2,28 +2,28 @@ "gpio_configs":[ { "Name" : "PostComplete", - "LineName" : "POST_COMPLETE", + "LineName" : "POST_COMPLETE4", "Type" : "GPIO", "Polarity" : "ActiveLow" }, { "Name" : "SlotPower", - "LineName" : "SLOT1_POWER", + "LineName" : "SLOT4_POWER", "Type" : "GPIO", "Polarity" : "ActiveLow" }, { "Name" : "PowerOut", - "LineName" : "POWER_OUT1", + "LineName" : "POWER_OUT4", "Type" : "GPIO", "Polarity" : "ActiveLow" }, { "Name" : "ResetOut", - "LineName" : "RESET_OUT1", + "LineName" : "RESET_OUT4", "Type" : "GPIO", "Polarity" : "ActiveLow" }, @@ -31,7 +31,7 @@ { "Name" : "PowerOk", "DbusName" : "xyz.openbmc_project.IpmbSensor", - "Path" : "/xyz/openbmc_project/gpio/volt/4_CPU_Good", + "Path" : "/xyz/openbmc_project/gpio/ipmbGpioState/4_CPU_Good", "Interface" : "xyz.openbmc_project.Chassis.Control.Power", "Property" : "PGood", "Type" : "DBUS" -- cgit v1.2.3 From b49ee37efc853e04194aeadc5ebf65d30576d344 Mon Sep 17 00:00:00 2001 From: Eddie James Date: Fri, 3 Dec 2021 10:50:06 -0600 Subject: openpower: occ: Update control service to run after FSI scan The OCC control application must not run during an FSI scan, so add an After dependency. Also, add a dependency on the target that determines whether or not the system has undergone a Reset/Reload. Signed-off-by: Eddie James Change-Id: I1f10feca449377405df7525d59778b85b6c8f38a --- .../occ/openpower-occ-control/org.open_power.OCC.Control.service | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service index d16bcdce7..10ac0ee94 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service @@ -2,6 +2,9 @@ Description=OpenPOWER OCC controller Wants=mapper-wait@-xyz-openbmc_project-inventory.service After=mapper-wait@-xyz-openbmc_project-inventory.service +Wants=obmc-host-reset-running@0.target +After=obmc-host-reset-running@0.target +After=fsi-scan@0.service [Service] ExecStart=/usr/bin/env openpower-occ-control -- cgit v1.2.3 From e2e667473e93a48bee69722dea603418d0c60591 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 23 Nov 2021 12:00:36 -0800 Subject: meta-google: gbmc-ncsi-config: Rename address clear rules This ensures they are run prior to running other DHCP configuration logic. Change-Id: I0180414bbc291ea49e548a312cd2b713344613e1 Signed-off-by: William A. Kennington III --- .../ncsi/files/25-gbmc-ncsi-clear-ip.sh.in | 26 ++++++++++++++++++++++ .../ncsi/files/gbmc-ncsi-clear-ip.sh.in | 26 ---------------------- .../recipes-google/ncsi/gbmc-ncsi-config.bb | 8 +++---- 3 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 meta-google/recipes-google/ncsi/files/25-gbmc-ncsi-clear-ip.sh.in delete mode 100644 meta-google/recipes-google/ncsi/files/gbmc-ncsi-clear-ip.sh.in diff --git a/meta-google/recipes-google/ncsi/files/25-gbmc-ncsi-clear-ip.sh.in b/meta-google/recipes-google/ncsi/files/25-gbmc-ncsi-clear-ip.sh.in new file mode 100644 index 000000000..e17a5e200 --- /dev/null +++ b/meta-google/recipes-google/ncsi/files/25-gbmc-ncsi-clear-ip.sh.in @@ -0,0 +1,26 @@ +# 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. + +[ -z "${gbmc_ncsi_clear_ip-}" ] || exit + +source /usr/libexec/ncsid_lib.sh || exit + +gbmc_ncsi_clear_ip_hook() { + UpdateIP xyz.openbmc_project.Network '@NCSI_IF@' '0.0.0.0' '0' || true + UpdateIP xyz.openbmc_project.Network '@NCSI_IF@' '::' '0' || true +} + +GBMC_BR_DHCP_HOOKS+=(gbmc_ncsi_clear_ip_hook) + +gbmc_ncsi_clear_ip=1 diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-clear-ip.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-clear-ip.sh.in deleted file mode 100644 index e17a5e200..000000000 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-clear-ip.sh.in +++ /dev/null @@ -1,26 +0,0 @@ -# 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. - -[ -z "${gbmc_ncsi_clear_ip-}" ] || exit - -source /usr/libexec/ncsid_lib.sh || exit - -gbmc_ncsi_clear_ip_hook() { - UpdateIP xyz.openbmc_project.Network '@NCSI_IF@' '0.0.0.0' '0' || true - UpdateIP xyz.openbmc_project.Network '@NCSI_IF@' '::' '0' || true -} - -GBMC_BR_DHCP_HOOKS+=(gbmc_ncsi_clear_ip_hook) - -gbmc_ncsi_clear_ip=1 diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb index 6e2582495..0312f0502 100644 --- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb +++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb @@ -20,7 +20,7 @@ SRC_URI += " \ file://gbmc-ncsi-br-pub-addr.sh.in \ file://gbmc-ncsi-br-deprecated-ips.sh.in \ file://gbmc-ncsi-set-nicenabled.service.in \ - file://gbmc-ncsi-clear-ip.sh.in \ + file://25-gbmc-ncsi-clear-ip.sh.in \ " S = "${WORKDIR}" @@ -109,9 +109,9 @@ do_install:append() { dhcpdir=${D}${datadir}/gbmc-br-dhcp/ install -d -m0755 $dhcpdir - sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-clear-ip.sh.in \ - >${WORKDIR}/gbmc-ncsi-clear-ip.sh - install -m644 ${WORKDIR}/gbmc-ncsi-clear-ip.sh $dhcpdir + sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/25-gbmc-ncsi-clear-ip.sh.in \ + >${WORKDIR}/25-gbmc-ncsi-clear-ip.sh + install -m644 ${WORKDIR}/25-gbmc-ncsi-clear-ip.sh $dhcpdir sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-set-nicenabled.service.in \ >${D}${systemd_system_unitdir}/gbmc-ncsi-set-nicenabled.service -- cgit v1.2.3 From ab61616ae78d4730355e8dc45e97d982b396440c Mon Sep 17 00:00:00 2001 From: Charles Boyer Date: Mon, 6 Dec 2021 13:56:23 -0600 Subject: meta-fii/meta-kudo: Add ampere-host-reset.service 1. ampere-host-power-cycle.service will force off host followed by force on. 2. ampere-host-reset.service will pulse the sysreset pin Signed-off-by: Charles Boyer Change-Id: I4736c82f8f462a21650d5abba55c036a05da8e25 --- meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb | 2 ++ .../ampere-hostctrl/ampere-host-power-cycle.service | 2 +- .../host/ampere-hostctrl/ampere-host-reset.service | 12 ++++++++++++ .../recipes-kudo/host/files/ampere_power_util.sh | 17 +++++++++++++---- 4 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb index f8f85b3d5..5e41d6b9e 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb @@ -16,6 +16,7 @@ SRC_URI = "file://ampere-host-shutdown.service \ file://ampere-chassis-powercycle.service \ file://ampere-host-shutdown-ack.service \ file://ampere-host-power-cycle.service \ + file://ampere-host-reset.service \ " DEPENDS = "systemd" @@ -29,6 +30,7 @@ SYSTEMD_SERVICE:${PN} = " \ ampere-chassis-powercycle.service \ ampere-host-shutdown-ack.service \ ampere-host-power-cycle.service \ + ampere-host-reset.service \ " # host power control # overwrite the host shutdown to graceful shutdown diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service index 3e03e07df..b020aa3f2 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service @@ -8,6 +8,6 @@ After=kudo-bios-verify.service [Service] RemainAfterExit=no Type=oneshot -ExecStart=/usr/bin/env ampere_power_util.sh mb force_reset +ExecStart=/usr/bin/env ampere_power_util.sh mb host_cycle SyslogIdentifier=ampere_power_util.sh diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service new file mode 100644 index 000000000..830fb4497 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service @@ -0,0 +1,12 @@ +[Unit] +Description=Ampere Computing LLC power cycle service +Conflicts=obmc-host-start@0.target +OnFailure=obmc-chassis-powerreset@0.target +Wants=kudo-bios-verify.service +After=kudo-bios-verify.service + +[Service] +RemainAfterExit=no +Type=oneshot +ExecStart=/usr/bin/env ampere_power_util.sh mb host_reset +SyslogIdentifier=ampere_power_util.sh \ No newline at end of file diff --git a/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh b/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh index 19ccc0e8e..d9bcb0cf2 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh +++ b/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh @@ -4,7 +4,7 @@ source /usr/sbin/kudo-lib.sh # Usage of this utility function usage() { - echo "usage: power-util mb [on|off|graceful_shutdown|force_reset|shutdown_ack|hotswap|power_button]"; + echo "usage: power-util mb [on|off|graceful_shutdown|host_reset|host_cycle|shutdown_ack|hotswap|power_button]"; } hotswap() { @@ -70,7 +70,7 @@ graceful_shutdown() { fi } -force_reset() { +host_reset() { if [ $(host_status) == "on" ]; then echo "Triggering sysreset pin" busctl set-property xyz.openbmc_project.Watchdog /xyz/openbmc_project/watchdog/host0 xyz.openbmc_project.State.Watchdog ExpireAction s xyz.openbmc_project.State.Watchdog.Action.None @@ -82,6 +82,13 @@ force_reset() { fi } +host_cycle() { + echo "DC cycling host" + force_off + sleep 2 + power_on +} + shutdown_ack() { echo "Receive shutdown ACK triggered" power_off @@ -141,8 +148,10 @@ elif [[ $2 == "hotswap" ]]; then hotswap elif [[ $2 == "graceful_shutdown" ]]; then graceful_shutdown -elif [ $2 == "force_reset" ]; then - force_reset +elif [ $2 == "host_reset" ]; then + host_reset +elif [ $2 == "host_cycle" ]; then + host_cycle elif [ $2 == "shutdown_ack" ]; then shutdown_ack elif [ $2 == "power_button" ]; then -- cgit v1.2.3 From 4e5730ceac7c6f5e4f33bf92a420ecdb119f395e Mon Sep 17 00:00:00 2001 From: Ben Tyner Date: Tue, 30 Nov 2021 07:49:19 -0600 Subject: meta-ibm:(PIM) Add altitude sensor association Make altitude sensor visible via redfish, chassis, all-sensors. Signed-off-by: Ben Tyner Change-Id: I7e032e74ad8889e7e80e197dccc7b65a26482c0a --- .../phosphor-inventory-manager/p10bmc/ibm,everest_associations.json | 1 + .../phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json | 1 + .../phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json | 1 + 3 files changed, 3 insertions(+) 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 68a0a6ac2..a1a87e534 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 @@ -204,6 +204,7 @@ }, "paths": [ + "/xyz/openbmc_project/sensors/altitude/Altitude", "/xyz/openbmc_project/sensors/fan_tach/fan0_0", "/xyz/openbmc_project/sensors/fan_tach/fan0_1", "/xyz/openbmc_project/sensors/fan_tach/fan1_0", 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 b6f1ceaf3..73dda9edf 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 @@ -285,6 +285,7 @@ }, "paths": [ + "/xyz/openbmc_project/sensors/altitude/Altitude", "/xyz/openbmc_project/sensors/fan_tach/fan0_0", "/xyz/openbmc_project/sensors/fan_tach/fan0_1", "/xyz/openbmc_project/sensors/fan_tach/fan1_0", 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 667c53c89..2e1682de1 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 @@ -279,6 +279,7 @@ }, "paths": [ + "/xyz/openbmc_project/sensors/altitude/Altitude", "/xyz/openbmc_project/sensors/fan_tach/fan0_0", "/xyz/openbmc_project/sensors/fan_tach/fan1_0", "/xyz/openbmc_project/sensors/fan_tach/fan2_0", -- cgit v1.2.3 From 2f5e1695c9f967e8d11415502b1c08affd8955a4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 5 Nov 2021 01:31:59 -0700 Subject: meta-google: gbmc-ncsi-config: Fix missing include We use functions from the network-sh library and need to include it. Change-Id: I7f78b7dd37c4e5d38342c4625c26c4b583133bf5 Signed-off-by: William A. Kennington III --- meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in | 2 ++ 1 file changed, 2 insertions(+) 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 da6f27a79..796e40584 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 @@ -14,6 +14,8 @@ [ -z "${gbmc_ncsi_br_deprecated_ips_lib-}" ] || return +source /usr/share/network/lib.sh || exit + gbmc_ncsi_br_deprecated_ips_init= gbmc_ncsi_br_deprecated_ips_confip= gbmc_ncsi_br_deprecated_ips_lastip= -- cgit v1.2.3 From 3dbea9350f23bbf2a4b3909e1d6bab157edba7fc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 5 Nov 2021 01:31:59 -0700 Subject: meta-google: gbmc-bridge: Add stateless deprecated addresses We were missing this address but we want neighbor discovery from outside the BMC to work against this range. Change-Id: I6ef139486f382df21596c460626bfe2f692c7236 Signed-off-by: William A. Kennington III --- .../recipes-google/ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in | 5 +++++ 1 file changed, 5 insertions(+) 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 796e40584..7b0702570 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 @@ -34,6 +34,8 @@ gbmc_ncsi_br_deprecated_ips_update() { ip_to_bytes pfx_bytes "$gbmc_ncsi_br_deprecated_ips_lastip" local pfx="$(ip_bytes_to_str pfx_bytes)" + (( pfx_bytes[9] &= 0xf0 )) + local stateless_pfx="$(ip_bytes_to_str pfx_bytes)" pfx_bytes[8]=0 pfx_bytes[9]=0 local host_pfx="$(ip_bytes_to_str pfx_bytes)" @@ -42,6 +44,9 @@ gbmc_ncsi_br_deprecated_ips_update() { Address=$pfx/128 PreferredLifetime=0 [Address] +Address=$stateless_pfx/128 +PreferredLifetime=0 +[Address] Address=$host_pfx/128 PreferredLifetime=0 EOF -- cgit v1.2.3 From b823f89c8cd0da678c78e242bf12c25f414d0697 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 23 Nov 2021 20:54:56 -0800 Subject: meta-google: gbmc-ncsi-config: Fix deprecated address nft The nft rules were not deleted in cases where the public addresses are removed from the gbmc-br interface. This would create broken rules. Change-Id: I22a88f1fb15ccbea49e586061ea8e93bbbfb1bc1 Signed-off-by: William A. Kennington III --- .../ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) 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 7b0702570..677ef28c3 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 @@ -29,6 +29,7 @@ gbmc_ncsi_br_deprecated_ips_update() { "${gbmc_ncsi_br_deprecated_ips_lastip:-(deleted)}" >&2 local contents= + local nfcontents= if [ -n "$gbmc_ncsi_br_deprecated_ips_lastip" ]; then local pfx_bytes=() ip_to_bytes pfx_bytes "$gbmc_ncsi_br_deprecated_ips_lastip" @@ -49,6 +50,16 @@ PreferredLifetime=0 [Address] Address=$host_pfx/128 PreferredLifetime=0 +EOF + read -r -d '' nfcontents <"$rfile" + if [ -z "$nfcontents" ]; then + rm -f "$rfile" + else + printf '%s' "$nfcontents" >"$rfile" + fi systemctl reset-failed nftables && systemctl --no-block restart nftables || true } -- cgit v1.2.3 From d1a214d0e2516524475ee45ae860d7aa0f2b3e10 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 6 Dec 2021 15:26:46 -0800 Subject: meta-google: gbmc-bridge: Request hostname via DHCP Change-Id: If3dacbfde966de337702b44b9b06b3eb21755546 Signed-off-by: William A. Kennington III --- .../recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.service | 2 +- meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 145f84b93..7eb0ce075 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 @@ -7,7 +7,7 @@ StartLimitBurst=3 [Service] Restart=always RestartSec=5 -ExecStart=/usr/bin/udhcpc6 -f -q -O bootfile_url -O bootfile_param -i gbmcbr -s /usr/libexec/gbmc-br-dhcp.sh +ExecStart=/usr/bin/udhcpc6 -f -q -O fqdn -O bootfile_url -O bootfile_param -i gbmcbr -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 beccc8658..42a077d09 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 @@ -92,5 +92,10 @@ EOF networkctl reload && networkctl reconfigure gbmcbr fi + if [ -n "${fqdn-}" ]; then + echo "Using hostname $fqdn" >&2 + hostnamectl set-hostname "$fqdn" || true + fi + gbmc_br_dhcp_run_hooks fi -- cgit v1.2.3 From 32e440d8706ca2106d7d2a7a6013732cba529f21 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 3 Dec 2021 18:19:07 -0800 Subject: meta-google: inplace-gbmc-update: Add dhcp hook This makes it possible for the BMC to fetch an upgraded image during DHCP time and perform an inplace update to the new version. Change-Id: I6d32af306180dd52d4235ba4edbb80c3e49756d7 Signed-off-by: William A. Kennington III --- meta-google/recipes-phosphor/flash/gbmc-update.bb | 17 ++++++ .../flash/gbmc-update/75-gbmc-upgrade.sh | 66 ++++++++++++++++++++++ .../recipes-phosphor/flash/inplace-gbmc-update.bb | 12 +++- .../inplace-gbmc-update/75-inplace-gbmc-upgrade.sh | 41 ++++++++++++++ 4 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 meta-google/recipes-phosphor/flash/gbmc-update.bb create mode 100644 meta-google/recipes-phosphor/flash/gbmc-update/75-gbmc-upgrade.sh create mode 100644 meta-google/recipes-phosphor/flash/inplace-gbmc-update/75-inplace-gbmc-upgrade.sh diff --git a/meta-google/recipes-phosphor/flash/gbmc-update.bb b/meta-google/recipes-phosphor/flash/gbmc-update.bb new file mode 100644 index 000000000..2c0f51066 --- /dev/null +++ b/meta-google/recipes-phosphor/flash/gbmc-update.bb @@ -0,0 +1,17 @@ +SUMMARY = "Google BMC Update Utilities" +DESCRIPTION = "Google BMC Update Utilities" +PR = "r1" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +SRC_URI += " \ + file://75-gbmc-upgrade.sh \ +" + +FILES:${PN} += "${datadir}/gbmc-br-dhcp" + +do_install() { + install -d ${D}${datadir}/gbmc-br-dhcp + install -m 0644 ${WORKDIR}/75-gbmc-upgrade.sh ${D}${datadir}/gbmc-br-dhcp/ +} diff --git a/meta-google/recipes-phosphor/flash/gbmc-update/75-gbmc-upgrade.sh b/meta-google/recipes-phosphor/flash/gbmc-update/75-gbmc-upgrade.sh new file mode 100644 index 000000000..c94bf5bd0 --- /dev/null +++ b/meta-google/recipes-phosphor/flash/gbmc-update/75-gbmc-upgrade.sh @@ -0,0 +1,66 @@ +#!/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. + +[ -z "${gbmc_upgrade-}" ] || exit + +: "${GBMC_UPGRADE_SIG=/tmp/bmc.sig}" + +gbmc_upgrade_hook() { + [ -n "${bootfile_url-}" ] || return + + local tmpdir + tmpdir="$(mktemp -d)" || return + gbmc_upgrade_internal || true + # SC doesn't know our variable is defined elsewhere + # shellcheck disable=SC2153 + rm -rf -- "$tmpdir" "$GBMC_UPGRADE_SIG" "$GBMC_UPGRADE_IMG" +} + +gbmc_upgrade_fetch() ( + echo "Fetching $bootfile_url" >&2 + + # We only support tarballs at the moment + if [[ "$bootfile_url" != *.tar ]]; then + echo "Unknown upgrade unpack method: $bootfile_url" >&2 + return 1 + fi + + # Ensure some sane output file limit + # Currently no BMC image is larger than 64M + ulimit -H -f $((96 * 1024 * 1024)) || return + wget "$bootfile_url" | tar -xC "$tmpdir" || true + + local sig + sig="$(find "$tmpdir" -name 'image-*.sig')" || return + local img="${sig%.sig}" + mv "$sig" "$GBMC_UPGRADE_SIG" || return + mv "$img" "$GBMC_UPGRADE_IMG" || return + + # Regular packages have a VERSION file with the image + local imgdir="${sig%/*}" + if [ -f "$imgdir/VERSION" ]; then + cat "$imgdir/VERSION" || return + fi + + # Staging packages have a directory named after the version + local vdir="${imgdir##*/}" + if [[ "$vdir" =~ ([0-9]+[.]){3}[0-9]+ ]]; then + echo "$vdir" + fi +) + +GBMC_BR_DHCP_HOOKS+=(gbmc_upgrade_hook) + +gbmc_upgrade=1 diff --git a/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb b/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb index 9e55afce5..418ee3932 100644 --- a/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb +++ b/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb @@ -10,8 +10,11 @@ inherit obmc-phosphor-systemd PROVIDES += "virtual/bmc-update" RPROVIDES:${PN} += "virtual/bmc-update" -RDEPENDS:${PN} += "google-key" -RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += " \ + bash \ + gbmc-update \ + google-key \ + " SRC_URI += " \ file://config-bmc.json \ @@ -19,12 +22,14 @@ SRC_URI += " \ file://inplace-gbmc-verify.sh \ file://inplace-gbmc-version.service \ file://inplace-gbmc-version.sh \ + file://75-inplace-gbmc-upgrade.sh \ " SYSTEMD_SERVICE:${PN} += "inplace-gbmc-verify.service" SYSTEMD_SERVICE:${PN} += "inplace-gbmc-version.service" FILES:${PN} += "${datadir}/phosphor-ipmi-flash" +FILES:${PN} += "${datadir}/gbmc-br-dhcp" do_install() { sed -i 's,@ALLOW_DEV@,,' ${WORKDIR}/inplace-gbmc-verify.sh @@ -37,6 +42,9 @@ do_install() { install -d ${D}${datadir}/phosphor-ipmi-flash install -m 0644 ${WORKDIR}/config-bmc.json ${D}${datadir}/phosphor-ipmi-flash + + install -d ${D}${datadir}/gbmc-br-dhcp + install -m 0644 ${WORKDIR}/75-inplace-gbmc-upgrade.sh ${D}${datadir}/gbmc-br-dhcp/ } do_install:prepend:dev() { diff --git a/meta-google/recipes-phosphor/flash/inplace-gbmc-update/75-inplace-gbmc-upgrade.sh b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/75-inplace-gbmc-upgrade.sh new file mode 100644 index 000000000..df4662f6d --- /dev/null +++ b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/75-inplace-gbmc-upgrade.sh @@ -0,0 +1,41 @@ +#!/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. + +[ -z "${inplace_gbmc_upgrade-}" ] || exit + +# SC doesn't know another file depends on this variable +# shellcheck disable=SC2034 +GBMC_UPGRADE_IMG=/run/initramfs/bmc-image + +gbmc_upgrade_internal() { + local version + version="$(gbmc_upgrade_fetch)" || return + + echo "IMG Version: $version" >&2 + local active_version + active_version="$(inplace-gbmc-version.sh)" || return + echo "Active Version: $active_version" >&2 + if [[ "$version" == "$active_version" ]]; then + echo 'Version already active' >&2 + return 0 + fi + + echo 'Verifying image' >&2 + systemctl start inplace-gbmc-verify || return + echo 'Rebooting to perform update' >&2 + reboot || return +} + +inplace_gbmc_upgrade=1 -- cgit v1.2.3 From 11cadbe48080ceca9c9c3028137f0234d982a2fc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Dec 2021 00:41:13 +0000 Subject: pldm: srcrev bump a6bf120793..872f0f6938 George Liu (2): host-bmc: Fix D-Bus property signal of sendStateSensorEvent method utils: Add split method Manojkiran Eda (1): Change entity type of dimm from 142 to 66 Change-Id: Ie6b9880cb9baa50695935ca09a42a330fd2e58a7 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index e9d1c5dbe..386781a90 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 = "a6bf12079398a6eb91875aec28184939e493c4a3" +SRCREV = "872f0f6938eddddf86ae35be944b1766e1a36228" -- cgit v1.2.3 From dd7414891b46a6b686ef5008e373052950fbc01c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 7 Dec 2021 22:21:39 +0000 Subject: phosphor-power: srcrev bump 7945dd2763..9ba382357e Adriana Kobylak (1): psu-ng: Run validation when PSU is plugged Brandon Wyman (2): psu-ng: INFO journal trace when pgoodFault clears psu-ng: Add DEGLITCH_LIMIT, deglitch pgoodFault Change-Id: I5b0bb69510dde4a466227d6467c7034f17336857 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 310b98283..1ae5955f9 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 = "7945dd2763cecdd19ddf1bfbff3595166cc0cc8b" +SRCREV = "9ba382357e61ff91285a4d5d761cde9fce20124c" -- cgit v1.2.3 From c30ba5f353e7f6537c9feb79395923d04ba2e216 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 7 Dec 2021 21:30:26 +0000 Subject: openpower-hw-diags: srcrev bump 87cd2f5767..611b344212 Ben Tyner (2): attn: Add wait for power fault handling attn: Fix no PEL created when TI info unavailable Zane Shelley (1): change analyzerHardware() to return PEL PLID is created Change-Id: I3b6432213052d3f3763509d106a82ecbb24185df Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5d36f401e..bfe1f4227 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" -SRCREV = "87cd2f5767321bfa88c104f32cd08c9386fb468a" +SRCREV = "611b344212fe92f73b74dfe212c9029841549068" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2e25b85362405a7fa6ada3dd654d0c5000f81b32 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 7 Dec 2021 18:51:02 +0000 Subject: phosphor-led-manager: srcrev bump f178c0f26d..23d5408ba8 George Liu (1): Update the clang-format file with latest Change-Id: I5b729a2a3d0b5112047fa190f3a3fe24148158bd Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 51ef6d323..5c2cc97fe 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 = "f178c0f26d41ddd732d5d3e3acbcec43fa7dc5b6" +SRCREV = "23d5408ba8050e12ec31cba66f3f111d6200d70c" -- cgit v1.2.3 From 60d8b7c8877851925734dd6fe045a021ce3a14b3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 7 Dec 2021 18:01:14 +0000 Subject: phosphor-logging: srcrev bump 35e79a803c..002d8cfd20 Brandon Wyman (1): PEL: Add power supply PS_Kill fault Ramesh Iyyar (2): PEL: Added the new component id for the op-hw-isolation PEL: Added the new message registry for op-hw-isolation error Change-Id: I4a3ce3d069f9ede38a3fb0cab5f493bda9e10dfc Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 45fc183e0..bf49f5f32 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 = "35e79a803c8b491f5a1a22c45a5a48805d49d706" +SRCREV = "002d8cfd2060723fbcdff96cf4fa4a1b5b1de167" S = "${WORKDIR}/git" -- cgit v1.2.3 From 00338bc6ab2903f36dbf129a2d2f1a8bde3b552c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 7 Dec 2021 17:31:02 +0000 Subject: bmcweb: srcrev bump 6afb06d91f..116c184bd3 Asmitha Karunanithi (1): Enhance logs for networkd, hypervisor networkd app Ed Tanous (4): /s/boost::beast::span/std::span Enable stringop warnings Remove copies from log services and virtual media Delete the copy constructor on the Request object Krzysztof Grobelny (1): fixed errors in EventService Patrick Williams (1): test: time_utils: fix negative test Change-Id: I0f5edebe1f49da4656740ba99ccc9fbf4046a6c2 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 824d0ac8f..c5d78732b 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "6afb06d91fbf0017840eb9189dc4f8ee771cb046" +SRCREV = "116c184bd30d0d8e0227dac946fa4ea00e2035bf" S = "${WORKDIR}/git" -- cgit v1.2.3 From 080e0af1ee4a2eeeff4596040861b95674251318 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 7 Dec 2021 15:40:45 +0000 Subject: phosphor-fan-presence: srcrev bump 0cb48f3d9a..20afdda364 Matthew Barth (1): control: Support state parameter on net decrease target action Change-Id: Ic25fa85028166396630b11c966c1567068a003cc Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 904a02b8b..899f722ca 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" -SRCREV = "0cb48f3d9a730cead5b082817ec2c4143218e891" +SRCREV = "20afdda36475796d4993143832132a8b877b441e" -- cgit v1.2.3 From 677bd79ba5205d375241afa2924c49c2dd4add27 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 7 Dec 2021 04:11:27 +0000 Subject: dbus-sensors: srcrev bump 04d050669c..57574ad52b Andrew Jeffery (11): NVMeSensorMain: Extract lambda body NVMeSensorMain: Define extractBusNumber() NVMeSensorMain: Define extractSensorName() NVMeSensorMain: Define deriveRootBusPath() NVMeSensorMain: Define deriveRootBus() NVMeSensorMain: Define provideRootBusContext() NVMeSensorMain: Move context definition to where it's used NVMeSensorMain: Make early exits contiguous NVMeSensorMain: Collapse continue conditions NVMeSensorMain: Drop use of baseConfiguration pointer NVMeSensorMain: Avoid context variable Change-Id: I70eff41b9fb80b9269af4c44d90993735b430580 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 4555095cd..f7d0f7427 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 = "04d050669c95218230d9fb45385479df43fc1a0d" +SRCREV = "57574ad52bcafd396806624e321fb930ec43f0cc" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 92851c4d4b4176b1c573ad201b2e8d5f19eeebde Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 7 Dec 2021 00:11:09 +0000 Subject: phosphor-host-ipmid: srcrev bump 5aae092cab..d950f410b7 JeffLin (1): dbus-sdr: Remove suffixs appended by dbus-sensors Willy Tu (1): ipmid: channel: add match function to reset config on network changes Change-Id: Ieb6a391abb62ca3df7e600b8404c44afbc84d7f4 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 84f7e3ba2..b7ae586ed 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 = "5aae092cab08279d45c7914c466314b356164b7c" +SRCREV = "d950f410b71e0ac4650519eb5bf7ea683e98684d" -- cgit v1.2.3 From 38caf2d7cd610007adcd131a97ec4623da323b03 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 6 Dec 2021 22:00:56 +0000 Subject: phosphor-net-ipmid: srcrev bump 5819666c23..af23add2a2 Jayaprakash Mutyala (1): Fix for closeSession with invalid session ID Change-Id: Ib6f66a37c1731370d5c5398f0c91f5d3290b6467 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c4fd449c9..3e2b955bf 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -18,7 +18,7 @@ DEPENDS += "phosphor-ipmi-host" RRECOMMENDS:${PN} = "pam-ipmi" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "5819666c23ee1d01a54fc5fb2c068bb1da1f29c7" +SRCREV = "af23add2a2cf73226cdc72af4793fde6357e8932" S = "${WORKDIR}/git" -- cgit v1.2.3 From 47dbfce76fc6bbf5a4a2b37be6cba46f7f836998 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 6 Dec 2021 14:51:25 +0000 Subject: telemetry: srcrev bump e28aa53dc1..3eb5686571 Patrick Williams (3): sensor: add missing header for sdbusplus::bus::match build: fix deprecated meson function meson: fix phosphor-logging dependency Szymon Dompke (1): Add support for AppendLimit and ReportUpdates Change-Id: Idaa4881e5b93cdbbb5c838becea668aa3c3e2393 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 31e821618..ed61a3be2 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "e28aa53dc1492f09a64dc9f1dbfd5b6dba06e31f" +SRCREV = "3eb56865714cd591b24d2bdef83307508aa072c5" S = "${WORKDIR}/git" -- cgit v1.2.3 From eaeb5fa7f811ea7f6a28e9fc6b51e6ec85f82e4b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 4 Dec 2021 11:31:12 +0000 Subject: phosphor-networkd: srcrev bump c7cf25f740..afa4032d8f William A. Kennington III (3): ethernet_interface: Remove superfluous logging ethernet_interface: Disable opportunistic DHCPv6 if disabled ethernet_interface: Remove unused function Change-Id: I53720c6611fb742a1fd089979419335826532a4b Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index 3ae79250b..088049d6c 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -11,7 +11,7 @@ inherit python3native inherit systemd SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "c7cf25f7409a6e0fb33d06482d297d03b6dc6b60" +SRCREV = "afa4032d8fe2ba50a7e364ad7c5f58b6424cb17c" DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" -- cgit v1.2.3 From d5ba08bbcc7178aef4c7a4f9ff7caa0e7f345b27 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 3 Dec 2021 20:51:48 +0000 Subject: webui-vue: srcrev bump cc79a53192..12dc20c370 Dixsie Wolmers (3): Network settings redesign - interface settings Network Settings: Add and Delete IPV4 and DNS address Network settings: Edit hostname and MAC address Change-Id: Ic5c428f01638a6c4dbf0cbc2a48869451cb2516f Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index da6467083..90b553016 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 = "cc79a53192de73457cb4c8c3350d896d952bb106" +SRCREV = "12dc20c3701fe58b7d827ed44d65ac67cee8a4a6" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " -- cgit v1.2.3 From a160326fec4a4b299fb5fc395d312e6c70828ce9 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 7 Dec 2021 20:44:43 -0600 Subject: phosphor-settings-manager: add `inherit pkgconfig` The latest Yocto doesn't give us "pkgconfig" for free in many cases. This repository uses 'PKG_CHECK_MODULES', which relies on pkgconfig. Add the inherit so that it is available in the configure step. Change-Id: I1bcd78d11ec01f7724e3d22ea6812dfc223f2c9c Signed-off-by: Patrick Williams --- .../recipes-phosphor/settings/phosphor-settings-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb index b3c491883..175e73556 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb @@ -4,7 +4,7 @@ d-bus objects to represent various user settings." PR = "r1" PV = "1.0+git${SRCPV}" -inherit autotools +inherit autotools pkgconfig inherit obmc-phosphor-dbus-service inherit python3native inherit phosphor-settings-manager -- cgit v1.2.3 From 7bfedcf46b05c55266fb7bdd253ce81975dfa9d9 Mon Sep 17 00:00:00 2001 From: Lotus Xu Date: Wed, 8 Dec 2021 14:21:07 +0800 Subject: bytedance: g220a: Modify power-control config Tested: Test on qemu ipmi chassis status cmd work correct Signed-off-by: Lotus Xu Change-Id: I60d20bf58c21b5c81d5fbad7649c1e2b43351392 --- .../x86-power-control/power-config-host0.json | 53 ++++++++++++++++++---- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control/power-config-host0.json b/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control/power-config-host0.json index c16564440..1ca0e613d 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control/power-config-host0.json +++ b/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control/power-config-host0.json @@ -1,11 +1,46 @@ { - "gpio_configs": { - "NMIButton": "NMI_BUTTON", - "NMIOut": "NMI_OUT", - "PostComplete": "POST_COMPLETE", - "PwrButton": "POWER_BUTTON", - "PwrOK": "PS_PWROK", - "PwrOut": "POWER_OUT", - "RstOut": "RESET_OUT" - } + "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" : "ResetOut", + "LineName" : "RESET_OUT", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + } + ] } -- cgit v1.2.3 From 78dcf8ff15917ce440ce6251a7a1a8d7b0870329 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Tue, 7 Dec 2021 00:22:24 -0600 Subject: openpower: pdata srcrev bump ..b2c92eff16 Amitay Isaacs (1): attribute: export attribute to override file during write Jayanth Othayoth (1): Revert "Revert "data: p10: Changed default value as 1 for DISABLE_SECURITY"" Ramesh Iyyar (5): data: p10: Added the OSCREFCLK target data: p10: Added the POSITION attribute scripts: attribute: xml: Added notRequiredInDevTree tag support scripts: genDTS: Added the OSCREFCLK target under the I2C target data: p10: Added clock target support for Rainier system Signed-off-by: Jayanth Othayoth Change-Id: Ib3bc7cd0d784ed009ef783d2ec6e0e2fa1aaeefe --- meta-openpower/recipes-bsp/pdata/pdata_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-bsp/pdata/pdata_git.bb b/meta-openpower/recipes-bsp/pdata/pdata_git.bb index f851de908..65e73a311 100644 --- a/meta-openpower/recipes-bsp/pdata/pdata_git.bb +++ b/meta-openpower/recipes-bsp/pdata/pdata_git.bb @@ -13,7 +13,7 @@ inherit autotools \ perlnative SRC_URI = "git://git@github.com/open-power/pdata;branch="main"" -SRCREV = "79da01b670a8a2544fad3594290ba1b51f6117ae" +SRCREV = "b2c92eff169e96a67db516f3ea29a4e9d601d89d" DEPENDS = "pdbg \ libxml-simple-perl-native \ -- cgit v1.2.3 From a9e0c81eaafe4fce582e9ae7e9cea71475c6e156 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Tue, 7 Dec 2021 00:23:23 -0600 Subject: openpower: pdata devtree file based attribute override support attributes tool enabled to track the updates to attributes done using "write" command. This features requires environment variable PDATA_ATTR_OVERRIDE is defined and is pointing to a file path that can be appended to. This commits add support for setting shell context environment variable to enable attribute override for devtree attributes. Refer gerrit review for details https://gerrit.openbmc-project.xyz/c/openbmc/openpower-proc-control/ +/49298 Signed-off-by: Jayanth Othayoth Change-Id: I744b86018440b6626307d447934152c978f6bd4b --- meta-openpower/recipes-bsp/pdata/files/power-target.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-openpower/recipes-bsp/pdata/files/power-target.sh b/meta-openpower/recipes-bsp/pdata/files/power-target.sh index 10c985050..4a024195c 100755 --- a/meta-openpower/recipes-bsp/pdata/files/power-target.sh +++ b/meta-openpower/recipes-bsp/pdata/files/power-target.sh @@ -1,6 +1,7 @@ # Command line debug tools like pdbg and ecmd requires # PDBG_DTB environment variable. -# attributes tool required both PDBG_DTB and PDATA_INFODB. +# attributes tool required PDBG_DTB, PDATA_INFODB and PDATA_ATTR_OVERRIDE export PDBG_DTB=/var/lib/phosphor-software-manager/pnor/rw/DEVTREE export PDATA_INFODB=/usr/share/pdata/attributes_info.db +export PDATA_ATTR_OVERRIDE=/tmp/devtree_attr_override -- cgit v1.2.3 From ed24aee86a9c2fe35728181b4d70dbdaa8aceb1a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Dec 2021 22:20:45 +0000 Subject: entity-manager: srcrev bump 5468c6e953..c1a4bb4a5e Andrew Jeffery (3): EntityManager: Split out PerformScan EntityManager: Split out PerformProbe EntityManager: Clean up use of probeTypes Rashmica Gupta (3): configurations: Add ambient virtual sensor to Blyth Add optional hysteresis field to Thresholds ambient virtual temp: add in thresholds Change-Id: Iff52753ac8800ed01e05d51c8224a3d9c532b07e Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 91d609ecf..bb861863b 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "5468c6e953f608331ff455fea51ce541ea2cd9f0" +SRCREV = "c1a4bb4a5e819e80e63c6b623d90c7d1583b4fe2" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From 6bf76f9d2f05770a8901209cc2dfa6b39030e958 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Dec 2021 19:21:26 +0000 Subject: phosphor-state-manager: srcrev bump 1e89e62283..68a8c31d82 Andrew Geissler (3): host-restart: ensure reason cleared on host stop host-restart: set restart reason on power policy use host-restart: set restart reason on scheduling use Change-Id: Ib4fb725feb3459b4bc34a6c15c30d84a07952b75 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5f76096ec..c9b14dc93 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -187,6 +187,6 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERRO SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "1e89e62283ea037823319244fc2de6c351c18538" +SRCREV = "68a8c31d820718588a583625e88ba2626ef64526" S = "${WORKDIR}/git" -- cgit v1.2.3 From cd214db05a0deee3455a7c5fa30308c6e2e3ac3d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Dec 2021 18:40:55 +0000 Subject: bmcweb: srcrev bump 116c184bd3..f5e29f33e6 JunLin Chen (1): Fix bmcweb crash problem when no-auth Patrick Williams (1): span: clean up stray boost headers. Change-Id: Ia0ca226af406ba89090776252d32f0147912c133 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index c5d78732b..3042c9a4f 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "116c184bd30d0d8e0227dac946fa4ea00e2035bf" +SRCREV = "f5e29f33e61be81ece4b2f78d7d1750d357f7ff3" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2d7bb48b99b564ba6e0e2ea39604087612a90e6d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Dec 2021 18:01:16 +0000 Subject: phosphor-logging: srcrev bump 002d8cfd20..c30f00a32f Brandon Wyman (1): PEL: Add power supply fan fault Jayanth Othayoth (1): PEL: Add error message registry entry for devtree reinit Change-Id: I5bc87dc0855556882d48ab922c94397940aaf0f5 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index bf49f5f32..d3e2a8dd8 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 = "002d8cfd2060723fbcdff96cf4fa4a1b5b1de167" +SRCREV = "c30f00a32f1680ff727df784e8ca966482b74019" S = "${WORKDIR}/git" -- cgit v1.2.3 From 7a633f5fd8b3c1090d235231a9747a0b6a19e091 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Dec 2021 18:00:28 +0000 Subject: openpower-hw-diags: srcrev bump 611b344212..ebff0d375e Zane Shelley (1): add analysis type to analyzer main function austinfcui (1): Add PDBG callback function for logging with log level Change-Id: I48cf16ae321cf1a21cfa0850dec2ffa3bb343225 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bfe1f4227..87ea49707 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" -SRCREV = "611b344212fe92f73b74dfe212c9029841549068" +SRCREV = "ebff0d375ef410eeed34c3ef50bc5745f4def486" S = "${WORKDIR}/git" -- cgit v1.2.3 From cd6fbefc581b23dba6175677b0103c71d1379cac Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Dec 2021 17:10:38 +0000 Subject: sdbusplus: srcrev bump 6d83cf539a..4a46eb5aa0 Jonathan Doman (1): Make asio::object_server take const ptr to connection Patrick Williams (9): message: shorten message type bus: shorten bus type manager,interface: use shortened types vtable: shorten vtable type slot: shorten slot type slot: explicitly transfer pointer bus: reduce forward declaration for friendship slot: add friended get function object: handle diamond inheritance Change-Id: I9c08386ce8ff448c3ed40e89eba7544d3864bfac Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 787e17325..1c8bbb366 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" -SRCREV = "6d83cf539ac0613e5639ec484c4865317795cd75" +SRCREV = "4a46eb5aa05df6da3ba66446a6e1526098e47d0f" -- cgit v1.2.3 From 89dcac9415dc579b21f7435729f194f3a6c15cb4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Dec 2021 15:50:23 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump 9cbc06b10d..3ce1a4cbd2 Adriana Kobylak (1): openssl: stop using deprecated read_RSAPublicKey Change-Id: I988d63c064a4ec4eb1affd4c279a13b63ecd8f61 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7b44d7840..1051d01a9 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" -SRCREV = "9cbc06b10d2738f7c2e3472cd447612768739f1d" +SRCREV = "3ce1a4cbd2f3ba7c11a48d0f180710a83a1f5c10" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From 2f96ad993431f0c86c7bc4f91ff495ef8b83a96f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Dec 2021 14:50:53 +0000 Subject: phosphor-bmc-code-mgmt: srcrev bump 58e18979f5..d75c869d07 Patrick Williams (1): openssl: stop using deprecated read_RSAPublicKey Change-Id: Ie541df96d855c2f0fcd88ddca252c6f69c9b43db Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index d62a8c2c7..f0a5d9bce 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 = "58e18979f54272cea7af1834011cd249902665c5" +SRCREV = "d75c869d07a31626fe876c244ec978662326245b" -- cgit v1.2.3 From 5879f01b56c4531a94ed6f14a46e84da3aa738f2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Dec 2021 12:40:38 +0000 Subject: phosphor-certificate-manager: srcrev bump 13eba41aab..83e6eab0f0 Patrick Williams (1): certificate: fix memory leak Change-Id: I3b7c75ca10667647c07fe21c90b40c9d408c8e63 Signed-off-by: Andrew Geissler --- .../recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d9121fac6..80f9ab821 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "13eba41aaba1e704afe63db23e287518c1ae6dff" +SRCREV = "83e6eab0f088f742528e0860e8105340eb9dfb46" inherit autotools \ pkgconfig \ -- cgit v1.2.3 From ef64de967e48a39f21b958feafb871cebf0f7ccb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 8 Dec 2021 12:20:28 +0000 Subject: openpower-proc-control: srcrev bump 0ac7c38f64..381c3e3449 Jayanth Othayoth (7): Add TemporaryFile class PHAL: reinitialize the devtree attributes PHAL: devtree file based attribute override support PHAL: enabled devtree attributes reinit during boot PHAL: threadStopall procedure support P9: threadStopall procedure support pdbg api based op-stop-instructions service updates Marri Devender Rao (1): PHAL: Add callout details for platform related errors Change-Id: I71d429ed84ef59af3adc08d183830cdeae7647ee Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1a3fde452..c27b4d58c 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" -SRCREV = "0ac7c38f64ce2c5a170ab6fe219d26e599713da3" +SRCREV = "381c3e3449ca62674cfa70d81c17104221edd2ea" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From c43ab61ced86d19d5698a18a81cdbfa8d43d050e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 6 Dec 2021 06:51:25 +0000 Subject: x86-power-control: srcrev bump 6ce234ecae..85e111ed69 Logananth Sundararaj (1): Changes for dbus based gpio config. Change-Id: I071c72e0edb6626d2a58311fbdb589182c988f6e Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0aaf40c50..93b745fb6 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" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "6ce234ecaeef3558b97cb24020577996b38a4690" +SRCREV = "85e111ed6940491b6fe40cc5054ef021a1404e19" PV = "1.0+git${SRCPV}" -- cgit v1.2.3 From 11e70600436c95cb52e211bd3f3daddd570a5325 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Wed, 8 Dec 2021 10:47:46 +0000 Subject: meta-ampere: mtjade: don't configure OCP GPIO when BMC rebooted Configure OCP_AUX_PWREN and/or OCP_MAIN_PWREN GPIOs, even without changing their values, make the OCP power glitched which consequently makes the Host OS generates many calltrace message. When BMC is rebooted, the ampere-gpio-poweron@service service is triggered that reconfigure these GPIOs. This comit prevents this case by checking if the Host is currently ON to skip the reconfiguration. Tested: 1. Boot the BMC and Host CPU. 2. Reboot BMC. Ensure no call trace for OCP Signed-off-by: Thang Q. Nguyen Change-Id: I621e025adf72baf84bffd011ea0e04229f739755 --- .../platform/mtjade-gpio-config/ampere-gpio-poweroff@.service | 4 ++-- .../platform/mtjade-gpio-config/ampere_gpio_utils.sh | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service index 78862eb32..fe776a5b9 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service @@ -1,10 +1,10 @@ [Unit] Description=Ampere set GPIOs before power off Requires=op-wait-power-off@%i.service -Before=op-wait-power-off@%i.service +After=op-wait-power-off@%i.service Conflicts=obmc-chassis-poweron@%i.target [Service] Type=oneshot ExecStart=/usr/bin/env ampere_gpio_utils.sh power off -SyslogIdentifier=ampere_gpio_utils \ No newline at end of file +SyslogIdentifier=ampere_gpio_utils diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere_gpio_utils.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere_gpio_utils.sh index 1a098f446..5d1a1a27a 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere_gpio_utils.sh +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere_gpio_utils.sh @@ -10,14 +10,16 @@ function usage() { set_gpio_power_off() { echo "Setting GPIO before Power off" - gpio_configure_output "$OCP_AUX_PWREN" 1 gpio_configure_output "$OCP_MAIN_PWREN" 0 - gpio_configure_output "$SPI0_PROGRAM_SEL" 0 + rm -f /run/openbmc/host@0-on } set_gpio_power_on() { echo "Setting GPIO before Power on" - gpio_configure_output "$OCP_AUX_PWREN" 1 + val=$(gpio_get_val "$S0_CPU_FW_BOOT_OK") + if [ "$val" == 1 ]; then + exit + fi gpio_configure_output "$OCP_MAIN_PWREN" 1 gpio_configure_output "$SPI0_PROGRAM_SEL" 1 gpio_configure_output "$SPI0_BACKUP_SEL" 0 -- cgit v1.2.3 From 7dd9ff465dc582a5d03b2ea62eee147faae39ffc Mon Sep 17 00:00:00 2001 From: "Lakshminarayana R. Kammath" Date: Tue, 7 Dec 2021 04:38:14 -0600 Subject: meta-ibm: Add partition SAI and platform SAI as fault indicator objects phosphor-led-manager already has platform and partition system attention indicator D-Bus objects implementing xyz.openbmc_project.Led.Group. but, was not added to association json which this commit is doing. Signed-off-by: Lakshminarayana R. Kammath Change-Id: I3803cbb2d07626e3af6474ea8e74d987f4a963b0 --- .../p10bmc/ibm,everest_associations.json | 18 ++++++++++++++++++ .../p10bmc/ibm,rainier-2u_associations.json | 18 ++++++++++++++++++ .../p10bmc/ibm,rainier-4u_associations.json | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+) 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 a1a87e534..8693e7d1d 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 @@ -278,6 +278,24 @@ } ] }, + { + "path": "system", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/partition_system_attention_indicator", + "/xyz/openbmc_project/led/groups/platform_system_attention_indicator" + ] + } + ] + }, { "path": "system/chassis/motherboard/powersupply0", "endpoints": 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 73dda9edf..2ea36bc67 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 @@ -321,6 +321,24 @@ } ] }, + { + "path": "system", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/partition_system_attention_indicator", + "/xyz/openbmc_project/led/groups/platform_system_attention_indicator" + ] + } + ] + }, { "path": "system/chassis/motherboard/powersupply0", "endpoints": 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 2e1682de1..6d9bc42f1 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 @@ -309,6 +309,24 @@ } ] }, + { + "path": "system", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/partition_system_attention_indicator", + "/xyz/openbmc_project/led/groups/platform_system_attention_indicator" + ] + } + ] + }, { "path": "system/chassis/motherboard/powersupply0", "endpoints": -- cgit v1.2.3 From 7843a81ebc3592ec45793964880328937305b8c2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 9 Dec 2021 14:17:10 -0800 Subject: gbmc-ncsi-config: Stop ncsid if special RA is received The receipt of the RA is indicative of a non-NCSI configuration so we can shut down the daemon in this instance. Change-Id: Iff958be408cff853973bd335f2459cd3d9bca0e0 Signed-off-by: William A. Kennington III --- meta-google/recipes-google/ncsi/files/gbmc-ncsi-ip-from-ra.sh.in | 3 +++ 1 file changed, 3 insertions(+) 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 index 6144617d4..2788f7f19 100755 --- 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 @@ -41,6 +41,9 @@ set_net() { 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 + # Delete any stale IP Addresses from the primary interface as we won't use them UpdateIP xyz.openbmc_project.Network "$NCSI_IF" '0.0.0.0' '0' || true UpdateIP xyz.openbmc_project.Network "$NCSI_IF" '::' '0' || true -- cgit v1.2.3 From f2265623f4cdae094c7f31b4b2135bdd406857cc Mon Sep 17 00:00:00 2001 From: Logananth Sundararaj Date: Fri, 3 Dec 2021 22:31:49 +0530 Subject: meta-yosemitev2: Fixing the u-boot console debugging. Removed the debug uboot console prints. Initialized the baudrate to 57600. Signed-off-by: Logananth Sundararaj Change-Id: Ia6cd59e3d6a8a0d73d6a6113c60e13bba0f90b22 --- .../0001-board-aspeed-Add-Mux-for-yosemitev2.patch | 61 +++++++--------------- .../0002-spl-host-console-handle.patch | 57 ++++++++++---------- 2 files changed, 48 insertions(+), 70 deletions(-) mode change 100755 => 100644 meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch diff --git a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-Mux-for-yosemitev2.patch b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-Mux-for-yosemitev2.patch index 5634ce936..9f2799f68 100644 --- a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-Mux-for-yosemitev2.patch +++ b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-Mux-for-yosemitev2.patch @@ -1,22 +1,21 @@ -From c2e01a4cc220b9a1c1a6bb52e5f58bcc8d2edc55 Mon Sep 17 00:00:00 2001 -From: manikandan-e -Date: Wed, 30 Oct 2019 19:43:51 +0530 -Subject: [PATCH 2/2] board-aspeed-Add-Mux-for-yosemitev2 - -Signed-off-by: manikandan-e +From f09b84e61569f2b991cc3e257c34517a222922d3 Mon Sep 17 00:00:00 2001 +From: Logananth Sundararaj +Date: Fri, 3 Dec 2021 15:21:50 +0530 +Subject: [PATCH] board-aspeed-Add-Mux-for-yosemitev2 +Signed-off-by: Logananth Sundararaj --- - arch/arm/mach-aspeed/platform_g5.S | 213 +++++++++++++++++++++++++++++++------ - 1 file changed, 183 insertions(+), 30 deletions(-) + arch/arm/mach-aspeed/platform_g5.S | 191 ++++++++++++++++++++++++----- + 1 file changed, 162 insertions(+), 29 deletions(-) diff --git a/arch/arm/mach-aspeed/platform_g5.S b/arch/arm/mach-aspeed/platform_g5.S -index 2ac1ca4..c3ce077 100644 +index 2ac1ca4721..e1c17ae4a3 100644 --- a/arch/arm/mach-aspeed/platform_g5.S +++ b/arch/arm/mach-aspeed/platform_g5.S @@ -302,6 +302,156 @@ TIME_TABLE_DDR4_1600: ldr r2, =0x00000800 .endm - + + .macro console_bmc + ldr r0, =0x1e780024 +ldr r1, [r0] @@ -149,8 +148,8 @@ index 2ac1ca4..c3ce077 100644 + mov r2, r2, lsr #12 + tst r2, #0x01 + ldr r0, =0x1E784000 -+ moveq r1, #0x0D @ Baudrate 115200 -+ movne r1, #0x01 @ Baudrate 115200, div13 ++ moveq r1, #0x1A @ Baudrate 57600 ++ movne r1, #0x02 @ Baudrate 57600, div13 + + str r1, [r0] + @@ -170,7 +169,7 @@ index 2ac1ca4..c3ce077 100644 .macro print_hex_char and r1, r1, #0xF cmp r1, #9 -@@ -324,6 +474,36 @@ init_dram: +@@ -324,6 +474,16 @@ init_dram: /******************************************** Initial Reset Procedure : Begin *******************************************/ @@ -180,26 +179,6 @@ index 2ac1ca4..c3ce077 100644 + + uart_console_setup + -+ /* Debug - UART console message */ -+ ldr r0, =0x1E784000 -+ mov r1, #0x0D @ '\r' -+ str r1, [r0] -+ mov r1, #0x0A @ '\n' -+ str r1, [r0] -+ mov r1, #0x54 @ 'S' -+ str r1, [r0] -+ mov r1, #0x50 @ 'P' -+ str r1, [r0] -+ mov r1, #0x4C @ 'L' -+ str r1, [r0] -+ mov r1, #0x0D @ '\r' -+ str r1, [r0] -+ mov r1, #0x0A @ '\n' -+ str r1, [r0] -+ /* End Debug - UART console message */ -+ -+ -+ + ldr r0, =0x1E720204 + mov r1, #0x0 + str r1, [r0] @@ -207,21 +186,19 @@ index 2ac1ca4..c3ce077 100644 /* Clear AHB bus lock condition */ ldr r0, =0x1e600000 ldr r1, =0xAEED1A03 -@@ -793,7 +973,9 @@ wait_ddr_reset: +@@ -793,6 +953,8 @@ wait_ddr_reset: clear_delay_timer /* end delay 10ms */ - --/* Debug - UART console message */ + + uart_console_setup + -+ /* Debug - UART console message */ + /* Debug - UART console message */ #ifdef CONFIG_DRAM_UART_TO_UART1 ldr r0, =0x1e78909c @ route UART5 to UART Port1, 2016.08.29 - ldr r1, =0x10000004 -@@ -806,35 +988,6 @@ wait_ddr_reset: +@@ -806,35 +968,6 @@ wait_ddr_reset: str r1, [r0] #endif - + - ldr r0, =0x1e78400c - mov r1, #0x83 - str r1, [r0] @@ -254,6 +231,6 @@ index 2ac1ca4..c3ce077 100644 ldr r0, =0x1e784000 mov r1, #0x0D @ '\r' str r1, [r0] --- -2.7.4 +-- +2.17.1 diff --git a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch old mode 100755 new mode 100644 index cccdd04b5..8f01c122c --- a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch +++ b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch @@ -1,6 +1,6 @@ -From ca2c08a7e710e4beff2fdf17bba5a74adff13db8 Mon Sep 17 00:00:00 2001 -From: Manikandan Elumalai -Date: Wed, 10 Jun 2020 17:53:59 +0530 +From 9c5a3784a68a456cd22e63719917ed79873d0801 Mon Sep 17 00:00:00 2001 +From: Logananth Sundararaj +Date: Fri, 3 Dec 2021 16:37:58 +0530 Subject: [PATCH] spl-host-console-handle This patch adds four 1S server console through debug card @@ -13,25 +13,25 @@ GPIOAA5 ---SW_ID2 GPIOAA4 ---SW_ID1 SW_ID8 SW_ID4 SW_ID2 SW_ID1 Position Descritpion -L L L L 1 1s server slot1 select +L L L L 1 1s server slot1 select -L L H 2 1s server slot2 select +L L L H 2 1s server slot2 select -L L H L 3 1s server slot3 select +L L H L 3 1s server slot3 select -L L H H 4 1s server slot4 select +L L H H 4 1s server slot4 select -L H L L 5 BMC Debug port select +L H L L 5 BMC Debug port select -L H L H 6 1s server slot1 select +L H L H 6 1s server slot1 select -L H H L 7 1s server slot2 select +L H H L 7 1s server slot2 select -L H H H 8 1s server slot3 select +L H H H 8 1s server slot3 select -H L L L 9 1s server slot4 select +H L L L 9 1s server slot4 select -H L L H 10 BMC Debug port select +H L L H 10 BMC Debug port select BMC and Hosts UART control flow GPIOE0 --- DEBUG_UART_SEL_0 @@ -40,24 +40,24 @@ GPIOE2 --- DEBUG_UART_SEL_2 GPIOE2 --- DEBUG_UART_RX_SEL_N SEL_2 SEL_1 SEL_0 RX_SEL_N CONSOLE -0 0 0 0 SLOT1 -0 0 1 0 SLOT2 -0 1 0 0 SLOT3 -0 1 1 0 SLOT4 -1 0 0 1 BMC Debug +0 0 0 0 SLOT1 +0 0 1 0 SLOT2 +0 1 0 0 SLOT3 +0 1 1 0 SLOT4 +1 0 0 1 BMC Debug -Signed-off-by: Manikandan Elumalai +Signed-off-by: Logananth Sundararaj --- - arch/arm/mach-aspeed/platform_g5.S | 68 +++++++++++++++++++++++++++++++++----- - 1 file changed, 60 insertions(+), 8 deletions(-) + arch/arm/mach-aspeed/platform_g5.S | 69 ++++++++++++++++++++++++++---- + 1 file changed, 61 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-aspeed/platform_g5.S b/arch/arm/mach-aspeed/platform_g5.S -index c3ce077..29daa7a 100644 +index e1c17ae4a3..798b9c4337 100644 --- a/arch/arm/mach-aspeed/platform_g5.S +++ b/arch/arm/mach-aspeed/platform_g5.S -@@ -315,6 +315,58 @@ orr r1, r1, #0xC - str r1, [r0] - .endm +@@ -315,6 +315,59 @@ TIME_TABLE_DDR4_1600: + str r1, [r0] + .endm + .macro console_slot1 + ldr r0, =0x1e780024 @@ -110,11 +110,12 @@ index c3ce077..29daa7a 100644 + orr r1, r1, #0x3 + str r1, [r0] + .endm ++ + .macro console_sel // Disable SoL UARTs[1-4] -@@ -354,28 +406,28 @@ dbg_card_pres\@: +@@ -354,28 +407,28 @@ dbg_card_pres\@: ldr r1, =0x00 cmp r0, r1 bne case_pos2\@ @@ -147,7 +148,7 @@ index c3ce077..29daa7a 100644 b case_end\@ case_pos5\@: //Test for position#5 -@@ -389,28 +441,28 @@ case_pos6\@: +@@ -389,28 +442,28 @@ case_pos6\@: ldr r1, =0x05 cmp r0, r1 bne case_pos7\@ @@ -181,4 +182,4 @@ index c3ce077..29daa7a 100644 case_pos10\@: //Test for position#10 -- -2.7.4 +2.17.1 -- cgit v1.2.3 From c0106fbd54238706bfe813a9ecd7c411c38fd41c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 12:21:05 +0000 Subject: phosphor-bmc-code-mgmt: srcrev bump d75c869d07..0890ab9453 Patrick Williams (2): openssl: stop using deprecated SHA512_* functions openssl: test: stop using deprecated SHA512_* functions Change-Id: I311c37183df9ef9335d6d3adf69ffe008dcbfdf1 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index f0a5d9bce..b701d887d 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 = "d75c869d07a31626fe876c244ec978662326245b" +SRCREV = "0890ab94539f682450c0e9ac86bcbb6c8ee067d4" -- cgit v1.2.3 From 5422fe603bd670fc3a94c03f9f119d5aaeca13c3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 15:00:24 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump 3ce1a4cbd2..5e0b2375b2 Adriana Kobylak (1): openssl: stop using deprecated SHA512_* functions Change-Id: Ibe01f9a4b93de1303058365f7b2f1460f1d13370 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1051d01a9..eca81d800 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" -SRCREV = "3ce1a4cbd2f3ba7c11a48d0f180710a83a1f5c10" +SRCREV = "5e0b2375b20ea1e82f95770f68ae416a8c0de62f" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From 067cc96c9f95a20cc67f5625420e779dc9d35cfc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 19:10:28 +0000 Subject: openpower-hw-diags: srcrev bump ebff0d375e..ec227c2cf9 Zane Shelley (4): Apply resolutions based on analysis type Set guard policy based on analysis type Add informational PEL for manual analysis change root cause filter based on analysis type Change-Id: I74d06977702bd2b233776a21a50a0084ab170abe Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 87ea49707..6b4b02341 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" -SRCREV = "ebff0d375ef410eeed34c3ef50bc5745f4def486" +SRCREV = "ec227c2cf954772403f0a685cb9b600f40ba2c5a" S = "${WORKDIR}/git" -- cgit v1.2.3 From f8a56837f12f3026af32bf20d6ef34e41820a8dd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 18:10:47 +0000 Subject: phosphor-dbus-interfaces: srcrev bump e0764cf41d..36ed8ad2b4 Carlos J. Mazieri (1): software: define multi-slot/multi-device update Jason M. Bills (1): Add interface for sending raw PECI commands Patrick Williams (2): software: remove old TODO software: leverage Compatible strings Shawn McCarney (1): Add UPower Device interface Change-Id: I0848a17e3338a3ccbcf1071df8918ed7b5f2b7e7 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 119d17ffc..1e3c5149a 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "e0764cf41d16b823a519e9d4f508b588e3e84aba" +SRCREV = "36ed8ad2b40e63eaa0aa8b37a5e6d6d2faa614db" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true -- cgit v1.2.3 From 560750b72f1638860071309ed41e9007d5565ea4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 17:31:34 +0000 Subject: phosphor-power: srcrev bump 9ba382357e..a169b0f9d2 Brandon Wyman (1): psu-ng: IBM FN goes to SparePartNumber Jim Wright (1): pseq: Retrieve compatible systems from EM Change-Id: I5286aec0866dd7b36766e1b3cc1adc87165a13d9 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 1ae5955f9..76a179cb4 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 = "9ba382357e61ff91285a4d5d761cde9fce20124c" +SRCREV = "a169b0f9d2d5114729e149c158d518176556b892" -- cgit v1.2.3 From 3efbdd6f4b8cde9829e7ffb599faaf830c2acce2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 14:11:15 +0000 Subject: pldm: srcrev bump 872f0f6938..27403f46db Brad Bishop (2): pldmtool: oem: ibm: add missing header pldmtool: oem: ibm: untangle header dependencies George Liu (1): Remove duplicate LID_STAGING_DIR Change-Id: I4addd1073f78ebc04636321764325a59cc07709b Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 386781a90..f62966633 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 = "872f0f6938eddddf86ae35be944b1766e1a36228" +SRCREV = "27403f46dbd3da33e082340377f671d16faf1b36" -- cgit v1.2.3 From 187732dea3835b77155a4cadf65b84658d3ed687 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 05:20:45 +0000 Subject: entity-manager: srcrev bump c1a4bb4a5e..a9c5892927 Andrew Jeffery (1): entity-manager: Search sysconfdir for configurations Bruce Mitchell (2): entity-manager: Support for DPS310 and SI7020 Rainier entity-manager: Support DPS310 and SI7020 Everest Change-Id: I5a48832cf0c3e1138cc5e142f751110fc5ea3ad8 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index bb861863b..43c37bded 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "c1a4bb4a5e819e80e63c6b623d90c7d1583b4fe2" +SRCREV = "a9c589292720d62047eaefd6aa3a148a9ad4c506" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From 2b1ceddc8da5d9742e972362949207a2374384fd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 10:00:29 +0000 Subject: openpower-proc-control: srcrev bump 381c3e3449..f9152b91f2 Ramesh Iyyar (2): README: Updated the build steps PHAL: Set HardwareIsolation policy before start the host Change-Id: I843d7318baf5656f99a05c59609a5a1d0ed7742e Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c27b4d58c..78e0eef84 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" -SRCREV = "381c3e3449ca62674cfa70d81c17104221edd2ea" +SRCREV = "f9152b91f27b3929e5bd147ee79e75fac2019727" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From 9b1df3160015bd2c2dfaab287bfac48867df21bd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 05:01:40 +0000 Subject: dbus-sensors: srcrev bump 57574ad52b..0e68f19968 Bruce Mitchell (1): DPS310 temperature pressure, SI7020 temperature Ed Tanous (1): Make list single line Howard Chiu (1): PSUSensor: Add MP5023 into whitelist Paul Fertser (1): Revert "Add beep support for PSU" Change-Id: I154914813834ec2cbb95e6f3880bf8f04a9f3057 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index f7d0f7427..bcb615ab1 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 = "57574ad52bcafd396806624e321fb930ec43f0cc" +SRCREV = "0e68f19968f2501701cb53a9a66506c7bc497a05" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From d9a1e06d6dcd8e5b2db5b1dc0570effc8b798974 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 9 Dec 2021 22:11:09 +0000 Subject: phosphor-networkd: srcrev bump afa4032d8f..b353ba0dcf Johnathan Mantey (1): Fix missing line-feed for DHCPv6Client entry Change-Id: I642aa6a83442c772777177e38833cfdffbf7da07 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index 088049d6c..627f59899 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -11,7 +11,7 @@ inherit python3native inherit systemd SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "afa4032d8fe2ba50a7e364ad7c5f58b6424cb17c" +SRCREV = "b353ba0dcf4aec7f68b8ff08800679f7f150fb81" DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" -- cgit v1.2.3 From 860dabb0b1a86d7ed78f2984cacad770a692c5e8 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 9 Dec 2021 20:11:14 +0000 Subject: phosphor-logging: srcrev bump c30f00a32f..dd4bd482f1 Zane Shelley (1): PEL: openpower-hw-diags informational registry entry Change-Id: Ib16ef1ea04c300372185fe1598a0c552a934cd07 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index d3e2a8dd8..c4e4d1a61 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 = "c30f00a32f1680ff727df784e8ca966482b74019" +SRCREV = "dd4bd482f1009576a7a074cc63c6a9ce6698876d" S = "${WORKDIR}/git" -- cgit v1.2.3 From b193822a5dac519e38cf5fa1b81ae71cfb7be23f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 9 Dec 2021 17:31:04 +0000 Subject: phosphor-host-ipmid: srcrev bump d950f410b7..778f65973b Konstantin Aladyshev (2): Don't throw exception if FRU inventory path is not present Add support for setting threshold comparison status Change-Id: Ia7513495682ba6b96fcf190d55ea1e8a3998b221 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index b7ae586ed..288f1fb96 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 = "d950f410b71e0ac4650519eb5bf7ea683e98684d" +SRCREV = "778f65973b544fe04520fe03d5613f333fc4d1dd" -- cgit v1.2.3 From 6e995585d7e6b4d4b73f0ac8035435e72f401f00 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 9 Dec 2021 15:50:48 +0000 Subject: phosphor-fan-presence: srcrev bump 20afdda364..323694a9d8 Matt Spinler (2): control: set_parameter_from_group: handle no max control:p10bmc: Events to set DVFS temp params Matthew Barth (1): control: Change `addGroup()` to get all managed objects Change-Id: Ia18ad0dc394e24fbd813e638dbd487fb37716c11 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 899f722ca..e6f260b6c 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" -SRCREV = "20afdda36475796d4993143832132a8b877b441e" +SRCREV = "323694a9d8611405e93acb50ba5ba729cc580056" -- cgit v1.2.3 From 13465b4b693e7a5701ab7eae47788f19d85a71b1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 18:51:13 +0000 Subject: bmcweb: srcrev bump f5e29f33e6..df5415fc03 Ed Tanous (2): Clean up meson lists Add logging to internal error Jiaqing Zhao (2): Convert IPv4-mapped IPv6 ClientIP back to IPv4 Remove non-standard IPv6StaticAddress properties P Dheeraj Srujan Kumar (1): Restructure Redfish EventLog Transmit code flow SpencerKu (1): Redfish: Script to Expose Host Log Entries zhanghaicheng (1): Fix bmcweb core-dump caused by Split up authenticate Change-Id: Ie3e2cafd8af1970dce2fe81d36f0b203343085fe Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 3042c9a4f..f10936b07 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "f5e29f33e61be81ece4b2f78d7d1750d357f7ff3" +SRCREV = "df5415fc03b458eedfcb07a6be262d1067a50aec" S = "${WORKDIR}/git" -- cgit v1.2.3 From a8e309d7e3afa3c32e3d8a6ade203c86a7a97bdb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 9 Dec 2021 13:41:56 +0000 Subject: telemetry: srcrev bump 3eb5686571..b8cc78ddf9 Krzysztof Grobelny (2): Using enum class instead of string in more places Api changes in AddReportFuture version Change-Id: Ia77453eebeeb18fa3a768e1f3db6683c8e9f4c4c Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index ed61a3be2..0cff5121c 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "3eb56865714cd591b24d2bdef83307508aa072c5" +SRCREV = "b8cc78ddf9cc87c83176c7bda575ceef2678d00f" S = "${WORKDIR}/git" -- cgit v1.2.3 From 35b0b9ccffe50b9a981f9e9c34fa36d47b653745 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 9 Dec 2021 07:41:11 +0000 Subject: service-config-manager: srcrev bump c7d2253187..fa5d5ca730 George Liu (1): Update the clang-format file with latest Change-Id: I4bb1b2deadc8252fc42ba4a50705528b7f3401e6 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 44d911df5..041969304 100644 --- a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" SRC_URI = "git://github.com/openbmc/service-config-manager" -SRCREV = "c7d22531874868c7002eab263c5c66576db92b06" +SRCREV = "fa5d5ca73024c6be6a011184edad79a6cf2c7630" inherit meson pkgconfig systemd -- cgit v1.2.3 From e306b7fd34beb400c29ffd5861f512770b9aafca Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 9 Dec 2021 05:50:36 +0000 Subject: phosphor-certificate-manager: srcrev bump 83e6eab0f0..63540131ac Nan Zhou (1): allow X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT Change-Id: If490efcdd55badc85e769e67e1e91ef5336e96ee Signed-off-by: Andrew Geissler --- .../recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 80f9ab821..7f2dbebbb 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "83e6eab0f088f742528e0860e8105340eb9dfb46" +SRCREV = "63540131ac2c2e9fa97f948c1d7a11de589e268b" inherit autotools \ pkgconfig \ -- cgit v1.2.3 From 4cb5f85a4e59bf24deddeec580b6d39d72f03725 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 9 Dec 2021 03:50:34 +0000 Subject: sdbusplus: srcrev bump 4a46eb5aa0..ce62764d6c gokulsanker (1): Modified set_handler() to return dbus error code Change-Id: Ia6c1f466d19b6119dd79e1678f509b8270c7e316 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 1c8bbb366..1528740c7 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" -SRCREV = "4a46eb5aa05df6da3ba66446a6e1526098e47d0f" +SRCREV = "ce62764d6c0a72ec88eb433e1afd05b751225971" -- cgit v1.2.3 From 1985ad8758e779604e743ae5b545fb07e6232e99 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 23:40:14 +0000 Subject: google-misc: srcrev bump 379b061ffd..ddf93d57c1 Patrick Williams (3): nemora-postd: fix compile fail sdbusplus: remove usage of deprecated alias MAINTAINERS: fix syntax William A. Kennington III (2): ncsid: Only log errors a single time ncsid: update_ra_gw: Fix SIGTERM handling Change-Id: I6af4e21f61b4e126979cac3042bfac72516f62e3 Signed-off-by: Andrew Geissler --- meta-google/recipes-google/google-misc/google-misc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-google/recipes-google/google-misc/google-misc.inc b/meta-google/recipes-google/google-misc/google-misc.inc index 49535873b..cd2c37975 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" -SRCREV = "379b061ffdd797d00c07acf0b5cb81e1f6513bca" +SRCREV = "ddf93d57c15ad453ba1498ab8553302c0361dfbe" S = "${WORKDIR}/git/subprojects/${GOOGLE_MISC_PROJ}" inherit meson -- cgit v1.2.3 From 11ea7f74ce55a0dd3cf67bd9e0f758146e30ac63 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 11 Dec 2021 18:40:42 +0000 Subject: phosphor-certificate-manager: srcrev bump 63540131ac..bb939ea45d Patrick Williams (1): build: add meson support Change-Id: I7b1ce2bd642dcf19dd4a8bf72e53cb12a49e5ea0 Signed-off-by: Andrew Geissler --- .../recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7f2dbebbb..f11508d1d 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "63540131ac2c2e9fa97f948c1d7a11de589e268b" +SRCREV = "bb939ea45d53b2dbb7ab6b03856f023f82beecd5" inherit autotools \ pkgconfig \ -- cgit v1.2.3 From e73d2169891264a3c0b2c8e61912e0f747b9e3c6 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 8 Dec 2021 21:25:20 -0600 Subject: unifex: add recipe libunifex is a library for enabling C++ "Unified Executors" in C++20, based on current standards work being proposed for C++23 (P2300)[1]. This library provides C++20 support for async and co-routines. 1. https://isocpp.org/files/papers/P2300R3.html Signed-off-by: Patrick Williams Signed-off-by: Khem Raj (cherry picked from commit edc54a229fc3c50d2cd41e400b18feb3ae41cfb4) Signed-off-by: Patrick Williams Change-Id: I8332f2919a707e76e6aa839cb55140e8ceec637a --- .../meta-oe/recipes-devtools/unifex/unifex_git.bb | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-devtools/unifex/unifex_git.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/unifex/unifex_git.bb b/meta-openembedded/meta-oe/recipes-devtools/unifex/unifex_git.bb new file mode 100644 index 000000000..85fe39b6d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/unifex/unifex_git.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "C++ Unified Executors library" +HOMEPAGE = "https://github.com/facebookexperimental/libunifex" +SECTION = "libs" +LICENSE = "Apache-2.0-with-LLVM-exception" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5b86506074cb3cdc493b4f96b73b2909" + +SRC_URI = "git://github.com/facebookexperimental/libunifex.git;branch=main;protocol=https" +SRCREV = "9df21c58d34ce8a1cd3b15c3a7347495e29417a0" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +PACKAGECONFIG ??= "liburing" +PACKAGECONFIG[liburing] = ",,liburing" + +EXTRA_OECMAKE += " \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_TESTING=OFF \ + -DCMAKE_CXX_STANDARD=20 \ + -DUNIFEX_BUILD_EXAMPLES=OFF \ + " + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3 From 045f2fb5dd3b3a07196c9ed213378bfa1f2c1e85 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Sun, 5 Dec 2021 07:02:18 -0600 Subject: phosphor-certificate-manager: switch to meson Signed-off-by: Patrick Williams Change-Id: I00f31a008d909d78f1ebd0497f329087ef457dc5 --- .../certificate/phosphor-certificate-manager_git.bb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 f11508d1d..30be5a3bf 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -11,12 +11,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" SRCREV = "bb939ea45d53b2dbb7ab6b03856f023f82beecd5" -inherit autotools \ - pkgconfig \ - systemd +inherit meson pkgconfig systemd DEPENDS = " \ - autoconf-archive-native \ openssl \ phosphor-dbus-interfaces \ phosphor-logging \ @@ -26,14 +23,14 @@ DEPENDS = " \ S = "${WORKDIR}/git" -EXTRA_OECONF += "--disable-tests" +EXTRA_OEMESON += "-Dtests=disabled" SYSTEMD_SERVICE:${PN} = "phosphor-certificate-manager@.service" PACKAGECONFIG ??= "bmcweb-cert nslcd-authority-cert" -PACKAGECONFIG[ibm-hypervisor-cert] = "--enable-ca-cert-extension,," -PACKAGECONFIG[bmcweb-cert] = "--enable-bmcweb-cert-config,," -PACKAGECONFIG[nslcd-authority-cert] = "--enable-nslcd-authority-cert-config,," +PACKAGECONFIG[ibm-hypervisor-cert] = "-Dca-cert-extension=enabled,-Dca-cert-extension=disabled" +PACKAGECONFIG[bmcweb-cert] = "-Dconfig-bmcweb=enabled,-Dconfig-bmcweb=disabled" +PACKAGECONFIG[nslcd-authority-cert] = "-Dconfig-nslcd=enabled,-Dconfig-nslcd=disabled" SYSTEMD_SERVICE:${PN} = " \ phosphor-certificate-manager@.service \ -- cgit v1.2.3 From 587ff2d0b4ea86d98c832be475ef3399ba2d5c05 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Dec 2021 21:00:31 +0000 Subject: openpower-hw-diags: srcrev bump ec227c2cf9..86aa97a508 Ben Tyner (1): attn: Always request a dump for TI with SRC Change-Id: I825811f45c6440ac906137de77d3a270b2fc2879 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6b4b02341..bdd9fa2b5 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" -SRCREV = "ec227c2cf954772403f0a685cb9b600f40ba2c5a" +SRCREV = "86aa97a50808e8358ac8582e2240c6ae50dd2ff1" S = "${WORKDIR}/git" -- cgit v1.2.3 From f8e3a9d9087194af380a6c937d8f5e198ac7708b Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Mon, 13 Dec 2021 11:43:42 -0600 Subject: meta-x86: remove layer This layer has nothing in it. The current direction is for anything architecture specific to end up in meta-phosphor. Remove this "layer" so that it doesn't keep getting copied into new machines. Signed-off-by: Patrick Williams Change-Id: Ied03175589840490bcd1eda8c704c73e224ba9a9 --- meta-inspur/meta-on5263m5/conf/bblayers.conf.sample | 1 - meta-inventec/meta-transformers/conf/bblayers.conf.sample | 1 - meta-quanta/meta-q71l/conf/bblayers.conf.sample | 1 - meta-x86/conf/layer.conf | 6 ------ 4 files changed, 9 deletions(-) delete mode 100644 meta-x86/conf/layer.conf diff --git a/meta-inspur/meta-on5263m5/conf/bblayers.conf.sample b/meta-inspur/meta-on5263m5/conf/bblayers.conf.sample index 6d1e794a0..e95004453 100644 --- a/meta-inspur/meta-on5263m5/conf/bblayers.conf.sample +++ b/meta-inspur/meta-on5263m5/conf/bblayers.conf.sample @@ -14,7 +14,6 @@ BBLAYERS ?= " \ ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-x86 \ ##OEROOT##/meta-inspur \ ##OEROOT##/meta-inspur/meta-on5263m5\ " diff --git a/meta-inventec/meta-transformers/conf/bblayers.conf.sample b/meta-inventec/meta-transformers/conf/bblayers.conf.sample index 783c90e88..6469c50b5 100755 --- a/meta-inventec/meta-transformers/conf/bblayers.conf.sample +++ b/meta-inventec/meta-transformers/conf/bblayers.conf.sample @@ -15,7 +15,6 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-webserver \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-x86 \ ##OEROOT##/meta-openpower \ ##OEROOT##/meta-inventec \ ##OEROOT##/meta-inventec/meta-transformers \ diff --git a/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-quanta/meta-q71l/conf/bblayers.conf.sample index b4411a4e0..2ede49eed 100644 --- a/meta-quanta/meta-q71l/conf/bblayers.conf.sample +++ b/meta-quanta/meta-q71l/conf/bblayers.conf.sample @@ -15,7 +15,6 @@ BBLAYERS ?= " \ ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-x86 \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-q71l \ " diff --git a/meta-x86/conf/layer.conf b/meta-x86/conf/layer.conf deleted file mode 100644 index aab9a63e2..000000000 --- a/meta-x86/conf/layer.conf +++ /dev/null @@ -1,6 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -BBFILE_COLLECTIONS += "obmc_machines_x86" -BBFILE_PATTERN_obmc_machines_x86 = "" -LAYERSERIES_COMPAT_obmc_machines_x86 = "hardknott honister" -- cgit v1.2.3 From 4e4ce6fa6c92c4474e18b1bc4378c1fe5290bee7 Mon Sep 17 00:00:00 2001 From: Andrei Kartashev Date: Thu, 9 Dec 2021 12:46:49 +0300 Subject: obmc-yadro-cli: srcrev bump 76743c3706..ce70f4f732 Alexander Amelkin (6): host: Fix help wording and formatting Fix `health sensors` help Refix 480e20899: Fix double execution of cmds host config default: Remove extra audit diagnostics intrusion: fix/refactor diagnostics intrusion: Add audit logging Alexander Filippov (6): vegman: health: logs: clean: remove rotated logs vegman: heath: logs: clean: remove obsolete logs vegman: bmc: add snmp subcommand Prevent modification of admin and current user vegman: inventory: use lsinventory user: refix preventing rules Artem Senichev (1): Add check for invalid options in BMC/BIOS update Igor Kononenko (4): host virtualmedia: Add more protocols host virtualmedia: Fix RO/RW modes host virtualmedia: Fix mount/umount output host:vm: Support to direct NBD external images Ivan Mikhaylov (3): vegman: intrusion: add intrusion control vegman: led: led refactoring vegman: audit handling change Signed-off-by: Andrei Kartashev Change-Id: I21a8118ec88e0411c42adf2855cdbe96f938cedd --- meta-yadro/recipes-yadro/cli/obmc-yadro-cli_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-cli_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-cli_git.bb index 2564ce38e..2131774d1 100644 --- a/meta-yadro/recipes-yadro/cli/obmc-yadro-cli_git.bb +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-cli_git.bb @@ -14,6 +14,7 @@ RDEPENDS:${PN} = " \ ${VIRTUAL-RUNTIME_base-utils} \ bash \ obmc-yadro-fwupdate \ + obmc-yadro-lsinventory \ obmc-yadro-lssensors \ obmc-yadro-netconfig \ phosphor-debug-collector-dreport \ @@ -42,4 +43,4 @@ do_install() { # Source code repository S = "${WORKDIR}/git" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-cli" -SRCREV = "76743c3706516bae6b2bb8749706b4ea673e9358" +SRCREV = "ce70f4f732114b1989c63792907b84a3f6e91f84" -- cgit v1.2.3 From e06abcd366c0493c449a3842e103609771d9d319 Mon Sep 17 00:00:00 2001 From: Andrei Kartashev Date: Thu, 9 Dec 2021 12:47:22 +0300 Subject: obmc-yadro-fwupdate: srcrev bump 0e3c0714f3..388f4a004e Andrei Kartashev (1): image_intel: use 'bootside' u-boot var Artem Senichev (5): Add integration with UEFI variables service bios: Use YADRO specific path for D-Bus interface Revert "bios: Use YADRO specific path for D-Bus interface" Revert "Add integration with UEFI variables service" vegman: Save/restore MAC addresses of x722 Signed-off-by: Andrei Kartashev Change-Id: Ifd49ddf0e2eb8a7f586cdbca7feb1455a316d993 --- meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb index 161c54bf0..eac6c962c 100644 --- a/meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb @@ -22,5 +22,5 @@ PACKAGECONFIG ??= " obmc-phosphor-image reboot-guard-support " PACKAGECONFIG:append_df-openpower = "openpower-support" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-fwupdate" -SRCREV = "0e3c0714f344a2f7f289c851434955360e6f075b" +SRCREV = "388f4a004e4fe29ee55b964527088714c55f8c70" S = "${WORKDIR}/git" -- cgit v1.2.3 From 6c752719c39e037b9bd8e900f5713314f7685a8b Mon Sep 17 00:00:00 2001 From: Andrei Kartashev Date: Thu, 9 Dec 2021 12:47:47 +0300 Subject: obmc-yadro-lsinventory: srcrev bump d0bdf0ddd1..d8e25f82ff Alexander Filippov (3): Add remote host support use any inventory managers replace json-c with nlohmann/json Signed-off-by: Andrei Kartashev Change-Id: I7b7b9214c909e6b0d147d17339c73c203e78fcb3 --- meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb index 2e66a7d95..0d1a57ab8 100644 --- a/meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb @@ -12,11 +12,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" # Dependencies DEPENDS += " \ - json-c \ + nlohmann-json \ sdbusplus \ " # Source code repository S = "${WORKDIR}/git" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-lsinventory.git" -SRCREV = "d0bdf0ddd192b9d41c5c5d4af9385122b08c7608" +SRCREV = "d8e25f82ff29c7b2c6d1888e9fe28307f173b078" -- cgit v1.2.3 From c5682eccac6d425c5f4e88a7320740ca76488d6a Mon Sep 17 00:00:00 2001 From: Andrei Kartashev Date: Thu, 9 Dec 2021 12:47:57 +0300 Subject: obmc-yadro-lssensors: srcrev bump 39c37655bb..dcaac17c62 Alexander Amelkin (4): Fix alignment for log sensor names Add CLI mode Fix error message for invalid sensor type Fix a typo in commit aabb2cf2b4fcbc09 Signed-off-by: Andrei Kartashev Change-Id: I2075b55bcf9bafd5f94587253916e9b9fcf9210a --- meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb index f202ab89f..3741ed279 100644 --- a/meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb @@ -13,4 +13,4 @@ DEPENDS += "sdbusplus" S = "${WORKDIR}/git" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-lssensors.git" -SRCREV = "39c37655bb777f1876cdddc4b624b38d75105b8e" +SRCREV = "dcaac17c62c9dd21499c4c5e9eb8070f10786560" -- cgit v1.2.3 From 9993f63fd1430ac14ec653493e5f50b478e122f4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Dec 2021 03:31:43 +0000 Subject: pldm: srcrev bump 27403f46db..db4361279b Manojkiran Eda (1): Remove Unnecessary trace in pldm Sagar Srinivas (1): Fix for "Unknown PLDM Entity Type in Numeric Effecter PDR" Change-Id: I1d7b51f9efcc1f207bc36086f92cfcca3e602d0e Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index f62966633..5abed5d90 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 = "27403f46dbd3da33e082340377f671d16faf1b36" +SRCREV = "db4361279b45ad9aa3edf1081204a4d78cfa4fbd" -- cgit v1.2.3 From 4b1630b04cd6b2ab42e21f6ca41142a37377323f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Dec 2021 03:01:13 +0000 Subject: dbus-sensors: srcrev bump 0e68f19968..0b207a624f Andrew Jeffery (3): NVMeSensor: Centralise configuration type NVMeContext: Add the ability to remove NVMeSensors NVMeSensorMain: Remove sensors when removing configs Bruce Mitchell (1): Fixes Units for Temperature & Pressure for Hwmon Lei YU (3): test: Add test_Utils utils: Refactor findFiles() cpusensor: Search in peci-0 directory Change-Id: I18e3088d1c271db5a26a3222b14adb7518a6ccba Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index bcb615ab1..4da518d0c 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 = "0e68f19968f2501701cb53a9a66506c7bc497a05" +SRCREV = "0b207a624f925460797a51974b77b275d4c05e30" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 430eda52b6d5a18588f3ca53e77e1087b0f023c2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Dec 2021 02:20:41 +0000 Subject: bios-settings-mgr: srcrev bump 29656f07b7..47453d77c7 George Liu (4): build: switch to C++20 Update the clang-format file with latest logging: switch to lg2 Fix the String type of pendingAttributes method Change-Id: Id71236d4038f4b515f0b6def41defc2a39857de1 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb index bb433d677..cbb9c8403 100644 --- a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb @@ -13,7 +13,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=bcd9ada3a943f58551867d72893cc9ab" SRC_URI = "git://github.com/openbmc/bios-settings-mgr" -SRCREV = "29656f07b7e81c0bb13ca119b4c6ef62f5e79a18" +SRCREV = "47453d77c728c297a665866c570c2d5fb356abb2" inherit meson pkgconfig systemd -- cgit v1.2.3 From 9721e3d7702b15c8b5b164ab707af082c2c78139 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Dec 2021 23:41:10 +0000 Subject: phosphor-power: srcrev bump a169b0f9d2..d8a8617afa Brandon Wyman (1): psu-ng: Add in handling of specific MFR faults Jim Wright (1): pseq: Find and parse configuaration file Change-Id: If9ab3b53cd1c77ce1a6f51d22fc0601447bd46e9 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 76a179cb4..77425ab0b 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 = "a169b0f9d2d5114729e149c158d518176556b892" +SRCREV = "d8a8617afab828a8c2f047fa90d7ec5a67d869ee" -- cgit v1.2.3 From 691a8e0474d482e2487b7ba29818cbb758bdd2b2 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Mon, 13 Dec 2021 18:00:02 -0600 Subject: meta-phosphor: cmake packages: add pkgconfig With the latest Yocto we see failures: ``` 17:14:36 | CMake Error at /home/jenkins-op/workspace/ci-openbmc/distro/ubuntu/label/docker-builder/target/tiogapass/build/work/arm1176jzs-openbmc-linux-gnueabi/phosphor-ipmi-ipmb/0.1+gitAUTOINC+8227626764-r0/recipe-sysroot-native/usr/share/cmake-3.21/Modules/FindPackageHandleStandardArgs.cmake:230 (message): 17:14:36 | Could NOT find PkgConfig (missing: PKG_CONFIG_EXECUTABLE) ``` Add the correct inherit for ipmb-ipmb. Pre-emptively add for any recipe which does 'inherit cmake'. Signed-off-by: Patrick Williams Change-Id: Ib3327af0f19268d1f5b70259c3445b0985da9fa0 --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb | 2 +- meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb | 2 +- meta-phosphor/recipes-support/cjson/cjson_git.bb | 2 +- meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 1db304c64..5c7e3e0e3 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb @@ -18,5 +18,5 @@ DEPENDS = "sdbusplus \ nlohmann-json" S = "${WORKDIR}/git" -inherit cmake systemd +inherit cmake pkgconfig systemd FILES:${PN} += "/usr/share/ipmbbridge/ipmb-channels.json" diff --git a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb index bfa69e9c3..a0582340b 100644 --- a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb +++ b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb @@ -8,7 +8,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit cmake systemd +inherit cmake pkgconfig systemd inherit obmc-phosphor-ipmiprovider-symlink DEPENDS += " \ diff --git a/meta-phosphor/recipes-support/cjson/cjson_git.bb b/meta-phosphor/recipes-support/cjson/cjson_git.bb index 1b83dd1bc..67512ffe9 100644 --- a/meta-phosphor/recipes-support/cjson/cjson_git.bb +++ b/meta-phosphor/recipes-support/cjson/cjson_git.bb @@ -8,7 +8,7 @@ SRCREV = "cbc05de76fbd4dfff17b5626d5cfe9ec922b1f4a" S = "${WORKDIR}/git" -inherit cmake +inherit cmake pkgconfig FILES:${PN}-dev += "${libdir}/cmake/cJSON/*" 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 cf1d6b136..b7bad6e29 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" -inherit cmake systemd +inherit cmake pkgconfig systemd SRC_URI = "git://github.com/openbmc/peci-pcie" -- cgit v1.2.3 From ff13eace0d73538d561edfdea5d829adfa59ab7b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 11 Dec 2021 03:30:23 +0000 Subject: openpower-proc-control: srcrev bump f9152b91f2..b5fa942a4f Andrew Geissler (1): host-restart: set restart reason on mpreboot Change-Id: Ib24d3217042ca497028375b63eb590d95e8c7961 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 78e0eef84..004956707 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" -SRCREV = "f9152b91f27b3929e5bd147ee79e75fac2019727" +SRCREV = "b5fa942a4fa02fe4500674b32ee16e31e802f1de" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From 70d2b50e0d34c15a58d0fc85725962a111db163d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 11 Dec 2021 01:31:10 +0000 Subject: phosphor-watchdog: srcrev bump 6a54155eab..cf4ce3c171 Willy Tu (1): phosphor-watchdog: Cleanup CodeChecker Errors Change-Id: I01f9edbda8c43933d4e374480cbad90ba8da2848 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb index 4ef5f0cc5..251dc6655 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb @@ -20,7 +20,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "systemd" SRC_URI += "git://github.com/openbmc/phosphor-watchdog" -SRCREV = "6a54155eab9bab579bc9493199a4272676563b5f" +SRCREV = "cf4ce3c171cf222fd5920c173a0b7efadb674fe0" S = "${WORKDIR}/git" EXTRA_OEMESON = " \ -- cgit v1.2.3 From bd6ddaf49c6a885d0624fd27990b2a5de79c7e1b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Dec 2021 16:07:35 -0600 Subject: meta-ibm:witherspoon: remove obmc-ikvm package Witherspoon is running tight on space, and as our primary hardware CI machine, we need to keep it going. The GUI has already been pulled out so the KVM package doesn't make much sense anyway. Tested: - Reduced image size by ~200KB - Will rely on CI to regression test Signed-off-by: Andrew Geissler Change-Id: I3e55702da764e4e1ca1673e158c7acf4f74c9bda --- meta-ibm/conf/machine/witherspoon.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf index 42844c1cc..e71992219 100644 --- a/meta-ibm/conf/machine/witherspoon.conf +++ b/meta-ibm/conf/machine/witherspoon.conf @@ -32,3 +32,5 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \ # Inhibit phosphor-fan-control-fan-config-mrw-native PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \ "phosphor-fan-control-fan-config" + +IMAGE_FEATURES:remove = "obmc-ikvm" -- cgit v1.2.3 From 21f28927c175a417b4e4eaaa5295ee7b572e0009 Mon Sep 17 00:00:00 2001 From: Howard Chiu Date: Thu, 9 Dec 2021 13:33:54 +0800 Subject: meta-bletchley: add phosphor-nvme Use phosphor-nvme to monitor the temperature of NVMe SSD on each sled Signed-off-by: Howard Chiu Change-Id: Ib61dca1742f66b93cab7bee86b27b33cc7dce969 --- .../images/obmc-phosphor-image.bbappend | 1 + .../sensors/phosphor-nvme/nvme_config.json | 36 ++++++++++++++++++++++ .../sensors/phosphor-nvme_%.bbappend | 8 +++++ 3 files changed, 45 insertions(+) create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend new file mode 100644 index 000000000..11096e1c4 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -0,0 +1 @@ +OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-nvme" diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json new file mode 100644 index 000000000..f64382e9c --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json @@ -0,0 +1,36 @@ +{ + "config": [ + { + "NVMeDriveIndex": 0, + "NVMeDriveBusID": 0 + }, + { + "NVMeDriveIndex": 1, + "NVMeDriveBusID": 1 + }, + { + "NVMeDriveIndex": 2, + "NVMeDriveBusID": 2 + }, + { + "NVMeDriveIndex": 3, + "NVMeDriveBusID": 3 + }, + { + "NVMeDriveIndex": 4, + "NVMeDriveBusID": 4 + }, + { + "NVMeDriveIndex": 5, + "NVMeDriveBusID": 5 + } + ], + "threshold": [ + { + "criticalHigh": 75, + "criticalLow": 0, + "maxValue": 127, + "minValue": -127 + } + ] +} diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend new file mode 100644 index 000000000..919cef113 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-nvme_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://nvme_config.json" + +do_install:append() { + install -d ${D}/${sysconfdir}/nvme/ + install -m 0644 ${WORKDIR}/nvme_config.json ${D}/${sysconfdir}/nvme/ +} -- cgit v1.2.3 From 5abb7ee32973c3959f5f498f9f6396017b2f3622 Mon Sep 17 00:00:00 2001 From: Howard Chiu Date: Thu, 9 Dec 2021 13:43:50 +0800 Subject: meta-bletchley: Enable kernel configs for platform-specific devices 1. AST26xx ADC driver 2. AST26xx PWM v14 driver 3. AST26xx Tach driver from Aspeed-linux 4. Enable driver for PHY fixed link 5. HDC1080 humidity sensor driver 6. PCF85363 RTC driver 7. FUSB302 USB-PD PHY driver 8. MP5023 HSC driver 9. DEVMEM driver for early debug purpose Signed-off-by: Howard Chiu Change-Id: Ib87de12cabd5aef4ef8bd25ac3451a1df56d3fc1 --- .../linux/linux-aspeed/bletchley.cfg | 27 ++++++++++++++++++++++ .../recipes-kernel/linux/linux-aspeed_%.bbappend | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/bletchley.cfg create mode 100644 meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed_%.bbappend diff --git a/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/bletchley.cfg b/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/bletchley.cfg new file mode 100644 index 000000000..c77b942a1 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/bletchley.cfg @@ -0,0 +1,27 @@ +# aspeed-pwm driver +CONFIG_HAVE_CLK=y +CONFIG_PWM=y +CONFIG_OF=y +CONFIG_PWM_ASPEED_AST2600=y +# pwm-fan driver +CONFIG_SENSORS_PWM_FAN=y +# aspeed-tach driver +CONFIG_SENSORS_TACH_ASPEED_AST2600=y +# aspeed-adc driver +CONFIG_COMMON_CLK=y +CONFIG_ASPEED_ADC=y +# devmem +CONFIG_DEVMEM=y +# fixed-link feature +CONFIG_PHYLIB=y +CONFIG_FIXED_PHY=y +# humidity and temperature sensor +CONFIG_HDC100X=y +# interposer HSC driver +CONFIG_SENSORS_MP5023=y +# RTC +CONFIG_RTC_DRV_PCF85363=y +# FUSB302 driver +CONFIG_TYPEC=y +CONFIG_TYPEC_TCPM=y +CONFIG_TYPEC_FUSB302=y diff --git a/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..4727bdf73 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:" +SRC_URI += "file://bletchley.cfg" -- cgit v1.2.3 From 5905d41d62ccd752ba38f7c8a4bf2fa9c57a5238 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Thu, 21 Oct 2021 09:10:45 -0700 Subject: Add bbclass to copy license info to /usr/share/www Some products have requirements for the source license info to be made available to users. This adds a bbclass that copies the license info stored in /usr/share/common-licenses to /usr/share/www/common-licenses. From there it is served to users by bmcweb in the existing webassets.hpp functionality. File paths will show users the file content, but directories will only display content in an index.* file. So, the bbclass also creates an index.json for each directory so that directory paths will show users the directory contents. Tested: Navigated to /common-licenses and common-licenses/ and confirmed that the directory listing was displayed. Navigated to /common-licenses/bmcweb and common-licenses/bmcweb/ and confirmed that the directory listing was displayed. Navigated to /common-licenses/bmcweb/LICENSE and confirmed that the license text was displayed. Navigated to /common-licenses/../../network/config.json and it returned "Not Found". Navigated to /common-licenses/../ipmi-providers/channel_access.json and it returned "Not Found". Change-Id: I286b0cf53a9520087b1a57b17ea66f408f08ed3b Signed-off-by: Jason M. Bills --- meta-phosphor/classes/license_static.bbclass | 64 ++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 meta-phosphor/classes/license_static.bbclass diff --git a/meta-phosphor/classes/license_static.bbclass b/meta-phosphor/classes/license_static.bbclass new file mode 100644 index 000000000..dd7301758 --- /dev/null +++ b/meta-phosphor/classes/license_static.bbclass @@ -0,0 +1,64 @@ +#### +# Copyright 2021 Intel Corporation +# +# Add a class to support serving license info through bmcweb. +# +# bmcweb serves static content from the /usr/share/www folder, so this class +# copies the license info from /usr/share/common-licenses to +# /usr/share/www/common-licenses so it will be statically served by bmcweb. +# +# Requires 'COPY_LIC_DIRS' to be enabled to create /usr/share/common-licenses. +# +# Class can be inherited in a project bbclass to copy the license info. +# +# Example: +# inherit license_static +#### + +STATIC_LICENSE_DIR = "${IMAGE_ROOTFS}/usr/share/www/common-licenses" + + +def add_index_html_header(f): + f.write("") + f.write("") + f.write("") + f.write("

") + + +def add_index_html_footer(f): + f.write("

") + f.write("") + f.write("") + + +def create_index_files(d): + import os + + static_license_dir = d.getVar('STATIC_LICENSE_DIR') + for dirpath, dirnames, filenames in os.walk(static_license_dir): + with open(os.path.join(dirpath, "index.html"), "w") as f: + add_index_html_header(f) + full_list = filenames+dirnames + full_list.sort() + f.write("
".join(full_list)) + add_index_html_footer(f) + + +def copy_license_files(d): + import shutil + + rootfs_license_dir = d.getVar('ROOTFS_LICENSE_DIR') + static_license_dir = d.getVar('STATIC_LICENSE_DIR') + shutil.copytree(rootfs_license_dir, static_license_dir) + + +python do_populate_static_lic() { + copy_lic_dirs = d.getVar('COPY_LIC_DIRS') + if copy_lic_dirs == "1": + copy_license_files(d) + create_index_files(d) + else: + bb.warn("Static licenses not copied because 'COPY_LIC_DIRS' is disabled.") +} + +ROOTFS_POSTPROCESS_COMMAND:append = "do_populate_static_lic; " -- cgit v1.2.3 From 683ca00ce8c6c1a177bbde27a4f5c144869fe94a Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 15 Dec 2021 13:12:22 -0600 Subject: sdbus++: remove autotools dependency I'm not sure why this got left around in the Python tools file but it isn't necessary. This repository is using Meson now anyhow. Signed-off-by: Patrick Williams Change-Id: I5399019d8ad3310482fc901e8e6372ea5337c309 --- meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb index e5dbf4b50..6cfa03018 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb @@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 S="${WORKDIR}/git/tools" DEPENDS += " \ - autoconf-archive-native \ ${PYTHON_PN}-inflection-native \ ${PYTHON_PN}-mako-native \ ${PYTHON_PN}-pyyaml-native \ -- cgit v1.2.3 From bdccd86cc18f9dba43fb488797f91d941035254f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 15 Dec 2021 13:51:55 -0800 Subject: meta-google: gbmc-bridge: Fix service permissions Change-Id: I5fc6db2510b9c27d8d2ce27304e0a5e821015fb3 Signed-off-by: William A. Kennington III --- meta-google/recipes-google/networking/gbmc-bridge.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-google/recipes-google/networking/gbmc-bridge.bb b/meta-google/recipes-google/networking/gbmc-bridge.bb index 5f79d468a..509d871d9 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge.bb +++ b/meta-google/recipes-google/networking/gbmc-bridge.bb @@ -101,8 +101,8 @@ do_install() { install -m0755 ${WORKDIR}/gbmc-br-ensure-ra.sh ${D}${libexecdir}/ install -m0755 ${WORKDIR}/gbmc-br-dhcp.sh ${D}${libexecdir}/ install -d -m0755 ${D}${systemd_system_unitdir} - install -m0755 ${WORKDIR}/gbmc-br-ensure-ra.service ${D}${systemd_system_unitdir}/ - install -m0755 ${WORKDIR}/gbmc-br-dhcp.service ${D}${systemd_system_unitdir}/ + install -m0644 ${WORKDIR}/gbmc-br-ensure-ra.service ${D}${systemd_system_unitdir}/ + install -m0644 ${WORKDIR}/gbmc-br-dhcp.service ${D}${systemd_system_unitdir}/ } do_rm_work:prepend() { -- cgit v1.2.3 From 7356f8ebcb6b0e4c06018c748b7c5771b41e007e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 15 Dec 2021 02:21:52 -0800 Subject: meta-google: nftables: Make rule loading atomic This ensures that all of the rules are processed and unexpected packets are not allowed or blocked by the kernel at any time. Change-Id: Ia7bb1d7f604f8ed1bd9759a23e370d20cb0c690d Signed-off-by: William A. Kennington III --- .../ncsi/files/gbmc-ncsi-br-deprecated-ips.sh.in | 2 +- meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in | 4 +--- .../recipes-google/networking/gbmc-bridge/gbmc-br-nft.sh | 4 +--- meta-google/recipes-google/nftables/files/nft-configure.sh | 14 +++++++++----- meta-google/recipes-google/nftables/files/nftables.service | 1 + 5 files changed, 13 insertions(+), 12 deletions(-) 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 677ef28c3..9d9f7899e 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 @@ -88,7 +88,7 @@ EOF else printf '%s' "$nfcontents" >"$rfile" fi - systemctl reset-failed nftables && systemctl --no-block restart nftables || true + systemctl reset-failed nftables && systemctl --no-block reload-or-restart nftables || true } gbmc_ncsi_br_deprecated_ips_hook() { diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in index 30b2b65e4..074ec5785 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in @@ -46,9 +46,7 @@ gbmc_ncsi_nft_update() { mkdir -p -m 755 "$(dirname "$rfile")" printf '%s' "$contents" >"$rfile" - echo 'Restarting nftables' >&2 - systemctl reset-failed nftables - systemctl --no-block restart nftables + systemctl reset-failed nftables && systemctl --no-block reload-or-restart nftables || true } gbmc_ncsi_nft_hook() { 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 980f7b6d6..ca4e15a1f 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 @@ -37,9 +37,7 @@ gbmc_br_nft_update() { mkdir -p -m 755 "$(dirname "$rfile")" printf '%s' "$contents" >"$rfile" - echo 'Restarting nftables' >&2 - systemctl reset-failed nftables - systemctl --no-block restart nftables + systemctl reset-failed nftables && systemctl --no-block reload-or-restart nftables || true } gbmc_br_nft_hook() { diff --git a/meta-google/recipes-google/nftables/files/nft-configure.sh b/meta-google/recipes-google/nftables/files/nft-configure.sh index 05bb23d8b..8c8e058b7 100644 --- a/meta-google/recipes-google/nftables/files/nft-configure.sh +++ b/meta-google/recipes-google/nftables/files/nft-configure.sh @@ -8,10 +8,14 @@ for dir in /run/nftables /etc/nftables /usr/share/nftables; do done let i+=1 done -rc=0 -nft flush ruleset || rc=$? + +rules="" +trap 'rm -f -- "$rules"' TERM INT EXIT ERR +rules="$(mktemp)" || exit +echo 'flush ruleset' >"$rules" for key in $(printf "%s\n" "${!basemap[@]}" | sort -r); do - echo "Executing ${basemap[$key]}" >&2 - nft -f "${basemap[$key]}" || rc=$? + echo "Loading ${basemap[$key]}" >&2 + echo '' >>"$rules" + cat "${basemap[$key]}" >>"$rules" done -exit $rc +nft -f "$rules" || exit diff --git a/meta-google/recipes-google/nftables/files/nftables.service b/meta-google/recipes-google/nftables/files/nftables.service index 770a3d3ac..1a93812b8 100644 --- a/meta-google/recipes-google/nftables/files/nftables.service +++ b/meta-google/recipes-google/nftables/files/nftables.service @@ -5,6 +5,7 @@ Before=network-pre.target Type=oneshot RemainAfterExit=yes ExecStart=/usr/libexec/nft-configure.sh +ExecReload=/usr/libexec/nft-configure.sh ExecStop=/usr/sbin/nft flush ruleset [Install] -- cgit v1.2.3 From c2d043808ea75c3ca1a9e476bd5f64636ed53a88 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Dec 2021 12:51:40 +0000 Subject: phosphor-virtual-sensor: srcrev bump b57d737081..05b1d41788 Rashmica Gupta (1): thresholds: Update Severity to be a string Change-Id: I95ea44a8fbaeaca4a97f728c1b2931e1bac9c510 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 25c499875..621f33673 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -16,7 +16,7 @@ DEPENDS += "nlohmann-json" DEPENDS += "exprtk" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" -SRCREV = "b57d7370815015ce8f04be16cee39c45b0770355" +SRCREV = "05b1d41788058cdf255ce1d46b2ff8041abf5656" S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "phosphor-virtual-sensor.service" -- cgit v1.2.3 From cd92b83260b660c8df5a7c047885ef1c79b8fe99 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Tue, 14 Dec 2021 13:06:22 +0000 Subject: meta-ampere: mtjade: fru: use dynamic sensors Change to use dynamic sensors for FRU support to take advantage of IPMI fru read/write commands. Tested: 1. Check FRU reading $ ipmitool fru print 2. Write fru.bin into FRU EEPROM Signed-off-by: Thang Q. Nguyen Signed-off-by: Thang Tran Change-Id: I0d0b52ae7b0fd301a14d0d2894268637d867a5b8 --- .../ipmi/phosphor-ipmi-fru_%.bbappend | 9 + .../configuration/mtjade-yaml-config.bb | 19 +- .../mtjade-yaml-config/ipmi-sensors-mtjade.yaml | 399 --------------------- .../mtjade-ipmi-fru-properties.yaml | 23 -- .../mtjade-yaml-config/mtjade-ipmi-fru.yaml | 85 ----- .../mtjade-yaml-config/mtjade-ipmi-sensors.yaml | 399 +++++++++++++++++++++ .../obmc/eeproms/system/chassis/motherboard | 2 - .../ipmi/phosphor-ipmi-fru_%.bbappend | 26 -- .../ipmi/phosphor-ipmi-host_%.bbappend | 16 +- 9 files changed, 422 insertions(+), 556 deletions(-) create mode 100644 meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/ipmi-sensors-mtjade.yaml delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml create mode 100644 meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-sensors.yaml delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend diff --git a/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..75177dce1 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +inherit obmc-phosphor-systemd + +HOSTIPMI_PROVIDER_LIBRARY:remove = "libstrgfnhandler.so" + +do_install:append () { + rm -rf ${D}${libdir}/ipmid-providers +} diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb index c9f27020f..376ebc075 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb @@ -5,27 +5,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch SRC_URI = " \ - file://ipmi-sensors-${MACHINE}.yaml \ - file://mtjade-ipmi-fru.yaml \ - file://mtjade-ipmi-fru-properties.yaml \ + file://mtjade-ipmi-sensors.yaml \ " S = "${WORKDIR}" do_install() { - install -m 0644 -D ipmi-sensors-${MACHINE}.yaml \ - ${D}${datadir}/${BPN}/ipmi-sensors-${MACHINE}.yaml - cat mtjade-ipmi-fru.yaml > fru-read.yaml - install -m 0644 -D mtjade-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 mtjade-ipmi-sensors.yaml \ + ${D}${datadir}/${BPN}/ipmi-sensors.yaml } FILES:${PN}-dev = " \ - ${datadir}/${BPN}/ipmi-sensors-${MACHINE}.yaml \ - ${datadir}/${BPN}/ipmi-extra-properties.yaml \ - ${datadir}/${BPN}/ipmi-fru-read.yaml \ - " + ${datadir}/${BPN}/ipmi-sensors.yaml \ + " ALLOW_EMPTY:${PN} = "1" diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/ipmi-sensors-mtjade.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/ipmi-sensors-mtjade.yaml deleted file mode 100644 index 959f353f3..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/ipmi-sensors-mtjade.yaml +++ /dev/null @@ -1,399 +0,0 @@ -1: &TEMP_DEFAULTS - bExp: 0 - entityID: 30 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 255: - type: double - multiplierM: 1 - mutability: Mutability::Write|Mutability::Read - offsetB: 0 - path: /xyz/openbmc_project/sensors/temperature/TS1_Temp - rExp: 0 - readingType: readingData - sensorNamePattern: nameLeaf - sensorReadingType: 1 - sensorType: 1 - serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -2: - <<: *TEMP_DEFAULTS - entityInstance: 2 - path: /xyz/openbmc_project/sensors/temperature/TS2_Temp -3: - <<: *TEMP_DEFAULTS - entityInstance: 3 - path: /xyz/openbmc_project/sensors/temperature/TS3_Temp -4: - <<: *TEMP_DEFAULTS - entityInstance: 4 - path: /xyz/openbmc_project/sensors/temperature/TS4_Temp -5: - <<: *TEMP_DEFAULTS - entityInstance: 5 - path: /xyz/openbmc_project/sensors/temperature/TS5_Temp -6: - <<: *TEMP_DEFAULTS - entityInstance: 6 - path: /xyz/openbmc_project/sensors/temperature/TS6_Temp -243: - <<: *TEMP_DEFAULTS - entityInstance: 58 - path: /xyz/openbmc_project/sensors/temperature/PSU0_TEMP -244: - <<: *TEMP_DEFAULTS - entityInstance: 59 - path: /xyz/openbmc_project/sensors/temperature/PSU1_TEMP - -37: &FAN_DEFAULTS - entityID: 29 - entityInstance: 13 - sensorType: 4 - path: /xyz/openbmc_project/sensors/fan_tach/FAN3_1 - sensorReadingType: 1 - multiplierM: 100 - offsetB: 0 - rExp: 0 - unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS - mutability: Mutability::Write|Mutability::Read - serviceInterface: org.freedesktop.DBus.Properties - readingType: readingData - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 0x0: - type: double - -40: - <<: *FAN_DEFAULTS - entityInstance: 16 - path: /xyz/openbmc_project/sensors/fan_tach/FAN3_2 -43: - <<: *FAN_DEFAULTS - entityInstance: 19 - path: /xyz/openbmc_project/sensors/fan_tach/FAN4_1 -46: - <<: *FAN_DEFAULTS - entityInstance: 22 - path: /xyz/openbmc_project/sensors/fan_tach/FAN4_2 -49: - <<: *FAN_DEFAULTS - entityInstance: 25 - path: /xyz/openbmc_project/sensors/fan_tach/FAN5_1 -52: - <<: *FAN_DEFAULTS - entityInstance: 28 - path: /xyz/openbmc_project/sensors/fan_tach/FAN5_2 -55: - <<: *FAN_DEFAULTS - entityInstance: 31 - path: /xyz/openbmc_project/sensors/fan_tach/FAN6_1 -58: - <<: *FAN_DEFAULTS - entityInstance: 34 - path: /xyz/openbmc_project/sensors/fan_tach/FAN6_2 -61: - <<: *FAN_DEFAULTS - entityInstance: 37 - path: /xyz/openbmc_project/sensors/fan_tach/FAN7_1 -64: - <<: *FAN_DEFAULTS - entityInstance: 40 - path: /xyz/openbmc_project/sensors/fan_tach/FAN7_2 -67: - <<: *FAN_DEFAULTS - entityInstance: 43 - path: /xyz/openbmc_project/sensors/fan_tach/FAN8_1 -70: - <<: *FAN_DEFAULTS - entityInstance: 46 - path: /xyz/openbmc_project/sensors/fan_tach/FAN8_2 -245: - <<: *FAN_DEFAULTS - entityInstance: 60 - path: /xyz/openbmc_project/sensors/fan_tach/PSU0_fan1 -246: - <<: *FAN_DEFAULTS - entityInstance: 61 - path: /xyz/openbmc_project/sensors/fan_tach/PSU1_fan1 - -73: &VOLTAGE_DEFAULTS - entityID: 0x13 - entityInstance: 9 - sensorType: 0x02 - path: /xyz/openbmc_project/sensors/voltage/S0_0V8_VDDC_SOC - sensorReadingType: 0x01 - multiplierM: 5 - offsetB: 0 - bExp: 0 - unit: xyz.openbmc_project.Sensor.Value.Unit.Volts - rExp: -3 - serviceInterface: org.freedesktop.DBus.Properties - readingType: readingData - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 0xFF: - type: double -74: - <<: *VOLTAGE_DEFAULTS - entityInstance: 11 - multiplierM: 7 - path: /xyz/openbmc_project/sensors/voltage/S0_0V75_PCP -75: - <<: *VOLTAGE_DEFAULTS - entityInstance: 13 - multiplierM: 7 - path: /xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ0123 -76: - <<: *VOLTAGE_DEFAULTS - entityInstance: 15 - multiplierM: 4 - path: /xyz/openbmc_project/sensors/voltage/S0_0V6_VTT0123 -77: - <<: *VOLTAGE_DEFAULTS - entityInstance: 17 - multiplierM: 15 - path: /xyz/openbmc_project/sensors/voltage/S0_2V5_VPP0123 -78: - <<: *VOLTAGE_DEFAULTS - entityInstance: 19 - multiplierM: 7 - path: /xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ4567 -79: - <<: *VOLTAGE_DEFAULTS - entityInstance: 21 - multiplierM: 4 - path: /xyz/openbmc_project/sensors/voltage/S0_0V6_VTT4567 -80: - <<: *VOLTAGE_DEFAULTS - entityInstance: 23 - multiplierM: 15 - path: /xyz/openbmc_project/sensors/voltage/S0_2V5_VPP4567 -81: - <<: *VOLTAGE_DEFAULTS - entityInstance: 25 - multiplierM: 5 - path: /xyz/openbmc_project/sensors/voltage/S0_0V85_RCA -82: - <<: *VOLTAGE_DEFAULTS - entityInstance: 27 - multiplierM: 11 - path: /xyz/openbmc_project/sensors/voltage/S0_1V8_VDDH -83: - <<: *VOLTAGE_DEFAULTS - entityInstance: 29 - multiplierM: 9 - path: /xyz/openbmc_project/sensors/voltage/S0_1V5_VDDH -84: - <<: *VOLTAGE_DEFAULTS - entityInstance: 31 - multiplierM: 11 - path: /xyz/openbmc_project/sensors/voltage/S0_1V8_SOC -85: - <<: *VOLTAGE_DEFAULTS - entityInstance: 33 - multiplierM: 11 - path: /xyz/openbmc_project/sensors/voltage/S0_1V8_PCP -86: - <<: *VOLTAGE_DEFAULTS - entityInstance: 35 - multiplierM: 20 - path: /xyz/openbmc_project/sensors/voltage/S0_3V3_SOC - -87: - <<: *VOLTAGE_DEFAULTS - entityInstance: 10 - multiplierM: 5 - path: /xyz/openbmc_project/sensors/voltage/S1_0V8_VDDC_SOC -88: - <<: *VOLTAGE_DEFAULTS - entityInstance: 12 - multiplierM: 7 - path: /xyz/openbmc_project/sensors/voltage/S1_0V75_PCP -89: - <<: *VOLTAGE_DEFAULTS - entityInstance: 14 - multiplierM: 7 - path: /xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ0123 -90: - <<: *VOLTAGE_DEFAULTS - entityInstance: 16 - multiplierM: 4 - path: /xyz/openbmc_project/sensors/voltage/S1_0V6_VTT0123 -91: - <<: *VOLTAGE_DEFAULTS - entityInstance: 18 - multiplierM: 15 - path: /xyz/openbmc_project/sensors/voltage/S1_2V5_VPP0123 -92: - <<: *VOLTAGE_DEFAULTS - entityInstance: 20 - multiplierM: 7 - path: /xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ4567 -93: - <<: *VOLTAGE_DEFAULTS - entityInstance: 22 - multiplierM: 4 - path: /xyz/openbmc_project/sensors/voltage/S1_0V6_VTT4567 -94: - <<: *VOLTAGE_DEFAULTS - entityInstance: 24 - multiplierM: 15 - path: /xyz/openbmc_project/sensors/voltage/S1_2V5_VPP4567 -95: - <<: *VOLTAGE_DEFAULTS - entityInstance: 26 - multiplierM: 5 - path: /xyz/openbmc_project/sensors/voltage/S1_0V85_RCA -96: - <<: *VOLTAGE_DEFAULTS - entityInstance: 28 - multiplierM: 11 - path: /xyz/openbmc_project/sensors/voltage/S1_1V8_VDDH -97: - <<: *VOLTAGE_DEFAULTS - entityInstance: 30 - multiplierM: 9 - path: /xyz/openbmc_project/sensors/voltage/S1_1V5_VDDH -98: - <<: *VOLTAGE_DEFAULTS - entityInstance: 32 - multiplierM: 11 - path: /xyz/openbmc_project/sensors/voltage/S1_1V8_SOC -99: - <<: *VOLTAGE_DEFAULTS - entityInstance: 34 - multiplierM: 11 - path: /xyz/openbmc_project/sensors/voltage/S1_1V8_PCP -100: - <<: *VOLTAGE_DEFAULTS - entityInstance: 36 - multiplierM: 20 - path: /xyz/openbmc_project/sensors/voltage/S1_3V3_SOC -101: - <<: *VOLTAGE_DEFAULTS - entityInstance: 37 - multiplierM: 20 - path: /xyz/openbmc_project/sensors/voltage/3V3_SB -102: - <<: *VOLTAGE_DEFAULTS - entityInstance: 38 - multiplierM: 18 - path: /xyz/openbmc_project/sensors/voltage/VBAT_RTC -230: - <<: *VOLTAGE_DEFAULTS - entityInstance: 74 - multiplierM: 18 - rExp: -1 - path: /xyz/openbmc_project/sensors/voltage/PSU0_VINPUT -231: - <<: *VOLTAGE_DEFAULTS - entityInstance: 75 - multiplierM: 18 - rExp: -1 - path: /xyz/openbmc_project/sensors/voltage/PSU1_VINPUT -232: - <<: *VOLTAGE_DEFAULTS - entityInstance: 76 - multiplierM: 18 - rExp: -2 - path: /xyz/openbmc_project/sensors/voltage/PSU0_VOUTPUT -233: - <<: *VOLTAGE_DEFAULTS - entityInstance: 77 - multiplierM: 18 - rExp: -2 - path: /xyz/openbmc_project/sensors/voltage/PSU1_VOUTPUT - -240: &power - sensorType: 0x08 - path: /xyz/openbmc_project/sensors/power/PSU0_POUTPUT - entityID: 19 - entityInstance: 84 - sensorReadingType: 0x01 - multiplierM: 80 - offsetB: 0 - bExp: 0 - unit: xyz.openbmc_project.Sensor.Value.Unit.Watts - rExp: -1 - serviceInterface: org.freedesktop.DBus.Properties - readingType: readingData - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 0xFF: - type: double - -241: - <<: *power - entityInstance: 85 - multiplierM: 80 - rExp: -1 - path: /xyz/openbmc_project/sensors/power/PSU1_POUTPUT - -242: - <<: *power - entityInstance: 57 - multiplierM: 80 - rExp: -1 - path: /xyz/openbmc_project/sensors/power/total_power - -238: - <<: *power - entityInstance: 82 - multiplierM: 80 - rExp: -1 - path: /xyz/openbmc_project/sensors/power/PSU0_PINPUT - -239: - <<: *power - entityInstance: 83 - multiplierM: 80 - rExp: -1 - path: /xyz/openbmc_project/sensors/power/PSU1_PINPUT - -234: ¤t - sensorType: 0x03 - path: /xyz/openbmc_project/sensors/current/PSU0_IINPUT - entityID: 19 - entityInstance: 78 - sensorReadingType: 0x01 - multiplierM: 80 - offsetB: 0 - bExp: 0 - unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes - rExp: -3 - serviceInterface: org.freedesktop.DBus.Properties - readingType: readingData - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 0xFF: - type: double - -235: - <<: *current - entityInstance: 79 - multiplierM: 80 - path: /xyz/openbmc_project/sensors/current/PSU1_IINPUT - -236: - <<: *current - entityInstance: 80 - multiplierM: 80 - path: /xyz/openbmc_project/sensors/current/PSU0_IOUTPUT - -237: - <<: *current - entityInstance: 81 - multiplierM: 80 - path: /xyz/openbmc_project/sensors/current/PSU1_IOUTPUT diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml deleted file mode 100644 index db8de9f40..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml +++ /dev/null @@ -1,23 +0,0 @@ -/system/chassis/motherboard: - 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: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system: - 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-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml index 80bcce434..e69de29bb 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml @@ -1,85 +0,0 @@ -0x00: - /system/chassis/motherboard: - entityID: 7 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item.NetworkInterface: - MACAddress: - IPMIFruProperty: Custom Field 1 - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Decorator.VendorInformation: - CustomField1: - IPMIFruProperty: FRU File ID - IPMIFruSection: Board - xyz.openbmc_project.Common.UUID: - UUID: - IPMIFruProperty: UUID - IPMIFruSection: MultiRecord - /system/chassis: - entityID: 23 - entityInstance: 1 - 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: - CustomField2: - IPMIFruProperty: Custom Field 1 - IPMIFruSection: Chassis - /system: - entityID: 7 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - PartNumber: - IPMIFruProperty: Model Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.AssetTag: - AssetTag: - IPMIFruProperty: Asset Tag - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.VendorInformation: - CustomField1: - IPMIFruProperty: FRU File ID - IPMIFruSection: Product - CustomField2: - IPMIFruProperty: Custom Field 1 - IPMIFruSection: Product diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-sensors.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-sensors.yaml new file mode 100644 index 000000000..959f353f3 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-sensors.yaml @@ -0,0 +1,399 @@ +1: &TEMP_DEFAULTS + bExp: 0 + entityID: 30 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/TS1_Temp + rExp: 0 + readingType: readingData + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +2: + <<: *TEMP_DEFAULTS + entityInstance: 2 + path: /xyz/openbmc_project/sensors/temperature/TS2_Temp +3: + <<: *TEMP_DEFAULTS + entityInstance: 3 + path: /xyz/openbmc_project/sensors/temperature/TS3_Temp +4: + <<: *TEMP_DEFAULTS + entityInstance: 4 + path: /xyz/openbmc_project/sensors/temperature/TS4_Temp +5: + <<: *TEMP_DEFAULTS + entityInstance: 5 + path: /xyz/openbmc_project/sensors/temperature/TS5_Temp +6: + <<: *TEMP_DEFAULTS + entityInstance: 6 + path: /xyz/openbmc_project/sensors/temperature/TS6_Temp +243: + <<: *TEMP_DEFAULTS + entityInstance: 58 + path: /xyz/openbmc_project/sensors/temperature/PSU0_TEMP +244: + <<: *TEMP_DEFAULTS + entityInstance: 59 + path: /xyz/openbmc_project/sensors/temperature/PSU1_TEMP + +37: &FAN_DEFAULTS + entityID: 29 + entityInstance: 13 + sensorType: 4 + path: /xyz/openbmc_project/sensors/fan_tach/FAN3_1 + sensorReadingType: 1 + multiplierM: 100 + offsetB: 0 + rExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0x0: + type: double + +40: + <<: *FAN_DEFAULTS + entityInstance: 16 + path: /xyz/openbmc_project/sensors/fan_tach/FAN3_2 +43: + <<: *FAN_DEFAULTS + entityInstance: 19 + path: /xyz/openbmc_project/sensors/fan_tach/FAN4_1 +46: + <<: *FAN_DEFAULTS + entityInstance: 22 + path: /xyz/openbmc_project/sensors/fan_tach/FAN4_2 +49: + <<: *FAN_DEFAULTS + entityInstance: 25 + path: /xyz/openbmc_project/sensors/fan_tach/FAN5_1 +52: + <<: *FAN_DEFAULTS + entityInstance: 28 + path: /xyz/openbmc_project/sensors/fan_tach/FAN5_2 +55: + <<: *FAN_DEFAULTS + entityInstance: 31 + path: /xyz/openbmc_project/sensors/fan_tach/FAN6_1 +58: + <<: *FAN_DEFAULTS + entityInstance: 34 + path: /xyz/openbmc_project/sensors/fan_tach/FAN6_2 +61: + <<: *FAN_DEFAULTS + entityInstance: 37 + path: /xyz/openbmc_project/sensors/fan_tach/FAN7_1 +64: + <<: *FAN_DEFAULTS + entityInstance: 40 + path: /xyz/openbmc_project/sensors/fan_tach/FAN7_2 +67: + <<: *FAN_DEFAULTS + entityInstance: 43 + path: /xyz/openbmc_project/sensors/fan_tach/FAN8_1 +70: + <<: *FAN_DEFAULTS + entityInstance: 46 + path: /xyz/openbmc_project/sensors/fan_tach/FAN8_2 +245: + <<: *FAN_DEFAULTS + entityInstance: 60 + path: /xyz/openbmc_project/sensors/fan_tach/PSU0_fan1 +246: + <<: *FAN_DEFAULTS + entityInstance: 61 + path: /xyz/openbmc_project/sensors/fan_tach/PSU1_fan1 + +73: &VOLTAGE_DEFAULTS + entityID: 0x13 + entityInstance: 9 + sensorType: 0x02 + path: /xyz/openbmc_project/sensors/voltage/S0_0V8_VDDC_SOC + sensorReadingType: 0x01 + multiplierM: 5 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + rExp: -3 + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double +74: + <<: *VOLTAGE_DEFAULTS + entityInstance: 11 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S0_0V75_PCP +75: + <<: *VOLTAGE_DEFAULTS + entityInstance: 13 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ0123 +76: + <<: *VOLTAGE_DEFAULTS + entityInstance: 15 + multiplierM: 4 + path: /xyz/openbmc_project/sensors/voltage/S0_0V6_VTT0123 +77: + <<: *VOLTAGE_DEFAULTS + entityInstance: 17 + multiplierM: 15 + path: /xyz/openbmc_project/sensors/voltage/S0_2V5_VPP0123 +78: + <<: *VOLTAGE_DEFAULTS + entityInstance: 19 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ4567 +79: + <<: *VOLTAGE_DEFAULTS + entityInstance: 21 + multiplierM: 4 + path: /xyz/openbmc_project/sensors/voltage/S0_0V6_VTT4567 +80: + <<: *VOLTAGE_DEFAULTS + entityInstance: 23 + multiplierM: 15 + path: /xyz/openbmc_project/sensors/voltage/S0_2V5_VPP4567 +81: + <<: *VOLTAGE_DEFAULTS + entityInstance: 25 + multiplierM: 5 + path: /xyz/openbmc_project/sensors/voltage/S0_0V85_RCA +82: + <<: *VOLTAGE_DEFAULTS + entityInstance: 27 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S0_1V8_VDDH +83: + <<: *VOLTAGE_DEFAULTS + entityInstance: 29 + multiplierM: 9 + path: /xyz/openbmc_project/sensors/voltage/S0_1V5_VDDH +84: + <<: *VOLTAGE_DEFAULTS + entityInstance: 31 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S0_1V8_SOC +85: + <<: *VOLTAGE_DEFAULTS + entityInstance: 33 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S0_1V8_PCP +86: + <<: *VOLTAGE_DEFAULTS + entityInstance: 35 + multiplierM: 20 + path: /xyz/openbmc_project/sensors/voltage/S0_3V3_SOC + +87: + <<: *VOLTAGE_DEFAULTS + entityInstance: 10 + multiplierM: 5 + path: /xyz/openbmc_project/sensors/voltage/S1_0V8_VDDC_SOC +88: + <<: *VOLTAGE_DEFAULTS + entityInstance: 12 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S1_0V75_PCP +89: + <<: *VOLTAGE_DEFAULTS + entityInstance: 14 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ0123 +90: + <<: *VOLTAGE_DEFAULTS + entityInstance: 16 + multiplierM: 4 + path: /xyz/openbmc_project/sensors/voltage/S1_0V6_VTT0123 +91: + <<: *VOLTAGE_DEFAULTS + entityInstance: 18 + multiplierM: 15 + path: /xyz/openbmc_project/sensors/voltage/S1_2V5_VPP0123 +92: + <<: *VOLTAGE_DEFAULTS + entityInstance: 20 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ4567 +93: + <<: *VOLTAGE_DEFAULTS + entityInstance: 22 + multiplierM: 4 + path: /xyz/openbmc_project/sensors/voltage/S1_0V6_VTT4567 +94: + <<: *VOLTAGE_DEFAULTS + entityInstance: 24 + multiplierM: 15 + path: /xyz/openbmc_project/sensors/voltage/S1_2V5_VPP4567 +95: + <<: *VOLTAGE_DEFAULTS + entityInstance: 26 + multiplierM: 5 + path: /xyz/openbmc_project/sensors/voltage/S1_0V85_RCA +96: + <<: *VOLTAGE_DEFAULTS + entityInstance: 28 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S1_1V8_VDDH +97: + <<: *VOLTAGE_DEFAULTS + entityInstance: 30 + multiplierM: 9 + path: /xyz/openbmc_project/sensors/voltage/S1_1V5_VDDH +98: + <<: *VOLTAGE_DEFAULTS + entityInstance: 32 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S1_1V8_SOC +99: + <<: *VOLTAGE_DEFAULTS + entityInstance: 34 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S1_1V8_PCP +100: + <<: *VOLTAGE_DEFAULTS + entityInstance: 36 + multiplierM: 20 + path: /xyz/openbmc_project/sensors/voltage/S1_3V3_SOC +101: + <<: *VOLTAGE_DEFAULTS + entityInstance: 37 + multiplierM: 20 + path: /xyz/openbmc_project/sensors/voltage/3V3_SB +102: + <<: *VOLTAGE_DEFAULTS + entityInstance: 38 + multiplierM: 18 + path: /xyz/openbmc_project/sensors/voltage/VBAT_RTC +230: + <<: *VOLTAGE_DEFAULTS + entityInstance: 74 + multiplierM: 18 + rExp: -1 + path: /xyz/openbmc_project/sensors/voltage/PSU0_VINPUT +231: + <<: *VOLTAGE_DEFAULTS + entityInstance: 75 + multiplierM: 18 + rExp: -1 + path: /xyz/openbmc_project/sensors/voltage/PSU1_VINPUT +232: + <<: *VOLTAGE_DEFAULTS + entityInstance: 76 + multiplierM: 18 + rExp: -2 + path: /xyz/openbmc_project/sensors/voltage/PSU0_VOUTPUT +233: + <<: *VOLTAGE_DEFAULTS + entityInstance: 77 + multiplierM: 18 + rExp: -2 + path: /xyz/openbmc_project/sensors/voltage/PSU1_VOUTPUT + +240: &power + sensorType: 0x08 + path: /xyz/openbmc_project/sensors/power/PSU0_POUTPUT + entityID: 19 + entityInstance: 84 + sensorReadingType: 0x01 + multiplierM: 80 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts + rExp: -1 + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +241: + <<: *power + entityInstance: 85 + multiplierM: 80 + rExp: -1 + path: /xyz/openbmc_project/sensors/power/PSU1_POUTPUT + +242: + <<: *power + entityInstance: 57 + multiplierM: 80 + rExp: -1 + path: /xyz/openbmc_project/sensors/power/total_power + +238: + <<: *power + entityInstance: 82 + multiplierM: 80 + rExp: -1 + path: /xyz/openbmc_project/sensors/power/PSU0_PINPUT + +239: + <<: *power + entityInstance: 83 + multiplierM: 80 + rExp: -1 + path: /xyz/openbmc_project/sensors/power/PSU1_PINPUT + +234: ¤t + sensorType: 0x03 + path: /xyz/openbmc_project/sensors/current/PSU0_IINPUT + entityID: 19 + entityInstance: 78 + sensorReadingType: 0x01 + multiplierM: 80 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + rExp: -3 + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +235: + <<: *current + entityInstance: 79 + multiplierM: 80 + path: /xyz/openbmc_project/sensors/current/PSU1_IINPUT + +236: + <<: *current + entityInstance: 80 + multiplierM: 80 + path: /xyz/openbmc_project/sensors/current/PSU0_IOUTPUT + +237: + <<: *current + entityInstance: 81 + multiplierM: 80 + path: /xyz/openbmc_project/sensors/current/PSU1_IOUTPUT diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard deleted file mode 100644 index f0498347b..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard +++ /dev/null @@ -1,2 +0,0 @@ -SYSFS_PATH=/sys/bus/i2c/devices/3-0050/eeprom -FRUID=0 diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend deleted file mode 100644 index 5150e2312..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ /dev/null @@ -1,26 +0,0 @@ -inherit obmc-phosphor-systemd - -DEPENDS:append:mtjade = " mtjade-yaml-config" - -EXTRA_OECONF:mtjade = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-extra-properties.yaml \ - " -FILESEXTRAPATHS:prepend:mtjade := "${THISDIR}/${PN}:" - -EEPROM_NAMES = "motherboard" - -EEPROMFMT = "system/chassis/{0}" -EEPROM_ESCAPEDFMT = "system-chassis-{0}" -EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" -EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" - -ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" - -TMPL = "obmc-read-eeprom@.service" -TGT = "multi-user.target" -INSTFMT = "obmc-read-eeprom@{0}.service" -FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" - -SYSTEMD_LINK:${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index fce5b74eb..04fff3d63 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" -DEPENDS:append:mtjade = " mtjade-yaml-config" +DEPENDS:append = " ${MACHINE}-yaml-config" RRECOMMENDS:${PN} += "ipmitool" RDEPENDS:${PN} += "bash" @@ -10,14 +10,16 @@ SRC_URI += " \ file://ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service \ " -EXTRA_OECONF:mtjade = " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-sensors-${MACHINE}.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \ - " +EXTRA_OECONF = " \ + SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/${MACHINE}-yaml-config/ipmi-sensors.yaml \ + " AMPERE_SOFTPOWEROFF_TMPL = "ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" -do_install:append:mtjade(){ +PACKAGECONFIG:append = " dynamic-sensors" +HOSTIPMI_PROVIDER_LIBRARY += "libdynamiccmds.so" + +do_install:append(){ install -d ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host install -m 0755 ${WORKDIR}/ampere-phosphor-softpoweroff ${D}/${bindir}/phosphor-softpoweroff -- cgit v1.2.3 From 8ce4c743e388fa026078119bac0e2740252c7d38 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Dec 2021 20:30:39 +0000 Subject: phosphor-certificate-manager: srcrev bump bb939ea45d..e0e2cce95a Patrick Williams (4): certificate: openssl3: switch to EVP_PKEY_eq certs_manager: switch keygen to support openssl-3 build: remove autotools build: rename config.h source Change-Id: I34db8c34c8ff3acabcaf5550d35f35c9c76452f4 Signed-off-by: Andrew Geissler --- .../recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 30be5a3bf..55c2413c0 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "bb939ea45d53b2dbb7ab6b03856f023f82beecd5" +SRCREV = "e0e2cce95a5fad8431d4c40f81519447af8e701f" inherit meson pkgconfig systemd -- cgit v1.2.3 From adf3f4248c2ecf1ef44f945a1f2284dde5b3586b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Dec 2021 17:30:58 +0000 Subject: bmcweb: srcrev bump df5415fc03..5187e09b89 Alpana Kumari (1): Add Spare Part Number for Chassis Ed Tanous (3): Make timer system use boost Deduplicate doAccept code Implement connection limit Jayaprakash Mutyala (1): Fix - RedFish response for non-manufacturing mode Josh Lehan (1): error_messages: Use int64_t in invalidIndex Nan Zhou (2): fix the year 2038 problem in getDateTime Change DateOffset from Z to +00:00 Patrick Williams (3): hostlogger_test.py: reformat with black ssl_key_handler: use OpenSSL 3.0 API for keygen ssl_key_handler: support OpenSSL 3.0 for key verification Change-Id: I9c57381b1bbe75f4533add4f2609b1882bfb7a86 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index f10936b07..18a8720b2 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "df5415fc03b458eedfcb07a6be262d1067a50aec" +SRCREV = "5187e09b891b9d0f12c76736caaa062120fd19f7" S = "${WORKDIR}/git" -- cgit v1.2.3 From bed4864c20956195ee8bce74c726d4fc4bc22fff Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Dec 2021 19:51:28 +0000 Subject: phosphor-power: srcrev bump d8a8617afa..391a069004 Brandon Wyman (1): psu-ng: gtest cleanup expectation warnings Change-Id: I1d824b0d2205703c697a679326affb945507aa3f Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 77425ab0b..477498d90 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 = "d8a8617afab828a8c2f047fa90d7ec5a67d869ee" +SRCREV = "391a0690043baafbe96b7962a3e843101c53fcb7" -- cgit v1.2.3 From 387bf1b4850269be757b1317ab7fc5ff17170f34 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Dec 2021 12:10:37 +0000 Subject: openpower-proc-control: srcrev bump b5fa942a4f..db92472533 rajerpp1 (2): PHAL: Fixing wrong callout of reference target PHAL: Clock error handling support Change-Id: I1c5aebbf467aaffd55b2b847ecc1bf467721bf65 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 004956707..a0dd2bab2 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" -SRCREV = "b5fa942a4fa02fe4500674b32ee16e31e802f1de" +SRCREV = "db92472533b150dfbe7e60489b47cfc4791ec11c" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From cadd0bab18a09ea04bb322445b99a29c5100eba1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Dec 2021 05:21:24 +0000 Subject: pldm: srcrev bump db4361279b..6a4d1cf836 Andrew Geissler (1): ibm: bios for auto poweron control Varsha Kaverappa (1): PLDM BIOS attr enum return error if byte value is 2 Change-Id: I0005425883fc4e116a2491cb95034f17f325afad Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 5abed5d90..3589c3e0a 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 = "db4361279b45ad9aa3edf1081204a4d78cfa4fbd" +SRCREV = "6a4d1cf836f2bf291890d56ad5d071f205ea3ef0" -- cgit v1.2.3 From 66224aee4991e38657ca91c0a00a02902507eb78 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Dec 2021 13:31:25 +0000 Subject: telemetry: srcrev bump b8cc78ddf9..3e2cc9d497 Szymon Dompke (1): Update subprojects versions Change-Id: Ic47543e033f0aaa60df7dc862b222021c0f1f806 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 0cff5121c..11562d3ca 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "b8cc78ddf9cc87c83176c7bda575ceef2678d00f" +SRCREV = "3e2cc9d4978cf8f8bab4384dfd2b4996d95040fe" S = "${WORKDIR}/git" -- cgit v1.2.3 From 0eed037386a3b318d01abab0b9d3a21509240f58 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Dec 2021 03:30:33 +0000 Subject: sdbusplus: srcrev bump ce62764d6c..55949c29ad Krzysztof Grobelny (1): Used erased type to reduce binary for getProperty Change-Id: Ie90a03628170d8ee71dbb238b5037288c8ceddba Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 1528740c7..3d9a9e8ce 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" -SRCREV = "ce62764d6c0a72ec88eb433e1afd05b751225971" +SRCREV = "55949c29adbf88b05acc62ef972de7b5c6a21a4a" -- cgit v1.2.3 From ba62239f1252ea1c6f58b834fc2d65466b44712a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Dec 2021 18:30:40 +0000 Subject: entity-manager: srcrev bump a9c5892927..1e8e71f23f Bruce Mitchell (1): Cleanup of code to pass CI, clang-tidy-13 Kumar Thangavel (1): Move global variable powerIsOn to local variable. Change-Id: I7807945f34d6a5aabeb2eda0cc8851ffad83f096 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 43c37bded..0a2350341 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "a9c589292720d62047eaefd6aa3a148a9ad4c506" +SRCREV = "1e8e71f23fb4c686da5f2c9451e320b08637f15a" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From 3b1f413e9b4864e43f1aed539e5a65a7f190c74e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Dec 2021 20:51:55 +0000 Subject: x86-power-control: srcrev bump 85e111ed69..c46ebb493f Jason M. Bills (1): Change to lg2 Change-Id: Ie95d80ed73a9f45b39156b11087f89487329f98b Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 93b745fb6..36b557e25 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" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "85e111ed6940491b6fe40cc5054ef021a1404e19" +SRCREV = "c46ebb493f0e0cc1ccc5525d5484465bba69551f" PV = "1.0+git${SRCPV}" -- cgit v1.2.3 From 8430dc0bd1a247a45a16513d8ff7186940ea758b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Dec 2021 00:00:47 +0000 Subject: phosphor-fan-presence: srcrev bump 323694a9d8..075fcd858f Matthew Barth (22): control:p10bmc: Update DVFS temp events control:p10bmc: Add decrease parameter to DVFS temp events control:p10bmc: Create 2s fan control timer loop event control:p10bmc:ibm,rainier-2u: Add increase actions for OCC temps control:p10bmc:ibm,rainier-4u: Add increase actions for OCC temps control:p10bmc:ibm,rainier-1s4u: Add increase actions for OCC temps control:p10bmc:ibm,everest: Add increase actions for OCC temps control:p10bmc:ibm,rainier-2u: Add decrease actions for OCC temps control:p10bmc:ibm,rainier-4u: Add decrease actions for OCC temps control:p10bmc:ibm,rainier-1s4u: Add decrease actions for OCC temps control:p10bmc:ibm,everest: Add decrease actions for OCC temps control:p10bmc:ibm,rainier-2u: Add increase action for NVMe temps control:p10bmc:ibm,rainier-4u: Add increase action for NVMe temps control:p10bmc:ibm,rainier-1s4u: Add increase action for NVMe temps control:p10bmc:ibm,everest: Add increase action for NVMe temps control:p10bmc:ibm,rainier-2u: Add decrease action for NVMe temps control:p10bmc:ibm,rainier-4u: Add decrease action for NVMe temps control:p10bmc:ibm,rainier-1s4u: Add decrease action for NVMe temps control:p10bmc:ibm,everest: Add decrease action for NVMe temps control:p10bmc: Remove NVMe temps when removed from dbus control:p10bmc:ibm,rainier-2u: Set `default_floor` = `poweron_target` control:p10bmc: Increase/decrease actions for planar temps Change-Id: If229f2304628e9f8fdbfc0ea983c953f54f1aea8 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index e6f260b6c..a24626f4f 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" -SRCREV = "323694a9d8611405e93acb50ba5ba729cc580056" +SRCREV = "075fcd858f1bfb4ba8ca5cc41526495bf3df166a" -- cgit v1.2.3 From 503e474891dc20f56ebc0e1f213f80e8149e7329 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Dec 2021 19:50:46 +0000 Subject: phosphor-bmc-code-mgmt: Add USB code update option George Liu (5): usb: Initialize USB Code Update usb: Copy image file to /tmp/images via USB usb: Add utility for D-Bus usb: Update the RequestedActivation property usb: Add service and rules files Change-Id: Ic1d290120c7050b419ce146fbdc14febef7814e8 Signed-off-by: Andrew Geissler Signed-off-by: Adriana Kobylak --- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc | 2 +- .../recipes-phosphor/flash/phosphor-software-manager_git.bb | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index b701d887d..832818c13 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 = "0890ab94539f682450c0e9ac86bcbb6c8ee067d4" +SRCREV = "6d775e6448b57f42099ce71ebef41ed1c19c5479" 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 f51319adf..da308bcc8 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -14,6 +14,7 @@ SOFTWARE_MGR_PACKAGES = " \ ${PN}-updater-ubi \ ${PN}-updater-mmc \ ${PN}-sync \ + ${PN}-usb \ " PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}" ALLOW_EMPTY:${PN} = "1" @@ -28,6 +29,7 @@ PACKAGECONFIG[verify_signature] = " \ -Dverify-full-signature=enabled, \ -Dverify-full-signature=disabled" PACKAGECONFIG[sync_bmc_files] = "-Dsync-bmc-files=enabled, -Dsync-bmc-files=disabled" +PACKAGECONFIG[usb_code_update] = "-Dusb-code-update=enabled, -Dusb-code-update=disabled, cli11" PACKAGECONFIG[ubifs_layout] = "-Dbmc-layout=ubi" PACKAGECONFIG[mmc_layout] = "-Dbmc-layout=mmc" PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled" @@ -67,6 +69,10 @@ FILES:${PN}-sync += " \ ${bindir}/phosphor-sync-software-manager \ ${sysconfdir}/synclist \ " +FILES:${PN}-usb += "\ + ${base_libdir}/udev/rules.d/70-bmc-usb.rules \ + ${bindir}/phosphor-usb-code-update \ + " DBUS_SERVICE:${PN}-version += "xyz.openbmc_project.Software.Version.service" DBUS_SERVICE:${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service" DBUS_SERVICE:${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service" @@ -81,6 +87,7 @@ SYSTEMD_SERVICE:${PN}-updater += " \ " SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}" +SYSTEMD_SERVICE:${PN}-usb += "${@bb.utils.contains('PACKAGECONFIG', 'usb_code_update', 'usb-code-update@.service', '', d)}" S = "${WORKDIR}/git" -- cgit v1.2.3 From 85ae4e180f18b3f90f813d0c59ef4e14e2449af5 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Dec 2021 22:51:10 +0000 Subject: smbios-mdr: srcrev bump 631388e621..5f2d627553 Alex Schendel (1): Add FW Version in journalctl log Change-Id: Ibf9f8279fdf8f1f1eaa8cf30bb0b9947e16220e6 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb index a0582340b..945637d54 100644 --- a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb +++ b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb @@ -28,7 +28,7 @@ EXTRA_OECMAKE = "-DYOCTO=ON" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/smbios-mdr.git" -SRCREV = "631388e621abad855abbe4abbfb20111da9056f1" +SRCREV = "5f2d627553b6d8fbe4472eb0c15cbff6bc2888d3" SYSTEMD_SERVICE:${PN} += "smbios-mdrv2.service" SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'cpuinfo', 'xyz.openbmc_project.cpuinfo.service', '', d)}" -- cgit v1.2.3 From a4eff2b29a151626d856341d808f27b4d646f420 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Dec 2021 23:20:55 +0000 Subject: phosphor-host-ipmid: srcrev bump 778f65973b..6619ae4683 Chalapathi Venkataramashetty (2): sensorcommands: check for reserved sensor number in sensor commands. sensorcommands:Platform Event Message command corrected Johnathan Mantey (2): Make sensor/sdr list commands work on systems with > 255 sensors Improve SDR sensor number mapping for sensor nums above 510 Change-Id: I4e0a2a9c922cef031a3e9e82416734d9c131627e Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 288f1fb96..dcd673367 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 = "778f65973b544fe04520fe03d5613f333fc4d1dd" +SRCREV = "6619ae468393d362638b525cfd927b1a2c125727" -- cgit v1.2.3 From 0b8e81620307cff80cbfe00d7d7da4ff2b02a2e4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Dec 2021 09:51:04 +0000 Subject: phosphor-snmp: srcrev bump d560529eb7..7350c77aa6 Chicago Duan (1): SNMPTrap: SNMPTrap address support hostname Change-Id: Iaa61540ba43d700a7fc57c3902b2afb0b81a5166 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb index 9f5c0b262..10ce8944a 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb @@ -12,7 +12,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/phosphor-snmp" -SRCREV = "d560529eb7e22c0b78fb0def20f57c6f35be9dfe" +SRCREV = "7350c77aa635cff08c5f1ee32e10679de7c5afda" DBUS_SERVICE:${PN} += "xyz.openbmc_project.Network.SNMP.service" -- cgit v1.2.3 From 8defc8bd7832988f59f9b80976eba2c5eb5c556b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Dec 2021 03:41:13 +0000 Subject: phosphor-post-code-manager: srcrev bump 9ce5a645f5..c4440ebefb Manojkiran Eda (2): Drop experimental::filesystem Fix unused variables error Change-Id: I757a4e07f579df1fb121afc76e2ff7963ab70297 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d5d81f8ba..28c835aeb 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." SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git" -SRCREV = "9ce5a645f50c0ab94e582abbf95474f636aba678" +SRCREV = "c4440ebefb36d4c2eebd3d0bdf0ce4671f04a158" S = "${WORKDIR}/git" -- cgit v1.2.3 From 30d141b171846d0f148ea2f68e4fa0cd98636631 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 14 Dec 2021 13:50:39 +0000 Subject: phosphor-buttons: srcrev bump 8381d5aa35..dd5495cf40 Naveen Moses (1): Enable group gpio configuration Change-Id: I6fa93ca2858132b2181d62a04bf8cf86bf4f8713 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c1b56ea09..2a7e349c6 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/phosphor-buttons.git" -SRCREV = "8381d5aa3525e15f1e4bd1f3a5af815107716872" +SRCREV = "dd5495cf40d5911fb9ad04acc6689ae8af054524" inherit cmake pkgconfig systemd -- cgit v1.2.3 From ddcc9b08d0bf3ef0e66681534549bb2b952ee115 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Dec 2021 21:21:05 +0000 Subject: bmcweb: srcrev bump 5187e09b89..b24483809a Ed Tanous (1): Remove unused header Change-Id: Ia86298c1df9807aca9de15610357c6d349fd68e9 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 18a8720b2..e1ee05b4e 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "5187e09b891b9d0f12c76736caaa062120fd19f7" +SRCREV = "b24483809a127e792bff97ec903e4c9d96960d00" S = "${WORKDIR}/git" -- cgit v1.2.3 From ad8a30cba53f55c8d529150fdf02fdc20d15d8ab Mon Sep 17 00:00:00 2001 From: Manojkiran Eda Date: Sun, 12 Dec 2021 15:44:38 +0530 Subject: post-code-manager : Switch to meson build system & Bump Tested By: Was able to sucessfully build post-code-manager using meson & was able to see that the daemon is working as before on a BMC. Signed-off-by: Manojkiran Eda Change-Id: I4cf90fc8bf0a3350b944d5ef94fa131cb6f1c35f --- .../state/phosphor-post-code-manager_%.bbappend | 4 ++-- .../recipes-phosphor/state/phosphor-post-code-manager_git.bb | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend index bee5a5ffa..e9f35d42d 100644 --- a/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend @@ -1,4 +1,4 @@ # Set MaxBootCycleCount to 5 on IBM systems -EXTRA_OECMAKE:append:p10bmc = "-DMAX_BOOT_CYCLE_COUNT=5" -EXTRA_OECMAKE:append:witherspoon-tacoma = "-DMAX_BOOT_CYCLE_COUNT=5" +EXTRA_OEMESON:append:p10bmc = "-Dmax-boot-cycle-count=5" +EXTRA_OEMESON:append:witherspoon-tacoma = "-Dmax-boot-cycle-count=5" 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 28c835aeb..9551f5c57 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." SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git" -SRCREV = "c4440ebefb36d4c2eebd3d0bdf0ce4671f04a158" +SRCREV = "84855abe9efea81f2ed8cf025892a7400edc9d74" S = "${WORKDIR}/git" @@ -13,14 +13,15 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit cmake pkgconfig systemd +inherit meson pkgconfig systemd def get_service(d): + service_list = "xyz.openbmc_project.State.Boot.PostCode.service xyz.openbmc_project.State.Boot.PostCode@.service " if(d.getVar('OBMC_HOST_INSTANCES') == '0'): - return "xyz.openbmc_project.State.Boot.PostCode.service" + return service_list else: - return " ".join(["xyz.openbmc_project.State.Boot.PostCode@{}.service".format(x) for x in d.getVar('OBMC_HOST_INSTANCES').split()]) + return service_list+" ".join(["xyz.openbmc_project.State.Boot.PostCode@{}.service".format(x) for x in d.getVar('OBMC_HOST_INSTANCES').split()]) SYSTEMD_SERVICE:${PN} = "${@get_service(d)}" @@ -28,7 +29,6 @@ DEPENDS += " \ sdbusplus \ phosphor-dbus-interfaces \ phosphor-logging \ + libcereal \ " -FILES:${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode@.service" -FILES:${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode.service" -- cgit v1.2.3 From e96820d5379bf9ca80ace325f9a1ec9e51cc3c66 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Fri, 17 Dec 2021 02:24:24 +0000 Subject: meta-ampere: mtjade: Add more Host firmware support Add support SCP firmware update with checking if the ampere_fru_upgrade available to execute the update. This commit also supports 2nd Host SPI-NOR update ability. Tested: 1. Manually copy ampere_fru_upgrade to the /usr/sbin folder and run SCP firmware update via Redfish. 2. Flash UEFI firmware update on the secondary Host SPI-NOR. Signed-off-by: Thang Q. Nguyen Change-Id: Ic335ee2d21625239c3df1937ed5333708233845b --- .../0001-flashcp-support-offset-option.patch | 141 -------------------- .../recipes-devtools/mtd/mtd-utils_%.bbappend | 3 - meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 - .../recipes-ampere/flash/ampere-flash-utils.bb | 2 + .../ampere-flash-utils/ampere_firmware_upgrade.sh | 144 +++++++++++++++++++++ .../flash/ampere-flash-utils/ampere_flash_bios.sh | 31 ++++- 6 files changed, 170 insertions(+), 152 deletions(-) delete mode 100644 meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch delete mode 100644 meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend create mode 100755 meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_firmware_upgrade.sh diff --git a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch b/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch deleted file mode 100644 index 0edae05f8..000000000 --- a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 32c17dd886a5b506781b86c6227bb059ce33420b Mon Sep 17 00:00:00 2001 -From: Tung Nguyen -Date: Sun, 5 Sep 2021 09:22:08 +0000 -Subject: [PATCH] flashcp support offset option - -The flashcp command from mtd-utils just support to flash from offset 0. -Add offset option to specify the start offset so that firmware can be -flashed correctly - -Signed-off-by: Tung Nguyen ---- - misc-utils/flashcp.c | 50 +++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 47 insertions(+), 3 deletions(-) - -diff --git a/misc-utils/flashcp.c b/misc-utils/flashcp.c -index 341c210..0a0e75b 100644 ---- a/misc-utils/flashcp.c -+++ b/misc-utils/flashcp.c -@@ -91,7 +91,7 @@ static NORETURN void showusage(bool error) - "\n" - "Flash Copy - Written by Abraham van der Merwe \n" - "\n" -- "usage: %1$s [ -v | --verbose | -A | --erase-all ] \n" -+ "usage: %1$s [ -v | --verbose | -A | --erase-all ] \n" - " %1$s -h | --help\n" - " %1$s -V | --version\n" - "\n" -@@ -102,6 +102,7 @@ static NORETURN void showusage(bool error) - " -V | --version Show version information and exit\n" - " File which you want to copy to flash\n" - " Flash device to write to (e.g. /dev/mtd0, /dev/mtd1, etc.)\n" -+ " The start offset. Optional, default: 0\n" - "\n", - PROGRAM_NAME); - -@@ -156,6 +157,16 @@ static void safe_rewind (int fd,const char *filename) - } - } - -+static int safe_rewind_offset(int fd, const char *filename, off_t offset) -+{ -+ if (lseek(fd, offset, SEEK_SET) < 0) { -+ log_printf(LOG_ERROR, "While seeking to start of %s: %m\n", filename); -+ return EXIT_FAILURE; -+ } -+ -+ return EXIT_SUCCESS; -+} -+ - /******************************************************************************/ - - static int dev_fd = -1,fil_fd = -1; -@@ -169,6 +180,8 @@ static void cleanup (void) - int main (int argc,char *argv[]) - { - const char *filename = NULL,*device = NULL; -+ off_t offset; -+ - int i,flags = FLAG_NONE; - ssize_t result; - size_t size,written; -@@ -225,6 +238,20 @@ int main (int argc,char *argv[]) - showusage(true); - } - } -+ -+ if (optind + 3 == argc) { -+ flags |= FLAG_FILENAME; -+ filename = argv[optind]; -+ DEBUG("Got filename: %s\n", filename); -+ -+ flags |= FLAG_DEVICE; -+ device = argv[optind + 1]; -+ DEBUG("Got device: %s\n", device); -+ -+ offset = strtoul(argv[optind + 2], NULL, 16); -+ DEBUG("Got offset: 0x%x\n", offset); -+ } -+ - if (optind+2 == argc) { - flags |= FLAG_FILENAME; - filename = argv[optind]; -@@ -233,6 +260,8 @@ int main (int argc,char *argv[]) - flags |= FLAG_DEVICE; - device = argv[optind+1]; - DEBUG("Got device: %s\n",device); -+ -+ offset = 0; - } - - if (flags & FLAG_HELP || device == NULL) -@@ -264,6 +293,12 @@ int main (int argc,char *argv[]) - exit (EXIT_FAILURE); - } - -+ /* does offset is out of the mtd */ -+ if (offset > mtd.size) { -+ log_printf(LOG_ERROR, "%s offset won't fit into %s!\n", offset, device); -+ exit(EXIT_FAILURE); -+ } -+ - /* diff block flashcp */ - if (flags & FLAG_PARTITION) - { -@@ -284,6 +319,8 @@ int main (int argc,char *argv[]) - } - else - { -+ /* Erase from the offset */ -+ erase.start = offset; - erase.length = (filestat.st_size + mtd.erasesize - 1) / mtd.erasesize; - erase.length *= mtd.erasesize; - } -@@ -330,6 +367,12 @@ int main (int argc,char *argv[]) - size = filestat.st_size; - i = BUFSIZE; - written = 0; -+ -+ /* if offset is greater than 0 */ -+ if (offset) -+ if (safe_rewind_offset(dev_fd, device, offset) != EXIT_SUCCESS) -+ return EXIT_FAILURE; -+ - while (size) - { - if (size < BUFSIZE) i = size; -@@ -374,8 +417,9 @@ int main (int argc,char *argv[]) - * verify that flash == file data * - **********************************/ - -- safe_rewind (fil_fd,filename); -- safe_rewind (dev_fd,device); -+ safe_rewind(fil_fd, filename); -+ safe_rewind_offset(dev_fd, device, offset); -+ - size = filestat.st_size; - i = BUFSIZE; - written = 0; --- -2.25.1 - diff --git a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend b/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend deleted file mode 100644 index 6f3e20319..000000000 --- a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-flashcp-support-offset-option.patch " diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 633efa012..ede176ad0 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -32,7 +32,6 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ ampere-flash-utils \ ampere-mac-update \ mtjade-gpio-config \ - mtd-utils \ ampere-platform-init \ ampere-ipmi-oem \ " diff --git a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb index 241070c4e..844709b91 100644 --- a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb +++ b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils.bb @@ -9,6 +9,7 @@ RDEPENDS:${PN} = "bash" DEPENDS = "zlib" SRC_URI += "\ + file://ampere_firmware_upgrade.sh \ file://ampere_flash_bios.sh \ " @@ -19,5 +20,6 @@ LDFLAGS += "-L ${ROOT}/usr/lib/ -lz " do_install:append() { install -d ${D}/usr/sbin + install -m 0755 ${WORKDIR}/ampere_firmware_upgrade.sh ${D}/${sbindir}/ampere_firmware_upgrade.sh install -m 0755 ${S}/ampere_flash_bios.sh ${D}/${sbindir}/ampere_flash_bios.sh } diff --git a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_firmware_upgrade.sh b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_firmware_upgrade.sh new file mode 100755 index 000000000..130682d12 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_firmware_upgrade.sh @@ -0,0 +1,144 @@ +#!/bin/bash + +do_fru_upgrade() { + FRU_DEVICE="/sys/bus/i2c/devices/3-0050/eeprom" + + if ! command -v ampere_fru_upgrade; + then + echo "Bypass fru update as no ampere_fru_upgrade available" + exit + fi + ampere_fru_upgrade -d $FRU_DEVICE -f "$IMAGE" + + systemctl restart xyz.openbmc_project.FruDevice.service + systemctl restart phosphor-ipmi-host.service +} + +do_smpmpro_upgrade() { + I2C_BUS_DEV="1" + EEPROM_ADDR="0x50" + + if ! command -v ampere_eeprom_prog; + then + echo "Bypass SCP firmware update as no ampere_eeprom_prog available" + exit + fi + echo "SECPRO mode: $SECPRO" + # Turn off the Host if it is currently ON + chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}') + echo "Current Chassis State: $chassisstate" + if [ "$chassisstate" == 'On' ]; + then + echo "Turning the Chassis off" + obmcutil chassisoff + sleep 15 + # Check if HOST was OFF + chassisstate_off=$(obmcutil chassisstate | awk -F. '{print $NF}') + if [ "$chassisstate_off" == 'On' ]; + then + echo "Error : Failed turning the Chassis off" + exit + fi + fi + + if [[ $SECPRO == 1 ]]; then + # 3 is S0_SPECIAL_BOOT + gpioset 0 3=1 + # 66 is S1_SPECIAL_BOOT + gpioset 0 66=1 + fi + + # Switch EEPROM control to BMC AST2500 I2C + # 226 is BMC_GPIOAC2_SPI0_PROGRAM_SEL + gpioset 0 226=0 + + # 08 is BMC_GPIOB0_I2C_BACKUP_SEL + if [[ $DEV_SEL == 1 ]]; then + echo "Run update primary Boot EEPROM" + gpioset 0 8=1 # Main EEPROM + elif [[ $DEV_SEL == 2 ]]; then + echo "Run update secondary Boot EEPROM" + gpioset 0 8=0 # Second EEPROM + else + echo "Please choose Main (1) or Second EEPROM (2)" + exit 0 + fi + + # Write Firmware to EEPROM and read back for validation + ampere_eeprom_prog -b $I2C_BUS_DEV -s $EEPROM_ADDR -p -f "$IMAGE" + + # Switch EEPROM control to Host + # 08 is BMC_GPIOB0_I2C_BACKUP_SEL + gpioset 0 8=1 + # 226 is BMC_GPIOAC2_SPI0_PROGRAM_SEL + gpioset 0 226=1 + + if [ "$chassisstate" == 'On' ]; + then + sleep 5 + echo "Turn on the Host" + obmcutil poweron + fi + + # Deassert SECPRO GPIO PINs + if [[ $SECPRO == 1 ]]; then + chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}') + if [ "$chassisstate_off" == 'Off' ]; then + obmcutil poweron + fi + + sleep 30s + echo "De-asserting special GPIO PINs" + # 3 is S0_SPECIAL_BOOT + gpioset 0 3=0 + # 66 is S1_SPECIAL_BOOT + gpioset 0 66=0 + fi +} + + +if [ $# -eq 0 ]; then + echo "Usage:" + echo " $(basename "$0") [SECPRO]" + echo "Where:" + echo " : smpmpro or fru" + echo " If Type is smpmpro, 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 + +TYPE=$1 +IMAGE=$2 +if [ -z "$3" ] +then + DEV_SEL="1" # by default, select Main image +else + DEV_SEL=$3 +fi + +SECPRO=0 +if [ -n "$4" ]; then + if [[ "$4" == "1" ]]; then + SECPRO=1 + fi +fi + +MANIFEST="$(echo "$IMAGE" | cut -d'/' -f-4)/MANIFEST" +if [ -f "$MANIFEST" ]; then + echo "MANIFEST: $MANIFEST" + if grep -qF "SECPRO" "$MANIFEST"; then + SECPRO=1 + fi +fi + +# Restrict to flash failover in case of SECPRO +if [ $SECPRO == 1 ] && [ "$DEV_SEL" == 2 ]; then + echo "Not allow to flash the failover with SECPRO image" + exit +fi + +if [[ $TYPE == "smpmpro" ]]; then + do_smpmpro_upgrade +elif [[ $TYPE == "fru" ]]; then + do_fru_upgrade +fi diff --git a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh index b7f4bc52e..b13e4b50a 100755 --- a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh +++ b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh @@ -15,10 +15,8 @@ # limitations under the License. do_flash () { - OFFSET=$1 - # Check the PNOR partition available - HOST_MTD=$(< /proc/mtd grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') + HOST_MTD=$(< /proc/mtd grep "pnor-uefi" | sed -n 's/^\(.*\):.*/\1/p') if [ -z "$HOST_MTD" ]; then # If the PNOR partition is not available, then bind again driver @@ -26,7 +24,7 @@ do_flash () { echo 1e630000.spi > /sys/bus/platform/drivers/aspeed-smc/bind sleep 2 - HOST_MTD=$(< /proc/mtd grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') + HOST_MTD=$(< /proc/mtd grep "pnor-uefi" | sed -n 's/^\(.*\):.*/\1/p') if [ -z "$HOST_MTD" ]; then echo "Fail to probe Host SPI-NOR device" @@ -34,8 +32,8 @@ do_flash () { fi fi - echo "--- Flashing firmware to @/dev/$HOST_MTD offset=$OFFSET" - flashcp -v "$IMAGE" /dev/"$HOST_MTD" "$OFFSET" + echo "--- Flashing firmware to @/dev/$HOST_MTD" + flashcp -v "$IMAGE" /dev/"$HOST_MTD" } @@ -50,6 +48,12 @@ if [ ! -f "$IMAGE" ]; then exit 1 fi +if [ -z "$2" ]; then + DEV_SEL="1" # by default, select primary device +else + DEV_SEL="$2" +fi + # Turn off the Host if it is currently ON chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}') echo "--- Current Chassis State: $chassisstate" @@ -74,8 +78,21 @@ if ! gpioset 0 226=0; then exit 1 fi +# Switch the host SPI bus (between primary and secondary) +# 227 is BMC_SPI0_BACKUP_SEL +if [[ $DEV_SEL == 1 ]]; then + echo "Run update primary Host SPI-NOR" + gpioset 0 227=0 # Primary SPI +elif [[ $DEV_SEL == 2 ]]; then + echo "Run update secondary Host SPI-NOR" + gpioset 0 227=1 # Second SPI +else + echo "Please choose primary SPI (1) or second SPI (2)" + exit 0 +fi + # Flash the firmware -do_flash 0x400000 +do_flash # Switch the host SPI bus to HOST." echo "--- Switch the host SPI bus to HOST." -- cgit v1.2.3 From ff93ed36473a00d679821ab3a414fa5b8f97abfc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 27 Sep 2021 15:54:14 -0500 Subject: run openpower-debug-collector after stop instructions openpower-debug-collector may end up requesting a SBE or hostboot dump. Ensure that if stop-instruction is also scheduled in the same systemd target, that we first stop instruction to get the hardware in a known state and then start the dump collection. Signed-off-by: Andrew Geissler Change-Id: I1156a20b16545ff42e20d4a8e3fc1089786ba605 --- .../openpower-debug-collector-watchdog@.service | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service index 6fc3fec82..6826764ff 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service @@ -1,6 +1,7 @@ [Unit] Description=OpenPOWER debug data collector for host watchdog timeout Before=obmc-host-quiesce@%i.target +After=op-stop-instructions@%i.service [Service] ExecStart=/usr/bin/env watchdog_timeout -- cgit v1.2.3 From 0932fc35681047902f9ee29427e61aa24cb71ba5 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 17 Dec 2021 06:58:25 -0600 Subject: meta-facebook: fb-ipmi-oem: add pkgconfig This is required by newer versions of Yocto. Signed-off-by: Patrick Williams Change-Id: I7011bb03b3a384903f44154d2ea2a8f283afd237 --- meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5dc4a60c7..e76e94bbb 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -12,7 +12,7 @@ PV = "0.1+git${SRCPV}" DEPENDS = "boost phosphor-ipmi-host phosphor-logging systemd " -inherit cmake obmc-phosphor-ipmiprovider-symlink +inherit cmake pkgconfig obmc-phosphor-ipmiprovider-symlink EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1" EXTRA_OECMAKE:append:yosemitev2 = " -DBIC=1" -- cgit v1.2.3 From d61a093b752603013878e23219fcca489bc14067 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 15 Dec 2021 21:28:40 -0600 Subject: meta-phosphor: x86-power-control: change URL protocol to https We should never use 'protocol=ssh' on a Github SRC_URI because it means that only people with a valid SSH key loaded in Github can build the code (ie. no anonymous users). This is bad for CI-type builds. Signed-off-by: Patrick Williams Change-Id: I4713ed1759f548aee5b97d2f789e9f37892c9360 --- meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 36b557e25..424ad28de 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" -SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" +SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=https" SRCREV = "c46ebb493f0e0cc1ccc5525d5484465bba69551f" PV = "1.0+git${SRCPV}" @@ -33,4 +33,4 @@ DEPENDS += " \ sdbusplus \ phosphor-logging \ " -FILES:${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.Chassis.Control.Power@.service" \ No newline at end of file +FILES:${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.Chassis.Control.Power@.service" -- cgit v1.2.3 From b389cd92e2ec0361a6a7d7244ca9c06c1ee46665 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 15 Dec 2021 21:34:22 -0600 Subject: meta-phosphor: prefer https protocol A few recipes are specifying 'protocol=git' to the git-fetcher, which is already the default[1]. For github URLs, upstream Yocto / OE suggest that 'protocol=https' is used[2]. Switch any URL that has a protocol specified to be 'https' instead of 'git'. 1. https://docs.yoctoproject.org/bitbake/bitbake-user-manual/bitbake-user-manual-fetching.html#git-fetcher-git 2. https://lists.openembedded.org/g/openembedded-devel/message/94255 Signed-off-by: Patrick Williams Change-Id: Ibf1ab0fa2cb83c8cb9f4e535a0781f41e3b0dafe --- meta-phosphor/conf/distro/include/phosphor-base.inc | 2 +- meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb | 2 +- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb | 2 +- meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb | 2 +- meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb | 2 +- meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 64f293cf0..1de312f19 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -32,7 +32,7 @@ https://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" # The CONNECTIVITY_CHECK_URI's are used to test whether we can successfully # fetch from the network (and warn you if not). To disable the test set # the variable to be empty. -# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master +# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=https;rev=master CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" SANITY_TESTED_DISTROS ?= " \ 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 cf3f7ad12..cdeba6516 100644 --- a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb @@ -14,7 +14,7 @@ DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" -SRC_URI = "git://github.com/openbmc/phosphor-health-monitor.git;protocol=git" +SRC_URI = "git://github.com/openbmc/phosphor-health-monitor.git;protocol=https" SRCREV = "f5151879326e36880ddf2c46fe8c539ce721b0d6" S = "${WORKDIR}/git" 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 73fea8ad4..a5459c88f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb @@ -20,6 +20,6 @@ DEPENDS += "sdbusplus" DEPENDS += "cli11" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/ssifbridge.git;protocol=git;branch=master" +SRC_URI = "git://github.com/openbmc/ssifbridge.git;protocol=https;branch=master" SRCREV= "2c2b8280584d05d16a4d0c180be8c3a6ee37aec2" 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 6c10cb7c5..a80b3e7e8 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 @@ -21,7 +21,7 @@ DEPENDS += " \ systemd \ " -SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=git" +SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=https" SRCREV = "87e3fcf439f2b943272365e1d294984f39bb52b8" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index 7928b2bcd..d9749a636 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -14,7 +14,7 @@ DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" -SRC_URI = "git://github.com/openbmc/phosphor-nvme.git;protocol=git" +SRC_URI = "git://github.com/openbmc/phosphor-nvme.git;protocol=https" SRCREV = "5022a4ee5cd4d3eaeabc4e991507e71b35b26a16" S = "${WORKDIR}/git" 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 621f33673..5465d7038 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" DEPENDS += "exprtk" -SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" +SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=https" SRCREV = "05b1d41788058cdf255ce1d46b2ff8041abf5656" S = "${WORKDIR}/git" -- cgit v1.2.3 From 5f94596675fcf3e670ab14e39b44b67e2bf0d740 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Dec 2021 20:50:48 +0000 Subject: phosphor-certificate-manager: srcrev bump e0e2cce95a..cf811c4309 Nan Zhou (1): remove year 2038 check Change-Id: I762f5294dddcd9b499975492e870cea30d129e25 Signed-off-by: Andrew Geissler --- .../recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 55c2413c0..ab49637a4 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "e0e2cce95a5fad8431d4c40f81519447af8e701f" +SRCREV = "cf811c4309adbf164f6e040ea0216dbca7cf367f" inherit meson pkgconfig systemd -- cgit v1.2.3 From 60224557e5370ded4274e12b7c1e9bdfd528a07c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Dec 2021 20:20:35 +0000 Subject: openpower-hw-diags: srcrev bump 86aa97a508..15527a43fe Zane Shelley (2): created PluginResolution class create PluginMap and plugin definition Change-Id: I88a9ed8130348630f45ab67d76dfc8bf6f02245c Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bdd9fa2b5..040b26e06 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" -SRCREV = "86aa97a50808e8358ac8582e2240c6ae50dd2ff1" +SRCREV = "15527a43fe309d3599d146d5a48607b14b426a37" S = "${WORKDIR}/git" -- cgit v1.2.3 From a64d8bbafd8711fccc21b5dc6c1087efa247298a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Dec 2021 20:11:40 +0000 Subject: bmcweb: srcrev bump b24483809a..47c9e106e0 Ed Tanous (1): Remove unused file James Feist (1): Change Default of REST D-Bus to OFF Josh Lehan (1): gitignore: Update to the latest from toptal.com Lukasz Kazmierczak (2): Add GET method for TriggerCollection Add GET method for Triggers Szymon Dompke (1): Add support for DELETE on Triggers schema Change-Id: I49ef5b2c6a6aff8011bff151a6ffb3755372cbd2 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index e1ee05b4e..e3d7e8b0a 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "b24483809a127e792bff97ec903e4c9d96960d00" +SRCREV = "47c9e106e0057dd70133d50e928e48cbc68e709a" S = "${WORKDIR}/git" -- cgit v1.2.3 From 713a24cb5537e0448598042307869e50d695ec9f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Dec 2021 18:00:40 +0000 Subject: entity-manager: srcrev bump 1e8e71f23f..f466ccece5 Howard Chiu (1): Configurations: Bletchley: Update sensors Thang Q. Nguyen (1): Configurations: Add Ampere Mt.Jade platform Change-Id: I18df05eee0bb6433f0574b1372a0f06b4e6762b0 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 0a2350341..9cb7a04e7 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "1e8e71f23fb4c686da5f2c9451e320b08637f15a" +SRCREV = "f466ccece5c08a028b173a017f7894aecfccdcde" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From cdf0702e3f8e555b85ad74dd958a1e6ecf195b12 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Dec 2021 14:51:28 +0000 Subject: pldm: srcrev bump 6a4d1cf836..81c045183b Brad Bishop (4): pldm_visualise_pdrs: Add executor abstraction pldm_visualise_pdrs: add process abstraction pldm_visualise_pdrs: run pldmtool directly pldm_visualise_pdrs: check for tty Manojkiran Eda (1): Remove all dependencies for libpldm Change-Id: Ie99716f235908d37e6ee57dbf8df93743a3f2e6a Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 3589c3e0a..bbaa6349c 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 = "6a4d1cf836f2bf291890d56ad5d071f205ea3ef0" +SRCREV = "81c045183b0ea6d2c857777858a29ed10650bc56" -- cgit v1.2.3 From 37a2a320ed2f428da8e4fff507329ee83c20afc2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Dec 2021 02:31:28 +0000 Subject: phosphor-post-code-manager: srcrev bump 84855abe9e..de8d3a537f Manojkiran Eda (1): Fix static analysis & cppcheck issues Change-Id: Ie75d99035a4c0763247c140cafe9248f2f09e18c Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9551f5c57..4485cb55b 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." SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git" -SRCREV = "84855abe9efea81f2ed8cf025892a7400edc9d74" +SRCREV = "de8d3a537fec2e0b36791cc53aeb963fc746d1da" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2d25852c1e1a1bd7616679f09c4c79b524e49833 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Dec 2021 09:40:27 +0000 Subject: openpower-vpd-parser: srcrev bump 8c796818c2..ec912e6c0d Priyanga Ramasamy (1): Defect SW541296:vpd-tool write failure Shantappa Teekappanavar (1): Identify cable and flett cards Change-Id: I9df850d6e214a085a847c4b798754c48324d281d Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 82581d7e5..cbb6f82bc 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ 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" -SRCREV = "8c796818c231b09d9ec33f123015e2e3097ef384" +SRCREV = "ec912e6c0de2ff32c895ef681958052e0039e64f" -- cgit v1.2.3 From 1ab7ad92fef1dc03d564de3a50f22906ff1b15b6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 17 Dec 2021 01:31:00 +0000 Subject: libmctp: srcrev bump 95cccaec5b..983cc3fa49 Brad Bishop (1): build: compile and install utils Change-Id: I674cf7246d94b1b45b6667b0316c3d2bf6328e80 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index 2a61782d8..e2a1b90be 100644 --- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" SRC_URI = "git://github.com/openbmc/libmctp \ file://default" -SRCREV = "95cccaec5b8e38e320569125a827ccadd63479f3" +SRCREV = "983cc3fa49dcac2e640e814500221c6acc177eff" DEPENDS += "autoconf-archive-native \ systemd \ -- cgit v1.2.3 From e8008b147b5caa7750f08760ae041730765b0244 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Dec 2021 23:30:56 +0000 Subject: phosphor-host-ipmid: srcrev bump 6619ae4683..e39ba9930b Arun P. Mohanan (1): fix:Channel access mode set to disabled by default Change-Id: I8eddf268eba18efceeaae5181b12afdf47b556b8 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index dcd673367..673ea5b98 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 = "6619ae468393d362638b525cfd927b1a2c125727" +SRCREV = "e39ba9930b66ed46b15147f4f12dd7f92b63da32" -- cgit v1.2.3 From abf5ddacfcf0d4469c3117addd1b794abf4afa59 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Fri, 26 Nov 2021 06:12:16 +0000 Subject: meta-ampere: mtjade: sensor: change to use dbus-sensor Replace sensor monitoring in phosphor-hwmon by dbus-sensor/entity-manager. Tested: 1. Check IPMI sensor report for Temp and ADC sensors with correct threshold $ ipmitool sdr list $ ipmitool sensor list all 2. Check Redfish Thermal and Power schema for Temperature and ADC sensors Signed-off-by: Thang Q. Nguyen Change-Id: Idbb719ed01a28892bce32adce062c56dd51d3088 --- .../configuration/dbus-sensors_%.bbappend | 1 + .../apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf | 3 - .../apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf | 3 - .../apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf | 3 - .../apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf | 3 - .../apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf | 3 - .../apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf | 3 - .../ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf | 17 --- .../ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf | 17 --- .../ahb/apb/pwm-tacho-controller@1e786000.conf | 60 ---------- .../obmc/mtjade/hwmon/iio-hwmon-adc14.conf | 4 - .../obmc/mtjade/hwmon/iio-hwmon-battery.conf | 11 -- .../obmc/mtjade/hwmon/iio-hwmon.conf | 123 --------------------- .../sensors/phosphor-hwmon_%.bbappend | 31 ------ 14 files changed, 1 insertion(+), 281 deletions(-) create mode 100644 meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend new file mode 100644 index 000000000..bfd03f8c5 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:remove = " cpusensor ipmbsensor" diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf deleted file mode 100644 index 5d1ed0944..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS1_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf deleted file mode 100644 index 2429d8e14..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS2_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf deleted file mode 100644 index 60d2783ae..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS3_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf deleted file mode 100644 index 9b7987400..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS4_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf deleted file mode 100644 index c9fc00c05..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS5_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf deleted file mode 100644 index 6c71eca5d..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS6_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf deleted file mode 100644 index 944085d4d..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf +++ /dev/null @@ -1,17 +0,0 @@ -LABEL_temp1= "PSU0_TEMP" -CRITHI_temp1=64000 - -LABEL_power2= "PSU0_POUTPUT" - -LABEL_fan1="PSU0_fan1" -CRITHI_fan1=20300 - -LABEL_in1= "PSU0_VINPUT" -LABEL_in2= "PSU0_VOUTPUT" - -LABEL_curr1= "PSU0_IINPUT" -LABEL_curr2= "PSU0_IOUTPUT" - -LABEL_power1= "PSU0_PINPUT" - -INTERVAL=10000000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf deleted file mode 100644 index 15b965551..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf +++ /dev/null @@ -1,17 +0,0 @@ -LABEL_temp1 = "PSU1_TEMP" -CRITHI_temp1=64000 - -LABEL_power2 = "PSU1_POUTPUT" - -LABEL_fan1 = "PSU1_fan1" -CRITHI_fan1=20300 - -LABEL_in1= "PSU1_VINPUT" -LABEL_in2= "PSU1_VOUTPUT" - -LABEL_curr1= "PSU1_IINPUT" -LABEL_curr2= "PSU1_IOUTPUT" - -LABEL_power1 = "PSU1_PINPUT" - -INTERVAL=10000000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf deleted file mode 100644 index b14392bea..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ /dev/null @@ -1,60 +0,0 @@ -LABEL_fan5 = "FAN3_1" -CRITLO_fan5=500 -CRITHI_fan5=23100 - -LABEL_fan6 = "FAN3_2" -CRITLO_fan6=500 -CRITHI_fan6=23100 - -LABEL_fan7 = "FAN4_1" -CRITLO_fan7=500 -CRITHI_fan7=23100 - -LABEL_fan8 = "FAN4_2" -CRITLO_fan8=500 -CRITHI_fan8=23100 - -LABEL_fan9 = "FAN5_1" -CRITLO_fan9=500 -CRITHI_fan9=23100 - -LABEL_fan10 = "FAN5_2" -CRITLO_fan10=500 -CRITHI_fan10=23100 - -LABEL_fan11 = "FAN6_1" -CRITLO_fan11=500 -CRITHI_fan11=23100 - -LABEL_fan12 = "FAN6_2" -CRITLO_fan12=500 -CRITHI_fan12=23100 - -LABEL_fan13 = "FAN7_1" -CRITLO_fan13=500 -CRITHI_fan13=23100 - -LABEL_fan14 = "FAN7_2" -CRITLO_fan14=500 -CRITHI_fan14=23100 - -LABEL_fan15 = "FAN8_1" -CRITLO_fan15=500 -CRITHI_fan15=23100 - -LABEL_fan16 = "FAN8_2" -CRITLO_fan16=500 -CRITHI_fan16=23100 - -PWM_TARGET_fan5 = "3" -PWM_TARGET_fan6 = "3" -PWM_TARGET_fan7 = "4" -PWM_TARGET_fan8 = "4" -PWM_TARGET_fan9 = "5" -PWM_TARGET_fan10 = "5" -PWM_TARGET_fan11 = "6" -PWM_TARGET_fan12 = "6" -PWM_TARGET_fan13 = "7" -PWM_TARGET_fan14 = "7" -PWM_TARGET_fan15 = "8" -PWM_TARGET_fan16 = "8" diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf deleted file mode 100644 index a5c5c2a45..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf +++ /dev/null @@ -1,4 +0,0 @@ -LABEL_in1=3V3_SB -GAIN_in1=3 -CRITHI_in1=3960 -CRITLO_in1=2320 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf deleted file mode 100644 index 3cc58229d..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf +++ /dev/null @@ -1,11 +0,0 @@ -LABEL_in1=VBAT_RTC -GAIN_in1=3 -CRITHI_in1=3564 -CRITLO_in1=2106 - -# GPIOS4 needs to be pulled high for battery voltage reading -GPIOCHIP_in1=0 -GPIO_in1=148 - -# Read it every day so it does not impact battery life -INTERVAL=86400000000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf deleted file mode 100644 index 4e46123ae..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf +++ /dev/null @@ -1,123 +0,0 @@ -LABEL_in1=S0_0V8_VDDC_SOC -CRITHI_in1=960 -CRITLO_in1=560 - -LABEL_in2=S1_0V8_VDDC_SOC -CRITHI_in2=960 -CRITLO_in2=560 - -LABEL_in3=S0_0V75_PCP -CRITHI_in3=1323 -CRITLO_in3=504 - -LABEL_in4=S1_0V75_PCP -CRITHI_in4=1323 -CRITLO_in4=504 - -LABEL_in5=S0_1V2_VDDQ0123 -CRITHI_in5=1442 -CRITLO_in5=840 - -LABEL_in6=S1_1V2_VDDQ0123 -CRITHI_in6=1442 -CRITLO_in6=840 - -LABEL_in7=S0_0V6_VTT0123 -CRITHI_in7=720 -CRITLO_in7=420 - -LABEL_in8=S1_0V6_VTT0123 -CRITHI_in8=720 -CRITLO_in8=420 - -LABEL_in9=S0_2V5_VPP0123 -GAIN_in9=2 -CRITHI_in9=3000 -CRITLO_in9=1755 - -LABEL_in10=S1_2V5_VPP0123 -GAIN_in10=2 -CRITHI_in10=3000 -CRITLO_in10=1755 - -LABEL_in11=S0_1V2_VDDQ4567 -CRITHI_in11=1442 -CRITLO_in11=840 - -LABEL_in12=S1_1V2_VDDQ4567 -CRITHI_in12=1442 -CRITLO_in12=840 - -LABEL_in13=S0_0V6_VTT4567 -CRITHI_in13=720 -CRITLO_in13=420 - -LABEL_in14=S1_0V6_VTT4567 -CRITHI_in14=720 -CRITLO_in14=420 - -LABEL_in15=S0_2V5_VPP4567 -GAIN_in15=2 -CRITHI_in15=3000 -CRITLO_in15=1755 - -LABEL_in16=S1_2V5_VPP4567 -GAIN_in16=2 -CRITHI_in16=3000 -CRITLO_in16=1755 - -LABEL_in17=S0_0V85_RCA -CRITHI_in17=1080 -CRITLO_in17=630 - -LABEL_in18=S1_0V85_RCA -CRITHI_in18=1080 -CRITLO_in18=630 - -LABEL_in19=S0_1V8_VDDH -GAIN_in19=2 -CRITHI_in19=2156 -CRITLO_in19=1265 - -LABEL_in20=S1_1V8_VDDH -GAIN_in20=2 -CRITHI_in20=2156 -CRITLO_in20=1265 - -LABEL_in21=S0_1V5_VDDH -CRITHI_in21=1800 -CRITLO_in21=1053 - -LABEL_in22=S1_1V5_VDDH -CRITHI_in22=1800 -CRITLO_in22=1053 - -LABEL_in23=S0_1V8_SOC -GAIN_in23=2 -CRITHI_in23=2156 -CRITLO_in23=1265 - -LABEL_in24=S1_1V8_SOC -GAIN_in24=2 -CRITHI_in24=2156 -CRITLO_in24=1265 - -LABEL_in25=S0_1V8_PCP -GAIN_in25=2 -CRITHI_in25=2156 -CRITLO_in25=1265 - -LABEL_in26=S1_1V8_PCP -GAIN_in26=2 -CRITHI_in26=2156 -CRITLO_in26=1265 - -LABEL_in27=S0_3V3_SOC -GAIN_in27=3 -CRITHI_in27=3960 -CRITLO_in27=2320 - -LABEL_in28=S1_3V3_SOC -GAIN_in28=3 -CRITHI_in28=3960 -CRITLO_in28=2320 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend deleted file mode 100644 index a77a59be0..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:" - -EXTRA_OEMESON:append:mtjade = " -Dnegative-errno-on-fail=true" - -CHIPS:mtjade = " \ - bus@1e78a000/i2c-bus@100/tmp175@28 \ - bus@1e78a000/i2c-bus@100/tmp175@29 \ - bus@1e78a000/i2c-bus@100/tmp175@2a \ - bus@1e78a000/i2c-bus@100/tmp175@2b \ - bus@1e78a000/i2c-bus@100/tmp175@2c \ - bus@1e78a000/i2c-bus@100/tmp175@2d \ - bus@1e78a000/i2c-bus@1c0/psu@58 \ - bus@1e78a000/i2c-bus@1c0/psu@59 \ - pwm-tacho-controller@1e786000 \ - " - -ITEMSFMT = "ahb/apb/{0}.conf" - -ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS:${MACHINE}')}" - -ITEMS += "iio-hwmon.conf iio-hwmon-adc14.conf iio-hwmon-battery.conf" - -ENVS = "obmc/${MACHINE}/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" - -do_install:append:mtjade() { - SOURCEDIR="${WORKDIR}/obmc/${MACHINE}/hwmon" - DESTDIR="${D}${sysconfdir}/default/obmc" - install -d ${DESTDIR} - cp -r ${SOURCEDIR} ${DESTDIR} -} -- cgit v1.2.3 From 708decbaee691dc2bc4258fc764d9ba59463297b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 18 Dec 2021 19:47:35 -0800 Subject: meta-google: busybox: Remove unused options This trims down our busybox binary to remove a bunch of unused / duplicate utilities. Change-Id: Iabee2b086436db800c35f5b9cd738704c493df50 Signed-off-by: William A. Kennington III --- .../recipes-core/busybox/busybox_%.bbappend | 1 + meta-google/recipes-core/busybox/files/gbmc.cfg | 34 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/meta-google/recipes-core/busybox/busybox_%.bbappend b/meta-google/recipes-core/busybox/busybox_%.bbappend index 0f2210d7f..fd7873cc1 100644 --- a/meta-google/recipes-core/busybox/busybox_%.bbappend +++ b/meta-google/recipes-core/busybox/busybox_%.bbappend @@ -1,2 +1,3 @@ FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/files:" SRC_URI:append:gbmc = " file://gbmc.cfg" +SRC_URI:remove:gbmc = "file://syslog.cfg" diff --git a/meta-google/recipes-core/busybox/files/gbmc.cfg b/meta-google/recipes-core/busybox/files/gbmc.cfg index 158f771b3..c76e4f0a7 100644 --- a/meta-google/recipes-core/busybox/files/gbmc.cfg +++ b/meta-google/recipes-core/busybox/files/gbmc.cfg @@ -19,3 +19,37 @@ CONFIG_FEATURE_UDHCPC6_RFC5970=y # Misc CONFIG_BC=y +CONFIG_TRUNCATE=y +CONFIG_BASE64=y +CONFIG_FEATURE_TOP_INTERACTIVE=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y + +# Remove unused things +CONFIG_BUNZIP2=n +CONFIG_BZIP2=n +CONFIG_UNZIP=n +CONFIG_ADDGROUP=n +CONFIG_ADDUSER=n +CONFIG_DELGROUP=n +CONFIG_DELUSER=n +CONFIG_LOGIN=n +CONFIG_SU=n +CONFIG_SULOGIN=n +CONFIG_FDISK=n +CONFIG_FSTRIM=n +CONFIG_MKSWAP=n +CONFIG_SWAPON=n +CONFIG_SWAPOFF=n +CONFIG_WATCHDOG=n +CONFIG_IFCONFIG=n +CONFIG_IFUP=n +CONFIG_IFDOWN=n +CONFIG_ROUTE=n +CONFIG_TFTP=n +CONFIG_TLS=n +CONFIG_TRACEROUTE=n +CONFIG_KLOGD=n +CONFIG_LOGREAD=n +CONFIG_SYSLOGD=n -- cgit v1.2.3 From 8b26979b24fe929cdb2edd27d8d11258bdcb75e1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 18 Dec 2021 18:55:29 -0800 Subject: meta-google: phosphor-ipmi-host: Remove unused RDEPENDS Change-Id: I01bfbd4022584641d8df6ee694b62eadc3cb657c Signed-off-by: William A. Kennington III --- meta-google/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-google/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 000000000..77fcbe079 --- /dev/null +++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,3 @@ +# Neither of these are used in a gbmc configuration +RDEPENDS:${PN}:remove:gbmc = "clear-once" +RDEPENDS:${PN}:remove:gbmc = "${VIRTUAL-RUNTIME_obmc-bmc-updater}" -- cgit v1.2.3 From 2696b0a16ced82722525754d241b5fb5f80790fd Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Sat, 14 Aug 2021 18:38:58 -0700 Subject: meta-google: Add new system.conf for gbmc-systemd-config Add systemd.conf options for watchdog to replace watchdog-conf ``` // interval is 60s by default interval = 10 watchdog-device = /dev/watchdog // The value is in pages. They are presently 4KiB each. // Reset the BMC if it goes below 3MiB min-memory = 768 ``` Tested: ``` $ cat /lib/systemd/system.conf.d/40-system.conf [Manager] DefaultMemoryAccounting=yes RuntimeWatchdogSec=10s WatchdogDevice=/dev/watchdog ``` Change-Id: I51171746669dfeb1efe6c09952efa3457e33c86b Signed-off-by: Willy Tu --- meta-google/recipes-google/systemd/files/40-system.conf | 4 ++++ meta-google/recipes-google/systemd/gbmc-systemd-config.bb | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 meta-google/recipes-google/systemd/files/40-system.conf diff --git a/meta-google/recipes-google/systemd/files/40-system.conf b/meta-google/recipes-google/systemd/files/40-system.conf new file mode 100644 index 000000000..5f770d01f --- /dev/null +++ b/meta-google/recipes-google/systemd/files/40-system.conf @@ -0,0 +1,4 @@ +[Manager] +DefaultMemoryAccounting=yes +RuntimeWatchdogSec=10s +WatchdogDevice=/dev/watchdog diff --git a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb index 6e26fc99d..843053bc8 100644 --- a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb +++ b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb @@ -11,11 +11,13 @@ SRC_URI:append = " \ file://firmware-updates.target \ file://firmware-updates-pre.target \ file://40-gbmc-forward.conf \ + file://40-system.conf \ " FILES:${PN}:append = " \ ${systemd_unitdir}/coredump.conf.d/40-gbmc-coredump.conf \ ${systemd_unitdir}/resolved.conf.d/40-gbmc-nomdns.conf \ + ${systemd_unitdir}/system.conf.d/40-system.conf \ ${libdir}/sysctl.d/40-gbmc-forward.conf \ " @@ -44,6 +46,9 @@ do_install() { install -d -m0755 ${D}${libdir}/sysctl.d install -m 0644 ${WORKDIR}/40-gbmc-forward.conf ${D}${libdir}/sysctl.d/ + + install -d -m 0755 ${D}${systemd_unitdir}/system.conf.d/ + install -D -m0644 ${WORKDIR}/40-system.conf ${D}${systemd_unitdir}/system.conf.d/ } do_install:append:dev() { -- cgit v1.2.3 From a7d72d713cff6d14225eb39b35d7150aef479e0d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 20 Dec 2021 01:37:31 -0800 Subject: meta-google: Remove mostly unused iotools There are generally other ways to poke at the IO space of the BMC and there isn't any evidence these are being used anymore. Change-Id: I9d0e7187f2be8bbbf349e8cdf63c32013876260c Signed-off-by: William A. Kennington III --- meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend index dce86826f..db3a2575c 100644 --- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -17,7 +17,6 @@ OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = \ # Include these useful utilities for all gbmc platforms OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " ipmitool" -OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " iotools" OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " lrzsz" # Add gBMC update recipes -- cgit v1.2.3 From 538683f3af153b0a3381790a7bfbd2696b17f9d5 Mon Sep 17 00:00:00 2001 From: Potin Lai Date: Fri, 17 Dec 2021 00:47:35 +0800 Subject: meta-bletchley: add led manager add support of phosphor-led-manager for Bletchley Signed-off-by: Potin Lai Change-Id: I4c27fb1a7658b89ff20f8f2ee4c38ae5bd17ffc0 --- .../meta-bletchley/conf/machine/bletchley.conf | 2 + .../leds/bletchley-led-manager-config-native.bb | 18 +++++ .../leds/bletchley-led-manager-config/led.yaml | 89 ++++++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config-native.bb create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config/led.yaml diff --git a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf index 9427df28a..b3480f5c5 100644 --- a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf +++ b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf @@ -12,3 +12,5 @@ require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/facebook-tpm2.inc FLASH_SIZE = "131072" + +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "bletchley-led-manager-config-native" diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config-native.bb b/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config-native.bb new file mode 100644 index 000000000..d06ec861e --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config-native.bb @@ -0,0 +1,18 @@ +SUMMARY = "Phosphor LED Group Management for Bletchley" +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}" + +# Copies example led layout yaml file +do_install() { + SRC=${S} + DEST=${D}${datadir}/phosphor-led-manager + install -D ${SRC}/led.yaml ${DEST}/led.yaml +} 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 new file mode 100644 index 000000000..4fb482cca --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/leds/bletchley-led-manager-config/led.yaml @@ -0,0 +1,89 @@ +bmc_booted: + sys_log_id: + Action: 'On' + +sys_identify: + sys_log_id: + Action: 'Blink' + DutyOn: 50 + Period: 1000 + +fan0_fault: + fan0_amber: + Action: 'On' + +fan0_good: + fan0_blue: + Action: 'On' + +fan1_fault: + fan1_amber: + Action: 'On' + +fan1_good: + fan1_blue: + Action: 'On' + +fan2_fault: + fan2_amber: + Action: 'On' + +fan2_good: + fan2_blue: + Action: 'On' + +fan3_fault: + fan3_amber: + Action: 'On' + +fan3_good: + fan3_blue: + Action: 'On' + +sled0_fault: + sled0_amber: + Action: 'On' + +sled0_good: + sled0_blue: + Action: 'On' + +sled1_fault: + sled1_amber: + Action: 'On' + +sled1_good: + sled1_blue: + Action: 'On' + +sled2_fault: + sled2_amber: + Action: 'On' + +sled2_good: + sled2_blue: + Action: 'On' + +sled3_fault: + sled3_amber: + Action: 'On' + +sled3_good: + sled3_blue: + Action: 'On' + +sled4_fault: + sled4_amber: + Action: 'On' + +sled4_good: + sled4_blue: + Action: 'On' + +sled5_fault: + sled5_amber: + Action: 'On' + +sled5_good: + sled5_blue: + Action: 'On' -- cgit v1.2.3 From 16bdc32f2f670f489bd381f358853384f6b41141 Mon Sep 17 00:00:00 2001 From: Logananth Sundararaj Date: Mon, 20 Dec 2021 21:46:09 +0530 Subject: meta-yosemitev2: fixing the build warnings. while applying the patch facing some build warnings. Tested : Tested in Yosemitev2. Signed-off-by: Logananth Sundararaj Change-Id: I1544059d205413823e148eff1a56b994ca2b05c1 --- .../u-boot-aspeed/0002-spl-host-console-handle.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch index 8f01c122c..b39659506 100644 --- a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch +++ b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch @@ -1,6 +1,6 @@ -From 9c5a3784a68a456cd22e63719917ed79873d0801 Mon Sep 17 00:00:00 2001 +From 99fdec9719987ce93e4582d31cb7d08c5beb51ef Mon Sep 17 00:00:00 2001 From: Logananth Sundararaj -Date: Fri, 3 Dec 2021 16:37:58 +0530 +Date: Mon, 20 Dec 2021 16:51:22 +0530 Subject: [PATCH] spl-host-console-handle This patch adds four 1S server console through debug card @@ -52,13 +52,13 @@ Signed-off-by: Logananth Sundararaj 1 file changed, 61 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-aspeed/platform_g5.S b/arch/arm/mach-aspeed/platform_g5.S -index e1c17ae4a3..798b9c4337 100644 +index f14b5acc6b..340d7b2b91 100644 --- a/arch/arm/mach-aspeed/platform_g5.S +++ b/arch/arm/mach-aspeed/platform_g5.S -@@ -315,6 +315,59 @@ TIME_TABLE_DDR4_1600: - str r1, [r0] - .endm - +@@ -315,6 +315,59 @@ orr r1, r1, #0xC + str r1, [r0] + .endm + + .macro console_slot1 + ldr r0, =0x1e780024 + ldr r1, [r0] @@ -113,7 +113,7 @@ index e1c17ae4a3..798b9c4337 100644 + + .macro console_sel - + // Disable SoL UARTs[1-4] @@ -354,28 +407,28 @@ dbg_card_pres\@: ldr r1, =0x00 -- cgit v1.2.3 From 33c678b6f12eba8c5b4653e74fa76987d5d30ce0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 20 Dec 2021 17:20:49 +0000 Subject: phosphor-dbus-interfaces: srcrev bump 36ed8ad2b4..4f703341d9 John Wedig (1): Add D-Bus interface for a logical volume Change-Id: I424662fbdea40b346d922f2a783ea5a4d3ff4c61 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1e3c5149a..c3041db94 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "36ed8ad2b40e63eaa0aa8b37a5e6d6d2faa614db" +SRCREV = "4f703341d9f9b1bf873d3aa93255573e9eb44bfa" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true -- cgit v1.2.3 From 0d875f5674cc5e04c02bca23e3c3259c3860c25b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 20 Dec 2021 07:42:03 +0000 Subject: peci-pcie: srcrev bump de624395a5..bb5efe7b3e Spencer Ku (1): Support "GenerationInUse" PCIe device property Change-Id: Id3a4dfb7bc706cf2d0e69862853610e6cda3d024 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b7bad6e29..fc734558f 100644 --- a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb +++ b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/openbmc/peci-pcie" DEPENDS = "boost sdbusplus libpeci" PV = "0.1+git${SRCPV}" -SRCREV = "de624395a587be555463a14a3db90500b4e0521c" +SRCREV = "bb5efe7b3ecfd56584cef10739b3395ef3017dd4" S = "${WORKDIR}/git" -- cgit v1.2.3 From 56171e7db4a414df097e10e50d9b0487a806e340 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 20 Dec 2021 05:21:28 +0000 Subject: webui-vue: srcrev bump 12dc20c370..823c181267 Konstantin Aladyshev (5): Russian translations for the new Network settings design Russian translations for the IPv4/DNS network settings Russian translations for the hostname/MAC address settings Russian translations for the deleteDns/deleteIpv4 fixes Correct values for deleteDns/deleteIpv4 keys in translation Lei YU (1): [POC] login: Fix waiting in login page after login kennyneedsmilky (1): Fixed refresh system info on header Change-Id: I3d681e36c72992addb9c5101ce694fed64434ba5 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 90b553016..173ecb8b7 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 = "12dc20c3701fe58b7d827ed44d65ac67cee8a4a6" +SRCREV = "823c181267565536d229b6c4932543d62c5433d0" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " -- cgit v1.2.3 From 989dc29eb5b6d84bcbd9de2e4f7fbadef4684e83 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 20 Dec 2021 01:00:57 +0000 Subject: bmcweb: srcrev bump 47c9e106e0..af4edf686e Ed Tanous (1): Implement MIME parsing Change-Id: I2680fa87b08a60a2fae1830360ac8f1c6ceccd52 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index e3d7e8b0a..a9ffbc355 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "47c9e106e0057dd70133d50e928e48cbc68e709a" +SRCREV = "af4edf686e684d728fccbb69a8f550fd2adab46a" S = "${WORKDIR}/git" -- cgit v1.2.3 From 9d64df2df5368e56d6b76dcabbc12c02158c45c7 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 20 Dec 2021 21:00:59 +0000 Subject: phosphor-host-postd: srcrev bump 996facb65d..5633a3fc97 Patrick Williams (1): sdbusplus: remove usage of deprecated alias Change-Id: Id52fef03d5da74b6e673fd938e7a9bed3219d1cc Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5e320fe7e..0b98e0276 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -20,7 +20,7 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd" -SRCREV = "996facb65d554f7c0f14c10e3c9252d67a01e21a" +SRCREV = "5633a3fc974af7358ccb0d9937dae7daacebfdea" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" POST_CODE_BYTES ?= "1" -- cgit v1.2.3 From e29824360d02936fc1431f612bf89bb49d19b335 Mon Sep 17 00:00:00 2001 From: Vivekanand Veeracholan Date: Fri, 3 Dec 2021 17:09:52 -0800 Subject: meta-phosphor: obmc-console: Add support for multiple ports 1. Add support to install multiple console port configuration files. OBMC_CONSOLE_TTYS is space separated list to set multiple ports. Defaults to OBMC_CONSOLE_HOST_TTY. 2. Prioritize picking up port specific configuration over generic one. Tested: Built for single and multi port configuration and verified the presence of correct config file in sysconf directory. Signed-off-by: Vivekanand Veeracholan Change-Id: Ic918b5830f972adbcfa14e2befa4e3420698825f --- .../recipes-phosphor/console/obmc-console_git.bb | 54 ++++++++++++++++------ 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 97b197c93..bda58aab7 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -40,24 +40,50 @@ FILES:${PN} += "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0" +# Support multiple TTY ports using space separated list. +# Ex. OBMC_CONSOLE_TTYS = "ttyS1 ttyS2" +OBMC_CONSOLE_TTYS ?= "${OBMC_CONSOLE_HOST_TTY}" + do_install:append() { # Install the server configuration install -m 0755 -d ${D}${sysconfdir}/${BPN} - if test -f "${WORKDIR}/${BPN}.conf"; then - # Remove the upstream-provided server configuration - rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf - # Install the old-style server configuration - install -m 0644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/ - # Link the custom configuration to the required location - ln -sr ${D}${sysconfdir}/${BPN}.conf ${D}${sysconfdir}/${BPN}/server.${OBMC_CONSOLE_HOST_TTY}.conf - elif test -f "${WORKDIR}/server.${OBMC_CONSOLE_HOST_TTY}.conf" ; then - # Remove the upstream-provided server configuration + + # If the OBMC_CONSOLE_TTYS variable is used without the default OBMC_CONSOLE_HOST_TTY + # the port specific config file should be provided. If it is just OBMC_CONSOLE_HOST_TTY, + # use the old style which supports both port specific or obmc-console.conf method. + if [[ "${OBMC_CONSOLE_TTYS}" != "${OBMC_CONSOLE_HOST_TTY}" ]]; then rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf - # Install the package-provided new-style configuration - install -m 0644 ${WORKDIR}/server.${OBMC_CONSOLE_HOST_TTY}.conf ${D}${sysconfdir}/${BPN}/ + + for CONSOLE in ${OBMC_CONSOLE_TTYS} + do + if test -f "${WORKDIR}/server.${CONSOLE}.conf" ; then + install -m 0644 ${WORKDIR}/server.${CONSOLE}.conf ${D}${sysconfdir}/${BPN}/ + else + bberror "Must provide port specific config files when using OBMC_CONSOLE_TTYS" \ + "Missing server.${CONSOLE}.conf" + fi + done else - # Otherwise, remove socket-id from the shipped configuration to - # align with the lack of a client configuration file - sed -ri '/^socket-id =/d' ${D}${sysconfdir}/${BPN}/server.${OBMC_CONSOLE_HOST_TTY}.conf + # Port specific config file is prioritized over generic conf file. + # If port specific config file is not present and generic "obmc-console.conf" + # exists, it will be used. + if test -f "${WORKDIR}/server.${OBMC_CONSOLE_TTYS}.conf" ; then + # Remove the upstream-provided server configuration + rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf + # Install the package-provided new-style configuration + install -m 0644 ${WORKDIR}/server.${OBMC_CONSOLE_TTYS}.conf ${D}${sysconfdir}/${BPN}/ + elif test -f "${WORKDIR}/${BPN}.conf"; then + # Remove the upstream-provided server configuration + rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf + # Install the old-style server configuration + install -m 0644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/ + # Link the custom configuration to the required location + ln -sr ${D}${sysconfdir}/${BPN}.conf ${D}${sysconfdir}/${BPN}/server.${OBMC_CONSOLE_TTYS}.conf + else + # Otherwise, remove socket-id from the shipped configuration to + # align with the lack of a client configuration file + sed -ri '/^socket-id =/d' ${D}${sysconfdir}/${BPN}/server.${OBMC_CONSOLE_TTYS}.conf + fi fi + } -- cgit v1.2.3 From aecb7a9c53dfc84565fd651f4565e49545eee935 Mon Sep 17 00:00:00 2001 From: Fran Hsu Date: Fri, 3 Dec 2021 16:13:58 +0800 Subject: meta-nuvoton: u-boot-nuvoton: srcrev bump c11d9a81ea...7578a59e96 Stanley Chu (1): driver: i2c-npcm7xx: extend the timeout of ack cycle on receving. Fran Hsu (1): dts: npcm730 GSZ: update the GPIO default setting. Signed-off-by: Fran Hsu Change-Id: Ia2ae99c32dd77255f1bba5b4ccc757fdd5a31469 --- meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc index 9236271c9..28c8b3360 100644 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" UBRANCH = "npcm7xx-v2019.01" SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH}" -SRCREV = "c11d9a81eadfb9b3c4e53acba1a97a13924b6d88" +SRCREV = "7578a59e968d23eed2830f766d52cd4d3c7f95df" S = "${WORKDIR}/git" -- cgit v1.2.3 From 4df005e22665afe3c59dbbb66e59f17d245fb15e Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 21 Dec 2021 08:36:14 +1030 Subject: openpower: pdbg: Bump version to v3.4 Changes: - Add more p10 hardware support (dimm, mem_port, oscrefclock, tpm, nx) - Add i2c bus implementation for generic i2c targets - Implement (nest and core) htm for P10 Change-Id: Id1250ab557e4a73f90a1002f8a00b8e0af6438c0 Signed-off-by: Joel Stanley --- meta-openpower/recipes-bsp/pdbg/pdbg_3.3.bb | 15 --------------- meta-openpower/recipes-bsp/pdbg/pdbg_3.4.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 meta-openpower/recipes-bsp/pdbg/pdbg_3.3.bb create mode 100644 meta-openpower/recipes-bsp/pdbg/pdbg_3.4.bb diff --git a/meta-openpower/recipes-bsp/pdbg/pdbg_3.3.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_3.3.bb deleted file mode 100644 index d7b3c31b9..000000000 --- a/meta-openpower/recipes-bsp/pdbg/pdbg_3.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "PowerPC FSI Debugger" -DESCRIPTION = "pdbg allows JTAG-like debugging of the host POWER processors" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI += "git://github.com/open-power/pdbg.git" -SRCREV = "v3.3" - -DEPENDS += "dtc-native" - -S = "${WORKDIR}/git" - -inherit autotools - -BBCLASSEXTEND = "native" diff --git a/meta-openpower/recipes-bsp/pdbg/pdbg_3.4.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_3.4.bb new file mode 100644 index 000000000..ffbe0847b --- /dev/null +++ b/meta-openpower/recipes-bsp/pdbg/pdbg_3.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "PowerPC FSI Debugger" +DESCRIPTION = "pdbg allows JTAG-like debugging of the host POWER processors" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI += "git://github.com/open-power/pdbg.git" +SRCREV = "v3.4" + +DEPENDS += "dtc-native" + +S = "${WORKDIR}/git" + +inherit autotools + +BBCLASSEXTEND = "native" -- cgit v1.2.3 From 17fea4afc95d5c672cf066c571ac8a6070d54162 Mon Sep 17 00:00:00 2001 From: Jamin Lin Date: Wed, 8 Dec 2021 16:41:55 +0800 Subject: socsec: update socsec tool to v1.0.0 1. To fix python modules not found such as bitarray at do_compile task , adds "DEPEND" to install dependencies. 2. Create a socsec.inc to place the common settings. 3. Create a socsec_1.0.0.bb to build socsec tool v1.0.0. Signed-off-by: Jamin Lin Change-Id: I27a9216419555b58e7484e85506fa229f0e230b7 --- meta-aspeed/recipes-aspeed/python/socsec.inc | 27 +++++++++++++++++++++++ meta-aspeed/recipes-aspeed/python/socsec_1.0.0.bb | 4 ++++ meta-aspeed/recipes-aspeed/python/socsec_git.bb | 23 ------------------- 3 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 meta-aspeed/recipes-aspeed/python/socsec.inc create mode 100644 meta-aspeed/recipes-aspeed/python/socsec_1.0.0.bb delete mode 100644 meta-aspeed/recipes-aspeed/python/socsec_git.bb diff --git a/meta-aspeed/recipes-aspeed/python/socsec.inc b/meta-aspeed/recipes-aspeed/python/socsec.inc new file mode 100644 index 000000000..30ba30897 --- /dev/null +++ b/meta-aspeed/recipes-aspeed/python/socsec.inc @@ -0,0 +1,27 @@ +SUMMARY = "Secure-boot utilities for ASPEED BMC SoCs" +HOMEPAGE = "https://github.com/AspeedTech-BMC/socsec/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d50b901333b4eedfee074ebcd6a6d611" + +BRANCH ?= "master" +SRC_URI = "git://github.com/AspeedTech-BMC/socsec.git;protocol=https;branch=${BRANCH}" + +S = "${WORKDIR}/git" + +inherit python3native setuptools3 + +DEPENDS += "${PYTHON_PN}-bitarray-native" +DEPENDS += "${PYTHON_PN}-ecdsa-native" +DEPENDS += "${PYTHON_PN}-pycryptodome-native" + +RDEPENDS:${PN} += "${PYTHON_PN}-bitarray" +RDEPENDS:${PN} += "${PYTHON_PN}-core" +RDEPENDS:${PN} += "${PYTHON_PN}-hexdump" +RDEPENDS:${PN} += "${PYTHON_PN}-jsonschema" +RDEPENDS:${PN} += "${PYTHON_PN}-jstyleson" +RDEPENDS:${PN} += "${PYTHON_PN}-pycryptodome" +RDEPENDS:${PN} += "${PYTHON_PN}-ecdsa" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-aspeed/recipes-aspeed/python/socsec_1.0.0.bb b/meta-aspeed/recipes-aspeed/python/socsec_1.0.0.bb new file mode 100644 index 000000000..a67c4c9dc --- /dev/null +++ b/meta-aspeed/recipes-aspeed/python/socsec_1.0.0.bb @@ -0,0 +1,4 @@ +include socsec.inc + +PV = "1.0.0+git${SRCPV}" +SRCREV = "2787a252988f4811097995ef9e807b1b433bde9f" diff --git a/meta-aspeed/recipes-aspeed/python/socsec_git.bb b/meta-aspeed/recipes-aspeed/python/socsec_git.bb deleted file mode 100644 index 6034b2982..000000000 --- a/meta-aspeed/recipes-aspeed/python/socsec_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Secure-boot utilities for ASPEED BMC SoCs" -HOMEPAGE = "https://github.com/AspeedTech-BMC/socsec/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d50b901333b4eedfee074ebcd6a6d611" - -SRC_URI = "git://github.com/AspeedTech-BMC/socsec/;protocol=https;branch=master" - -PV = "0.2.1+git${SRCPV}" -SRCREV = "51bd4504bffb5044264cfe4c63b8fe8d48a114a9" - -S = "${WORKDIR}/git" - -inherit python3native setuptools3 - -RDEPENDS:${PN} += "python3-bitarray" -RDEPENDS:${PN} += "python3-core" -RDEPENDS:${PN} += "python3-ecdsa" -RDEPENDS:${PN} += "python3-jsonschema" -RDEPENDS:${PN} += "python3-jstyleson" -RDEPENDS:${PN} += "python3-pycryptodome" - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3 From dd4e6efd8f5388b5ae0ccbc9da98246f0f406d56 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 20 Dec 2021 18:29:59 -0800 Subject: meta-google: systemd: Remove kmod support gBMC does not use kernel modules Change-Id: I75d8309a787cb74f3be1f5bae08de2897ffdac0a Signed-off-by: William A. Kennington III --- meta-google/recipes-core/systemd/systemd_%.bbappend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-google/recipes-core/systemd/systemd_%.bbappend b/meta-google/recipes-core/systemd/systemd_%.bbappend index 59751059a..5185a5eaf 100644 --- a/meta-google/recipes-core/systemd/systemd_%.bbappend +++ b/meta-google/recipes-core/systemd/systemd_%.bbappend @@ -6,3 +6,6 @@ PACKAGECONFIG:remove:gbmc = "timesyncd" # We don't need any legacy sysv rc compatability PACKAGECONFIG:remove:gbmc = "sysvinit" + +# We don't enable kernel modules +PACKAGECONFIG:remove:gbmc = "kmod" -- cgit v1.2.3 From 57f2af755586ed656fcb9714d174d56b27978f7b Mon Sep 17 00:00:00 2001 From: Brandon Kim Date: Mon, 20 Dec 2021 19:15:19 -0800 Subject: meta-google: gnupg: Remove unneeded gnupg help files This saved 49152 bytes of compressed image space in our platform. Signed-off-by: Josh Lehan Signed-off-by: Brandon Kim Change-Id: I40016cffd8586bbcda1cc45ec968efd35c8f4188 --- meta-google/recipes-support/gnupg/gnupg_%.bbappend | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 meta-google/recipes-support/gnupg/gnupg_%.bbappend diff --git a/meta-google/recipes-support/gnupg/gnupg_%.bbappend b/meta-google/recipes-support/gnupg/gnupg_%.bbappend new file mode 100644 index 000000000..3f2f4f94f --- /dev/null +++ b/meta-google/recipes-support/gnupg/gnupg_%.bbappend @@ -0,0 +1,2 @@ +# Remove unneeded gnupg help files to save space +EXTRA_OECONF:append:gbmc = " --disable-doc" -- cgit v1.2.3 From e10dcff322ca3d510d8f3fed0bcf9c80a9130ff5 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Fri, 10 Dec 2021 03:02:12 -0600 Subject: openpower: libekb srcrev bump c1d1ff7f15..9a8b5a419f2 rajerpp1 (2): libekb: Removing HWIDs which are not handled now libekb: Special error handling for clock errors Signed-off-by: Jayanth Othayoth Change-Id: Iabaf972e638f2527846d3a9a32bb4e2a2560bd0c --- meta-openpower/recipes-bsp/libekb/libekb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-bsp/libekb/libekb_git.bb b/meta-openpower/recipes-bsp/libekb/libekb_git.bb index fe3630a98..ccaad5778 100644 --- a/meta-openpower/recipes-bsp/libekb/libekb_git.bb +++ b/meta-openpower/recipes-bsp/libekb/libekb_git.bb @@ -17,7 +17,7 @@ inherit autotools \ SRCREV_FORMAT = "libekb_ekb" -SRCREV_libekb = "c1d1ff7f1559d6cf2c6c1eda99a9133b4157d63b" +SRCREV_libekb = "9a8b5a419f2058e7e1d4bb97a1f91bd2d343f86a" SRCREV_ekb = "${EKB_REV}" SRC_URI = "git://git@github.com/open-power/libekb_p10;branch="main";name=libekb \ -- cgit v1.2.3 From 7155a19cd94a5c174edbd4ec7e6c417af2cbe08a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 21 Dec 2021 12:01:52 +0000 Subject: telemetry: srcrev bump 3e2cc9d497..31db7f71ec Krzysztof Grobelny (1): Added missing const Change-Id: I05080eb3dffaee652b5f7979cd57af2b2295a0c7 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 11562d3ca..97a400d4c 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "3e2cc9d4978cf8f8bab4384dfd2b4996d95040fe" +SRCREV = "31db7f71ec023eb6b0e630fa18048b6fd9ae7430" S = "${WORKDIR}/git" -- cgit v1.2.3 From d42c1f20447981999cf066d2f164aa035711a95a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 21 Dec 2021 00:30:56 +0000 Subject: bmcweb: srcrev bump af4edf686e..895e46d807 JunLin Chen (1): Skip contentLength check in insecure-disable-auth Change-Id: I169f4bac658410c6fce5123ae072e90e63f4c256 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index a9ffbc355..b9a9f7a23 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "af4edf686e684d728fccbb69a8f550fd2adab46a" +SRCREV = "895e46d807d0afe6753753eb9ad8911897425b90" S = "${WORKDIR}/git" -- cgit v1.2.3 From f5c1bd8a8dc61ce6f940e59b59985061dae20621 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 21 Dec 2021 01:00:59 +0000 Subject: phosphor-host-postd: srcrev bump 5633a3fc97..6a5e0a1cba William A. Kennington III (4): gitignore: Change to support meson instead of autotools subprojects: Add everything for local building main: Use optional instead of unique_ptr main: Terminate cleanly for TERM and INT Change-Id: Idedd9f04c04f05f0754a049bd43d08a421108191 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0b98e0276..fd2b4376f 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -20,7 +20,7 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd" -SRCREV = "5633a3fc974af7358ccb0d9937dae7daacebfdea" +SRCREV = "6a5e0a1cba979c3c793e794c41481221da9a4e33" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" POST_CODE_BYTES ?= "1" -- cgit v1.2.3 From 7a5836d5d3fc2a23545c1b2fbbd8b961eadcbd4d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 20 Dec 2021 23:01:33 +0000 Subject: phosphor-watchdog: srcrev bump cf4ce3c171..658527bbdd William A. Kennington III (1): mainapp: Terminate cleanly for TERM and INT Change-Id: Iebb6dcbab8d69f74ebf4c59aa9c64e78494a6c27 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb index 251dc6655..785dd9c4f 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb @@ -20,7 +20,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "systemd" SRC_URI += "git://github.com/openbmc/phosphor-watchdog" -SRCREV = "cf4ce3c171cf222fd5920c173a0b7efadb674fe0" +SRCREV = "658527bbdde8b88ca798527f03c3c67ad7f1c080" S = "${WORKDIR}/git" EXTRA_OEMESON = " \ -- cgit v1.2.3 From 5344b3efc2b51b28070e922f6ec49b7cbde408dc Mon Sep 17 00:00:00 2001 From: Potin Lai Date: Wed, 15 Dec 2021 11:06:15 +0800 Subject: meta-facebook: add packagegroup-security-tpm2 when tpm2 is enabled Signed-off-by: Potin Lai Change-Id: I3e576e5f9f831a4f73cf9d048859f37d471f3ed7 Signed-off-by: Patrick Williams --- meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend index 5755aa58b..ba9cc1fe8 100644 --- a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -4,6 +4,6 @@ IMAGE_FEATURES:remove:fb-nohost = "obmc-console" OBMC_IMAGE_EXTRA_INSTALL:append = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', \ - bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'tpm2-tools', '', d), \ + bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2', '', d), \ '', d)} \ " -- cgit v1.2.3 From 62412968bcf0ace5180229c2842b74c4bca8f794 Mon Sep 17 00:00:00 2001 From: Andrei Kartashev Date: Thu, 9 Dec 2021 12:38:40 +0300 Subject: phosphor-host-ipmid: Add option for configuring hybrid sensors Implements PACKAGECONFIG option to enable or disable hybrid sensors. This makes it possible to mix static and dynamic sensors. Note: as for now, statically defined SDR ids would be discarded if hybrid mode is enabled. Signed-off-by: Andrei Kartashev Change-Id: I9a22fbcf2a3c90742d537b71511618f11c8a54cf --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 03d4e4f2f..bfc04f63c 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -23,6 +23,7 @@ def ipmi_whitelists(d): PACKAGECONFIG ??= "" PACKAGECONFIG[dynamic-sensors] = "--enable-dynamic-sensors,--disable-dynamic-sensors" +PACKAGECONFIG[hybrid-sensors] = "--enable-hybrid-sensors,--disable-hybrid-sensors" DEPENDS += "autoconf-archive-native" DEPENDS += "nlohmann-json" -- cgit v1.2.3 From a4d1550627645758ea23f069703ec341a343bd23 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 21 Dec 2021 16:41:03 +0000 Subject: phosphor-health-monitor: srcrev bump f515187932..9d29b378d3 Konstantin Aladyshev (1): Set correct values for sensor min and max properties Change-Id: I5af479ddea8764a0a289cd39c2b49fb3e0e05242 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cdeba6516..bbc3e2564 100644 --- a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" SRC_URI = "git://github.com/openbmc/phosphor-health-monitor.git;protocol=https" -SRCREV = "f5151879326e36880ddf2c46fe8c539ce721b0d6" +SRCREV = "9d29b378d369166399cb1817f7591711f2060170" S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "phosphor-health-monitor.service" -- cgit v1.2.3 From f9b08f806f4712c467c5ab1945f7746e195c0b7d Mon Sep 17 00:00:00 2001 From: Brandon Kim Date: Tue, 21 Dec 2021 09:26:54 -0800 Subject: meta-phosphor: gnupg: Remove unneeded gnupg files This saved 49152 bytes of compressed image space in our platform. Signed-off-by: Josh Lehan Signed-off-by: Brandon Kim Change-Id: I4b5b4c7cd2bfffb9720bae02624519ee10ca73af --- meta-google/recipes-support/gnupg/gnupg_%.bbappend | 2 -- meta-phosphor/recipes-support/gnupg/gnupg_%.bbappend | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 meta-google/recipes-support/gnupg/gnupg_%.bbappend create mode 100644 meta-phosphor/recipes-support/gnupg/gnupg_%.bbappend diff --git a/meta-google/recipes-support/gnupg/gnupg_%.bbappend b/meta-google/recipes-support/gnupg/gnupg_%.bbappend deleted file mode 100644 index 3f2f4f94f..000000000 --- a/meta-google/recipes-support/gnupg/gnupg_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Remove unneeded gnupg help files to save space -EXTRA_OECONF:append:gbmc = " --disable-doc" diff --git a/meta-phosphor/recipes-support/gnupg/gnupg_%.bbappend b/meta-phosphor/recipes-support/gnupg/gnupg_%.bbappend new file mode 100644 index 000000000..3f2f4f94f --- /dev/null +++ b/meta-phosphor/recipes-support/gnupg/gnupg_%.bbappend @@ -0,0 +1,2 @@ +# Remove unneeded gnupg help files to save space +EXTRA_OECONF:append:gbmc = " --disable-doc" -- cgit v1.2.3 From a6b6c4abdf1b67e34701d2a9e36123f7f8b4d9a6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 21 Dec 2021 17:21:18 +0000 Subject: webui-vue: srcrev bump 823c181267..799bcd3fb4 Kenneth Fullbright (1): Add assembly table component name to table Change-Id: I815dbaf3eee89279ea2ae3e2450481aa27af5296 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 173ecb8b7..70282c2c5 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 = "823c181267565536d229b6c4932543d62c5433d0" +SRCREV = "799bcd3fb476c7a0c38a4779aa91f59a7c931c6a" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " -- cgit v1.2.3 From 4091a0d42e312c8c9ec9af6525f1074103b97639 Mon Sep 17 00:00:00 2001 From: Oskar Senft Date: Tue, 30 Nov 2021 16:05:59 -0500 Subject: tyan, s7106: Initial commit for TYAN S7106 The TYAN S7106 is a server mainboard with an Aspeed AST2500 BMC. Signed-off-by: Oskar Senft Change-Id: I75e4938bbc7d25bd8e949a4bae5761205aa0ff22 --- meta-tyan/OWNERS | 3 + meta-tyan/conf/layer.conf | 11 ++++ meta-tyan/conf/machine/include/tyan.inc | 20 +++++++ .../console/obmc-console/obmc-console.conf | 3 + .../console/obmc-console_%.bbappend | 2 + .../recipes-phosphor/dummy/tyan-dummy.bb | 8 +++ .../ipmi/phosphor-ipmi-host_%.bbappend | 1 + .../packagegroups/packagegroup-tyan-apps.bb | 39 ++++++++++++ .../x86-power-control/power-config-host0.json | 69 ++++++++++++++++++++++ .../chassis/x86-power-control_%.bbappend | 11 ++++ meta-tyan/meta-s7106/conf/bblayers.conf.sample | 19 ++++++ meta-tyan/meta-s7106/conf/conf-notes.txt | 2 + meta-tyan/meta-s7106/conf/layer.conf | 11 ++++ meta-tyan/meta-s7106/conf/local.conf.sample | 17 ++++++ meta-tyan/meta-s7106/conf/machine/s7106.conf | 16 +++++ .../recipes-kernel/linux/linux-aspeed/s7106.cfg | 20 +++++++ .../recipes-kernel/linux/linux-aspeed_%.bbappend | 4 ++ .../ipmi/phosphor-ipmi-kcs_%.bbappend | 1 + 18 files changed, 257 insertions(+) create mode 100644 meta-tyan/OWNERS create mode 100644 meta-tyan/conf/layer.conf create mode 100644 meta-tyan/conf/machine/include/tyan.inc create mode 100644 meta-tyan/meta-common/recipes-phosphor/console/obmc-console/obmc-console.conf create mode 100644 meta-tyan/meta-common/recipes-phosphor/console/obmc-console_%.bbappend create mode 100644 meta-tyan/meta-common/recipes-phosphor/dummy/tyan-dummy.bb create mode 100644 meta-tyan/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend create mode 100644 meta-tyan/meta-common/recipes-phosphor/packagegroups/packagegroup-tyan-apps.bb create mode 100644 meta-tyan/meta-common/recipes-x86/chassis/x86-power-control/power-config-host0.json create mode 100644 meta-tyan/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend create mode 100644 meta-tyan/meta-s7106/conf/bblayers.conf.sample create mode 100644 meta-tyan/meta-s7106/conf/conf-notes.txt create mode 100644 meta-tyan/meta-s7106/conf/layer.conf create mode 100644 meta-tyan/meta-s7106/conf/local.conf.sample create mode 100644 meta-tyan/meta-s7106/conf/machine/s7106.conf create mode 100644 meta-tyan/meta-s7106/recipes-kernel/linux/linux-aspeed/s7106.cfg create mode 100644 meta-tyan/meta-s7106/recipes-kernel/linux/linux-aspeed_%.bbappend create mode 100644 meta-tyan/meta-s7106/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend diff --git a/meta-tyan/OWNERS b/meta-tyan/OWNERS new file mode 100644 index 000000000..3080f8540 --- /dev/null +++ b/meta-tyan/OWNERS @@ -0,0 +1,3 @@ +owners: +- aaelhaj@google.com +- osk@google.com diff --git a/meta-tyan/conf/layer.conf b/meta-tyan/conf/layer.conf new file mode 100644 index 000000000..e0bd4cac7 --- /dev/null +++ b/meta-tyan/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}/meta-common/recipes-*/*/*.bb \ + ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "tyan-layer" +BBFILE_PATTERN_tyan-layer = "^${LAYERDIR}/" +LAYERSERIES_COMPAT_tyan-layer = "hardknott honister" + diff --git a/meta-tyan/conf/machine/include/tyan.inc b/meta-tyan/conf/machine/include/tyan.inc new file mode 100644 index 000000000..3180704c2 --- /dev/null +++ b/meta-tyan/conf/machine/include/tyan.inc @@ -0,0 +1,20 @@ +MACHINE_FEATURES += "\ + obmc-bmc-state-mgmt \ + obmc-chassis-state-mgmt \ + obmc-host-ipmi \ + obmc-host-state-mgmt \ + obmc-phosphor-chassis-mgmt \ + obmc-phosphor-fan-mgmt \ + obmc-phosphor-flash-mgmt \ + " + +VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager" +PREFERRED_PROVIDER_virtual/obmc-inventory-data = "entity-manager" + +VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" +VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" + +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-tyan-apps" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-tyan-apps" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-tyan-apps" diff --git a/meta-tyan/meta-common/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-tyan/meta-common/recipes-phosphor/console/obmc-console/obmc-console.conf new file mode 100644 index 000000000..8491f5365 --- /dev/null +++ b/meta-tyan/meta-common/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -0,0 +1,3 @@ +baud = 115200 +local-tty = ttyS3 +local-tty-baud = 115200 diff --git a/meta-tyan/meta-common/recipes-phosphor/console/obmc-console_%.bbappend b/meta-tyan/meta-common/recipes-phosphor/console/obmc-console_%.bbappend new file mode 100644 index 000000000..18bcfe350 --- /dev/null +++ b/meta-tyan/meta-common/recipes-phosphor/console/obmc-console_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" +OBMC_CONSOLE_HOST_TTY = "ttyS2" diff --git a/meta-tyan/meta-common/recipes-phosphor/dummy/tyan-dummy.bb b/meta-tyan/meta-common/recipes-phosphor/dummy/tyan-dummy.bb new file mode 100644 index 000000000..54b93855a --- /dev/null +++ b/meta-tyan/meta-common/recipes-phosphor/dummy/tyan-dummy.bb @@ -0,0 +1,8 @@ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +ALLOW_EMPTY_${PN} = "1" + +PROVIDES += "virtual/obmc-fan-mgmt" +RPROVIDES:${PN} += "virtual-obmc-fan-mgmt" + diff --git a/meta-tyan/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-tyan/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 000000000..bc70432fd --- /dev/null +++ b/meta-tyan/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:append = " dynamic-sensors" diff --git a/meta-tyan/meta-common/recipes-phosphor/packagegroups/packagegroup-tyan-apps.bb b/meta-tyan/meta-common/recipes-phosphor/packagegroups/packagegroup-tyan-apps.bb new file mode 100644 index 000000000..b29cca434 --- /dev/null +++ b/meta-tyan/meta-common/recipes-phosphor/packagegroups/packagegroup-tyan-apps.bb @@ -0,0 +1,39 @@ +SUMMARY = "OpenBMC for TYAN - Applications" +PR = "r1" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = " \ + ${PN}-chassis \ + ${PN}-flash \ + ${PN}-system \ + " + +PROVIDES += "virtual/obmc-chassis-mgmt" +PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" + +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" + +SUMMARY:${PN}-chassis = "TYAN Chassis" +RDEPENDS:${PN}-chassis = " \ + x86-power-control \ + " + +SUMMARY:${PN}-flash = "TYAN Flash" +RDEPENDS:${PN}-flash = " \ + phosphor-software-manager \ + " + +SUMMARY:${PN}-system = "TYAN System" +RDEPENDS:${PN}-system = " \ + dbus-sensors \ + phosphor-hostlogger \ + phosphor-sel-logger \ + ipmitool \ + phosphor-post-code-manager \ + phosphor-host-postd \ + " diff --git a/meta-tyan/meta-common/recipes-x86/chassis/x86-power-control/power-config-host0.json b/meta-tyan/meta-common/recipes-x86/chassis/x86-power-control/power-config-host0.json new file mode 100644 index 000000000..bbeea06c6 --- /dev/null +++ b/meta-tyan/meta-common/recipes-x86/chassis/x86-power-control/power-config-host0.json @@ -0,0 +1,69 @@ +{ + "gpio_configs":[ + { + "Name" : "IdButton", + "LineName" : "id-button", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "NMIButton", + "LineName" : "nmi-button", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "NMIOut", + "LineName" : "nmi-control", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "PostComplete", + "LineName" : "post-complete", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "PowerButton", + "LineName" : "power-button", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "PowerOk", + "LineName" : "power-chassis-good", + "Type" : "GPIO", + "Polarity" : "ActiveHigh" + }, + { + "Name" : "PowerOut", + "LineName" : "power-chassis-control", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "ResetButton", + "LineName" : "reset-button", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + }, + { + "Name" : "ResetOut", + "LineName" : "reset-control", + "Type" : "GPIO", + "Polarity" : "ActiveLow" + } + ], + "timing_configs":{ + "PowerPulseMs": 200, + "ForceOffPulseMs": 15000, + "ResetPulseMs": 500, + "PowerCycleMs": 5000, + "SioPowerGoodWatchdogMs": 1000, + "PsPowerOKWatchdogMs": 8000, + "GracefulPowerOffS": 300, + "WarmResetCheckMs": 500, + "PowerOffSaveMs": 7000 + } +} diff --git a/meta-tyan/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-tyan/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend new file mode 100644 index 000000000..c0fe1dd72 --- /dev/null +++ b/meta-tyan/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI:append = " \ + file://power-config-host0.json \ +" + +RDEPENDS:${PN}:append = " bash" + +do_install:append() { + install -d ${D}${datadir}/${PN} + install -m 0644 ${WORKDIR}/power-config-host0.json ${D}${datadir}/${PN} +} diff --git a/meta-tyan/meta-s7106/conf/bblayers.conf.sample b/meta-tyan/meta-s7106/conf/bblayers.conf.sample new file mode 100644 index 000000000..956b2a759 --- /dev/null +++ b/meta-tyan/meta-s7106/conf/bblayers.conf.sample @@ -0,0 +1,19 @@ +# 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-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-tyan \ + ##OEROOT##/meta-tyan/meta-s7106 \ +" diff --git a/meta-tyan/meta-s7106/conf/conf-notes.txt b/meta-tyan/meta-s7106/conf/conf-notes.txt new file mode 100644 index 000000000..43d4ab099 --- /dev/null +++ b/meta-tyan/meta-s7106/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-tyan/meta-s7106/conf/layer.conf b/meta-tyan/meta-s7106/conf/layer.conf new file mode 100644 index 000000000..dae8f08f5 --- /dev/null +++ b/meta-tyan/meta-s7106/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 += "s7106-layer" +BBFILE_PATTERN_s7106-layer = "^${LAYERDIR}/" +BBFILE_PRIORITY_s7106-layer = "5" +LAYERSERIES_COMPAT_s7106-layer = "hardknott honister" diff --git a/meta-tyan/meta-s7106/conf/local.conf.sample b/meta-tyan/meta-s7106/conf/local.conf.sample new file mode 100644 index 000000000..ec1b849eb --- /dev/null +++ b/meta-tyan/meta-s7106/conf/local.conf.sample @@ -0,0 +1,17 @@ +MACHINE ??= "s7106" +DISTRO ?= "openbmc-phosphor" +PACKAGE_CLASSES ?= "package_rpm" +SANITY_TESTED_DISTROS:append ?= " *" +EXTRA_IMAGE_FEATURES = "debug-tweaks" +USER_CLASSES ?= "buildstats image-prelink" +PATCHRESOLVE = "noop" +BB_DISKMON_DIRS = "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + ABORT,${TMPDIR},100M,1K \ + ABORT,${DL_DIR},100M,1K \ + ABORT,${SSTATE_DIR},100M,1K \ + ABORT,/tmp,10M,1K" +CONF_VERSION = "2" diff --git a/meta-tyan/meta-s7106/conf/machine/s7106.conf b/meta-tyan/meta-s7106/conf/machine/s7106.conf new file mode 100644 index 000000000..0244ebd76 --- /dev/null +++ b/meta-tyan/meta-s7106/conf/machine/s7106.conf @@ -0,0 +1,16 @@ +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-tyan-${MACHINE}.dtb" + +UBOOT_MACHINE = "ast_g5_phy_config" + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/tyan.inc + +FLASH_SIZE = "32768" + +# We don't have configuration for these components yet, so remove them. +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "tyan-dummy" +IMAGE_FEATURES:remove = "obmc-fan-control" +IMAGE_FEATURES:remove = "obmc-fan-mgmt" +IMAGE_FEATURES:remove = "obmc-flash-mgmt" diff --git a/meta-tyan/meta-s7106/recipes-kernel/linux/linux-aspeed/s7106.cfg b/meta-tyan/meta-s7106/recipes-kernel/linux/linux-aspeed/s7106.cfg new file mode 100644 index 000000000..c427a19be --- /dev/null +++ b/meta-tyan/meta-s7106/recipes-kernel/linux/linux-aspeed/s7106.cfg @@ -0,0 +1,20 @@ +CONFIG_ASPEED_UART_ROUTING=y +CONFIG_DEVMEM=y +CONFIG_I2C_MUX_GPIO=y +CONFIG_SENSORS_NCT7802=y + +# Support for virtual USB NIC +CONFIG_USB_U_ETHER=y +CONFIG_USB_F_ECM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y + +# Enable PECI +CONFIG_PECI=y +CONFIG_PECI_CHARDEV=y +CONFIG_PECI_ASPEED=y +CONFIG_SENSORS_PECI_CPUTEMP=y +CONFIG_SENSORS_PECI_DIMMTEMP=y +CONFIG_SENSORS_PECI_CPUPOWER=y +CONFIG_SENSORS_PECI_DIMMPOWER=y +CONFIG_IPMB_DEVICE_INTERFACE=y diff --git a/meta-tyan/meta-s7106/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-tyan/meta-s7106/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..6307e1bb6 --- /dev/null +++ b/meta-tyan/meta-s7106/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI:append = " \ + file://s7106.cfg \ + " diff --git a/meta-tyan/meta-s7106/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-tyan/meta-s7106/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend new file mode 100644 index 000000000..9f7857036 --- /dev/null +++ b/meta-tyan/meta-s7106/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend @@ -0,0 +1 @@ +KCS_DEVICE = "ipmi-kcs1" -- cgit v1.2.3 From cf261cf7931c7b212a1b289cf9e8f82ad1cb573d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 16 Dec 2021 12:11:42 +0000 Subject: phosphor-logging: srcrev bump dd4bd482f1..f928c4a260 rajerpp1 (2): PEL: Fixing wrong callout of reference target PEL: Clock SBE HWP error handling support Change-Id: I39c5cc31cd91829d09afb769e01a64e33e19fd46 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index c4e4d1a61..6e112538e 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 = "dd4bd482f1009576a7a074cc63c6a9ce6698876d" +SRCREV = "f928c4a260f8fc3e7b72d0786e1f6a8345ebcaac" S = "${WORKDIR}/git" -- cgit v1.2.3 From 5b85fa5a554cdbcbd731abd06d466166e63362ea Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 22 Dec 2021 11:33:50 +1030 Subject: linux-aspeed: Add s7106, Bletchley, Vegman These are backports from the v5.17 aspeed pull request. Ali El-Haj-Mahmoud (1): ARM: dts: aspeed: Add TYAN S8036 BMC machine Andrei Kartashev (2): dt-bindings: vendor-prefixes: add YADRO ARM: dts: aspeed: add device tree for YADRO VEGMAN BMC Eddie James (2): ARM: dts: aspeed: p10: Enable USB host ports ARM: dts: aspeed: p10: Add TPM device Howard Chiu (1): ARM: dts: aspeed: Adding Facebook Bletchley BMC Jae Hyun Yoo (3): ARM: dts: aspeed: add LCLK setting into LPC IBT node ARM: dts: aspeed: add LCLK setting into LPC KCS nodes dt-bindings: ipmi: bt-bmc: add 'clocks' as a required property Joel Stanley (3): dt-bindings: aspeed: Add Secure Boot Controller bindings ARM: dts: aspeed: Add secure boot controller node ipmi: bt: Add ast2600 compatible string Lei YU (2): ARM: dts: Add openbmc-flash-layout-64-alt.dtsi ARM: dts: aspeed: g220a: Enable secondary flash Oskar Senft (1): ARM: dts: aspeed: tyan-s7106: Add uart_routing and fix vuart config Quan Nguyen (2): ARM: dts: aspeed: mtjade: Add I2C buses for NVMe devices ARM: dts: aspeed: mtjade: Add uefi partition Change-Id: I89371d3ab9c99415b3e971fbb62a6cad8b8e4b16 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 3208f9c9b..f06557204 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.15" LINUX_VERSION ?= "5.15.5" -SRCREV="ebd46c8290139e545fbb16201b2b26851a657baa" +SRCREV="c1649f9ee389fc155959bd87f4a1f5ac969187c7" require linux-aspeed.inc -- cgit v1.2.3 From 199901b364e8d501d0f8c9e245ce12d96da15199 Mon Sep 17 00:00:00 2001 From: Brian Ma Date: Tue, 21 Dec 2021 17:15:58 +0800 Subject: meta-google: os-release: Avoid effect not gbmc distro Add distro override to avoid os-release setting effect other not gbmc distro Signed-off-by: Brian Ma Change-Id: I34afb4ce8e72f2be15a5f5668e6ff6c567548ad5 --- meta-google/recipes-core/os-release/os-release.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-google/recipes-core/os-release/os-release.bbappend b/meta-google/recipes-core/os-release/os-release.bbappend index f6b7cc152..635f7c5ae 100644 --- a/meta-google/recipes-core/os-release/os-release.bbappend +++ b/meta-google/recipes-core/os-release/os-release.bbappend @@ -8,4 +8,4 @@ python() { } IMAGE_TYPE = "${GBMC_CONFIG}" -OS_RELEASE_FIELDS:append = " BUILD_MEMO IMAGE_TYPE" +OS_RELEASE_FIELDS:append:gbmc = " BUILD_MEMO IMAGE_TYPE" -- cgit v1.2.3 From 0b763d63e5b64a4fb5caf63afdf5a3ea31a79132 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 22 Dec 2021 00:00:55 +0000 Subject: bmcweb: srcrev bump 895e46d807..d1a648140e Ed Tanous (2): Make routing capture by const reference Add more types to DbusVariantType Spencer Ku (1): PCIe: Implement "PcieType" PCIe device property Change-Id: I4c66924f759da111235adc1cec64147dab5bd168 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index b9a9f7a23..9a80f0482 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "895e46d807d0afe6753753eb9ad8911897425b90" +SRCREV = "d1a648140e3cadd0ea6b0014c4d61ec880742000" S = "${WORKDIR}/git" -- cgit v1.2.3 From c66c1d09370ab40ca48be056e943e7c331cbb8d4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 21 Dec 2021 20:30:39 +0000 Subject: sdbusplus: srcrev bump 55949c29ad..e1353143b6 Patrick Williams (1): sdbus++: property: invalid Python symbol Change-Id: I7931da04684a56d2de4413f82871c11c803997a4 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 3d9a9e8ce..5e064218b 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" -SRCREV = "55949c29adbf88b05acc62ef972de7b5c6a21a4a" +SRCREV = "e1353143b6d8e5cdc7c9dcdc8c5a90000502dea2" -- cgit v1.2.3 From f4b7cd1673cf336ed5bdf45afeb9da68692c08f3 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 22 Dec 2021 12:18:26 +1030 Subject: linux-aspeed: Move to v5.15.10 stable release This includes security and bug fixes from the 5.15.6 through to 5.15.10 stable releases. Change-Id: Ib4e8e69386ba6c7857c22d8b2fb063c9d8d03b36 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index f06557204..f90c6278c 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.15" -LINUX_VERSION ?= "5.15.5" +LINUX_VERSION ?= "5.15.10" -SRCREV="c1649f9ee389fc155959bd87f4a1f5ac969187c7" +SRCREV="dd1e40cecc7ca43ce22552e380bbc00b720575f5" require linux-aspeed.inc -- cgit v1.2.3 From 54cfdab2070a7bf23b887286459cb6b8b10e14a4 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Wed, 22 Dec 2021 07:53:52 +0000 Subject: meta-ampere: mtjade: support NVME Temperature Enable phosphor-nvme with configuration for nvme_max sensor for FAN control support later. Tested: 1. Check NVME Temp: $ busctl get-property xyz.openbmc_project.nvme.manager \ /xyz/openbmc_project/sensors/temperature/nvme20 \ xyz.openbmc_project.Sensor.Value Value d 22 2. Check nvme_max has valid value $ busctl introspect xyz.openbmc_project.VirtualSensor \ /xyz/openbmc_project/sensors/temperature/nvme_max Signed-off-by: Thang Q. Nguyen Change-Id: Ied609ba5b5d39877c09ed04faff5063c7882a689 --- meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 + .../sensors/phosphor-nvme/nvme_config.json | 118 +++++++++++ .../sensors/phosphor-nvme_%.bbappend | 8 + .../virtual_sensor_config.json | 218 ++++++++++++++++++++- .../sensors/phosphor-virtual-sensor_%.bbappend | 8 +- 5 files changed, 346 insertions(+), 7 deletions(-) create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index ede176ad0..642e7469e 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -34,6 +34,7 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ mtjade-gpio-config \ ampere-platform-init \ ampere-ipmi-oem \ + phosphor-nvme \ " PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json new file mode 100644 index 000000000..9c2aade75 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json @@ -0,0 +1,118 @@ +{ + "config": [ + { + "NVMeDriveIndex": 0, + "NVMeDriveBusID": 50 + }, + { + "NVMeDriveIndex": 1, + "NVMeDriveBusID": 51 + }, + { + "NVMeDriveIndex": 2, + "NVMeDriveBusID": 52 + }, + { + "NVMeDriveIndex": 3, + "NVMeDriveBusID": 53 + }, + { + "NVMeDriveIndex": 4, + "NVMeDriveBusID": 54 + }, + { + "NVMeDriveIndex": 5, + "NVMeDriveBusID": 55 + }, + { + "NVMeDriveIndex": 6, + "NVMeDriveBusID": 56 + }, + { + "NVMeDriveIndex": 7, + "NVMeDriveBusID": 57 + }, + { + "NVMeDriveIndex": 8, + "NVMeDriveBusID": 60 + }, + { + "NVMeDriveIndex": 9, + "NVMeDriveBusID": 61 + }, + { + "NVMeDriveIndex": 10, + "NVMeDriveBusID": 62 + }, + { + "NVMeDriveIndex": 11, + "NVMeDriveBusID": 63 + }, + { + "NVMeDriveIndex": 12, + "NVMeDriveBusID": 64 + }, + { + "NVMeDriveIndex": 13, + "NVMeDriveBusID": 65 + }, + { + "NVMeDriveIndex": 14, + "NVMeDriveBusID": 66 + }, + { + "NVMeDriveIndex": 15, + "NVMeDriveBusID": 67 + }, + { + "NVMeDriveIndex": 16, + "NVMeDriveBusID": 70 + }, + { + "NVMeDriveIndex": 17, + "NVMeDriveBusID": 71 + }, + { + "NVMeDriveIndex": 18, + "NVMeDriveBusID": 72 + }, + { + "NVMeDriveIndex": 19, + "NVMeDriveBusID": 73 + }, + { + "NVMeDriveIndex": 20, + "NVMeDriveBusID": 74 + }, + { + "NVMeDriveIndex": 21, + "NVMeDriveBusID": 75 + }, + { + "NVMeDriveIndex": 22, + "NVMeDriveBusID": 76 + }, + { + "NVMeDriveIndex": 23, + "NVMeDriveBusID": 77 + }, + { + "NVMeDriveIndex": 24, + "NVMeDriveBusID": 80 + }, + { + "NVMeDriveIndex": 25, + "NVMeDriveBusID": 81 + } + ], + "threshold": [ + { + "criticalHigh": 80, + "criticalLow": 0, + "warningHigh": 70, + "warningLow": 5, + "maxValue": 127, + "minValue": -128 + } + ] +} diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend new file mode 100644 index 000000000..5eadc25f7 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += " file://nvme_config.json" + +do_install:append() { + install -m 0644 -D ${WORKDIR}/nvme_config.json \ + ${D}/etc/nvme +} diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json index d0dc76782..abacb4f65 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json @@ -8,12 +8,25 @@ "Threshold" : { }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade" + ] + ], "Params": { "DbusParam": [ { - "ParamName": "PSU0_POUTPUT", + "ParamName": "P0", "Desc": { "Name": "PSU0_POUTPUT", @@ -21,7 +34,7 @@ } }, { - "ParamName": "PSU1_POUTPUT", + "ParamName": "P1", "Desc": { "Name": "PSU1_POUTPUT", @@ -30,7 +43,206 @@ } ] }, - "Expression": "PSU0_POUTPUT + PSU1_POUTPUT" + "Expression": "(P0 + P1) >= 0 ? (P0 + P1) : NULL" + }, + { + "Desc":{ + "Name":"nvme_max", + "SensorType":"temperature" + }, + "Threshold":{ + "CriticalHigh": 80, + "CriticalLow": 0, + "WarningHigh": 70, + "WarningLow": 5 + }, + "Params":{ + "DbusParam": [ + { + "ParamName": "n0", + "Desc": { + "Name": "nvme0", + "SensorType": "temperature" + } + }, + { + "ParamName": "n1", + "Desc": { + "Name": "nvme1", + "SensorType": "temperature" + } + }, + { + "ParamName": "n2", + "Desc": { + "Name": "nvme2", + "SensorType": "temperature" + } + }, + { + "ParamName": "n3", + "Desc": { + "Name": "nvme3", + "SensorType": "temperature" + } + }, + { + "ParamName": "n4", + "Desc": { + "Name": "nvme4", + "SensorType": "temperature" + } + }, + { + "ParamName": "n5", + "Desc": { + "Name": "nvme5", + "SensorType": "temperature" + } + }, + { + "ParamName": "n6", + "Desc": { + "Name": "nvme6", + "SensorType": "temperature" + } + }, + { + "ParamName": "n7", + "Desc": { + "Name": "nvme7", + "SensorType": "temperature" + } + }, + { + "ParamName": "n8", + "Desc": { + "Name": "nvme8", + "SensorType": "temperature" + } + }, + { + "ParamName": "n9", + "Desc": { + "Name": "nvme9", + "SensorType": "temperature" + } + }, + { + "ParamName": "n10", + "Desc": { + "Name": "nvme10", + "SensorType": "temperature" + } + }, + { + "ParamName": "n11", + "Desc": { + "Name": "nvme11", + "SensorType": "temperature" + } + }, + { + "ParamName": "n12", + "Desc": { + "Name": "nvme12", + "SensorType": "temperature" + } + }, + { + "ParamName": "n13", + "Desc": { + "Name": "nvme13", + "SensorType": "temperature" + } + }, + { + "ParamName": "n14", + "Desc": { + "Name": "nvme14", + "SensorType": "temperature" + } + }, + { + "ParamName": "n15", + "Desc": { + "Name": "nvme15", + "SensorType": "temperature" + } + }, + { + "ParamName": "n16", + "Desc": { + "Name": "nvme16", + "SensorType": "temperature" + } + }, + { + "ParamName": "n17", + "Desc": { + "Name": "nvme17", + "SensorType": "temperature" + } + }, + { + "ParamName": "n18", + "Desc": { + "Name": "nvme18", + "SensorType": "temperature" + } + }, + { + "ParamName": "n19", + "Desc": { + "Name": "nvme19", + "SensorType": "temperature" + } + }, + { + "ParamName": "n20", + "Desc": { + "Name": "nvme20", + "SensorType": "temperature" + } + }, + { + "ParamName": "n21", + "Desc": { + "Name": "nvme21", + "SensorType": "temperature" + } + }, + { + "ParamName": "n22", + "Desc": { + "Name": "nvme22", + "SensorType": "temperature" + } + }, + { + "ParamName": "n23", + "Desc": { + "Name": "nvme23", + "SensorType": "temperature" + } + }, + { + "ParamName": "n24", + "Desc": { + "Name": "nvme24", + "SensorType": "temperature" + } + }, + { + "ParamName": "n25", + "Desc": { + "Name": "nvme25", + "SensorType": "temperature" + } + } + ] + }, + "Expression": "max(0,(n0 == n0) ? n0 : NULL,(n1 == n1) ? n1 : NULL,(n2 == n2) ? n2 : NULL,(n3 == n3) ? n3 : NULL,(n4 == n4) ? n4 : NULL,(n5 == n5) ? n5 : NULL,(n6 == n6) ? n6 : NULL,(n7 == n7) ? n7 : NULL,(n8 == n8) ? n8 : NULL,(n9 == n9) ? n9 : NULL,(n10 == n10) ? n10 : NULL,(n11 == n11) ? n11 : NULL,(n12 == n12) ? n12 : NULL,(n13 == n13) ? n13 : NULL,(n14 == n14) ? n14 : NULL,(n15 == n15) ? n15 : NULL,(n16 == n16) ? n16 : NULL,(n17 == n17) ? n17 : NULL,(n18 == n18) ? n18 : NULL,(n19 == n19) ? n19 : NULL,(n20 == n20) ? n20 : NULL,(n21 == n21) ? n21 : NULL,(n22 == n22) ? n22 : NULL,(n23 == n23) ? n23 : NULL,(n24 == n24) ? n24 : NULL,(n25 == n25) ? n25 : NULL)" } ] diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 3a1af4f3b..0d1b5e63c 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,10 +1,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI:append:mtjade += " \ - file://virtual_sensor_config.json \ - " +SRC_URI:append += " \ + file://virtual_sensor_config.json \ + " -do_install:append:mtjade() { +do_install:append() { install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/ } -- cgit v1.2.3 From 775dfa41360e48d926489c18553fb4997d4f7d37 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Wed, 22 Dec 2021 09:54:52 +0000 Subject: meta-ampere: mtjade: clean up phosphor-hwmon configs Disable phosphor-hwmon from compilation and clean up sensor inventory which added before for phosphor-hwmon. Tested: 1. Check if no phosphor-hwmon compiled and run 2. Check all S0 and S1 ADC sensors are still available in Redfish. Signed-off-by: Thang Q. Nguyen Change-Id: Ic6ac13963e755e6ef0d93b3f6486546c61b1abe0 --- .../phosphor-inventory-manager/associations.json | 63 +--------------------- .../packagegroups/packagegroup-obmc-apps.bbappend | 14 +++-- 2 files changed, 10 insertions(+), 67 deletions(-) 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 e7b3256a8..5e535d502 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 @@ -72,68 +72,7 @@ "/xyz/openbmc_project/sensors/fan_tach/FAN8_1", "/xyz/openbmc_project/sensors/fan_tach/FAN8_2", "/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1", - "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1", - - "/xyz/openbmc_project/sensors/temperature/TS1_Temp", - "/xyz/openbmc_project/sensors/temperature/TS2_Temp", - "/xyz/openbmc_project/sensors/temperature/TS3_Temp", - "/xyz/openbmc_project/sensors/temperature/TS4_Temp", - "/xyz/openbmc_project/sensors/temperature/TS5_Temp", - "/xyz/openbmc_project/sensors/temperature/TS6_Temp", - "/xyz/openbmc_project/sensors/temperature/PSU0_TEMP", - "/xyz/openbmc_project/sensors/temperature/PSU1_TEMP", - - "/xyz/openbmc_project/sensors/voltage/S0_0V8_VDDC_SOC", - "/xyz/openbmc_project/sensors/voltage/S0_0V75_PCP", - "/xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ0123", - "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT0123", - "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP0123", - "/xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ4567", - "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT4567", - "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP4567", - "/xyz/openbmc_project/sensors/voltage/S0_0V85_RCA", - "/xyz/openbmc_project/sensors/voltage/S0_1V8_VDDH", - "/xyz/openbmc_project/sensors/voltage/S0_1V5_VDDH", - "/xyz/openbmc_project/sensors/voltage/S0_1V8_SOC", - "/xyz/openbmc_project/sensors/voltage/S0_1V8_PCP", - "/xyz/openbmc_project/sensors/voltage/S0_3V3_SOC", - "/xyz/openbmc_project/sensors/voltage/S0_CPU_VCORE", - "/xyz/openbmc_project/sensors/voltage/S0_DIMM_DDR_Volt", - "/xyz/openbmc_project/sensors/voltage/S0_DIMM_VR1_Volt", - "/xyz/openbmc_project/sensors/voltage/S0_DIMM_VR2_Volt", - "/xyz/openbmc_project/sensors/voltage/S0_RCA_VR_Volt", - "/xyz/openbmc_project/sensors/voltage/S0_SOC_Volt", - "/xyz/openbmc_project/sensors/voltage/S1_0V8_VDDC_SOC", - "/xyz/openbmc_project/sensors/voltage/S1_0V75_PCP", - "/xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ0123", - "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT0123", - "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP0123", - "/xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ4567", - "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT4567", - "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP4567", - "/xyz/openbmc_project/sensors/voltage/S1_0V85_RCA", - "/xyz/openbmc_project/sensors/voltage/S1_1V8_VDDH", - "/xyz/openbmc_project/sensors/voltage/S1_1V5_VDDH", - "/xyz/openbmc_project/sensors/voltage/S1_1V8_SOC", - "/xyz/openbmc_project/sensors/voltage/S1_1V8_PCP", - "/xyz/openbmc_project/sensors/voltage/S1_3V3_SOC", - "/xyz/openbmc_project/sensors/voltage/3V3_SB", - "/xyz/openbmc_project/sensors/voltage/VBAT_RTC", - "/xyz/openbmc_project/sensors/voltage/PSU0_VINPUT", - "/xyz/openbmc_project/sensors/voltage/PSU0_VOUTPUT", - "/xyz/openbmc_project/sensors/voltage/PSU1_VINPUT", - "/xyz/openbmc_project/sensors/voltage/PSU1_VOUTPUT", - - "/xyz/openbmc_project/sensors/power/PSU0_PINPUT", - "/xyz/openbmc_project/sensors/power/PSU1_PINPUT", - "/xyz/openbmc_project/sensors/power/PSU0_POUTPUT", - "/xyz/openbmc_project/sensors/power/PSU1_POUTPUT", - "/xyz/openbmc_project/sensors/power/total_power", - - "/xyz/openbmc_project/sensors/current/PSU0_IINPUT", - "/xyz/openbmc_project/sensors/current/PSU0_IOUTPUT", - "/xyz/openbmc_project/sensors/current/PSU1_IINPUT", - "/xyz/openbmc_project/sensors/current/PSU1_IOUTPUT" + "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1" ] } ] diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 56db56883..7b27a7edd 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -3,13 +3,17 @@ RDEPENDS:${PN}-extras:append:mtjade = " \ phosphor-image-signing \ phosphor-virtual-sensor \ phosphor-misc-usb-ctrl \ - " + fault-monitor \ + id-button \ + psu-hotswap-reset \ + " RDEPENDS:${PN}-inventory:append:mtjade = " \ - fault-monitor \ - id-button \ - psu-hotswap-reset \ host-gpio-handling \ dbus-sensors \ entity-manager \ - " + " + +RDEPENDS:${PN}-extras:remove:mtjade = " phosphor-hwmon" +VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors" +RDEPENDS:${PN}-extras:append:mtjade = " phosphor-virtual-sensor" -- cgit v1.2.3 From 8c3075a3a50ec16c8c9fb93a1785a5abb13386c5 Mon Sep 17 00:00:00 2001 From: Potin Lai Date: Mon, 13 Dec 2021 23:13:02 +0800 Subject: meta-aspeed: Enable tpm2 kernel config Append tpm2 in MACHINE_FEATURES to enable related kernel configs MACHINE_FEATURES:append = " tpm2" Signed-off-by: Potin Lai Change-Id: Ie6b50d81040de2863487cffc449193ec9462bf89 --- meta-aspeed/recipes-kernel/linux/linux-aspeed.inc | 1 + meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.cfg | 6 ++++++ meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.scc | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.cfg create mode 100644 meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.scc diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc index aa060295f..6098885d5 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc @@ -12,6 +12,7 @@ SRC_URI += " \ file://defconfig \ file://rsa_oem_fitimage_key.key;sha256sum=eeb4ff2ebbfbd97b6254fe6dbaeea41067e54c65176c233ec7b2ab2decf1ddcd \ file://rsa_oem_fitimage_key.crt;sha256sum=45f5a55497cce8040999bf9f3214d471ac7b83ab7acef41c4425a34662e8372e \ + ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'file://tpm/tpm2.scc', '', d)} \ " LINUX_VERSION_EXTENSION ?= "-${SRCREV}" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.cfg b/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.cfg new file mode 100644 index 000000000..9479a7b41 --- /dev/null +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.cfg @@ -0,0 +1,6 @@ +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y +CONFIG_TCG_TIS_SPI=y +CONFIG_SECURITYFS=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.scc b/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.scc new file mode 100644 index 000000000..088148fec --- /dev/null +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/tpm/tpm2.scc @@ -0,0 +1,3 @@ +define KFEATURE_DESCRIPTION "Enable TPM 2.0" + +kconf hardware tpm2.cfg -- cgit v1.2.3 From 56541269b22ccd15c75e938d4fa2e0a7969f8ccf Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 21 Dec 2021 20:31:35 +0000 Subject: phosphor-virtual-sensor: srcrev bump 05b1d41788..190e4bf8a4 Patrick Williams (1): README: format changes suggested by markdownlint Change-Id: Iafbda607f4ef8bee638acf3c2d66f7bd197c8d43 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5465d7038..5b57f865c 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -16,7 +16,7 @@ DEPENDS += "nlohmann-json" DEPENDS += "exprtk" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=https" -SRCREV = "05b1d41788058cdf255ce1d46b2ff8041abf5656" +SRCREV = "190e4bf8a434a04c7426d7ea30a8ba2171a61741" S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "phosphor-virtual-sensor.service" -- cgit v1.2.3 From af3c30e591e6dd38541969ff201087f46d68f864 Mon Sep 17 00:00:00 2001 From: Potin Lai Date: Wed, 22 Dec 2021 14:17:40 +0800 Subject: meta-bletchley: kernel: enable SPI_GPIO config enable SPI_GPIO feature Signed-off-by: Potin Lai Change-Id: I24bb13acfbddcff14c5f15fbd9262ba1b019d9f7 --- .../meta-bletchley/recipes-kernel/linux/linux-aspeed/bletchley.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/bletchley.cfg b/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/bletchley.cfg index c77b942a1..49e07a291 100644 --- a/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/bletchley.cfg +++ b/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/bletchley.cfg @@ -25,3 +25,6 @@ CONFIG_RTC_DRV_PCF85363=y CONFIG_TYPEC=y CONFIG_TYPEC_TCPM=y CONFIG_TYPEC_FUSB302=y +# SPI GPIO +CONFIG_SPI_GPIO=y +CONFIG_SPI_BITBANG=y -- cgit v1.2.3 From da05a16b41d429bd7c1229b377b8bfa948d61281 Mon Sep 17 00:00:00 2001 From: Potin Lai Date: Fri, 17 Dec 2021 13:30:28 +0800 Subject: meta-bletchley: enable bletchley dts select aspeed-bmc-facebook-bletchley.dts for build Signed-off-by: Potin Lai Change-Id: I85503d876b959a2f220ad84b6a9ddba047e89c80 --- meta-facebook/meta-bletchley/conf/machine/bletchley.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf index b3480f5c5..d69357b0c 100644 --- a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf +++ b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf @@ -1,6 +1,5 @@ -#KMACHINE = "aspeed" -#KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb" -KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb" +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb" UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" UBOOT_DEVICETREE = "ast2600a1-evb" -- cgit v1.2.3 From 0eb09a13b1e395c0ff09d794cc11bd1513a6b935 Mon Sep 17 00:00:00 2001 From: Howard Chiu Date: Thu, 9 Dec 2021 13:27:04 +0800 Subject: meta-bletchley: Add init service to setup system To setup GPIOs and set fan speed to 70% Signed-off-by: Howard Chiu Signed-off-by: Potin Lai Change-Id: I7a64e19b6e34bcab7013b382d19d7be6156bf87a --- .../plat-svc/files/bletchley-early-sys-init | 82 ++++++++++++++++++++++ .../plat-svc/files/bletchley-sys-init.service | 11 +++ .../recipes-bletchley/plat-svc/plat-svc_0.1.bb | 25 +++++++ .../images/obmc-phosphor-image.bbappend | 5 +- 4 files changed, 122 insertions(+), 1 deletion(-) create mode 100755 meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-early-sys-init create mode 100644 meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-sys-init.service create mode 100644 meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-early-sys-init b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-early-sys-init new file mode 100755 index 000000000..90a3f72af --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-early-sys-init @@ -0,0 +1,82 @@ +#!/bin/bash -e + +set_gpio() +{ + NET_NAME=$1 + OUT_VAL=$2 + mapfile -t -d " " GPIO_INFO < <(gpiofind "$NET_NAME") + if [ "${#GPIO_INFO[@]}" -ne 2 ]; then + echo "set_gpio: can not find gpio, $NET_NAME" + return 1 + fi + + echo -n "set_gpio: set $NET_NAME = $OUT_VAL" + if ! gpioset "${GPIO_INFO[0]}" "${GPIO_INFO[1]%$'\n'}"="$OUT_VAL"; then + echo " failed" + return 1 + fi + + echo " success" + return 0 +} + +set_fan() +{ + FAN_ID=$1 + FAN_DUTY=$2 + SYSFA_PWM_PATH="" + + for file in /sys/devices/platform/pwm-fan"$FAN_ID"/hwmon/hwmon*/pwm1 + do + if [ -e "$file" ]; then + SYSFA_PWM_PATH="$file" + break + fi + done + + if [ -z "$SYSFA_PWM_PATH" ]; then + echo "set_fan: pwm file not found, chekc fan id ($FAN_ID)" + return 1 + fi + + if [ "$FAN_DUTY" -lt 0 ] || [ "$FAN_DUTY" -gt 100 ]; then + echo "set_fan: incorrect fan duty, $FAN_DUTY" + return 1 + fi + + # convert duty (0-100) to pwm value (0-255) + PWM_VAL=$(printf "%.0f" $((FAN_DUTY*255/100))) + + echo -n "set_fan: set fan$FAN_ID = $FAN_DUTY" + if ! echo "$PWM_VAL" > "$SYSFA_PWM_PATH"; then + echo " failed" + return 1 + fi + + echo " success" + return 0 +} + +# set initial value for GPIO output pins +set_gpio SEL_SPI2_MUX 1 +set_gpio SPI2_MUX1 1 +set_gpio SPI2_MUX2 1 +set_gpio SPI2_MUX3 1 +set_gpio SWITCH_FRU_MUX 1 +set_gpio BAT_DETECT 1 +set_gpio BMC_BT_WP0 1 +set_gpio BMC_BT_WP1 1 +set_gpio USB2_SEL0_A 1 +set_gpio USB2_SEL1_A 1 +set_gpio USB2_SEL0_B 1 +set_gpio USB2_SEL1_B 1 +set_gpio RST_FRONT_IOEXP 1 +set_gpio BSM_FLASH_LATCH 1 + +# set initial duty value for each fan +set_fan 0 70 +set_fan 1 70 +set_fan 2 70 +set_fan 3 70 + +exit 0; diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-sys-init.service b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-sys-init.service new file mode 100644 index 000000000..481225990 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/files/bletchley-sys-init.service @@ -0,0 +1,11 @@ +[Unit] +Description=Bletchley Early System Init +Before=phosphor-pid-control.service + +[Service] +Type=oneshot +ExecStart=/usr/libexec/bletchley-early-sys-init +SyslogIdentifier=Bletchley Early Init + +[Install] +WantedBy=multi-user.target diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb new file mode 100644 index 000000000..dcbf6e88a --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bletchley/plat-svc/plat-svc_0.1.bb @@ -0,0 +1,25 @@ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch systemd + +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "libgpiod-tools" + +SRC_URI += " \ + file://bletchley-early-sys-init \ + file://bletchley-sys-init.service \ + " + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN}:append = " \ + bletchley-sys-init.service \ + " + +do_install() { + install -d ${D}${libexecdir} + install -m 0755 ${WORKDIR}/bletchley-early-sys-init ${D}${libexecdir} + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/bletchley-sys-init.service ${D}${systemd_system_unitdir} +} diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend index 11096e1c4..a13903c39 100644 --- a/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1,4 @@ -OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-nvme" +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + phosphor-nvme \ + plat-svc \ +" -- cgit v1.2.3 From d303b7b434d871384abc0f50b5ed26102f7f8537 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 22 Dec 2021 13:51:25 +0000 Subject: phosphor-power: srcrev bump 391a069004..925c0263d0 Brandon Wyman (1): psu-ng: Change pgoodFault type to size_t Change-Id: I2ec58d0b87beed89296d822f32814022a807aa8b Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 477498d90..31644a25c 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 = "391a0690043baafbe96b7962a3e843101c53fcb7" +SRCREV = "925c0263d0bfdccfa6fc6511679f2d6c27afa08c" -- cgit v1.2.3 From d4c91051815b66e4fae4cba579b0c605ce542e7a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 22 Dec 2021 14:11:39 +0000 Subject: phosphor-user-manager: srcrev bump ce4e1aa087..ce89bfcd3b Jiaqing Zhao (1): Set expiry date to 1970-01-01 to disable account Change-Id: Idf0e9b011a221ac06335df4c1b23461a74a5ed05 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 21d1c814f..df16638bf 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -41,5 +41,5 @@ DBUS_SERVICE:phosphor-ldap = " \ xyz.openbmc_project.LDAP.PrivilegeMapper.service \ " SRC_URI += "git://github.com/openbmc/phosphor-user-manager" -SRCREV = "ce4e1aa087ca4ce62069106482285c1acf13499b" +SRCREV = "ce89bfcd3b4744675bd32bb83f87c4148837ecf8" S = "${WORKDIR}/git" -- cgit v1.2.3 From 03966b5b2d3d50a740ed8a1190a902c10f1e692a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 22 Dec 2021 16:21:09 +0000 Subject: phosphor-health-monitor: srcrev bump 9d29b378d3..a6cd704bda Konstantin Aladyshev (1): Set unset threshold values to NaN Change-Id: I551a81437255dfd9085b0ec4bd8eb4e1ad06476f Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bbc3e2564..8139bfd19 100644 --- a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" SRC_URI = "git://github.com/openbmc/phosphor-health-monitor.git;protocol=https" -SRCREV = "9d29b378d369166399cb1817f7591711f2060170" +SRCREV = "a6cd704bda72e39e1b94652a9eb0733da8498791" S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "phosphor-health-monitor.service" -- cgit v1.2.3 From c8d90aa929a4705a03d578aca6e1672c02c8b999 Mon Sep 17 00:00:00 2001 From: Naveen Moses Date: Thu, 7 Oct 2021 18:20:33 +0530 Subject: sync bmc time from ipmb host This script runs at startup as systemd service. It checks if the bmc time is in sync from NTP server. otherwise it reads the host time via ipmb interface and updates as bmc time. This change was tested and verified in yosemitev2 and tiogapass platforms. Signed-off-by: Naveen Moses Change-Id: I8c937c16415b2dd05d05155facadc0bed797db07 --- .../phosphor-time-manager/bmc-set-time.service | 12 +++ .../phosphor-time-manager/set-bmc-time-from-host | 116 +++++++++++++++++++++ .../datetime/phosphor-time-manager_%.bbappend | 19 ++++ 3 files changed, 147 insertions(+) create mode 100644 meta-facebook/recipes-phosphor/datetime/phosphor-time-manager/bmc-set-time.service create mode 100644 meta-facebook/recipes-phosphor/datetime/phosphor-time-manager/set-bmc-time-from-host create mode 100644 meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend diff --git a/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager/bmc-set-time.service b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager/bmc-set-time.service new file mode 100644 index 000000000..e148b535f --- /dev/null +++ b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager/bmc-set-time.service @@ -0,0 +1,12 @@ +[Unit] +Description= Sync time from host via ipmb +Wants=ipmb.service xyz.openbmc_project.Network.service +After=ipmb.service xyz.openbmc_project.Network.service + +[Service] +Type=onshot +ExecStart=/usr/libexec/set-bmc-time-from-host +RemainAfterExit=no + +[Install] +WantedBy=multi-user.target diff --git a/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager/set-bmc-time-from-host b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager/set-bmc-time-from-host new file mode 100644 index 000000000..40b3b8cbc --- /dev/null +++ b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager/set-bmc-time-from-host @@ -0,0 +1,116 @@ +#!/bin/bash +#BMC set time from host +set -e + +echo "set-bmc-time-from-host is started" +# Sync BMC's date with one of the four servers + +HOST_INSTANCES="HOST_INSTANCES_SED_REPLACEMENT_VALUE" +MAX_RETRY_LIMIT=6 + +check_NTP_status() +{ + timedatectl show --property=NTPSynchronized --value +} + +get_single_host_time() +{ + for (( retry=1; retry<=5; retry++ )) + do + #request the single host time via ipmb command + # which will be set as bmc time + # 0x01 - me channel | 0x0a - storage net fn | 0x00 - lun + # 0x48 - get SEL time + ipmi_cmd_output=$(busctl call xyz.openbmc_project.Ipmi.Channel.Ipmb \ + "/xyz/openbmc_project/Ipmi/Channel/Ipmb" org.openbmc.Ipmb sendRequest \ + yyyyay 0x01 0x0a 0x00 0x48 0) + ipmb_result=$? + if [ "$ipmb_result" == "0" ];then + sleep 1 + break + fi + done + + if [ "$retry" == "$MAX_RETRY_LIMIT" ];then + exit 1 + fi + + echo "$ipmi_cmd_output" + +} + +get_multi_host_datetime() +{ + ipmbAddr=$1 + for (( retry=1; retry<=5; retry++ )) + do + #request the multihost host time via ipmb command + # which will be set as bmc time + # 0x38 - oem net fn | 0x00 - lun | 0x02 - request to bridge ic cmd + # 0x6 - length | IANA id 0x15 0xA0 0x0 |0x48 - get SEL time + + ipmi_cmd_output=$(busctl call xyz.openbmc_project.Ipmi.Channel.Ipmb \ + /xyz/openbmc_project/Ipmi/Channel/Ipmb org.openbmc.Ipmb sendRequest \ + yyyyay "$ipmbAddr" 0x38 0 0x2 6 0x15 0xA0 0x0 0x1 0x28 0x48) + ipmb_result=$? + if [ $ipmb_result == 0 ];then + break + fi + sleep 1 + done + + echo "$ipmi_cmd_output" +} +sync_multi_host_datetime() +{ + for index in $HOST_INSTANCES + do + ipmb_addr=$(((index-1)*4)) + # Use standard IPMI command 'SendRequest method' to read RTC time + echo "chosen ipmb addr : "$ipmb_addr + multi_host_time_result=$(get_multi_host_datetime $ipmb_addr) + + if [[ $(echo "$multi_host_time_result" | awk '{ print NF }') -eq 18 ]]; + then + echo "syncing up host " $index " date time with bmc..." + date -s @$((0x$(echo "$multi_host_time_result" | \ + awk '{printf "%02x%02x%02x%02x",$18,$17,$16,$15}'))) + sync + break + fi + done + +} +sync_single_host_datetime() +{ + single_host_time_result=$(get_single_host_time) + + if [[ $(echo "$single_host_time_result" | awk '{ print NF }') -eq 11 ]]; + then + echo "Syncing up host date time with bmc..." + date -s @$((0x$(echo "$single_host_time_result" | \ + awk '{printf "%02x%02x%02x%02x",$11,$10,$9,$8}'))) + sync + fi + +} + +#wait for the NTP server start if available. +sleep 60 + +NTP_STATUS=$(check_NTP_status) + +echo "NTP status :""$NTP_STATUS" + +if [ "$NTP_STATUS" == "yes" ]; then + echo "NTP is running and system clock is in sync.skiping host time sync..." + exit 0 +fi + +if [ "$HOST_INSTANCES" == "0" ]; then + echo "single host instance" + sync_single_host_datetime +else + echo "multiple host instance" + sync_multi_host_datetime +fi diff --git a/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend new file mode 100644 index 000000000..97ea50d80 --- /dev/null +++ b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend @@ -0,0 +1,19 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append:fb-withhost += "file://set-bmc-time-from-host" + + +RDEPENDS:${PN}:append:fb-withhost += "bash" + +do_install:append:fb-withhost(){ + + # Store the bitbake variable OBMC_HOST_INSTANCES inside time sync script as HOST_INSTANCES variable using sed. + sed -i -e "s,HOST_INSTANCES_SED_REPLACEMENT_VALUE,${OBMC_HOST_INSTANCES},g" ${WORKDIR}/set-bmc-time-from-host + + install -d ${D}$/lib/systemd/system + install -m 0644 ${WORKDIR}/bmc-set-time.service ${D}$/lib/systemd/system + install -d ${D}/usr/libexec + install -m 0777 ${WORKDIR}/set-bmc-time-from-host ${D}/usr/libexec +} + +SYSTEMD_SERVICE:${PN}:fb-withhost += "bmc-set-time.service" -- cgit v1.2.3 From c6fad74c88fd5b14320347cc8b4ca647e6fd5a3e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 23 Dec 2021 03:51:15 +0000 Subject: webui-vue: srcrev bump 799bcd3fb4..00cb42b615 Kenneth (1): Fixed empty string in NTP server array Kenneth Fullbright (1): Fixed routerKey prop eslint warning Change-Id: I7efcb431be084a0c6eecbf6dca782d6edfc93876 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 70282c2c5..e02fa773c 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 = "799bcd3fb476c7a0c38a4779aa91f59a7c931c6a" +SRCREV = "00cb42b615602bb6563ff02f91158eb2e3b603fc" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " -- cgit v1.2.3 From c5437e904a53dbe1b32dde7521a0b7ffc7959be4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 24 Dec 2021 11:01:19 +0000 Subject: phosphor-host-ipmid: srcrev bump e39ba9930b..0ce6a5771d P Dheeraj Srujan Kumar (1): Enable encoding/decoding object paths Change-Id: I552a87ecbe68e5f87de2e104a4ed4a132e56bfed Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 673ea5b98..d3aabc7ee 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 = "e39ba9930b66ed46b15147f4f12dd7f92b63da32" +SRCREV = "0ce6a5771d00f8c37f43daf722ed6774324342a8" -- cgit v1.2.3 From 8814712ce5a5cb1bdeb384d60152fee2a78a53dd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 24 Dec 2021 11:01:00 +0000 Subject: bmcweb: srcrev bump d1a648140e..b477fd4408 P Dheeraj Srujan Kumar (1): Enable encoding/decoding object paths of User Name Change-Id: I500bd6fc2af42b73a0de86fe2a9603ba5ce0ff36 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 9a80f0482..88e89ceed 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://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "d1a648140e3cadd0ea6b0014c4d61ec880742000" +SRCREV = "b477fd4408bc0602cc86147121f03791d3f4824a" S = "${WORKDIR}/git" -- cgit v1.2.3 From 5015014321e9863440bc4e8fb69e581cea7242c1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 24 Dec 2021 11:01:44 +0000 Subject: phosphor-user-manager: srcrev bump ce89bfcd3b..b01e2fe760 P Dheeraj Srujan Kumar (1): Enable encoding object paths of User Name Change-Id: I744563c2a6c75ea110f371ddd572a8ed1e0b3790 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 df16638bf..fe9d515ef 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -41,5 +41,5 @@ DBUS_SERVICE:phosphor-ldap = " \ xyz.openbmc_project.LDAP.PrivilegeMapper.service \ " SRC_URI += "git://github.com/openbmc/phosphor-user-manager" -SRCREV = "ce89bfcd3b4744675bd32bb83f87c4148837ecf8" +SRCREV = "b01e2fe760eb04ae9d0d13716a127056949e2601" S = "${WORKDIR}/git" -- cgit v1.2.3 From a3021266199a66d65d5d43f8fbea0bc6ac81d834 Mon Sep 17 00:00:00 2001 From: Potin Lai Date: Fri, 24 Dec 2021 14:59:26 +0800 Subject: meta-bletchley: phosphor-network: enable sync-mac 1. Enable sync-mac 2. add inventory mapping config Signed-off-by: Potin Lai Change-Id: I441c00c22d7f1c0e3d0c9f83b9cc149007acd781 --- .../recipes-phosphor/network/phosphor-network/config.json | 3 +++ .../recipes-phosphor/network/phosphor-network_%.bbappend | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network/config.json create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network/config.json b/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network/config.json new file mode 100644 index 000000000..52280a4e6 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network/config.json @@ -0,0 +1,3 @@ +{ + "eth0":"ethernet" +} diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 000000000..ae025bbc6 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +PACKAGECONFIG:append = " sync-mac" +SRC_URI:append = " file://config.json " +FILES:${PN} += "${datadir}/network/*.json" + +do_install:append() { + install -d ${D}${datadir}/network/ + install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/ +} -- cgit v1.2.3 From 98bfffe201a3633eab34f86e910c0ba1f78ebeae Mon Sep 17 00:00:00 2001 From: Potin Lai Date: Fri, 24 Dec 2021 13:32:18 +0800 Subject: meta-bletchley: read fru from eeprom and store to inventory area 1. create configuration layer for fru yaml config 2. add fru eeprom path and id config 3. add FRU_YAML_GEN in phosphor-ipmi-host bbappend Test: root@bletchley:~# busctl introspect xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/bmc NAME TYPE SIGNATURE RESULT/VALUE FLAGS org.freedesktop.DBus.Introspectable interface - - - .Introspect method - s - org.freedesktop.DBus.Peer interface - - - .GetMachineId method - s - .Ping method - - - org.freedesktop.DBus.Properties interface - - - .Get method ss v - .GetAll method s a{sv} - .Set method ssv - - .PropertiesChanged signal sa{sv}as - - xyz.openbmc_project.Inventory.Decorator.Asset interface - - - .BuildDate property s "2021-12-21 - 07:56:00" emits-change writable .Manufacturer property s "Quanta" emits-change writable .Model property s "" emits-change writable .PartNumber property s "3RL19MA0000" emits-change writable .SerialNumber property s "1234567890123" emits-change writable .SparePartNumber property s "" emits-change writable .SubModel property s "" emits-change writable xyz.openbmc_project.Inventory.Decorator.Revision interface - - - .Version property s "FRU Ver 0.01" emits-change writable xyz.openbmc_project.Inventory.Item interface - - - .Present property b false emits-change writable .PrettyName property s "Bletchley -Class 1" emits-change writable xyz.openbmc_project.Inventory.Item.Bmc interface - - - xyz.openbmc_project.Inventory.Item.Board interface - - - root@bletchley:~# busctl introspect xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/bmc/ethernet NAME TYPE SIGNATURE RESULT/VALUE FLAGS org.freedesktop.DBus.Introspectable interface - - - .Introspect method - s - org.freedesktop.DBus.Peer interface - - - .GetMachineId method - s - .Ping method - - - org.freedesktop.DBus.Properties interface - - - .Get method ss v - .GetAll method s a{sv} - .Set method ssv - - .PropertiesChanged signal sa{sv}as - - xyz.openbmc_project.Inventory.Item.Ethernet interface - - - xyz.openbmc_project.Inventory.Item.NetworkInterface interface - - - .MACAddress property s "3AD664F68D3F" emits-change writable Signed-off-by: Potin Lai Change-Id: I70d624885abaa13639a0617b356554aa6c88af57 --- .../configuration/bletchley-yaml-config.bb | 23 +++++++++++++ .../bletchley-yaml-config/bletchley-ipmi-fru.yaml | 38 ++++++++++++++++++++++ .../obmc/eeproms/system/chassis/bmc | 2 ++ .../ipmi/phosphor-ipmi-fru_%.bbappend | 26 +++++++++++++++ .../ipmi/phosphor-ipmi-host_%.bbappend | 5 +++ 5 files changed, 94 insertions(+) create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config.bb create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config/bletchley-ipmi-fru.yaml create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config.bb b/meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config.bb new file mode 100644 index 000000000..7a8f8471c --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config.bb @@ -0,0 +1,23 @@ +SUMMARY = "YAML configuration for bletchley" +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://bletchley-ipmi-fru.yaml \ + " + +S = "${WORKDIR}" + +do_install() { + install -m 0644 -D bletchley-ipmi-fru.yaml \ + ${D}${datadir}/${BPN}/ipmi-fru-read.yaml +} + +FILES:${PN}-dev = " \ + ${datadir}/${BPN}/ipmi-fru-read.yaml \ + " + +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config/bletchley-ipmi-fru.yaml b/meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config/bletchley-ipmi-fru.yaml new file mode 100644 index 000000000..8c53a2a7c --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/configuration/bletchley-yaml-config/bletchley-ipmi-fru.yaml @@ -0,0 +1,38 @@ +0: + /system/chassis/bmc: + entityID: 7 + 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 + xyz.openbmc_project.Inventory.Item.Board: + xyz.openbmc_project.Inventory.Item.Bmc: + + /system/chassis/bmc/ethernet: + entityID: 7 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item.NetworkInterface: + MACAddress: + IPMIFruProperty: Custom Field 3 + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item.Ethernet: \ No newline at end of file diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc new file mode 100644 index 000000000..b1bd018a6 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/7-0054/eeprom +FRUID=0 \ No newline at end of file diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..0c78a8f52 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,26 @@ +inherit obmc-phosphor-systemd + +FILESEXTRAPATHS:prepend:bletchley := "${THISDIR}/${PN}:" + +DEPENDS:append:bletchley = " bletchley-yaml-config" + +EXTRA_OECONF:bletchley = " \ + YAML_GEN=${STAGING_DIR_HOST}${datadir}/bletchley-yaml-config/ipmi-fru-read.yaml \ + " + +EEPROM_NAMES = "bmc" + +EEPROMFMT = "system/chassis/{0}" +EEPROM_ESCAPEDFMT = "system-chassis-{0}" +EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" +EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" + +ENVFMT = "obmc/eeproms/{0}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:bletchley := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" + +TMPL = "obmc-read-eeprom@.service" +TGT = "${SYSTEMD_DEFAULT_TARGET}" +INSTFMT = "obmc-read-eeprom@{0}.service" +FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" + +SYSTEMD_LINK:${PN}:append:bletchley := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 000000000..fd303a04b --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,5 @@ +DEPENDS:append:bletchley = " bletchley-yaml-config" + +EXTRA_OECONF:bletchley = " \ + FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/bletchley-yaml-config/ipmi-fru-read.yaml \ + " -- cgit v1.2.3 From 25d6d06ed7d674b4c0158259ed4faad877af2034 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 28 Dec 2021 12:40:44 +0000 Subject: sdbusplus: srcrev bump e1353143b6..6adfe948ee Krzysztof Grobelny (1): Simplified code examples Change-Id: If51836eeec4c7a1e7374e58201a6319877c5d678 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 5e064218b..8fa74450e 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" -SRCREV = "e1353143b6d8e5cdc7c9dcdc8c5a90000502dea2" +SRCREV = "6adfe948ee55ffde8457047042d0d55aa3d8b4a7" -- cgit v1.2.3 From 4a9bc3fabd7c3c8291d4e678f1702cb7a1fb4a21 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 28 Dec 2021 08:51:19 +0000 Subject: webui-vue: srcrev bump 00cb42b615..f4328edf86 MichalX Szopinski (1): Remove hardcoded chassis in Manage power usage Change-Id: Ida08706de53a11d770ec54fbe1bdae5c5638aecb Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index e02fa773c..8b4a72f5d 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 = "00cb42b615602bb6563ff02f91158eb2e3b603fc" +SRCREV = "f4328edf86b284fe8836717251ce6696670dbdd5" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " -- cgit v1.2.3 From f55ce54a59100c100ee98aa5b3f4482a3f0f1d35 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 28 Dec 2021 06:31:54 +0000 Subject: phosphor-post-code-manager: srcrev bump de8d3a537f..f5e52db77c Alan Kuo (1): Fix 'usTimeOffset' was not declared error Change-Id: Id3d0f0ff317a0df20f72bc9a56a69193d30552b2 Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4485cb55b..483b8fe03 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." SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git" -SRCREV = "de8d3a537fec2e0b36791cc53aeb963fc746d1da" +SRCREV = "f5e52db77cb580b2a6e9b95d06e26bfd185627d9" S = "${WORKDIR}/git" -- cgit v1.2.3 From 90d36a1088d824f4988419ab70572bb6e2254d7a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 28 Dec 2021 00:31:10 +0000 Subject: phosphor-led-manager: srcrev bump 23d5408ba8..db6d763891 George Liu (1): Fix sdbus++-gen-meson version warning Change-Id: Ia2ee3228640512577c4215990bd3f3fcd9c4e84e Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 5c2cc97fe..c740185d9 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 = "23d5408ba8050e12ec31cba66f3f111d6200d70c" +SRCREV = "db6d763891a8526197478c24616b8740f92742d5" -- cgit v1.2.3 From df3e3304aeaae66608fc5fb3c9213607f4635c44 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 21 Dec 2021 05:20:32 +0000 Subject: openpower-vpd-parser: srcrev bump ec912e6c0d..26d6c146d2 Sunny Srivastava (1): Copy record data from parent FRU Change-Id: Ic631143ac0e09eb3c7c83dccdd6818142a27facc Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index cbb6f82bc..3a590a8c8 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ 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" -SRCREV = "ec912e6c0de2ff32c895ef681958052e0039e64f" +SRCREV = "26d6c146d265de6f0b6b66baf3951298c0418a67" -- cgit v1.2.3 From 16657ece7be5e9e59c295b396440db4447e8b48d Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 28 Dec 2021 21:19:03 -0600 Subject: meta-bletchley: phosphor-network: use += style for append Signed-off-by: Patrick Williams Change-Id: I19d92019649ba990dcc33ac1bc25c4ebadc933b6 --- .../recipes-phosphor/network/phosphor-network_%.bbappend | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend index ae025bbc6..b91e82f91 100644 --- a/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-facebook/meta-bletchley/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,7 +1,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PACKAGECONFIG:append = " sync-mac" -SRC_URI:append = " file://config.json " +SRC_URI += " \ + file://config.json \ + " FILES:${PN} += "${datadir}/network/*.json" do_install:append() { -- cgit v1.2.3 From d58f23c78a2501d4b6ed36a74c23de28595d4f78 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 28 Dec 2021 21:36:33 -0600 Subject: meta-facebook: add fb-phosphor-image.inc Builds done using facebook/openbmc do not use the 'obmc-phosphor-image' image name, but instead use 'MACHINE-image'. This means that bbappend files have no effect and we need a different method to get consistent sets of include files. Introduce 'fb-phosphor-image.inc' and 'fb-MACHINE-phosphor-image.inc' as the replacements for the obmc-phosphor-image.bbappend. Signed-off-by: Patrick Williams Change-Id: I166342c1744d1cd0237f8c75d90d87153fb19b35 --- .../recipes-phosphor/images/fb-bletchley-phosphor-image.inc | 4 ++++ .../recipes-phosphor/images/obmc-phosphor-image.bbappend | 4 ---- meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc | 9 +++++++++ .../recipes-phosphor/images/obmc-phosphor-image.bbappend | 12 ++++-------- 4 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc delete mode 100644 meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend create mode 100644 meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc new file mode 100644 index 000000000..8fa7252e7 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc @@ -0,0 +1,4 @@ +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + phosphor-nvme \ + plat-svc \ + " diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend deleted file mode 100644 index a13903c39..000000000 --- a/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -OBMC_IMAGE_EXTRA_INSTALL:append = " \ - phosphor-nvme \ - plat-svc \ -" diff --git a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc new file mode 100644 index 000000000..fbc80809c --- /dev/null +++ b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc @@ -0,0 +1,9 @@ +IMAGE_FEATURES:remove:fb-nohost = "obmc-console" + +OBMC_IMAGE_EXTRA_INSTALL:append = "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', \ + bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2', '', d), \ + '', d)} \ + " + +include recipes-phosphor/images/fb-${MACHINE}-phosphor-image.inc diff --git a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend index ba9cc1fe8..23979e66d 100644 --- a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,9 +1,5 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +require recipes-phosphor/images/fb-phosphor-image.inc -IMAGE_FEATURES:remove:fb-nohost = "obmc-console" - -OBMC_IMAGE_EXTRA_INSTALL:append = "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', \ - bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2', '', d), \ - '', d)} \ - " +# Please do not add any content directly to this file. Instead add it to +# the corresponding .inc file. Otherwise, builds from facebook/openbmc will +# not be able to pick up your content. -- cgit v1.2.3 From 4a0948d0184e35770ca24cd591e9a29fd5ff44a6 Mon Sep 17 00:00:00 2001 From: "Allen.Wang" Date: Wed, 15 Dec 2021 13:41:18 +0800 Subject: meta-bletchley: Add services to control step motor For Bletchley platform, we can only power on system by step motor to press power key. Add tools and service to initialize step motor and control system power by motor. Signed-off-by: Allen.Wang Change-Id: Ic75352a037566d701b2e362743c527c370b0c2e5 Signed-off-by: Patrick Williams --- .../meta-bletchley/conf/machine/bletchley.conf | 3 + .../motor-ctrl/files/host-poweroff@.service | 10 ++ .../motor-ctrl/files/host-poweron@.service | 10 ++ .../recipes-bletchley/motor-ctrl/files/motor-ctrl | 101 +++++++++++ .../recipes-bletchley/motor-ctrl/files/motor-init | 185 +++++++++++++++++++++ .../files/motor-init-calibration@.service | 11 ++ .../recipes-bletchley/motor-ctrl/files/power-ctrl | 178 ++++++++++++++++++++ .../recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb | 37 +++++ .../images/fb-bletchley-phosphor-image.inc | 3 +- 9 files changed, 537 insertions(+), 1 deletion(-) create mode 100644 meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/host-poweroff@.service create mode 100644 meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/host-poweron@.service create mode 100755 meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-ctrl create mode 100755 meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-init create mode 100644 meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-init-calibration@.service create mode 100755 meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/power-ctrl create mode 100644 meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb diff --git a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf index d69357b0c..6b7711a62 100644 --- a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf +++ b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf @@ -13,3 +13,6 @@ require conf/machine/include/facebook-tpm2.inc FLASH_SIZE = "131072" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "bletchley-led-manager-config-native" + +OBMC_HOST_INSTANCES = "0 1 2 3 4 5 " + diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/host-poweroff@.service b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/host-poweroff@.service new file mode 100644 index 000000000..50cd53283 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/host-poweroff@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Power off System in Sled%i by Step Motor +Requires=motor-init-calibration@%i.service +After=motor-init-calibration@%i.service + +[Service] +Type=oneshot +ExecStart=/usr/sbin/power-ctrl sled%i off +SyslogIdentifier=power-ctrl + diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/host-poweron@.service b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/host-poweron@.service new file mode 100644 index 000000000..6ff11202d --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/host-poweron@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Power on System in Sled%i by Step Motor +Requires=motor-init-calibration@%i.service +After=motor-init-calibration@%i.service + +[Service] +Type=oneshot +ExecStart=/usr/sbin/power-ctrl sled%i on +SyslogIdentifier=power-ctrl + diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-ctrl b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-ctrl new file mode 100755 index 000000000..3f8f2ca21 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-ctrl @@ -0,0 +1,101 @@ +#!/bin/bash -e +# +# Control step motor rotate of sled + +function set_gpio() +{ + NET_NAME=$1 + OUT_VAL=$2 + mapfile -t -d " " GPIO_INFO < <(gpiofind "$NET_NAME") + if [ "${#GPIO_INFO[@]}" -ne 2 ]; then + echo "set_gpio: can not find gpio, $NET_NAME" + return 1 + fi + echo -n "set_gpio: set $NET_NAME = $OUT_VAL" + if ! gpioset "${GPIO_INFO[0]}" "${GPIO_INFO[1]%$'\n'}"="$OUT_VAL"; then + echo " failed" + return 1 + fi + echo " success" + return 0 +} + +#Get i2c bus number for sledN +function get_bus_num() { + SLED_NUM=$1 + local bus=0 + + if [[ "$SLED_NUM" = [0-5] ]]; then + bus="$SLED_NUM" + fi + echo "$bus" +} + +#Enable sledN Motor VRef +function open_vref() { + i2cset -f -y "${1}" 0x67 0x06 0x95 +} + +#Disable sledN Motor VRef +function close_vref() { + i2cset -f -y "${1}" 0x67 0x06 0x55 +} + +####################################### +# Setting step motor control pins to start/stop motor +# Arguments: +# 1. SLED NUMBER +# 2. Value of STBY RESET PIN +# 3. Value of ENABLE PIN +# 4. Value of DIRECTION PIN +####################################### +function set_motor() { + STBY_PIN="SLED${1}_MD_STBY_RESET" + EN_PIN="SLED${1}_MD_IOEXP_EN_FAULT" + DIR_PIN="SLED${1}_MD_DIR" + set_gpio "$STBY_PIN" "$2" + set_gpio "$EN_PIN" "$3" + set_gpio "$DIR_PIN" "$4" +} + +function show_usage(){ + echo "Usage: motor-ctrl [sled0 | sled1 | sled2 | sled3 | sled4 | sled5] [f r s]" + echo " f : Step Motor go forward" + echo " r : Step Motor go reverse" + echo " s : Step Motor stop " +} + +if [ $# -ne 2 ]; then + show_usage + exit 1; +fi + +if [[ "$1" =~ ^(slot[0-5]{1})$ ]] || [[ "$1" =~ ^(sled[0-5]{1})$ ]]; then + SLED=$1 + SLED_NUM=${SLED:4} + I2C_NUM=$(get_bus_num "$SLED_NUM") + ACTION=$2 +else + echo "invalid sled name: $1" + exit 1; +fi + +if [[ "$ACTION" == "s" ]]; then + echo "stop motor" + set_motor "$SLED_NUM" 1 0 0 + close_vref "$I2C_NUM" +elif [[ "$ACTION" == "f" ]];then + echo "start motor, direction:forward" + set_motor "$SLED_NUM" 1 1 0 + open_vref "$I2C_NUM" +elif [[ "$ACTION" == "r" ]];then + echo "start motor, direction:reverse" + set_motor "$SLED_NUM" 1 1 1 + open_vref "$I2C_NUM" +else + echo "Error: Unknown action!" + exit 1 +fi + +exit 0 + diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-init b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-init new file mode 100755 index 000000000..cecb99618 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-init @@ -0,0 +1,185 @@ +#!/bin/bash -e + +# Initialize for step motor of sled: +# Enable pwm and setup pwm duty +# Setup gpio pins for step motor control +# Moving step motor back to initial position + +export PATH=$PATH:/usr/libexec + +PWM_BASE_ADDR="0x1e61" +DEV_FILE="/dev/mem" +CALIBRATE_TIMEOUT=120 + +#Get pwm register address for sledN +function get_pwm_offset() { + local offset=0 + case $1 in + 0) + offset="0080" + ;; + 1) + offset="0090" + ;; + 2) + offset="00a0" + ;; + 3) + offset="00b0" + ;; + 4) + offset="00c0" + ;; + 5) + offset="00d0" + ;; + esac + + echo ${PWM_BASE_ADDR}${offset} +} + +#Get pwm duty register address for sledN +function get_duty_offset() { + local offset=0 + case $1 in + 0) + offset="0084" + ;; + 1) + offset="0094" + ;; + 2) + offset="00a4" + ;; + 3) + offset="00b4" + ;; + 4) + offset="00c4" + ;; + 5) + offset="00d4" + ;; + esac + + echo ${PWM_BASE_ADDR}${offset} +} + +#Enable pwm for sledN +function open_pwm() { + local SLED_NUM="$1" + echo "Open pwm of sled$SLED_NUM" + #enable BMC PWM + if [ ! -c "$DEV_FILE" ]; then + mknod /dev/mem c 1 1 + fi + + PWM_OFFSET=$(get_pwm_offset "$SLED_NUM") + DUTY_OFFSET=$(get_duty_offset "$SLED_NUM") + echo "setting ${PWM_OFFSET} to 0x000113F3" + echo "setting ${DUTY_OFFSET} to 0xFF006400" + devmem "$PWM_OFFSET" 32 0x000113F3 + devmem "$DUTY_OFFSET" 32 0xFF006400 +} + +function set_gpio() +{ + NET_NAME=$1 + OUT_VAL=$2 + mapfile -t -d " " GPIO_INFO < <(gpiofind "$NET_NAME") + if [ "${#GPIO_INFO[@]}" -ne 2 ]; then + echo "set_gpio: can not find gpio, $NET_NAME" + return 1 + fi + echo -n "set_gpio: set $NET_NAME = $OUT_VAL" + if ! gpioset "${GPIO_INFO[0]}" "${GPIO_INFO[1]%$'\n'}"="$OUT_VAL"; then + echo " failed" + return 1 + fi + echo " success" + return 0 +} + +function get_gpio() +{ + NET_NAME=$1 + RET_VAL=2 + + mapfile -t -d " " GPIO_INFO < <(gpiofind "$NET_NAME") + if [ "${#GPIO_INFO[@]}" -ne 2 ]; then + echo "get_gpio: can not find gpio, $NET_NAME" >&2 + return 1 + fi + if ! RET_VAL=$(gpioget "${GPIO_INFO[0]}" "${GPIO_INFO[1]%$'\n'}") ; then + echo "get_gpio: get ${NET_NAME} failed" >&2 + return 1 + fi + echo "${RET_VAL}" + return 0 +} + +#Init gpio pins for step motor control +function init_gpios() { + echo "Init GPIOs:" + motor_ctrl_gpio_pins_names=( "SLED${1}_MD_STBY_RESET" + "SLED${1}_MD_IOEXP_EN_FAULT" + "SLED${1}_MD_DIR" + "SLED${1}_MD_DECAY" + "SLED${1}_MD_MODE1" + "SLED${1}_MD_MODE2" + "SLED${1}_MD_MODE3" ) + + for gpio_name in "${motor_ctrl_gpio_pins_names[@]}"; do + set_gpio "$gpio_name" 0 + done +} + +if [[ "$1" =~ ^(slot[0-5]{1})$ ]] || [[ "$1" =~ ^(sled[0-5]{1})$ ]]; then + SLED=$1 + SLED_NUM=${SLED:4} +else + #show_usage + echo "invalid sled name: ${1}" + exit 1; +fi + +#Check if sled is present +SLED_PRESENT=$(get_gpio "presence-sled${SLED_NUM}") +if [ "$SLED_PRESENT" != 0 ];then + echo "${SLED} is not present, skip motor initialize" + exit 1 +fi + +#Init gpios +init_gpios "$SLED_NUM" + +#enable pwm +open_pwm "$SLED_NUM" + +#SLED{N}_MS_DETECT1 (initial position) +DETECT_PIN1="SLED${SLED_NUM}_MS_DETECT1" +INIT_POS=$(get_gpio "$DETECT_PIN1") + +if [ "$INIT_POS" -eq 1 ];then + time_count=0 + echo "Making motor back to initial position..." + motor-ctrl "$SLED" r >/dev/null + while [ "$INIT_POS" -eq 1 ] ;do + INIT_POS=$(get_gpio "$DETECT_PIN1") + sleep 0.1 + time_count=$(( time_count + 1 )) + if [ $time_count -gt $CALIBRATE_TIMEOUT ];then + echo "Error: Step motor run over 1 cycle but switch never triggered" + break + fi + done + motor-ctrl "$SLED" s >/dev/null +fi + +if [ "$INIT_POS" -eq 0 ];then + echo "Motor calibrated to initial position." + exit 0 +else + echo "Find motor initial position failed" + exit 1 +fi diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-init-calibration@.service b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-init-calibration@.service new file mode 100644 index 000000000..aab61b7fe --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/motor-init-calibration@.service @@ -0,0 +1,11 @@ +[Unit] +Description=Motor Initialize for sled%i + +[Service] +ExecStart=/usr/libexec/motor-init sled%i +SyslogIdentifier=Motor Initialize sled%i +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/power-ctrl b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/power-ctrl new file mode 100755 index 000000000..111ce8bbc --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/files/power-ctrl @@ -0,0 +1,178 @@ +#!/bin/bash +# +# Power Control tool +# Enable/disable AC relay +# On/off System by step moter to press power key + +export PATH=$PATH:/usr/sbin:/usr/libexec + +DELAY_POWER_ON="0.5" +DELAY_POWER_OFF="5" +POWER_BTN_TIMEOUT_CNT=60 + +#Switch pull low while it be touched +function wait_for_switch() { + TARGET_PIN=$1 + TARGET_SWITCH=1 + TIME_CNT=0 + while [ "$TARGET_SWITCH" -eq 1 ] ;do + TARGET_SWITCH=$(get_gpio "$TARGET_PIN") + sleep 0.1 + TIME_CNT=$(( TIME_CNT +1)) + if [ $TIME_CNT -gt $POWER_BTN_TIMEOUT_CNT ];then + echo "Error: Too long to get target switch, force exit" >&2 + break + fi + done +} + +function trigger_power_button() { + local sled_num=$1 + local delay_time=$2 + + #SLED{N}_MS_DETECT1 (initial position) + GPIO_DETECT_PIN1="SLED${sled_num}_MS_DETECT1" + #SLED{N}_MS_DETECT0 (MAC position) + GPIO_DETECT_PIN0="SLED${sled_num}_MS_DETECT0" + + echo "Motor go forward to press Power key" + motor-ctrl "sled${sled_num}" f >/dev/null + wait_for_switch "${GPIO_DETECT_PIN0}" + motor-ctrl "sled${sled_num}" s >/dev/null + + if [ "$(get_gpio "$GPIO_DETECT_PIN0")" -eq 0 ];then + echo "Power key switch triggered" + echo "Press power key for Sled${1} ${delay_time} seconds..." + sleep "$delay_time" + else + echo "Power key switch not trigger, back motor to initail position" + fi + + motor-ctrl "sled${sled_num}" r >/dev/null + wait_for_switch "${GPIO_DETECT_PIN1}" + motor-ctrl "sled${sled_num}" s >/dev/null + if [ "$(get_gpio "$GPIO_DETECT_PIN1")" -eq 0 ];then + echo "Motor reverse to initial position successful" + else + echo "Initail position switch not trigger, force stop motor" + fi +} + +#Get i2c bus number for sledN +function get_bus_num() { + SLED_NUM=$1 + local bus=0 + + if [[ "$SLED_NUM" = [0-5] ]]; then + bus="$SLED_NUM" + fi + echo "$bus" +} + +function set_gpio() +{ + NET_NAME=$1 + OUT_VAL=$2 + mapfile -t -d " " GPIO_INFO < <(gpiofind "$NET_NAME") + if [ "${#GPIO_INFO[@]}" -ne 2 ]; then + echo "set_gpio: can not find gpio, $NET_NAME" + return 1 + fi + echo -n "set_gpio: set $NET_NAME = $OUT_VAL" + if ! gpioset "${GPIO_INFO[0]}" "${GPIO_INFO[1]%$'\n'}"="$OUT_VAL"; then + echo " failed" + return 1 + fi + echo " success" + return 0 +} + +function get_gpio() +{ + NET_NAME=$1 + RET_VAL=2 + + mapfile -t -d " " GPIO_INFO < <(gpiofind "$NET_NAME") + if [ "${#GPIO_INFO[@]}" -ne 2 ]; then + echo "get_gpio: can not find gpio, $NET_NAME" >&2 + return 1 + fi + if ! RET_VAL=$(gpioget "${GPIO_INFO[0]}" "${GPIO_INFO[1]%$'\n'}") ; then + echo "get_gpio: get ${NET_NAME} failed" >&2 + return 1 + fi + echo "${RET_VAL}" + return 0 +} + +function get_ac_status(){ + i2c_bus=$(get_bus_num "$1") + p1_output_reg=$(i2cget -f -y "$i2c_bus" 0x76 0x03) + p1_config_reg=$(i2cget -f -y "$i2c_bus" 0x76 0x07) + host_pwr="$(( (p1_output_reg & 0x80)>>7 ))" + is_output="$(( (~p1_config_reg & 0x80)>>7 ))" + + if [ "$(( host_pwr & is_output ))" -eq 1 ];then + echo "AC on" + else + echo "AC off" + fi +} + +function show_usage(){ + echo "Usage: power-ctrl [sled0 | sled1 | sled2 | sled3 | sled4 | sled5] [on off ac-on ac-off status]" + echo " power-ctrl chassis-cycle" +} + +if [ $# -eq 1 ]; then + if [ "$1" = "chassis-cycle" ];then + echo "chassis cycle...." + i2cset -y -f 12 0x11 0xd9 c + exit 0 + else + echo "Invalid argument: [ $1 ]" + show_usage + exit 1; + fi +fi + +if [ $# -gt 2 ]; then + echo "Too many arguments" + show_usage + exit 1; +fi + +if [[ "$1" =~ ^(slot[0-5]{1})$ ]] || [[ "$1" =~ ^(sled[0-5]{1})$ ]]; then + SLED=$1 + ACTION=$2 + SLED_NUM=${SLED:4} +else + echo "invalid sled name: ${1}" + show_usage + exit 1; +fi + +#Check if sled is present +SLED_PRESENT=$(get_gpio "presence-sled${SLED_NUM}") +if [ "$SLED_PRESENT" != 0 ];then + echo "${SLED} is not present!" + exit 1 +fi + +if [[ "$ACTION" == "on" ]]; then + echo "Power on ${SLED}" + trigger_power_button "$SLED_NUM" "$DELAY_POWER_ON" +elif [[ "$ACTION" == "off" ]];then + echo "Power off ${SLED}" + trigger_power_button "$SLED_NUM" "$DELAY_POWER_OFF" +elif [[ "$ACTION" == "status" ]];then + get_ac_status "$SLED_NUM" + #TODO : check or record Host(DC) power status +elif [[ "$ACTION" == "ac-on" ]];then + set_gpio "power-host${SLED_NUM}" 1 +elif [[ "$ACTION" == "ac-off" ]];then + set_gpio "power-host${SLED_NUM}" 0 +else + echo "Unknown action: [ ${ACTION} ]" + show_usage +fi diff --git a/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb new file mode 100644 index 000000000..2705eb850 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bletchley/motor-ctrl/motor-ctrl_0.1.bb @@ -0,0 +1,37 @@ +SUMMARY = "Bletchley Motor control" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit obmc-phosphor-systemd + +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "libgpiod-tools" +RDEPENDS:${PN} += "i2c-tools" + +S = "${WORKDIR}" +SRC_URI += "file://motor-init \ + file://motor-ctrl \ + file://power-ctrl " + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${WORKDIR}/power-ctrl ${D}${sbindir} + + install -d ${D}${libexecdir} + install -m 0755 ${WORKDIR}/motor-init ${D}${libexecdir} + install -m 0755 ${WORKDIR}/motor-ctrl ${D}${libexecdir} +} + +MOTOR_INIT_INSTFMT= "motor-init-calibration@{0}.service" +PWR_ON_INSTFMT="host-poweron@.service:host-poweron@{0}.service" +PWR_OFF_INSTFMT="host-poweroff@.service:host-poweroff@{0}.service" + +SYSTEMD_SERVICE:${PN} ="${@compose_list(d, 'MOTOR_INIT_INSTFMT', 'OBMC_HOST_INSTANCES')}" +FILES:${PN} += "${systemd_system_unitdir}/motor-init-calibration@.service" + +SYSTEMD_SERVICE:${PN} +="host-poweron@.service" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PWR_ON_INSTFMT', 'OBMC_HOST_INSTANCES')}" + +SYSTEMD_SERVICE:${PN} +="host-poweroff@.service" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PWR_OFF_INSTFMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc index 8fa7252e7..6636f5090 100644 --- a/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc +++ b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc @@ -1,4 +1,5 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ phosphor-nvme \ plat-svc \ - " + motor-ctrl \ +" -- cgit v1.2.3 From 51a992da77acde9850afc13e93685640319d86e3 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Thu, 30 Dec 2021 04:35:08 +0000 Subject: meta-ampere: redfish: remove Chassis chassis instance The chassis instance when implementing sensor monitor using dbus-sensor/entity-manager is /redfish/v1/Chassis/ where is defined from entity-manager configuration. This commit removes /redfish/v1/Chassis/chassis which is redundant and make incorrect link from other schema like ComputerSystem and BMC Manager. Tested: 1. Check no /redfish/v1/Chassis/chassis available. 2. Check all sensors are available in /redfish/v1/Chassis/Mt_Jade. Signed-off-by: Thang Q. Nguyen Change-Id: I334a94bb65c3caa49d0bcb6ab03a42f7999728d5 --- .../inventory/inventory-cleanup.bb | 17 +++++ .../inventory-cleanup/inventory-cleanup.yaml | 16 +++++ .../inventory/inventory-cleanup.bb | 17 ----- .../inventory-cleanup/inventory-cleanup.yaml | 16 ----- .../phosphor-inventory-manager/associations.json | 80 ---------------------- .../phosphor-inventory-manager_%.bbappend | 10 --- 6 files changed, 33 insertions(+), 123 deletions(-) create mode 100644 meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb create mode 100644 meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend diff --git a/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb new file mode 100644 index 000000000..1b5a119b1 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb @@ -0,0 +1,17 @@ +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 new file mode 100644 index 000000000..23f54e331 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml @@ -0,0 +1,16 @@ +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-jade/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb deleted file mode 100644 index 1b5a119b1..000000000 --- a/meta-ampere/meta-jade/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-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml deleted file mode 100644 index 3fa190852..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml +++ /dev/null @@ -1,16 +0,0 @@ -description: > - Mt.Jade 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-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json deleted file mode 100644 index 5e535d502..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json +++ /dev/null @@ -1,80 +0,0 @@ -[ - { - "path": "system/chassis/motherboard/powersupply0", - "endpoints": - [ - { - "types": - { - "rType": "inventory", - "fType": "sensors" - }, - "paths": - [ - "/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1", - "/xyz/openbmc_project/sensors/temperature/PSU0_TEMP", - "/xyz/openbmc_project/sensors/voltage/PSU0_VINPUT", - "/xyz/openbmc_project/sensors/voltage/PSU0_VOUTPUT", - "/xyz/openbmc_project/sensors/power/PSU0_PINPUT", - "/xyz/openbmc_project/sensors/power/PSU0_POUTPUT", - "/xyz/openbmc_project/sensors/current/PSU0_IINPUT", - "/xyz/openbmc_project/sensors/current/PSU0_IOUTPUT" - ] - } - ] - }, - { - "path": "system/chassis/motherboard/powersupply1", - "endpoints": - [ - { - "types": - { - "rType": "inventory", - "fType": "sensors" - }, - "paths": - [ - "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1", - "/xyz/openbmc_project/sensors/temperature/PSU1_TEMP", - "/xyz/openbmc_project/sensors/voltage/PSU1_VINPUT", - "/xyz/openbmc_project/sensors/voltage/PSU1_VOUTPUT", - "/xyz/openbmc_project/sensors/power/PSU1_PINPUT", - "/xyz/openbmc_project/sensors/power/PSU1_POUTPUT", - "/xyz/openbmc_project/sensors/current/PSU1_IINPUT", - "/xyz/openbmc_project/sensors/current/PSU1_IOUTPUT" - ] - } - ] - }, - { - "path": "system/chassis", - "endpoints": - [ - { - "types": - { - "rType": "chassis", - "fType": "all_sensors" - }, - "paths": - [ - "/xyz/openbmc_project/sensors/fan_tach/FAN3_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN3_2", - "/xyz/openbmc_project/sensors/fan_tach/FAN4_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN4_2", - "/xyz/openbmc_project/sensors/fan_tach/FAN5_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN5_2", - "/xyz/openbmc_project/sensors/fan_tach/FAN6_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN6_2", - "/xyz/openbmc_project/sensors/fan_tach/FAN7_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN7_2", - "/xyz/openbmc_project/sensors/fan_tach/FAN8_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN8_2", - "/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1", - "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1" - ] - } - ] - } -] 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 deleted file mode 100644 index ab3030879..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -DEPENDS:append:mtjade = " inventory-cleanup" - -FILESEXTRAPATHS:prepend:mtjade := "${THISDIR}/${PN}:" -PACKAGECONFIG:append:mtjade = " associations" -SRC_URI:append:mtjade = " file://associations.json" - -do_install:append:mtjade() { - install -d ${D}${base_datadir} - install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir} -} -- cgit v1.2.3 From 81878cce3ee6a6b4920ad663479ad37a6f6c64fa Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Thu, 30 Dec 2021 05:43:02 +0000 Subject: Revert "meta-ampere: mtjade: support PSU present detection via GPIO" By replacing phosphor-hwmon by dbus-sensor, PSU presence detection via GPIO does not work anymore and it causes confiction with dbus-sensor's PSUSensor. Revert the commit to avoid the confliction Change-Id: Idfd54325c122921a3c5df062bce1b6909b643999 Signed-off-by: Thang Q. Nguyen --- .../recipes-ac01/packagegroups/packagegroup-ampere-apps.bb | 1 - meta-ampere/meta-jade/conf/machine/mtjade.conf | 2 -- .../obmc/gpio/phosphor-power-supply-0.conf | 6 ------ .../obmc/gpio/phosphor-power-supply-1.conf | 6 ------ .../recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend | 12 ------------ 5 files changed, 27 deletions(-) delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb index ede8d9db5..9f1461905 100644 --- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb +++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb @@ -26,7 +26,6 @@ RDEPENDS:${PN}-chassis = " \ phosphor-hostlogger \ phosphor-sel-logger \ phosphor-logging \ - virtual/obmc-gpio-presence \ " SUMMARY:${PN}-system = "Ampere System" diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 642e7469e..40bd0f81e 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -14,8 +14,6 @@ FLASH_KERNEL_OFFSET = "1024" FLASH_ROFS_OFFSET = "10240" FLASH_RWFS_OFFSET = "43008" -OBMC_POWER_SUPPLY_INSTANCES = "0 1" - MACHINE_FEATURES += "\ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf deleted file mode 100644 index c5fc23ace..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf +++ /dev/null @@ -1,6 +0,0 @@ -INVENTORY=/system/chassis/motherboard/powersupply0 -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=64 -NAME=powersupply0 -DRIVERS=/sys/bus/i2c/drivers/pmbus,6-0058 -EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf deleted file mode 100644 index e591227d2..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf +++ /dev/null @@ -1,6 +0,0 @@ -INVENTORY=/system/chassis/motherboard/powersupply1 -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=65 -NAME=powersupply1 -DRIVERS=/sys/bus/i2c/drivers/pmbus,6-0059 -EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend deleted file mode 100644 index 527cbbda0..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" -INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" -POWERSUPPLY_TGT = "multi-user.target" -FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" - -SYSTEMD_LINK:${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" - -POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" - -SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -- cgit v1.2.3 From 0ee50bdd6b0ba3cd7da17fe0f6ccce2312521d0f Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Thu, 30 Dec 2021 07:42:36 -0600 Subject: meta-facebook: enable allow-root-login root is only added to a number of required groups if either `debug-tweaks` or `allow-root-login` is on (see phosphor-rootfs-postcommands.bbclass). For internal builds we turn off `debug-tweaks`, so add `allow-root-login` to our IMAGE_FEATURES since we need it on everywhere. Signed-off-by: Patrick Williams Change-Id: Ic65dce4fd5374a6a9c8389c67693b980a2b5509c --- meta-facebook/conf/machine/include/facebook.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 47b641dfc..c61237934 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -15,6 +15,7 @@ PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_wo PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" IMAGE_FEATURES:remove = "obmc-ikvm" +IMAGE_FEATURES:append = " allow-root-login" # Most of our hardware uses the default ttyS4 but at 57600. SERIAL_CONSOLES:facebook = "57600;ttyS4" -- cgit v1.2.3 From 851a10e54604704eabed9f565f29e98627521fc6 Mon Sep 17 00:00:00 2001 From: zhanghaicheng Date: Thu, 23 Dec 2021 09:44:26 +0800 Subject: Fix the config error of u-boot-env When using 64M flash, the config of u-boot CONFIG_ENV_SIZE and CONFIG_ENV_OFFSET is wrong. The config file fw_env.config is wrong, too. Modify them according to the 64M flash dts file. Before correcting these errors, when we used setenv to set environment variables in u-boot, we could not use fw_printenv to get them. The reverse is also the same. Because they set different offset and size. Tested: 1. Use commands in u-boot: setenv test value saveenv After BMC starts, use fw_printenv can get "test=value" 2. Use the command to change the value of "test" fw_setenv test v We can get "test=v" in u-boot by printenv. Signed-off-by: zhanghaicheng Change-Id: I9eccf6abe743253b6f8c344a8b8648e68ab52019 --- meta-aspeed/conf/machine/distro/include/uboot-distrovars.inc | 1 + meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_64M_nor.config | 2 ++ meta-aspeed/recipes-bsp/u-boot/files/u-boot_flash_64M.cfg | 2 ++ meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb | 2 ++ meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb | 3 +++ 5 files changed, 10 insertions(+) create mode 100644 meta-aspeed/conf/machine/distro/include/uboot-distrovars.inc create mode 100644 meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_64M_nor.config create mode 100644 meta-aspeed/recipes-bsp/u-boot/files/u-boot_flash_64M.cfg diff --git a/meta-aspeed/conf/machine/distro/include/uboot-distrovars.inc b/meta-aspeed/conf/machine/distro/include/uboot-distrovars.inc new file mode 100644 index 000000000..81dcd3e5a --- /dev/null +++ b/meta-aspeed/conf/machine/distro/include/uboot-distrovars.inc @@ -0,0 +1 @@ +OVERRIDES .= ":uboot-flash-${FLASH_SIZE}" diff --git a/meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_64M_nor.config b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_64M_nor.config new file mode 100644 index 000000000..52d088266 --- /dev/null +++ b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_flash_64M_nor.config @@ -0,0 +1,2 @@ +# MTD device name Device offset Env. size Flash sector size Number of sectors +/dev/mtd/u-boot-env 0x0000 0x20000 0x1000 diff --git a/meta-aspeed/recipes-bsp/u-boot/files/u-boot_flash_64M.cfg b/meta-aspeed/recipes-bsp/u-boot/files/u-boot_flash_64M.cfg new file mode 100644 index 000000000..b0f3f2891 --- /dev/null +++ b/meta-aspeed/recipes-bsp/u-boot/files/u-boot_flash_64M.cfg @@ -0,0 +1,2 @@ +CONFIG_ENV_SIZE=0x20000 +CONFIG_ENV_OFFSET=0xE0000 diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb index 8cf4a19fb..1b2820cb5 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb @@ -1,4 +1,5 @@ require u-boot-common-aspeed-sdk_${PV}.inc +require conf/machine/distro/include/uboot-distrovars.inc UBOOT_MAKE_TARGET ?= "DEVICE_TREE=${UBOOT_DEVICETREE}" @@ -7,6 +8,7 @@ require recipes-bsp/u-boot/u-boot.inc PROVIDES += "u-boot" DEPENDS += "bc-native dtc-native" +SRC_URI:append:uboot-flash-65536 = "file://u-boot_flash_64M.cfg" SRC_URI:append:df-phosphor-mmc = " file://u-boot-env-ast2600.txt" SRC_URI += " \ file://rsa_oem_dss_key.pem;sha256sum=64a379979200d39949d3e5b0038e3fdd5548600b2f7077a17e35422336075ad4 \ diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb index 90e120677..2708ae081 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb @@ -1,4 +1,5 @@ require u-boot-common-aspeed-sdk_${PV}.inc +require conf/machine/distro/include/uboot-distrovars.inc SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" DEPENDS += "mtd-utils" @@ -8,9 +9,11 @@ RPROVIDES:${PN} += "u-boot-fw-utils" SRC_URI += "file://fw_env_ast2600_nor.config" SRC_URI += "file://fw_env_ast2600_mmc.config" +SRC_URI += "file://fw_env_flash_64M_nor.config" ENV_CONFIG_FILE = "fw_env_ast2600_nor.config" ENV_CONFIG_FILE:df-phosphor-mmc = "fw_env_ast2600_mmc.config" +ENV_CONFIG_FILE:uboot-flash-65536 = "fw_env_flash_64M_nor.config" INSANE_SKIP:${PN} = "already-stripped" EXTRA_OEMAKE:class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1' -- cgit v1.2.3 From 9248c75b142fa11243c20f4d200a04e4f6395b51 Mon Sep 17 00:00:00 2001 From: John Wedig Date: Fri, 3 Dec 2021 16:17:45 -0800 Subject: meta-phosphor: storage: Add recipe for estoraged Signed-off-by: John Wedig Change-Id: I607813c03e1acd42329bc7d67b9e4ffa1564a84c --- meta-phosphor/recipes-phosphor/storage/estoraged.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 meta-phosphor/recipes-phosphor/storage/estoraged.bb diff --git a/meta-phosphor/recipes-phosphor/storage/estoraged.bb b/meta-phosphor/recipes-phosphor/storage/estoraged.bb new file mode 100644 index 000000000..c6675959a --- /dev/null +++ b/meta-phosphor/recipes-phosphor/storage/estoraged.bb @@ -0,0 +1,20 @@ +SUMMARY = "Encrypted storage management daemon" +DESCRIPTION = "Provides a D-Bus interface to manage an encrypted storage device" +PR = "r1" +PV = "0.1+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +inherit meson pkgconfig + +DEPENDS += "phosphor-dbus-interfaces" +DEPENDS += "cryptsetup" +DEPENDS += "openssl" +DEPENDS += "phosphor-logging" +DEPENDS += "sdbusplus" +DEPENDS += "stdplus" + +RDEPENDS:${PN} += "e2fsprogs" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/openbmc/estoraged.git" +SRCREV = "972c3faae9092f8a513222d0b24c36ad79f4119f" -- cgit v1.2.3 From 18f97faa411078b95d042d207f5fff32bc8ece1d Mon Sep 17 00:00:00 2001 From: P Dheeraj Srujan Kumar Date: Thu, 31 Mar 2022 02:50:48 +0530 Subject: Update to internal 1-0.91 Signed-off-by: P Dheeraj Srujan Kumar --- ...-allow-drive-sensors-on-bus-2-for-ast2500.patch | 28 +- ...sabling-serial-console-if-FFUJ-is-enabled.patch | 51 ++ .../u-boot/u-boot-aspeed-sdk_%.bbappend | 1 + .../0005-Add-sample-i3c-slave-driver.patch | 150 ++++ .../recipes-kernel/linux/linux-aspeed_%.bbappend | 1 + .../0001-ADCSensor-Fix-for-P3V3-sensor.patch | 59 ++ .../sensors/dbus-sensors_%.bbappend | 3 + .../at-scale-debug/at-scale-debug_git.bb | 6 +- ...rintf_s-compilation-issue-for-safec-3.5.1.patch | 35 + .../recipes-core/interfaces/libmctp_git.bb | 2 +- .../recipes-core/ipmi/intel-ipmi-oem_%.bbappend | 2 +- ...001-Fix-heap-buffer-overflow-in-captoinfo.patch | 47 ++ .../recipes-core/ncurses/ncurses_%.bbappend | 2 + .../recipes-core/safec/safec_%.bbappend | 11 - .../meta-common/recipes-core/safec/safec_3.4.bb | 15 - .../boost-url/boost-url_%.bbappend | 4 - .../recipes-devtools/mtd-util/mtd-util.bb | 2 +- ...er-Check-return-code-for-sd_bus_add_objec.patch | 21 +- .../sdbusplus/sdbusplus_%.bbappend | 2 +- .../libvncserver/libvncserver_%.bbappend | 2 +- .../obmc-ikvm/obmc-ikvm_%.bbappend | 2 +- .../host-misc-comm-manager_git.bb | 2 +- .../recipes-intel/hsbp/hsbp-manager_git.bb | 2 +- .../intel-pfr/intel-pfr-signing-utility-native.bb | 4 +- .../recipes-intel/intel-pfr/pfr-manager_%.bbappend | 2 +- .../recipes-intel/psu-manager/psu-manager.bb | 2 +- .../recipes-intel/smbios/smbios-mdrv1.bb | 31 - .../smbios/smbios-mdrv1/smbios-mdrv1.service | 13 - .../recipes-intel/smbios/smbios-mdrv2.bb | 2 +- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 6 +- .../recipes-network/network/ncsi-monitor.bb | 2 + .../network/ncsi-monitor/check-for-host-in-reset | 14 +- ...ing-channel-specific-privilege-to-network.patch | 36 +- ...Fix-for-updating-MAC-address-from-RedFish.patch | 109 --- .../network/phosphor-network_%.bbappend | 3 +- .../recipes-network/network/static-mac-addr.bb | 4 +- .../network/static-mac-addr/mac-check | 27 +- .../biosconfig-manager/biosconfig-manager_git.bb | 2 +- ...ty-manager-Add-support-to-update-assetTag.patch | 51 +- .../configuration/entity-manager_%.bbappend | 2 +- .../dbus/phosphor-dbus-interfaces_%.bbappend | 2 +- .../fans/phosphor-pid-control_%.bbappend | 2 +- .../host/phosphor-host-postd_git.bbappend | 2 +- ...001-Firmware-update-configuration-changes.patch | 288 ++----- ...5-Add-Model-CoreCount-to-ProcessorSummary.patch | 288 ------- .../0025-Add-Model-to-ProcessorSummary.patch | 108 +++ ...elete-the-copy-constructor-on-the-Request.patch | 30 + ...27-Convert-VariantType-to-DbusVariantType.patch | 50 ++ ...fix-for-broken-feature-Pending-Attributes.patch | 89 ++- ...osAttributeRegistry-node-under-Registries.patch | 76 ++ ...d-unmerged-changes-for-http-retry-support.patch | 172 ++-- .../0002-EventService-https-client-support.patch | 243 +++--- .../0004-Add-Server-Sent-Events-support.patch | 14 +- ...tyle-subscription-support-to-eventservice.patch | 70 +- .../0006-Add-EventService-SSE-filter-support.patch | 24 +- ...rvice-Log-events-for-subscription-actions.patch | 21 +- ...ks-on-Event-Subscription-input-parameters.patch | 33 +- ...cture-Redifsh-EventLog-Transmit-code-flow.patch | 18 +- ...010-Remove-Terminated-Event-Subscriptions.patch | 71 +- ...h-while-deleting-terminated-subscriptions.patch | 12 +- ...ort-for-deleting-terminated-subscriptions.patch | 45 ++ ...rvice-fix-added-Context-field-to-response.patch | 33 + .../interfaces/bmcweb/eventservice/README | 10 +- ...dd-asyncResp-support-during-handleUpgrade.patch | 2 +- ...port-for-privilege-check-in-handleUpgrade.patch | 2 +- .../0004-Add-Privileges-to-Websockets.patch | 6 +- ...1-Add-support-for-MetricDefinition-scheme.patch | 619 -------------- ...dd-support-for-POST-on-TriggersCollection.patch | 889 +++++++++++++++++++++ ...1-Sync-Telmetry-service-with-EventService.patch | 284 +++++++ ...t-Remove-LogService-from-TelemetryService.patch | 26 + ...2-Sync-Telmetry-service-with-EventService.patch | 295 ------- ...d-bmcweb-to-use-new-telemetry-service-API.patch | 513 ++++++++---- ...MetricDefinition-property-in-MetricReport.patch | 268 ------- ...0005-Add-GET-method-for-TriggerCollection.patch | 313 -------- ...t-Remove-LogService-from-TelemetryService.patch | 26 - ...rvice-fix-added-Context-field-to-response.patch | 29 - ...ort-for-deleting-terminated-subscriptions.patch | 46 -- .../interfaces/bmcweb/telemetry/README | 28 +- ...1-Revert-Disable-nbd-proxy-from-the-build.patch | 30 +- ...status-code-from-InsertMedia-REST-methods.patch | 24 +- .../recipes-phosphor/interfaces/bmcweb_%.bbappend | 47 +- .../0062-Update-IPMI-Chassis-Control-command.patch | 292 ------- .../ipmi/phosphor-ipmi-host_%.bbappend | 3 +- .../ipmi/phosphor-ipmi-net_%.bbappend | 2 +- .../ipmi/phosphor-node-manager-proxy_git.bb | 2 +- .../network/phosphor-snmp_%.bbappend | 2 +- .../recipes-phosphor/peci/peci-pcie_%.bbappend | 2 +- .../recipes-phosphor/pmci/libmctp-intel_git.bb | 2 +- .../recipes-phosphor/pmci/libpldm-intel_git.bb | 6 +- .../recipes-phosphor/pmci/mctp-emulator.bb | 6 +- .../recipes-phosphor/pmci/mctp-wrapper.bb | 6 +- .../meta-common/recipes-phosphor/pmci/mctpd.bb | 8 +- .../meta-common/recipes-phosphor/pmci/mctpwplus.bb | 6 +- .../recipes-phosphor/pmci/nvmemi-daemon.bb | 4 +- .../meta-common/recipes-phosphor/pmci/pldmd.bb | 6 +- .../recipes-phosphor/pmci/pmci-launcher.bb | 6 +- .../prov-mode-mgr/prov-mode-mgr_git.bb | 2 +- .../security-manager/security-manager_git.bb | 6 +- ...eck-for-min-max-received-from-hwmon-files.patch | 8 +- .../0002-Fix-PECI-client-creation-flow.patch | 34 +- ...-threshold-de-assert-event-when-threshold.patch | 24 +- ...004-Fan-Tach-Sensor-Threshold-Ignore-Zero.patch | 20 +- .../dbus-sensors/0005-Fix-PECI-ioctl-number.patch | 4 +- ...sor-create-RequirediTempSensor-if-defined.patch | 22 +- ...007-Add-support-for-the-energy-hwmon-type.patch | 33 +- .../0008-CPUSensor-additional-debug-message.patch | 12 +- ...or-Create-CPUConfig-for-each-PECI-adapter.patch | 6 +- .../sensors/dbus-sensors_%.bbappend | 2 +- .../recipes-phosphor/settings/settings_git.bb | 2 +- .../special-mode-mgr/special-mode-mgr_git.bb | 4 +- .../state/phosphor-post-code-manager_git.bbappend | 2 +- .../recipes-phosphor/system/callback-manager.bb | 2 +- .../telemetry/telemetry_%.bbappend | 2 +- ...suport-for-multiple-user-manager-services.patch | 48 +- .../users/phosphor-user-manager_%.bbappend | 6 +- .../virtual-media/virtual-media.bb | 6 +- .../webui/phosphor-webui_%.bbappend | 2 +- .../recipes-phosphor/webui/webui-vue_%.bbappend | 2 +- .../CVE-2021-43618-Avoid-bit-size-overflows.patch | 25 + .../meta-common/recipes-support/gmp/gmp_%.bbappend | 4 + .../chassis/x86-power-control_%.bbappend | 2 +- .../meta-wht/conf/bblayers.conf.sample | 1 - .../meta-wolfpass/conf/bblayers.conf.sample | 1 - 123 files changed, 3117 insertions(+), 3426 deletions(-) create mode 100644 meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0038-Disabling-serial-console-if-FFUJ-is-enabled.patch create mode 100644 meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed/0005-Add-sample-i3c-slave-driver.patch create mode 100644 meta-openbmc-mods/meta-ast2600/recipes-phosphor/sensors/dbus-sensors/0001-ADCSensor-Fix-for-P3V3-sensor.patch create mode 100644 meta-openbmc-mods/meta-ast2600/recipes-phosphor/sensors/dbus-sensors_%.bbappend create mode 100644 meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/files/0001-ASD-Fix-sprintf_s-compilation-issue-for-safec-3.5.1.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-core/ncurses/ncurses/0001-Fix-heap-buffer-overflow-in-captoinfo.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-core/ncurses/ncurses_%.bbappend delete mode 100644 meta-openbmc-mods/meta-common/recipes-core/safec/safec_%.bbappend delete mode 100644 meta-openbmc-mods/meta-common/recipes-core/safec/safec_3.4.bb delete mode 100644 meta-openbmc-mods/meta-common/recipes-devtools/boost-url/boost-url_%.bbappend delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1/smbios-mdrv1.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0004-Fix-for-updating-MAC-address-from-RedFish.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0025-Add-Model-CoreCount-to-ProcessorSummary.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0025-Add-Model-to-ProcessorSummary.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0026-Revert-Delete-the-copy-constructor-on-the-Request.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0027-Convert-VariantType-to-DbusVariantType.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0007-Add-BiosAttributeRegistry-node-under-Registries.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0012-Add-support-for-deleting-terminated-subscriptions.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0013-event-service-fix-added-Context-field-to-response.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-MetricDefinition-scheme.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-POST-on-TriggersCollection.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Sync-Telmetry-service-with-EventService.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Revert-Remove-LogService-from-TelemetryService.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Sync-Telmetry-service-with-EventService.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0004-Add-support-for-MetricDefinition-property-in-MetricReport.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0005-Add-GET-method-for-TriggerCollection.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0006-Revert-Remove-LogService-from-TelemetryService.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0007-event-service-fix-added-Context-field-to-response.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0009-Add-support-for-deleting-terminated-subscriptions.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-support/gmp/gmp/CVE-2021-43618-Avoid-bit-size-overflows.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-support/gmp/gmp_%.bbappend diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors/0001-Only-allow-drive-sensors-on-bus-2-for-ast2500.patch b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors/0001-Only-allow-drive-sensors-on-bus-2-for-ast2500.patch index ea7ca092c..c28ae6126 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors/0001-Only-allow-drive-sensors-on-bus-2-for-ast2500.patch +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors/0001-Only-allow-drive-sensors-on-bus-2-for-ast2500.patch @@ -1,7 +1,7 @@ -From d06d0a8fabd699fc1cab4fbd6e4572ce0b22a905 Mon Sep 17 00:00:00 2001 +From 8f6c6f3a23c002f5247c407205f3a62dcd0e0c8c Mon Sep 17 00:00:00 2001 From: James Feist Date: Thu, 23 Apr 2020 14:01:38 -0700 -Subject: [PATCH 1/1] Only allow drive sensors on bus 2 for ast2500 +Subject: [PATCH] Only allow drive sensors on bus 2 for ast2500 CPLD doesn't allow multi-master, so readings wont work. Put in a work-around to only allow bus 2 transactions. @@ -15,22 +15,22 @@ Signed-off-by: James Feist 1 file changed, 6 insertions(+) diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp -index 1858ea9..844f061 100644 +index 8eaeb57..25edf01 100644 --- a/src/NVMeSensorMain.cpp +++ b/src/NVMeSensorMain.cpp -@@ -111,6 +111,12 @@ void createSensors(boost::asio::io_service& io, - rootBus = std::stoi(rootName.substr(0, dash)); - } +@@ -154,6 +154,12 @@ static void handleSensorConfigurations( + << "\n"; + } -+ // HACK: cpld on current products doesn't allow multi-master -+ if (rootBus != 2) -+ { -+ continue; -+ } ++ // HACK: cpld on current products doesn't allow multi-master ++ if (rootBus != 2) ++ { ++ continue; ++ } + - std::shared_ptr context; - auto findRoot = nvmeDeviceMap.find(rootBus); - if (findRoot != nvmeDeviceMap.end()) + std::shared_ptr sensorPtr = + std::make_shared( + objectServer, io, dbusConnection, *sensorName, -- 2.17.1 diff --git a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0038-Disabling-serial-console-if-FFUJ-is-enabled.patch b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0038-Disabling-serial-console-if-FFUJ-is-enabled.patch new file mode 100644 index 000000000..372d69e26 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0038-Disabling-serial-console-if-FFUJ-is-enabled.patch @@ -0,0 +1,51 @@ +From a9f5d0357701c817106cd158d377ef645309ccc2 Mon Sep 17 00:00:00 2001 +From: gokulsanker +Date: Wed, 8 Dec 2021 01:44:19 +0530 +Subject: [PATCH] If FFUJ is enabled serial console must be disabled + +FFUJ mode user is not allowed to enter uboot command +line interface. Serial console is disabled by creating +an indefinite sleep if FFUJ is enabled, same +functionality is used in whitely platforms + +Tested: +Serial console is disabled in FFUJ mode + +Signed-off-by: gokulsanker +--- + common/autoboot.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/common/autoboot.c b/common/autoboot.c +index 8a99780423..21e59feea7 100644 +--- a/common/autoboot.c ++++ b/common/autoboot.c +@@ -19,6 +19,7 @@ DECLARE_GLOBAL_DATA_PTR; + + #define MAX_DELAY_STOP_STR 32 + ++#define WAIT_STATE_TIMEOUT 10000 + #ifndef DEBUG_BOOTKEYS + #define DEBUG_BOOTKEYS 0 + #endif +@@ -271,9 +272,14 @@ static int abortboot(int bootdelay) + { + int abort = 0; + +- abort = gpio_abort(); +- if (abort) +- goto exit; ++ if (gpio_abort()) ++ { ++ printf("#### BMC is in disabled state(FFU Jumper is asserted), " ++ "So BMC serial console disabled. ####\n"); ++ while (1) { ++ mdelay(WAIT_STATE_TIMEOUT); ++ } ++ } + + if (bootdelay >= 0) + abort = __abortboot(bootdelay); +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend index 1e20585bc..fdc83fce1 100644 --- a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend +++ b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend @@ -41,6 +41,7 @@ SRC_URI:append:intel-ast2600 = " \ file://0034-Implement-the-IPMI-commands-in-FFUJ-mode-in-u-boot.patch \ file://0036-Disable-BMC-MMIO-Decode-on-VGA-SCU-register-bit.patch \ file://0037-Enable-I2C-clock-stretching-and-multi-master-support.patch \ + file://0038-Disabling-serial-console-if-FFUJ-is-enabled.patch \ " # CVE-2020-10648 vulnerability fix diff --git a/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed/0005-Add-sample-i3c-slave-driver.patch b/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed/0005-Add-sample-i3c-slave-driver.patch new file mode 100644 index 000000000..8f548c2e5 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed/0005-Add-sample-i3c-slave-driver.patch @@ -0,0 +1,150 @@ +From 4987202965423fafd5c704d4e68a51a4167a4414 Mon Sep 17 00:00:00 2001 +From: Oleksandr Shulzhenko +Date: Thu, 30 Sep 2021 16:28:26 +0200 +Subject: [PATCH] Add sample i3c slave driver + +The aim of the driver is to debug various i3c solutions implemented +for DesignWare master I3C driver. +The driver is bound to the I3C device that corresponds to I3C slave +emulated by Prodigy with manufacturer ID 0xAC and part ID 0x55AA. +It is enough to fill the I3C_DEVICE macro with the corresponding data +to adjust the driver with another I3C slave device + +Signed-off-by: Oleksandr Shulzhenko +--- + drivers/i3c/Kconfig | 2 + + drivers/i3c/Makefile | 1 + + drivers/i3c/sample/Kconfig | 7 +++ + drivers/i3c/sample/Makefile | 2 + + drivers/i3c/sample/dw-i3c-sample.c | 75 ++++++++++++++++++++++++++++++ + 5 files changed, 87 insertions(+) + create mode 100644 drivers/i3c/sample/Kconfig + create mode 100644 drivers/i3c/sample/Makefile + create mode 100644 drivers/i3c/sample/dw-i3c-sample.c + +diff --git a/drivers/i3c/Kconfig b/drivers/i3c/Kconfig +index 01642768ab5f..202b0d091631 100644 +--- a/drivers/i3c/Kconfig ++++ b/drivers/i3c/Kconfig +@@ -36,4 +36,6 @@ config I3CDEV + and hence SUBJECT TO CHANGE WITHOUT NOTICE while it stabilizes. + + source "drivers/i3c/master/Kconfig" ++ ++source "drivers/i3c/sample/Kconfig" + endif # I3C +diff --git a/drivers/i3c/Makefile b/drivers/i3c/Makefile +index 606d422841b2..8048a9a793c6 100644 +--- a/drivers/i3c/Makefile ++++ b/drivers/i3c/Makefile +@@ -3,3 +3,4 @@ i3c-y := device.o master.o + obj-$(CONFIG_I3C) += i3c.o + obj-$(CONFIG_I3CDEV) += i3cdev.o + obj-$(CONFIG_I3C) += master/ ++obj-$(CONFIG_I3C) += sample/ +diff --git a/drivers/i3c/sample/Kconfig b/drivers/i3c/sample/Kconfig +new file mode 100644 +index 000000000000..6376c9891795 +--- /dev/null ++++ b/drivers/i3c/sample/Kconfig +@@ -0,0 +1,7 @@ ++# SPDX-License-Identifier: GPL-2.0-only ++config DW_I3C_SAMPLE ++ tristate "Synopsys DesignWare I3C sample driver" ++ depends on I3C ++help ++ Say yes here to enable the driver for DesignWare ++ I3C Sample driver. +diff --git a/drivers/i3c/sample/Makefile b/drivers/i3c/sample/Makefile +new file mode 100644 +index 000000000000..c73bb34fce0e +--- /dev/null ++++ b/drivers/i3c/sample/Makefile +@@ -0,0 +1,2 @@ ++# SPDX-License-Identifier: GPL-2.0-only ++obj-$(CONFIG_DW_I3C_SAMPLE) += dw-i3c-sample.o +\ No newline at end of file +diff --git a/drivers/i3c/sample/dw-i3c-sample.c b/drivers/i3c/sample/dw-i3c-sample.c +new file mode 100644 +index 000000000000..1993b9fdb32b +--- /dev/null ++++ b/drivers/i3c/sample/dw-i3c-sample.c +@@ -0,0 +1,75 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* Copyright (C) 2021 Intel Corporation.*/ ++ ++#include ++#include ++ ++#define IBI_QUEUE_STATUS_IBI_ID(x) (((x) & GENMASK(15, 8)) >> 8) ++#define IBI_QUEUE_IBI_ADDR(x) (IBI_QUEUE_STATUS_IBI_ID(x) >> 1) ++#define IBI_QUEUE_STATUS_DATA_LEN(x) ((x) & GENMASK(7, 0)) ++ ++static void ibi_handler(struct i3c_device *dev, ++ const struct i3c_ibi_payload *payload) ++{ ++ unsigned int i = 0; ++ u32 ibi_status; ++ u8 addr; ++ const u8 *buf; ++ ++ dev_info(i3cdev_to_dev(dev), "%s:%d\n", __func__, __LINE__); ++ if (payload) { ++ ibi_status = *((u32 *)payload->data); ++ addr = IBI_QUEUE_IBI_ADDR(ibi_status); ++ dev_info(i3cdev_to_dev(dev), "%s, dynamic address = 0x%02x\n", ++ __func__, addr); ++ /* We need to read only IBI Paylod data - so shift for IBI_QUEUE_STATUS ++ * length which is 32 bits ++ */ ++ buf = payload->data + sizeof(u32); ++ for (i = 0; i < IBI_QUEUE_STATUS_DATA_LEN(ibi_status); i++) ++ dev_info(i3cdev_to_dev(dev), "%s payload[%d] = 0x%02x\n", ++ __func__, i, *(buf + sizeof(u8) * i)); ++ } ++} ++ ++static int dw_i3c_sample_probe(struct i3c_device *i3cdev) ++{ ++ int ret; ++ struct i3c_ibi_setup ibireq = { ++ .handler = ibi_handler, ++ .max_payload_len = 2, ++ .num_slots = 10, ++ }; ++ ++ ret = i3c_device_request_ibi(i3cdev, &ibireq); ++ if (ret) ++ return ret; ++ ret = i3c_device_enable_ibi(i3cdev); ++ if (ret) ++ i3c_device_free_ibi(i3cdev); ++ ++ return ret; ++} ++ ++static void dw_i3c_sample_remove(struct i3c_device *i3cdev) ++{ ++ i3c_device_disable_ibi(i3cdev); ++ i3c_device_free_ibi(i3cdev); ++} ++ ++static const struct i3c_device_id dw_i3c_sample_ids[] = { ++ I3C_DEVICE(0x2AC /*manufid*/, 0x55AA /*partid*/, NULL /*driver-data*/), ++ { /* sentinel */ }, ++}; ++ ++static struct i3c_driver dw_i3c_sample = { ++ .driver.name = "dw-i3c-sample", ++ .id_table = dw_i3c_sample_ids, ++ .probe = dw_i3c_sample_probe, ++ .remove = dw_i3c_sample_remove, ++}; ++ ++module_i3c_driver(dw_i3c_sample); ++MODULE_AUTHOR("Oleksandr Shulzhenko "); ++MODULE_DESCRIPTION("DesignWare I3C sample driver"); ++MODULE_LICENSE("GPL"); +-- +2.25.1 + diff --git a/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed_%.bbappend index df3901d77..94d22381f 100644 --- a/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -7,4 +7,5 @@ SRC_URI += " \ file://0002-serial-8250-Fix-RX-DMA-time-out-property.patch \ file://0003-serial-8250_aspeed-Make-port-type-fixed.patch \ file://0004-Add-a-workaround-to-cover-UART-interrupt-bug-in-AST2.patch \ + file://0005-Add-sample-i3c-slave-driver.patch \ " diff --git a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/sensors/dbus-sensors/0001-ADCSensor-Fix-for-P3V3-sensor.patch b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/sensors/dbus-sensors/0001-ADCSensor-Fix-for-P3V3-sensor.patch new file mode 100644 index 000000000..458f234b6 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/sensors/dbus-sensors/0001-ADCSensor-Fix-for-P3V3-sensor.patch @@ -0,0 +1,59 @@ +From 9923811a2880ad4a8289af666b63adfd1807b5bd Mon Sep 17 00:00:00 2001 +From: Jayaprakash Mutyala +Date: Mon, 22 Nov 2021 22:12:00 +0000 +Subject: [PATCH] ADCSensor: Fix for P3V3 sensor + +Issue: As part of adapting to upstream ADC driver change for all the +platforms of AST2600, ADC scale factor settings in board configurations +is adjusted. +Patch: https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/47086 +Due to this change set sensor threshold is not updating for critical +threshold value of P3V3 sensor. + +Fix: Updating pre sensor scaling of "maxVoltageReading" to 2.5 can fix +this issue. + +Tested: +Verified using IPMI set sensor threshold command for P3V3 sensor and for +other sensors as well. +Before fix: +//Get sensor threshold for P3V3 sensor +Command : ipmitool raw 0x04 0x27 0x83 +Response: 1b d6 d0 00 f8 ff 00 +//Set sensor threshold for P3V3 sensor +Command : ipmitool raw 0x04 0x26 0x83 0x10 0x00 0x00 0x00 0x00 0xfd 0x00 +Response: //Success +Command : ipmitool raw 0x04 0x27 0x83 +Response: 1b d8 d1 00 f9 ff 00 + +After fix: +//Get sensor threshold for P3V3 sensor +Command : ipmitool raw 0x04 0x27 0x81 +Response: 1b b2 ad 00 ce d4 00 +//Set sensor threshold for P3V3 sensor +Command : ipmitool raw 0x04 0x26 0x81 0x10 0x00 0x00 0x00 0x00 0xfd 0x00 +Response: //Success +Command : ipmitool raw 0x04 0x27 0x81 +Response: 1b b2 ad 00 ce fd 00 + +Signed-off-by: Jayaprakash Mutyala +--- + src/ADCSensor.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ADCSensor.cpp b/src/ADCSensor.cpp +index 9758168..2f3c66f 100644 +--- a/src/ADCSensor.cpp ++++ b/src/ADCSensor.cpp +@@ -37,7 +37,7 @@ + static constexpr unsigned int sensorScaleFactor = 1000; + + static constexpr double roundFactor = 10000; // 3 decimal places +-static constexpr double maxVoltageReading = 1.8; // pre sensor scaling ++static constexpr double maxVoltageReading = 2.5; // pre sensor scaling + static constexpr double minVoltageReading = 0; + + ADCSensor::ADCSensor(const std::string& path, +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-ast2600/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/sensors/dbus-sensors_%.bbappend new file mode 100644 index 000000000..7f412bfa4 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2600/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://0001-ADCSensor-Fix-for-P3V3-sensor.patch" diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb index 74db92917..e2fa7b57e 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb @@ -12,8 +12,10 @@ DEPENDS = "sdbusplus openssl libpam libgpiod safec" do_configure[depends] += "virtual/kernel:do_shared_workdir" -SRC_URI = "git://github.com/Intel-BMC/asd;protocol=git" -SRCREV = "1.4.6" +SRC_URI = "git://github.com/Intel-BMC/asd;protocol=https" +SRCREV = "1.4.7" + +SRC_URI += "file://0001-ASD-Fix-sprintf_s-compilation-issue-for-safec-3.5.1.patch" inherit useradd diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/files/0001-ASD-Fix-sprintf_s-compilation-issue-for-safec-3.5.1.patch b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/files/0001-ASD-Fix-sprintf_s-compilation-issue-for-safec-3.5.1.patch new file mode 100644 index 000000000..943ffb4a8 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/files/0001-ASD-Fix-sprintf_s-compilation-issue-for-safec-3.5.1.patch @@ -0,0 +1,35 @@ +From efd1373e7c4a7a89609184aa0b5e1c3edcb8be6a Mon Sep 17 00:00:00 2001 +From: Ernesto Corona +Date: Fri, 19 Nov 2021 09:11:03 -0800 +Subject: [PATCH] ASD Fix sprintf_s compilation issue for safec 3.5.1 + +A missing macro was defined to ensure sprintf_s macro defintion is +set when safe_str_lib.h is included. + +Test: +Remove openbmc-meta-intel/meta-common/recipes-core/safec/safec_3.4.bb +Compile at-scale-debug using devtool +ASD Sanity finished successfully(SPR). + +Signed-off-by: Ernesto Corona +Change-Id: Idd94b4ba9ff8b4194317a045b140ce90db2ee860 +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 59ff03c..d6239a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,6 +4,8 @@ project(at-scale-debug C) + find_package (PkgConfig REQUIRED) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/sysroot/include) + pkg_check_modules (SAFEC REQUIRED libsafec) ++# Define HAVE_C99 to include sprintf_s macro in safec library ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_C99") + include_directories (${SAFEC_INCLUDE_DIRS}) + link_directories (${SAFEC_LIBRARY_DIRS}) + +-- +2.25.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb index eba56f829..79027b766 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb @@ -2,7 +2,7 @@ SUMMARY = "libmctp" DESCRIPTION = "Implementation of MCTP (DTMF DSP0236)" SRC_URI = "git://github.com/openbmc/libmctp.git" -SRCREV = "663ec39ea107c2a736f9bcb20cbfdfa623092ab1" +SRCREV = "983cc3fa49dcac2e640e814500221c6acc177eff" PV = "0.1+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend index ac61d983c..a9e6c81ad 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend @@ -2,7 +2,7 @@ EXTRA_OECMAKE += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', '-DINTEL_PF EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMC_VALIDATION_UNSECURE_FEATURE=ON', '', d)}" EXTRA_OECMAKE += "-DUSING_ENTITY_MANAGER_DECORATORS=OFF" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git" -SRCREV = "9e58cfe1ba5ca5bcd5263b50730c5a231eabdd4f" +SRCREV = "d2d60ab5b325c4630c8e794e861b88cf3c9337bf" FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" diff --git a/meta-openbmc-mods/meta-common/recipes-core/ncurses/ncurses/0001-Fix-heap-buffer-overflow-in-captoinfo.patch b/meta-openbmc-mods/meta-common/recipes-core/ncurses/ncurses/0001-Fix-heap-buffer-overflow-in-captoinfo.patch new file mode 100644 index 000000000..420a19b41 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-core/ncurses/ncurses/0001-Fix-heap-buffer-overflow-in-captoinfo.patch @@ -0,0 +1,47 @@ +From ad135388ac66b7c8276b0899d9b43433e2faffa6 Mon Sep 17 00:00:00 2001 +From: P Dheeraj Srujan Kumar +Date: Tue, 7 Dec 2021 23:58:53 +0000 +Subject: [PATCH] Fix heap-buffer-overflow in captoinfo + +This has been picked up from http://cvsweb.netbsd.org/ +bsdweb.cgi/pkgsrc/devel/ncurses/patches/Attic/ +patch-ncurses_tinfo_captoinfo.c +?rev=1.1&content-type=text/x-cvsweb-markup + +Thomas Dickey is the owner of this patch. +This fix is a part of +https://github.com/ThomasDickey/ncurses-snapshots/ +commit/63ca9e061f4644795d6f3f559557f3e1ed8c738b#diff- +7e95c7bc5f213e9be438e69a9d5d0f261a14952bcbd692f7b9014217b8047340 + +Signed-off-by: P Dheeraj Srujan Kumar +--- + ncurses/tinfo/captoinfo.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c +index 8b3b83d1..c9741405 100644 +--- a/ncurses/tinfo/captoinfo.c ++++ b/ncurses/tinfo/captoinfo.c +@@ -216,12 +216,15 @@ cvtchar(register const char *sp) + } + break; + case '^': ++ len = 2; + c = UChar(*++sp); +- if (c == '?') ++ if (c == '?') { + c = 127; +- else ++ } else if (c == '\0') { ++ len = 1; ++ } else { + c &= 0x1f; +- len = 2; ++ } + break; + default: + c = UChar(*sp); +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-core/ncurses/ncurses_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/ncurses/ncurses_%.bbappend new file mode 100644 index 000000000..e60bd9a6b --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-core/ncurses/ncurses_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://0001-Fix-heap-buffer-overflow-in-captoinfo.patch" diff --git a/meta-openbmc-mods/meta-common/recipes-core/safec/safec_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/safec/safec_%.bbappend deleted file mode 100644 index b8256e2b1..000000000 --- a/meta-openbmc-mods/meta-common/recipes-core/safec/safec_%.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -RDEPENDS:${PN} = "" -do_install:append() { - F=$(find ${D} -name check_for_unsafe_apis) - if [ -n "${F}" ]; then - # remove the unused perl script - rm -f "${F}" - # remove the script's destination directory, only if it is empty - rmdir "$(dirname ${F})" 2>/dev/null || : - fi -} - diff --git a/meta-openbmc-mods/meta-common/recipes-core/safec/safec_3.4.bb b/meta-openbmc-mods/meta-common/recipes-core/safec/safec_3.4.bb deleted file mode 100644 index cf83203ec..000000000 --- a/meta-openbmc-mods/meta-common/recipes-core/safec/safec_3.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Safe C Library" - -LICENSE = "safec" -LIC_FILES_CHKSUM = "file://COPYING;md5=6d0eb7dfc57806a006fcbc4e389cf164" -SECTION = "lib" - -inherit autotools pkgconfig - -S = "${WORKDIR}/git" -SRCREV = "e8bf1fff157ba931692130a0ec6f2833fa7d5f87" -SRC_URI = "git://github.com/rurban/safeclib.git" - -COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm|aarch64).*-linux' - -RDEPENDS:${PN} = "perl" diff --git a/meta-openbmc-mods/meta-common/recipes-devtools/boost-url/boost-url_%.bbappend b/meta-openbmc-mods/meta-common/recipes-devtools/boost-url/boost-url_%.bbappend deleted file mode 100644 index 323788fe8..000000000 --- a/meta-openbmc-mods/meta-common/recipes-devtools/boost-url/boost-url_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" - -# Temporary pin to resolve build breaks -SRCREV = "2c867fbe284ae532f1329b87a86ad3f8cd382867" diff --git a/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb b/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb index 5b59dd909..c925c522d 100644 --- a/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb +++ b/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb @@ -3,7 +3,7 @@ DESCRIPTION = "OpenBMC mtd-util" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b77c43ae4eaf67bd73fb6452b2f113a3" -SRC_URI = "git://github.com/Intel-BMC/mtd-util;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/mtd-util.git;protocol=ssh" PV = "1.0+git${SRCPV}" SRCREV = "708072b62a3cecb520eeaacac88b4f2c2e101fe4" diff --git a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch index 9aaf2f952..884e818a9 100644 --- a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch +++ b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch @@ -1,4 +1,4 @@ -From baff58f6e8f7aef4fd56be959fdd2e5e3c429eef Mon Sep 17 00:00:00 2001 +From 9d70ffc5532e17752903407d0267a281cc4be6d5 Mon Sep 17 00:00:00 2001 From: Johnathan Mantey Date: Mon, 13 Jul 2020 11:51:54 -0700 Subject: [PATCH] Revert "server: Check return code for @@ -6,29 +6,28 @@ Subject: [PATCH] Revert "server: Check return code for This reverts commit 017a19da5f67a74daedf4d63111569902d4764e6. --- - src/server/interface.cpp | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) + src/server/interface.cpp | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/server/interface.cpp b/src/server/interface.cpp -index a72c656..0155b6d 100644 +index e47f6ef..1ea9a06 100644 --- a/src/server/interface.cpp +++ b/src/server/interface.cpp -@@ -17,13 +17,8 @@ interface::interface(sdbusplus::bus::bus& bus, const char* path, +@@ -17,12 +17,8 @@ interface::interface(sdbusplus::bus_t& bus, const char* path, _interface_added(false) { sd_bus_slot* slot = nullptr; -- int r = _intf->sd_bus_add_object_vtable(_bus.get(), &slot, _path.c_str(), -- _interf.c_str(), vtable, context); +- int r = _intf->sd_bus_add_object_vtable( +- get_busp(_bus), &slot, _path.c_str(), _interf.c_str(), vtable, context); - if (r < 0) - { - throw exception::SdBusError(-r, "sd_bus_add_object_vtable"); - } -- -+ _intf->sd_bus_add_object_vtable(_bus.get(), &slot, _path.c_str(), ++ _intf->sd_bus_add_object_vtable(get_busp(_bus), &slot, _path.c_str(), + _interf.c_str(), vtable, context); - _slot = decltype(_slot){slot}; - } + _slot = std::move(slot); + } -- 2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend index a33c265f6..36539fbda 100644 --- a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend @@ -6,4 +6,4 @@ SRC_URI += " \ " # Temporary pin to resolve build breaks -SRCREV="dfb5642201699dc42a7dda12d72718a8b9568151" +SRCREV="6adfe948ee55ffde8457047042d0d55aa3d8b4a7" diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend b/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend index dbd591c86..e527d27f7 100644 --- a/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend @@ -2,4 +2,4 @@ FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" # Use the latest to support obmc-ikvm properly SRC_URI = "git://github.com/LibVNC/libvncserver" -SRCREV = "c1f29b73e4f111fc3d4b5941936218be0c6c430f" +SRCREV = "0b8990784a81823eecc9089263ac1966d17bf399" diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm_%.bbappend b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm_%.bbappend index faee3bf4c..695cfd437 100644 --- a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" #SRC_URI = "git://github.com/openbmc/obmc-ikvm" -SRCREV = "f90f68d1e9bc6c53f49ebac6d0b8e11257de77a9" +SRCREV = "ee09e3033a453565034b2b9bf4f2e0cbc8323ccd" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/host-misc-comm-manager/host-misc-comm-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-intel/host-misc-comm-manager/host-misc-comm-manager_git.bb index 6b54189e6..7dfce8c4e 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/host-misc-comm-manager/host-misc-comm-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/host-misc-comm-manager/host-misc-comm-manager_git.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/Intel-BMC/host-misc-comm-manager.git;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/host-misc-comm-manager;protocol=ssh" SRCREV = "470facc6e94ecbd01ca9c3f0749ae603dffff0e9" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb index a2ce25369..180693f08 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb @@ -2,7 +2,7 @@ SUMMARY = "HSBP Manager" DESCRIPTION = "HSBP Manager monitors HSBPs through SMBUS" SRC_URI = "git://github.com/openbmc/s2600wf-misc.git" -SRCREV = "0c5059f685f6df0704a4b773f2e617cf10d03210" +SRCREV = "26067f6af051ccf8feff251a081aa46e45dfa4dc" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-signing-utility-native.bb b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-signing-utility-native.bb index 72e7857ef..112b6b4c2 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-signing-utility-native.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-signing-utility-native.bb @@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fe DEPENDS = "openssl-native libxml2-native " -SRC_URI = "git://github.com/Intel-BMC/intel-pfr-signing-utility;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/intel-pfr-signing-utility.git;protocol=ssh" -SRCREV = "33b8e02e9b25d5150b744fcbda4cf1e508813194" +SRCREV = "7ad7cb3f3d7f408fd9ac454c242e77c8fbc6d61b" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend index 2ae1e372b..1e6becb03 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend @@ -1,5 +1,5 @@ # Enable downstream autobump SRC_URI = "git://github.com/openbmc/pfr-manager" -SRCREV = "8491692089f9295cf2efab456d4747f3cf1fb098" +SRCREV = "57f42c3d37d9546ede4f2c015bf9f392130c93b5" DEPENDS += " libgpiod \ " diff --git a/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb b/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb index 9cd2eec6f..6ce844f60 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb @@ -1,7 +1,7 @@ SUMMARY = "Power supply manager for Intel based platform" DESCRIPTION = "Power supply manager which include PSU Cold Redundancy service" -SRC_URI = "git://github.com/Intel-BMC/psu-manager.git;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/psu-manager.git;protocol=ssh" SRCREV = "30788892792c302b1317bac4e7f837ca1374d789" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb deleted file mode 100644 index 9eca05bae..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "SMBIOS MDR version 1 service for Intel based platform" -DESCRIPTION = "SMBIOS MDR version 1 service for Intel based platfrom" - -SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh;nobranch=1" -SRCREV = "6aab8bcc8fd0550753c87265036b1b7c4c8a9f71" - -S = "${WORKDIR}/git/services/smbios" - -PV = "1.0+git${SRCPV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit cmake pkgconfig -inherit obmc-phosphor-systemd - -SYSTEMD_SERVICE:${PN} += "smbios-mdrv1.service" - -DEPENDS += " \ - autoconf-archive-native \ - systemd \ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ - " -RDEPENDS:${PN} += " \ - libsystemd \ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ - " diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1/smbios-mdrv1.service b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1/smbios-mdrv1.service deleted file mode 100644 index edfd3bf70..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1/smbios-mdrv1.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Intel BMC SMBIOS MDR V1 - -[Service] -Restart=always -RestartSec=5 -StartLimitBurst=10 -ExecStartPre=/bin/mkdir -p /etc/smbios -ExecStart=/usr/bin/env smbiosapp -SyslogIdentifier=smbiosapp - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb index 683497208..fefaddbce 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb @@ -2,7 +2,7 @@ SUMMARY = "SMBIOS MDR version 2 service for Intel based platform" DESCRIPTION = "SMBIOS MDR version 2 service for Intel based platfrom" SRC_URI = "git://github.com/openbmc/smbios-mdr.git" -SRCREV = "631388e621abad855abbe4abbfb20111da9056f1" +SRCREV = "bc924d0f9f590d7d420b9f7bc98bdb9b8688618e" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend index fb05aa1a0..2a9a03d1b 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -3,10 +3,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" LINUX_VERSION = "5.15" KBRANCH = "dev-5.15-intel" -KSRC = "git://github.com/Intel-BMC/linux;protocol=ssh;branch=${KBRANCH}" +KSRC = "git://git@github.com/Intel-BMC/linux.git;protocol=ssh;branch=${KBRANCH}" # Include this as a comment only for downstream auto-bump -# SRC_URI = "git://github.com/Intel-BMC/linux;protocol=ssh;branch=dev-5.15-intel" -SRCREV="c7981259e359523e74044f926b69a804c61c86b1" +# SRC_URI = "git://git@github.com/Intel-BMC/linux.git;protocol=ssh;branch=dev-5.15-intel" +SRCREV="aaccb149bfa6ff74dc8e9ff043191730060002db" do_compile:prepend(){ # device tree compiler flags diff --git a/meta-openbmc-mods/meta-common/recipes-network/network/ncsi-monitor.bb b/meta-openbmc-mods/meta-common/recipes-network/network/ncsi-monitor.bb index cdb8e2097..4219a8e42 100644 --- a/meta-openbmc-mods/meta-common/recipes-network/network/ncsi-monitor.bb +++ b/meta-openbmc-mods/meta-common/recipes-network/network/ncsi-monitor.bb @@ -14,6 +14,8 @@ SRC_URI = "\ file://${BPN}.service \ " +RDEPENDS:${PN} += "bash" + inherit obmc-phosphor-systemd SYSTEMD_SERVICE:${PN} += "${BPN}.service" diff --git a/meta-openbmc-mods/meta-common/recipes-network/network/ncsi-monitor/check-for-host-in-reset b/meta-openbmc-mods/meta-common/recipes-network/network/ncsi-monitor/check-for-host-in-reset index aa17aebf2..be01092a2 100755 --- a/meta-openbmc-mods/meta-common/recipes-network/network/ncsi-monitor/check-for-host-in-reset +++ b/meta-openbmc-mods/meta-common/recipes-network/network/ncsi-monitor/check-for-host-in-reset @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # PFR Boot Time Detection # @@ -51,14 +51,20 @@ RSMRST="RSMRST_N" # Read the assertion state from the RSMRST_N input function get_rsmrst_state { local __resultVal=$1 - local gpio_state=$($GPIOGET $($GPIOFIND "$RSMRST")) + local gpioFound=$($GPIOFIND $RSMRST) + # Test to see if the RSMRST_N input exists. This test does not cover the + # case where an input is already owned by another service/process. + if [ -z "$gpioFound" ] + then + return 1 + fi + local gpio_state=$($GPIOGET $gpioFound) eval $__resultVal="'$gpio_state'" return 0 } get_rsmrst_state rsmrst_val - -if [ "$rsmrst_val" -eq 0 ] +if [[ $? == 0 && $rsmrst_val -eq 0 ]] then echo "RSMRST_N is asserted, take eth1 down" ip link set down dev eth1 diff --git a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch index f21283a75..153480728 100644 --- a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch +++ b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch @@ -1,4 +1,4 @@ -From 145778897e36f407773844b3b96847ff10306ee8 Mon Sep 17 00:00:00 2001 +From eacd73a119e55599d1f8837d04b4fa40452e5653 Mon Sep 17 00:00:00 2001 From: AppaRao Puli Date: Thu, 2 Apr 2020 17:06:07 +0530 Subject: [PATCH] Adding channel specific privilege to network @@ -23,11 +23,11 @@ Signed-off-by: Ramya Narayana src/ethernet_interface.cpp | 124 +++++++++++++++++++++++++++++++++++++ src/ethernet_interface.hpp | 37 ++++++++++- src/network_manager.cpp | 102 ++++++++++++++++++++++++++++++ - src/network_manager.hpp | 9 +++ - 4 files changed, 271 insertions(+), 1 deletion(-) + src/network_manager.hpp | 7 +++ + 4 files changed, 269 insertions(+), 1 deletion(-) diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp -index 2e15803..1145773 100644 +index 44f46f6..61eb8de 100644 --- a/src/ethernet_interface.cpp +++ b/src/ethernet_interface.cpp @@ -48,6 +48,10 @@ constexpr auto PROPERTY_INTERFACE = "org.freedesktop.DBus.Properties"; @@ -49,7 +49,7 @@ index 2e15803..1145773 100644 // Emit deferred signal. if (emitSignal) -@@ -1322,5 +1327,124 @@ std::string EthernetInterface::defaultGateway6(std::string gateway) +@@ -1319,5 +1324,124 @@ std::string EthernetInterface::defaultGateway6(std::string gateway) return gw; } @@ -175,7 +175,7 @@ index 2e15803..1145773 100644 } // namespace network } // namespace phosphor diff --git a/src/ethernet_interface.hpp b/src/ethernet_interface.hpp -index 0fe3778..fa5c889 100644 +index 8928455..0f54814 100644 --- a/src/ethernet_interface.hpp +++ b/src/ethernet_interface.hpp @@ -2,11 +2,14 @@ @@ -233,7 +233,7 @@ index 0fe3778..fa5c889 100644 using EthernetInterfaceIntf::interfaceName; using EthernetInterfaceIntf::linkUp; using EthernetInterfaceIntf::mtu; -@@ -372,6 +387,26 @@ class EthernetInterface : public Ifaces +@@ -363,6 +378,26 @@ class EthernetInterface : public Ifaces * @returns true/false value if the NIC is enabled */ bool queryNicEnabled() const; @@ -261,10 +261,10 @@ index 0fe3778..fa5c889 100644 } // namespace network diff --git a/src/network_manager.cpp b/src/network_manager.cpp -index fe59f0b..01a99a3 100644 +index 19e4673..1c8bf3b 100644 --- a/src/network_manager.cpp +++ b/src/network_manager.cpp -@@ -39,6 +39,13 @@ extern std::unique_ptr refreshObjectTimer; +@@ -39,6 +39,13 @@ extern std::unique_ptr reloadTimer; using namespace phosphor::logging; using namespace sdbusplus::xyz::openbmc_project::Common::Error; @@ -381,27 +381,25 @@ index fe59f0b..01a99a3 100644 bool Manager::createDefaultNetworkFiles(bool force) diff --git a/src/network_manager.hpp b/src/network_manager.hpp -index fb3cc32..0c3d49b 100644 +index f574891..49f1cfa 100644 --- a/src/network_manager.hpp +++ b/src/network_manager.hpp -@@ -156,6 +156,12 @@ class Manager : public details::VLANCreateIface - return routeTable; +@@ -170,6 +170,11 @@ class Manager : public details::VLANCreateIface + { + reloadPreHooks.push_back(std::move(hook)); } - + /** supported privilege list **/ + std::vector supportedPrivList; + + /** @brief initializes the supportedPrivilege List */ + void initSupportedPrivilges(); -+ + protected: /** @brief Persistent sdbusplus DBus bus connection. */ - sdbusplus::bus::bus& bus; -@@ -181,6 +187,9 @@ class Manager : public details::VLANCreateIface +@@ -199,6 +204,8 @@ class Manager : public details::VLANCreateIface - /** @brief The routing table */ - route::Table routeTable; -+ + /** @brief List of hooks to execute during the next reload */ + std::vector> reloadPreHooks; + /** Get the user management service name dynamically **/ + std::string getUserServiceName(); }; diff --git a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0004-Fix-for-updating-MAC-address-from-RedFish.patch b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0004-Fix-for-updating-MAC-address-from-RedFish.patch deleted file mode 100644 index 90bbc1d5b..000000000 --- a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0004-Fix-for-updating-MAC-address-from-RedFish.patch +++ /dev/null @@ -1,109 +0,0 @@ -From cbd034daf844529eb7f098c990dc8f44c12f6b97 Mon Sep 17 00:00:00 2001 -From: sunitakx -Date: Tue, 13 Jul 2021 12:54:01 +0000 -Subject: [PATCH] Fix for updating MAC address from RedFish - -Issue: When IP address source for an interface is DHCP and its MAC -address is patched using RedFish, response code is not reaching the -RedFish request initiator (client). - -RootCause: After bmcweb patches the MAC address, immediately IP address -of that interface also changes to new value (because of DHCP). -Due to this, success response from bmcweb is not reaching the client as -expected. - -Fix: Do MAC-ADDR patching after validating the request and responding -"200 OK" to RedFish client. i.e Start a timer which will modify the -MAC-ADDR at the end of its expiry. - -Tested: -Update the MAC address from RedFish. -PATCH: https:///redfish/v1/Managers/bmc/EthernetInterfaces/eth0 -Body: - {"MACAddress": "xx:xx:xx:xx:xx:xx"} - -Response code: {"200 OK"} received. - -Signed-off-by: sunitakx -Signed-off-by: Ramya Narayana ---- - src/ethernet_interface.cpp | 17 ++++++++++++----- - src/ethernet_interface.hpp | 5 +++++ - 2 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp -index 1145773..129905e 100644 ---- a/src/ethernet_interface.cpp -+++ b/src/ethernet_interface.cpp -@@ -143,6 +143,8 @@ EthernetInterface::EthernetInterface(sdbusplus::bus::bus& bus, - { - this->emit_object_added(); - } -+ macUpdateTimer = std::make_unique( -+ [this](void) { macAddressTimeoutHandler(); }); - } - - static IP::Protocol convertFamily(int family) -@@ -1209,8 +1211,17 @@ void EthernetInterface::writeDHCPSection(std::fstream& stream) - } - } - -+void EthernetInterface::macAddressTimeoutHandler() -+{ -+ macUpdateTimer->stop(); -+ // The MAC and LLADDRs will only update if the NIC is already down -+ EthernetIntfSocket eifSocket(PF_INET, SOCK_DGRAM, IPPROTO_IP); -+ setNICAdminState(eifSocket.sock, interfaceName().c_str(), false); -+ manager.reloadConfigs(); -+} - std::string EthernetInterface::macAddress(std::string value) - { -+ std::chrono::seconds usec(defaultTimeout); - ether_addr newMAC; - try - { -@@ -1244,12 +1255,8 @@ std::string EthernetInterface::macAddress(std::string value) - intf->MacAddressIntf::macAddress(validMAC); - } - MacAddressIntf::macAddress(validMAC); -- -+ macUpdateTimer->start(usec); - writeConfigurationFile(); -- // The MAC and LLADDRs will only update if the NIC is already down -- EthernetIntfSocket eifSocket(PF_INET, SOCK_DGRAM, IPPROTO_IP); -- setNICAdminState(eifSocket.sock, interface.c_str(), false); -- manager.reloadConfigs(); - } - - #ifdef HAVE_UBOOT_ENV -diff --git a/src/ethernet_interface.hpp b/src/ethernet_interface.hpp -index fa5c889..70f4756 100644 ---- a/src/ethernet_interface.hpp -+++ b/src/ethernet_interface.hpp -@@ -11,11 +11,14 @@ - #include - #include - #include -+#include - #include - #include - #include - #include - -+static constexpr const uint32_t defaultTimeout = 1; -+ - namespace phosphor - { - namespace network -@@ -84,6 +87,8 @@ class EthernetInterface : public Ifaces - EthernetInterface& operator=(EthernetInterface&&) = delete; - virtual ~EthernetInterface() = default; - -+ std::unique_ptr macUpdateTimer; -+ void macAddressTimeoutHandler(); - /** @brief Constructor to put object onto bus at a dbus path. - * @param[in] bus - Bus to attach to. - * @param[in] objPath - Path to attach at. --- -2.17.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network_%.bbappend b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network_%.bbappend index 4828c9ea0..a6cc6f510 100644 --- a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network_%.bbappend @@ -3,10 +3,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" DEPENDS += "nlohmann-json boost" SRC_URI = "git://github.com/openbmc/phosphor-networkd" -SRCREV = "ee2cba8a7d22ef4a251181087e9ef9bfc5c4b165" +SRCREV = "cc5a670f1650e76b66750365bd4beecf821969fa" SRC_URI += " file://0003-Adding-channel-specific-privilege-to-network.patch \ - file://0004-Fix-for-updating-MAC-address-from-RedFish.patch \ " EXTRA_OECONF:append = " --enable-nic-ethtool=yes" diff --git a/meta-openbmc-mods/meta-common/recipes-network/network/static-mac-addr.bb b/meta-openbmc-mods/meta-common/recipes-network/network/static-mac-addr.bb index ee55c5407..c32e14b6f 100644 --- a/meta-openbmc-mods/meta-common/recipes-network/network/static-mac-addr.bb +++ b/meta-openbmc-mods/meta-common/recipes-network/network/static-mac-addr.bb @@ -4,6 +4,8 @@ DESCRIPTION = "Set a priority on MAC addresses to run with: \ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +RDEPENDS:${PN} += "bash" + PV = "1.0" LICENSE = "Apache-2.0" @@ -11,7 +13,7 @@ LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fe SRC_URI = "\ file://mac-check \ - file://${PN}.service \ + file://${BPN}.service \ " inherit obmc-phosphor-systemd diff --git a/meta-openbmc-mods/meta-common/recipes-network/network/static-mac-addr/mac-check b/meta-openbmc-mods/meta-common/recipes-network/network/static-mac-addr/mac-check index 39d7dd8a7..429f9264b 100644 --- a/meta-openbmc-mods/meta-common/recipes-network/network/static-mac-addr/mac-check +++ b/meta-openbmc-mods/meta-common/recipes-network/network/static-mac-addr/mac-check @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2018 Intel Corporation # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -158,4 +158,29 @@ done <<-END_CONF eth0 eth1addr eth1 ethaddr END_CONF + +### HOSTNAME FEATURE ### +if [[ $* == *--no-unique-hostname* ]]; then + echo "mac-check: Skipping hostname check" +else + # Read MAC and strip colon chars + hw_mac=$(cat /sys/class/net/eth0/address | tr -d ":") + # Read Hostname + hostname=$(hostname) + #Match bmc-mac (a MAC address has 12 hex digits) + bmc_mac_format="^bmc-mac[a-f0-9]{12}$" + #Match bmc-mac + inteldefault="bmc-mac$hw_mac" + #if the current hostname already has the current MAC address, we won't rewrite the name unnecessarily. + #Otherwise, match intel-obmc or bmc-mac, and change the hostname to use the current MAC address + if [[ "$hostname" == "intel-obmc" || \ + ("$hostname" != "$inteldefault" && \ + "$hostname" =~ $bmc_mac_format) ]]; then + hostnamectl set-hostname "$inteldefault" + echo "mac-check: HOSTNAME CHANGED (hostname deemed to be default or wrong MAC Address)" + else + echo "mac-check: HOSTNAME NOT CHANGED (hostname is already correct or is custom)" + fi +fi + exit $first_error_seen diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/biosconfig-manager/biosconfig-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/biosconfig-manager/biosconfig-manager_git.bb index 711e4eced..8f14552ad 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/biosconfig-manager/biosconfig-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/biosconfig-manager/biosconfig-manager_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fe inherit meson systemd SRC_URI = "git://github.com/openbmc/bios-settings-mgr.git" -SRCREV = "29656f07b7e81c0bb13ca119b4c6ef62f5e79a18" +SRCREV = "616f9228daa5b94447c3c9d519b63f1686e751f5" SYSTEMD_SERVICE:${PN} += " \ xyz.openbmc_project.biosconfig_manager.service \ diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch index 0fea3e8a0..12a0ce5ca 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch @@ -1,6 +1,6 @@ -From 0941036f4206d74bfc3d3e505a5d269fb39c48ff Mon Sep 17 00:00:00 2001 +From 31f3f766c9c6cc6c0b7c722030dbbf6de65b7e2f Mon Sep 17 00:00:00 2001 From: mansijos -Date: Tue, 6 Apr 2021 02:12:56 +0530 +Date: Mon, 3 Jan 2022 19:44:09 +0000 Subject: [PATCH] Entity-manager: Add support to update assetTag Asset tag is an updateable property from User level interface like @@ -12,26 +12,20 @@ Successfully updated in assetTag interface as well as in fru interface while using set-property and using redfish as well. The new value is preserved after BMC resets. -Change-Id: If7fbfd8325488280f500ab0e2c8b38475813cc3f Signed-off-by: mansijos --- - src/EntityManager.cpp | 95 +++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 91 insertions(+), 4 deletions(-) + src/EntityManager.cpp | 83 ++++++++++++++++++++++++++++++++++++++++--- + src/PerformScan.cpp | 11 ++++++ + 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp -index 490c0f5..139ba9a 100644 +index d327f2b..5fade71 100644 --- a/src/EntityManager.cpp +++ b/src/EntityManager.cpp -@@ -48,9 +48,19 @@ constexpr const char* lastConfiguration = "/tmp/configuration/last.json"; - constexpr const char* currentConfiguration = "/var/configuration/system.json"; +@@ -51,6 +51,13 @@ constexpr const char* currentConfiguration = "/var/configuration/system.json"; constexpr const char* globalSchema = "global.json"; - constexpr const int32_t maxMapperDepth = 0; -+constexpr const char* foundObject = "FoundProbe"; - constexpr const bool debug = false; -+ -+ +using foundProbeData = std::map; +static foundProbeData foundData; +static std::map mapFoundData; @@ -39,10 +33,10 @@ index 490c0f5..139ba9a 100644 +constexpr const char* fruConn = "xyz.openbmc_project.FruDevice"; +constexpr const char* fruIntf = "xyz.openbmc_project.FruDevice"; + - struct CmpStr - { - bool operator()(const char* a, const char* b) const -@@ -577,6 +587,43 @@ void addArrayToDbus(const std::string& name, const nlohmann::json& array, + const boost::container::flat_map + probeTypes{{{"FALSE", probe_type_codes::FALSE_T}, + {"TRUE", probe_type_codes::TRUE_T}, +@@ -205,6 +212,43 @@ void addArrayToDbus(const std::string& name, const nlohmann::json& array, } } @@ -86,7 +80,7 @@ index 490c0f5..139ba9a 100644 template void addProperty(const std::string& propertyName, const PropertyType& value, sdbusplus::asio::dbus_interface* iface, -@@ -591,9 +638,18 @@ void addProperty(const std::string& propertyName, const PropertyType& value, +@@ -219,9 +263,18 @@ void addProperty(const std::string& propertyName, const PropertyType& value, } iface->register_property( propertyName, value, @@ -106,7 +100,7 @@ index 490c0f5..139ba9a 100644 val = newVal; if (!setJsonFromPointer(jsonPointerString, val, systemConfiguration)) -@@ -993,6 +1049,9 @@ void postToDbus(const nlohmann::json& newConfiguration, +@@ -621,6 +674,9 @@ void postToDbus(const nlohmann::json& newConfiguration, populateInterfaceFromJson(systemConfiguration, jsonPointerPath, boardIface, boardValues, objServer); jsonPointerPath += "/"; @@ -116,7 +110,7 @@ index 490c0f5..139ba9a 100644 // iterate through board properties for (auto& boardField : boardValues.items()) { -@@ -1002,9 +1061,28 @@ void postToDbus(const nlohmann::json& newConfiguration, +@@ -630,9 +686,28 @@ void postToDbus(const nlohmann::json& newConfiguration, createInterface(objServer, boardName, boardField.key(), boardKeyOrig); @@ -148,7 +142,20 @@ index 490c0f5..139ba9a 100644 } } -@@ -1362,6 +1440,11 @@ void PerformScan::run() +diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp +index 5978710..5261ef7 100644 +--- a/src/PerformScan.cpp ++++ b/src/PerformScan.cpp +@@ -38,6 +38,8 @@ constexpr const int32_t maxMapperDepth = 0; + + constexpr const bool debug = false; + ++constexpr const char* foundObject = "FoundProbe"; ++ + void getInterfaces( + const std::tuple& call, + const std::vector>& probeVector, +@@ -359,6 +361,11 @@ void PerformScan::run() { continue; // non-numeric replacement } @@ -160,7 +167,7 @@ index 490c0f5..139ba9a 100644 usedNames.insert(nameIt.value()); auto usedIt = std::find(indexes.begin(), indexes.end(), index); -@@ -1439,6 +1522,10 @@ void PerformScan::run() +@@ -436,6 +443,10 @@ void PerformScan::run() } } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend index ba51f9454..32f0a7857 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,6 +1,6 @@ # this is here just to bump faster than upstream # SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "2c412eef8eb76bf2a998c9d193f2dc92aaec39f8" +SRCREV = "3b802f1c8c030965b76737966b9b022433e6ef5b" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend index b8e0e7741..d8f77004b 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend @@ -1,7 +1,7 @@ # Keep this as a comment to enable the auto-bump script without # stomping on SRC_URI from previous .bbappend files #SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces.git" -SRCREV = "e0764cf41d16b823a519e9d4f508b588e3e84aba" +SRCREV = "ed708de3a629531dc2fdb8e70946fb24e112d617" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 328176aca..3da638514 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -5,7 +5,7 @@ SYSTEMD_SERVICE:${PN} = "phosphor-pid-control.service" EXTRA_OECONF = "--enable-configure-dbus=yes" SRC_URI = "git://github.com/openbmc/phosphor-pid-control.git" -SRCREV = "cca9c659889d149c06e95bab4b8808db4f1e3eab" +SRCREV = "457993f836338aa0c13a32af803fcbc5227c81f3" SRC_URI += "\ file://0001-allow-dbus-sensors-without-thresholds.patch \ diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/host/phosphor-host-postd_git.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/host/phosphor-host-postd_git.bbappend index 0c97b0b86..21ff75f73 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/host/phosphor-host-postd_git.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/host/phosphor-host-postd_git.bbappend @@ -1,4 +1,4 @@ DEPENDS += " gtest" #SRC_URI = "git://github.com/openbmc/phosphor-host-postd.git" -SRCREV = "996facb65d554f7c0f14c10e3c9252d67a01e21a" +SRCREV = "6a5e0a1cba979c3c793e794c41481221da9a4e33" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-configuration-changes.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-configuration-changes.patch index 6621d2512..4fb12ed04 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-configuration-changes.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-configuration-changes.patch @@ -1,6 +1,6 @@ -From 7c005c318a12c53ed887b3081bd4b34ea0213053 Mon Sep 17 00:00:00 2001 +From 74309a2b2f9a41b741816cb427d9008f67c6f160 Mon Sep 17 00:00:00 2001 From: Vikram Bodireddy -Date: Mon, 28 Jun 2021 21:56:18 +0530 +Date: Fri, 3 Dec 2021 05:25:02 +0530 Subject: [PATCH] Firmware update configuration changes This commit will provide user to PATCH the below firmware update @@ -39,20 +39,18 @@ Tested: - Successfully ran redfish validater with no new errors. -Change-Id: I25ef6d64af3f1dcea3acba93d7fd2b505130142e Signed-off-by: Vikram Bodireddy -Signed-off-by: AppaRao Puli --- - redfish-core/lib/update_service.hpp | 462 ++++++++++++++---- + redfish-core/lib/update_service.hpp | 337 ++++++++++++++++-- static/redfish/v1/$metadata/index.xml | 3 + - .../JsonSchemas/OemUpdateService/index.json | 69 +++ - .../redfish/v1/schema/OemUpdateService_v1.xml | 40 ++ - 4 files changed, 484 insertions(+), 90 deletions(-) + .../JsonSchemas/OemUpdateService/index.json | 69 ++++ + .../redfish/v1/schema/OemUpdateService_v1.xml | 40 +++ + 4 files changed, 421 insertions(+), 28 deletions(-) create mode 100644 static/redfish/v1/JsonSchemas/OemUpdateService/index.json create mode 100644 static/redfish/v1/schema/OemUpdateService_v1.xml diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp -index e420130..b3270f0 100644 +index fde878e..be0abc9 100644 --- a/redfish-core/lib/update_service.hpp +++ b/redfish-core/lib/update_service.hpp @@ -26,7 +26,9 @@ @@ -84,7 +82,7 @@ index e420130..b3270f0 100644 inline static void cleanUp() { -@@ -42,28 +55,120 @@ inline static void cleanUp() +@@ -42,27 +55,120 @@ inline static void cleanUp() fwUpdateErrorMatcher = nullptr; } inline static void activateImage(const std::string& objPath, @@ -97,13 +95,13 @@ index e420130..b3270f0 100644 + if (imgUriTargets.size() == 0) + { + crow::connections::systemBus->async_method_call( -+ [](const boost::system::error_code error_code) { -+ if (error_code) ++ [](const boost::system::error_code errorCode) { ++ if (errorCode) + { + BMCWEB_LOG_DEBUG + << "RequestedActivation failed: error_code = " -+ << error_code; -+ BMCWEB_LOG_DEBUG << "error msg = " << error_code.message(); ++ << errorCode; ++ BMCWEB_LOG_DEBUG << "error msg = " << errorCode.message(); + } + }, + service, objPath, "org.freedesktop.DBus.Properties", "Set", @@ -123,14 +121,14 @@ index e420130..b3270f0 100644 + const boost::system::error_code ec, + const crow::openbmc_mapper::GetSubTreeType& subtree) { + if (ec || !subtree.size()) -+ { + { +- BMCWEB_LOG_DEBUG << "error_code = " << errorCode; +- BMCWEB_LOG_DEBUG << "error msg = " << errorCode.message(); + return; + } + + for (const auto& [invObjPath, invDict] : subtree) - { -- BMCWEB_LOG_DEBUG << "error_code = " << errorCode; -- BMCWEB_LOG_DEBUG << "error msg = " << errorCode.message(); ++ { + std::size_t idPos = invObjPath.rfind("/"); + if ((idPos == std::string::npos) || + ((idPos + 1) >= invObjPath.size())) @@ -198,9 +196,8 @@ index e420130..b3270f0 100644 }, - service, objPath, "org.freedesktop.DBus.Properties", "Set", - "xyz.openbmc_project.Software.Activation", "RequestedActivation", -- std::variant( -- "xyz.openbmc_project.Software.Activation.RequestedActivations." -- "Active")); +- dbus::utility::DbusVariantType( +- "xyz.openbmc_project.Software.Activation.RequestedActivations.Active")); + "xyz.openbmc_project.ObjectMapper", + "/xyz/openbmc_project/object_mapper", + "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", @@ -215,7 +212,7 @@ index e420130..b3270f0 100644 sdbusplus::message::message& m, task::Payload&& payload) { -@@ -76,23 +181,25 @@ static void +@@ -75,23 +181,26 @@ static void m.read(objPath, interfacesProperties); @@ -234,11 +231,9 @@ index e420130..b3270f0 100644 + [objPath, asyncResp, imgTargets{imgUriTargets}, + payload(std::move(payload))]( const boost::system::error_code errorCode, -- const std::vector< -- std::pair>>& -- objInfo) mutable { -+ const std::vector>>& objInfo) { + const std::vector< + std::pair>>& + objInfo) mutable { if (errorCode) { - BMCWEB_LOG_DEBUG << "error_code = " << errorCode; @@ -248,7 +243,7 @@ index e420130..b3270f0 100644 BMCWEB_LOG_DEBUG << "error msg = " << errorCode.message(); if (asyncResp) -@@ -119,7 +226,7 @@ static void +@@ -118,7 +227,7 @@ static void // is added fwAvailableTimer = nullptr; @@ -257,7 +252,7 @@ index e420130..b3270f0 100644 if (asyncResp) { std::shared_ptr task = -@@ -251,8 +358,7 @@ static void +@@ -249,8 +358,7 @@ static void "xyz.openbmc_project.ObjectMapper", "/xyz/openbmc_project/object_mapper", "xyz.openbmc_project.ObjectMapper", "GetObject", objPath.str, @@ -267,7 +262,7 @@ index e420130..b3270f0 100644 } } } -@@ -262,7 +368,7 @@ static void +@@ -260,7 +368,7 @@ static void static void monitorForSoftwareAvailable( const std::shared_ptr& asyncResp, const crow::Request& req, const std::string& url, @@ -276,11 +271,9 @@ index e420130..b3270f0 100644 { // Only allow one FW update at a time if (fwUpdateInProgress != false) -@@ -301,11 +407,12 @@ static void monitorForSoftwareAvailable( - redfish::messages::internalError(asyncResp->res); +@@ -300,10 +408,10 @@ static void monitorForSoftwareAvailable( } }); -+ task::Payload payload(req); - auto callback = [asyncResp, + auto callback = [asyncResp, imgTargets{imgUriTargets}, @@ -291,7 +284,7 @@ index e420130..b3270f0 100644 }; fwUpdateInProgress = true; -@@ -470,12 +577,15 @@ inline void requestRoutesUpdateServiceActionsSimpleUpdate(App& app) +@@ -470,12 +578,15 @@ inline void requestRoutesUpdateServiceActionsSimpleUpdate(App& app) std::string fwFile = imageURI.substr(separator + 1); BMCWEB_LOG_DEBUG << "Server: " << tftpServer + " File: " << fwFile; @@ -308,7 +301,7 @@ index e420130..b3270f0 100644 // TFTP can take up to 10 minutes depending on image size and // connection speed. Return to caller as soon as the TFTP operation -@@ -524,6 +634,9 @@ inline void requestRoutesUpdateService(App& app) +@@ -524,6 +635,9 @@ inline void requestRoutesUpdateService(App& app) asyncResp->res.jsonValue["Name"] = "Update Service"; asyncResp->res.jsonValue["HttpPushUri"] = "/redfish/v1/UpdateService"; @@ -318,20 +311,10 @@ index e420130..b3270f0 100644 // UpdateService cannot be disabled asyncResp->res.jsonValue["ServiceEnabled"] = true; asyncResp->res.jsonValue["FirmwareInventory"] = { -@@ -538,7 +651,8 @@ inline void requestRoutesUpdateService(App& app) - asyncResp->res - .jsonValue["Actions"]["#UpdateService.SimpleUpdate"]; - updateSvcSimpleUpdate["target"] = -- "/redfish/v1/UpdateService/Actions/UpdateService.SimpleUpdate"; -+ "/redfish/v1/UpdateService/Actions/" -+ "UpdateService.SimpleUpdate"; - updateSvcSimpleUpdate["TransferProtocol@Redfish.AllowableValues"] = - {"TFTP"}; - #endif -@@ -580,89 +694,258 @@ inline void requestRoutesUpdateService(App& app) - "/xyz/openbmc_project/software/apply_time", - "org.freedesktop.DBus.Properties", "Get", - "xyz.openbmc_project.Software.ApplyTime", "RequestedApplyTime"); +@@ -575,6 +689,34 @@ inline void requestRoutesUpdateService(App& app) + "OnReset"; + } + }); + + // Get the ApplyOptions value + crow::connections::systemBus->async_method_call( @@ -361,33 +344,26 @@ index e420130..b3270f0 100644 + "org.freedesktop.DBus.Properties", "Get", + "xyz.openbmc_project.Software.ApplyOptions", "ClearConfig"); }); -+ BMCWEB_ROUTE(app, "/redfish/v1/UpdateService/") .privileges(redfish::privileges::patchUpdateService) -- .methods(boost::beast::http::verb::patch)( -- [](const crow::Request& req, -- const std::shared_ptr& asyncResp) { -- BMCWEB_LOG_DEBUG << "doPatch..."; -+ .methods( -+ boost::beast::http::verb:: -+ patch)([](const crow::Request& req, -+ const std::shared_ptr& asyncResp) { -+ BMCWEB_LOG_DEBUG << "doPatch..."; -+ -+ std::optional pushUriOptions; +@@ -585,12 +727,60 @@ inline void requestRoutesUpdateService(App& app) + BMCWEB_LOG_DEBUG << "doPatch..."; + + std::optional pushUriOptions; + std::optional> imgTargets; + std::optional imgTargetBusy; + std::optional oemProps; -+ if (!json_util::readJson(req, asyncResp->res, "HttpPushUriOptions", + if (!json_util::readJson(req, asyncResp->res, "HttpPushUriOptions", +- pushUriOptions)) + pushUriOptions, "HttpPushUriTargets", + imgTargets, "HttpPushUriTargetsBusy", + imgTargetBusy, "Oem", oemProps)) -+ { + { + BMCWEB_LOG_DEBUG + << "UpdateService doPatch: Invalid request body"; -+ return; -+ } -+ + return; + } + + if (oemProps) + { + std::optional applyOptions; @@ -406,10 +382,7 @@ index e420130..b3270f0 100644 + { + return; + } - -- std::optional pushUriOptions; -- if (!json_util::readJson(req, asyncResp->res, -- "HttpPushUriOptions", pushUriOptions)) ++ + if (clearConfig) + { + // Set the requested image apply time value @@ -432,82 +405,13 @@ index e420130..b3270f0 100644 + } + } + } -+ if (pushUriOptions) -+ { -+ std::optional pushUriApplyTime; -+ if (!json_util::readJson(*pushUriOptions, asyncResp->res, -+ "HttpPushUriApplyTime", -+ pushUriApplyTime)) - { - return; - } - -- if (pushUriOptions) -+ if (pushUriApplyTime) - { -- std::optional pushUriApplyTime; -- if (!json_util::readJson(*pushUriOptions, asyncResp->res, -- "HttpPushUriApplyTime", -- pushUriApplyTime)) -+ std::optional applyTime; -+ if (!json_util::readJson(*pushUriApplyTime, asyncResp->res, -+ "ApplyTime", applyTime)) - { - return; + if (pushUriOptions) + { + std::optional pushUriApplyTime; +@@ -653,6 +843,98 @@ inline void requestRoutesUpdateService(App& app) } - -- if (pushUriApplyTime) -+ if (applyTime) - { -- std::optional applyTime; -- if (!json_util::readJson(*pushUriApplyTime, -- asyncResp->res, "ApplyTime", -- applyTime)) -+ std::string applyTimeNewVal; -+ if (applyTime == "Immediate") - { -+ applyTimeNewVal = -+ "xyz.openbmc_project.Software.ApplyTime." -+ "RequestedApplyTimes.Immediate"; -+ } -+ else if (applyTime == "OnReset") -+ { -+ applyTimeNewVal = -+ "xyz.openbmc_project.Software.ApplyTime." -+ "RequestedApplyTimes.OnReset"; -+ } -+ else -+ { -+ BMCWEB_LOG_INFO -+ << "ApplyTime value is not in the list of " -+ "acceptable values"; -+ messages::propertyValueNotInList( -+ asyncResp->res, *applyTime, "ApplyTime"); - return; - } - -- if (applyTime) -+ // Set the requested image apply time value -+ crow::connections::systemBus->async_method_call( -+ [asyncResp](const boost::system::error_code ec) { -+ if (ec) -+ { -+ BMCWEB_LOG_ERROR -+ << "D-Bus responses error: " << ec; -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ messages::success(asyncResp->res); -+ }, -+ "xyz.openbmc_project.Settings", -+ "/xyz/openbmc_project/software/apply_time", -+ "org.freedesktop.DBus.Properties", "Set", -+ "xyz.openbmc_project.Software.ApplyTime", -+ "RequestedApplyTime", -+ std::variant{applyTimeNewVal}); -+ } -+ } -+ } + } + } + if (imgTargetBusy) + { + if ((httpPushUriTargetBusy) && (*imgTargetBusy)) @@ -539,29 +443,7 @@ index e420130..b3270f0 100644 + // single image in future. For now, consider first + // target alone. + if ((*imgTargets).size() != 1) - { -- std::string applyTimeNewVal; -- if (applyTime == "Immediate") -- { -- applyTimeNewVal = -- "xyz.openbmc_project.Software.ApplyTime." -- "RequestedApplyTimes.Immediate"; -- } -- else if (applyTime == "OnReset") -- { -- applyTimeNewVal = -- "xyz.openbmc_project.Software.ApplyTime." -- "RequestedApplyTimes.OnReset"; -- } -- else -- { -- BMCWEB_LOG_INFO -- << "ApplyTime value is not in the list of " -- "acceptable values"; -- messages::propertyValueNotInList( -- asyncResp->res, *applyTime, "ApplyTime"); -- return; -- } ++ { + messages::invalidObject(asyncResp->res, + "HttpPushUriTargets"); + return; @@ -575,35 +457,19 @@ index e420130..b3270f0 100644 + { + return; + } - -- // Set the requested image apply time value -- crow::connections::systemBus->async_method_call( -- [asyncResp]( -- const boost::system::error_code ec) { -- if (ec) ++ + bool swInvObjFound = false; + for (const std::string& path : swInvPaths) + { + std::size_t idPos = path.rfind("/"); + if ((idPos == std::string::npos) || + ((idPos + 1) >= path.size())) - { -- BMCWEB_LOG_ERROR -- << "D-Bus responses error: " << ec; - messages::internalError(asyncResp->res); ++ { ++ messages::internalError(asyncResp->res); + BMCWEB_LOG_DEBUG + << "Can't parse firmware ID!!"; - return; - } -- messages::success(asyncResp->res); -- }, -- "xyz.openbmc_project.Settings", -- "/xyz/openbmc_project/software/apply_time", -- "org.freedesktop.DBus.Properties", "Set", -- "xyz.openbmc_project.Software.ApplyTime", -- "RequestedApplyTime", -- std::variant{applyTimeNewVal}); -- } ++ return; ++ } + std::string swId = path.substr(idPos + 1); + + if (swId == uriTargets[0]) @@ -631,20 +497,17 @@ index e420130..b3270f0 100644 + { + httpPushUriTargetBusy = *imgTargetBusy; + httpPushUriTargets = *imgTargets; - } - } -- }); ++ } ++ } + else + { + httpPushUriTargetBusy = *imgTargetBusy; + } + } -+ }); -+ + }); BMCWEB_ROUTE(app, "/redfish/v1/UpdateService/") .privileges(redfish::privileges::postUpdateService) - .methods(boost::beast::http::verb::post)( -@@ -672,7 +955,8 @@ inline void requestRoutesUpdateService(App& app) +@@ -663,7 +945,8 @@ inline void requestRoutesUpdateService(App& app) // Setup callback for when new software detected monitorForSoftwareAvailable(asyncResp, req, @@ -654,26 +517,17 @@ index e420130..b3270f0 100644 std::string filepath("/tmp/images/" + boost::uuids::to_string( -@@ -685,7 +969,7 @@ inline void requestRoutesUpdateService(App& app) - out.close(); - BMCWEB_LOG_DEBUG << "file upload complete!!"; - }); --} -+} // namespace redfish - - inline void requestRoutesSoftwareInventoryCollection(App& app) - { -@@ -748,8 +1032,7 @@ inline void requestRoutesSoftwareInventoryCollection(App& app) - "/xyz/openbmc_project/object_mapper", - "xyz.openbmc_project.ObjectMapper", "GetSubTree", - "/xyz/openbmc_project/software", static_cast(0), -- std::array{ -- "xyz.openbmc_project.Software.Version"}); -+ std::array{versionIntf}); - }); +@@ -739,8 +1022,7 @@ inline void requestRoutesSoftwareInventoryCollection(App& app) + "/xyz/openbmc_project/object_mapper", + "xyz.openbmc_project.ObjectMapper", "GetSubTree", + "/xyz/openbmc_project/software", static_cast(0), +- std::array{ +- "xyz.openbmc_project.Software.Version"}); ++ std::array{versionIntf}); + }); } /* Fill related item links (i.e. bmc, bios) in for inventory */ -@@ -913,7 +1196,7 @@ inline void requestRoutesSoftwareInventory(App& app) +@@ -908,7 +1190,7 @@ inline void requestRoutesSoftwareInventory(App& app) }, obj.second[0].first, obj.first, "org.freedesktop.DBus.Properties", "GetAll", @@ -682,7 +536,7 @@ index e420130..b3270f0 100644 } if (!found) { -@@ -937,8 +1220,7 @@ inline void requestRoutesSoftwareInventory(App& app) +@@ -932,8 +1214,7 @@ inline void requestRoutesSoftwareInventory(App& app) "/xyz/openbmc_project/object_mapper", "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", static_cast(0), @@ -693,10 +547,10 @@ index e420130..b3270f0 100644 } diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml -index 66b6faf..f0919c9 100644 +index 445af04..de7dc77 100644 --- a/static/redfish/v1/$metadata/index.xml +++ b/static/redfish/v1/$metadata/index.xml -@@ -2444,6 +2444,9 @@ +@@ -2502,6 +2502,9 @@ diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0025-Add-Model-CoreCount-to-ProcessorSummary.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0025-Add-Model-CoreCount-to-ProcessorSummary.patch deleted file mode 100644 index edf4d219e..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0025-Add-Model-CoreCount-to-ProcessorSummary.patch +++ /dev/null @@ -1,288 +0,0 @@ -From f4f15a52610d1a199ddac948c8f849df05d86151 Mon Sep 17 00:00:00 2001 -From: Ali Ahmed -Date: Fri, 3 Sep 2021 02:33:43 -0500 -Subject: [PATCH] Add Model & CoreCount to ProcessorSummary - -In Redfish ComputerSystem schema, the ProcessorSummary parameter -lists summary information of the Processors on the system. This commit -adds the 'Model' and 'CoreCount' properties to ProcessorSummary. - -If the CPU Models are different, then the 'Model' field takes the first -entry in alphabetical order. - -Testing: -1. Redfish Validator Testing successfully passed. -2. Curl testing: - -curl -k -H "X-Auth-Token: $tok" https://$bmc/redfish/v1/Systems/system - -... - "ProcessorSummary": { - "CoreCount": 24, - "Count": 2, - "Model": "test_name", - "Status": { - "Health": "OK", - "HealthRollup": "OK", - "State": "Disabled" - } - }, -... - -Change-Id: I39cbf6ed35c35ce3a3551c9689237d5023775326 -Signed-off-by: Ali Ahmed -Signed-off-by: AppaRao Puli ---- - redfish-core/lib/systems.hpp | 229 ++++++++++++++++++++++------------- - 1 file changed, 147 insertions(+), 82 deletions(-) - -diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp -index 680a0ee..3b5f9e4 100644 ---- a/redfish-core/lib/systems.hpp -+++ b/redfish-core/lib/systems.hpp -@@ -139,6 +139,152 @@ inline void - } - } - -+inline void getProcessorProperties( -+ const std::shared_ptr& aResp, const std::string& service, -+ const std::string& path, -+ const std::vector>>& -+ properties) -+{ -+ -+ BMCWEB_LOG_DEBUG << "Got " << properties.size() << " Cpu properties."; -+ -+ auto getCpuPresenceState = -+ [aResp](const boost::system::error_code ec3, -+ const std::variant& cpuPresenceCheck) { -+ if (ec3) -+ { -+ BMCWEB_LOG_ERROR << "DBUS response error " << ec3; -+ return; -+ } -+ modifyCpuPresenceState(aResp, cpuPresenceCheck); -+ }; -+ -+ auto getCpuFunctionalState = -+ [aResp](const boost::system::error_code ec3, -+ const std::variant& cpuFunctionalCheck) { -+ if (ec3) -+ { -+ BMCWEB_LOG_ERROR << "DBUS response error " << ec3; -+ return; -+ } -+ modifyCpuFunctionalState(aResp, cpuFunctionalCheck); -+ }; -+ -+ // Get the Presence of CPU -+ crow::connections::systemBus->async_method_call( -+ std::move(getCpuPresenceState), service, path, -+ "org.freedesktop.DBus.Properties", "Get", -+ "xyz.openbmc_project.Inventory.Item", "Present"); -+ -+ // Get the Functional State -+ crow::connections::systemBus->async_method_call( -+ std::move(getCpuFunctionalState), service, path, -+ "org.freedesktop.DBus.Properties", "Get", -+ "xyz.openbmc_project.State.Decorator.OperationalStatus", "Functional"); -+ -+ for (const auto& property : properties) -+ { -+ if (property.first == "Family") -+ { -+ // Get the CPU Model -+ const std::string* modelStr = -+ std::get_if(&property.second); -+ if (!modelStr) -+ { -+ BMCWEB_LOG_DEBUG << "Failed to get CPU Family"; -+ // Skip it and continue with other properties -+ continue; -+ } -+ if ((*modelStr).size() < 1) -+ { -+ BMCWEB_LOG_DEBUG << "Empty CPU Family info, skipping..."; -+ continue; -+ } -+ nlohmann::json& prevModel = -+ aResp->res.jsonValue["ProcessorSummary"]["Model"]; -+ std::string* prevModelPtr = prevModel.get_ptr(); -+ -+ // If CPU Models are different, use the first entry in -+ // alphabetical order -+ -+ // If Model has never been set -+ // before, set it to *modelStr -+ if (prevModelPtr == nullptr) -+ { -+ prevModel = *modelStr; -+ } -+ // If Model has been set before, only change if new Model is -+ // higher in alphabetical order -+ else -+ { -+ if (*modelStr < *prevModelPtr) -+ { -+ prevModel = *modelStr; -+ } -+ } -+ } -+ else if (property.first == "CoreCount") -+ { -+ // Get CPU CoreCount and add it to the total -+ const uint16_t* coreCountVal = -+ std::get_if(&property.second); -+ -+ if (!coreCountVal) -+ { -+ BMCWEB_LOG_DEBUG << "Failed to get CPU Core count"; -+ // Skip it and continue with other properties -+ continue; -+ } -+ -+ nlohmann::json& coreCount = -+ aResp->res.jsonValue["ProcessorSummary"]["CoreCount"]; -+ uint64_t* coreCountPtr = coreCount.get_ptr(); -+ -+ if (coreCountPtr == nullptr) -+ { -+ coreCount = *coreCountVal; -+ } -+ else -+ { -+ *coreCountPtr += *coreCountVal; -+ } -+ } -+ } -+} -+ -+/* -+ * @brief Get ProcessorSummary fields -+ * -+ * @param[in] aResp Shared pointer for completing asynchronous calls -+ * @param[in] service dbus service for Cpu Information -+ * @param[in] path dbus path for Cpu -+ * -+ * @return None. -+ */ -+inline void getProcessorSummary(const std::shared_ptr& aResp, -+ const std::string& service, -+ const std::string& path) -+{ -+ -+ crow::connections::systemBus->async_method_call( -+ [aResp, service, -+ path](const boost::system::error_code ec2, -+ const std::vector>>& properties) { -+ if (ec2) -+ { -+ BMCWEB_LOG_ERROR << "DBUS response error " << ec2; -+ messages::internalError(aResp->res); -+ return; -+ } -+ getProcessorProperties(aResp, service, path, properties); -+ }, -+ service, path, "org.freedesktop.DBus.Properties", "GetAll", -+ "xyz.openbmc_project.Inventory.Item.Cpu"); -+} -+ - /* - * @brief Retrieves computer system properties over dbus - * -@@ -309,88 +455,7 @@ inline void - BMCWEB_LOG_DEBUG - << "Found Cpu, now get its properties."; - -- crow::connections::systemBus->async_method_call( -- [aResp, service{connection.first}, -- path](const boost::system::error_code ec2, -- const std::vector< -- std::pair>& -- properties) { -- if (ec2) -- { -- BMCWEB_LOG_ERROR -- << "DBUS response error " << ec2; -- messages::internalError(aResp->res); -- return; -- } -- BMCWEB_LOG_DEBUG << "Got " -- << properties.size() -- << " Cpu properties."; -- -- auto getCpuPresenceState = -- [aResp]( -- const boost::system::error_code ec3, -- const std::variant& -- cpuPresenceCheck) { -- if (ec3) -- { -- BMCWEB_LOG_ERROR -- << "DBUS response error " -- << ec3; -- return; -- } -- modifyCpuPresenceState( -- aResp, cpuPresenceCheck); -- }; -- -- auto getCpuFunctionalState = -- [aResp]( -- const boost::system::error_code ec3, -- const std::variant& -- cpuFunctionalCheck) { -- if (ec3) -- { -- BMCWEB_LOG_ERROR -- << "DBUS response error " -- << ec3; -- return; -- } -- modifyCpuFunctionalState( -- aResp, cpuFunctionalCheck); -- }; -- -- // Get the Presence of CPU -- crow::connections::systemBus -- ->async_method_call( -- std::move(getCpuPresenceState), -- service, path, -- "org.freedesktop.DBus." -- "Properties", -- "Get", -- "xyz.openbmc_project.Inventory." -- "Item", -- "Present"); -- -- // Get the Functional State -- crow::connections::systemBus -- ->async_method_call( -- std::move(getCpuFunctionalState), -- service, path, -- "org.freedesktop.DBus." -- "Properties", -- "Get", -- "xyz.openbmc_project.State." -- "Decorator." -- "OperationalStatus", -- "Functional"); -- -- // Get the MODEL from -- // xyz.openbmc_project.Inventory.Decorator.Asset -- // support it later as Model is Empty -- // currently. -- }, -- connection.first, path, -- "org.freedesktop.DBus.Properties", "GetAll", -- "xyz.openbmc_project.Inventory.Item.Cpu"); -+ getProcessorSummary(aResp, connection.first, path); - - cpuHealth->inventory.emplace_back(path); - } --- -2.17.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0025-Add-Model-to-ProcessorSummary.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0025-Add-Model-to-ProcessorSummary.patch new file mode 100644 index 000000000..92654bee1 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0025-Add-Model-to-ProcessorSummary.patch @@ -0,0 +1,108 @@ +From 1b34b289eacc2ebb9c343680a3696dda4abe4a37 Mon Sep 17 00:00:00 2001 +From: Ali Ahmed +Date: Fri, 3 Sep 2021 02:33:43 -0500 +Subject: [PATCH] Add Model to ProcessorSummary + +In Redfish ComputerSystem schema, the ProcessorSummary parameter +lists summary information of the Processors on the system. This commit +adds the 'Model' property to ProcessorSummary. + +If the CPU Models are different, then the 'Model' field takes the first +entry in alphabetical order. + +Testing: +1. Redfish Validator Testing successfully passed. +2. Curl testing: + +curl -k -H "X-Auth-Token: $tok" https://$bmc/redfish/v1/Systems/system + +... + "ProcessorSummary": { + "CoreCount": 24, + "Count": 2, + "Model": "test_name", + "Status": { + "Health": "OK", + "HealthRollup": "OK", + "State": "Disabled" + } + }, +... + +Change-Id: I39cbf6ed35c35ce3a3551c9689237d5023775326 +Signed-off-by: Ali Ahmed +Signed-off-by: AppaRao Puli +--- + redfish-core/lib/systems.hpp | 47 +++++++++++++++++++++++++++++++----- + 1 file changed, 41 insertions(+), 6 deletions(-) + +diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp +index 2f88a777..8406bd4d 100644 +--- a/redfish-core/lib/systems.hpp ++++ b/redfish-core/lib/systems.hpp +@@ -185,21 +185,56 @@ inline void getProcessorProperties( + + for (const auto& property : properties) + { ++ if (property.first == "Family") ++ { ++ // Get the CPU Model ++ const std::string* modelStr = ++ std::get_if(&property.second); ++ if (!modelStr) ++ { ++ BMCWEB_LOG_DEBUG << "Failed to get CPU Family"; ++ // Skip it and continue with other properties ++ continue; ++ } ++ if ((*modelStr).size() < 1) ++ { ++ BMCWEB_LOG_DEBUG << "Empty CPU Family info, skipping..."; ++ continue; ++ } ++ nlohmann::json& prevModel = ++ aResp->res.jsonValue["ProcessorSummary"]["Model"]; ++ std::string* prevModelPtr = prevModel.get_ptr(); + +- // TODO: Get Model ++ // If CPU Models are different, use the first entry in ++ // alphabetical order + +- // Get CoreCount +- if (property.first == "CoreCount") ++ // If Model has never been set ++ // before, set it to *modelStr ++ if (prevModelPtr == nullptr) ++ { ++ prevModel = *modelStr; ++ } ++ // If Model has been set before, only change if new Model is ++ // higher in alphabetical order ++ else ++ { ++ if (*modelStr < *prevModelPtr) ++ { ++ prevModel = *modelStr; ++ } ++ } ++ } ++ else if (property.first == "CoreCount") + { +- + // Get CPU CoreCount and add it to the total + const uint16_t* coreCountVal = + std::get_if(&property.second); + + if (!coreCountVal) + { +- messages::internalError(aResp->res); +- return; ++ BMCWEB_LOG_DEBUG << "Failed to get CPU Core count"; ++ // Skip it and continue with other properties ++ continue; + } + + nlohmann::json& coreCount = +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0026-Revert-Delete-the-copy-constructor-on-the-Request.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0026-Revert-Delete-the-copy-constructor-on-the-Request.patch new file mode 100644 index 000000000..9f21b8475 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0026-Revert-Delete-the-copy-constructor-on-the-Request.patch @@ -0,0 +1,30 @@ +From d9488db9785b599d2c1e3a9d9fe1d2b5fa953865 Mon Sep 17 00:00:00 2001 +From: P Dheeraj Srujan Kumar +Date: Tue, 4 Jan 2022 06:49:58 +0530 +Subject: [PATCH] Revert "Delete the copy constructor on the Request object" + +This commit is reverted to resolve build issues due arising due +to removal of the copy constructor. + +This reverts commit 597d2b142362bafa90f24fc8c30750afab91f78f. +--- + http/http_request.hpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/http/http_request.hpp b/http/http_request.hpp +index 4567314..be84f18 100644 +--- a/http/http_request.hpp ++++ b/http/http_request.hpp +@@ -45,9 +45,6 @@ struct Request + } + } + +- Request(const Request&) = delete; +- Request& operator=(const Request&) = delete; +- + boost::beast::http::verb method() const + { + return req.method(); +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0027-Convert-VariantType-to-DbusVariantType.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0027-Convert-VariantType-to-DbusVariantType.patch new file mode 100644 index 000000000..f9bb69826 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0027-Convert-VariantType-to-DbusVariantType.patch @@ -0,0 +1,50 @@ +From 8e78ffc54b2a5444e96cdcc1440928b04e21c2a5 Mon Sep 17 00:00:00 2001 +From: AppaRao Puli +Date: Thu, 6 Jan 2022 01:37:08 +0000 +Subject: [PATCH] Convert VariantType to DbusVariantType + +All bmcweb code is now converted to use +DbusVariantType to reduce the image size. + +Its missed in one place where the code is under compiler +flag BMCWEB_ENABLE_REDFISH_PROVISIONING_FEATURE. This commit +convert missed types to DbusVariantType. + +Tested: +After conversion, image builds fine with compiler +flag enabled. Also tested the PFR provisioned +dbus calls and it works fine. + +Signed-off-by: AppaRao Puli +--- + redfish-core/lib/systems.hpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp +index 5fbd568..e9ae7ca 100644 +--- a/redfish-core/lib/systems.hpp ++++ b/redfish-core/lib/systems.hpp +@@ -1840,7 +1840,8 @@ inline void getProvisioningStatus(std::shared_ptr aResp) + BMCWEB_LOG_DEBUG << "Get OEM information."; + crow::connections::systemBus->async_method_call( + [aResp](const boost::system::error_code ec, +- const std::vector>& ++ const std::vector< ++ std::pair>& + propertiesList) { + nlohmann::json& oemPFR = + aResp->res.jsonValue["Oem"]["OpenBmc"]["FirmwareProvisioning"]; +@@ -1858,8 +1859,8 @@ inline void getProvisioningStatus(std::shared_ptr aResp) + + const bool* provState = nullptr; + const bool* lockState = nullptr; +- for (const std::pair& property : +- propertiesList) ++ for (const std::pair& ++ property : propertiesList) + { + if (property.first == "UfmProvisioned") + { +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0006-Add-fix-for-broken-feature-Pending-Attributes.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0006-Add-fix-for-broken-feature-Pending-Attributes.patch index 2e72a639d..85b5b3494 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0006-Add-fix-for-broken-feature-Pending-Attributes.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0006-Add-fix-for-broken-feature-Pending-Attributes.patch @@ -1,6 +1,6 @@ -From f75beb0472a42d5af512661470aadf12ac460470 Mon Sep 17 00:00:00 2001 +From 8225b2dc07279c65cdfe2ddc13964d84fd2ed8bb Mon Sep 17 00:00:00 2001 From: Arun Lal K M -Date: Fri, 8 Oct 2021 21:30:33 +0000 +Date: Tue, 4 Jan 2022 01:56:57 +0000 Subject: [PATCH] Add fix for broken feature 'Pending Attributes'. Fix is added for the following: @@ -10,6 +10,7 @@ Fix is added for the following: 4) Fix for incremental duplicate values in BiosAttributeRegistry. 5) POST to '/redfish/v1/Systems/system/Bios/Actions /Bios.ChangePassword/'. +6) Add support for Enumeration. Tested: By giving PATCH to 'redfish/v1/Systems/system/Bios/Settings' @@ -133,11 +134,11 @@ Validation has succeeded. Signed-off-by: Arun Lal K M Signed-off-by: Snehalatha Venkatesh --- - redfish-core/lib/bios.hpp | 586 ++++++++++++++++++++++++-------------- - 1 file changed, 376 insertions(+), 210 deletions(-) + redfish-core/lib/bios.hpp | 592 ++++++++++++++++++++++++-------------- + 1 file changed, 383 insertions(+), 209 deletions(-) diff --git a/redfish-core/lib/bios.hpp b/redfish-core/lib/bios.hpp -index 0bb0b9e..de79be2 100644 +index 0bb0b9e..69340eb 100644 --- a/redfish-core/lib/bios.hpp +++ b/redfish-core/lib/bios.hpp @@ -12,13 +12,15 @@ map{attributeName,struct{attributeType,readonlyStatus,displayname, @@ -191,7 +192,7 @@ index 0bb0b9e..de79be2 100644 enum PendingAttributesIndex { pendingAttrType = 0, -@@ -64,31 +63,16 @@ enum PendingAttributesIndex +@@ -64,30 +63,20 @@ enum PendingAttributesIndex static std::string mapAttrTypeToRedfish(const std::string_view typeDbus) { std::string ret; @@ -217,15 +218,16 @@ index 0bb0b9e..de79be2 100644 { ret = "Integer"; } -- else if (typeDbus == "xyz.openbmc_project.BIOSConfig." + else if (typeDbus == "xyz.openbmc_project.BIOSConfig." - "Manager.AttributeType.Boolean") -- { ++ "Manager.AttributeType.Enumeration") + { - ret = "Boolean"; -- } ++ ret = "Enumeration"; + } else { - ret = "UNKNOWN"; -@@ -96,29 +80,7 @@ static std::string mapAttrTypeToRedfish(const std::string_view typeDbus) +@@ -96,29 +85,7 @@ static std::string mapAttrTypeToRedfish(const std::string_view typeDbus) return ret; } @@ -255,7 +257,7 @@ index 0bb0b9e..de79be2 100644 static std::string mapBoundTypeToRedfish(const std::string_view typeDbus) { std::string ret; -@@ -201,6 +163,15 @@ inline void +@@ -201,6 +168,15 @@ inline void return; } @@ -271,7 +273,7 @@ index 0bb0b9e..de79be2 100644 const std::string& service = getObjectType.begin()->first; crow::connections::systemBus->async_method_call( -@@ -220,7 +191,7 @@ inline void +@@ -220,7 +196,7 @@ inline void asyncResp->res.jsonValue["Attributes"]; if (baseBiosTable == nullptr) { @@ -280,7 +282,16 @@ index 0bb0b9e..de79be2 100644 messages::internalError(asyncResp->res); return; } -@@ -248,7 +219,6 @@ inline void +@@ -230,7 +206,7 @@ inline void + const std::string& itemType = + std::get(item.second); + std::string attrType = mapAttrTypeToRedfish(itemType); +- if (attrType == "String") ++ if (attrType == "String" || attrType == "Enumeration") + { + const std::string* currValue = + std::get_if( +@@ -248,7 +224,6 @@ inline void else { BMCWEB_LOG_ERROR << "Unsupported attribute type."; @@ -288,7 +299,7 @@ index 0bb0b9e..de79be2 100644 } } }, -@@ -275,8 +245,9 @@ inline void requestRoutesBiosService(App& app) +@@ -275,8 +250,9 @@ inline void requestRoutesBiosService(App& app) */ inline void requestRoutesBiosChangePassword(App& app) { @@ -300,7 +311,7 @@ index 0bb0b9e..de79be2 100644 .methods(boost::beast::http::verb::post)( [](const crow::Request& req, const std::shared_ptr& asyncResp) { -@@ -342,180 +313,298 @@ inline void requestRoutesBiosSettings(App& app) +@@ -342,180 +318,300 @@ inline void requestRoutesBiosSettings(App& app) { BMCWEB_ROUTE(app, "/redfish/v1/Systems/system/Bios/Settings") .privileges(redfish::privileges::getBios) @@ -429,7 +440,8 @@ index 0bb0b9e..de79be2 100644 + std::string itemType = + mapAttrTypeToRedfish(biosAttrType); + -+ if (itemType == "String") ++ if (itemType == "String" || ++ itemType == "Enumeration") { - const std::string& key = item.first; - const std::string& itemType = @@ -625,9 +637,9 @@ index 0bb0b9e..de79be2 100644 BMCWEB_LOG_ERROR - << "doPatch resp_handler got error " << ec; + << "getBiosAttributes DBUS error: " << ec; -+ messages::internalError(asyncResp->res); -+ return; -+ } + messages::internalError(asyncResp->res); + return; + } + + const BiosBaseTableType* baseBiosTable = + std::get_if(&retBiosTable); @@ -635,9 +647,9 @@ index 0bb0b9e..de79be2 100644 + if (baseBiosTable == nullptr) + { + BMCWEB_LOG_ERROR << "baseBiosTable is empty."; - messages::internalError(asyncResp->res); - return; - } ++ messages::internalError(asyncResp->res); ++ return; ++ } + + PendingAttributesType pendingAttributes{}; + @@ -665,7 +677,8 @@ index 0bb0b9e..de79be2 100644 + std::string attrType = + mapAttrTypeToRedfish(itemType); + -+ if (attrType == "String") ++ if (attrType == "String" || ++ attrType == "Enumeration") + { + std::string val = attributes.value(); + @@ -741,7 +754,7 @@ index 0bb0b9e..de79be2 100644 } /** * BiosAttributeRegistry class supports handle get method for BIOS attribute -@@ -555,6 +644,15 @@ inline void requestRoutesBiosAttributeRegistry(App& app) +@@ -555,6 +651,15 @@ inline void requestRoutesBiosAttributeRegistry(App& app) return; } @@ -757,7 +770,7 @@ index 0bb0b9e..de79be2 100644 std::string service = getObjectType.begin()->first; crow::connections::systemBus->async_method_call( -@@ -575,8 +673,6 @@ inline void requestRoutesBiosAttributeRegistry(App& app) +@@ -575,8 +680,6 @@ inline void requestRoutesBiosAttributeRegistry(App& app) nlohmann::json& attributeArray = asyncResp->res .jsonValue["RegistryEntries"]["Attributes"]; @@ -766,7 +779,7 @@ index 0bb0b9e..de79be2 100644 if (baseBiosTable == nullptr) { BMCWEB_LOG_ERROR << "baseBiosTable == nullptr "; -@@ -592,10 +688,11 @@ inline void requestRoutesBiosAttributeRegistry(App& app) +@@ -592,10 +695,11 @@ inline void requestRoutesBiosAttributeRegistry(App& app) mapAttrTypeToRedfish(itemType); if (attrType == "UNKNOWN") { @@ -781,7 +794,15 @@ index 0bb0b9e..de79be2 100644 nlohmann::json attributeItem; attributeItem["AttributeName"] = item.first; attributeItem["Type"] = attrType; -@@ -615,10 +712,30 @@ inline void requestRoutesBiosAttributeRegistry(App& app) +@@ -609,16 +713,37 @@ inline void requestRoutesBiosAttributeRegistry(App& app) + attributeItem["MenuPath"] = + std::get(item.second); + +- if (attrType == "String") ++ if (attrType == "String" || ++ attrType == "Enumeration") + { + const std::string* currValue = std::get_if( &std::get( item.second)); @@ -812,7 +833,7 @@ index 0bb0b9e..de79be2 100644 attributeItem["CurrentValue"] = currValue != nullptr ? *currValue : ""; attributeItem["DefaultValue"] = -@@ -630,10 +747,30 @@ inline void requestRoutesBiosAttributeRegistry(App& app) +@@ -630,10 +755,30 @@ inline void requestRoutesBiosAttributeRegistry(App& app) std::get_if( &std::get( item.second)); @@ -843,7 +864,7 @@ index 0bb0b9e..de79be2 100644 attributeItem["CurrentValue"] = currValue != nullptr ? *currValue : 0; attributeItem["DefaultValue"] = -@@ -641,12 +778,13 @@ inline void requestRoutesBiosAttributeRegistry(App& app) +@@ -641,12 +786,13 @@ inline void requestRoutesBiosAttributeRegistry(App& app) } else { @@ -861,7 +882,7 @@ index 0bb0b9e..de79be2 100644 const std::vector& optionsVector = std::get(item.second); -@@ -661,9 +799,9 @@ inline void requestRoutesBiosAttributeRegistry(App& app) +@@ -661,9 +807,9 @@ inline void requestRoutesBiosAttributeRegistry(App& app) if (optItemTypeRedfish == "UNKNOWN") { BMCWEB_LOG_ERROR @@ -874,7 +895,7 @@ index 0bb0b9e..de79be2 100644 } if (optItemTypeRedfish == "OneOf") { -@@ -671,6 +809,17 @@ inline void requestRoutesBiosAttributeRegistry(App& app) +@@ -671,6 +817,17 @@ inline void requestRoutesBiosAttributeRegistry(App& app) std::get_if( &std::get( optItem)); @@ -892,7 +913,7 @@ index 0bb0b9e..de79be2 100644 optItemJson[optItemTypeRedfish] = currValue != nullptr ? *currValue : ""; -@@ -681,6 +830,17 @@ inline void requestRoutesBiosAttributeRegistry(App& app) +@@ -681,6 +838,17 @@ inline void requestRoutesBiosAttributeRegistry(App& app) std::get_if( &std::get( optItem)); @@ -910,7 +931,7 @@ index 0bb0b9e..de79be2 100644 optItemJson[optItemTypeRedfish] = currValue != nullptr ? *currValue : 0; -@@ -689,6 +849,12 @@ inline void requestRoutesBiosAttributeRegistry(App& app) +@@ -689,6 +857,12 @@ inline void requestRoutesBiosAttributeRegistry(App& app) optionsArray.push_back(optItemJson); } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0007-Add-BiosAttributeRegistry-node-under-Registries.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0007-Add-BiosAttributeRegistry-node-under-Registries.patch new file mode 100644 index 000000000..5e05e8f3a --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0007-Add-BiosAttributeRegistry-node-under-Registries.patch @@ -0,0 +1,76 @@ +From cf2e892bdd85b8fe1ccaf1296e02d8589aef05c1 Mon Sep 17 00:00:00 2001 +From: Snehalatha Venkatesh +Date: Tue, 28 Dec 2021 11:05:50 +0000 +Subject: [PATCH] Add BiosAttributeRegistry node under Registries. + +/redfish/v1/Registries/ is missing node BiosAttributeRegistry +under it. Added code to fix the same. + +Tested: +1.Ran Redfish Validator and passed. +2.GET - /redfish/v1/Registries/ + +Response: +{ +"@odata.id": "/redfish/v1/Registries", +"@odata.type": "#MessageRegistryFileCollection.MessageRegistryFileCollection", +"Description": "Collection of MessageRegistryFiles", +"Members": [ +{ +"@odata.id": "/redfish/v1/Registries/Base" +}, +{ +"@odata.id": "/redfish/v1/Registries/TaskEvent" +}, +{ +"@odata.id": "/redfish/v1/Registries/ResourceEvent" +}, +{ +"@odata.id": "/redfish/v1/Registries/BiosAttributeRegistry" +}, +{ +"@odata.id": "/redfish/v1/Registries/OpenBMC" +} +], +"Members@odata.count": 5, +"Name": "MessageRegistryFile Collection" +} + +Signed-off-by: Snehalatha Venkatesh +--- + redfish-core/lib/message_registries.hpp | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/redfish-core/lib/message_registries.hpp b/redfish-core/lib/message_registries.hpp +index 510b19a..0467f1e 100644 +--- a/redfish-core/lib/message_registries.hpp ++++ b/redfish-core/lib/message_registries.hpp +@@ -40,11 +40,12 @@ inline void handleMessageRegistryFileCollectionGet( + {"@odata.id", "/redfish/v1/Registries"}, + {"Name", "MessageRegistryFile Collection"}, + {"Description", "Collection of MessageRegistryFiles"}, +- {"Members@odata.count", 4}, ++ {"Members@odata.count", 5}, + {"Members", + {{{"@odata.id", "/redfish/v1/Registries/Base"}}, + {{"@odata.id", "/redfish/v1/Registries/TaskEvent"}}, + {{"@odata.id", "/redfish/v1/Registries/ResourceEvent"}}, ++ {{"@odata.id", "/redfish/v1/Registries/BiosAttributeRegistry"}}, + {{"@odata.id", "/redfish/v1/Registries/OpenBMC"}}}}}; + } + +@@ -87,6 +88,11 @@ inline void handleMessageRoutesMessageRegistryFileGet( + header = &message_registries::resource_event::header; + url = message_registries::resource_event::url; + } ++ else if (registry == "BiosAttributeRegistry") ++ { ++ header = &message_registries::bios::header; ++ dmtf.clear(); ++ } + else + { + messages::resourceNotFound( +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0001-Add-unmerged-changes-for-http-retry-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0001-Add-unmerged-changes-for-http-retry-support.patch index 52135e255..7229f9aa7 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0001-Add-unmerged-changes-for-http-retry-support.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0001-Add-unmerged-changes-for-http-retry-support.patch @@ -1,6 +1,6 @@ -From 6ff897d2b5513f15445f18aae16d8439ed94f377 Mon Sep 17 00:00:00 2001 +From 43b629c180e1b4350a9e9bd917d81a49acb57731 Mon Sep 17 00:00:00 2001 From: P Dheeraj Srujan Kumar -Date: Mon, 11 Oct 2021 18:41:27 +0530 +Date: Mon, 6 Dec 2021 19:49:01 +0000 Subject: [PATCH] Add unmerged changes for http retry support The http retry support added upstream as a single patch was slpit into @@ -9,45 +9,19 @@ This commit pulls in the differentail changes required to complete the entire http retry support. and also allow for other subsequent patches to be appplied easily. -Change-Id: Id8ccd991b7ffc505196b1a92b23e1cd51e00bc89 +Change-Id: I43e68eeffb8d69c289dd306c1c7cafc87ad766a0 Signed-off-by: P Dheeraj Srujan Kumar --- - http/http_client.hpp | 44 +++++++++++-------- - .../include/event_service_manager.hpp | 2 +- - 2 files changed, 27 insertions(+), 19 deletions(-) + http/http_client.hpp | 32 ++++++++++++++++--- + .../include/event_service_manager.hpp | 26 +++++++++------ + redfish-core/lib/event_service.hpp | 1 + + 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/http/http_client.hpp b/http/http_client.hpp -index ab20eb0..aad1cce 100644 +index 0c9e387..0701d9e 100644 --- a/http/http_client.hpp +++ b/http/http_client.hpp -@@ -68,7 +68,6 @@ class HttpClient : public std::enable_shared_from_this - std::optional< - boost::beast::http::response_parser> - parser; -- std::vector> headers; - boost::circular_buffer_space_optimized requestDataQueue{}; - - ConnState state; -@@ -137,18 +136,6 @@ class HttpClient : public std::enable_shared_from_this - - BMCWEB_LOG_DEBUG << __FUNCTION__ << "(): " << host << ":" << port; - -- req.version(static_cast(11)); // HTTP 1.1 -- req.target(uri); -- req.method(boost::beast::http::verb::post); -- -- // Set headers -- for (const auto& [key, value] : headers) -- { -- req.set(key, value); -- } -- req.set(boost::beast::http::field::host, host); -- req.keep_alive(true); -- - req.body() = data; - req.prepare_payload(); - -@@ -204,6 +191,17 @@ class HttpClient : public std::enable_shared_from_this +@@ -189,6 +189,17 @@ class HttpClient : public std::enable_shared_from_this BMCWEB_LOG_DEBUG << "recvMessage() data: " << self->parser->get(); @@ -65,57 +39,125 @@ index ab20eb0..aad1cce 100644 unsigned int respCode = self->parser->get().result_int(); BMCWEB_LOG_DEBUG << "recvMessage() Header Response Code: " << respCode; -@@ -398,11 +396,17 @@ class HttpClient : public std::enable_shared_from_this +@@ -381,15 +392,17 @@ class HttpClient : public std::enable_shared_from_this + public: + explicit HttpClient(boost::asio::io_context& ioc, const std::string& id, const std::string& destIP, const std::string& destPort, - const std::string& destUri) : +- const std::string& destUri, +- const boost::beast::http::fields& httpHeader) : ++ const std::string& destUri) : conn(ioc), -- timer(ioc), subId(id), host(destIP), port(destPort), uri(destUri), -- retryCount(0), maxRetryAttempts(5), retryIntervalSecs(0), -+ timer(ioc), req(boost::beast::http::verb::post, destUri, 11), -+ state(ConnState::initialized), subId(id), host(destIP), port(destPort), -+ uri(destUri), retryCount(0), maxRetryAttempts(5), retryIntervalSecs(0), - retryPolicyAction("TerminateAfterRetries"), runningTimer(false) +- timer(ioc), +- req(boost::beast::http::verb::post, destUri, 11, "", httpHeader), +- subId(id), host(destIP), port(destPort) ++ timer(ioc), req(boost::beast::http::verb::post, destUri, 11), subId(id), ++ host(destIP), port(destPort) { -- state = ConnState::initialized; + // Set the request header -+ req.set(boost::beast::http::field::host, host); + req.set(boost::beast::http::field::host, host); + req.set(boost::beast::http::field::content_type, "application/json"); -+ req.keep_alive(true); + req.keep_alive(true); + + requestDataQueue.set_capacity(maxRequestQueueSize); } void sendData(const std::string& data) -@@ -425,10 +429,14 @@ class HttpClient : public std::enable_shared_from_this +@@ -412,6 +425,15 @@ class HttpClient : public std::enable_shared_from_this return; } -- void setHeaders( -+ void addHeaders( - const std::vector>& httpHeaders) - { -- headers = httpHeaders; ++ void setHeaders(const boost::beast::http::fields& httpHeaders) ++ { + // Set custom headers -+ for (const auto& [key, value] : httpHeaders) ++ for (const auto& header : httpHeaders) + { -+ req.set(key, value); ++ req.set(header.name(), header.value()); + } - } - ++ } ++ void setRetryConfig(const uint32_t retryAttempts, + const uint32_t retryTimeoutInterval) + { diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index 8042803..0a63b8c 100644 +index e0f290c..7a2f096 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -412,7 +412,7 @@ class Subscription : public persistent_data::UserSubscription - reqHeaders.emplace_back(std::pair(key, val)); - } - } -- conn->setHeaders(reqHeaders); -+ conn->addHeaders(reqHeaders); - conn->sendData(msg); - this->eventSeqNum++; +@@ -384,7 +384,10 @@ class Subscription : public persistent_data::UserSubscription + eventSeqNum(1), + host(inHost), port(inPort), path(inPath), uriProto(inUriProto) + { +- // Subscription constructor ++ // create the HttpClient connection ++ conn = std::make_shared( ++ crow::connections::systemBus->get_io_context(), id, host, port, ++ path); + } + + Subscription(const std::shared_ptr& adaptor) : +@@ -397,17 +400,12 @@ class Subscription : public persistent_data::UserSubscription + + void sendEvent(const std::string& msg) + { +- if (conn == nullptr) ++ if (conn != nullptr) + { +- // create the HttpClient connection +- conn = std::make_shared( +- crow::connections::systemBus->get_io_context(), id, host, port, +- path, httpHeaders); ++ conn->sendData(msg); ++ eventSeqNum++; } + +- conn->sendData(msg); +- eventSeqNum++; +- + if (sseConn != nullptr) + { + sseConn->sendData(eventSeqNum, msg); +@@ -551,6 +549,14 @@ class Subscription : public persistent_data::UserSubscription + } + } + ++ void updatehttpHeaders() ++ { ++ if (conn != nullptr) ++ { ++ conn->setHeaders(httpHeaders); ++ } ++ } ++ + uint64_t getEventSeqNum() + { + return eventSeqNum; +@@ -664,6 +670,7 @@ class EventServiceManager + // Update retry configuration. + subValue->updateRetryConfig(retryAttempts, retryTimeoutInterval); + subValue->updateRetryPolicy(); ++ subValue->updatehttpHeaders(); + } + return; + } +@@ -919,6 +926,7 @@ class EventServiceManager + // Update retry configuration. + subValue->updateRetryConfig(retryAttempts, retryTimeoutInterval); + subValue->updateRetryPolicy(); ++ subValue->updatehttpHeaders(); + + return id; + } +diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp +index d273aea..7739ad0 100644 +--- a/redfish-core/lib/event_service.hpp ++++ b/redfish-core/lib/event_service.hpp +@@ -611,6 +611,7 @@ inline void requestRoutesEventDestination(App& app) + } + } + subValue->httpHeaders = fields; ++ subValue->updatehttpHeaders(); + } + + if (retryPolicy) -- 2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0002-EventService-https-client-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0002-EventService-https-client-support.patch index aeeafc421..2125fcc52 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0002-EventService-https-client-support.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0002-EventService-https-client-support.patch @@ -1,6 +1,6 @@ -From 3f2ad28e6e124249cde3df50c9e18c283fbcbf3e Mon Sep 17 00:00:00 2001 +From b5e0024f33afc95751afe14e66c38bf9802645f6 Mon Sep 17 00:00:00 2001 From: AppaRao Puli -Date: Mon, 22 Feb 2021 17:07:47 +0000 +Date: Mon, 6 Dec 2021 21:39:05 +0000 Subject: [PATCH] EventService: https client support Add https client support for push style eventing. Using this BMC can @@ -13,15 +13,16 @@ Tested: listener. - Validator passed. -Change-Id: I44c3918b39baa2eb5fddda9d635f99aa280a422a +Change-Id: I480085344ba7bed6ec0d94876eda1d252e51cb45 Signed-off-by: AppaRao Puli +Signed-off-by: P Dheeraj Srujan Kumar --- http/http_client.hpp | 307 ++++++++++++------ .../include/event_service_manager.hpp | 2 +- - 2 files changed, 202 insertions(+), 107 deletions(-) + 2 files changed, 204 insertions(+), 105 deletions(-) diff --git a/http/http_client.hpp b/http/http_client.hpp -index aad1cce..5e7ff47 100644 +index d3d3491..58b5402 100644 --- a/http/http_client.hpp +++ b/http/http_client.hpp @@ -20,6 +20,7 @@ @@ -30,9 +31,9 @@ index aad1cce..5e7ff47 100644 #include +#include #include + #include #include - -@@ -43,6 +44,8 @@ enum class ConnState +@@ -44,6 +45,8 @@ enum class ConnState resolveFailed, connectInProgress, connectFailed, @@ -41,7 +42,7 @@ index aad1cce..5e7ff47 100644 connected, sendInProgress, sendFailed, -@@ -61,7 +64,9 @@ class HttpClient : public std::enable_shared_from_this +@@ -62,7 +65,9 @@ class HttpClient : public std::enable_shared_from_this { private: crow::async_resolve::Resolver resolver; @@ -51,7 +52,7 @@ index aad1cce..5e7ff47 100644 boost::asio::steady_timer timer; boost::beast::flat_static_buffer buffer; boost::beast::http::request req; -@@ -108,23 +113,52 @@ class HttpClient : public std::enable_shared_from_this +@@ -110,23 +115,52 @@ class HttpClient : public std::enable_shared_from_this const std::vector& endpointList) { state = ConnState::connectInProgress; @@ -112,15 +113,7 @@ index aad1cce..5e7ff47 100644 self->state = ConnState::connected; self->handleConnState(); }); -@@ -132,132 +166,187 @@ class HttpClient : public std::enable_shared_from_this - - void sendMessage(const std::string& data) - { -- state = ConnState::sendInProgress; -- - BMCWEB_LOG_DEBUG << __FUNCTION__ << "(): " << host << ":" << port; -+ state = ConnState::sendInProgress; - +@@ -139,124 +173,182 @@ class HttpClient : public std::enable_shared_from_this req.body() = data; req.prepare_payload(); @@ -173,23 +166,52 @@ index aad1cce..5e7ff47 100644 + boost::beast::http::async_write(conn, req, std::move(respHandler)); + } } -- + void recvMessage() { state = ConnState::recvInProgress; +- parser.emplace(std::piecewise_construct, std::make_tuple()); +- parser->body_limit(httpReadBodyLimit); + auto respHandler = [self(shared_from_this())]( + const boost::beast::error_code ec, + const std::size_t& bytesTransferred) { + if (ec && ec != boost::asio::ssl::error::stream_truncated) + { + BMCWEB_LOG_ERROR << "recvMessage() failed: " << ec.message(); -+ + +- // Receive the HTTP response +- boost::beast::http::async_read( +- conn, buffer, *parser, +- [self(shared_from_this())](const boost::beast::error_code& ec, +- const std::size_t& bytesTransferred) { +- if (ec) +- { +- BMCWEB_LOG_ERROR << "recvMessage() failed: " +- << ec.message(); +- self->state = ConnState::recvFailed; +- self->handleConnState(); +- return; +- } +- BMCWEB_LOG_DEBUG << "recvMessage() bytes transferred: " +- << bytesTransferred; +- BMCWEB_LOG_DEBUG << "recvMessage() data: " +- << self->parser->get(); + self->state = ConnState::recvFailed; + self->handleConnState(); + return; + } -+ + +- // Check if the response and header are received +- if (!self->parser->is_done()) +- { +- // The parser failed to receive the response +- BMCWEB_LOG_ERROR +- << "recvMessage() parser failed to receive response"; +- self->state = ConnState::recvFailed; +- self->handleConnState(); +- return; +- } + BMCWEB_LOG_DEBUG << "recvMessage() bytes transferred: " + << bytesTransferred; + boost::ignore_unused(bytesTransferred); @@ -204,11 +226,26 @@ index aad1cce..5e7ff47 100644 + self->handleConnState(); + return; + } -+ + +- unsigned int respCode = self->parser->get().result_int(); +- BMCWEB_LOG_DEBUG << "recvMessage() Header Response Code: " +- << respCode; + unsigned int respCode = self->parser->get().result_int(); + BMCWEB_LOG_DEBUG << "recvMessage() Header Response Code: " + << respCode; -+ + +- // 2XX response is considered to be successful +- if ((respCode < 200) || (respCode >= 300)) +- { +- // The listener failed to receive the Sent-Event +- BMCWEB_LOG_ERROR +- << "recvMessage() Listener Failed to " +- "receive Sent-Event. Header Response Code: " +- << respCode; +- self->state = ConnState::recvFailed; +- self->handleConnState(); +- return; +- } + // 2XX response is considered to be successful + if ((respCode < 200) || (respCode >= 300)) + { @@ -219,7 +256,14 @@ index aad1cce..5e7ff47 100644 + self->handleConnState(); + return; + } -+ + +- // Send is successful, Lets remove data from queue +- // check for next request data in queue. +- if (!self->requestDataQueue.empty()) +- { +- self->requestDataQueue.pop_front(); +- } +- self->state = ConnState::idle; + // Send is successful, Lets remove data from queue + // check for next request data in queue. + if (!self->requestDataQueue.empty()) @@ -236,17 +280,30 @@ index aad1cce..5e7ff47 100644 + // Abort the connection since server is not keep-alive enabled + self->state = ConnState::abortConnection; + } -+ + +- // Keep the connection alive if server supports it +- // Else close the connection +- BMCWEB_LOG_DEBUG << "recvMessage() keepalive : " +- << self->parser->keep_alive(); +- if (!self->parser->keep_alive()) +- { +- // Abort the connection since server is not keep-alive +- // enabled +- self->state = ConnState::abortConnection; +- } + // Returns ownership of the parsed message + self->parser->release(); -+ + +- self->handleConnState(); +- }); +- } + self->handleConnState(); + }; - parser.emplace(std::piecewise_construct, std::make_tuple()); - parser->body_limit(httpReadBodyLimit); ++ parser.emplace(std::piecewise_construct, std::make_tuple()); ++ parser->body_limit(httpReadBodyLimit); - // Check only for the response header - parser->skip(true); ++ // Check only for the response header ++ parser->skip(true); + conn.expires_after(std::chrono::seconds(30)); + if (sslConn) + { @@ -259,28 +316,25 @@ index aad1cce..5e7ff47 100644 + std::move(respHandler)); + } + } -+ void doClose() -+ { -+ state = ConnState::closeInProgress; + void doClose() + { + state = ConnState::closeInProgress; +- boost::beast::error_code ec; +- conn.socket().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec); +- conn.close(); -- // Receive the HTTP response -- boost::beast::http::async_read( -- conn, buffer, *parser, -- [self(shared_from_this())](const boost::beast::error_code& ec, -- const std::size_t& bytesTransferred) { +- // not_connected happens sometimes so don't bother reporting it. +- if (ec && ec != boost::beast::errc::not_connected) + // Set the timeout on the tcp stream socket for the async operation + conn.expires_after(std::chrono::seconds(30)); + if (sslConn) -+ { + { +- BMCWEB_LOG_ERROR << "shutdown failed: " << ec.message(); +- return; + sslConn->async_shutdown([self = shared_from_this()]( + const boost::system::error_code ec) { - if (ec) - { -- BMCWEB_LOG_ERROR << "recvMessage() failed: " -- << ec.message(); -- self->state = ConnState::recvFailed; -- self->handleConnState(); -- return; ++ if (ec) ++ { + // Many https server closes connection abruptly + // i.e witnout close_notify. More details are at + // https://github.com/boostorg/beast/issues/824 @@ -294,79 +348,20 @@ index aad1cce..5e7ff47 100644 + BMCWEB_LOG_ERROR << "doClose() failed: " + << ec.message(); + } - } -- BMCWEB_LOG_DEBUG << "recvMessage() bytes transferred: " -- << bytesTransferred; -- BMCWEB_LOG_DEBUG << "recvMessage() data: " -- << self->parser->get(); -- -- // Check if the response and header are received -- if (!self->parser->is_done()) ++ } + else - { -- // The parser failed to receive the response -- BMCWEB_LOG_ERROR -- << "recvMessage() parser failed to receive response"; -- self->state = ConnState::recvFailed; -- self->handleConnState(); -- return; ++ { + BMCWEB_LOG_DEBUG << "Connection closed gracefully..."; - } ++ } + self->conn.close(); - -- unsigned int respCode = self->parser->get().result_int(); -- BMCWEB_LOG_DEBUG << "recvMessage() Header Response Code: " -- << respCode; -- -- // 2XX response is considered to be successful -- if ((respCode < 200) || (respCode >= 300)) ++ + if ((self->state != ConnState::suspended) && + (self->state != ConnState::terminated)) - { -- // The listener failed to receive the Sent-Event -- BMCWEB_LOG_ERROR << "recvMessage() Listener Failed to " -- "receive Sent-Event"; -- self->state = ConnState::recvFailed; ++ { + self->state = ConnState::closed; - self->handleConnState(); -- return; - } -- -- // Send is successful, Lets remove data from queue -- // check for next request data in queue. -- if (!self->requestDataQueue.empty()) -- { -- self->requestDataQueue.pop_front(); -- } -- self->state = ConnState::idle; -- -- // Keep the connection alive if server supports it -- // Else close the connection -- BMCWEB_LOG_DEBUG << "recvMessage() keepalive : " -- << self->parser->keep_alive(); -- if (!self->parser->keep_alive()) -- { -- // Abort the connection since server is not keep-alive -- // enabled -- self->state = ConnState::abortConnection; -- } -- -- self->handleConnState(); - }); -- } -- -- void doClose() -- { -- state = ConnState::closeInProgress; -- boost::beast::error_code ec; -- conn.socket().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec); -- conn.close(); -- -- // not_connected happens sometimes so don't bother reporting it. -- if (ec && ec != boost::beast::errc::not_connected) -- { -- BMCWEB_LOG_ERROR << "shutdown failed: " << ec.message(); -- return; ++ self->handleConnState(); ++ } ++ }); } - BMCWEB_LOG_DEBUG << "Connection closed gracefully"; - if ((state != ConnState::suspended) && (state != ConnState::terminated)) @@ -396,7 +391,7 @@ index aad1cce..5e7ff47 100644 } } -@@ -330,6 +419,7 @@ class HttpClient : public std::enable_shared_from_this +@@ -329,6 +421,7 @@ class HttpClient : public std::enable_shared_from_this { case ConnState::resolveInProgress: case ConnState::connectInProgress: @@ -404,7 +399,7 @@ index aad1cce..5e7ff47 100644 case ConnState::sendInProgress: case ConnState::recvInProgress: case ConnState::closeInProgress: -@@ -356,6 +446,7 @@ class HttpClient : public std::enable_shared_from_this +@@ -355,6 +448,7 @@ class HttpClient : public std::enable_shared_from_this } case ConnState::resolveFailed: case ConnState::connectFailed: @@ -412,7 +407,7 @@ index aad1cce..5e7ff47 100644 case ConnState::sendFailed: case ConnState::recvFailed: case ConnState::retry: -@@ -394,7 +485,8 @@ class HttpClient : public std::enable_shared_from_this +@@ -391,7 +485,8 @@ class HttpClient : public std::enable_shared_from_this public: explicit HttpClient(boost::asio::io_context& ioc, const std::string& id, const std::string& destIP, const std::string& destPort, @@ -420,9 +415,9 @@ index aad1cce..5e7ff47 100644 + const std::string& destUri, + const std::string& uriProto) : conn(ioc), - timer(ioc), req(boost::beast::http::verb::post, destUri, 11), - state(ConnState::initialized), subId(id), host(destIP), port(destPort), -@@ -407,8 +499,11 @@ class HttpClient : public std::enable_shared_from_this + timer(ioc), req(boost::beast::http::verb::post, destUri, 11), subId(id), + host(destIP), port(destPort) +@@ -402,6 +497,10 @@ class HttpClient : public std::enable_shared_from_this req.keep_alive(true); requestDataQueue.set_capacity(maxRequestQueueSize); @@ -431,16 +426,14 @@ index aad1cce..5e7ff47 100644 + sslConn.emplace(conn, ctx); + } } -- + void sendData(const std::string& data) - { - if ((state == ConnState::suspended) || (state == ConnState::terminated)) diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index 08d0b98..f1ce0c0 100644 +index 317f900..f581b96 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -385,7 +385,7 @@ class Subscription : public persistent_data::UserSubscription - { +@@ -383,7 +383,7 @@ class Subscription : public persistent_data::UserSubscription + // create the HttpClient connection conn = std::make_shared( crow::connections::systemBus->get_io_context(), id, host, port, - path); diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0004-Add-Server-Sent-Events-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0004-Add-Server-Sent-Events-support.patch index ea521a7e4..dfa67935c 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0004-Add-Server-Sent-Events-support.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0004-Add-Server-Sent-Events-support.patch @@ -1,4 +1,4 @@ -From d7a2660f200c38e74bfcbfe55b8da1b8bed08833 Mon Sep 17 00:00:00 2001 +From ea7d0091545450721d8b9b901e2593401b50d24c Mon Sep 17 00:00:00 2001 From: AppaRao Puli Date: Fri, 12 Mar 2021 18:53:25 +0000 Subject: [PATCH] Add Server-Sent-Events support @@ -31,10 +31,10 @@ Signed-off-by: P Dheeraj Srujan Kumar create mode 100644 http/server_sent_event.hpp diff --git a/http/http_connection.hpp b/http/http_connection.hpp -index 8e53afa..a1bbfce 100644 +index 0f20761..9cf603d 100644 --- a/http/http_connection.hpp +++ b/http/http_connection.hpp -@@ -378,11 +378,13 @@ class Connection : +@@ -362,11 +362,13 @@ class Connection : [self] { self->completeRequest(); }); }); @@ -83,10 +83,10 @@ index a983d4a..07b0265 100644 // In case of a JSON object, set the Content-Type header void jsonMode() diff --git a/http/routing.hpp b/http/routing.hpp -index 5d9c8e3..bfff107 100644 +index fe9c7e9..c748580 100644 --- a/http/routing.hpp +++ b/http/routing.hpp -@@ -6,6 +6,7 @@ +@@ -7,6 +7,7 @@ #include "http_response.hpp" #include "logging.hpp" #include "privileges.hpp" @@ -94,7 +94,7 @@ index 5d9c8e3..bfff107 100644 #include "sessions.hpp" #include "utility.hpp" #include "websocket.hpp" -@@ -398,6 +399,68 @@ class WebSocketRule : public BaseRule +@@ -397,6 +398,68 @@ class WebSocketRule : public BaseRule std::function errorHandler; }; @@ -163,7 +163,7 @@ index 5d9c8e3..bfff107 100644 template struct RuleParameterTraits { -@@ -410,6 +473,14 @@ struct RuleParameterTraits +@@ -409,6 +472,14 @@ struct RuleParameterTraits return *p; } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch index ee69081ef..525070d93 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch @@ -1,4 +1,4 @@ -From 799e47842e179f7c752712004f0e96d3219eee11 Mon Sep 17 00:00:00 2001 +From 278ea5570d8a162774c3d84b0706e27539e714cc Mon Sep 17 00:00:00 2001 From: AppaRao Puli Date: Tue, 16 Mar 2021 15:37:24 +0000 Subject: [PATCH] Add SSE style subscription support to eventservice @@ -25,18 +25,18 @@ Signed-off-by: P Dheeraj Srujan Kumar http/http_connection.hpp | 2 +- include/eventservice_sse.hpp | 75 +++++ .../include/event_service_manager.hpp | 109 +++++-- - redfish-core/include/server_sent_events.hpp | 290 ------------------ + redfish-core/include/server_sent_events.hpp | 289 ------------------ redfish-core/lib/event_service.hpp | 8 +- src/webserver_main.cpp | 2 + - 6 files changed, 164 insertions(+), 322 deletions(-) + 6 files changed, 164 insertions(+), 321 deletions(-) create mode 100644 include/eventservice_sse.hpp delete mode 100644 redfish-core/include/server_sent_events.hpp diff --git a/http/http_connection.hpp b/http/http_connection.hpp -index a1bbfce..2d08501 100644 +index 9cf603d..cf629ea 100644 --- a/http/http_connection.hpp +++ b/http/http_connection.hpp -@@ -382,7 +382,7 @@ class Connection : +@@ -366,7 +366,7 @@ class Connection : boost::iequals( thisReq.getHeaderValue(boost::beast::http::field::upgrade), "websocket")) || @@ -127,17 +127,18 @@ index 0000000..14daf00 +} // namespace eventservice_sse +} // namespace redfish diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index 3f398d7..dd833ce 100644 +index f581b96..57a2ab8 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -22,15 +22,17 @@ +@@ -23,6 +23,7 @@ #include #include +#include #include + #include #include - #include +@@ -30,9 +31,10 @@ #include #include #include @@ -149,7 +150,7 @@ index 3f398d7..dd833ce 100644 #include #include #include -@@ -46,9 +48,27 @@ using ReadingsObjType = +@@ -48,9 +50,27 @@ using ReadingsObjType = static constexpr const char* eventFormatType = "Event"; static constexpr const char* metricReportFormatType = "MetricReport"; @@ -176,10 +177,10 @@ index 3f398d7..dd833ce 100644 + namespace message_registries { - inline boost::beast::span -@@ -68,24 +88,6 @@ inline boost::beast::span + inline std::span +@@ -70,24 +90,6 @@ inline std::span } - return boost::beast::span(openbmc::registry); + return {openbmc::registry}; } -} // namespace message_registries - @@ -201,8 +202,8 @@ index 3f398d7..dd833ce 100644 -{ static const Message* getMsgFromRegistry(const std::string& messageKey, - const boost::beast::span& registry) -@@ -388,11 +390,9 @@ class Subscription : public persistent_data::UserSubscription + const std::span& registry) +@@ -386,11 +388,9 @@ class Subscription : public persistent_data::UserSubscription path, uriProto); } @@ -217,7 +218,7 @@ index 3f398d7..dd833ce 100644 ~Subscription() = default; -@@ -417,7 +417,7 @@ class Subscription : public persistent_data::UserSubscription +@@ -404,7 +404,7 @@ class Subscription : public persistent_data::UserSubscription if (sseConn != nullptr) { @@ -226,7 +227,7 @@ index 3f398d7..dd833ce 100644 } } -@@ -508,6 +508,7 @@ class Subscription : public persistent_data::UserSubscription +@@ -495,6 +495,7 @@ class Subscription : public persistent_data::UserSubscription this->sendEvent( msg.dump(2, ' ', true, nlohmann::json::error_handler_t::replace)); @@ -234,7 +235,7 @@ index 3f398d7..dd833ce 100644 } #endif -@@ -578,14 +579,39 @@ class Subscription : public persistent_data::UserSubscription +@@ -557,14 +558,39 @@ class Subscription : public persistent_data::UserSubscription return eventSeqNum; } @@ -275,16 +276,16 @@ index 3f398d7..dd833ce 100644 }; class EventServiceManager -@@ -942,6 +968,8 @@ class EventServiceManager - subValue->updateRetryConfig(retryAttempts, retryTimeoutInterval); +@@ -922,6 +948,8 @@ class EventServiceManager subValue->updateRetryPolicy(); + subValue->updatehttpHeaders(); + // Set Subscription ID for back trace + subValue->setSubscriptionId(id); return id; } -@@ -970,11 +998,40 @@ class EventServiceManager +@@ -950,11 +978,40 @@ class EventServiceManager } } @@ -327,10 +328,10 @@ index 3f398d7..dd833ce 100644 std::vector idList; diff --git a/redfish-core/include/server_sent_events.hpp b/redfish-core/include/server_sent_events.hpp deleted file mode 100644 -index 7613d7b..0000000 +index dd3cd36..0000000 --- a/redfish-core/include/server_sent_events.hpp +++ /dev/null -@@ -1,290 +0,0 @@ +@@ -1,289 +0,0 @@ - -/* -// Copyright (c) 2020 Intel Corporation @@ -350,7 +351,6 @@ index 7613d7b..0000000 -#pragma once - -#include --#include -#include -#include -#include @@ -622,10 +622,10 @@ index 7613d7b..0000000 - -} // namespace crow diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp -index 8609862..249e594 100644 +index 91a041e..9ad2bbd 100644 --- a/redfish-core/lib/event_service.hpp +++ b/redfish-core/lib/event_service.hpp -@@ -37,8 +37,6 @@ static constexpr const std::array supportedResourceTypes = { +@@ -40,8 +40,6 @@ static constexpr const std::array supportedResourceTypes = { "Task"}; #endif @@ -634,16 +634,16 @@ index 8609862..249e594 100644 inline void requestRoutesEventService(App& app) { BMCWEB_ROUTE(app, "/redfish/v1/EventService/") -@@ -50,6 +48,8 @@ inline void requestRoutesEventService(App& app) - {"@odata.type", "#EventService.v1_5_0.EventService"}, - {"Id", "EventService"}, - {"Name", "Event Service"}, -+ {"ServerSentEventUri", -+ "/redfish/v1/EventService/Subscriptions/SSE"}, - {"Subscriptions", - {{"@odata.id", "/redfish/v1/EventService/Subscriptions"}}}, - {"Actions", -@@ -90,9 +90,7 @@ inline void requestRoutesEventService(App& app) +@@ -54,6 +52,8 @@ inline void requestRoutesEventService(App& app) + {"@odata.type", "#EventService.v1_5_0.EventService"}, + {"Id", "EventService"}, + {"Name", "Event Service"}, ++ {"ServerSentEventUri", ++ "/redfish/v1/EventService/Subscriptions/SSE"}, + {"Subscriptions", + {{"@odata.id", "/redfish/v1/EventService/Subscriptions"}}}, + {"Actions", +@@ -92,9 +92,7 @@ inline void requestRoutesEventService(App& app) .privileges(redfish::privileges::patchEventService) .methods(boost::beast::http::verb::patch)( [](const crow::Request& req, diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch index 3914cc81a..05018a47d 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch @@ -1,4 +1,4 @@ -From 769f0e20d0a7e786d7091ffb7ee57d35204dfa28 Mon Sep 17 00:00:00 2001 +From 64a9d1826b7b4a66750f7ecaaff7bcf7e0d23932 Mon Sep 17 00:00:00 2001 From: AppaRao Puli Date: Wed, 17 Mar 2021 01:16:50 +0000 Subject: [PATCH] Add EventService SSE filter support @@ -59,7 +59,7 @@ index 14daf00..fed7fec 100644 + std::string queryFilters; + if (req.urlParams.size()) + { -+ boost::urls::url_view::params_type::iterator it = ++ boost::urls::query_params_view::iterator it = + req.urlParams.find("$filter"); + if (it == req.urlParams.end()) + { @@ -155,14 +155,14 @@ index 14daf00..fed7fec 100644 + // Check for Message ID in each of the selected Registry + for (const std::string& it : registryPrefix) + { -+ const boost::beast::span< ++ const std::span< + const redfish::message_registries::MessageEntry> + registry = + redfish::message_registries::getRegistryFromPrefix( + it); + + if (std::any_of( -+ registry.cbegin(), registry.cend(), ++ registry.begin(), registry.end(), + [&id]( + const redfish::message_registries::MessageEntry& + messageEntry) { @@ -203,10 +203,10 @@ index 14daf00..fed7fec 100644 std::string id = redfish::EventServiceManager::getInstance().addSubscription(subValue, diff --git a/redfish-core/include/error_messages.hpp b/redfish-core/include/error_messages.hpp -index 3d11cc4..90084e3 100644 +index 7f53fa4..9c688b4 100644 --- a/redfish-core/include/error_messages.hpp +++ b/redfish-core/include/error_messages.hpp -@@ -971,6 +971,15 @@ nlohmann::json mutualExclusiveProperties(const std::string& arg1, +@@ -985,6 +985,15 @@ nlohmann::json mutualExclusiveProperties(const std::string& arg1, void mutualExclusiveProperties(crow::Response& res, const std::string& arg1, const std::string& arg2); @@ -223,10 +223,10 @@ index 3d11cc4..90084e3 100644 } // namespace redfish diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index dd833ce..861f4cb 100644 +index 57a2ab8..aae9f02 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -55,6 +55,11 @@ static constexpr const char* eventServiceFile = +@@ -57,6 +57,11 @@ static constexpr const char* eventServiceFile = static constexpr const uint8_t maxNoOfSubscriptions = 20; static constexpr const uint8_t maxNoOfSSESubscriptions = 10; @@ -239,10 +239,10 @@ index dd833ce..861f4cb 100644 static std::optional inotifyConn; static constexpr const char* redfishEventLogDir = "/var/log"; diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp -index 249e594..6f01707 100644 +index 9ad2bbd..99c3bfd 100644 --- a/redfish-core/lib/event_service.hpp +++ b/redfish-core/lib/event_service.hpp -@@ -21,11 +21,6 @@ +@@ -24,11 +24,6 @@ namespace redfish { @@ -255,10 +255,10 @@ index 249e594..6f01707 100644 "TerminateAfterRetries", "SuspendRetries", "RetryForever"}; diff --git a/redfish-core/src/error_messages.cpp b/redfish-core/src/error_messages.cpp -index 9c28e8f..2394398 100644 +index 2087a67..ecb3721 100644 --- a/redfish-core/src/error_messages.cpp +++ b/redfish-core/src/error_messages.cpp -@@ -2173,6 +2173,32 @@ void mutualExclusiveProperties(crow::Response& res, const std::string& arg1, +@@ -2203,6 +2203,32 @@ void mutualExclusiveProperties(crow::Response& res, const std::string& arg1, addMessageToErrorJson(res.jsonValue, mutualExclusiveProperties(arg1, arg2)); } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0007-EventService-Log-events-for-subscription-actions.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0007-EventService-Log-events-for-subscription-actions.patch index 3be65ee2a..7cad022f3 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0007-EventService-Log-events-for-subscription-actions.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0007-EventService-Log-events-for-subscription-actions.patch @@ -1,4 +1,4 @@ -From b8eb53886106e44e3668857b13f8642d2ad3cfbf Mon Sep 17 00:00:00 2001 +From b5020756ae3fbff6283c293c74b779d656429f3a Mon Sep 17 00:00:00 2001 From: AppaRao Puli Date: Fri, 27 Aug 2021 16:02:01 +0000 Subject: [PATCH] EventService: Log events for subscription actions @@ -21,13 +21,14 @@ Tested: Change-Id: I3745fa6357bd215379781a9818d9acc02a853d79 Signed-off-by: AppaRao Puli Signed-off-by: Ayushi Smriti +Signed-off-by: P Dheeraj Srujan Kumar --- .../include/event_service_manager.hpp | 35 ++++++++++++++++--- redfish-core/lib/event_service.hpp | 2 +- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index c3e7f61..e9bdbfa 100644 +index aae9f02..69db652 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp @@ -21,6 +21,7 @@ @@ -38,7 +39,7 @@ index c3e7f61..e9bdbfa 100644 #include #include -@@ -788,7 +789,7 @@ class EventServiceManager +@@ -780,7 +781,7 @@ class EventServiceManager } } @@ -47,7 +48,7 @@ index c3e7f61..e9bdbfa 100644 { persistent_data::EventServiceStore::getInstance() .eventServiceConfig.enabled = serviceEnabled; -@@ -835,7 +836,7 @@ class EventServiceManager +@@ -827,7 +828,7 @@ class EventServiceManager if (updateConfig) { @@ -56,7 +57,7 @@ index c3e7f61..e9bdbfa 100644 } if (updateRetryCfg) -@@ -947,7 +948,7 @@ class EventServiceManager +@@ -939,7 +940,7 @@ class EventServiceManager if (updateFile) { @@ -65,7 +66,7 @@ index c3e7f61..e9bdbfa 100644 } #ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES -@@ -962,6 +963,13 @@ class EventServiceManager +@@ -955,6 +956,13 @@ class EventServiceManager // Set Subscription ID for back trace subValue->setSubscriptionId(id); @@ -79,7 +80,7 @@ index c3e7f61..e9bdbfa 100644 return id; } -@@ -986,7 +994,14 @@ class EventServiceManager +@@ -979,7 +987,14 @@ class EventServiceManager persistent_data::EventServiceStore::getInstance() .subscriptionsConfigMap.erase(obj2); updateNoOfSubscribersCount(); @@ -95,7 +96,7 @@ index c3e7f61..e9bdbfa 100644 } } -@@ -1008,6 +1023,18 @@ class EventServiceManager +@@ -1001,6 +1016,18 @@ class EventServiceManager } } @@ -115,10 +116,10 @@ index c3e7f61..e9bdbfa 100644 { return subscriptionsMap.size(); diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp -index 9def549..6a8421f 100644 +index 99c3bfd..15e45dc 100644 --- a/redfish-core/lib/event_service.hpp +++ b/redfish-core/lib/event_service.hpp -@@ -617,7 +617,7 @@ inline void requestRoutesEventDestination(App& app) +@@ -624,7 +624,7 @@ inline void requestRoutesEventDestination(App& app) subValue->updateRetryPolicy(); } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0008-Add-checks-on-Event-Subscription-input-parameters.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0008-Add-checks-on-Event-Subscription-input-parameters.patch index 84ceb4ba8..a46708ee5 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0008-Add-checks-on-Event-Subscription-input-parameters.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0008-Add-checks-on-Event-Subscription-input-parameters.patch @@ -1,4 +1,4 @@ -From 05fdea2bb8e486b058d137a067ce1f5c885d2a96 Mon Sep 17 00:00:00 2001 +From ee758f1f97890f51707e72b3c6b08c8c46c41595 Mon Sep 17 00:00:00 2001 From: Nitin Wankhade Date: Mon, 28 Jun 2021 19:59:57 +0000 Subject: [PATCH] Add checks on Event Subscription input parameters @@ -16,17 +16,18 @@ Tested Change-Id: Iec2cd766c0e137b72706fc2da468d4fefd8fbaae Signed-off-by: Nitin Wankhade +Signed-off-by: P Dheeraj Srujan Kumar --- - redfish-core/lib/event_service.hpp | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) + redfish-core/lib/event_service.hpp | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp -index 52b01e5..f8a1671 100644 +index 15e45dc..27dec86 100644 --- a/redfish-core/lib/event_service.hpp +++ b/redfish-core/lib/event_service.hpp -@@ -19,6 +19,10 @@ - #include - #include +@@ -22,6 +22,10 @@ + + #include +#define MAX_CONTEXT_SIZE 256 +#define MAX_DESTINATION_SIZE 1024 @@ -35,7 +36,7 @@ index 52b01e5..f8a1671 100644 namespace redfish { static constexpr const std::array supportedRetryPolicies = { -@@ -220,6 +224,12 @@ inline void requestRoutesEventDestinationCollection(App& app) +@@ -223,6 +227,12 @@ inline void requestRoutesEventDestinationCollection(App& app) return; } @@ -48,7 +49,7 @@ index 52b01e5..f8a1671 100644 if (regPrefixes && msgIds) { if (regPrefixes->size() && msgIds->size()) -@@ -330,11 +340,31 @@ inline void requestRoutesEventDestinationCollection(App& app) +@@ -333,13 +343,29 @@ inline void requestRoutesEventDestinationCollection(App& app) if (context) { @@ -64,22 +65,20 @@ index 52b01e5..f8a1671 100644 { + size_t cumulativeLen = 0; + -+ for (nlohmann::json& itr : *headers) -+ { -+ std::string hdr{itr.dump( + for (const nlohmann::json& headerChunk : *headers) + { ++ std::string hdr{headerChunk.dump( + -1, ' ', true, nlohmann::json::error_handler_t::replace)}; + cumulativeLen += hdr.length(); -+ + if (cumulativeLen > MAX_HEADER_SIZE) + { + messages::propertySizeExceeded(asyncResp->res, + "HttpHeaders"); + return; + } -+ } - subValue->httpHeaders = *headers; - } - + for (const auto& item : headerChunk.items()) + { + const std::string* value = -- 2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0009-Restructure-Redifsh-EventLog-Transmit-code-flow.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0009-Restructure-Redifsh-EventLog-Transmit-code-flow.patch index d1fe475f5..918560f4d 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0009-Restructure-Redifsh-EventLog-Transmit-code-flow.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0009-Restructure-Redifsh-EventLog-Transmit-code-flow.patch @@ -1,5 +1,5 @@ -From 542505dff60e3921b00b51acae882e207d46f1a6 Mon Sep 17 00:00:00 2001 -From: Krzysztof Grobelny +From d047619b7003882846b108f519b00cdd41265361 Mon Sep 17 00:00:00 2001 +From: P Dheeraj Srujan Kumar Date: Wed, 14 Jul 2021 14:13:11 +0000 Subject: [PATCH] Restructure Redfish EventLog Transmit code flow @@ -35,7 +35,7 @@ Signed-off-by: P Dheeraj Srujan Kumar 1 file changed, 76 insertions(+), 32 deletions(-) diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index e9bdbfa..5c4de70 100644 +index 3208fb3..86c90fb 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp @@ -134,15 +134,10 @@ static const Message* formatMessage(const std::string_view& messageID) @@ -55,7 +55,7 @@ index e9bdbfa..5c4de70 100644 // Get the entry timestamp std::time_t curTs = 0; -@@ -621,6 +616,7 @@ class EventServiceManager +@@ -628,6 +623,7 @@ class EventServiceManager } std::string lastEventTStr; @@ -63,7 +63,7 @@ index e9bdbfa..5c4de70 100644 size_t noOfEventLogSubscribers{0}; size_t noOfMetricReportSubscribers{0}; std::shared_ptr matchTelemetryMonitor; -@@ -1163,7 +1159,22 @@ class EventServiceManager +@@ -1172,7 +1168,22 @@ class EventServiceManager #ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES void cacheLastEventTimestamp() { @@ -87,7 +87,7 @@ index e9bdbfa..5c4de70 100644 std::ifstream logStream(redfishEventLogFile); if (!logStream.good()) { -@@ -1171,27 +1182,44 @@ class EventServiceManager +@@ -1180,27 +1191,44 @@ class EventServiceManager return; } std::string logEntry; @@ -143,7 +143,7 @@ index e9bdbfa..5c4de70 100644 std::ifstream logStream(redfishEventLogFile); if (!logStream.good()) { -@@ -1201,27 +1229,21 @@ class EventServiceManager +@@ -1210,27 +1238,21 @@ class EventServiceManager std::vector eventRecords; @@ -178,7 +178,7 @@ index e9bdbfa..5c4de70 100644 std::string timestamp; std::string messageID; -@@ -1233,6 +1255,16 @@ class EventServiceManager +@@ -1242,6 +1264,16 @@ class EventServiceManager continue; } @@ -195,7 +195,7 @@ index e9bdbfa..5c4de70 100644 std::string registryName; std::string messageKey; event_log::getRegistryAndMessageKey(messageID, registryName, -@@ -1242,11 +1274,23 @@ class EventServiceManager +@@ -1251,11 +1283,23 @@ class EventServiceManager continue; } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0010-Remove-Terminated-Event-Subscriptions.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0010-Remove-Terminated-Event-Subscriptions.patch index 9af5a066b..f37bc241b 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0010-Remove-Terminated-Event-Subscriptions.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0010-Remove-Terminated-Event-Subscriptions.patch @@ -1,5 +1,5 @@ -From f665ba085bb2310f008b7534f827fb401ad973c2 Mon Sep 17 00:00:00 2001 -From: Krzysztof Grobelny +From 5d13aa636aba6c68ab5a74e589cac35f4e925129 Mon Sep 17 00:00:00 2001 +From: P Dheeraj Srujan Kumar Date: Tue, 12 Oct 2021 08:19:51 +0000 Subject: [PATCH] Delete/Remove Terminated Event Subscription(s) @@ -22,15 +22,15 @@ Tested: Change-Id: If447acb2db74fb29a5d1cfe6194b77cda82bc8a1 Signed-off-by: P Dheeraj Srujan Kumar --- - http/http_client.hpp | 43 +++++++++++++++---- - .../include/event_service_manager.hpp | 36 ++++++++++++++++ - 2 files changed, 70 insertions(+), 9 deletions(-) + http/http_client.hpp | 48 +++++++++++++++---- + .../include/event_service_manager.hpp | 36 ++++++++++++++ + 2 files changed, 75 insertions(+), 9 deletions(-) diff --git a/http/http_client.hpp b/http/http_client.hpp -index 5e7ff47..54ae2c3 100644 +index 58b5402..745eeb6 100644 --- a/http/http_client.hpp +++ b/http/http_client.hpp -@@ -55,6 +55,8 @@ enum class ConnState +@@ -56,6 +56,8 @@ enum class ConnState closeInProgress, closed, suspended, @@ -39,7 +39,7 @@ index 5e7ff47..54ae2c3 100644 terminated, abortConnection, retry -@@ -288,7 +290,14 @@ class HttpClient : public std::enable_shared_from_this +@@ -290,7 +292,14 @@ class HttpClient : public std::enable_shared_from_this } void doClose() { @@ -55,7 +55,7 @@ index 5e7ff47..54ae2c3 100644 // Set the timeout on the tcp stream socket for the async operation conn.expires_after(std::chrono::seconds(30)); -@@ -318,8 +327,11 @@ class HttpClient : public std::enable_shared_from_this +@@ -320,8 +329,11 @@ class HttpClient : public std::enable_shared_from_this } self->conn.close(); @@ -69,7 +69,7 @@ index 5e7ff47..54ae2c3 100644 { self->state = ConnState::closed; self->handleConnState(); -@@ -341,8 +353,11 @@ class HttpClient : public std::enable_shared_from_this +@@ -343,8 +355,11 @@ class HttpClient : public std::enable_shared_from_this } conn.close(); @@ -83,7 +83,7 @@ index 5e7ff47..54ae2c3 100644 { state = ConnState::closed; handleConnState(); -@@ -365,8 +380,7 @@ class HttpClient : public std::enable_shared_from_this +@@ -367,8 +382,7 @@ class HttpClient : public std::enable_shared_from_this BMCWEB_LOG_DEBUG << "Retry policy: " << retryPolicyAction; if (retryPolicyAction == "TerminateAfterRetries") { @@ -93,7 +93,7 @@ index 5e7ff47..54ae2c3 100644 } if (retryPolicyAction == "SuspendRetries") { -@@ -423,6 +437,7 @@ class HttpClient : public std::enable_shared_from_this +@@ -425,6 +439,7 @@ class HttpClient : public std::enable_shared_from_this case ConnState::sendInProgress: case ConnState::recvInProgress: case ConnState::closeInProgress: @@ -101,7 +101,7 @@ index 5e7ff47..54ae2c3 100644 { BMCWEB_LOG_DEBUG << "Async operation is already in progress"; break; -@@ -439,7 +454,7 @@ class HttpClient : public std::enable_shared_from_this +@@ -441,11 +456,16 @@ class HttpClient : public std::enable_shared_from_this break; } case ConnState::suspended: @@ -110,8 +110,17 @@ index 5e7ff47..54ae2c3 100644 { doClose(); break; -@@ -506,7 +521,8 @@ class HttpClient : public std::enable_shared_from_this - } + } ++ case ConnState::terminated: ++ { ++ BMCWEB_LOG_DEBUG << "Connection Terminated"; ++ break; ++ } + case ConnState::resolveFailed: + case ConnState::connectFailed: + case ConnState::handshakeFailed: +@@ -505,7 +525,8 @@ class HttpClient : public std::enable_shared_from_this + void sendData(const std::string& data) { - if ((state == ConnState::suspended) || (state == ConnState::terminated)) @@ -120,7 +129,7 @@ index 5e7ff47..54ae2c3 100644 { return; } -@@ -524,6 +540,15 @@ class HttpClient : public std::enable_shared_from_this +@@ -523,6 +544,15 @@ class HttpClient : public std::enable_shared_from_this return; } @@ -133,14 +142,14 @@ index 5e7ff47..54ae2c3 100644 + return false; + } + - void addHeaders( - const std::vector>& httpHeaders) + void setHeaders(const boost::beast::http::fields& httpHeaders) { + // Set custom headers diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index 6f60a31..363adb0 100644 +index 69db652..5d71c63 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -591,6 +591,14 @@ class Subscription : public persistent_data::UserSubscription +@@ -588,6 +588,14 @@ class Subscription : public persistent_data::UserSubscription return std::nullopt; } @@ -155,7 +164,7 @@ index 6f60a31..363adb0 100644 private: std::shared_ptr sseConn = nullptr; uint64_t eventSeqNum; -@@ -847,6 +855,22 @@ class EventServiceManager +@@ -843,6 +851,22 @@ class EventServiceManager } } @@ -178,7 +187,7 @@ index 6f60a31..363adb0 100644 void updateNoOfSubscribersCount() { size_t eventLogSubCount = 0; -@@ -881,6 +905,7 @@ class EventServiceManager +@@ -877,6 +901,7 @@ class EventServiceManager std::shared_ptr getSubscription(const std::string& id) { @@ -186,7 +195,7 @@ index 6f60a31..363adb0 100644 auto obj = subscriptionsMap.find(id); if (obj == subscriptionsMap.end()) { -@@ -971,6 +996,7 @@ class EventServiceManager +@@ -968,6 +993,7 @@ class EventServiceManager bool isSubscriptionExist(const std::string& id) { @@ -194,7 +203,7 @@ index 6f60a31..363adb0 100644 auto obj = subscriptionsMap.find(id); if (obj == subscriptionsMap.end()) { -@@ -1033,6 +1059,7 @@ class EventServiceManager +@@ -1030,6 +1056,7 @@ class EventServiceManager size_t getNumberOfSubscriptions() { @@ -202,7 +211,7 @@ index 6f60a31..363adb0 100644 return subscriptionsMap.size(); } -@@ -1049,6 +1076,7 @@ class EventServiceManager +@@ -1046,6 +1073,7 @@ class EventServiceManager std::vector getAllIDs() { @@ -210,7 +219,7 @@ index 6f60a31..363adb0 100644 std::vector idList; for (const auto& it : subscriptionsMap) { -@@ -1059,6 +1087,7 @@ class EventServiceManager +@@ -1056,6 +1084,7 @@ class EventServiceManager bool isDestinationExist(const std::string& destUrl) { @@ -218,7 +227,7 @@ index 6f60a31..363adb0 100644 for (const auto& it : subscriptionsMap) { std::shared_ptr entry = it.second; -@@ -1073,6 +1102,7 @@ class EventServiceManager +@@ -1070,6 +1099,7 @@ class EventServiceManager void sendTestEventLog() { @@ -226,7 +235,7 @@ index 6f60a31..363adb0 100644 for (const auto& it : this->subscriptionsMap) { std::shared_ptr entry = it.second; -@@ -1100,6 +1130,8 @@ class EventServiceManager +@@ -1097,6 +1127,8 @@ class EventServiceManager } eventRecord.push_back(eventMessage); @@ -235,7 +244,7 @@ index 6f60a31..363adb0 100644 for (const auto& it : this->subscriptionsMap) { std::shared_ptr entry = it.second; -@@ -1143,6 +1175,8 @@ class EventServiceManager +@@ -1140,6 +1172,8 @@ class EventServiceManager } void sendBroadcastMsg(const std::string& broadcastMsg) { @@ -244,7 +253,7 @@ index 6f60a31..363adb0 100644 for (const auto& it : this->subscriptionsMap) { std::shared_ptr entry = it.second; -@@ -1291,6 +1325,8 @@ class EventServiceManager +@@ -1254,6 +1288,8 @@ class EventServiceManager return; } @@ -254,5 +263,5 @@ index 6f60a31..363adb0 100644 { std::shared_ptr entry = it.second; -- -2.25.1 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0011-Fix-bmcweb-crash-while-deleting-terminated-subscriptions.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0011-Fix-bmcweb-crash-while-deleting-terminated-subscriptions.patch index 585f7bf09..87f0a4fd9 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0011-Fix-bmcweb-crash-while-deleting-terminated-subscriptions.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0011-Fix-bmcweb-crash-while-deleting-terminated-subscriptions.patch @@ -1,4 +1,4 @@ -From 5b87bb61b58e92a8c5af37a7959347747409a65c Mon Sep 17 00:00:00 2001 +From ff562320d23e1c1e075689a636505f22eb4890d4 Mon Sep 17 00:00:00 2001 From: P Dheeraj Srujan Kumar Date: Thu, 14 Oct 2021 02:56:11 +0530 Subject: [PATCH] Fix bmcweb crash while deleting terminated subscriptions @@ -33,10 +33,10 @@ Signed-off-by: P Dheeraj Srujan Kumar 2 files changed, 58 insertions(+), 12 deletions(-) diff --git a/http/http_client.hpp b/http/http_client.hpp -index 54ae2c3..162cb09 100644 +index 745eeb6..5575765 100644 --- a/http/http_client.hpp +++ b/http/http_client.hpp -@@ -367,6 +367,12 @@ class HttpClient : public std::enable_shared_from_this +@@ -369,6 +369,12 @@ class HttpClient : public std::enable_shared_from_this void waitAndRetry() { @@ -49,7 +49,7 @@ index 54ae2c3..162cb09 100644 if (retryCount >= maxRetryAttempts) { BMCWEB_LOG_ERROR << "Maximum number of retries reached."; -@@ -393,11 +399,6 @@ class HttpClient : public std::enable_shared_from_this +@@ -395,11 +401,6 @@ class HttpClient : public std::enable_shared_from_this return; } @@ -62,10 +62,10 @@ index 54ae2c3..162cb09 100644 retryCount++; diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index 363adb0..7af7a4d 100644 +index 5d71c63..f97909c 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -857,18 +857,63 @@ class EventServiceManager +@@ -853,18 +853,63 @@ class EventServiceManager void deleteTerminatedSubcriptions() { diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0012-Add-support-for-deleting-terminated-subscriptions.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0012-Add-support-for-deleting-terminated-subscriptions.patch new file mode 100644 index 000000000..dd4827f27 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0012-Add-support-for-deleting-terminated-subscriptions.patch @@ -0,0 +1,45 @@ +From e44cced4e8a50a6edf0ace0e00b5be4b61533190 Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny +Date: Tue, 7 Dec 2021 09:48:07 +0100 +Subject: [PATCH] Add support for deleting terminated subscriptions + +Added functionality to delete/remove event subscription(s) which are +configured to Terminate after retries. + +Currently, when an Event is subscribed with Retry Policy as +"TerminateAfterRetries", the state of the connection is set to +"Terminated" after retrying, but the Subscription is not removed. +This commit adds the functionality to detect terminated connection and +remove the respective subscription. + +This commit adds this check for metric reports. + +Tested: + - Created a Subscription with + DeliveryRetryPolicy: "TerminateAfterRetries" + - Received Events successfully on Event listener + - Once the Event listener was stopped, the Subscription was + removed/deleted after retries. + +Change-Id: I3cb0af5bc24411cddcdb3d1d9de25e8e9144106c +Signed-off-by: P Dheeraj Srujan Kumar +--- + redfish-core/include/event_service_manager.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp +index f97909c..881d2db 100644 +--- a/redfish-core/include/event_service_manager.hpp ++++ b/redfish-core/include/event_service_manager.hpp +@@ -1514,6 +1514,8 @@ class EventServiceManager + return; + } + ++ this->deleteTerminatedSubcriptions(); ++ + for (const auto& it : + EventServiceManager::getInstance().subscriptionsMap) + { +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0013-event-service-fix-added-Context-field-to-response.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0013-event-service-fix-added-Context-field-to-response.patch new file mode 100644 index 000000000..019ccbe64 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0013-event-service-fix-added-Context-field-to-response.patch @@ -0,0 +1,33 @@ +From ce9b52791e76d73050f053f8fc607c6e1eb5d8c4 Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny +Date: Thu, 16 Dec 2021 10:46:55 +0100 +Subject: [PATCH] event service fix, added Context field to response + +Tested: + - Context field is present + - No regression detected + +Signed-off-by: Krzysztof Grobelny +--- + redfish-core/include/event_service_manager.hpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp +index 881d2db..1ba9f21 100644 +--- a/redfish-core/include/event_service_manager.hpp ++++ b/redfish-core/include/event_service_manager.hpp +@@ -530,6 +530,11 @@ class Subscription : public persistent_data::UserSubscription + return; + } + ++ if (!customText.empty()) ++ { ++ msg["Context"] = customText; ++ } ++ + this->sendEvent( + msg.dump(2, ' ', true, nlohmann::json::error_handler_t::replace)); + } +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README index c09967456..22dae410d 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README @@ -22,7 +22,7 @@ Upstream revision information: file://eventservice/0007-EventService-Log-events-for-subscription-actions.patch - Add checks on Event-Subscription input parameters (Downstream patch) - file://eventservice//0008-Add-checks-on-Event-Subscription-input-parameters.patch + file://eventservice/0008-Add-checks-on-Event-Subscription-input-parameters.patch - Restructure Redifsh EventLog Transmit code flow https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/44449/3 @@ -31,4 +31,10 @@ Upstream revision information: file://eventservice/0010-Remove-Terminated-Event-Subscriptions.patch - Fix bmcweb crash while deleting terminated subscriptions (Downstream patch) - file://eventservice/0011-Fix-bmcweb-crash-while-deleting-terminated-subscriptions.patch + file://eventservice/0011-Fix-bmcweb-crash-while-deleting-terminated-subscriptions.patch + + - Add support for deleting terminated subscriptions + file://eventservice/0012-Add-support-for-deleting-terminated-subscriptions.patch + + - event service fix added Context field to response + file://eventservice/0013-event-service-fix-added-Context-field-to-response.patch diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0001-Add-asyncResp-support-during-handleUpgrade.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0001-Add-asyncResp-support-during-handleUpgrade.patch index b3aa11774..c25a79521 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0001-Add-asyncResp-support-during-handleUpgrade.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0001-Add-asyncResp-support-during-handleUpgrade.patch @@ -176,7 +176,7 @@ index 25e4ce8..858f146 100644 + crow::Response resp; + rules[ruleIndex]->handleUpgrade(req, resp, std::move(adaptor)); } - catch (std::exception& e) + catch (const std::exception& e) { BMCWEB_LOG_ERROR << "An uncaught exception occurred: " << e.what(); - res.result(boost::beast::http::status::internal_server_error); diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0003-Add-Support-for-privilege-check-in-handleUpgrade.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0003-Add-Support-for-privilege-check-in-handleUpgrade.patch index 1ba584616..180ee46d0 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0003-Add-Support-for-privilege-check-in-handleUpgrade.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0003-Add-Support-for-privilege-check-in-handleUpgrade.patch @@ -60,7 +60,7 @@ index acc99dc..e2a8fbb 100644 - crow::Response resp; - rules[ruleIndex]->handleUpgrade(req, resp, std::move(adaptor)); - } -- catch (std::exception& e) +- catch (const std::exception& e) - { - BMCWEB_LOG_ERROR << "An uncaught exception occurred: " << e.what(); - asyncResp->res.result( diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0004-Add-Privileges-to-Websockets.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0004-Add-Privileges-to-Websockets.patch index 64e235ce3..19c671754 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0004-Add-Privileges-to-Websockets.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/http_routing/0004-Add-Privileges-to-Websockets.patch @@ -117,9 +117,9 @@ index 02f958a..ebbe68f 100644 --- a/include/vm_websocket.hpp +++ b/include/vm_websocket.hpp @@ -3,6 +3,7 @@ - #include - #include - #include + #include + #include + #include +#include #include diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-MetricDefinition-scheme.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-MetricDefinition-scheme.patch deleted file mode 100644 index f5226fe6e..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-MetricDefinition-scheme.patch +++ /dev/null @@ -1,619 +0,0 @@ -From 32e557279450226ed9c06312649d90b802f3d4c5 Mon Sep 17 00:00:00 2001 -From: Krzysztof Grobelny -Date: Tue, 13 Apr 2021 13:00:18 +0000 -Subject: [PATCH] Add support for MetricDefinition scheme - -Added MetricDefinition node to Redfish code. Now user is able to list -all available metrics in OpenBMC that are supported by Telemetry -service. Metrics are grouped by reading type. - -MetricDefinitions contains all physical sensors supported by redfish, -algorithm iterates through all chassis and collects results for each -node available in that chassis (Power, Thermal, Sensors). - -When BMCWEB_NEW_POWERSUBSYSTEM_THERMALSUBSYSTEM will be enabled by -default (meson option redfish-new-powersubsystem-thermalsubsystem) it -will be possible to optimize this algorithm to only get sensors from -Sensors node. Currently Sensors node doesn't contain all available -sensors. - -Tested: - - MetricDefinitions response is filled with existing sensors, it works - with and without Telemetry service - - Validated a presence of MetricDefinition members and its attributes - - Successfully passed RedfishServiceValidator.py using witherspoon - image on QEMU - - Tested using following GET,POST requests - -GET /redfish/v1/TelemetryService/MetricDefinitions -{ - "@odata.id": "/redfish/v1/TelemetryService/MetricDefinitions", - "@odata.type": "#MetricDefinitionCollection.MetricDefinitionCollection", - "Members": [ - { - "@odata.id": "/redfish/v1/TelemetryService/MetricDefinitions/Fan_Pwm" - }, - { - "@odata.id": "/redfish/v1/TelemetryService/MetricDefinitions/Fan_Tach" - }, - { - "@odata.id": "/redfish/v1/TelemetryService/MetricDefinitions/HostCpuUtilization" - }, - { - "@odata.id": "/redfish/v1/TelemetryService/MetricDefinitions/HostMemoryBandwidthUtilization" - }, - { - "@odata.id": "/redfish/v1/TelemetryService/MetricDefinitions/HostPciBandwidthUtilization" - }, - { - "@odata.id": "/redfish/v1/TelemetryService/MetricDefinitions/Inlet_BRD_Temp" - }, - { - "@odata.id": "/redfish/v1/TelemetryService/MetricDefinitions/Left_Rear_Board_Temp" - } - ], - "Members@odata.count": 7, - "Name": "Metric Definition Collection" -} - -GET /redfish/v1/TelemetryService/MetricDefinitions/Fan_Tach -{ - "@odata.id": "/redfish/v1/TelemetryService/MetricDefinitions/Fan_Tach", - "@odata.type": "#MetricDefinition.v1_0_3.MetricDefinition", - "Id": "Fan_Tach", - "IsLinear": true, - "MaxReadingRange": 25000.0, - "MetricDataType": "Decimal", - "MetricProperties": [ - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/0/Reading", - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/1/Reading", - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/2/Reading", - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/3/Reading", - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/4/Reading", - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/5/Reading", - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/6/Reading", - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/7/Reading", - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/8/Reading", - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/9/Reading" - ], - "MetricType": "Gauge", - "MinReadingRange": 0.0, - "Name": "Fan_Tach", - "Units": "RPM" -} - -POST redfish/v1/TelemetryService/MetricReportDefinitions, body: -{ - "Id": "TestReport", - "Metrics": [ - { - "MetricId": "TestMetric", - "MetricProperties": [ - "/redfish/v1/Chassis/Chassis0/Thermal#/Fans/3/Reading", - ] - } - ], - "MetricReportDefinitionType": "OnRequest", - "ReportActions": [ - "RedfishEvent", - "LogToMetricReportsCollection" - ] -} -{ - "@Message.ExtendedInfo": [ - { - "@odata.type": "#Message.v1_1_1.Message", - "Message": "The resource has been created successfully", - "MessageArgs": [], - "MessageId": "Base.1.8.1.Created", - "MessageSeverity": "OK", - "Resolution": "None" - } - ] -} - -Signed-off-by: Wludzik, Jozef -Signed-off-by: Krzysztof Grobelny -Change-Id: I3086e1302e1ba2e5442d1367939fd5507a0cbc00 ---- - redfish-core/include/redfish.hpp | 3 + - .../include/utils/get_chassis_names.hpp | 58 +++ - .../include/utils/telemetry_utils.hpp | 2 + - redfish-core/lib/metric_definition.hpp | 368 ++++++++++++++++++ - redfish-core/lib/telemetry_service.hpp | 3 +- - 5 files changed, 433 insertions(+), 1 deletion(-) - create mode 100644 redfish-core/include/utils/get_chassis_names.hpp - create mode 100644 redfish-core/lib/metric_definition.hpp - -diff --git a/redfish-core/include/redfish.hpp b/redfish-core/include/redfish.hpp -index 0a97150..67c5af2 100644 ---- a/redfish-core/include/redfish.hpp -+++ b/redfish-core/include/redfish.hpp -@@ -26,6 +26,7 @@ - #include "../lib/managers.hpp" - #include "../lib/memory.hpp" - #include "../lib/message_registries.hpp" -+#include "../lib/metric_definition.hpp" - #include "../lib/metric_report.hpp" - #include "../lib/metric_report_definition.hpp" - #include "../lib/network_protocol.hpp" -@@ -200,6 +201,8 @@ class RedfishService - requestRoutesMetricReportDefinition(app); - requestRoutesMetricReportCollection(app); - requestRoutesMetricReport(app); -+ requestRoutesMetricDefinitionCollection(app); -+ requestRoutesMetricDefinition(app); - } - }; - -diff --git a/redfish-core/include/utils/get_chassis_names.hpp b/redfish-core/include/utils/get_chassis_names.hpp -new file mode 100644 -index 0000000..0276b6f ---- /dev/null -+++ b/redfish-core/include/utils/get_chassis_names.hpp -@@ -0,0 +1,58 @@ -+#pragma once -+ -+#include -+ -+#include -+#include -+#include -+ -+namespace redfish -+{ -+ -+namespace utils -+{ -+ -+template -+inline void getChassisNames(F&& cb) -+{ -+ const std::array interfaces = { -+ "xyz.openbmc_project.Inventory.Item.Board", -+ "xyz.openbmc_project.Inventory.Item.Chassis"}; -+ -+ crow::connections::systemBus->async_method_call( -+ [callback = std::move(cb)](const boost::system::error_code ec, -+ const std::vector& chassis) { -+ std::vector chassisNames; -+ -+ if (ec) -+ { -+ callback(ec, chassisNames); -+ return; -+ } -+ -+ chassisNames.reserve(chassis.size()); -+ for (const std::string& path : chassis) -+ { -+ sdbusplus::message::object_path dbusPath = path; -+ std::string name = dbusPath.filename(); -+ if (name.empty()) -+ { -+ callback(boost::system::errc::make_error_code( -+ boost::system::errc::invalid_argument), -+ chassisNames); -+ return; -+ } -+ chassisNames.emplace_back(std::move(name)); -+ } -+ -+ callback(ec, chassisNames); -+ }, -+ "xyz.openbmc_project.ObjectMapper", -+ "/xyz/openbmc_project/object_mapper", -+ "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths", -+ "/xyz/openbmc_project/inventory", 0, interfaces); -+} -+ -+} // namespace utils -+ -+} // namespace redfish -diff --git a/redfish-core/include/utils/telemetry_utils.hpp b/redfish-core/include/utils/telemetry_utils.hpp -index 5872350..1b4f75d 100644 ---- a/redfish-core/include/utils/telemetry_utils.hpp -+++ b/redfish-core/include/utils/telemetry_utils.hpp -@@ -10,6 +10,8 @@ namespace telemetry - - constexpr const char* service = "xyz.openbmc_project.Telemetry"; - constexpr const char* reportInterface = "xyz.openbmc_project.Telemetry.Report"; -+constexpr const char* metricDefinitionUri = -+ "/redfish/v1/TelemetryService/MetricDefinitions/"; - constexpr const char* metricReportDefinitionUri = - "/redfish/v1/TelemetryService/MetricReportDefinitions/"; - constexpr const char* metricReportUri = -diff --git a/redfish-core/lib/metric_definition.hpp b/redfish-core/lib/metric_definition.hpp -new file mode 100644 -index 0000000..347c297 ---- /dev/null -+++ b/redfish-core/lib/metric_definition.hpp -@@ -0,0 +1,368 @@ -+#pragma once -+ -+#include "async_resp.hpp" -+#include "sensors.hpp" -+#include "utils/get_chassis_names.hpp" -+#include "utils/telemetry_utils.hpp" -+ -+#include -+ -+namespace redfish -+{ -+ -+namespace telemetry -+{ -+ -+struct ValueVisitor -+{ -+ ValueVisitor(boost::system::error_code& ec) : ec(ec) -+ {} -+ -+ template -+ double operator()(T value) const -+ { -+ return static_cast(value); -+ } -+ -+ double operator()(std::monostate) const -+ { -+ ec = boost::system::errc::make_error_code( -+ boost::system::errc::invalid_argument); -+ return double{}; -+ } -+ -+ boost::system::error_code& ec; -+}; -+ -+inline void getReadingRange( -+ const std::string& service, const std::string& path, -+ const std::string& property, -+ std::function callback) -+{ -+ crow::connections::systemBus->async_method_call( -+ [callback = std::move(callback)]( -+ boost::system::error_code ec, -+ const std::variant& -+ valueVariant) { -+ if (ec) -+ { -+ callback(ec, double{}); -+ return; -+ } -+ -+ const double value = std::visit(ValueVisitor(ec), valueVariant); -+ -+ callback(ec, value); -+ }, -+ service, path, "org.freedesktop.DBus.Properties", "Get", -+ "xyz.openbmc_project.Sensor.Value", property); -+} -+ -+inline void -+ fillMinMaxReadingRange(const std::shared_ptr& asyncResp, -+ const std::string& serviceName, -+ const std::string& sensorPath) -+{ -+ asyncResp->res.jsonValue["MetricType"] = "Numeric"; -+ -+ telemetry::getReadingRange( -+ serviceName, sensorPath, "MinValue", -+ [asyncResp](boost::system::error_code ec, double readingRange) { -+ if (ec) -+ { -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ -+ if (std::isfinite(readingRange)) -+ { -+ asyncResp->res.jsonValue["MetricType"] = "Gauge"; -+ -+ asyncResp->res.jsonValue["MinReadingRange"] = readingRange; -+ } -+ }); -+ -+ telemetry::getReadingRange( -+ serviceName, sensorPath, "MaxValue", -+ [asyncResp](boost::system::error_code ec, double readingRange) { -+ if (ec) -+ { -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ -+ if (std::isfinite(readingRange)) -+ { -+ asyncResp->res.jsonValue["MetricType"] = "Gauge"; -+ -+ asyncResp->res.jsonValue["MaxReadingRange"] = readingRange; -+ } -+ }); -+} -+ -+inline void getSensorService( -+ const std::string& sensorPath, -+ std::function callback) -+{ -+ using ResultType = std::pair< -+ std::string, -+ std::vector>>>; -+ -+ crow::connections::systemBus->async_method_call( -+ [sensorPath, callback = std::move(callback)]( -+ boost::system::error_code ec, -+ const std::vector& result) { -+ if (ec) -+ { -+ callback(ec, std::string{}); -+ return; -+ } -+ -+ for (const auto& [path, serviceToInterfaces] : result) -+ { -+ if (path == sensorPath) -+ { -+ for (const auto& [service, interfaces] : -+ serviceToInterfaces) -+ { -+ callback(boost::system::errc::make_error_code( -+ boost::system::errc::success), -+ service); -+ return; -+ } -+ } -+ } -+ -+ callback(boost::system::errc::make_error_code( -+ boost::system::errc::no_such_file_or_directory), -+ std::string{}); -+ }, -+ "xyz.openbmc_project.ObjectMapper", -+ "/xyz/openbmc_project/object_mapper", -+ "xyz.openbmc_project.ObjectMapper", "GetSubTree", -+ "/xyz/openbmc_project/sensors", 2, -+ std::array{"xyz.openbmc_project.Sensor.Value"}); -+} -+ -+constexpr auto metricDefinitionMapping = std::array{ -+ std::pair{"fan_pwm", "Fan_Pwm"}, std::pair{"fan_tach", "Fan_Tach"}}; -+ -+std::string mapSensorToMetricDefinition(const std::string& sensorPath) -+{ -+ sdbusplus::message::object_path sensorObjectPath{sensorPath}; -+ -+ const auto it = std::find_if( -+ metricDefinitionMapping.begin(), metricDefinitionMapping.end(), -+ [&sensorObjectPath](const auto& item) { -+ return item.first == sensorObjectPath.parent_path().filename(); -+ }); -+ -+ const char* metricDefinitionPath = -+ "/redfish/v1/TelemetryService/MetricDefinitions/"; -+ -+ if (it != metricDefinitionMapping.end()) -+ { -+ return std::string{metricDefinitionPath} + it->second; -+ } -+ -+ return metricDefinitionPath + sensorObjectPath.filename(); -+} -+ -+template -+inline void mapRedfishUriToDbusPath(Callback&& callback) -+{ -+ utils::getChassisNames([callback = std::move(callback)]( -+ boost::system::error_code ec, -+ const std::vector& chassisNames) { -+ if (ec) -+ { -+ BMCWEB_LOG_ERROR << "getChassisNames error: " << ec.value(); -+ callback(ec, {}); -+ return; -+ } -+ -+ auto counter = std::make_shared, size_t>>(); -+ -+ auto handleRetrieveUriToDbusMap = -+ [counter, callback = std::move(callback)]( -+ const boost::beast::http::status status, -+ const boost::container::flat_map& -+ uriToDbus) { -+ if (status != boost::beast::http::status::ok) -+ { -+ BMCWEB_LOG_ERROR << "Failed to retrieve URI to dbus " -+ "sensors map with err " -+ << static_cast(status); -+ counter->second = 0u; -+ callback(boost::system::errc::make_error_code( -+ boost::system::errc::io_error), -+ {}); -+ return; -+ } -+ -+ for (const auto& [key, value] : uriToDbus) -+ { -+ counter->first[key] = value; -+ } -+ -+ if (--counter->second == 0u) -+ { -+ callback(boost::system::errc::make_error_code( -+ boost::system::errc::success), -+ counter->first); -+ } -+ }; -+ -+ for (const std::string& chassisName : chassisNames) -+ { -+ for (const auto& [sensorNode, dbusPaths] : sensors::dbus::paths) -+ { -+ ++counter->second; -+ retrieveUriToDbusMap(chassisName, sensorNode.data(), -+ handleRetrieveUriToDbusMap); -+ } -+ } -+ }); -+} -+ -+} // namespace telemetry -+ -+inline void requestRoutesMetricDefinitionCollection(App& app) -+{ -+ BMCWEB_ROUTE(app, "/redfish/v1/TelemetryService/MetricDefinitions/") -+ .privileges(privileges::getTelemetryService) -+ .methods(boost::beast::http::verb::get)( -+ [](const crow::Request&, -+ const std::shared_ptr& asyncResp) { -+ telemetry::mapRedfishUriToDbusPath( -+ [asyncResp](boost::system::error_code ec, -+ const boost::container::flat_map< -+ std::string, std::string>& uriToDbus) { -+ if (ec) -+ { -+ messages::internalError(asyncResp->res); -+ BMCWEB_LOG_ERROR -+ << "mapRedfishUriToDbusPath error: " -+ << ec.value(); -+ return; -+ } -+ -+ std::set members; -+ -+ for (const auto& [uri, dbusPath] : uriToDbus) -+ { -+ members.insert( -+ telemetry::mapSensorToMetricDefinition( -+ dbusPath)); -+ } -+ -+ for (const std::string& odataId : members) -+ { -+ asyncResp->res.jsonValue["Members"].push_back( -+ {{"@odata.id", odataId}}); -+ } -+ -+ asyncResp->res.jsonValue["Members@odata.count"] = -+ asyncResp->res.jsonValue["Members"].size(); -+ }); -+ -+ asyncResp->res.jsonValue["@odata.type"] = -+ "#MetricDefinitionCollection." -+ "MetricDefinitionCollection"; -+ asyncResp->res.jsonValue["@odata.id"] = -+ "/redfish/v1/TelemetryService/MetricDefinitions"; -+ asyncResp->res.jsonValue["Name"] = -+ "Metric Definition Collection"; -+ asyncResp->res.jsonValue["Members"] = nlohmann::json::array(); -+ asyncResp->res.jsonValue["Members@odata.count"] = 0; -+ }); -+} -+ -+inline void requestRoutesMetricDefinition(App& app) -+{ -+ BMCWEB_ROUTE(app, "/redfish/v1/TelemetryService/MetricDefinitions//") -+ .privileges(privileges::getTelemetryService) -+ .methods( -+ boost::beast::http::verb::get)([](const crow::Request&, -+ const std::shared_ptr< -+ bmcweb::AsyncResp>& asyncResp, -+ const std::string& name) { -+ telemetry::mapRedfishUriToDbusPath( -+ [asyncResp, name]( -+ boost::system::error_code ec, -+ const boost::container::flat_map& -+ uriToDbus) { -+ if (ec) -+ { -+ messages::internalError(asyncResp->res); -+ BMCWEB_LOG_ERROR << "mapRedfishUriToDbusPath error: " -+ << ec.value(); -+ return; -+ } -+ -+ std::string odataId = telemetry::metricDefinitionUri + name; -+ boost::container::flat_map -+ matchingUris; -+ -+ for (const auto& [uri, dbusPath] : uriToDbus) -+ { -+ if (telemetry::mapSensorToMetricDefinition(dbusPath) == -+ odataId) -+ { -+ matchingUris.emplace(uri, dbusPath); -+ } -+ } -+ -+ if (matchingUris.empty()) -+ { -+ messages::resourceNotFound(asyncResp->res, -+ "MetricDefinition", name); -+ return; -+ } -+ -+ std::string sensorPath = matchingUris.begin()->second; -+ -+ telemetry::getSensorService( -+ sensorPath, -+ [asyncResp, name, odataId = std::move(odataId), -+ sensorPath, matchingUris = std::move(matchingUris)]( -+ boost::system::error_code ec, -+ const std::string& serviceName) { -+ if (ec) -+ { -+ messages::internalError(asyncResp->res); -+ BMCWEB_LOG_ERROR << "getServiceSensorFailed: " -+ << ec.value(); -+ return; -+ } -+ -+ asyncResp->res.jsonValue["Id"] = name; -+ asyncResp->res.jsonValue["Name"] = name; -+ asyncResp->res.jsonValue["@odata.id"] = odataId; -+ asyncResp->res.jsonValue["@odata.type"] = -+ "#MetricDefinition.v1_0_3.MetricDefinition"; -+ asyncResp->res.jsonValue["MetricDataType"] = -+ "Decimal"; -+ asyncResp->res.jsonValue["IsLinear"] = true; -+ asyncResp->res.jsonValue["Units"] = -+ sensors::toReadingUnits( -+ sdbusplus::message::object_path{sensorPath} -+ .parent_path() -+ .filename()); -+ -+ for (const auto& [uri, dbusPath] : matchingUris) -+ { -+ asyncResp->res.jsonValue["MetricProperties"] -+ .push_back(uri); -+ } -+ -+ telemetry::fillMinMaxReadingRange( -+ asyncResp, serviceName, sensorPath); -+ }); -+ }); -+ }); -+} -+ -+} // namespace redfish -diff --git a/redfish-core/lib/telemetry_service.hpp b/redfish-core/lib/telemetry_service.hpp -index 8ecc591..027b51b 100644 ---- a/redfish-core/lib/telemetry_service.hpp -+++ b/redfish-core/lib/telemetry_service.hpp -@@ -18,11 +18,12 @@ inline void handleTelemetryServiceGet( - asyncResp->res.jsonValue["@odata.id"] = "/redfish/v1/TelemetryService"; - asyncResp->res.jsonValue["Id"] = "TelemetryService"; - asyncResp->res.jsonValue["Name"] = "Telemetry Service"; -- - asyncResp->res.jsonValue["MetricReportDefinitions"]["@odata.id"] = - "/redfish/v1/TelemetryService/MetricReportDefinitions"; - asyncResp->res.jsonValue["MetricReports"]["@odata.id"] = - "/redfish/v1/TelemetryService/MetricReports"; -+ asyncResp->res.jsonValue["MetricDefinitions"]["@odata.id"] = -+ "/redfish/v1/TelemetryService/MetricDefinitions"; - - crow::connections::systemBus->async_method_call( - [asyncResp](const boost::system::error_code ec, --- -2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-POST-on-TriggersCollection.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-POST-on-TriggersCollection.patch new file mode 100644 index 000000000..b0cf44cb2 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-POST-on-TriggersCollection.patch @@ -0,0 +1,889 @@ +From 008cc1b35ccb1508d3c71ff5c6cfc6c772f1744c Mon Sep 17 00:00:00 2001 +From: Szymon Dompke +Date: Wed, 17 Nov 2021 18:18:16 +0100 +Subject: [PATCH] Add support for POST on TriggersCollection +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Added POST method on /redfish/v1/TelemetryService/Triggers uri, which +creates new trigger in telemetry service, by using dbus call AddTrigger. + +By DMTF, most of the properties are not required, and as such are +treated as optional. Some values can be deduced from others (like +'MetricType', depending on 'DiscreteTriggers' or 'NumericThresholds'). +All properties provided in POST body by user will be verified against +each other, and errors will be raised. Few examples of such situations: +- 'MetricType' is set to 'Discrete' but 'NumericThresholds' was passed. +- 'MetricType' is set to 'Numeric' but "DiscreteTriggers' or + 'DiscreteTriggerCondition' were passed +- 'DiscreteTriggerCondition' is set to 'Specified' but + 'DiscreteTriggers' is an empty array or was not passed. +- 'DiscreteTriggerCondition' is set to 'Changed' but 'DiscreteTriggers' + is passed and is not an empty array. + +Example 1 – Trigger with discrete values: +{ + "Id": "TestTrigger", + "MetricType": "Discrete", + "TriggerActions": [ + "RedfishEvent" + ], + "DiscreteTriggerCondition": "Specified", + "DiscreteTriggers": [ + { + "Value": "55.88", + "DwellTime": "PT0.001S", + "Severity": "Warning" + }, + { + "Name": "My discrete trigger", + "Value": "55.88", + "DwellTime": "PT0.001S", + "Severity": "OK" + }, + { + "Value": "55.88", + "DwellTime": "PT0.001S", + "Severity": "Critical" + } + ], + "MetricProperties": [ + "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/0/Reading" + ], + "Links": { + "MetricReportDefinitions": [] + } +} + +Example 2 – trigger with numeric threshold: +{ + "Id": "TestTrigger2", + "Name": "My Numeric Trigger", + "MetricType": "Numeric", + "TriggerActions": [ + "RedfishEvent", + "RedfishMetricReport" + ], + "NumericThresholds": { + "UpperCritical": { + "Reading": 50, + "Activation": "Increasing", + "DwellTime": "PT0.001S" + }, + "UpperWarning": { + "Reading": 48.1, + "Activation": "Increasing", + "DwellTime": "PT0.004S" + } + }, + "MetricProperties": [ + "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/0/Reading", + "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/17/Reading" + ], + "Links": { + "MetricReportDefinitions": [ + "/redfish/v1/TelemetryService/MetricReportDefinitions/PowerMetrics", + "/redfish/v1/TelemetryService/MetricReportDefinitions/PowerMetricStats", + "/redfish/v1/TelemetryService/MetricReportDefinitions/PlatformPowerUsage" + ] + } +} + +Tested: +- Triggers were successfully created with above example message bodies. + This can be checked by calling: + 'busctl tree xyz.openbmc_project.Telemetry'. +- Expected errors were returned for messages with incorrect or mutually + exclusive properties and incorrect values. +- Redfish service validator is passing. + +Signed-off-by: Szymon Dompke +Change-Id: Ief8c76de8aa660ae0d2dbe4610c26a28186a290a +--- + redfish-core/include/utils/finalizer.hpp | 35 ++ + .../include/utils/telemetry_utils.hpp | 82 +++ + redfish-core/lib/metric_report_definition.hpp | 31 +- + redfish-core/lib/trigger.hpp | 526 +++++++++++++++++- + 4 files changed, 642 insertions(+), 32 deletions(-) + create mode 100644 redfish-core/include/utils/finalizer.hpp + +diff --git a/redfish-core/include/utils/finalizer.hpp b/redfish-core/include/utils/finalizer.hpp +new file mode 100644 +index 0000000..cb98507 +--- /dev/null ++++ b/redfish-core/include/utils/finalizer.hpp +@@ -0,0 +1,35 @@ ++#pragma once ++ ++#include ++ ++namespace redfish ++{ ++ ++namespace utils ++{ ++ ++class Finalizer ++{ ++ public: ++ Finalizer() = delete; ++ Finalizer(std::function finalizer) : finalizer(std::move(finalizer)) ++ {} ++ ++ Finalizer(const Finalizer&) = delete; ++ Finalizer(Finalizer&&) = delete; ++ ++ ~Finalizer() ++ { ++ if (finalizer) ++ { ++ finalizer(); ++ } ++ } ++ ++ private: ++ std::function finalizer; ++}; ++ ++} // namespace utils ++ ++} // namespace redfish +\ No newline at end of file +diff --git a/redfish-core/include/utils/telemetry_utils.hpp b/redfish-core/include/utils/telemetry_utils.hpp +index 8aeff0d..c68e40c 100644 +--- a/redfish-core/include/utils/telemetry_utils.hpp ++++ b/redfish-core/include/utils/telemetry_utils.hpp +@@ -13,6 +13,9 @@ constexpr const char* metricReportDefinitionUri = + "/redfish/v1/TelemetryService/MetricReportDefinitions"; + constexpr const char* metricReportUri = + "/redfish/v1/TelemetryService/MetricReports"; ++constexpr const char* triggerInterface = ++ "xyz.openbmc_project.Telemetry.Trigger"; ++constexpr const char* triggerUri = "/redfish/v1/TelemetryService/Triggers"; + + inline std::string getDbusReportPath(const std::string& id) + { +@@ -28,5 +31,84 @@ inline std::string getDbusTriggerPath(const std::string& id) + return {triggersPath / id}; + } + ++inline std::optional ++ getReportNameFromReportDefinitionUri(const std::string& uri) ++{ ++ constexpr const char* uriPattern = ++ "/redfish/v1/TelemetryService/MetricReportDefinitions/"; ++ constexpr size_t idx = std::string_view(uriPattern).length(); ++ if (boost::starts_with(uri, uriPattern)) ++ { ++ return uri.substr(idx); ++ } ++ return std::nullopt; ++} ++ ++inline std::optional ++ getTriggerIdFromDbusPath(const std::string& dbusPath) ++{ ++ constexpr const char* triggerTree = ++ "/xyz/openbmc_project/Telemetry/Triggers/TelemetryService/"; ++ constexpr size_t idx = std::string_view(triggerTree).length(); ++ if (boost::starts_with(dbusPath, triggerTree)) ++ { ++ return dbusPath.substr(idx); ++ } ++ return std::nullopt; ++} ++ ++inline bool getChassisSensorNode( ++ const std::shared_ptr& asyncResp, ++ const std::vector& uris, ++ boost::container::flat_set>& matched) ++{ ++ size_t uriIdx = 0; ++ for (const std::string& uri : uris) ++ { ++ std::string chassis; ++ std::string node; ++ ++ if (!boost::starts_with(uri, "/redfish/v1/Chassis/") || ++ !dbus::utility::getNthStringFromPath(uri, 3, chassis) || ++ !dbus::utility::getNthStringFromPath(uri, 4, node)) ++ { ++ BMCWEB_LOG_ERROR << "Failed to get chassis and sensor Node " ++ "from " ++ << uri; ++ messages::propertyValueIncorrect(asyncResp->res, uri, ++ "MetricProperties/" + ++ std::to_string(uriIdx)); ++ return false; ++ } ++ ++ if (boost::ends_with(node, "#")) ++ { ++ node.pop_back(); ++ } ++ ++ matched.emplace(std::move(chassis), std::move(node)); ++ uriIdx++; ++ } ++ return true; ++} ++ ++inline std::optional ++ redfishActionToDbusAction(const std::string& redfishAction) ++{ ++ if (redfishAction == "RedfishMetricReport") ++ { ++ return "UpdateReport"; ++ } ++ if (redfishAction == "RedfishEvent") ++ { ++ return "RedfishEvent"; ++ } ++ if (redfishAction == "LogToLogService") ++ { ++ return "LogToLogService"; ++ } ++ return std::nullopt; ++} ++ + } // namespace telemetry + } // namespace redfish +diff --git a/redfish-core/lib/metric_report_definition.hpp b/redfish-core/lib/metric_report_definition.hpp +index cb38633..4007544 100644 +--- a/redfish-core/lib/metric_report_definition.hpp ++++ b/redfish-core/lib/metric_report_definition.hpp +@@ -217,7 +217,7 @@ inline bool getUserParameters(crow::Response& res, const crow::Request& req, + return true; + } + +-inline bool getChassisSensorNode( ++inline bool getChassisSensorNodeFromMetrics( + const std::shared_ptr& asyncResp, + const std::vector>>& + metrics, +@@ -225,30 +225,9 @@ inline bool getChassisSensorNode( + { + for (const auto& [id, uris] : metrics) + { +- for (size_t i = 0; i < uris.size(); i++) ++ if (!getChassisSensorNode(asyncResp, uris, matched)) + { +- const std::string& uri = uris[i]; +- std::string chassis; +- std::string node; +- +- if (!boost::starts_with(uri, "/redfish/v1/Chassis/") || +- !dbus::utility::getNthStringFromPath(uri, 3, chassis) || +- !dbus::utility::getNthStringFromPath(uri, 4, node)) +- { +- BMCWEB_LOG_ERROR +- << "Failed to get chassis and sensor Node from " << uri; +- messages::propertyValueIncorrect(asyncResp->res, uri, +- "MetricProperties/" + +- std::to_string(i)); +- return false; +- } +- +- if (boost::ends_with(node, "#")) +- { +- node.pop_back(); +- } +- +- matched.emplace(std::move(chassis), std::move(node)); ++ return false; + } + } + return true; +@@ -382,8 +361,8 @@ inline void requestRoutesMetricReportDefinitionCollection(App& app) + + boost::container::flat_set> + chassisSensors; +- if (!telemetry::getChassisSensorNode(asyncResp, args.metrics, +- chassisSensors)) ++ if (!telemetry::getChassisSensorNodeFromMetrics( ++ asyncResp, args.metrics, chassisSensors)) + { + return; + } +diff --git a/redfish-core/lib/trigger.hpp b/redfish-core/lib/trigger.hpp +index 210468c..01c150e 100644 +--- a/redfish-core/lib/trigger.hpp ++++ b/redfish-core/lib/trigger.hpp +@@ -1,7 +1,9 @@ + #pragma once + +-#include "utils/collection.hpp" ++#include "sensors.hpp" ++#include "utils/finalizer.hpp" + #include "utils/telemetry_utils.hpp" ++#include "utils/time_utils.hpp" + + #include + #include +@@ -14,9 +16,10 @@ namespace redfish + { + namespace telemetry + { +-constexpr const char* triggerInterface = +- "xyz.openbmc_project.Telemetry.Trigger"; +-constexpr const char* triggerUri = "/redfish/v1/TelemetryService/Triggers"; ++ ++static constexpr std::array ++ supportedNumericThresholdNames = {"UpperCritical", "LowerCritical", ++ "UpperWarning", "LowerWarning"}; + + using NumericThresholdParams = + std::tuple; +@@ -24,6 +27,10 @@ using NumericThresholdParams = + using DiscreteThresholdParams = + std::tuple; + ++using TriggerThresholdParams = ++ std::variant, ++ std::vector>; ++ + using TriggerThresholdParamsExt = + std::variant, + std::vector>; +@@ -35,6 +42,455 @@ using TriggerGetParamsVariant = + std::variant>; + ++namespace add_trigger ++{ ++ ++enum class MetricType ++{ ++ Discrete, ++ Numeric ++}; ++ ++enum class DiscreteCondition ++{ ++ Specified, ++ Changed ++}; ++ ++struct Context ++{ ++ struct ++ { ++ std::string id; ++ std::string name; ++ std::vector actions; ++ std::vector> ++ sensors; ++ std::vector reportNames; ++ TriggerThresholdParams thresholds; ++ } dbusArgs; ++ ++ struct ++ { ++ std::optional discreteCondition; ++ std::optional metricType; ++ std::optional> metricProperties; ++ } parsedInfo; ++ ++ boost::container::flat_map uriToDbusMerged{}; ++}; ++ ++inline std::optional getMetricType(const std::string& metricType) ++{ ++ if (metricType == "Discrete") ++ { ++ return MetricType::Discrete; ++ } ++ if (metricType == "Numeric") ++ { ++ return MetricType::Numeric; ++ } ++ return std::nullopt; ++} ++ ++inline std::optional ++ getDiscreteCondition(const std::string& discreteTriggerCondition) ++{ ++ if (discreteTriggerCondition == "Specified") ++ { ++ return DiscreteCondition::Specified; ++ } ++ if (discreteTriggerCondition == "Changed") ++ { ++ return DiscreteCondition::Changed; ++ } ++ return std::nullopt; ++} ++ ++inline bool parseNumericThresholds(crow::Response& res, ++ nlohmann::json& numericThresholds, ++ Context& ctx) ++{ ++ if (!numericThresholds.is_object()) ++ { ++ messages::propertyValueTypeError(res, numericThresholds.dump(), ++ "NumericThresholds"); ++ return false; ++ } ++ ++ std::vector parsedParams; ++ parsedParams.reserve(numericThresholds.size()); ++ ++ for (auto& [thresholdName, thresholdData] : numericThresholds.items()) ++ { ++ if (std::find(supportedNumericThresholdNames.begin(), ++ supportedNumericThresholdNames.end(), ++ thresholdName) == supportedNumericThresholdNames.end()) ++ { ++ messages::propertyUnknown(res, thresholdName); ++ return false; ++ } ++ ++ double reading = .0; ++ std::string activation; ++ std::string dwellTimeStr; ++ ++ if (!json_util::readJson(thresholdData, res, "Reading", reading, ++ "Activation", activation, "DwellTime", ++ dwellTimeStr)) ++ { ++ return false; ++ } ++ ++ std::optional dwellTime = ++ time_utils::fromDurationString(dwellTimeStr); ++ if (!dwellTime) ++ { ++ messages::propertyValueIncorrect(res, "DwellTime", dwellTimeStr); ++ return false; ++ } ++ ++ parsedParams.emplace_back(thresholdName, ++ static_cast(dwellTime->count()), ++ activation, reading); ++ } ++ ++ ctx.dbusArgs.thresholds = std::move(parsedParams); ++ return true; ++} ++ ++inline bool parseDiscreteTriggers( ++ crow::Response& res, ++ std::optional>& discreteTriggers, Context& ctx) ++{ ++ std::vector parsedParams; ++ if (!discreteTriggers) ++ { ++ ctx.dbusArgs.thresholds = std::move(parsedParams); ++ return true; ++ } ++ ++ parsedParams.reserve(discreteTriggers->size()); ++ for (nlohmann::json& thresholdInfo : *discreteTriggers) ++ { ++ std::optional name; ++ std::string value; ++ std::string dwellTimeStr; ++ std::string severity; ++ ++ if (!json_util::readJson(thresholdInfo, res, "Name", name, "Value", ++ value, "DwellTime", dwellTimeStr, "Severity", ++ severity)) ++ { ++ return false; ++ } ++ ++ std::optional dwellTime = ++ time_utils::fromDurationString(dwellTimeStr); ++ if (!dwellTime) ++ { ++ messages::propertyValueIncorrect(res, "DwellTime", dwellTimeStr); ++ return false; ++ } ++ ++ if (!name) ++ { ++ name = ""; ++ } ++ ++ parsedParams.emplace_back( ++ *name, severity, static_cast(dwellTime->count()), value); ++ } ++ ++ ctx.dbusArgs.thresholds = std::move(parsedParams); ++ return true; ++} ++ ++inline bool parseTriggerThresholds( ++ crow::Response& res, ++ std::optional>& discreteTriggers, ++ std::optional& numericThresholds, Context& ctx) ++{ ++ if (discreteTriggers && numericThresholds) ++ { ++ messages::mutualExclusiveProperties(res, "DiscreteTriggers", ++ "NumericThresholds"); ++ return false; ++ } ++ ++ if (ctx.parsedInfo.discreteCondition) ++ { ++ if (numericThresholds) ++ { ++ messages::mutualExclusiveProperties(res, "DiscreteTriggerCondition", ++ "NumericThresholds"); ++ return false; ++ } ++ } ++ ++ if (ctx.parsedInfo.metricType) ++ { ++ if (*ctx.parsedInfo.metricType == MetricType::Discrete && ++ numericThresholds) ++ { ++ messages::propertyValueConflict(res, "NumericThresholds", ++ "MetricType"); ++ return false; ++ } ++ if (*ctx.parsedInfo.metricType == MetricType::Numeric && ++ discreteTriggers) ++ { ++ messages::propertyValueConflict(res, "DiscreteTriggers", ++ "MetricType"); ++ return false; ++ } ++ if (*ctx.parsedInfo.metricType == MetricType::Numeric && ++ ctx.parsedInfo.discreteCondition) ++ { ++ messages::propertyValueConflict(res, "DiscreteTriggers", ++ "DiscreteTriggerCondition"); ++ return false; ++ } ++ } ++ ++ if (discreteTriggers || ctx.parsedInfo.discreteCondition || ++ (ctx.parsedInfo.metricType && ++ *ctx.parsedInfo.metricType == MetricType::Discrete)) ++ { ++ if (ctx.parsedInfo.discreteCondition) ++ { ++ if (*ctx.parsedInfo.discreteCondition == ++ DiscreteCondition::Specified && ++ !discreteTriggers) ++ { ++ messages::createFailedMissingReqProperties(res, ++ "DiscreteTriggers"); ++ return false; ++ } ++ if (discreteTriggers && ((*ctx.parsedInfo.discreteCondition == ++ DiscreteCondition::Specified && ++ discreteTriggers->empty()) || ++ (*ctx.parsedInfo.discreteCondition == ++ DiscreteCondition::Changed && ++ !discreteTriggers->empty()))) ++ { ++ messages::propertyValueConflict(res, "DiscreteTriggers", ++ "DiscreteTriggerCondition"); ++ return false; ++ } ++ } ++ if (!parseDiscreteTriggers(res, discreteTriggers, ctx)) ++ { ++ return false; ++ } ++ } ++ else if (numericThresholds) ++ { ++ if (!parseNumericThresholds(res, *numericThresholds, ctx)) ++ { ++ return false; ++ } ++ } ++ else ++ { ++ messages::createFailedMissingReqProperties( ++ res, "'DiscreteTriggers', 'NumericThresholds', " ++ "'DiscreteTriggerCondition' or 'MetricType'"); ++ return false; ++ } ++ return true; ++} ++ ++inline bool parseLinks(crow::Response& res, nlohmann::json& links, Context& ctx) ++{ ++ if (links.empty()) ++ { ++ return true; ++ } ++ ++ std::optional> metricReportDefinitions; ++ if (!json_util::readJson(links, res, "MetricReportDefinitions", ++ metricReportDefinitions)) ++ { ++ return false; ++ } ++ ++ if (metricReportDefinitions) ++ { ++ ctx.dbusArgs.reportNames.reserve(metricReportDefinitions->size()); ++ for (std::string& reportDefinionUri : *metricReportDefinitions) ++ { ++ std::optional reportName = ++ getReportNameFromReportDefinitionUri(reportDefinionUri); ++ if (!reportName) ++ { ++ messages::propertyValueIncorrect(res, "MetricReportDefinitions", ++ reportDefinionUri); ++ return false; ++ } ++ ctx.dbusArgs.reportNames.push_back(*reportName); ++ } ++ } ++ return true; ++} ++ ++inline bool parseMetricProperties(crow::Response& res, Context& ctx) ++{ ++ if (!ctx.parsedInfo.metricProperties) ++ { ++ return true; ++ } ++ ++ ctx.dbusArgs.sensors.reserve(ctx.parsedInfo.metricProperties->size()); ++ ++ size_t uriIdx = 0; ++ for (const std::string& uri : *ctx.parsedInfo.metricProperties) ++ { ++ auto el = ctx.uriToDbusMerged.find(uri); ++ if (el == ctx.uriToDbusMerged.end()) ++ { ++ BMCWEB_LOG_ERROR << "Failed to find DBus sensor " ++ "corsresponding to URI " ++ << uri; ++ messages::propertyValueNotInList( ++ res, uri, "MetricProperties/" + std::to_string(uriIdx)); ++ return false; ++ } ++ ++ const std::string& dbusPath = el->second; ++ ctx.dbusArgs.sensors.emplace_back(dbusPath, uri); ++ uriIdx++; ++ } ++ return true; ++} ++ ++inline bool parsePostTriggerParams(crow::Response& res, ++ const crow::Request& req, Context& ctx) ++{ ++ std::optional id; ++ std::optional name; ++ std::optional metricType; ++ std::optional> triggerActions; ++ std::optional discreteTriggerCondition; ++ std::optional> discreteTriggers; ++ std::optional numericThresholds; ++ std::optional links; ++ if (!json_util::readJson( ++ req, res, "Id", id, "Name", name, "MetricType", metricType, ++ "TriggerActions", triggerActions, "DiscreteTriggerCondition", ++ discreteTriggerCondition, "DiscreteTriggers", discreteTriggers, ++ "NumericThresholds", numericThresholds, "MetricProperties", ++ ctx.parsedInfo.metricProperties, "Links", links)) ++ { ++ return false; ++ } ++ ++ ctx.dbusArgs.id = id.value_or(""); ++ ctx.dbusArgs.name = name.value_or(""); ++ ++ if (metricType) ++ { ++ if (!(ctx.parsedInfo.metricType = getMetricType(*metricType))) ++ { ++ messages::propertyValueIncorrect(res, "MetricType", *metricType); ++ return false; ++ } ++ } ++ ++ if (discreteTriggerCondition) ++ { ++ if (!(ctx.parsedInfo.discreteCondition = ++ getDiscreteCondition(*discreteTriggerCondition))) ++ { ++ messages::propertyValueIncorrect(res, "DiscreteTriggerCondition", ++ *discreteTriggerCondition); ++ return false; ++ } ++ } ++ ++ if (triggerActions) ++ { ++ ctx.dbusArgs.actions.reserve(triggerActions->size()); ++ for (const std::string& action : *triggerActions) ++ { ++ if (const std::optional& dbusAction = ++ redfishActionToDbusAction(action)) ++ { ++ ctx.dbusArgs.actions.emplace_back(*dbusAction); ++ } ++ else ++ { ++ messages::propertyValueNotInList(res, action, "TriggerActions"); ++ return false; ++ } ++ } ++ } ++ ++ if (!parseTriggerThresholds(res, discreteTriggers, numericThresholds, ctx)) ++ { ++ return false; ++ } ++ ++ if (links) ++ { ++ if (!parseLinks(res, *links, ctx)) ++ { ++ return false; ++ } ++ } ++ return true; ++} ++ ++inline void createTrigger(const std::shared_ptr& asyncResp, ++ Context& ctx) ++{ ++ crow::connections::systemBus->async_method_call( ++ [aResp = asyncResp, id = ctx.dbusArgs.id]( ++ const boost::system::error_code ec, const std::string& dbusPath) { ++ if (ec == boost::system::errc::file_exists) ++ { ++ messages::resourceAlreadyExists(aResp->res, "Trigger", "Id", ++ id); ++ return; ++ } ++ if (ec == boost::system::errc::too_many_files_open) ++ { ++ messages::createLimitReachedForResource(aResp->res); ++ return; ++ } ++ if (ec) ++ { ++ messages::internalError(aResp->res); ++ BMCWEB_LOG_ERROR << "respHandler DBus error " << ec; ++ return; ++ } ++ ++ const std::optional& triggerId = ++ getTriggerIdFromDbusPath(dbusPath); ++ if (!triggerId) ++ { ++ messages::internalError(aResp->res); ++ BMCWEB_LOG_ERROR << "Unknown data returned by " ++ "AddTrigger DBus method"; ++ return; ++ } ++ ++ messages::created(aResp->res); ++ aResp->res.addHeader("Location", ++ triggerUri + std::string("/") + *triggerId); ++ }, ++ service, "/xyz/openbmc_project/Telemetry/Triggers", ++ "xyz.openbmc_project.Telemetry.TriggerManager", "AddTrigger", ++ "TelemetryService/" + ctx.dbusArgs.id, ctx.dbusArgs.name, ++ ctx.dbusArgs.actions, ctx.dbusArgs.sensors, ctx.dbusArgs.reportNames, ++ ctx.dbusArgs.thresholds); ++} ++ ++} // namespace add_trigger ++ ++namespace get_trigger ++{ ++ + inline std::optional + getRedfishFromDbusAction(const std::string& dbusAction) + { +@@ -270,6 +726,8 @@ inline bool fillTrigger( + return true; + } + ++} // namespace get_trigger ++ + } // namespace telemetry + + inline void requestRoutesTriggerCollection(App& app) +@@ -290,6 +748,62 @@ inline void requestRoutesTriggerCollection(App& app) + asyncResp, telemetry::triggerUri, interfaces, + "/xyz/openbmc_project/Telemetry/Triggers/TelemetryService"); + }); ++ ++ BMCWEB_ROUTE(app, "/redfish/v1/TelemetryService/Triggers/") ++ .privileges(redfish::privileges::postTriggersCollection) ++ .methods(boost::beast::http::verb::post)( ++ [](const crow::Request& req, ++ const std::shared_ptr& asyncResp) { ++ const auto ctx = ++ std::make_shared(); ++ if (!telemetry::add_trigger::parsePostTriggerParams( ++ asyncResp->res, req, *ctx)) ++ { ++ return; ++ } ++ ++ if (!ctx->parsedInfo.metricProperties || ++ ctx->parsedInfo.metricProperties->empty()) ++ { ++ telemetry::add_trigger::createTrigger(asyncResp, *ctx); ++ return; ++ } ++ ++ boost::container::flat_set> ++ chassisSensors; ++ if (!telemetry::getChassisSensorNode( ++ asyncResp, *ctx->parsedInfo.metricProperties, ++ chassisSensors)) ++ { ++ return; ++ } ++ ++ const auto finalizer = ++ std::make_shared([asyncResp, ctx] { ++ if (!telemetry::add_trigger::parseMetricProperties( ++ asyncResp->res, *ctx)) ++ { ++ return; ++ } ++ telemetry::add_trigger::createTrigger(asyncResp, *ctx); ++ }); ++ ++ for (const auto& [chassis, sensorType] : chassisSensors) ++ { ++ retrieveUriToDbusMap( ++ chassis, sensorType, ++ [asyncResp, ctx, ++ finalizer](const boost::beast::http::status status, ++ const boost::container::flat_map< ++ std::string, std::string>& uriToDbus) { ++ if (status == boost::beast::http::status::ok) ++ { ++ ctx->uriToDbusMerged.insert(uriToDbus.begin(), ++ uriToDbus.end()); ++ } ++ }); ++ } ++ }); + } + + inline void requestRoutesTrigger(App& app) +@@ -320,8 +834,8 @@ inline void requestRoutesTrigger(App& app) + return; + } + +- if (!telemetry::fillTrigger(asyncResp->res.jsonValue, +- id, ret)) ++ if (!telemetry::get_trigger::fillTrigger( ++ asyncResp->res.jsonValue, id, ret)) + { + messages::internalError(asyncResp->res); + } +-- +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Sync-Telmetry-service-with-EventService.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Sync-Telmetry-service-with-EventService.patch new file mode 100644 index 000000000..f86f48528 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Sync-Telmetry-service-with-EventService.patch @@ -0,0 +1,284 @@ +From 383848b9088056371743a28eb1f9a3ed415dc46b Mon Sep 17 00:00:00 2001 +From: "Wludzik, Jozef" +Date: Tue, 15 Dec 2020 12:30:31 +0100 +Subject: [PATCH] Sync Telmetry service with EventService + +Synced the latest changes in Telemetry service with Event Service +code. Now assembling MetricReport is covered in single place in +code. Updated method of fetching Readings from Telemetry by +Event Service. Using ReportUpdate signal is no longer +supported. Now Event Service monitors for PropertiesChanged signal +from /xyz/openbmc_project/Telemetry/Reports path. + +Tested: + - Verified that EventListener received MetricReport response from + Event Service in insecure http push style eventing mode + +Change-Id: I2fc1841a6c9259a8bff30b34bddc0d4aabd41912 +Signed-off-by: Wludzik, Jozef +Signed-off-by: Lukasz Kazmierczak +--- + .../include/event_service_manager.hpp | 135 ++++++------------ + redfish-core/lib/metric_report.hpp | 29 ++-- + 2 files changed, 59 insertions(+), 105 deletions(-) + +diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp +index 010c991..38ab879 100644 +--- a/redfish-core/include/event_service_manager.hpp ++++ b/redfish-core/include/event_service_manager.hpp +@@ -14,6 +14,7 @@ + // limitations under the License. + */ + #pragma once ++#include "metric_report.hpp" + #include "registries.hpp" + #include "registries/base_message_registry.hpp" + #include "registries/openbmc_message_registry.hpp" +@@ -503,47 +504,32 @@ class Subscription : public persistent_data::UserSubscription + } + #endif + +- void filterAndSendReports(const std::string& id2, +- const std::string& readingsTs, +- const ReadingsObjType& readings) ++ void filterAndSendReports( ++ const std::string& id, ++ const std::variant& var) + { +- std::string metricReportDef = +- "/redfish/v1/TelemetryService/MetricReportDefinitions/" + id2; ++ std::string mrdUri = telemetry::metricReportDefinitionUri + id; + + // Empty list means no filter. Send everything. + if (metricReportDefinitions.size()) + { + if (std::find(metricReportDefinitions.begin(), + metricReportDefinitions.end(), +- metricReportDef) == metricReportDefinitions.end()) ++ mrdUri) == metricReportDefinitions.end()) + { + return; + } + } + +- nlohmann::json metricValuesArray = nlohmann::json::array(); +- for (const auto& it : readings) ++ nlohmann::json msg; ++ if (!telemetry::fillReport(msg, id, var)) + { +- metricValuesArray.push_back({}); +- nlohmann::json& entry = metricValuesArray.back(); +- +- auto& [id, property, value, timestamp] = it; +- +- entry = {{"MetricId", id}, +- {"MetricProperty", property}, +- {"MetricValue", std::to_string(value)}, +- {"Timestamp", crow::utility::getDateTime(timestamp)}}; ++ BMCWEB_LOG_ERROR << "Failed to fill the MetricReport for DBus " ++ "Report with id " ++ << id; ++ return; + } + +- nlohmann::json msg = { +- {"@odata.id", "/redfish/v1/TelemetryService/MetricReports/" + id}, +- {"@odata.type", "#MetricReport.v1_3_0.MetricReport"}, +- {"Id", id2}, +- {"Name", id2}, +- {"Timestamp", readingsTs}, +- {"MetricReportDefinition", {{"@odata.id", metricReportDef}}}, +- {"MetricValues", metricValuesArray}}; +- + this->sendEvent( + msg.dump(2, ' ', true, nlohmann::json::error_handler_t::replace)); + } +@@ -1309,73 +1295,43 @@ class EventServiceManager + } + + #endif +- +- void getMetricReading(const std::string& service, +- const std::string& objPath, const std::string& intf) ++ void getReadingsForReport(sdbusplus::message::message& msg) + { +- std::size_t found = objPath.find_last_of('/'); +- if (found == std::string::npos) ++ sdbusplus::message::object_path path(msg.get_path()); ++ std::string id = path.filename(); ++ if (id.empty()) + { +- BMCWEB_LOG_DEBUG << "Invalid objPath received"; ++ BMCWEB_LOG_ERROR << "Failed to get Id from path"; + return; + } + +- std::string idStr = objPath.substr(found + 1); +- if (idStr.empty()) ++ std::string interface; ++ std::vector< ++ std::pair>> ++ props; ++ std::vector invalidProps; ++ msg.read(interface, props, invalidProps); ++ ++ auto found = ++ std::find_if(props.begin(), props.end(), ++ [](const auto& x) { return x.first == "Readings"; }); ++ if (found == props.end()) + { +- BMCWEB_LOG_DEBUG << "Invalid ID in objPath"; ++ BMCWEB_LOG_INFO << "Failed to get Readings from Report properties"; + return; + } + +- crow::connections::systemBus->async_method_call( +- [idStr{std::move(idStr)}]( +- const boost::system::error_code ec, +- boost::container::flat_map< +- std::string, std::variant>& +- resp) { +- if (ec) +- { +- BMCWEB_LOG_DEBUG +- << "D-Bus call failed to GetAll metric readings."; +- return; +- } +- +- const int32_t* timestampPtr = +- std::get_if(&resp["Timestamp"]); +- if (!timestampPtr) +- { +- BMCWEB_LOG_DEBUG << "Failed to Get timestamp."; +- return; +- } +- +- ReadingsObjType* readingsPtr = +- std::get_if(&resp["Readings"]); +- if (!readingsPtr) +- { +- BMCWEB_LOG_DEBUG << "Failed to Get Readings property."; +- return; +- } +- +- if (!readingsPtr->size()) +- { +- BMCWEB_LOG_DEBUG << "No metrics report to be transferred"; +- return; +- } +- +- for (const auto& it : +- EventServiceManager::getInstance().subscriptionsMap) +- { +- std::shared_ptr entry = it.second; +- if (entry->eventFormatType == metricReportFormatType) +- { +- entry->filterAndSendReports( +- idStr, crow::utility::getDateTime(*timestampPtr), +- *readingsPtr); +- } +- } +- }, +- service, objPath, "org.freedesktop.DBus.Properties", "GetAll", +- intf); ++ const std::variant& readings = ++ found->second; ++ for (const auto& it : ++ EventServiceManager::getInstance().subscriptionsMap) ++ { ++ Subscription& entry = *it.second.get(); ++ if (entry.eventFormatType == metricReportFormatType) ++ { ++ entry.filterAndSendReports(id, readings); ++ } ++ } + } + + void unregisterMetricReportSignal() +@@ -1397,9 +1353,9 @@ class EventServiceManager + } + + BMCWEB_LOG_DEBUG << "Metrics report signal - Register"; +- std::string matchStr( +- "type='signal',member='ReportUpdate', " +- "interface='xyz.openbmc_project.MonitoringService.Report'"); ++ std::string matchStr = "type='signal',member='PropertiesChanged'," ++ "interface='org.freedesktop.DBus.Properties'," ++ "arg0=xyz.openbmc_project.Telemetry.Report"; + + matchTelemetryMonitor = std::make_shared( + *crow::connections::systemBus, matchStr, +@@ -1410,10 +1366,7 @@ class EventServiceManager + return; + } + +- std::string service = msg.get_sender(); +- std::string objPath = msg.get_path(); +- std::string intf = msg.get_interface(); +- getMetricReading(service, objPath, intf); ++ getReadingsForReport(msg); + }); + } + +diff --git a/redfish-core/lib/metric_report.hpp b/redfish-core/lib/metric_report.hpp +index 159968a..c959495 100644 +--- a/redfish-core/lib/metric_report.hpp ++++ b/redfish-core/lib/metric_report.hpp +@@ -34,17 +34,14 @@ inline nlohmann::json toMetricValues(const Readings& readings) + return metricValues; + } + +-inline void fillReport(const std::shared_ptr& asyncResp, +- const std::string& id, ++inline bool fillReport(nlohmann::json& json, const std::string& id, + const std::variant& var) + { +- asyncResp->res.jsonValue["@odata.type"] = +- "#MetricReport.v1_3_0.MetricReport"; +- asyncResp->res.jsonValue["@odata.id"] = +- telemetry::metricReportUri + std::string("/") + id; +- asyncResp->res.jsonValue["Id"] = id; +- asyncResp->res.jsonValue["Name"] = id; +- asyncResp->res.jsonValue["MetricReportDefinition"]["@odata.id"] = ++ json["@odata.type"] = "#MetricReport.v1_3_0.MetricReport"; ++ json["@odata.id"] = telemetry::metricReportUri + std::string("/") + id; ++ json["Id"] = id; ++ json["Name"] = id; ++ json["MetricReportDefinition"]["@odata.id"] = + telemetry::metricReportDefinitionUri + std::string("/") + id; + + const TimestampReadings* timestampReadings = +@@ -52,14 +49,14 @@ inline void fillReport(const std::shared_ptr& asyncResp, + if (!timestampReadings) + { + BMCWEB_LOG_ERROR << "Property type mismatch or property is missing"; +- messages::internalError(asyncResp->res); +- return; ++ return false; + } + + const auto& [timestamp, readings] = *timestampReadings; +- asyncResp->res.jsonValue["Timestamp"] = ++ json["Timestamp"] = + crow::utility::getDateTime(static_cast(timestamp)); +- asyncResp->res.jsonValue["MetricValues"] = toMetricValues(readings); ++ json["MetricValues"] = toMetricValues(readings); ++ return true; + } + } // namespace telemetry + +@@ -122,7 +119,11 @@ inline void requestRoutesMetricReport(App& app) + return; + } + +- telemetry::fillReport(asyncResp, id, ret); ++ if (!telemetry::fillReport( ++ asyncResp->res.jsonValue, id, ret)) ++ { ++ messages::internalError(asyncResp->res); ++ } + }, + telemetry::service, reportPath, + "org.freedesktop.DBus.Properties", "Get", +-- +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Revert-Remove-LogService-from-TelemetryService.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Revert-Remove-LogService-from-TelemetryService.patch new file mode 100644 index 000000000..6b57dc912 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Revert-Remove-LogService-from-TelemetryService.patch @@ -0,0 +1,26 @@ +From 71b55e9773c387d6510650e7cf64f050a853ac77 Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny +Date: Tue, 30 Nov 2021 16:29:12 +0100 +Subject: [PATCH] Revert "Remove LogService from TelemetryService" + +This reverts commit 2b3da45876aac57a36d3093379a992d699e7e396. +--- + redfish-core/lib/telemetry_service.hpp | 2 + + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/redfish-core/lib/telemetry_service.hpp b/redfish-core/lib/telemetry_service.hpp +index b79a5cd..e3e4a25 100644 +--- a/redfish-core/lib/telemetry_service.hpp ++++ b/redfish-core/lib/telemetry_service.hpp +@@ -25,6 +25,8 @@ inline void handleTelemetryServiceGet( + "/redfish/v1/TelemetryService/MetricReports"; + asyncResp->res.jsonValue["Triggers"]["@odata.id"] = + "/redfish/v1/TelemetryService/Triggers"; ++ asyncResp->res.jsonValue["LogService"]["@odata.id"] = ++ "/redfish/v1/Managers/bmc/LogServices/Journal"; + + crow::connections::systemBus->async_method_call( + [asyncResp](const boost::system::error_code ec, +-- +2.25.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Sync-Telmetry-service-with-EventService.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Sync-Telmetry-service-with-EventService.patch deleted file mode 100644 index 3088a7f9d..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Sync-Telmetry-service-with-EventService.patch +++ /dev/null @@ -1,295 +0,0 @@ -From 541353a4e4b06de42b6a9a400629f5a5fba04e86 Mon Sep 17 00:00:00 2001 -From: "Wludzik, Jozef" -Date: Tue, 15 Dec 2020 12:30:31 +0100 -Subject: [PATCH] Sync Telmetry service with EventService - -Synced the latest changes in Telemetry service with Event Service -code. Now assembling MetricReport is covered in single place in -code. Updated method of fetching Readings from Telemetry by -Event Service. Using ReportUpdate signal is no longer -supported. Now Event Service monitors for PropertiesChanged signal -from /xyz/openbmc_project/Telemetry/Reports path. - -Tested: - - Verified that EventListener received MetricReport response from - Event Service in insecure http push style eventing mode - -Change-Id: I2fc1841a6c9259a8bff30b34bddc0d4aabd41912 -Signed-off-by: Wludzik, Jozef -Signed-off-by: Lukasz Kazmierczak ---- - .../include/event_service_manager.hpp | 156 ++++++------------ - redfish-core/lib/metric_report.hpp | 28 ++-- - 2 files changed, 69 insertions(+), 115 deletions(-) - -diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index 3f398d7..cf9f658 100644 ---- a/redfish-core/include/event_service_manager.hpp -+++ b/redfish-core/include/event_service_manager.hpp -@@ -14,6 +14,7 @@ - // limitations under the License. - */ - #pragma once -+#include "metric_report.hpp" - #include "registries.hpp" - #include "registries/base_message_registry.hpp" - #include "registries/openbmc_message_registry.hpp" -@@ -511,47 +512,32 @@ class Subscription : public persistent_data::UserSubscription - } - #endif - -- void filterAndSendReports(const std::string& id2, -- const std::string& readingsTs, -- const ReadingsObjType& readings) -+ void filterAndSendReports( -+ const std::string& id, -+ const std::variant& var) - { -- std::string metricReportDef = -- "/redfish/v1/TelemetryService/MetricReportDefinitions/" + id2; -+ std::string mrdUri = telemetry::metricReportDefinitionUri + id; - - // Empty list means no filter. Send everything. - if (metricReportDefinitions.size()) - { - if (std::find(metricReportDefinitions.begin(), - metricReportDefinitions.end(), -- metricReportDef) == metricReportDefinitions.end()) -+ mrdUri) == metricReportDefinitions.end()) - { - return; - } - } - -- nlohmann::json metricValuesArray = nlohmann::json::array(); -- for (const auto& it : readings) -+ nlohmann::json msg; -+ if (!telemetry::fillReport(msg, id, var)) - { -- metricValuesArray.push_back({}); -- nlohmann::json& entry = metricValuesArray.back(); -- -- auto& [id, property, value, timestamp] = it; -- -- entry = {{"MetricId", id}, -- {"MetricProperty", property}, -- {"MetricValue", std::to_string(value)}, -- {"Timestamp", crow::utility::getDateTime(timestamp)}}; -+ BMCWEB_LOG_ERROR << "Failed to fill the MetricReport for DBus " -+ "Report with id " -+ << id; -+ return; - } - -- nlohmann::json msg = { -- {"@odata.id", "/redfish/v1/TelemetryService/MetricReports/" + id}, -- {"@odata.type", "#MetricReport.v1_3_0.MetricReport"}, -- {"Id", id2}, -- {"Name", id2}, -- {"Timestamp", readingsTs}, -- {"MetricReportDefinition", {{"@odata.id", metricReportDef}}}, -- {"MetricValues", metricValuesArray}}; -- - this->sendEvent( - msg.dump(2, ' ', true, nlohmann::json::error_handler_t::replace)); - } -@@ -1317,75 +1303,6 @@ class EventServiceManager - } - - #endif -- -- void getMetricReading(const std::string& service, -- const std::string& objPath, const std::string& intf) -- { -- std::size_t found = objPath.find_last_of('/'); -- if (found == std::string::npos) -- { -- BMCWEB_LOG_DEBUG << "Invalid objPath received"; -- return; -- } -- -- std::string idStr = objPath.substr(found + 1); -- if (idStr.empty()) -- { -- BMCWEB_LOG_DEBUG << "Invalid ID in objPath"; -- return; -- } -- -- crow::connections::systemBus->async_method_call( -- [idStr{std::move(idStr)}]( -- const boost::system::error_code ec, -- boost::container::flat_map< -- std::string, std::variant>& -- resp) { -- if (ec) -- { -- BMCWEB_LOG_DEBUG -- << "D-Bus call failed to GetAll metric readings."; -- return; -- } -- -- const int32_t* timestampPtr = -- std::get_if(&resp["Timestamp"]); -- if (!timestampPtr) -- { -- BMCWEB_LOG_DEBUG << "Failed to Get timestamp."; -- return; -- } -- -- ReadingsObjType* readingsPtr = -- std::get_if(&resp["Readings"]); -- if (!readingsPtr) -- { -- BMCWEB_LOG_DEBUG << "Failed to Get Readings property."; -- return; -- } -- -- if (!readingsPtr->size()) -- { -- BMCWEB_LOG_DEBUG << "No metrics report to be transferred"; -- return; -- } -- -- for (const auto& it : -- EventServiceManager::getInstance().subscriptionsMap) -- { -- std::shared_ptr entry = it.second; -- if (entry->eventFormatType == metricReportFormatType) -- { -- entry->filterAndSendReports( -- idStr, crow::utility::getDateTime(*timestampPtr), -- *readingsPtr); -- } -- } -- }, -- service, objPath, "org.freedesktop.DBus.Properties", "GetAll", -- intf); -- } -- - void unregisterMetricReportSignal() - { - if (matchTelemetryMonitor) -@@ -1405,9 +1322,11 @@ class EventServiceManager - } - - BMCWEB_LOG_DEBUG << "Metrics report signal - Register"; -- std::string matchStr( -- "type='signal',member='ReportUpdate', " -- "interface='xyz.openbmc_project.MonitoringService.Report'"); -+ std::string matchStr = "type='signal',member='PropertiesChanged'," -+ "interface='org.freedesktop.DBus.Properties'," -+ "path_namespace=/xyz/openbmc_project/Telemetry/" -+ "Reports/TelemetryService," -+ "arg0=xyz.openbmc_project.Telemetry.Report"; - - matchTelemetryMonitor = std::make_shared( - *crow::connections::systemBus, matchStr, -@@ -1418,10 +1337,43 @@ class EventServiceManager - return; - } - -- std::string service = msg.get_sender(); -- std::string objPath = msg.get_path(); -- std::string intf = msg.get_interface(); -- getMetricReading(service, objPath, intf); -+ sdbusplus::message::object_path path(msg.get_path()); -+ std::string id = path.filename(); -+ if (id.empty()) -+ { -+ BMCWEB_LOG_ERROR << "Failed to get Id from path"; -+ return; -+ } -+ -+ std::string intf; -+ std::vector>> -+ props; -+ std::vector invalidProps; -+ msg.read(intf, props, invalidProps); -+ -+ auto found = -+ std::find_if(props.begin(), props.end(), [](const auto& x) { -+ return x.first == "Readings"; -+ }); -+ if (found == props.end()) -+ { -+ BMCWEB_LOG_INFO -+ << "Failed to get Readings from Report properties"; -+ return; -+ } -+ -+ const std::variant& readings = -+ found->second; -+ for (const auto& it : -+ EventServiceManager::getInstance().subscriptionsMap) -+ { -+ Subscription& entry = *it.second.get(); -+ if (entry.eventFormatType == metricReportFormatType) -+ { -+ entry.filterAndSendReports(id, readings); -+ } -+ } - }); - } - -diff --git a/redfish-core/lib/metric_report.hpp b/redfish-core/lib/metric_report.hpp -index 63c8c19..7fe281d 100644 ---- a/redfish-core/lib/metric_report.hpp -+++ b/redfish-core/lib/metric_report.hpp -@@ -33,16 +33,14 @@ inline nlohmann::json toMetricValues(const Readings& readings) - return metricValues; - } - --inline void fillReport(const std::shared_ptr& asyncResp, -- const std::string& id, -+inline bool fillReport(nlohmann::json& json, const std::string& id, - const std::variant& var) - { -- asyncResp->res.jsonValue["@odata.type"] = -- "#MetricReport.v1_3_0.MetricReport"; -- asyncResp->res.jsonValue["@odata.id"] = telemetry::metricReportUri + id; -- asyncResp->res.jsonValue["Id"] = id; -- asyncResp->res.jsonValue["Name"] = id; -- asyncResp->res.jsonValue["MetricReportDefinition"]["@odata.id"] = -+ json["@odata.type"] = "#MetricReport.v1_3_0.MetricReport"; -+ json["@odata.id"] = telemetry::metricReportUri + id; -+ json["Id"] = id; -+ json["Name"] = id; -+ json["MetricReportDefinition"]["@odata.id"] = - telemetry::metricReportDefinitionUri + id; - - const TimestampReadings* timestampReadings = -@@ -50,14 +48,14 @@ inline void fillReport(const std::shared_ptr& asyncResp, - if (!timestampReadings) - { - BMCWEB_LOG_ERROR << "Property type mismatch or property is missing"; -- messages::internalError(asyncResp->res); -- return; -+ return false; - } - - const auto& [timestamp, readings] = *timestampReadings; -- asyncResp->res.jsonValue["Timestamp"] = -+ json["Timestamp"] = - crow::utility::getDateTime(static_cast(timestamp)); -- asyncResp->res.jsonValue["MetricValues"] = toMetricValues(readings); -+ json["MetricValues"] = toMetricValues(readings); -+ return true; - } - } // namespace telemetry - -@@ -118,7 +116,11 @@ inline void requestRoutesMetricReport(App& app) - return; - } - -- telemetry::fillReport(asyncResp, id, ret); -+ if (!telemetry::fillReport( -+ asyncResp->res.jsonValue, id, ret)) -+ { -+ messages::internalError(asyncResp->res); -+ } - }, - telemetry::service, reportPath, - "org.freedesktop.DBus.Properties", "Get", --- -2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0003-Switched-bmcweb-to-use-new-telemetry-service-API.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0003-Switched-bmcweb-to-use-new-telemetry-service-API.patch index 5dd2f51bc..a71511a96 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0003-Switched-bmcweb-to-use-new-telemetry-service-API.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0003-Switched-bmcweb-to-use-new-telemetry-service-API.patch @@ -1,6 +1,6 @@ -From 8ba1bcc3503cafb33b1a06356d4f8f92ae23e39a Mon Sep 17 00:00:00 2001 +From 41ee20f46f2c6d2e9e5418128993cd176d03a927 Mon Sep 17 00:00:00 2001 From: Krzysztof Grobelny -Date: Thu, 17 Jun 2021 13:37:57 +0000 +Date: Wed, 5 Jan 2022 14:54:18 +0100 Subject: [PATCH] Switched bmcweb to use new telemetry service API Added support for multiple MetricProperties. Added support for new @@ -15,51 +15,66 @@ Tested: Change-Id: I2cd17069e3ea015c8f5571c29278f1d50536272a Signed-off-by: Krzysztof Grobelny +Signed-off-by: Lukasz Kazmierczak --- - redfish-core/lib/metric_report_definition.hpp | 212 ++++++++++-------- - 1 file changed, 114 insertions(+), 98 deletions(-) + include/dbus_utility.hpp | 5 +- + redfish-core/lib/metric_report_definition.hpp | 310 +++++++++++------- + 2 files changed, 189 insertions(+), 126 deletions(-) +diff --git a/include/dbus_utility.hpp b/include/dbus_utility.hpp +index a971325..35109c4 100644 +--- a/include/dbus_utility.hpp ++++ b/include/dbus_utility.hpp +@@ -51,8 +51,9 @@ using DbusVariantType = sdbusplus::utility::dedup_variant_t< + std::vector>, + std::vector>>, + std::vector>, +- std::vector> ++ std::vector>, ++ std::string, std::string, std::string, uint64_t>> + >; + + // clang-format on diff --git a/redfish-core/lib/metric_report_definition.hpp b/redfish-core/lib/metric_report_definition.hpp -index a0c4f1d..7c26787 100644 +index 2584afc..9512381 100644 --- a/redfish-core/lib/metric_report_definition.hpp +++ b/redfish-core/lib/metric_report_definition.hpp -@@ -7,6 +7,8 @@ - #include +@@ -8,6 +8,8 @@ #include + #include #include +#include +#include #include #include -@@ -17,87 +19,90 @@ namespace redfish +@@ -18,119 +20,156 @@ namespace redfish namespace telemetry { -using ReadingParameters = - std::vector>; -+using ReadingParameters = std::vector< -+ std::tuple, std::string, -+ std::string, std::string, std::string, uint64_t>>; ++using ReadingParameters = std::vector>, ++ std::string, std::string, std::string, uint64_t>>; - inline void fillReportDefinition( - const std::shared_ptr& asyncResp, const std::string& id, - const std::vector< -- std::pair>>& ret) -+ std::pair>>& -+ properties) +-inline void fillReportDefinition( +- const std::shared_ptr& asyncResp, const std::string& id, +- const std::vector>& +- ret) ++std::string toReadfishReportAction(std::string_view action) { - asyncResp->res.jsonValue["@odata.type"] = - "#MetricReportDefinition.v1_3_0.MetricReportDefinition"; - asyncResp->res.jsonValue["@odata.id"] = -- telemetry::metricReportDefinitionUri + id; +- telemetry::metricReportDefinitionUri + std::string("/") + id; - asyncResp->res.jsonValue["Id"] = id; - asyncResp->res.jsonValue["Name"] = id; - asyncResp->res.jsonValue["MetricReport"]["@odata.id"] = -- telemetry::metricReportUri + id; +- telemetry::metricReportUri + std::string("/") + id; - asyncResp->res.jsonValue["Status"]["State"] = "Enabled"; - asyncResp->res.jsonValue["ReportUpdates"] = "Overwrite"; - @@ -69,34 +84,16 @@ index a0c4f1d..7c26787 100644 - const std::string* reportingType = nullptr; - const uint64_t* interval = nullptr; - for (const auto& [key, var] : ret) -+ try ++ if (action == "EmitsReadingsUpdate") { - if (key == "EmitsReadingsUpdate") -+ bool emitsReadingsUpdate = false; -+ bool logToMetricReportsCollection = false; -+ ReadingParameters readingParams; -+ std::string reportingType; -+ uint64_t interval = 0u; -+ -+ sdbusplus::unpackProperties( -+ properties, "EmitsReadingsUpdate", emitsReadingsUpdate, -+ "LogToMetricReportsCollection", logToMetricReportsCollection, -+ "ReadingParametersFutureVersion", readingParams, "ReportingType", -+ reportingType, "Interval", interval); -+ -+ std::vector redfishReportActions; -+ redfishReportActions.reserve(2); -+ if (emitsReadingsUpdate) - { +- { - emitsReadingsUpdate = std::get_if(&var); -+ redfishReportActions.emplace_back("RedfishEvent"); - } +- } - else if (key == "LogToMetricReportsCollection") -+ if (logToMetricReportsCollection) - { +- { - logToMetricReportsCollection = std::get_if(&var); -+ redfishReportActions.emplace_back("LogToMetricReportsCollection"); - } +- } - else if (key == "ReadingParameters") - { - readingParams = std::get_if(&var); @@ -106,76 +103,126 @@ index a0c4f1d..7c26787 100644 - reportingType = std::get_if(&var); - } - else if (key == "Interval") -+ -+ nlohmann::json metrics = nlohmann::json::array(); -+ for (auto& [sensorPath, operationType, id, metadata, -+ collectionTimeScope, collectionDuration] : readingParams) - { +- { - interval = std::get_if(&var); -+ std::vector metricProperties; -+ -+ nlohmann::json parsedMetadata = nlohmann::json::parse(metadata); -+ if (!json_util::readJson(parsedMetadata, asyncResp->res, -+ "MetricProperties", metricProperties)) -+ { -+ BMCWEB_LOG_ERROR << "Failed to read metadata"; -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ -+ metrics.push_back({ -+ {"MetricId", id}, -+ {"MetricProperties", std::move(metricProperties)}, -+ }); - } -- } +- } ++ return "RedfishEvent"; + } - if (!emitsReadingsUpdate || !logToMetricReportsCollection || - !readingParams || !reportingType || !interval) -- { ++ if (action == "LogToMetricReportsCollection") + { - BMCWEB_LOG_ERROR << "Property type mismatch or property is missing"; - messages::internalError(asyncResp->res); - return; -- } ++ return "LogToMetricReportsCollection"; + } ++ return ""; ++} - std::vector redfishReportActions; - redfishReportActions.reserve(2); - if (*emitsReadingsUpdate) -- { ++std::string toDbusReportAction(std::string_view action) ++{ ++ if (action == "RedfishEvent") + { - redfishReportActions.emplace_back("RedfishEvent"); ++ return "EmitsReadingsUpdate"; + } +- if (*logToMetricReportsCollection) ++ if (action == "LogToMetricReportsCollection") + { +- redfishReportActions.emplace_back("LogToMetricReportsCollection"); ++ return "LogToMetricReportsCollection"; + } ++ return ""; ++} + +- nlohmann::json metrics = nlohmann::json::array(); +- for (auto& [sensorPath, operationType, id, metadata] : *readingParams) ++inline void fillReportDefinition( ++ const std::shared_ptr& asyncResp, const std::string& id, ++ const std::vector>& ++ properties) ++{ ++ try + { +- metrics.push_back({ +- {"MetricId", id}, +- {"MetricProperties", {metadata}}, +- }); ++ std::vector reportActions; ++ ReadingParameters readingParams; ++ std::string reportingType; ++ std::string reportUpdates; ++ std::string name; ++ uint64_t appendLimit = 0u; ++ uint64_t interval = 0u; ++ ++ sdbusplus::unpackProperties( ++ properties, "ReportActions", reportActions, "ReportUpdates", ++ reportUpdates, "AppendLimit", appendLimit, ++ "ReadingParametersFutureVersion", readingParams, "ReportingType", ++ reportingType, "Interval", interval, "Name", name); ++ ++ for (std::string& action : reportActions) ++ { ++ action = toReadfishReportAction(action); ++ ++ if (action.empty()) ++ { ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ } ++ ++ nlohmann::json metrics = nlohmann::json::array(); ++ for (auto& [sensorData, collectionFunction, id, collectionTimeScope, ++ collectionDuration] : readingParams) ++ { ++ std::vector metricProperties; ++ ++ for (auto& [sensorPath, sensorMetadata] : sensorData) ++ { ++ metricProperties.emplace_back(std::move(sensorMetadata)); ++ } ++ ++ metrics.push_back( ++ {{"MetricId", std::move(id)}, ++ {"MetricProperties", std::move(metricProperties)}, ++ {"CollectionFunction", std::move(collectionFunction)}, ++ {"CollectionDuration", ++ time_utils::toDurationString( ++ std::chrono::milliseconds(collectionDuration))}, ++ {"CollectionTimeScope", std::move(collectionTimeScope)}}); ++ } ++ + asyncResp->res.jsonValue["@odata.type"] = + "#MetricReportDefinition.v1_3_0.MetricReportDefinition"; + asyncResp->res.jsonValue["@odata.id"] = -+ telemetry::metricReportDefinitionUri + id; ++ telemetry::metricReportDefinitionUri + std::string("/") + id; + asyncResp->res.jsonValue["Id"] = id; -+ asyncResp->res.jsonValue["Name"] = id; ++ asyncResp->res.jsonValue["Name"] = name; + asyncResp->res.jsonValue["MetricReport"]["@odata.id"] = -+ telemetry::metricReportUri + id; ++ telemetry::metricReportUri + std::string("/") + id; + asyncResp->res.jsonValue["Status"]["State"] = "Enabled"; -+ asyncResp->res.jsonValue["ReportUpdates"] = "Overwrite"; ++ asyncResp->res.jsonValue["ReportUpdates"] = reportUpdates; ++ asyncResp->res.jsonValue["AppendLimit"] = appendLimit; + asyncResp->res.jsonValue["Metrics"] = metrics; + asyncResp->res.jsonValue["MetricReportDefinitionType"] = reportingType; -+ asyncResp->res.jsonValue["ReportActions"] = redfishReportActions; ++ asyncResp->res.jsonValue["ReportActions"] = reportActions; + asyncResp->res.jsonValue["Schedule"]["RecurrenceInterval"] = + time_utils::toDurationString(std::chrono::milliseconds(interval)); - } -- if (*logToMetricReportsCollection) ++ } + catch (const sdbusplus::exception::UnpackPropertyError& error) - { -- redfishReportActions.emplace_back("LogToMetricReportsCollection"); ++ { + BMCWEB_LOG_ERROR << error.what() << ", property: " + << error.propertyName + ", reason: " << error.reason; -+ messages::internalError(asyncResp->res); - } -- -- nlohmann::json metrics = nlohmann::json::array(); -- for (auto& [sensorPath, operationType, id, metadata] : *readingParams) -+ catch (const nlohmann::json::parse_error& e) - { -- metrics.push_back({ -- {"MetricId", id}, -- {"MetricProperties", {metadata}}, -- }); -+ BMCWEB_LOG_ERROR << "Failed to parse metadata: " << e.what(); ++ messages::queryParameterValueFormatError( ++ asyncResp->res, ++ std::string(error.propertyName) + " " + std::string(error.reason), ++ error.what()); + messages::internalError(asyncResp->res); } - asyncResp->res.jsonValue["Metrics"] = metrics; @@ -186,33 +233,196 @@ index a0c4f1d..7c26787 100644 } struct AddReportArgs -@@ -275,6 +280,11 @@ class AddReport + { +- std::string name; ++ struct MetricArgs ++ { ++ std::string id; ++ std::vector uris; ++ std::optional collectionFunction; ++ std::optional collectionTimeScope; ++ std::optional collectionDuration; ++ }; ++ ++ std::optional id; ++ std::optional name; + std::string reportingType; +- bool emitsReadingsUpdate = false; +- bool logToMetricReportsCollection = false; ++ std::optional reportUpdates; ++ std::optional appendLimit; ++ std::vector reportActions; + uint64_t interval = 0; +- std::vector>> metrics; ++ std::vector metrics; + }; - for (const auto& [id, uris] : args.metrics) + inline bool toDbusReportActions(crow::Response& res, +- std::vector& actions, ++ const std::vector& actions, + AddReportArgs& args) + { + size_t index = 0; +- for (auto& action : actions) ++ for (const auto& action : actions) + { +- if (action == "RedfishEvent") +- { +- args.emitsReadingsUpdate = true; +- } +- else if (action == "LogToMetricReportsCollection") +- { +- args.logToMetricReportsCollection = true; +- } +- else ++ std::string dbusReportAction = toDbusReportAction(action); ++ ++ if (dbusReportAction.empty()) { -+ std::vector dbusPaths; -+ dbusPaths.reserve(uris.size()); -+ nlohmann::json metadata; -+ metadata["MetricProperties"] = nlohmann::json::array(); + messages::propertyValueNotInList( + res, action, "ReportActions/" + std::to_string(index)); + return false; + } + - for (size_t i = 0; i < uris.size(); i++) ++ args.reportActions.emplace_back(std::move(dbusReportAction)); + index++; + } + return true; +@@ -142,23 +181,12 @@ inline bool getUserParameters(crow::Response& res, const crow::Request& req, + std::vector metrics; + std::vector reportActions; + std::optional schedule; +- if (!json_util::readJson(req, res, "Id", args.name, "Metrics", metrics, +- "MetricReportDefinitionType", args.reportingType, +- "ReportActions", reportActions, "Schedule", +- schedule)) +- { +- return false; +- } +- +- constexpr const char* allowedCharactersInName = +- "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"; +- if (args.name.empty() || args.name.find_first_not_of( +- allowedCharactersInName) != std::string::npos) ++ if (!json_util::readJson( ++ req, res, "Id", args.id, "Name", args.name, "Metrics", metrics, ++ "MetricReportDefinitionType", args.reportingType, "ReportUpdates", ++ args.reportUpdates, "AppendLimit", args.appendLimit, ++ "ReportActions", reportActions, "Schedule", schedule)) + { +- BMCWEB_LOG_ERROR << "Failed to match " << args.name +- << " with allowed character " +- << allowedCharactersInName; +- messages::propertyValueIncorrect(res, "Id", args.name); + return false; + } + +@@ -203,15 +231,35 @@ inline bool getUserParameters(crow::Response& res, const crow::Request& req, + args.metrics.reserve(metrics.size()); + for (auto& m : metrics) + { +- std::string id; +- std::vector uris; +- if (!json_util::readJson(m, res, "MetricId", id, "MetricProperties", +- uris)) ++ std::optional collectionDurationStr; ++ AddReportArgs::MetricArgs metricArgs; ++ if (!json_util::readJson( ++ m, res, "MetricId", metricArgs.id, "MetricProperties", ++ metricArgs.uris, "CollectionFunction", ++ metricArgs.collectionFunction, "CollectionTimeScope", ++ metricArgs.collectionTimeScope, "CollectionDuration", ++ collectionDurationStr)) + { + return false; + } + +- args.metrics.emplace_back(std::move(id), std::move(uris)); ++ if (collectionDurationStr) ++ { ++ std::optional duration = ++ time_utils::fromDurationString(*collectionDurationStr); ++ ++ if (!duration || duration->count() < 0) ++ { ++ messages::propertyValueIncorrect(res, "CollectionDuration", ++ *collectionDurationStr); ++ return false; ++ } ++ ++ metricArgs.collectionDuration = ++ static_cast(duration->count()); ++ } ++ ++ args.metrics.emplace_back(std::move(metricArgs)); + } + + return true; +@@ -219,13 +267,12 @@ inline bool getUserParameters(crow::Response& res, const crow::Request& req, + + inline bool getChassisSensorNodeFromMetrics( + const std::shared_ptr& asyncResp, +- const std::vector>>& +- metrics, ++ const std::vector& metrics, + boost::container::flat_set>& matched) + { +- for (const auto& [id, uris] : metrics) ++ for (const auto& metric : metrics) + { +- if (!getChassisSensorNode(asyncResp, uris, matched)) ++ if (!getChassisSensorNode(asyncResp, metric.uris, matched)) + { + return false; + } +@@ -251,11 +298,16 @@ class AddReport + telemetry::ReadingParameters readingParams; + readingParams.reserve(args.metrics.size()); + +- for (const auto& [id, uris] : args.metrics) ++ for (auto& metric : args.metrics) + { +- for (size_t i = 0; i < uris.size(); i++) ++ std::vector< ++ std::tuple> ++ sensorParams; ++ sensorParams.reserve(metric.uris.size()); ++ ++ for (size_t i = 0; i < metric.uris.size(); i++) { - const std::string& uri = uris[i]; -@@ -291,8 +301,12 @@ class AddReport +- const std::string& uri = uris[i]; ++ const std::string& uri = metric.uris[i]; + auto el = uriToDbus.find(uri); + if (el == uriToDbus.end()) + { +@@ -269,17 +321,23 @@ class AddReport } const std::string& dbusPath = el->second; - readingParams.emplace_back(dbusPath, "SINGLE", id, uri); -+ dbusPaths.emplace_back(dbusPath); -+ metadata["MetricProperties"].emplace_back(uri); ++ sensorParams.emplace_back(dbusPath, uri); } + -+ readingParams.emplace_back(dbusPaths, "SINGLE", id, metadata.dump(), -+ "Point", 0u); ++ readingParams.emplace_back( ++ std::move(sensorParams), metric.collectionFunction.value_or(""), ++ std::move(metric.id), metric.collectionTimeScope.value_or(""), ++ metric.collectionDuration.value_or(0u)); } const std::shared_ptr aResp = asyncResp; crow::connections::systemBus->async_method_call( -@@ -330,10 +344,10 @@ class AddReport +- [aResp, name = args.name, uriToDbus = std::move(uriToDbus)]( ++ [aResp, id = args.id.value_or(""), ++ uriToDbus = std::move(uriToDbus)]( + const boost::system::error_code ec, const std::string&) { + if (ec == boost::system::errc::file_exists) + { + messages::resourceAlreadyExists( +- aResp->res, "MetricReportDefinition", "Id", name); ++ aResp->res, "MetricReportDefinition", "Id", id); + return; + } + if (ec == boost::system::errc::too_many_files_open) +@@ -308,10 +366,12 @@ class AddReport messages::created(aResp->res); }, telemetry::service, "/xyz/openbmc_project/Telemetry/Reports", @@ -221,81 +431,50 @@ index a0c4f1d..7c26787 100644 - args.emitsReadingsUpdate, args.logToMetricReportsCollection, - args.interval, readingParams); + "xyz.openbmc_project.Telemetry.ReportManager", -+ "AddReportFutureVersion", "TelemetryService/" + args.name, -+ args.reportingType, args.emitsReadingsUpdate, -+ args.logToMetricReportsCollection, args.interval, readingParams); ++ "AddReportFutureVersion", ++ "TelemetryService/" + args.id.value_or(""), args.name.value_or(""), ++ args.reportingType, args.reportUpdates.value_or("Overwrite"), ++ args.appendLimit.value_or(0), args.reportActions, args.interval, ++ readingParams); } void insert(const boost::container::flat_map& el) -@@ -415,37 +429,39 @@ inline void requestRoutesMetricReportDefinition(App& app) - BMCWEB_ROUTE(app, - "/redfish/v1/TelemetryService/MetricReportDefinitions//") - .privileges(redfish::privileges::getMetricReportDefinition) -- .methods(boost::beast::http::verb::get)( -- [](const crow::Request&, -- const std::shared_ptr& asyncResp, -- const std::string& id) { +@@ -399,12 +459,15 @@ inline void requestRoutesMetricReportDefinition(App& app) + [](const crow::Request&, + const std::shared_ptr& asyncResp, + const std::string& id) { - crow::connections::systemBus->async_method_call( -- [asyncResp, id]( -- const boost::system::error_code ec, -- const std::vector>>& ret) { -- if (ec.value() == EBADR || -- ec == boost::system::errc::host_unreachable) -- { -- messages::resourceNotFound( -- asyncResp->res, "MetricReportDefinition", id); -- return; -- } -- if (ec) -- { -- BMCWEB_LOG_ERROR << "respHandler DBus error " << ec; -- messages::internalError(asyncResp->res); -- return; -- } -+ .methods( -+ boost::beast::http::verb::get)([](const crow::Request&, -+ const std::shared_ptr< -+ bmcweb::AsyncResp>& asyncResp, -+ const std::string& id) { -+ sdbusplus::asio::getAllProperties( -+ *crow::connections::systemBus, telemetry::service, -+ telemetry::getDbusReportPath(id), telemetry::reportInterface, -+ [asyncResp, -+ id](boost::system::error_code ec, -+ const std::vector>>& -+ properties) { -+ if (ec.value() == EBADR || -+ ec == boost::system::errc::host_unreachable) -+ { -+ messages::resourceNotFound( -+ asyncResp->res, "MetricReportDefinition", id); -+ return; -+ } -+ if (ec) -+ { -+ BMCWEB_LOG_ERROR << "respHandler DBus error " << ec; -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ -+ telemetry::fillReportDefinition(asyncResp, id, properties); -+ }); -+ }); ++ sdbusplus::asio::getAllProperties( ++ *crow::connections::systemBus, telemetry::service, ++ telemetry::getDbusReportPath(id), ++ telemetry::reportInterface, + [asyncResp, +- id](const boost::system::error_code ec, ++ id](boost::system::error_code ec, + const std::vector>& +- ret) { ++ properties) { + if (ec.value() == EBADR || + ec == boost::system::errc::host_unreachable) + { +@@ -419,12 +482,11 @@ inline void requestRoutesMetricReportDefinition(App& app) + return; + } - telemetry::fillReportDefinition(asyncResp, id, ret); - }, - telemetry::service, telemetry::getDbusReportPath(id), - "org.freedesktop.DBus.Properties", "GetAll", - telemetry::reportInterface); -- }); ++ telemetry::fillReportDefinition(asyncResp, id, ++ properties); ++ }); + }); ++ BMCWEB_ROUTE(app, "/redfish/v1/TelemetryService/MetricReportDefinitions//") .privileges(redfish::privileges::deleteMetricReportDefinitionCollection) -- 2.25.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0004-Add-support-for-MetricDefinition-property-in-MetricReport.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0004-Add-support-for-MetricDefinition-property-in-MetricReport.patch deleted file mode 100644 index bf5a09d9d..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0004-Add-support-for-MetricDefinition-property-in-MetricReport.patch +++ /dev/null @@ -1,268 +0,0 @@ -From dab3c96f9e39a89d7c359e22655650c7c16952ec Mon Sep 17 00:00:00 2001 -From: Krzysztof Grobelny -Date: Tue, 12 Oct 2021 08:06:13 +0000 -Subject: [PATCH] Add support for MetricDefinition property in MetricReport - -Added MetricDefinition as part of MetricValues array returned by -MetricReport. It contains single @odata.id with URI to proper -MetricDefinition resource - depending on MetricProperty. - -Testing done: -- GET request on redfish/v1/TelemetryService/MetricReports - got response with MetricDefinition and proper id inside - MetricValues array. - -Testing steps: -1. POST on redfish/v1/TelemetryService/MetricReportDefinitions - with body: -{ - "Id": "PeriodicReport_1", - "MetricReportDefinitionType": "Periodic", - "ReportActions": [ - "LogToMetricReportsCollection", - "RedfishEvent" - ], - "Metrics": [ - { - "MetricId": "sensor_1", - "MetricProperties": [ - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/1/Reading" - ] - } - ], - "Schedule": { - "RecurrenceInterval": "PT10S" - } -} - -2. GET on redfish/v1/TelemetryService/MetricReports/PeriodicReport_1 - should return: -{ - "@odata.id": - "/redfish/v1/TelemetryService/MetricReports/PeriodicReport_1", - "@odata.type": "#MetricReport.v1_3_0.MetricReport", - "Id": "PeriodicReport_1", - "MetricReportDefinition": { - "@odata.id": - "/redfish/v1/TelemetryService/MetricReportDefinitions/PeriodicReport_1" - }, - "MetricValues": [ - { - "MetricDefinition": { - "@odata.id": - "/redfish/v1/TelemetryService/MetricDefinitions/Rotational" - }, - "MetricId": "sensor_1", - "MetricProperty": - "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/1/Reading", - "MetricValue": "nan", - "Timestamp": "1970-01-01T00:03:21+00:00" - } - ], - "Name": "PeriodicReport_1", - "Timestamp": "1970-01-01T00:03:21+00:00" -} - -Change-Id: I7181c612f9b443015d551259bae25303aa436822 -Signed-off-by: Szymon Dompke ---- - meson.build | 4 +- - .../include/utils/telemetry_utils.hpp | 40 ++++++++++++ - redfish-core/lib/metric_report.hpp | 64 +++++++++++++++---- - redfish-core/lib/sensors.hpp | 2 + - 4 files changed, 95 insertions(+), 15 deletions(-) - -diff --git a/meson.build b/meson.build -index 6b6a8ab..218ea49 100644 ---- a/meson.build -+++ b/meson.build -@@ -377,6 +377,8 @@ srcfiles_unittest = [ - 'http/ut/utility_test.cpp' - ] - -+srcfiles_unittest_dependencies = ['redfish-core/src/error_messages.cpp', 'src/boost_url.cpp'] -+ - # Gather the Configuration data - - conf_data = configuration_data() -@@ -434,7 +436,7 @@ executable('bmcweb',srcfiles_bmcweb, - if(get_option('tests').enabled()) - foreach src_test : srcfiles_unittest - testname = src_test.split('/')[-1].split('.')[0] -- test(testname,executable(testname,src_test, -+ test(testname,executable(testname,[src_test] + srcfiles_unittest_dependencies, - include_directories : incdir, - install_dir: bindir, - dependencies: [ -diff --git a/redfish-core/include/utils/telemetry_utils.hpp b/redfish-core/include/utils/telemetry_utils.hpp -index 1b4f75d..c0c5ba3 100644 ---- a/redfish-core/include/utils/telemetry_utils.hpp -+++ b/redfish-core/include/utils/telemetry_utils.hpp -@@ -17,6 +17,46 @@ constexpr const char* metricReportDefinitionUri = - constexpr const char* metricReportUri = - "/redfish/v1/TelemetryService/MetricReports/"; - -+inline std::optional -+ getMetadataJson(const std::string& metadataStr) -+{ -+ std::optional res = -+ nlohmann::json::parse(metadataStr, nullptr, false); -+ if (res->is_discarded()) -+ { -+ BMCWEB_LOG_ERROR << "Malformed reading metatadata JSON provided by " -+ "telemetry service."; -+ return std::nullopt; -+ } -+ return res; -+} -+ -+inline std::optional -+ readStringFromMetadata(const nlohmann::json& metadataJson, const char* key) -+{ -+ std::optional res; -+ if (auto it = metadataJson.find(key); it != metadataJson.end()) -+ { -+ if (const std::string* value = it->get_ptr()) -+ { -+ res = *value; -+ } -+ else -+ { -+ BMCWEB_LOG_ERROR << "Incorrect reading metatadata JSON provided by " -+ "telemetry service. Missing key '" -+ << key << "'."; -+ } -+ } -+ else -+ { -+ BMCWEB_LOG_ERROR << "Incorrect reading metatadata JSON provided by " -+ "telemetry service. Key '" -+ << key << "' has a wrong type."; -+ } -+ return res; -+} -+ - inline void - getReportCollection(const std::shared_ptr& asyncResp, - const std::string& uri) -diff --git a/redfish-core/lib/metric_report.hpp b/redfish-core/lib/metric_report.hpp -index 7fe281d..13bf792 100644 ---- a/redfish-core/lib/metric_report.hpp -+++ b/redfish-core/lib/metric_report.hpp -@@ -1,5 +1,6 @@ - #pragma once - -+#include "sensors.hpp" - #include "utils/telemetry_utils.hpp" - - #include -@@ -15,34 +16,56 @@ using Readings = - std::vector>; - using TimestampReadings = std::tuple; - --inline nlohmann::json toMetricValues(const Readings& readings) -+inline bool fillMetricValues(nlohmann::json& metricValues, -+ const Readings& readings) - { -- nlohmann::json metricValues = nlohmann::json::array_t(); -- -- for (auto& [id, metadata, sensorValue, timestamp] : readings) -+ for (auto& [id, metadataStr, sensorValue, timestamp] : readings) - { -+ std::optional readingMetadataJson = -+ getMetadataJson(metadataStr); -+ if (!readingMetadataJson) -+ { -+ return false; -+ } -+ -+ std::optional sensorDbusPath = -+ readStringFromMetadata(*readingMetadataJson, "SensorDbusPath"); -+ if (!sensorDbusPath) -+ { -+ return false; -+ } -+ -+ std::optional sensorRedfishUri = -+ readStringFromMetadata(*readingMetadataJson, "SensorRedfishUri"); -+ if (!sensorRedfishUri) -+ { -+ return false; -+ } -+ -+ std::string metricDefinition = -+ std::string(metricDefinitionUri) + -+ sensors::toReadingType( -+ sdbusplus::message::object_path(*sensorDbusPath) -+ .parent_path() -+ .filename()); -+ - metricValues.push_back({ -+ {"MetricDefinition", -+ nlohmann::json{{"@odata.id", metricDefinition}}}, - {"MetricId", id}, -- {"MetricProperty", metadata}, -+ {"MetricProperty", *sensorRedfishUri}, - {"MetricValue", std::to_string(sensorValue)}, - {"Timestamp", - crow::utility::getDateTime(static_cast(timestamp))}, - }); - } - -- return metricValues; -+ return true; - } - - inline bool fillReport(nlohmann::json& json, const std::string& id, - const std::variant& var) - { -- json["@odata.type"] = "#MetricReport.v1_3_0.MetricReport"; -- json["@odata.id"] = telemetry::metricReportUri + id; -- json["Id"] = id; -- json["Name"] = id; -- json["MetricReportDefinition"]["@odata.id"] = -- telemetry::metricReportDefinitionUri + id; -- - const TimestampReadings* timestampReadings = - std::get_if(&var); - if (!timestampReadings) -@@ -52,9 +75,22 @@ inline bool fillReport(nlohmann::json& json, const std::string& id, - } - - const auto& [timestamp, readings] = *timestampReadings; -+ nlohmann::json metricValues = nlohmann::json::array(); -+ if (!fillMetricValues(metricValues, readings)) -+ { -+ return false; -+ } -+ -+ json["@odata.type"] = "#MetricReport.v1_3_0.MetricReport"; -+ json["@odata.id"] = telemetry::metricReportUri + id; -+ json["Id"] = id; -+ json["Name"] = id; -+ json["MetricReportDefinition"]["@odata.id"] = -+ telemetry::metricReportDefinitionUri + id; - json["Timestamp"] = - crow::utility::getDateTime(static_cast(timestamp)); -- json["MetricValues"] = toMetricValues(readings); -+ json["MetricValues"] = metricValues; -+ - return true; - } - } // namespace telemetry -diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp -index 7405e5a..9850b24 100644 ---- a/redfish-core/lib/sensors.hpp -+++ b/redfish-core/lib/sensors.hpp -@@ -21,6 +21,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - --- -2.25.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0005-Add-GET-method-for-TriggerCollection.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0005-Add-GET-method-for-TriggerCollection.patch deleted file mode 100644 index 0646aba5c..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0005-Add-GET-method-for-TriggerCollection.patch +++ /dev/null @@ -1,313 +0,0 @@ -From a1e89d356ba5ed594a1494efe8257946e1062396 Mon Sep 17 00:00:00 2001 -From: Lukasz Kazmierczak -Date: Tue, 31 Aug 2021 14:35:31 +0200 -Subject: [PATCH] Add GET method for TriggerCollection - -Added GET method for retrieving list of Triggers from Telemetry service - -Tested: -- Added single Trigger and requested result from bmcweb via - /redfish/v1/TelemetryService/Triggers -- Added multiple Triggers numeric and discrete, and requested results - from bmcweb via /redfish/v1/TelemetryService/Triggers -- Verified uri /redfish/v1/TelemetryService/Triggers by using - Redfish-Service-Validator (all passed) - -Signed-off-by: Lukasz Kazmierczak -Change-Id: Ide00eb44901ea1b97b80fc5c5ddfd97e393d4a04 ---- - redfish-core/include/redfish.hpp | 2 + - .../include/utils/telemetry_utils.hpp | 40 ++++++++--- - redfish-core/lib/metric_report.hpp | 6 +- - redfish-core/lib/metric_report_definition.hpp | 6 +- - redfish-core/lib/trigger.hpp | 31 ++++++++ - scripts/update_schemas.py | 1 + - static/redfish/v1/$metadata/index.xml | 3 + - .../v1/schema/TriggersCollection_v1.xml | 70 +++++++++++++++++++ - 8 files changed, 144 insertions(+), 15 deletions(-) - create mode 100644 redfish-core/lib/trigger.hpp - create mode 100644 static/redfish/v1/schema/TriggersCollection_v1.xml - -diff --git a/redfish-core/include/redfish.hpp b/redfish-core/include/redfish.hpp -index 9fb0ffe..99b3fe6 100644 ---- a/redfish-core/include/redfish.hpp -+++ b/redfish-core/include/redfish.hpp -@@ -42,6 +42,7 @@ - #include "../lib/task.hpp" - #include "../lib/telemetry_service.hpp" - #include "../lib/thermal.hpp" -+#include "../lib/trigger.hpp" - #include "../lib/update_service.hpp" - #include "../lib/virtual_media.hpp" - -@@ -197,6 +198,7 @@ class RedfishService - - hypervisor::requestRoutesHypervisorSystems(app); - -+ requestRoutesTriggerCollection(app); - requestRoutesTelemetryService(app); - requestRoutesMetricReportDefinitionCollection(app); - requestRoutesMetricReportDefinition(app); -diff --git a/redfish-core/include/utils/telemetry_utils.hpp b/redfish-core/include/utils/telemetry_utils.hpp -index c0c5ba3..df1aa68 100644 ---- a/redfish-core/include/utils/telemetry_utils.hpp -+++ b/redfish-core/include/utils/telemetry_utils.hpp -@@ -9,6 +9,8 @@ namespace telemetry - { - - constexpr const char* service = "xyz.openbmc_project.Telemetry"; -+constexpr const char* reportSubtree = -+ "/xyz/openbmc_project/Telemetry/Reports/TelemetryService"; - constexpr const char* reportInterface = "xyz.openbmc_project.Telemetry.Report"; - constexpr const char* metricDefinitionUri = - "/redfish/v1/TelemetryService/MetricDefinitions/"; -@@ -16,6 +18,11 @@ constexpr const char* metricReportDefinitionUri = - "/redfish/v1/TelemetryService/MetricReportDefinitions/"; - constexpr const char* metricReportUri = - "/redfish/v1/TelemetryService/MetricReports/"; -+constexpr const char* triggerSubtree = -+ "/xyz/openbmc_project/Telemetry/Triggers/TelemetryService"; -+constexpr const char* triggerInterface = -+ "xyz.openbmc_project.Telemetry.Trigger"; -+constexpr const char* triggerUri = "/redfish/v1/TelemetryService/Triggers/"; - - inline std::optional - getMetadataJson(const std::string& metadataStr) -@@ -57,15 +64,27 @@ inline std::optional - return res; - } - --inline void -- getReportCollection(const std::shared_ptr& asyncResp, -- const std::string& uri) -+struct CollectionParams - { -- const std::array interfaces = {reportInterface}; -+ const char* subtree; -+ int depth; -+ std::array interfaces; - -+ CollectionParams() = delete; -+ CollectionParams(const char* st, int dp, -+ const std::array& ifaces) : -+ subtree{st}, -+ depth{dp}, interfaces{ifaces} -+ {} -+}; -+ -+inline void getCollection(const std::shared_ptr& asyncResp, -+ const std::string& uri, -+ const CollectionParams& params) -+{ - crow::connections::systemBus->async_method_call( - [asyncResp, uri](const boost::system::error_code ec, -- const std::vector& reports) { -+ const std::vector& items) { - if (ec == boost::system::errc::io_error) - { - asyncResp->res.jsonValue["Members"] = nlohmann::json::array(); -@@ -82,13 +101,13 @@ inline void - nlohmann::json& members = asyncResp->res.jsonValue["Members"]; - members = nlohmann::json::array(); - -- for (const std::string& report : reports) -+ for (const std::string& item : items) - { -- sdbusplus::message::object_path path(report); -+ sdbusplus::message::object_path path(item); - std::string name = path.filename(); - if (name.empty()) - { -- BMCWEB_LOG_ERROR << "Received invalid path: " << report; -+ BMCWEB_LOG_ERROR << "Received invalid path: " << item; - messages::internalError(asyncResp->res); - return; - } -@@ -99,9 +118,8 @@ inline void - }, - "xyz.openbmc_project.ObjectMapper", - "/xyz/openbmc_project/object_mapper", -- "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths", -- "/xyz/openbmc_project/Telemetry/Reports/TelemetryService", 1, -- interfaces); -+ "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths", params.subtree, -+ params.depth, params.interfaces); - } - - inline std::string getDbusReportPath(const std::string& id) -diff --git a/redfish-core/lib/metric_report.hpp b/redfish-core/lib/metric_report.hpp -index 13bf792..ea4cd62 100644 ---- a/redfish-core/lib/metric_report.hpp -+++ b/redfish-core/lib/metric_report.hpp -@@ -108,8 +108,10 @@ inline void requestRoutesMetricReportCollection(App& app) - "/redfish/v1/TelemetryService/MetricReports"; - asyncResp->res.jsonValue["Name"] = "Metric Report Collection"; - -- telemetry::getReportCollection(asyncResp, -- telemetry::metricReportUri); -+ telemetry::getCollection( -+ asyncResp, telemetry::metricReportUri, -+ telemetry::CollectionParams(telemetry::reportSubtree, 1, -+ {telemetry::reportInterface})); - }); - } - -diff --git a/redfish-core/lib/metric_report_definition.hpp b/redfish-core/lib/metric_report_definition.hpp -index 7c26787..c97a1df 100644 ---- a/redfish-core/lib/metric_report_definition.hpp -+++ b/redfish-core/lib/metric_report_definition.hpp -@@ -377,8 +377,10 @@ inline void requestRoutesMetricReportDefinitionCollection(App& app) - asyncResp->res.jsonValue["Name"] = - "Metric Definition Collection"; - -- telemetry::getReportCollection( -- asyncResp, telemetry::metricReportDefinitionUri); -+ telemetry::getCollection( -+ asyncResp, telemetry::metricReportDefinitionUri, -+ telemetry::CollectionParams(telemetry::reportSubtree, 1, -+ {telemetry::reportInterface})); - }); - - BMCWEB_ROUTE(app, "/redfish/v1/TelemetryService/MetricReportDefinitions/") -diff --git a/redfish-core/lib/trigger.hpp b/redfish-core/lib/trigger.hpp -new file mode 100644 -index 0000000..681b3b4 ---- /dev/null -+++ b/redfish-core/lib/trigger.hpp -@@ -0,0 +1,31 @@ -+#pragma once -+ -+#include "utils/telemetry_utils.hpp" -+ -+#include -+#include -+ -+namespace redfish -+{ -+ -+inline void requestRoutesTriggerCollection(App& app) -+{ -+ BMCWEB_ROUTE(app, "/redfish/v1/TelemetryService/Triggers/") -+ .privileges(redfish::privileges::getTriggersCollection) -+ .methods(boost::beast::http::verb::get)( -+ [](const crow::Request&, -+ const std::shared_ptr& asyncResp) { -+ asyncResp->res.jsonValue["@odata.type"] = -+ "#TriggersCollection.TriggersCollection"; -+ asyncResp->res.jsonValue["@odata.id"] = -+ "/redfish/v1/TelemetryService/Triggers"; -+ asyncResp->res.jsonValue["Name"] = "Triggers Collection"; -+ -+ telemetry::getCollection( -+ asyncResp, telemetry::triggerUri, -+ telemetry::CollectionParams(telemetry::triggerSubtree, 1, -+ {telemetry::triggerInterface})); -+ }); -+} -+ -+} // namespace redfish -diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py -index dd39278..d66a59a 100755 ---- a/scripts/update_schemas.py -+++ b/scripts/update_schemas.py -@@ -93,6 +93,7 @@ include_list = [ - 'TaskService', - 'TelemetryService', - 'Thermal', -+ 'TriggersCollection', - 'UpdateService', - 'VLanNetworkInterfaceCollection', - 'VLanNetworkInterface', -diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml -index 876ebfb..75e3dd4 100644 ---- a/static/redfish/v1/$metadata/index.xml -+++ b/static/redfish/v1/$metadata/index.xml -@@ -2215,6 +2215,9 @@ - - - -+ -+ -+ - - - -diff --git a/static/redfish/v1/schema/TriggersCollection_v1.xml b/static/redfish/v1/schema/TriggersCollection_v1.xml -new file mode 100644 -index 0000000..399bebd ---- /dev/null -+++ b/static/redfish/v1/schema/TriggersCollection_v1.xml -@@ -0,0 +1,70 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ /redfish/v1/TelemetryService/Triggers -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.25.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0006-Revert-Remove-LogService-from-TelemetryService.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0006-Revert-Remove-LogService-from-TelemetryService.patch deleted file mode 100644 index a80ac61c7..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0006-Revert-Remove-LogService-from-TelemetryService.patch +++ /dev/null @@ -1,26 +0,0 @@ -From da575aaf0bdcb15be261d58314cf7bbbcd92dd74 Mon Sep 17 00:00:00 2001 -From: Krzysztof Grobelny -Date: Tue, 12 Oct 2021 08:08:06 +0000 -Subject: [PATCH] Revert "Remove LogService from TelemetryService" - -This reverts commit 2b3da45876aac57a36d3093379a992d699e7e396. ---- - redfish-core/lib/telemetry_service.hpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/redfish-core/lib/telemetry_service.hpp b/redfish-core/lib/telemetry_service.hpp -index 027b51b..49471fe 100644 ---- a/redfish-core/lib/telemetry_service.hpp -+++ b/redfish-core/lib/telemetry_service.hpp -@@ -24,6 +24,8 @@ inline void handleTelemetryServiceGet( - "/redfish/v1/TelemetryService/MetricReports"; - asyncResp->res.jsonValue["MetricDefinitions"]["@odata.id"] = - "/redfish/v1/TelemetryService/MetricDefinitions"; -+ asyncResp->res.jsonValue["LogService"]["@odata.id"] = -+ "/redfish/v1/Managers/bmc/LogServices/Journal"; - - crow::connections::systemBus->async_method_call( - [asyncResp](const boost::system::error_code ec, --- -2.25.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0007-event-service-fix-added-Context-field-to-response.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0007-event-service-fix-added-Context-field-to-response.patch deleted file mode 100644 index ffab743f6..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0007-event-service-fix-added-Context-field-to-response.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0ca8c383db8c9afbce63380955a20ada0acc20b7 Mon Sep 17 00:00:00 2001 -From: Krzysztof Grobelny -Date: Wed, 2 Jun 2021 12:44:43 +0000 -Subject: [PATCH] event service fix, added Context field to response - -Tested: - - Context field is present - - No regression detected - -Signed-off-by: Krzysztof Grobelny ---- - redfish-core/include/event_service_manager.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index 2b957ea..289886b 100644 ---- a/redfish-core/include/event_service_manager.hpp -+++ b/redfish-core/include/event_service_manager.hpp -@@ -556,6 +556,7 @@ class Subscription - << id; - return; - } -+ msg["Context"] = customText; - - this->sendEvent( - msg.dump(2, ' ', true, nlohmann::json::error_handler_t::replace)); --- -2.25.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0009-Add-support-for-deleting-terminated-subscriptions.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0009-Add-support-for-deleting-terminated-subscriptions.patch deleted file mode 100644 index 548e3d9c6..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0009-Add-support-for-deleting-terminated-subscriptions.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ef83a4fb14648edc6c8370363ff88fb6f060a43b Mon Sep 17 00:00:00 2001 -From: P Dheeraj Srujan Kumar -Date: Mon, 20 Sep 2021 21:55:57 +0530 -Subject: [PATCH] Add support for deleting terminated subscriptions - -Added functionality to delete/remove event subscription(s) which are -configured to Terminate after retries. - -Currently, when an Event is subscribed with Retry Policy as -"TerminateAfterRetries", the state of the connection is set to -"Terminated" after retrying, but the Subscription is not removed. -This commit adds the functionality to detect terminated connection and -remove the respective subscription. - -This commit adds this check for metric reports. - -Tested: - - Created a Subscription with - DeliveryRetryPolicy: "TerminateAfterRetries" - - Received Events successfully on Event listener - - Once the Event listener was stopped, the Subscription was - removed/deleted after retries. - -Change-Id: I3cb0af5bc24411cddcdb3d1d9de25e8e9144106c -Signed-off-by: P Dheeraj Srujan Kumar ---- - redfish-core/include/event_service_manager.hpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index c9e2812..c2fefb3 100644 ---- a/redfish-core/include/event_service_manager.hpp -+++ b/redfish-core/include/event_service_manager.hpp -@@ -1535,6 +1535,9 @@ class EventServiceManager - - std::variant& readings = - found->second; -+ -+ this->deleteTerminatedSubcriptions(); -+ - for (const auto& it : - EventServiceManager::getInstance().subscriptionsMap) - { --- -2.17.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/README b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/README index 90916ecec..541fa6aba 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/README +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/README @@ -2,29 +2,11 @@ These patches are mirror of upstream TelemetryService implementation. Until change is integrated they will be manually merged here to enable feature in Intel builds. Current revisions: -- Add support for MetricDefinition scheme - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/33363/102 - -- Sync Telmetry service with EventService - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/38798/53 - -- Switched bmcweb to use new telemetry service API - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/44270/19 - -- Add support for MetricDefinition property in MetricReport - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/44512/24 - -- Add GET method for TriggerCollection - file://telemetry/0005-Add-GET-method-for-TriggerCollection.patch +- Add support for POST on TriggersCollection + https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/44935/19 - LogService field, actual implementation will be upstreamed with triggers feature - file://telemetry/0006-Revert-Remove-LogService-from-TelemetryService.patch - -- Event service fix for Context field - file://telemetry/0007-event-service-fix-added-Context-field-to-response.patch + file://telemetry/0002-Revert-Remove-LogService-from-TelemetryService.patch -- Generalize ReadingType in MetricDefinition - file://telemetry/0008-Generalize-ReadingType-in-MetricDefinition.patch - -- Add support for deleting terminated subscriptions - file://telemetry/0009-Add-support-for-deleting-terminated-subscriptions.patch +- Switched bmcweb to use new telemetry service API + https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/44270/28 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch index de316c4fa..9225d20f1 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch @@ -1,6 +1,6 @@ -From b6863f9a0c1c36705eba0c3181541f67cd1a202a Mon Sep 17 00:00:00 2001 +From e614dec3e007d3ceaa697fd7bb264dbc1ef496e5 Mon Sep 17 00:00:00 2001 From: Krzysztof Grobelny -Date: Wed, 14 Jul 2021 09:04:42 +0000 +Date: Wed, 1 Dec 2021 12:25:07 +0100 Subject: [PATCH] Revert "Disable nbd proxy from the build" NBD Proxy has been disabled upstream. Reenable as we use it for Virtual @@ -15,24 +15,24 @@ Change-Id: I19a88b30c1074dd376f2df8f5668245b638b881f 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build -index 650a5ec..5738b10 100644 +index c9066d4..51c7f9d 100644 --- a/meson.build +++ b/meson.build -@@ -83,7 +83,8 @@ feature_map = { - 'rest' : '-DBMCWEB_ENABLE_DBUS_REST', - 'static-hosting' : '-DBMCWEB_ENABLE_STATIC_HOSTING', - 'insecure-tftp-update' : '-DBMCWEB_INSECURE_ENABLE_REDFISH_FW_TFTP_UPDATE', -- #'vm-nbdproxy' : '-DBMCWEB_ENABLE_VM_NBDPROXY', -+ 'validate-unsecure-feature' : '-DBMCWEB_ENABLE_VALIDATION_UNSECURE_FEATURE', -+ 'vm-nbdproxy' : '-DBMCWEB_ENABLE_VM_NBDPROXY', - 'vm-websocket' : '-DBMCWEB_ENABLE_VM_WEBSOCKET', +@@ -86,7 +86,8 @@ feature_map = { + 'static-hosting' : '-DBMCWEB_ENABLE_STATIC_HOSTING', + 'vm-websocket' : '-DBMCWEB_ENABLE_VM_WEBSOCKET', + 'xtoken-auth' : '-DBMCWEB_ENABLE_XTOKEN_AUTHENTICATION', +- #'vm-nbdproxy' : '-DBMCWEB_ENABLE_VM_NBDPROXY', ++ 'vm-nbdproxy' : '-DBMCWEB_ENABLE_VM_NBDPROXY', ++ 'validate-unsecure-feature' : '-DBMCWEB_ENABLE_VALIDATION_UNSECURE_FEATURE', } + # Get the options status and build a project summary to show which flags are diff --git a/meson_options.txt b/meson_options.txt -index ff5b887..645f224 100644 +index 4661658..435f382 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -3,14 +3,7 @@ option('yocto-deps', type: 'feature', value: 'disabled', description : 'Use YOCT +@@ -2,14 +2,7 @@ option('yocto-deps', type: 'feature', value: 'disabled', description : 'Use YOCT option('kvm', type : 'feature',value : 'enabled', description : 'Enable the KVM host video WebSocket. Path is \'/kvm/0\'. Video is from the BMC\'s \'/dev/video\' device.') option ('tests', type : 'feature', value : 'enabled', description : 'Enable Unit tests for bmcweb') option('vm-websocket', type : 'feature', value : 'enabled', description : '''Enable the Virtual Media WebSocket. Path is \'/vm/0/0\'to open the websocket. See https://github.com/openbmc/jsnbd/blob/master/README.''') @@ -45,10 +45,10 @@ index ff5b887..645f224 100644 -# opportunity to upstream their backend implementation -#option('vm-nbdproxy', type: 'feature', value : 'disabled', description : 'Enable the Virtual Media WebSocket.') +option('vm-nbdproxy', type: 'feature', value : 'disabled', description : 'Enable the Virtual Media WebSocket.') - option('rest', type : 'feature', value : 'enabled', description : '''Enable Phosphor REST (D-Bus) APIs. Paths directly map Phosphor D-Bus object paths, for example, \'/xyz/openbmc_project/logging/entry/enumerate\'. See https://github.com/openbmc/docs/blob/master/rest-api.md.''') + option('rest', type : 'feature', value : 'disabled', description : '''Enable Phosphor REST (D-Bus) APIs. Paths directly map Phosphor D-Bus object paths, for example, \'/xyz/openbmc_project/logging/entry/enumerate\'. See https://github.com/openbmc/docs/blob/master/rest-api.md.''') option('redfish', type : 'feature',value : 'enabled', description: 'Enable Redfish APIs. Paths are under \'/redfish/v1/\'. See https://github.com/openbmc/bmcweb/blob/master/DEVELOPING.md#redfish.') option('host-serial-socket', type : 'feature', value : 'enabled', description : 'Enable host serial console WebSocket. Path is \'/console0\'. See https://github.com/openbmc/docs/blob/master/console.md.') -@@ -39,6 +32,7 @@ option ('https_port', type : 'integer', min : 1, max : 65535, value : 443, descr +@@ -38,6 +31,7 @@ option ('https_port', type : 'integer', min : 1, max : 65535, value : 443, descr # the implications of doing so.In general, enabling these options will cause security # problems of varying degrees diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch index 439b05b3c..6443124c2 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch @@ -1,7 +1,7 @@ -From 437a2a854303ed4e05344684b1990806464268cd Mon Sep 17 00:00:00 2001 +From 47d907688368b98320d785aa8d285c9cf031d067 Mon Sep 17 00:00:00 2001 From: Krzysztof Grobelny -Date: Thu, 1 Jul 2021 10:08:27 +0000 -Subject: [PATCH] Invalid status code from InsertMedia REST methods GET, PUT, +Date: Wed, 1 Dec 2021 12:27:22 +0100 +Subject: [PATCH] Invalid status code from InsertMedia REST methods GET, PUT, DELETE, PATCH in proxy mode Add handlers for GET, PUT, DELETE, PATCH method and function that @@ -16,7 +16,7 @@ Signed-off-by: P Dheeraj Srujan Kumar 1 file changed, 137 insertions(+) diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp -index 3b9f7ef..7d77b9f 100644 +index 601b973..7d9dade 100644 --- a/redfish-core/lib/virtual_media.hpp +++ b/redfish-core/lib/virtual_media.hpp @@ -30,6 +30,117 @@ @@ -29,7 +29,7 @@ index 3b9f7ef..7d77b9f 100644 + * and sets suitable response code for unsupported REST method. + * + */ -+void CheckProxyMode(const std::shared_ptr& aResp, ++void checkProxyMode(const std::shared_ptr& aResp, + const crow::Request& req, const std::string& name, + const std::string& resName) +{ @@ -137,7 +137,7 @@ index 3b9f7ef..7d77b9f 100644 /** * @brief Function extracts transfer protocol name from URI. */ -@@ -844,6 +955,32 @@ inline void doVmAction(const std::shared_ptr& asyncResp, +@@ -850,6 +961,32 @@ inline void doVmAction(const std::shared_ptr& asyncResp, inline void requestNBDVirtualMediaRoutes(App& app) { @@ -148,7 +148,7 @@ index 3b9f7ef..7d77b9f 100644 + [](const crow::Request& req, + const std::shared_ptr& asyncResp, + const std::string& name, const std::string& resName) { -+ CheckProxyMode(asyncResp, req, name, resName); ++ checkProxyMode(asyncResp, req, name, resName); + }); + + for (auto method : @@ -163,13 +163,13 @@ index 3b9f7ef..7d77b9f 100644 + [](const crow::Request& req, + const std::shared_ptr& asyncResp, + const std::string& name, const std::string& resName) { -+ CheckProxyMode(asyncResp, req, name, resName); ++ checkProxyMode(asyncResp, req, name, resName); + }); + } + - BMCWEB_ROUTE(app, "/redfish/v1/Managers//VirtualMedia//Actions/" - "VirtualMedia.InsertMedia") - .privileges(redfish::privileges::postVirtualMedia) + BMCWEB_ROUTE( + app, + "/redfish/v1/Managers//VirtualMedia//Actions/VirtualMedia.InsertMedia") -- -2.17.1 +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend index a716e612d..7183dfffa 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,16 +1,10 @@ SRC_URI = "git://github.com/openbmc/bmcweb.git" -SRCREV = "b7ff344535c42af074c60bfb272ef66a2ba157b4" +SRCREV = "85ffe86a60f50ce9ad5728caf384a0dd0c8cc6a5" DEPENDS += "boost-url" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -# add a user called bmcweb for the server to assume -# bmcweb is part of group shadow for non-root pam authentication -USERADD_PARAM:${PN} = "-r -s /usr/sbin/nologin -d /home/bmcweb -m -G shadow bmcweb" - -GROUPADD_PARAM:${PN} = "web; redfish " - SRC_URI += "file://0001-Firmware-update-configuration-changes.patch \ file://0002-Use-chip-id-based-UUID-for-Service-Root.patch \ file://0010-managers-add-attributes-for-Manager.CommandShell.patch \ @@ -26,7 +20,9 @@ SRC_URI += "file://0001-Firmware-update-configuration-changes.patch \ file://0020-Redfish-Deny-set-AccountLockDuration-to-zero.patch \ file://0023-Add-get-IPMI-session-id-s-to-Redfish.patch \ file://0024-Add-count-sensor-type.patch \ - file://0025-Add-Model-CoreCount-to-ProcessorSummary.patch \ + file://0025-Add-Model-to-ProcessorSummary.patch \ + file://0026-Revert-Delete-the-copy-constructor-on-the-Request.patch \ + file://0027-Convert-VariantType-to-DbusVariantType.patch \ " # OOB Bios Config: @@ -36,10 +32,12 @@ SRC_URI += "file://biosconfig/0001-Define-Redfish-interface-Registries-Bios.patc file://biosconfig/0004-Add-support-to-ChangePassword-action.patch \ file://biosconfig/0005-Fix-remove-bios-user-pwd-change-option-via-Redfish.patch \ file://biosconfig/0006-Add-fix-for-broken-feature-Pending-Attributes.patch \ + file://biosconfig/0007-Add-BiosAttributeRegistry-node-under-Registries.patch \ " # Virtual Media: Backend code is not upstreamed so downstream only patches. -SRC_URI += "file://vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch \ +SRC_URI += " \ + file://vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch \ file://vm/0002-bmcweb-handle-device-or-resource-busy-exception.patch \ file://vm/0003-Add-ConnectedVia-property-to-virtual-media-item-temp.patch \ file://vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch \ @@ -56,35 +54,26 @@ SRC_URI += "file://eventservice/0001-Add-unmerged-changes-for-http-retry-support file://eventservice/0006-Add-EventService-SSE-filter-support.patch \ file://eventservice/0007-EventService-Log-events-for-subscription-actions.patch \ file://eventservice/0008-Add-checks-on-Event-Subscription-input-parameters.patch \ - file://eventservice/0009-Restructure-Redifsh-EventLog-Transmit-code-flow.patch \ file://eventservice/0010-Remove-Terminated-Event-Subscriptions.patch \ file://eventservice/0011-Fix-bmcweb-crash-while-deleting-terminated-subscriptions.patch \ + file://eventservice/0012-Add-support-for-deleting-terminated-subscriptions.patch \ + file://eventservice/0013-event-service-fix-added-Context-field-to-response.patch \ " + # Temporary downstream mirror of upstream patches, see telemetry\README for details -SRC_URI += " file://telemetry/0001-Add-support-for-MetricDefinition-scheme.patch \ - file://telemetry/0002-Sync-Telmetry-service-with-EventService.patch \ +SRC_URI += " file://telemetry/0001-Add-support-for-POST-on-TriggersCollection.patch \ + file://telemetry/0002-Revert-Remove-LogService-from-TelemetryService.patch \ file://telemetry/0003-Switched-bmcweb-to-use-new-telemetry-service-API.patch \ - file://telemetry/0004-Add-support-for-MetricDefinition-property-in-MetricReport.patch \ - file://telemetry/0005-Add-GET-method-for-TriggerCollection.patch \ - file://telemetry/0006-Revert-Remove-LogService-from-TelemetryService.patch \ - file://telemetry/0007-event-service-fix-added-Context-field-to-response.patch \ - file://telemetry/0009-Add-support-for-deleting-terminated-subscriptions.patch \ " # Temporary downstream patch for routing and privilege changes -SRC_URI += " file://http_routing/0001-Add-asyncResp-support-during-handleUpgrade.patch \ - file://http_routing/0002-Move-privileges-to-separate-entity.patch \ - file://http_routing/0003-Add-Support-for-privilege-check-in-handleUpgrade.patch \ - file://http_routing/0004-Add-Privileges-to-Websockets.patch \ - file://http_routing/0005-Add-Privileges-to-SseSockets.patch \ -" - -# Temporary fix: Move it to service file -do_install:append() { - install -d ${D}/var/lib/bmcweb - install -d ${D}/etc/ssl/certs/authority -} +SRC_URI += "file://http_routing/0001-Add-asyncResp-support-during-handleUpgrade.patch \ + file://http_routing/0002-Move-privileges-to-separate-entity.patch \ + file://http_routing/0003-Add-Support-for-privilege-check-in-handleUpgrade.patch \ + file://http_routing/0004-Add-Privileges-to-Websockets.patch \ + file://http_routing/0005-Add-Privileges-to-SseSockets.patch \ + " # Enable PFR support EXTRA_OEMESON += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', '-Dredfish-provisioning-feature=enabled', '', d)}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch deleted file mode 100644 index 112c1ffab..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch +++ /dev/null @@ -1,292 +0,0 @@ -From 99f63d2af9f45badaa8aff4ef958443bea62ede8 Mon Sep 17 00:00:00 2001 -From: "Jason M. Bills" -Date: Mon, 3 Jun 2019 17:01:47 -0700 -Subject: [PATCH] Update IPMI Chassis Control command - -This change updates the IPMI Chassis Control command to use the new -host state transitions. This allows each chassis control action -to more closely follow the behavior defined in the IPMI spec. - -ref: https://gerrit.openbmc-project.xyz/c/openbmc/docs/+/22358 - -Tested: -Ran each IPMI chassis control command to confirm the expected -behavior: -ipmitool power on: system is powered-on -ipmitool power off: system is forced off -ipmitool power cycle: system is forced off then powered-on -ipmitool power reset: system is hard reset -ipmitool power soft: soft power-off requested from system software - -Change-Id: Ic9fba3ca4abd9a758eb88f1e6ee09f7ca64ff80a -Signed-off-by: Jason M. Bills ---- - chassishandler.cpp | 204 +++++++++++---------------------------------- - 1 file changed, 48 insertions(+), 156 deletions(-) - -diff --git a/chassishandler.cpp b/chassishandler.cpp -index dfbe004be490..cd0ba3402f84 100644 ---- a/chassishandler.cpp -+++ b/chassishandler.cpp -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -815,59 +816,63 @@ ipmi::RspType<> ipmiSetChassisCap(bool intrusion, bool fpLockout, - //------------------------------------------ - // Calls into Host State Manager Dbus object - //------------------------------------------ --int initiate_state_transition(State::Host::Transition transition) -+int initiateHostStateTransition(State::Host::Transition transition) - { - // OpenBMC Host State Manager dbus framework -- constexpr auto HOST_STATE_MANAGER_ROOT = "/xyz/openbmc_project/state/host0"; -- constexpr auto HOST_STATE_MANAGER_IFACE = "xyz.openbmc_project.State.Host"; -- constexpr auto DBUS_PROPERTY_IFACE = "org.freedesktop.DBus.Properties"; -- constexpr auto PROPERTY = "RequestedHostTransition"; -+ constexpr auto hostStatePath = "/xyz/openbmc_project/state/host0"; -+ constexpr auto hostStateIntf = "xyz.openbmc_project.State.Host"; - -- // sd_bus error -- int rc = 0; -- char* busname = NULL; -+ auto service = ipmi::getService(*getSdBus(), hostStateIntf, hostStatePath); - -- // SD Bus error report mechanism. -- sd_bus_error bus_error = SD_BUS_ERROR_NULL; -+ // Convert to string equivalent of the passed in transition enum. -+ auto request = State::convertForMessage(transition); - -- // Gets a hook onto either a SYSTEM or SESSION bus -- sd_bus* bus_type = ipmid_get_sd_bus_connection(); -- rc = mapper_get_service(bus_type, HOST_STATE_MANAGER_ROOT, &busname); -- if (rc < 0) -+ try -+ { -+ ipmi::setDbusProperty(*getSdBus(), service, hostStatePath, -+ hostStateIntf, "RequestedHostTransition", -+ request); -+ } -+ catch (std::exception& e) - { - log( -- "Failed to get bus name", -- entry("ERRNO=0x%X, OBJPATH=%s", -rc, HOST_STATE_MANAGER_ROOT)); -- return rc; -+ "Failed to initiate transition", -+ entry("EXCEPTION=%s, REQUEST=%s", e.what(), request.c_str())); -+ return -1; - } -+ return 0; -+} -+ -+//------------------------------------------ -+// Calls into Chassis State Manager Dbus object -+//------------------------------------------ -+int initiateChassisStateTransition(State::Chassis::Transition transition) -+{ -+ // OpenBMC Chassis State Manager dbus framework -+ constexpr auto chassisStatePath = "/xyz/openbmc_project/state/chassis0"; -+ constexpr auto chassisStateIntf = "xyz.openbmc_project.State.Chassis"; -+ -+ auto service = -+ ipmi::getService(*getSdBus(), chassisStateIntf, chassisStatePath); - - // Convert to string equivalent of the passed in transition enum. - auto request = State::convertForMessage(transition); - -- rc = sd_bus_call_method(bus_type, // On the system bus -- busname, // Service to contact -- HOST_STATE_MANAGER_ROOT, // Object path -- DBUS_PROPERTY_IFACE, // Interface name -- "Set", // Method to be called -- &bus_error, // object to return error -- nullptr, // Response buffer if any -- "ssv", // Takes 3 arguments -- HOST_STATE_MANAGER_IFACE, PROPERTY, "s", -- request.c_str()); -- if (rc < 0) -- { -- log("Failed to initiate transition", -- entry("ERRNO=0x%X, REQUEST=%s", -rc, request.c_str())); -+ try -+ { -+ ipmi::setDbusProperty(*getSdBus(), service, chassisStatePath, -+ chassisStateIntf, "RequestedPowerTransition", -+ request); - } -- else -+ catch (std::exception& e) - { -- log("Transition request initiated successfully"); -+ log( -+ "Failed to initiate transition", -+ entry("EXCEPTION=%s, REQUEST=%s", e.what(), request.c_str())); -+ return -1; - } - -- sd_bus_error_free(&bus_error); -- free(busname); -- -- return rc; -+ return 0; - } - - //------------------------------------------ -@@ -1302,76 +1307,6 @@ ipmi::RspType("Failed to set property in SoftPowerOff object", -- entry("ERRNO=0x%X", -rc)); -- } -- -- // TODO openbmc/openbmc#1661 - Mapper refactor -- // free(busname); -- return rc; --} -- --//---------------------------------------------------------------------- --// Create file to indicate there is no need for softoff notification to host --//---------------------------------------------------------------------- --void indicate_no_softoff_needed() --{ -- fs::path path{HOST_INBAND_REQUEST_DIR}; -- if (!fs::is_directory(path)) -- { -- fs::create_directory(path); -- } -- -- // Add the host instance (default 0 for now) to the file name -- std::string file{HOST_INBAND_REQUEST_FILE}; -- auto size = std::snprintf(nullptr, 0, file.c_str(), 0); -- size++; // null -- std::unique_ptr buf(new char[size]); -- std::snprintf(buf.get(), size, file.c_str(), 0); -- -- // Append file name to directory and create it -- path /= buf.get(); -- std::ofstream(path.c_str()); --} -- - /** @brief Implementation of chassis control command - * - * @param - chassisControl command byte -@@ -1384,66 +1319,22 @@ ipmi::RspType<> ipmiChassisControl(uint8_t chassisControl) - switch (chassisControl) - { - case CMD_POWER_ON: -- rc = initiate_state_transition(State::Host::Transition::On); -+ rc = initiateHostStateTransition(State::Host::Transition::On); - break; - case CMD_POWER_OFF: -- // This path would be hit in 2 conditions. -- // 1: When user asks for power off using ipmi chassis command 0x04 -- // 2: Host asking for power off post shutting down. -- -- // If it's a host requested power off, then need to nudge Softoff -- // application that it needs to stop the watchdog timer if running. -- // If it is a user requested power off, then this is not really -- // needed. But then we need to differentiate between user and host -- // calling this same command -- -- // For now, we are going ahead with trying to nudge the soft off and -- // interpret the failure to do so as a non softoff case -- rc = stop_soft_off_timer(); -- -- // Only request the Off transition if the soft power off -- // application is not running -- if (rc < 0) -- { -- // First create a file to indicate to the soft off application -- // that it should not run. Not doing this will result in State -- // manager doing a default soft power off when asked for power -- // off. -- indicate_no_softoff_needed(); -- -- // Now request the shutdown -- rc = initiate_state_transition(State::Host::Transition::Off); -- } -- else -- { -- log("Soft off is running, so let shutdown target " -- "stop the host"); -- } -+ rc = -+ initiateChassisStateTransition(State::Chassis::Transition::Off); - break; -- - case CMD_HARD_RESET: -- rc = initiate_state_transition( -+ rc = initiateHostStateTransition( - State::Host::Transition::ForceWarmReboot); - break; - case CMD_POWER_CYCLE: -- // SPEC has a section that says certain implementations can trigger -- // PowerOn if power is Off when a command to power cycle is -- // requested -- -- // First create a file to indicate to the soft off application -- // that it should not run since this is a direct user initiated -- // power reboot request (i.e. a reboot request that is not -- // originating via a soft power off SMS request) -- indicate_no_softoff_needed(); -- -- rc = initiate_state_transition(State::Host::Transition::Reboot); -+ rc = initiateHostStateTransition(State::Host::Transition::Reboot); - break; -- - case CMD_SOFT_OFF_VIA_OVER_TEMP: -- // Request Host State Manager to do a soft power off -- rc = initiate_state_transition(State::Host::Transition::Off); -+ rc = initiateHostStateTransition(State::Host::Transition::Off); - break; -- - case CMD_PULSE_DIAGNOSTIC_INTR: - rc = setNmiProperty(true); - break; --- -2.17.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 87aab6f79..5c0908515 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -2,14 +2,13 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PROJECT_SRC_DIR := "${THISDIR}/${PN}" #SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "78fe1b14f60d55ae335369fb2c6e81ed9ac6d865" +SRCREV = "f93da667b58b67cf61d06dcc5862d9864c96d8e7" SRC_URI += "file://phosphor-ipmi-host.service \ file://0010-fix-get-system-GUID-ipmi-command.patch \ file://0053-Fix-keep-looping-issue-when-entering-OS.patch \ file://0059-Move-Set-SOL-config-parameter-to-host-ipmid.patch \ file://0060-Move-Get-SOL-config-parameter-to-host-ipmid.patch \ - file://0062-Update-IPMI-Chassis-Control-command.patch \ file://0063-Save-the-pre-timeout-interrupt-in-dbus-property.patch \ " diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend index a0b507cb8..853d68d87 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -3,7 +3,7 @@ inherit useradd # TODO: This should be removed, once up-stream bump up # issue is resolved SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "5819666c23ee1d01a54fc5fb2c068bb1da1f29c7" +SRCREV = "af23add2a2cf73226cdc72af4793fde6357e8932" USERADD_PACKAGES = "${PN}" # add a group called ipmi diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb index 14093cf3e..5935b3289 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Node Manager Proxy" DESCRIPTION = "The Node Manager Proxy provides a simple interface for communicating \ with Management Engine via IPMB" -SRC_URI = "git://github.com/Intel-BMC/node-manager;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/node-manager.git;protocol=ssh" SRCREV = "9aca80fa2a405938de99aae777e6cfcf08525563" PV = "0.1+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/network/phosphor-snmp_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/network/phosphor-snmp_%.bbappend index 6d9294635..1c8d7c91f 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/network/phosphor-snmp_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/network/phosphor-snmp_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" # SRC_URI = "git://github.com/openbmc/phosphor-snmp" -SRCREV = "d560529eb7e22c0b78fb0def20f57c6f35be9dfe" +SRCREV = "7350c77aa635cff08c5f1ee32e10679de7c5afda" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/peci/peci-pcie_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/peci/peci-pcie_%.bbappend index e7c5d1af3..34b6e89e7 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/peci/peci-pcie_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/peci/peci-pcie_%.bbappend @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/openbmc/peci-pcie" -SRCREV = "de624395a587be555463a14a3db90500b4e0521c" +SRCREV = "bb5efe7b3ecfd56584cef10739b3395ef3017dd4" EXTRA_OECMAKE += "-DWAIT_FOR_OS_STANDBY=1 -DUSE_RDENDPOINTCFG=1" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb index 592d6ae0c..a342f25c7 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb @@ -1,7 +1,7 @@ SUMMARY = "libmctp:intel" DESCRIPTION = "Implementation of MCTP(DMTF DSP0236)" -SRC_URI = "git://github.com/Intel-BMC/libmctp.git;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/libmctp.git;protocol=ssh" SRCREV = "d530c2271e1f9ff5d76a170c0abd64bd03ef40fd" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libpldm-intel_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libpldm-intel_git.bb index 162b4ed74..f86d8b7bc 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libpldm-intel_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libpldm-intel_git.bb @@ -1,10 +1,10 @@ SUMMARY = "libpldm_intel" DESCRIPTION = "Provides encode/decode APIs for PLDM specifications" -SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "94437a678a1d23b22dc179b5cb7b165e52a429c0" +SRC_URI = "git://git@github.com/Intel-BMC/libpldm.git;protocol=ssh;branch=main" +SRCREV = "cf792b06a27f308a888c4bbf5cb5f8b90fa18d22" -S = "${WORKDIR}/git/libpldm_intel" +S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb index fda4d6b79..e6a953468 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb @@ -4,10 +4,10 @@ DESCRIPTION = "Implementation of MCTP (DTMF DSP0236)" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=bcd9ada3a943f58551867d72893cc9ab" -SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "94437a678a1d23b22dc179b5cb7b165e52a429c0" +SRC_URI = "git://git@github.com/Intel-BMC/mctp-emulator.git;protocol=ssh;branch=main" +SRCREV = "3a95b7be9114d8a7f559ba68799e3c55d91aab13" -S = "${WORKDIR}/git/mctp_emulator" +S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-wrapper.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-wrapper.bb index 05e64ed46..5ddd791a1 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-wrapper.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-wrapper.bb @@ -4,10 +4,10 @@ DESCRIPTION = "Implementation of MCTP Wrapper Library" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=bcd9ada3a943f58551867d72893cc9ab" -SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "94437a678a1d23b22dc179b5cb7b165e52a429c0" +SRC_URI = "git://git@github.com/Intel-BMC/mctp-wrapper.git;protocol=ssh;branch=main" +SRCREV = "643337bb5d2eb9697335a38d6e57cbcea20123f2" -S = "${WORKDIR}/git/mctp_wrapper" +S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb index 8b088be23..1710c1acd 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb @@ -2,16 +2,16 @@ SUMMARY = "MCTP Daemon" DESCRIPTION = "Implementation of MCTP (DTMF DSP0236)" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PN}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "94437a678a1d23b22dc179b5cb7b165e52a429c0" +SRC_URI = "git://git@github.com/Intel-BMC/mctpd.git;protocol=ssh;branch=main" +SRCREV = "60c0862eb286b2de8cee93a2f6736a3d317d9739" S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" -OECMAKE_SOURCEPATH = "${S}/${PN}" +OECMAKE_SOURCEPATH = "${S}" inherit cmake systemd diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb index b1c40ab61..2c84eb697 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb @@ -4,10 +4,10 @@ DESCRIPTION = "Implementation of MCTP Wrapper Library Plus" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=615045c30a05cde5c0e924854d43c327" -SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "94437a678a1d23b22dc179b5cb7b165e52a429c0" +SRC_URI = "git://git@github.com/Intel-BMC/mctpwplus.git;protocol=ssh;branch=main" +SRCREV = "7a7425ce324497d1199af2cc9ce0e948cc226307" -S = "${WORKDIR}/git/mctpwplus" +S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb index 84c2c8066..97168e8a9 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb @@ -4,8 +4,8 @@ DESCRIPTION = "Implementation of NVMe MI daemon" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/Intel-BMC/nvme-mi.git;protocol=ssh" -SRCREV = "c3d5021fb60cd46d5c948c69f3d57ac9648b5be5" +SRC_URI = "git://git@github.com/Intel-BMC/nvme-mi.git;protocol=ssh;branch=master" +SRCREV = "f33407cec7dd1f5702402d9dea05d6a141f34d4d" S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb index 16253b5d0..661db1ea0 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb @@ -4,10 +4,10 @@ DESCRIPTION = "Implementation of PLDM specifications" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI += "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "94437a678a1d23b22dc179b5cb7b165e52a429c0" +SRC_URI += "git://git@github.com/Intel-BMC/pldmd.git;protocol=ssh;branch=main;branch=main" +SRCREV = "5a698ca08b8159d935f8ccbc09a84960cf201896" -S = "${WORKDIR}/git/pldmd" +S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pmci-launcher.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pmci-launcher.bb index c640c5664..4da8e97a2 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pmci-launcher.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pmci-launcher.bb @@ -4,10 +4,10 @@ DESCRIPTION = "Support to launch pmci services on-demand" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "94437a678a1d23b22dc179b5cb7b165e52a429c0" +SRC_URI = "git://git@github.com/Intel-BMC/pmci-launcher.git;protocol=ssh;branch=main" +SRCREV = "5b29e915cf8c34f84a6d4c03bd7fccf1a0642398" -S = "${WORKDIR}/git/pmci_launcher" +S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb index 79971942a..3483293f7 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/Intel-BMC/provisioning-mode-manager.git;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/provisioning-mode-manager.git;protocol=ssh" SRCREV = "0aca01b4ce9b303e12ba0f757f56390da139c8bb" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb index 783dea029..c30c62ca2 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb @@ -3,14 +3,14 @@ DESCRIPTION = "Daemon check for Remote debug enable and user account violation" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/security-manager" +S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit cmake systemd -SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "bee56d62b209088454d166d1efae4825a2b175df" +SRC_URI = "git://git@github.com/Intel-BMC/security-manager.git;protocol=ssh;branch=main" +SRCREV = "1cf60de11c5f13bd791402aef7f9a8d33de54c64" SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.SecurityManager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-check-for-min-max-received-from-hwmon-files.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-check-for-min-max-received-from-hwmon-files.patch index 33d35ec5e..d864d3290 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-check-for-min-max-received-from-hwmon-files.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-check-for-min-max-received-from-hwmon-files.patch @@ -1,4 +1,4 @@ -From 2516d67f8bb5ecd241b8dcdec3f8c58d0e3c4744 Mon Sep 17 00:00:00 2001 +From 021b17af775b58a61661f75af595b71625509241 Mon Sep 17 00:00:00 2001 From: Wojciech Dembinski Date: Mon, 7 Dec 2020 19:23:10 +0100 Subject: [PATCH] Add check for min/max received from hwmon files @@ -21,7 +21,7 @@ Change-Id: Ia061f849b0f434812f822ed1902c8964d4c64b45 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/src/CPUSensor.cpp b/src/CPUSensor.cpp -index 2356821..01f5eb6 100644 +index cd1038f..16c3686 100644 --- a/src/CPUSensor.cpp +++ b/src/CPUSensor.cpp @@ -1,5 +1,5 @@ @@ -31,7 +31,7 @@ index 2356821..01f5eb6 100644 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. -@@ -146,19 +146,22 @@ void CPUSensor::setupRead(void) +@@ -166,19 +166,22 @@ void CPUSensor::setupRead(void) void CPUSensor::updateMinMaxValues(void) { @@ -62,7 +62,7 @@ index 2356821..01f5eb6 100644 if (auto fileParts = splitFileName(path)) { -@@ -168,26 +171,25 @@ void CPUSensor::updateMinMaxValues(void) +@@ -188,26 +191,25 @@ void CPUSensor::updateMinMaxValues(void) { for (const auto& vectorItem : mapIt->second) { diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0002-Fix-PECI-client-creation-flow.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0002-Fix-PECI-client-creation-flow.patch index cfdc99d66..fdb245545 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0002-Fix-PECI-client-creation-flow.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0002-Fix-PECI-client-creation-flow.patch @@ -1,4 +1,4 @@ -From 0a1b2a13f6dbc64b5851ac2b1ca99d57afa78d60 Mon Sep 17 00:00:00 2001 +From 34d1e910cd1c9daa271ebb8c50edc5fc9b763b1a Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo Date: Wed, 27 Jan 2021 15:52:16 -0800 Subject: [PATCH] Fix PECI client creation flow @@ -7,15 +7,16 @@ This commit fixes the PECI client creation flow to make it retry the creation when the client is not exposed correctly. Signed-off-by: Jae Hyun Yoo +Signed-off-by: AppaRao Puli --- - src/CPUSensorMain.cpp | 66 +++++++++++++++++++++++++++++++++++-------- - 1 file changed, 54 insertions(+), 12 deletions(-) + src/CPUSensorMain.cpp | 69 +++++++++++++++++++++++++++++++++++-------- + 1 file changed, 56 insertions(+), 13 deletions(-) diff --git a/src/CPUSensorMain.cpp b/src/CPUSensorMain.cpp -index f304e3f..92c1716 100644 +index 9e991e7..abae170 100644 --- a/src/CPUSensorMain.cpp +++ b/src/CPUSensorMain.cpp -@@ -82,6 +82,7 @@ struct CPUConfig +@@ -83,6 +83,7 @@ struct CPUConfig }; static constexpr const char* peciDev = "/dev/peci-"; @@ -23,16 +24,19 @@ index f304e3f..92c1716 100644 static constexpr const unsigned int rankNumMax = 8; namespace fs = std::filesystem; -@@ -167,7 +168,7 @@ bool createSensors(boost::asio::io_service& io, +@@ -168,8 +169,9 @@ bool createSensors(boost::asio::io_service& io, } std::vector hwmonNamePaths; -- if (!findFiles(fs::path(R"(/sys/bus/peci/devices)"), +- if (!findFiles(fs::path(R"(/sys/bus/peci/devices/peci-0)"), +- R"(\d+-.+/peci-.+/hwmon/hwmon\d+/name$)", hwmonNamePaths, 5)) + if (!findFiles(fs::path(peciDevPath), - R"(peci-\d+/\d+-.+/peci-.+/hwmon/hwmon\d+/name$)", - hwmonNamePaths, 6)) ++ R"(peci-\d+/\d+-.+/peci-.+/hwmon/hwmon\d+/name$)", ++ hwmonNamePaths, 6)) { -@@ -403,7 +404,7 @@ bool createSensors(boost::asio::io_service& io, + std::cerr << "No CPU sensors in system\n"; + return true; +@@ -403,7 +405,7 @@ bool createSensors(boost::asio::io_service& io, return true; } @@ -41,7 +45,7 @@ index f304e3f..92c1716 100644 { std::ostringstream hex; hex << std::hex << config.addr; -@@ -411,9 +412,12 @@ void exportDevice(const CPUConfig& config) +@@ -411,9 +413,12 @@ void exportDevice(const CPUConfig& config) std::string busStr = std::to_string(config.bus); std::string parameters = "peci-client 0x" + addrHexStr; @@ -56,7 +60,7 @@ index f304e3f..92c1716 100644 const std::string& dir = devicePath.parent_path().string(); for (const auto& path : std::filesystem::directory_iterator(dir)) { -@@ -431,20 +435,38 @@ void exportDevice(const CPUConfig& config) +@@ -431,20 +436,38 @@ void exportDevice(const CPUConfig& config) std::cout << parameters << " on bus " << busStr << " is already exported\n"; } @@ -99,7 +103,7 @@ index f304e3f..92c1716 100644 } void detectCpu(boost::asio::deadline_timer& pingTimer, -@@ -460,6 +482,11 @@ void detectCpu(boost::asio::deadline_timer& pingTimer, +@@ -460,6 +483,11 @@ void detectCpu(boost::asio::deadline_timer& pingTimer, for (CPUConfig& config : cpuConfigs) { @@ -111,7 +115,7 @@ index f304e3f..92c1716 100644 std::string peciDevPath = peciDev + std::to_string(config.bus); auto file = open(peciDevPath.c_str(), O_RDWR | O_CLOEXEC); if (file < 0) -@@ -510,16 +537,29 @@ void detectCpu(boost::asio::deadline_timer& pingTimer, +@@ -510,16 +538,29 @@ void detectCpu(boost::asio::deadline_timer& pingTimer, newState = State::OFF; } @@ -145,7 +149,7 @@ index f304e3f..92c1716 100644 } if (newState == State::ON) -@@ -542,6 +582,8 @@ void detectCpu(boost::asio::deadline_timer& pingTimer, +@@ -542,6 +583,8 @@ void detectCpu(boost::asio::deadline_timer& pingTimer, keepPinging = true; } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0003-Fix-missing-threshold-de-assert-event-when-threshold.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0003-Fix-missing-threshold-de-assert-event-when-threshold.patch index 1cba1095d..fe9ce264d 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0003-Fix-missing-threshold-de-assert-event-when-threshold.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0003-Fix-missing-threshold-de-assert-event-when-threshold.patch @@ -1,4 +1,4 @@ -From db4353de222b51726c8e3c765cc8f1df4ad67687 Mon Sep 17 00:00:00 2001 +From d477be5da32c62fc30096a99d1e601ed7c42a10c Mon Sep 17 00:00:00 2001 From: Zhikui Ren Date: Tue, 22 Jun 2021 11:35:12 -0700 Subject: [PATCH] Fix missing de-assert event when threshold changes @@ -46,10 +46,10 @@ Signed-off-by: Zhikui Ren 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/include/Thresholds.hpp b/include/Thresholds.hpp -index af63f72..fd507d0 100644 +index 209d68e..640fdb4 100644 --- a/include/Thresholds.hpp +++ b/include/Thresholds.hpp -@@ -44,7 +44,7 @@ struct Threshold +@@ -47,7 +47,7 @@ struct Threshold void assertThresholds(Sensor* sensor, double assertValue, thresholds::Level level, thresholds::Direction direction, @@ -59,18 +59,18 @@ index af63f72..fd507d0 100644 struct TimerUsed { diff --git a/include/sensor.hpp b/include/sensor.hpp -index b98241b..6235674 100644 +index d38bcde..b8cfd66 100644 --- a/include/sensor.hpp +++ b/include/sensor.hpp -@@ -71,6 +71,7 @@ struct Sensor - std::shared_ptr operationalInterface; +@@ -81,6 +81,7 @@ struct Sensor + std::shared_ptr valueMutabilityInterface; double value = std::numeric_limits::quiet_NaN(); double rawValue = std::numeric_limits::quiet_NaN(); + bool hadValidValue = false; bool overriddenState = false; bool internalSet = false; double hysteresisTrigger; -@@ -432,6 +433,7 @@ struct Sensor +@@ -462,6 +463,7 @@ struct Sensor { markFunctional(true); markAvailable(true); @@ -79,10 +79,10 @@ index b98241b..6235674 100644 } diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp -index 821083a..da0d650 100644 +index 0581f21..84df7cf 100644 --- a/src/Thresholds.cpp +++ b/src/Thresholds.cpp -@@ -418,10 +418,19 @@ bool checkThresholds(Sensor* sensor) +@@ -426,10 +426,19 @@ bool checkThresholds(Sensor* sensor) { bool status = true; std::vector changes = checkThresholds(sensor, sensor->value); @@ -103,7 +103,7 @@ index 821083a..da0d650 100644 if (change.threshold.level == thresholds::Level::CRITICAL && change.asserted) { -@@ -443,6 +452,7 @@ void checkThresholdsPowerDelay(const std::weak_ptr& weakSensor, +@@ -451,6 +460,7 @@ void checkThresholdsPowerDelay(const std::weak_ptr& weakSensor, Sensor* sensor = sensorPtr.get(); std::vector changes = checkThresholds(sensor, sensor->value); @@ -111,7 +111,7 @@ index 821083a..da0d650 100644 for (const auto& change : changes) { // When CPU is powered off, some volatges are expected to -@@ -467,13 +477,13 @@ void checkThresholdsPowerDelay(const std::weak_ptr& weakSensor, +@@ -475,13 +485,13 @@ void checkThresholdsPowerDelay(const std::weak_ptr& weakSensor, } } assertThresholds(sensor, change.assertValue, change.threshold.level, @@ -127,7 +127,7 @@ index 821083a..da0d650 100644 { std::string property; std::shared_ptr interface; -@@ -513,7 +523,9 @@ void assertThresholds(Sensor* sensor, double assertValue, +@@ -521,7 +531,9 @@ void assertThresholds(Sensor* sensor, double assertValue, return; } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0004-Fan-Tach-Sensor-Threshold-Ignore-Zero.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0004-Fan-Tach-Sensor-Threshold-Ignore-Zero.patch index 214fbe888..c04d16feb 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0004-Fan-Tach-Sensor-Threshold-Ignore-Zero.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0004-Fan-Tach-Sensor-Threshold-Ignore-Zero.patch @@ -1,4 +1,4 @@ -From 221aaf1431a01fefb5e7df2461a1c691738a50a7 Mon Sep 17 00:00:00 2001 +From 6c482ff2206cedea73615d3c0370f6edfd245a08 Mon Sep 17 00:00:00 2001 From: Zhikui Ren Date: Fri, 19 Feb 2021 12:14:05 -0800 Subject: [PATCH] Fan Tach Sensor Threshold Ignore Zero @@ -21,17 +21,23 @@ Tested: No cr event for the missing fans. Signed-off-by: Zhikui Ren +Signed-off-by: Saravanan Palanisamy +Change-Id: I6ef1d61573dcb8c15c0b76a6a6805f368be13fc0 --- - src/TachSensor.cpp | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) + src/TachSensor.cpp | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/TachSensor.cpp b/src/TachSensor.cpp -index c375dbf..e85a2a2 100644 +index 2c48cc9..e85a2a2 100644 --- a/src/TachSensor.cpp +++ b/src/TachSensor.cpp -@@ -186,10 +186,16 @@ void TachSensor::checkThresholds(void) - // WA - treat value <= 0 as not present - bool status = false; +@@ -183,12 +183,19 @@ void TachSensor::handleResponse(const boost::system::error_code& err) + + void TachSensor::checkThresholds(void) + { +- bool status = thresholds::checkThresholds(this); ++ // WA - treat value <= 0 as not present ++ bool status = false; - if (redundancy && *redundancy) + if (value > 0) diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0005-Fix-PECI-ioctl-number.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0005-Fix-PECI-ioctl-number.patch index 8119f7542..6fb1a27e6 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0005-Fix-PECI-ioctl-number.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0005-Fix-PECI-ioctl-number.patch @@ -1,4 +1,4 @@ -From f85dd776301371892ff5197c1995bf2224dd87ab Mon Sep 17 00:00:00 2001 +From 07f431e2d58e6e41482141c32a4cc2e9b62755d8 Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo Date: Mon, 22 Feb 2021 15:57:20 -0800 Subject: [PATCH] Fix PECI ioctl number @@ -12,7 +12,7 @@ Signed-off-by: Jae Hyun Yoo 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/peci-ioctl.h b/include/linux/peci-ioctl.h -index e5b4b8bd3275..1f44edf4fc04 100644 +index e5b4b8b..1f44edf 100644 --- a/include/linux/peci-ioctl.h +++ b/include/linux/peci-ioctl.h @@ -601,7 +601,7 @@ struct peci_crashdump_get_frame_msg { diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0006-CPUSensor-create-RequirediTempSensor-if-defined.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0006-CPUSensor-create-RequirediTempSensor-if-defined.patch index 2083adfef..4c340a37a 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0006-CPUSensor-create-RequirediTempSensor-if-defined.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0006-CPUSensor-create-RequirediTempSensor-if-defined.patch @@ -1,4 +1,4 @@ -From 6ace96be5a7b6763545c1dfc572f8e2790d99d4b Mon Sep 17 00:00:00 2001 +From fefdd414b158d7b4424cb213dc74e89bab0507ab Mon Sep 17 00:00:00 2001 From: Zhikui Ren Date: Tue, 11 May 2021 11:14:55 -0700 Subject: [PATCH] CPUSensor: create RequiredTempSensor if defined @@ -28,10 +28,10 @@ Signed-off-by: Zhikui Ren 3 files changed, 123 insertions(+), 8 deletions(-) diff --git a/include/CPUSensor.hpp b/include/CPUSensor.hpp -index 8b51b76..93b7fcc 100644 +index 84a1e32..a083b9d 100644 --- a/include/CPUSensor.hpp +++ b/include/CPUSensor.hpp -@@ -26,6 +26,15 @@ class CPUSensor : public Sensor +@@ -26,6 +26,15 @@ class CPUSensor : public Sensor, public std::enable_shared_from_this std::vector&& thresholds, const std::string& configuration, int cpuId, bool show, double dtsOffset); @@ -48,11 +48,11 @@ index 8b51b76..93b7fcc 100644 static constexpr unsigned int sensorScaleFactor = 1000; static constexpr unsigned int sensorPollMs = 1000; diff --git a/src/CPUSensor.cpp b/src/CPUSensor.cpp -index c330088..3861ade 100644 +index 16c3686..5aab17f 100644 --- a/src/CPUSensor.cpp +++ b/src/CPUSensor.cpp @@ -98,6 +98,74 @@ CPUSensor::CPUSensor(const std::string& path, const std::string& objectType, - setupRead(); + setupPowerMatch(conn); } +// Create a dummy "not available" CPUSensor @@ -127,7 +127,7 @@ index c330088..3861ade 100644 { // close the input dev to cancel async operations diff --git a/src/CPUSensorMain.cpp b/src/CPUSensorMain.cpp -index 0d94e4b..1d12fa6 100644 +index abae170..2b02d60 100644 --- a/src/CPUSensorMain.cpp +++ b/src/CPUSensorMain.cpp @@ -332,10 +332,9 @@ bool createSensors(boost::asio::io_service& io, @@ -143,7 +143,7 @@ index 0d94e4b..1d12fa6 100644 } // check hidden properties -@@ -636,9 +635,9 @@ void detectCpuAsync( +@@ -637,9 +636,9 @@ void detectCpuAsync( }); } @@ -155,7 +155,7 @@ index 0d94e4b..1d12fa6 100644 sdbusplus::asio::object_server& objectServer) { bool useCache = false; -@@ -700,6 +699,45 @@ bool getCpuConfig(const std::shared_ptr& systemBus, +@@ -701,6 +700,45 @@ bool getCpuConfig(const std::shared_ptr& systemBus, iface->register_property("Present", *present); iface->initialize(); inventoryIfaces[name] = std::move(iface); @@ -201,7 +201,7 @@ index 0d94e4b..1d12fa6 100644 } auto findBus = config.second.find("Bus"); -@@ -728,7 +766,6 @@ bool getCpuConfig(const std::shared_ptr& systemBus, +@@ -729,7 +767,6 @@ bool getCpuConfig(const std::shared_ptr& systemBus, std::cout << "name: " << name << "\n"; std::cout << "type: " << type << "\n"; } @@ -209,7 +209,7 @@ index 0d94e4b..1d12fa6 100644 cpuConfigs.emplace(bus, addr, name, State::OFF); } } -@@ -764,7 +801,8 @@ int main() +@@ -765,7 +802,8 @@ int main() return; // we're being canceled } @@ -219,7 +219,7 @@ index 0d94e4b..1d12fa6 100644 { detectCpuAsync(pingTimer, creationTimer, io, objectServer, systemBus, cpuConfigs, sensorConfigs); -@@ -792,7 +830,7 @@ int main() +@@ -793,7 +831,7 @@ int main() return; // we're being canceled } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0007-Add-support-for-the-energy-hwmon-type.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0007-Add-support-for-the-energy-hwmon-type.patch index daaca7fae..ac7dfdfcf 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0007-Add-support-for-the-energy-hwmon-type.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0007-Add-support-for-the-energy-hwmon-type.patch @@ -1,4 +1,4 @@ -From 9f5ef2e8d9c34d9d9ddce34d450aaedd5c122b22 Mon Sep 17 00:00:00 2001 +From e280ca18317ec7095e876a97ab6164ab5100c1e0 Mon Sep 17 00:00:00 2001 From: Szymon Dompke Date: Tue, 18 May 2021 05:22:33 +0200 Subject: [PATCH] Add support for the energy hwmon type @@ -37,7 +37,7 @@ Signed-off-by: Szymon Dompke 3 files changed, 60 insertions(+), 51 deletions(-) diff --git a/include/CPUSensor.hpp b/include/CPUSensor.hpp -index 93b7fcc..76e43dc 100644 +index a083b9d..a6fbdad 100644 --- a/include/CPUSensor.hpp +++ b/include/CPUSensor.hpp @@ -16,6 +16,15 @@ @@ -53,10 +53,10 @@ index 93b7fcc..76e43dc 100644 + unsigned int scaleFactor; +}; + - class CPUSensor : public Sensor + class CPUSensor : public Sensor, public std::enable_shared_from_this { public: -@@ -25,7 +34,7 @@ class CPUSensor : public Sensor +@@ -25,7 +34,7 @@ class CPUSensor : public Sensor, public std::enable_shared_from_this boost::asio::io_service& io, const std::string& sensorName, std::vector&& thresholds, const std::string& configuration, int cpuId, bool show, @@ -65,7 +65,7 @@ index 93b7fcc..76e43dc 100644 // Create a CPUSensor without a path to sensor value CPUSensor(const std::string& objectType, -@@ -36,7 +45,6 @@ class CPUSensor : public Sensor +@@ -36,7 +45,6 @@ class CPUSensor : public Sensor, public std::enable_shared_from_this const std::string& sensorConfiguration); ~CPUSensor() override; @@ -73,19 +73,19 @@ index 93b7fcc..76e43dc 100644 static constexpr unsigned int sensorPollMs = 1000; static constexpr size_t warnAfterErrorCount = 10; static constexpr const char* labelTcontrol = "Tcontrol"; -@@ -54,6 +62,7 @@ class CPUSensor : public Sensor +@@ -55,6 +63,7 @@ class CPUSensor : public Sensor, public std::enable_shared_from_this size_t pollTime; bool loggedInterfaceDown = false; uint8_t minMaxReadCounter; + unsigned int scaleFactor; - void setupRead(void); void handleResponse(const boost::system::error_code& err); void checkThresholds(void) override; + void updateMinMaxValues(void); diff --git a/src/CPUSensor.cpp b/src/CPUSensor.cpp -index 3861ade..6737151 100644 +index 5aab17f..fefd89a 100644 --- a/src/CPUSensor.cpp +++ b/src/CPUSensor.cpp -@@ -39,58 +39,37 @@ CPUSensor::CPUSensor(const std::string& path, const std::string& objectType, +@@ -39,59 +39,38 @@ CPUSensor::CPUSensor(const std::string& path, const std::string& objectType, boost::asio::io_service& io, const std::string& sensorName, std::vector&& thresholdsIn, const std::string& sensorConfiguration, int cpuId, @@ -96,7 +96,8 @@ index 3861ade..6737151 100644 - objectType, false, false, 0, 0, conn, PowerState::on), + objectType, false, false, sensorProperties.max, sensorProperties.min, + conn, PowerState::on), - objServer(objectServer), inputDev(io), waitTimer(io), path(path), + std::enable_shared_from_this(), objServer(objectServer), + inputDev(io), waitTimer(io), path(path), privTcontrol(std::numeric_limits::quiet_NaN()), dtsOffset(dtsOffset), show(show), pollTime(CPUSensor::sensorPollMs), - minMaxReadCounter(0) @@ -164,7 +165,7 @@ index 3861ade..6737151 100644 } // call setup always as not all sensors call setInitialProperties -@@ -248,7 +227,7 @@ void CPUSensor::updateMinMaxValues(void) +@@ -262,7 +241,7 @@ void CPUSensor::updateMinMaxValues(void) auto& [suffix, oldValue, dbusName, newValue] = vectorItem; auto attrPath = boost::replace_all_copy(path, fileItem, suffix); @@ -173,7 +174,7 @@ index 3861ade..6737151 100644 { newValue.get() = *tmp; } -@@ -302,7 +281,7 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) +@@ -316,7 +295,7 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) std::getline(responseStream, response); rawValue = std::stod(response); responseStream.clear(); @@ -182,7 +183,7 @@ index 3861ade..6737151 100644 if (show) { -@@ -328,8 +307,7 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) +@@ -342,8 +321,7 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) { std::vector newThresholds; if (parseThresholdsFromAttr(newThresholds, path, @@ -193,7 +194,7 @@ index 3861ade..6737151 100644 if (!std::equal(thresholds.begin(), thresholds.end(), newThresholds.begin(), diff --git a/src/CPUSensorMain.cpp b/src/CPUSensorMain.cpp -index 1d12fa6..e348aa7 100644 +index 2b02d60..a64d39c 100644 --- a/src/CPUSensorMain.cpp +++ b/src/CPUSensorMain.cpp @@ -94,6 +94,18 @@ static constexpr auto sensorTypes{std::to_array({"XeonCPU"})}; @@ -253,14 +254,14 @@ index 1d12fa6..e348aa7 100644 std::cerr << "error populating thresholds for " << sensorName << "\n"; @@ -384,7 +406,7 @@ bool createSensors(boost::asio::io_service& io, - sensorPtr = std::make_unique( + sensorPtr = std::make_shared( inputPathStr, sensorType, objectServer, dbusConnection, io, sensorName, std::move(sensorThresholds), *interfacePath, cpuId, - show, dtsOffset); + show, dtsOffset, prop); + sensorPtr->setupRead(); createdSensors.insert(sensorName); if (debug) - { -- 2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0008-CPUSensor-additional-debug-message.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0008-CPUSensor-additional-debug-message.patch index 40c8d46bd..be2f7fa9a 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0008-CPUSensor-additional-debug-message.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0008-CPUSensor-additional-debug-message.patch @@ -1,4 +1,4 @@ -From c045d0ace218a8f0c9e9af0b04aed24ec733fc79 Mon Sep 17 00:00:00 2001 +From 805ae6679f49d0d7a3a6448af97f3cb639b9634f Mon Sep 17 00:00:00 2001 From: Zhikui Ren Date: Tue, 22 Jun 2021 14:49:44 -0700 Subject: [PATCH] CPUSensor: additional debug message @@ -24,10 +24,10 @@ Signed-off-by: Zhikui Ren 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/CPUSensor.cpp b/src/CPUSensor.cpp -index 0621e04..65acdac 100644 +index fefd89a..de33f9b 100644 --- a/src/CPUSensor.cpp +++ b/src/CPUSensor.cpp -@@ -300,6 +300,7 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) +@@ -315,6 +315,7 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) : std::numeric_limits::quiet_NaN(); if (gTcontrol != privTcontrol) { @@ -35,7 +35,7 @@ index 0621e04..65acdac 100644 privTcontrol = gTcontrol; if (!thresholds.empty()) -@@ -318,6 +319,10 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) +@@ -333,6 +334,10 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) thresholds::updateThresholds(this); } } @@ -47,10 +47,10 @@ index 0621e04..65acdac 100644 else { diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp -index 78ded55..283dacf 100644 +index 84df7cf..d1e04eb 100644 --- a/src/Thresholds.cpp +++ b/src/Thresholds.cpp -@@ -583,11 +583,8 @@ bool parseThresholdsFromAttr( +@@ -592,11 +592,8 @@ bool parseThresholdsFromAttr( if (auto val = readFile(attrPath, scaleFactor)) { *val += offset; diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0009-CPUSensor-Create-CPUConfig-for-each-PECI-adapter.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0009-CPUSensor-Create-CPUConfig-for-each-PECI-adapter.patch index 737ba9128..e1896ca7c 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0009-CPUSensor-Create-CPUConfig-for-each-PECI-adapter.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0009-CPUSensor-Create-CPUConfig-for-each-PECI-adapter.patch @@ -1,4 +1,4 @@ -From 262682632ee493d0b6593540cfc902d11286b7c3 Mon Sep 17 00:00:00 2001 +From c420a04ec18e9d62e11a69a0d5e88762b2a141a3 Mon Sep 17 00:00:00 2001 From: Iwona Winiarska Date: Tue, 13 Jul 2021 15:16:16 +0200 Subject: [PATCH] CPUSensor: Create CPUConfig for each PECI adapter @@ -27,7 +27,7 @@ Signed-off-by: Iwona Winiarska 1 file changed, 90 insertions(+) diff --git a/src/CPUSensorMain.cpp b/src/CPUSensorMain.cpp -index 744ca50..6850df7 100644 +index a64d39c..32cb6b3 100644 --- a/src/CPUSensorMain.cpp +++ b/src/CPUSensorMain.cpp @@ -33,6 +33,7 @@ @@ -143,5 +143,5 @@ index 744ca50..6850df7 100644 } } -- -2.31.1 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend index 765ad3739..23a44d69a 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -1,8 +1,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PROJECT_SRC_DIR := "${THISDIR}/${PN}" -SRCREV = "77518b28db824e01af18351094680a99b1ba3cae" #SRC_URI = "git://github.com/openbmc/dbus-sensors.git" +SRCREV = "0b207a624f925460797a51974b77b275d4c05e30" SRC_URI += "\ file://intrusionsensor-depend-on-networkd.conf \ diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb index 703cbb803..3a7ba69cd 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Settings" -SRC_URI = "git://github.com/Intel-BMC/settings.git;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/settings.git;protocol=ssh" SRCREV = "85a8be9a3fb8ef4726899b28f10fb9afa6fa9e89" PV = "0.1+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb index d17aebf00..9b21f3753 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb @@ -8,8 +8,8 @@ S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/Intel-BMC/special-mode-manager.git;protocol=ssh" -SRCREV = "42a0ba3c61ae38cc84b06705159065860492fc2e" +SRC_URI = "git://git@github.com/Intel-BMC/special-mode-manager.git;protocol=ssh" +SRCREV = "7dc05af0adc32e0f16cd2e4f47956a6b2a470790" EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMC_VALIDATION_UNSECURE_FEATURE=ON', '', d)}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/state/phosphor-post-code-manager_git.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/state/phosphor-post-code-manager_git.bbappend index a4e894cbc..f17d24806 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/state/phosphor-post-code-manager_git.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/state/phosphor-post-code-manager_git.bbappend @@ -1,2 +1,2 @@ #SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git" -SRCREV = "9ce5a645f50c0ab94e582abbf95474f636aba678" +SRCREV = "987f91a6536e0330799cc5f4e54740c4023b5ef0" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb index b123ddb35..d6196b75e 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb @@ -7,7 +7,7 @@ inherit cmake systemd DEPENDS = "boost sdbusplus" PV = "0.1+git${SRCPV}" -SRCREV = "0c5059f685f6df0704a4b773f2e617cf10d03210" +SRCREV = "26067f6af051ccf8feff251a081aa46e45dfa4dc" S = "${WORKDIR}/git/callback-manager" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/telemetry/telemetry_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/telemetry/telemetry_%.bbappend index ebd808168..0f2db3f1a 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/telemetry/telemetry_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/telemetry/telemetry_%.bbappend @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/openbmc/telemetry.git" -SRCREV = "e28aa53dc1492f09a64dc9f1dbfd5b6dba06e31f" +SRCREV = "51f0fd501f4b772533271d15cb27d396186a7192" EXTRA_OEMESON += " -Dmax-reports=10" EXTRA_OEMESON += " -Dmax-reading-parameters=200" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager/0005-Added-suport-for-multiple-user-manager-services.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager/0005-Added-suport-for-multiple-user-manager-services.patch index a7f431049..0a8962698 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager/0005-Added-suport-for-multiple-user-manager-services.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager/0005-Added-suport-for-multiple-user-manager-services.patch @@ -1,4 +1,4 @@ -From 75971b8faf7ef7af7285ba7d5207be71c66e5d11 Mon Sep 17 00:00:00 2001 +From d03ec9b688a5d93f8f44e775eb74358d30d9d314 Mon Sep 17 00:00:00 2001 From: Radivoje Jovanovic Date: Mon, 2 Jul 2018 19:23:25 -0700 Subject: [PATCH] Added suport for multiple user manager services @@ -12,11 +12,11 @@ Signed-off-by: Arun P. Mohanan --- Makefile.am | 5 +- mainapp.cpp | 90 +++++- - user_mgr.cpp | 297 ++---------------- + user_mgr.cpp | 305 ++---------------- user_mgr.hpp | 9 +- user_service.cpp | 789 +++++++++++++++++++++++++++++++++++++++++++++++ user_service.hpp | 233 ++++++++++++++ - 6 files changed, 1149 insertions(+), 274 deletions(-) + 6 files changed, 1150 insertions(+), 281 deletions(-) create mode 100644 user_service.cpp create mode 100644 user_service.hpp @@ -152,7 +152,7 @@ index e08da61..f4b7f8c 100644 // Claim the bus now bus.request_name(USER_MANAGER_BUSNAME); diff --git a/user_mgr.cpp b/user_mgr.cpp -index 1b14e8e..f6f2fdb 100644 +index 8fc899f..acc16b0 100644 --- a/user_mgr.cpp +++ b/user_mgr.cpp @@ -18,43 +18,34 @@ @@ -226,8 +226,8 @@ index 1b14e8e..f6f2fdb 100644 - int retCode = execProg.exit_code(); - if (retCode) - { -- log("Command execution failed", entry("PATH=%d", path), -- entry("RETURN_CODE:%d", retCode)); +- log("Command execution failed", entry("PATH=%s", path), +- entry("RETURN_CODE=%d", retCode)); - elog(); - } - @@ -281,7 +281,7 @@ index 1b14e8e..f6f2fdb 100644 bool UserMgr::isUserExist(const std::string& userName) { if (userName.empty()) -@@ -299,39 +217,14 @@ void UserMgr::createUser(std::string userName, +@@ -299,44 +217,15 @@ void UserMgr::createUser(std::string userName, { throwForInvalidPrivilege(priv); throwForInvalidGroups(groupNames); @@ -306,10 +306,12 @@ index 1b14e8e..f6f2fdb 100644 - } - try - { +- // set EXPIRE_DATE to 0 to disable user, PAM takes 0 as expire on +- // 1970-01-01, that's an implementation-defined behavior - executeCmd("/usr/sbin/useradd", userName.c_str(), "-G", groups.c_str(), - "-m", "-N", "-s", - (sshRequested ? "/bin/sh" : "/bin/nologin"), "-e", -- (enabled ? "" : "1970-01-02")); +- (enabled ? "" : "1970-01-01")); - } - catch (const InternalFailure& e) - { @@ -320,11 +322,15 @@ index 1b14e8e..f6f2fdb 100644 + userSrvc->createUser(userName, groupNames, priv, enabled); - // Add the users object before sending out the signal +- sdbusplus::message::object_path tempObjPath(usersObjPath); +- tempObjPath /= userName; +- std::string userObj(tempObjPath); + // Add the users to the local list before sending out the signal - std::string userObj = std::string(usersObjPath) + "/" + userName; ++ std::string userObj = std::string(usersObjPath) + "/" + userName; std::sort(groupNames.begin(), groupNames.end()); usersList.emplace( -@@ -345,19 +238,11 @@ void UserMgr::createUser(std::string userName, + userName, std::move(std::make_unique( +@@ -349,19 +238,11 @@ void UserMgr::createUser(std::string userName, void UserMgr::deleteUser(std::string userName) { @@ -348,7 +354,7 @@ index 1b14e8e..f6f2fdb 100644 usersList.erase(userName); -@@ -368,24 +253,13 @@ void UserMgr::deleteUser(std::string userName) +@@ -372,24 +253,13 @@ void UserMgr::deleteUser(std::string userName) void UserMgr::renameUser(std::string userName, std::string newUserName) { @@ -376,7 +382,7 @@ index 1b14e8e..f6f2fdb 100644 const auto& user = usersList[userName]; std::string priv = user.get()->userPrivilege(); std::vector groupNames = user.get()->userGroups(); -@@ -409,8 +283,6 @@ void UserMgr::updateGroupsAndPriv(const std::string& userName, +@@ -415,8 +285,6 @@ void UserMgr::updateGroupsAndPriv(const std::string& userName, { throwForInvalidPrivilege(priv); throwForInvalidGroups(groupNames); @@ -385,7 +391,7 @@ index 1b14e8e..f6f2fdb 100644 throwForUserDoesNotExist(userName); const std::vector& oldGroupNames = usersList[userName].get()->userGroups(); -@@ -426,29 +298,8 @@ void UserMgr::updateGroupsAndPriv(const std::string& userName, +@@ -432,29 +300,8 @@ void UserMgr::updateGroupsAndPriv(const std::string& userName, throwForMaxGrpUserCount(groupNames); } @@ -417,7 +423,7 @@ index 1b14e8e..f6f2fdb 100644 log("User groups / privilege updated successfully", entry("USER_NAME=%s", userName.c_str())); -@@ -644,19 +495,9 @@ int UserMgr::setPamModuleArgValue(const std::string& moduleName, +@@ -650,21 +497,9 @@ int UserMgr::setPamModuleArgValue(const std::string& moduleName, void UserMgr::userEnable(const std::string& userName, bool enabled) { @@ -426,8 +432,10 @@ index 1b14e8e..f6f2fdb 100644 throwForUserDoesNotExist(userName); - try - { +- // set EXPIRE_DATE to 0 to disable user, PAM takes 0 as expire on +- // 1970-01-01, that's an implementation-defined behavior - executeCmd("/usr/sbin/usermod", userName.c_str(), "-e", -- (enabled ? "" : "1970-01-02")); +- (enabled ? "" : "1970-01-01")); - } - catch (const InternalFailure& e) - { @@ -439,7 +447,7 @@ index 1b14e8e..f6f2fdb 100644 log("User enabled/disabled state updated successfully", entry("USER_NAME=%s", userName.c_str()), -@@ -779,54 +620,8 @@ bool UserMgr::userPasswordExpired(const std::string& userName) +@@ -787,54 +622,8 @@ bool UserMgr::userPasswordExpired(const std::string& userName) UserSSHLists UserMgr::getUserAndSshGrpList() { @@ -496,7 +504,7 @@ index 1b14e8e..f6f2fdb 100644 } size_t UserMgr::getIpmiUsersCount() -@@ -837,49 +632,14 @@ size_t UserMgr::getIpmiUsersCount() +@@ -845,49 +634,14 @@ size_t UserMgr::getIpmiUsersCount() bool UserMgr::isUserEnabled(const std::string& userName) { @@ -550,7 +558,7 @@ index 1b14e8e..f6f2fdb 100644 } DbusUserObj UserMgr::getPrivilegeMapperObject(void) -@@ -1106,11 +866,9 @@ void UserMgr::initUserObjects(void) +@@ -1114,11 +868,9 @@ void UserMgr::initUserObjects(void) { // All user management lock has to be based on /etc/shadow // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{}; @@ -564,7 +572,7 @@ index 1b14e8e..f6f2fdb 100644 if (!userNameList.empty()) { -@@ -1165,8 +923,10 @@ void UserMgr::initUserObjects(void) +@@ -1175,8 +927,10 @@ void UserMgr::initUserObjects(void) } } @@ -577,7 +585,7 @@ index 1b14e8e..f6f2fdb 100644 { UserMgrIface::allPrivileges(privMgr); std::sort(groupsMgr.begin(), groupsMgr.end()); -@@ -1274,6 +1034,7 @@ UserMgr::UserMgr(sdbusplus::bus::bus& bus, const char* path) : +@@ -1284,6 +1038,7 @@ UserMgr::UserMgr(sdbusplus::bus::bus& bus, const char* path) : } AccountPolicyIface::accountUnlockTimeout(value32); } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend index 21c7991bd..0bf528eb4 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend @@ -1,13 +1,13 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI = "git://github.com/openbmc/phosphor-user-manager" -SRCREV = "c0760c9109a0d847fd77d54c6b7948322a375d1d" +SRCREV = "b01e2fe760eb04ae9d0d13716a127056949e2601" EXTRA_OECONF += "${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-root-login' ], '', '--disable-root_user_mgmt', d)}" SRC_URI += " \ - file://0005-Added-suport-for-multiple-user-manager-services.patch \ - file://0006-Use-groupmems-instead-of-getgrnam_r-due-to-overlay.patch \ + file://0005-Added-suport-for-multiple-user-manager-services.patch \ + file://0006-Use-groupmems-instead-of-getgrnam_r-due-to-overlay.patch \ " FILES:${PN} += "${datadir}/dbus-1/system.d/phosphor-nslcd-cert-config.conf" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb index b8aedc6ee..f41ae7e3a 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb @@ -1,10 +1,10 @@ SUMMARY = "Virtual Media Service" DESCRIPTION = "Virtual Media Service" -SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "bee56d62b209088454d166d1efae4825a2b175df" +SRC_URI = "git://git@github.com/Intel-BMC/virtual-media.git;protocol=ssh;branch=main" +SRCREV = "6165e07cd0ef6da314ed1ef4f58fe47b7d8112db" -S = "${WORKDIR}/git/virtual-media" +S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend index 19db93805..39153c9c9 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend @@ -1,4 +1,4 @@ -SRC_URI = "git://github.com/Intel-BMC/phosphor-webui;protocol=ssh;branch=intel2" +SRC_URI = "git://git@github.com/Intel-BMC/phosphor-webui.git;protocol=ssh;branch=intel2" FILESEXTRAPATHS:prepend:intel := "${THISDIR}/${PN}:" SRCREV = "b5707d7648de19350b3f308b9602c888c6418d6f" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend index 1273ebb29..bdd6a3bad 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend @@ -1,6 +1,6 @@ # Enable downstream autobump SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "2a2e1021f48e2a939859ba7f4ae86c5de6df5655" +SRCREV = "f4328edf86b284fe8836717251ce6696670dbdd5" FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" SRC_URI += " \ diff --git a/meta-openbmc-mods/meta-common/recipes-support/gmp/gmp/CVE-2021-43618-Avoid-bit-size-overflows.patch b/meta-openbmc-mods/meta-common/recipes-support/gmp/gmp/CVE-2021-43618-Avoid-bit-size-overflows.patch new file mode 100644 index 000000000..f74197243 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-support/gmp/gmp/CVE-2021-43618-Avoid-bit-size-overflows.patch @@ -0,0 +1,25 @@ + +# HG changeset patch +# User Marco Bodrato +# Date 1634836009 -7200 +# Node ID 561a9c25298e17bb01896801ff353546c6923dbd +# Parent e1fd9db13b475209a864577237ea4b9105b3e96e +mpz/inp_raw.c: Avoid bit size overflows + +diff -r e1fd9db13b47 -r 561a9c25298e mpz/inp_raw.c +--- a/mpz/inp_raw.c Tue Dec 22 23:49:51 2020 +0100 ++++ b/mpz/inp_raw.c Thu Oct 21 19:06:49 2021 +0200 +@@ -88,8 +88,11 @@ + + abs_csize = ABS (csize); + ++ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8)) ++ return 0; /* Bit size overflows */ ++ + /* round up to a multiple of limbs */ +- abs_xsize = BITS_TO_LIMBS (abs_csize*8); ++ abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8); + + if (abs_xsize != 0) + { + diff --git a/meta-openbmc-mods/meta-common/recipes-support/gmp/gmp_%.bbappend b/meta-openbmc-mods/meta-common/recipes-support/gmp/gmp_%.bbappend new file mode 100644 index 000000000..7d77ea4b6 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-support/gmp/gmp_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://CVE-2021-43618-Avoid-bit-size-overflows.patch \ + " diff --git a/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend index daac0ecb8..d4d9b9566 100755 --- a/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,6 +1,6 @@ # Enable downstream autobump SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "48c94c59728023cdbff3bd62f203de3434af8b8a" +SRCREV = "c46ebb493f0e0cc1ccc5525d5484465bba69551f" FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample b/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample index 546cd7b31..44f5d6376 100644 --- a/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample +++ b/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample @@ -17,7 +17,6 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-x86 \ ##OEROOT##/meta-openbmc-mods \ ##OEROOT##/meta-intel-openbmc \ ##OEROOT##/meta-openbmc-mods/meta-common \ diff --git a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample index 925cdbd97..785634751 100644 --- a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample +++ b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample @@ -14,7 +14,6 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-x86 \ ##OEROOT##/meta-openbmc-mods \ ##OEROOT##/meta-intel-openbmc \ ##OEROOT##/meta-openbmc-mods/meta-common \ -- cgit v1.2.3