From 8115d65b8c83099b62f303de7d5dbccacd2761b6 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Sat, 16 Oct 2021 04:04:20 +0000 Subject: meta-ampere: mtjade: replace u-boot patches by feature Enable phosphor-aspeed-spi-master-mode.inc and remove the u-boot patch that used for this feature. Also remove GPIO setting patches which the setting already implemented in the platform init package. Tested: on Mt.Jade platform with OCP plugged 1. Bind/unbind Host SPI-NOR and ensure no problem 2. Turn off Host, reboot BMC and check if Host SPI-NOR is probe successfully. Signed-off-by: Thang Q. Nguyen Change-Id: Ie85166edca93b882868e1373696fbf664bee2ee4 --- meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 + .../0004-aspeed-add-gpio-support.patch | 518 --------------------- .../0005-aspeed-Enable-SPI-master-mode.patch | 33 -- ...0006-aspeed-support-Mt.Jade-platform-init.patch | 175 ------- .../recipes-bsp/u-boot/u-boot-aspeed_%.bbappend | 3 - 5 files changed, 1 insertion(+), 729 deletions(-) delete mode 100644 meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0004-aspeed-add-gpio-support.patch delete mode 100644 meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0005-aspeed-Enable-SPI-master-mode.patch delete mode 100644 meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0006-aspeed-support-Mt.Jade-platform-init.patch (limited to 'meta-ampere/meta-jade') diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index b42557566..a47ebef8a 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -5,6 +5,7 @@ UBOOT_MACHINE = "ast_g5_phy_config" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/distro/include/phosphor-isolation.inc +require conf/distro/include/phosphor-aspeed-spi-master-mode.inc # Reformat SPI flash layout to 64MB FLASH_SIZE = "65536" diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0004-aspeed-add-gpio-support.patch b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0004-aspeed-add-gpio-support.patch deleted file mode 100644 index 2f8ff45bd..000000000 --- a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0004-aspeed-add-gpio-support.patch +++ /dev/null @@ -1,518 +0,0 @@ -From 7372552ae247e4870fb6dc80df7610f86d736a57 Mon Sep 17 00:00:00 2001 -From: Chanh Nguyen -Date: Tue, 9 Mar 2021 11:04:56 +0700 -Subject: [PATCH] aspeed: add gpio support - -This is an initial support for the parallel GPIO pins directly connected -to the AHB on the Aspeed 2400/2500. - -This brings the functions and a shell command to manipulate the GPIO -state. The GPIO value reading and writing work in non interrupt mode -only. - -This is back ported from the patch file from -meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0003-aspeed-add-gpio-support.patch -to support GPIO configuration - -Signed-off-by: Alexander Filippov -Signed-off-by: Thang Q. Nguyen -Signed-off-by: Chanh Nguyen ---- - arch/arm/include/asm/arch-aspeed/gpio.h | 65 ++++ - drivers/gpio/Makefile | 2 + - drivers/gpio/aspeed_gpio.c | 386 ++++++++++++++++++++++++ - include/configs/ast-g5-phy.h | 1 + - 4 files changed, 454 insertions(+) - create mode 100644 arch/arm/include/asm/arch-aspeed/gpio.h - create mode 100644 drivers/gpio/aspeed_gpio.c - -diff --git a/arch/arm/include/asm/arch-aspeed/gpio.h b/arch/arm/include/asm/arch-aspeed/gpio.h -new file mode 100644 -index 0000000000..c63987e917 ---- /dev/null -+++ b/arch/arm/include/asm/arch-aspeed/gpio.h -@@ -0,0 +1,65 @@ -+/* -+ * SPDX-License-Identifier: GPL-2.0+ -+ * Copyright (C) 2020 YADRO. -+ */ -+#ifndef _ASPEED_GPIO_H -+#define _ASPEED_GPIO_H -+ -+#define ASPEED_GPIO_PORT_A 0 -+#define ASPEED_GPIO_PORT_B 1 -+#define ASPEED_GPIO_PORT_C 2 -+#define ASPEED_GPIO_PORT_D 3 -+#define ASPEED_GPIO_PORT_E 4 -+#define ASPEED_GPIO_PORT_F 5 -+#define ASPEED_GPIO_PORT_G 6 -+#define ASPEED_GPIO_PORT_H 7 -+#define ASPEED_GPIO_PORT_I 8 -+#define ASPEED_GPIO_PORT_J 9 -+#define ASPEED_GPIO_PORT_K 10 -+#define ASPEED_GPIO_PORT_L 11 -+#define ASPEED_GPIO_PORT_M 12 -+#define ASPEED_GPIO_PORT_N 13 -+#define ASPEED_GPIO_PORT_O 14 -+#define ASPEED_GPIO_PORT_P 15 -+#define ASPEED_GPIO_PORT_Q 16 -+#define ASPEED_GPIO_PORT_R 17 -+#define ASPEED_GPIO_PORT_S 18 -+#define ASPEED_GPIO_PORT_T 19 -+#define ASPEED_GPIO_PORT_U 20 -+#define ASPEED_GPIO_PORT_V 21 -+#define ASPEED_GPIO_PORT_W 22 -+#define ASPEED_GPIO_PORT_X 23 -+#define ASPEED_GPIO_PORT_Y 24 -+#define ASPEED_GPIO_PORT_Z 25 -+#define ASPEED_GPIO_PORT_AA 26 -+#define ASPEED_GPIO_PORT_AB 27 -+#define ASPEED_GPIO_PORT_AC 28 -+ -+#define ASPEED_GPIO_PORT_SHIFT 3 -+#define ASPEED_GPIO_PIN_MASK 0x7 -+#define ASPEED_GPIO(port, pin) \ -+ ((ASPEED_GPIO_PORT_##port << ASPEED_GPIO_PORT_SHIFT) | \ -+ (pin & ASPEED_GPIO_PIN_MASK)) -+ -+/* Direction values */ -+#define ASPEED_GPIO_INPUT 0 -+#define ASPEED_GPIO_OUTPUT 1 -+ -+/* Trigger values */ -+#define ASPEED_GPIO_FALLING_EDGE 0 -+#define ASPEED_GPIO_RISING_EDGE 1 -+#define ASPEED_GPIO_LOW_LEVEL 2 -+#define ASPEED_GPIO_HIGH_LEVEL 3 -+#define ASPEED_GPIO_DUAL_EDGE 4 -+ -+/* Debounce values */ -+#define ASPEED_GPIO_DEBOUNCE_NONE 0 -+#define ASPEED_GPIO_DEBOUNCE_1 1 -+#define ASPEED_GPIO_DEBOUNCE_2 2 -+#define ASPEED_GPIO_DEBOUNCE_3 3 -+ -+#define gpio_status() gpio_info() -+ -+extern void gpio_info(void); -+ -+#endif /* #ifndef _ASPEED_GPIO_H */ -diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index 792d19186a..5f043e07ce 100644 ---- a/drivers/gpio/Makefile -+++ b/drivers/gpio/Makefile -@@ -14,6 +14,8 @@ obj-$(CONFIG_DM_GPIO) += gpio-uclass.o - obj-$(CONFIG_DM_PCA953X) += pca953x_gpio.o - obj-$(CONFIG_DM_74X164) += 74x164_gpio.o - -+obj-$(CONFIG_ARCH_AST2400) += aspeed_gpio.o -+obj-$(CONFIG_ARCH_AST2500) += aspeed_gpio.o - obj-$(CONFIG_AT91_GPIO) += at91_gpio.o - obj-$(CONFIG_ATMEL_PIO4) += atmel_pio4.o - obj-$(CONFIG_INTEL_ICH6_GPIO) += intel_ich6_gpio.o -diff --git a/drivers/gpio/aspeed_gpio.c b/drivers/gpio/aspeed_gpio.c -new file mode 100644 -index 0000000000..dc07f5a520 ---- /dev/null -+++ b/drivers/gpio/aspeed_gpio.c -@@ -0,0 +1,386 @@ -+/* -+ * SPDX-License-Identifier: GPL-2.0+ -+ * Copyright (C) 2020 YADRO. -+ */ -+ -+#include -+ -+#include -+#include -+#include -+#include -+ -+typedef struct _ast_gpio_regs -+{ -+ uint32_t base; /* data and direction registers */ -+ uint32_t intcfg; /* interrupt config */ -+ uint32_t debounce; /* debounce config */ -+ uint32_t cmdsrc; /* command source config */ -+ uint32_t data; /* data read register */ -+} ast_gpio_regs_t; -+ -+static ast_gpio_regs_t ast_gpio_regs[] = { -+ /* A/B/C/D */ -+ {AST_GPIO_BASE + 0x0000, AST_GPIO_BASE + 0x0008, AST_GPIO_BASE + 0x0040, -+ AST_GPIO_BASE + 0x0060, AST_GPIO_BASE + 0x00C0}, -+ /* E/F/G/H */ -+ {AST_GPIO_BASE + 0x0020, AST_GPIO_BASE + 0x0028, AST_GPIO_BASE + 0x0048, -+ AST_GPIO_BASE + 0x0068, AST_GPIO_BASE + 0x00C4}, -+ /* I/J/K/L */ -+ {AST_GPIO_BASE + 0x0070, AST_GPIO_BASE + 0x0098, AST_GPIO_BASE + 0x00B0, -+ AST_GPIO_BASE + 0x0090, AST_GPIO_BASE + 0x00C8}, -+ /* M/N/O/P */ -+ {AST_GPIO_BASE + 0x0078, AST_GPIO_BASE + 0x00E8, AST_GPIO_BASE + 0x0100, -+ AST_GPIO_BASE + 0x00E0, AST_GPIO_BASE + 0x00CC}, -+ /* Q/R/S/T */ -+ {AST_GPIO_BASE + 0x0080, AST_GPIO_BASE + 0x0118, AST_GPIO_BASE + 0x0130, -+ AST_GPIO_BASE + 0x0110, AST_GPIO_BASE + 0x00D0}, -+ /* U/V/W/X */ -+ {AST_GPIO_BASE + 0x0088, AST_GPIO_BASE + 0x0148, AST_GPIO_BASE + 0x0160, -+ AST_GPIO_BASE + 0x0140, AST_GPIO_BASE + 0x00D4}, -+ /* Y/Z/AA/AB */ -+ {AST_GPIO_BASE + 0x01E0, AST_GPIO_BASE + 0x0178, AST_GPIO_BASE + 0x0190, -+ AST_GPIO_BASE + 0x0170, AST_GPIO_BASE + 0x00D8}, -+ /* AC */ -+ {AST_GPIO_BASE + 0x01E8, AST_GPIO_BASE + 0x01A8, AST_GPIO_BASE + 0x01C0, -+ AST_GPIO_BASE + 0x01A0, AST_GPIO_BASE + 0x00DC}, -+}; -+ -+#define AST_GPIO_PINS_PER_PORT 8 -+#define AST_GPIO_PORTS_PER_REGISTER 4 -+ -+#define AST_GPIO_PORT(gpio) (gpio >> ASPEED_GPIO_PORT_SHIFT) -+#define AST_GPIO_PIN(gpio) (gpio & ASPEED_GPIO_PIN_MASK) -+#define AST_GPIO_SHIFT(gpio) \ -+ ((AST_GPIO_PORT(gpio) % AST_GPIO_PORTS_PER_REGISTER) * \ -+ AST_GPIO_PINS_PER_PORT + \ -+ AST_GPIO_PIN(gpio)) -+ -+#define AST_GPIO_REG_INDEX(gpio) \ -+ (AST_GPIO_PORT(gpio) / AST_GPIO_PORTS_PER_REGISTER) -+ -+/** -+ * @return Pointer to corresponding item from ast_gpio_regs table. -+ */ -+#define AST_GPIO_REGS(gpio) \ -+ ((AST_GPIO_REG_INDEX(gpio) < ARRAY_SIZE(ast_gpio_regs)) \ -+ ? (ast_gpio_regs + AST_GPIO_REG_INDEX(gpio)) \ -+ : NULL) -+ -+/** -+ * @brief Set a corresponding bit in specified register. -+ * -+ * @param val - Required bit value -+ * @param base - Register address -+ * @param shift - Bit index. -+ */ -+#define AST_GPIO_WRITE(val, base, shift) \ -+ writel(((val) ? readl(base) | (1 << (shift)) \ -+ : readl(base) & ~(1 << (shift))), \ -+ base) -+ -+/** -+ * @brief Get value of corresponging bit from specified register. -+ * -+ * @param base - Register address -+ * @param shift - Bit index -+ * -+ * @return Bit value -+ */ -+#define AST_GPIO_READ(base, shift) ((readl(base) >> (shift)) & 1) -+ -+#define IS_VALID_GPIO(gpio) \ -+ ((gpio) >= ASPEED_GPIO(A, 0) && (gpio) <= ASPEED_GPIO(AC, 7)) -+ -+#define AST_GPIO_DIRECTION 0x04 -+#define AST_GPIO_INT_SENS0 0x04 -+#define AST_GPIO_INT_SENS1 0x08 -+#define AST_GPIO_INT_SENS2 0x0C -+#define AST_GPIO_INT_STATUS 0x10 -+#define AST_GPIO_DEBOUNCE0 0x00 -+#define AST_GPIO_DEBOUNCE1 0x04 -+#define AST_GPIO_CMD_SRC0 0x00 -+#define AST_GPIO_CMD_SRC1 0x04 -+ -+/** -+ * @brief Set a GPIO direction -+ * -+ * @param gpio GPIO line -+ * @param direction GPIO direction (0 for input or 1 for output) -+ * -+ * @return 0 if ok, -1 on error -+ */ -+static int ast_gpio_set_direction(unsigned gpio, unsigned direction) -+{ -+ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); -+ if (!regs) -+ { -+ printf("%s: Invalid GPIO!\n", __func__); -+ return -1; -+ } -+ -+ AST_GPIO_WRITE(direction, regs->base + AST_GPIO_DIRECTION, -+ AST_GPIO_SHIFT(gpio)); -+ return 0; -+} -+ -+/** -+ * The 6 following functions are generic u-boot gpio implementation. -+ * They are declared in `include/asm-generic/gpio.h` -+ */ -+ -+int gpio_request(unsigned gpio, const char *label) -+{ -+ return (IS_VALID_GPIO(gpio) ? 0 : -1); -+} -+ -+int gpio_free(unsigned gpio) -+{ -+ return (IS_VALID_GPIO(gpio) ? 0 : -1); -+} -+ -+int gpio_get_value(unsigned gpio) -+{ -+ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); -+ if (!regs) -+ { -+ printf("%s: Invalid GPIO!\n", __func__); -+ return -1; -+ } -+ -+ return AST_GPIO_READ(regs->base, AST_GPIO_SHIFT(gpio)); -+} -+ -+int gpio_set_value(unsigned gpio, int value) -+{ -+ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); -+ if (!regs) -+ { -+ printf("%s: Invalid GPIO!\n", __func__); -+ return -1; -+ } -+ -+ AST_GPIO_WRITE(value, regs->base, AST_GPIO_SHIFT(gpio)); -+ return 0; -+} -+ -+int gpio_direction_input(unsigned gpio) -+{ -+ return ast_gpio_set_direction(gpio, ASPEED_GPIO_INPUT); -+} -+ -+int gpio_direction_output(unsigned gpio, int value) -+{ -+ int rc = ast_gpio_set_direction(gpio, ASPEED_GPIO_OUTPUT); -+ return (rc == 0 ? gpio_set_value(gpio, value) : rc); -+} -+ -+/** -+ * @brief Convert a string to GPIO line. Used by `do_gpio()` from `cmd/gpio.c` -+ * -+ * @param str a GPIO name or line number -+ * -+ * @return GPIO line if ok, -1 on error -+ */ -+int name_to_gpio(const char *str) -+{ -+ int gpio = -1; -+ -+ if (str) -+ { -+ if (isalpha(*str)) -+ { -+ gpio = (toupper(*str) - 'A') << ASPEED_GPIO_PORT_SHIFT; -+ -+ if (toupper(*str) == 'A' && toupper(*(str + 1)) >= 'A' && -+ toupper(*(str + 1)) <= 'C') -+ { -+ str++; -+ gpio = (ASPEED_GPIO_PORT_AA + toupper(*str) - 'A') -+ << ASPEED_GPIO_PORT_SHIFT; -+ } -+ -+ str++; -+ if (*str >= '0' && *str <= '7' && !*(str + 1)) -+ { -+ gpio += *str - '0'; -+ } -+ else -+ { -+ gpio = -1; -+ } -+ } -+ else if (isdigit(*str)) -+ { -+ gpio = simple_strtoul(str, NULL, 0); -+ } -+ } -+ -+ return gpio; -+} -+ -+/** -+ * @return A GPIO direction in human readable format. -+ */ -+static const char *ast_gpio_direction(unsigned gpio) -+{ -+ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); -+ if (regs) -+ { -+ int direction = AST_GPIO_READ(regs->base + AST_GPIO_DIRECTION, -+ AST_GPIO_SHIFT(gpio)); -+ switch (direction) -+ { -+ case ASPEED_GPIO_INPUT: -+ return "input"; -+ case ASPEED_GPIO_OUTPUT: -+ return "output"; -+ default: -+ break; -+ } -+ } -+ return "error"; -+} -+ -+/** -+ * @return An interrupt trigger settings in human readable format. -+ */ -+static const char *ast_gpio_trigger(unsigned gpio) -+{ -+ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); -+ if (regs) -+ { -+ unsigned shift = AST_GPIO_SHIFT(gpio); -+ unsigned trigger = -+ (AST_GPIO_READ(regs->intcfg + AST_GPIO_INT_SENS0, shift) << 0) | -+ (AST_GPIO_READ(regs->intcfg + AST_GPIO_INT_SENS1, shift) << 1) | -+ (AST_GPIO_READ(regs->intcfg + AST_GPIO_INT_SENS2, shift) << 2); -+ -+ switch (trigger) -+ { -+ case ASPEED_GPIO_FALLING_EDGE: -+ return "fall"; -+ case ASPEED_GPIO_RISING_EDGE: -+ return "rise"; -+ case ASPEED_GPIO_LOW_LEVEL: -+ return "low "; -+ case ASPEED_GPIO_HIGH_LEVEL: -+ return "high"; -+ default: -+ return "both"; -+ } -+ } -+ return "error"; -+} -+ -+/** -+ * @return An interrupt status in human readable format. -+ */ -+static const char *ast_gpio_int_status(unsigned gpio) -+{ -+ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); -+ if (regs) -+ { -+ unsigned shift = AST_GPIO_SHIFT(gpio); -+ if (AST_GPIO_READ(regs->intcfg, shift)) -+ { -+ return AST_GPIO_READ(regs->intcfg + AST_GPIO_INT_STATUS, shift) -+ ? "pending" -+ : "cleaned"; -+ } -+ return "disabled"; -+ } -+ -+ return "error"; -+} -+ -+/** -+ * @return A debounce value in human readable format. -+ */ -+static const char *ast_gpio_debounce(unsigned gpio) -+{ -+ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); -+ if (regs) -+ { -+ unsigned shift = AST_GPIO_SHIFT(gpio); -+ unsigned debounce = -+ (AST_GPIO_READ(regs->debounce + AST_GPIO_DEBOUNCE0, shift) << 0) | -+ (AST_GPIO_READ(regs->debounce + AST_GPIO_DEBOUNCE1, shift) << 1); -+ switch (debounce) -+ { -+ case ASPEED_GPIO_DEBOUNCE_NONE: -+ return "none"; -+ case ASPEED_GPIO_DEBOUNCE_1: -+ return "timer1"; -+ case ASPEED_GPIO_DEBOUNCE_2: -+ return "timer2"; -+ case ASPEED_GPIO_DEBOUNCE_3: -+ return "timer3"; -+ default: -+ break; -+ } -+ } -+ -+ return "error"; -+} -+ -+/** -+ * @return A command source value in human readable format. -+ */ -+static const char *ast_gpio_command_source(unsigned gpio) -+{ -+ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); -+ if (regs) -+ { -+ /* Used one bit per gpio port */ -+ unsigned shift = AST_GPIO_SHIFT(gpio) - AST_GPIO_PIN(gpio); -+ unsigned cmdsrc = -+ (AST_GPIO_READ(regs->cmdsrc + AST_GPIO_CMD_SRC0, shift) << 0) | -+ (AST_GPIO_READ(regs->cmdsrc + AST_GPIO_CMD_SRC1, shift) << 1); -+ -+ switch (cmdsrc) -+ { -+ /* The single place where these values are used is here. */ -+ case 0x0: -+ return "ARM"; -+ case 0x1: -+ return "LPC"; -+ case 0x2: -+ return "CoCPU"; -+ default: -+ return "Unknown"; -+ } -+ } -+ -+ return "error"; -+} -+ -+/** -+ * @brief Show all GPIO pins statuses. Used by `do_gpio()` in `cmd/gpio.c` -+ */ -+void gpio_info(void) -+{ -+ unsigned first = ASPEED_GPIO(A, 0); -+ unsigned last = ASPEED_GPIO(AC, 7); -+ for (unsigned gpio = first; gpio <= last; gpio++) -+ { -+ unsigned port = AST_GPIO_PORT(gpio); -+ unsigned pin = AST_GPIO_PIN(gpio); -+ unsigned shift = AST_GPIO_SHIFT(gpio); -+ ast_gpio_regs_t *regs = AST_GPIO_REGS(gpio); -+ if (!regs) -+ { -+ printf("gpio %u is invalid!\n", gpio); -+ continue; -+ } -+ -+ printf("gpio %c%c%c line %3d: %s, int: %s, %s, deb: %s, src: %s, " -+ "val: %d/%d\n", -+ (port >= ASPEED_GPIO_PORT_AA ? 'A' : ' '), -+ ('A' + port % ASPEED_GPIO_PORT_AA), ('0' + pin), gpio, -+ ast_gpio_direction(gpio), ast_gpio_trigger(gpio), -+ ast_gpio_int_status(gpio), ast_gpio_debounce(gpio), -+ ast_gpio_command_source(gpio), gpio_get_value(gpio), -+ AST_GPIO_READ(regs->data, shift)); -+ } -+} -diff --git a/include/configs/ast-g5-phy.h b/include/configs/ast-g5-phy.h -index 5443a26cab..ea7c66716a 100644 ---- a/include/configs/ast-g5-phy.h -+++ b/include/configs/ast-g5-phy.h -@@ -32,5 +32,6 @@ - - /* Call board_late_init */ - #define CONFIG_BOARD_LATE_INIT 1 -+#define CONFIG_CMD_GPIO 1 /* Enable gpio command in shell */ - - #endif /* __AST_G5_PHY_CONFIG_H */ --- -2.17.1 - diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0005-aspeed-Enable-SPI-master-mode.patch b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0005-aspeed-Enable-SPI-master-mode.patch deleted file mode 100644 index 0dd736fba..000000000 --- a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0005-aspeed-Enable-SPI-master-mode.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0bf84de2a9db749bd61064cd47b96ef457725f54 Mon Sep 17 00:00:00 2001 -From: Chanh Nguyen -Date: Wed, 10 Mar 2021 00:02:17 +0700 -Subject: [PATCH] aspeed: Enable SPI master mode - -Currently, some systems design the strap pin, -which was shared pin with another function. -That makes the board strapping does not reflect the intended use of the system. - -This patch will enable SPI master mode by default. - -Signed-off-by: Chanh Nguyen ---- - board/aspeed/ast-g5/ast-g5.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c -index 9e27bce0f5..ed83d65136 100644 ---- a/board/aspeed/ast-g5/ast-g5.c -+++ b/board/aspeed/ast-g5/ast-g5.c -@@ -125,6 +125,9 @@ int board_late_init(void) - update_bootargs_cmd("resetreason", value); - } - -+ /* enable SPI master */ -+ ast_scu_spi_master(1); -+ - return 0; - } - #endif --- -2.17.1 - diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0006-aspeed-support-Mt.Jade-platform-init.patch b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0006-aspeed-support-Mt.Jade-platform-init.patch deleted file mode 100644 index 02a478362..000000000 --- a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0006-aspeed-support-Mt.Jade-platform-init.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 2c9ab641f2a7ea146a468ec4301c416010badff7 Mon Sep 17 00:00:00 2001 -From: Chanh Nguyen -Date: Wed, 17 Mar 2021 14:11:18 +0700 -Subject: [PATCH] aspeed: support Mt.Jade platform init - -This commit adds platform init for Mt.Jade platform. - -Signed-off-by: Thang Q. Nguyen -Signed-off-by: Chanh Nguyen ---- - arch/arm/include/asm/arch-aspeed/ast_scu.h | 1 + - arch/arm/include/asm/arch-aspeed/regs-scu.h | 4 ++ - arch/arm/mach-aspeed/ast-scu.c | 18 +++++ - board/aspeed/ast-g5/ast-g5.c | 76 +++++++++++++++++++++ - include/configs/ast-g5-phy.h | 3 + - 5 files changed, 102 insertions(+) - -diff --git a/arch/arm/include/asm/arch-aspeed/ast_scu.h b/arch/arm/include/asm/arch-aspeed/ast_scu.h -index f5c9126ec0..e2d06ccc1f 100644 ---- a/arch/arm/include/asm/arch-aspeed/ast_scu.h -+++ b/arch/arm/include/asm/arch-aspeed/ast_scu.h -@@ -46,5 +46,6 @@ extern void ast_scu_init_eth(u8 num); - extern void ast_scu_multi_func_eth(u8 num); - extern void ast_scu_multi_func_romcs(u8 num); - extern void ast_scu_switch_pwm_to_gpio_mode(void); -+extern void ast_scu_switch_espi_to_gpio_mode(void); - - #endif -diff --git a/arch/arm/include/asm/arch-aspeed/regs-scu.h b/arch/arm/include/asm/arch-aspeed/regs-scu.h -index b714fa9234..704ad75b4e 100644 ---- a/arch/arm/include/asm/arch-aspeed/regs-scu.h -+++ b/arch/arm/include/asm/arch-aspeed/regs-scu.h -@@ -76,6 +76,7 @@ - #define AST_SCU_FUN_PIN_CTRL7 0xA0 /* Multi-function Pin Control#7*/ - #define AST_SCU_FUN_PIN_CTRL8 0xA4 /* Multi-function Pin Control#8*/ - #define AST_SCU_FUN_PIN_CTRL9 0xA8 /* Multi-function Pin Control#9*/ -+#define AST_SCU_FUN_PIN_CTRL10 0xAC /* Multi-function Pin Control#10*/ - #define AST_SCU_MAC_CLK_DELAY_100M 0xB8 /* MAC interface clock delay 100M setting*/ - #define AST_SCU_MAC_CLK_DELAY_10M 0xBC /* MAC interface clock delay 10M setting*/ - #define AST_SCU_PWR_SAVING_EN 0xC0 /* Power Saving Wakeup Enable*/ -@@ -921,6 +922,9 @@ - #define SCU_FUN_PIN_ROMA19 (0x1 << 1) - #define SCU_FUN_PIN_ROMA18 (0x1) - -+/* AST_SCU_FUN_PIN_CTRL10 0xAC - Multi-function Pin Control#10 */ -+#define SCU_FUN_PIN_ESPI(x) (0x1 << (x)) -+ - /* AST_SCU_PWR_SAVING_EN 0xC0 - Power Saving Wakeup Enable */ - /* AST_SCU_PWR_SAVING_CTRL 0xC4 - Power Saving Wakeup Control */ - /* AST_SCU_HW_STRAP2 0xD0 - Haardware strapping register set 2 */ -diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c -index c7ab66415f..71c043d3e8 100644 ---- a/arch/arm/mach-aspeed/ast-scu.c -+++ b/arch/arm/mach-aspeed/ast-scu.c -@@ -554,3 +554,21 @@ void ast_scu_get_who_init_dram(void) - break; - } - } -+ -+void ast_scu_switch_espi_to_gpio_mode(void) -+{ -+ /* -+ * This Function to set the ESPI pin to GPIO mode -+ * This allow to setting AC5_READY -+ */ -+ ast_scu_write(ast_scu_read(AST_SCU_FUN_PIN_CTRL10) & -+ ~SCU_FUN_PIN_ESPI(0) & -+ ~SCU_FUN_PIN_ESPI(1) & -+ ~SCU_FUN_PIN_ESPI(2) & -+ ~SCU_FUN_PIN_ESPI(3) & -+ ~SCU_FUN_PIN_ESPI(4) & -+ ~SCU_FUN_PIN_ESPI(5) & -+ ~SCU_FUN_PIN_ESPI(6) & -+ ~SCU_FUN_PIN_ESPI(7), -+ AST_SCU_FUN_PIN_CTRL10); -+} -diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c -index ed83d65136..edf7f050a8 100644 ---- a/board/aspeed/ast-g5/ast-g5.c -+++ b/board/aspeed/ast-g5/ast-g5.c -@@ -163,3 +163,79 @@ void hw_watchdog_reset(void) - writel(0x4755, AST_WDT2_BASE + 0x08); - } - #endif /* CONFIG_WATCHDOG */ -+ -+#ifdef CONFIG_BOARD_EARLY_INIT_F -+int board_gpio_init(void) -+{ -+ int pgood = 0; -+ -+ /* GPIO_BMC_PSU_PG */ -+ pgood = gpio_get_value(44); -+ /* GPIO_BMC_OCP_AUX_PWREN */ -+ gpio_direction_output(139, 1); -+ -+ if (pgood) -+ { -+ /* GPIO_BMC_SYS_ATX_PSON_L */ -+ gpio_direction_output(42, 0); -+ /* GPIO_BMC_OCP_MAIN_PWREN */ -+ gpio_direction_output(140, 1); -+ } -+ else -+ { -+ /* GPIO_BMC_SYS_ATX_PSON_L */ -+ gpio_direction_output(42, 1); -+ /* GPIO_BMC_OCP_MAIN_PWREN */ -+ gpio_direction_output(140, 0); -+ } -+ -+ /* GPIOH7 GPIO_BMC_I2C6_RESET_L */ -+ gpio_direction_output(63, 1); -+ -+ /* GPIOM4 S0_I2C9_ALERT_L */ -+ gpio_direction_input(100); -+ -+ /* GPIOM5 S1_I2C9_ALERT_L */ -+ gpio_direction_input(101); -+ -+ /* GPIOQ7 GPIO_BMC_VGA_FRONT_PRES_L */ -+ gpio_direction_input(135); -+ -+ /* GPIOR1 GPIO_BMC_JTAG_SRST_L */ -+ gpio_direction_output(137, 1); -+ -+ /* BMC_GPIOR2_EXT_HIGHTEMP_L */ -+ gpio_direction_output(138, 1); -+ -+ /* GPIOS0 GPIO_S0_VRHOT_L */ -+ gpio_direction_input(144); -+ -+ /* GPIOS1 GPIO_S1_VRHOT_L */ -+ gpio_direction_input(145); -+ -+ /* GPIOS5 GPIO_BMC_VR_PMBUS_SEL_L */ -+ gpio_direction_output(149, 1); -+ -+ /* GPIOY3 BMC_VGA_SEL */ -+ gpio_direction_output(195, 1); -+ -+ /* GPIOAC1 GPIO_BMC_PCA9554_INT_L */ -+ gpio_direction_input(225); -+ -+ /* GPIO_BMC_READY */ -+ gpio_direction_output(229, 1); -+ -+ /* Enable I2C4 device access */ -+ gpio_direction_output(194, 1); -+ -+ return 0; -+} -+ -+int board_early_init_f(void) -+{ -+ ast_scu_switch_espi_to_gpio_mode(); -+ board_gpio_init(); -+ -+ return 0; -+} -+#endif /* CONFIG_BOARD_EARLY_INIT_F */ -diff --git a/include/configs/ast-g5-phy.h b/include/configs/ast-g5-phy.h -index ea7c66716a..a5e389616b 100644 ---- a/include/configs/ast-g5-phy.h -+++ b/include/configs/ast-g5-phy.h -@@ -34,4 +34,7 @@ - #define CONFIG_BOARD_LATE_INIT 1 - #define CONFIG_CMD_GPIO 1 /* Enable gpio command in shell */ - -+/* Call board_early_init_f */ -+#define CONFIG_BOARD_EARLY_INIT_F 1 -+ - #endif /* __AST_G5_PHY_CONFIG_H */ --- -2.17.1 - diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index bda3d9d71..6d0a5f816 100644 --- a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -4,7 +4,4 @@ SRC_URI += " \ file://0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch \ file://0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch \ file://0003-aspeed-support-passing-system-reset-status-to-kernel.patch \ - file://0004-aspeed-add-gpio-support.patch \ - file://0005-aspeed-Enable-SPI-master-mode.patch \ - file://0006-aspeed-support-Mt.Jade-platform-init.patch \ " -- cgit v1.2.3 From ade3e145ead0beedad181394fcaa63856176bdee Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 22 Oct 2021 14:26:27 -0500 Subject: treewide: clean up use of OBMC_MACHINE_FEATURES Modify the machine meta-layer configs to remove the use of the OBMC_MACHINE_FEATURES indirection and favor the Yocto MACHINE_FEATURES variable instead. Signed-off-by: Patrick Williams Change-Id: Ifafb79e4e4c010e9476b9547cd4982f5b645060e --- meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 2 +- meta-ampere/meta-jade/conf/machine/mtjade.conf | 2 +- meta-bytedance/meta-g220a/conf/machine/g220a.conf | 2 +- meta-facebook/conf/machine/include/facebook-withhost.inc | 2 +- meta-facebook/conf/machine/include/facebook.inc | 2 +- meta-fii/meta-kudo/conf/machine/kudo.conf | 2 +- meta-hpe/conf/machine/include/hpe.inc | 2 +- meta-ibm/conf/machine/p10bmc.conf | 2 +- meta-intel-openbmc/conf/machine/include/intel.inc | 2 +- meta-inventec/conf/machine/include/inventec.inc | 2 +- meta-openpower/conf/machine/include/openpower.inc | 2 +- meta-openpower/conf/machine/include/p8.inc | 2 +- meta-openpower/conf/machine/include/p9.inc | 2 +- meta-quanta/meta-gsj/conf/machine/gsj.conf | 2 +- meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf | 2 +- meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf | 2 +- meta-supermicro/conf/machine/include/supermicro.inc | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'meta-ampere/meta-jade') diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index 2ac82cade..91ca5bb1b 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -11,7 +11,7 @@ SERIAL_CONSOLES = "115200;ttyS4" FLASH_SIZE = "32768" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-chassis-state-mgmt \ obmc-host-state-mgmt \ diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index a47ebef8a..633efa012 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -16,7 +16,7 @@ FLASH_RWFS_OFFSET = "43008" OBMC_POWER_SUPPLY_INSTANCES = "0 1" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ obmc-chassis-state-mgmt \ diff --git a/meta-bytedance/meta-g220a/conf/machine/g220a.conf b/meta-bytedance/meta-g220a/conf/machine/g220a.conf index ba7a253e3..516e31683 100644 --- a/meta-bytedance/meta-g220a/conf/machine/g220a.conf +++ b/meta-bytedance/meta-g220a/conf/machine/g220a.conf @@ -10,7 +10,7 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/distro/include/phosphor-aspeednic-use-mac2.inc -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-chassis-state-mgmt \ obmc-host-ipmi \ diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc index ebe79d1a4..8567f696c 100644 --- a/meta-facebook/conf/machine/include/facebook-withhost.inc +++ b/meta-facebook/conf/machine/include/facebook-withhost.inc @@ -1,6 +1,6 @@ require conf/machine/include/facebook.inc -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-chassis-state-mgmt \ obmc-host-ipmi \ obmc-host-state-mgmt \ diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index d18a66bf5..43a0c2222 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index 9f64c476b..e065f2086 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -22,7 +22,7 @@ IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" SERIAL_CONSOLES = "115200;ttyS0" -OBMC_MACHINE_FEATURES += " \ +MACHINE_FEATURES += " \ obmc-host-ipmi \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-hpe/conf/machine/include/hpe.inc b/meta-hpe/conf/machine/include/hpe.inc index 74b1a2c6d..281d2d544 100644 --- a/meta-hpe/conf/machine/include/hpe.inc +++ b/meta-hpe/conf/machine/include/hpe.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 1891129a4..b714f78d3 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -15,7 +15,7 @@ require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc require conf/distro/include/ibm-yaml.inc DISTRO_FEATURES += "ibm-service-account-policy" -OBMC_MACHINE_FEATURES += 'phal' +MACHINE_FEATURES += 'phal' SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-intel-openbmc/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc index 738d103e5..623cd7910 100644 --- a/meta-intel-openbmc/conf/machine/include/intel.inc +++ b/meta-intel-openbmc/conf/machine/include/intel.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc index 02b0df685..9a9e9f574 100644 --- a/meta-inventec/conf/machine/include/inventec.inc +++ b/meta-inventec/conf/machine/include/inventec.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc index 65d9a8aef..f6c48bfb0 100644 --- a/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openpower/conf/machine/include/openpower.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-openpower/conf/machine/include/p8.inc b/meta-openpower/conf/machine/include/p8.inc index af269c23e..eb262cbf7 100644 --- a/meta-openpower/conf/machine/include/p8.inc +++ b/meta-openpower/conf/machine/include/p8.inc @@ -1,2 +1,2 @@ include conf/machine/include/ibm-power8-cpu.inc -OBMC_MACHINE_FEATURES += 'i2c-occ' +MACHINE_FEATURES += 'i2c-occ' diff --git a/meta-openpower/conf/machine/include/p9.inc b/meta-openpower/conf/machine/include/p9.inc index 2da9fd144..5c1779322 100644 --- a/meta-openpower/conf/machine/include/p9.inc +++ b/meta-openpower/conf/machine/include/p9.inc @@ -1,3 +1,3 @@ include conf/machine/include/ibm-power9-cpu.inc -OBMC_MACHINE_FEATURES += 'op-fsi p9-cfam-override' +MACHINE_FEATURES += 'op-fsi p9-cfam-override' PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index c5089e804..ce58a91c3 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -11,7 +11,7 @@ require conf/machine/include/obmc-bsp-common.inc IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" IMAGE_FSTYPES += " mtd-ubi-tar" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf index 7fadd1aba..a90e77bf6 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf @@ -16,7 +16,7 @@ IGPS_MACHINE = "RunBMC" IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf index 2bcaeaaa1..935bd99ca 100644 --- a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf +++ b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf @@ -11,7 +11,7 @@ UBOOT_LOADADDRESS = "0x40008000" FLASH_SIZE = "32768" # If we included the openpower.inc we'd get these from that. -#OBMC_MACHINE_FEATURES += "\ +#MACHINE_FEATURES += "\ # obmc-phosphor-fan-mgmt \ # obmc-phosphor-chassis-mgmt \ # obmc-phosphor-flash-mgmt \ diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc index bb26af880..d663f445a 100644 --- a/meta-supermicro/conf/machine/include/supermicro.inc +++ b/meta-supermicro/conf/machine/include/supermicro.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-chassis-state-mgmt \ obmc-host-state-mgmt \ -- cgit v1.2.3 From 060ad3ff7fcc30aff78a9e504efee9d8fa0d4526 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 22 Oct 2021 15:30:00 -0500 Subject: treewide: remove obmc-system-mgmt feature Every machine layer treats 'system-management' as either part of a package-group or removes the feature. The sample implementation in meta-phosphor is a do-nothing shell script (and up until recently was a Python script). There appears to be no useful purpose to this feature as a stand-alone concept, so remove it. Signed-off-by: Patrick Williams Change-Id: I20ca1fa8ff3cb01cac2d07d4ded84e0769e4514b --- meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 1 - .../packagegroups/packagegroup-amd-apps.bb | 2 -- .../packagegroups/packagegroup-ampere-apps.bb | 2 -- meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 - .../meta-e3c246d4i/conf/machine/e3c246d4i.conf | 1 - .../packagegroups/packagegroup-asrock-apps.bb | 2 -- meta-bytedance/meta-g220a/conf/machine/g220a.conf | 1 - .../packagegroups/packagegroup-bytedance-apps.bb | 2 -- meta-facebook/conf/machine/include/facebook.inc | 1 - .../packagegroups/packagegroup-fb-apps.bb | 2 -- meta-fii/meta-kudo/conf/machine/kudo.conf | 1 - .../packagegroups/packagegroup-kudo-apps.bb | 2 -- meta-hpe/conf/machine/include/hpe.inc | 1 - .../packagegroups/packagegroup-hpe-apps.bb | 2 -- .../meta-on5263m5/conf/machine/on5263m5.conf | 1 - .../packagegroups/packagegroup-inspur-apps.bb | 2 -- meta-intel-openbmc/conf/machine/include/intel.inc | 1 - .../packagegroups/packagegroup-intel-apps.bb | 2 -- meta-inventec/conf/machine/include/inventec.inc | 1 - .../packagegroups/packagegroup-inventec-apps.bb | 2 -- meta-openpower/conf/machine/include/openpower.inc | 1 - .../packagegroups/packagegroup-op-apps.bb | 2 -- meta-phosphor/classes/obmc-phosphor-image.bbclass | 2 -- .../conf/distro/include/phosphor-base.inc | 1 - .../conf/distro/include/phosphor-defaults.inc | 2 -- .../recipes-phosphor/images/obmc-phosphor-image.bb | 1 - .../recipes-phosphor/system/obmc-phosphor-sysd.bb | 18 ---------------- .../obmc-phosphor-sysd/obmc-phosphor-sysd.service | 10 --------- .../obmc-phosphor-sysd/obmc-phosphor-sysd.sh | 24 ---------------------- meta-quanta/meta-gbs/conf/machine/gbs.conf | 1 - meta-quanta/meta-gsj/conf/machine/gsj.conf | 1 - .../conf/machine/olympus-nuvoton.conf | 1 - .../packagegroup-olympus-nuvoton-apps.bb | 2 -- .../conf/machine/include/supermicro.inc | 1 - .../packagegroups/packagegroup-supermicro-apps.bb | 2 -- 35 files changed, 99 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb delete mode 100644 meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service delete mode 100644 meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh (limited to 'meta-ampere/meta-jade') diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index 91ca5bb1b..cc9f95673 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -31,7 +31,6 @@ PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ethanolx-led-manager-config-native" diff --git a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb index 06938055c..758e5b3ca 100644 --- a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb +++ b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "AMD Chassis" RDEPENDS:${PN}-chassis = " \ 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..ac820590f 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 @@ -13,11 +13,9 @@ PACKAGES = " \ 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 = "Ampere Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 633efa012..bd82e61c5 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -38,7 +38,6 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ " PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "mtjade-led-manager-config-native" diff --git a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf index 38fb811ff..b960c743d 100644 --- a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf +++ b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf @@ -9,7 +9,6 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps" VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control" VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control" diff --git a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb index e9f676dc8..c3af264a3 100644 --- a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb +++ b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb @@ -10,10 +10,8 @@ PACKAGES = " \ " PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-flash = "ASRock Flash" RDEPENDS:${PN}-flash = " \ diff --git a/meta-bytedance/meta-g220a/conf/machine/g220a.conf b/meta-bytedance/meta-g220a/conf/machine/g220a.conf index 516e31683..6e89d146d 100644 --- a/meta-bytedance/meta-g220a/conf/machine/g220a.conf +++ b/meta-bytedance/meta-g220a/conf/machine/g220a.conf @@ -30,7 +30,6 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed-sdk" PREFERRED_PROVIDER_u-boot = "u-boot-aspeed-sdk" diff --git a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb index 173805635..0de1880bc 100644 --- a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb +++ b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Bytedance Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 43a0c2222..415816db8 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -10,7 +10,6 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" IMAGE_FEATURES:remove = "obmc-ikvm" diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index d9c2abd53..febd160af 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -18,12 +18,10 @@ PACKAGES:append:fb-withhost = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Facebook Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index e065f2086..534df3581 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -30,7 +30,6 @@ MACHINE_FEATURES += " \ " 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" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps" diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb index 800efde74..e916c0f5f 100644 --- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -12,11 +12,9 @@ PACKAGES = " \ " PROVIDES += "virtual/obmc-chassis-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" RPROVIDES:${PN}-kudo-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES:${PN}-kudo-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-kudo-fw += "virtual-obmc-flash-mgmt" RPROVIDES:${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" diff --git a/meta-hpe/conf/machine/include/hpe.inc b/meta-hpe/conf/machine/include/hpe.inc index 281d2d544..79896c713 100644 --- a/meta-hpe/conf/machine/include/hpe.inc +++ b/meta-hpe/conf/machine/include/hpe.inc @@ -15,7 +15,6 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-hpe-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" #PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" diff --git a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb index 3f16d41e7..9fdcd4b2e 100644 --- a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb +++ b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "HPE Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf index 1c217913e..6017a8885 100644 --- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf +++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf @@ -7,7 +7,6 @@ require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" UBOOT_MACHINE = "ast_g5_phy_config" diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb index 68a2184cf..2d95e2332 100644 --- a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Inspur Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-intel-openbmc/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc index 623cd7910..4287ddd80 100644 --- a/meta-intel-openbmc/conf/machine/include/intel.inc +++ b/meta-intel-openbmc/conf/machine/include/intel.inc @@ -14,7 +14,6 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-intel-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb index 303a04b3d..69a523475 100644 --- a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Intel Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc index 9a9e9f574..0f8419e42 100644 --- a/meta-inventec/conf/machine/include/inventec.inc +++ b/meta-inventec/conf/machine/include/inventec.inc @@ -17,7 +17,6 @@ VIRTUAL-RUNTIME_obmc-discover-system-state = "x86-power-control" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inventec-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb index 7996cda5b..374b279a9 100644 --- a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb +++ b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb @@ -15,13 +15,11 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-ipmi-oem" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-ipmi-oem += "virtual-obmc-ipmi-oem" SUMMARY:${PN}-chassis = "Inventec Chassis" diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc index f6c48bfb0..348361e87 100644 --- a/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openpower/conf/machine/include/openpower.inc @@ -18,7 +18,6 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-bt" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-op-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout ?= "openpower-fru-vpd-layout-native" diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index 890967f96..e20def697 100644 --- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "OpenPOWER Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 80c16d22e..572ec80f1 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -27,7 +27,6 @@ # - obmc-sensors - OpenBMC sensor support # - obmc-settings-mgmt - OpenBMC settings management # - obmc-software - OpenBMC software management -# - obmc-system-mgmt - OpenBMC system management # - obmc-telemetry - OpenBMC telemetry solution # - obmc-user-mgmt - OpenBMC user management # - obmc-user-mgmt-ldap - OpenBMC LDAP users @@ -59,7 +58,6 @@ FEATURE_PACKAGES_obmc-rng ?= "packagegroup-obmc-apps-rng" FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net" FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors" FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software" -FEATURE_PACKAGES_obmc-system-mgmt ?= "${@bb.utils.contains('DISTRO_FEATURES', 'obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', '', d)}" FEATURE_PACKAGES_obmc-debug-collector ?= "packagegroup-obmc-apps-debug-collector" FEATURE_PACKAGES_obmc-settings-mgmt ?= "packagegroup-obmc-apps-settings" FEATURE_PACKAGES_obmc-network-mgmt ?= "packagegroup-obmc-apps-network" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 64f293cf0..0e7e84945 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -91,7 +91,6 @@ DISTRO_FEATURES_OBMC = " \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ - obmc-phosphor-system-mgmt \ " DISTRO_FEATURES_DEFAULT = " \ diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 8673a15c1..948a09051 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -97,8 +97,6 @@ VIRTUAL-RUNTIME_obmc-dump-manager ?= "phosphor-debug-collector-manager" # Provide support for monitoring BMC core dumps VIRTUAL-RUNTIME_obmc-dump-monitor ?= "phosphor-debug-collector-monitor" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt ??= "obmc-phosphor-sysd" - # phosphor-hwmon-config # # The phosphor-hwmon package can have its configuration generated diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index 494b06c7c..85b7f0448 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -29,7 +29,6 @@ IMAGE_FEATURES += " \ obmc-net-ipmi \ obmc-sensors \ obmc-software \ - obmc-system-mgmt \ obmc-user-mgmt \ obmc-user-mgmt-ldap \ ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'read-only-rootfs', '', d)} \ diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb deleted file mode 100644 index 06eb55ec2..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Phosphor OpenBMC System Management" -DESCRIPTION = "Phosphor OpenBMC system management reference implementation." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit obmc-phosphor-dbus-service - -PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES:${PN} += "virtual-obmc-system-mgmt" - -S = "${WORKDIR}" -SRC_URI += "file://${BPN}.sh" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/${BPN}.sh ${D}${bindir}/${BPN} -} diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service deleted file mode 100644 index 246d985ba..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor System Manager - -[Service] -Restart=always -ExecStart=/usr/bin/env obmc-phosphor-sysd -SyslogIdentifier=obmc-phosphor-sysd - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh deleted file mode 100644 index 95488d04d..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# Contributors Listed Below - COPYRIGHT 2015 -# [+] International Business Machines Corp. -# -# -# 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. - -echo "obmc-phosphor-sysd starting..." - -while true -do - sleep 60 -done diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 8fb72f286..4a65c5dcb 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -49,7 +49,6 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-net-ipmi" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-software" -IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-telemetry" IMAGE_FEATURES:remove = "obmc-debug-collector" IMAGE_FEATURES:remove = "obmc-settings-mgmt" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index ce58a91c3..8b9a1f823 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -44,7 +44,6 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-settings-mgmt" IMAGE_FEATURES:remove = "obmc-software" -IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap" IMAGE_FEATURES:remove = "obmc-debug-collector" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf index a90e77bf6..b45d74591 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf @@ -29,6 +29,5 @@ MACHINE_FEATURES += "\ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-olympus-nuvoton-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "olympus-nuvoton-led-manager-config-native" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb index d462d6905..6d69400e9 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-fans = "OLYMPUS NUVOTON Fans" RDEPENDS:${PN}-fans = " \ diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc index d663f445a..c8a762f77 100644 --- a/meta-supermicro/conf/machine/include/supermicro.inc +++ b/meta-supermicro/conf/machine/include/supermicro.inc @@ -14,7 +14,6 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-supermicro-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" diff --git a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb index 4549bf70f..6a24fadc6 100644 --- a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb +++ b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Supermicro Chassis" RDEPENDS:${PN}-chassis = " \ -- cgit v1.2.3 From 5a5f33c729e6b5869362172b63595422eb84a418 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 3 Nov 2021 10:35:37 -0500 Subject: Partially revert "treewide: remove obmc-system-mgmt feature" The obmc-system-mgmt feature is currently used in the image to trigger inclusion of a virtual-provider which provides a number of packages many systems need. Partially revert the removal of this feature so that the outcome is: 1. The empty obmc-phosphor-sysd package is still removed. 2. By default the 'obmc-system-mgmt' feature is included, unless specifically exempted. 3. All EVB platforms remove the 'obmc-system-mgmt' feature since they have no system they are managing. This partially reverts commit 060ad3ff7fcc30aff78a9e504efee9d8fa0d4526. Tested: * Built `bletchley` and confirmed `packagegroup-fb-apps-system` and `entity-manager` are present. ``` entity-manager armv7ahf-vfpv4d16 0.1+git0+6bf41588ab-r0 packagegroup-fb-apps-system all 1.0-r1 ``` * Built `witherspoon` and confirmed `packagegroup-op-apps-system` and `pdbg` are present. ``` packagegroup-op-apps-system noarch 1.0 pdbg arm1176jzs 3.3 ``` * Ran `bitbake -p` on `evb-ast2600` to confirm the undefined `virtual-obmc-system-mgmt` is not being included in the image. Change-Id: I8b7804d5101cc84a2c57473b3f85672bf7767c67 Signed-off-by: Patrick Williams --- meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 1 + meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb | 2 ++ .../meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb | 2 ++ meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 + meta-aspeed/conf/machine/evb-ast2500.conf | 1 + meta-aspeed/conf/machine/evb-ast2600.conf | 1 + meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf | 1 + .../recipes-asrock/packagegroups/packagegroup-asrock-apps.bb | 2 ++ meta-bytedance/meta-g220a/conf/machine/g220a.conf | 1 + .../recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb | 2 ++ meta-evb/meta-evb-raspberrypi/conf/local.conf.sample | 1 + meta-facebook/conf/machine/include/facebook.inc | 1 + meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb | 2 ++ meta-fii/meta-kudo/conf/machine/kudo.conf | 1 + meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb | 2 ++ meta-hpe/conf/machine/include/hpe.inc | 1 + .../meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb | 2 ++ meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf | 1 + .../recipes-inspur/packagegroups/packagegroup-inspur-apps.bb | 2 ++ meta-intel-openbmc/conf/machine/include/intel.inc | 1 + .../meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb | 2 ++ meta-inventec/conf/machine/include/inventec.inc | 1 + .../recipes-inventec/packagegroups/packagegroup-inventec-apps.bb | 2 ++ meta-nuvoton/conf/machine/evb-npcm750.conf | 1 + meta-openpower/conf/machine/include/openpower.inc | 1 + meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb | 2 ++ meta-phosphor/classes/obmc-phosphor-image.bbclass | 2 ++ meta-phosphor/conf/distro/include/phosphor-base.inc | 1 + meta-phosphor/conf/machine/include/obmc-evb-common.inc | 2 ++ meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb | 1 + meta-quanta/meta-gbs/conf/machine/gbs.conf | 1 + meta-quanta/meta-gsj/conf/machine/gsj.conf | 1 + meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf | 1 + .../packagegroups/packagegroup-olympus-nuvoton-apps.bb | 2 ++ meta-supermicro/conf/machine/include/supermicro.inc | 1 + .../recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb | 2 ++ 36 files changed, 51 insertions(+) create mode 100644 meta-phosphor/conf/machine/include/obmc-evb-common.inc (limited to 'meta-ampere/meta-jade') diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index cc9f95673..91ca5bb1b 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -31,6 +31,7 @@ PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ethanolx-led-manager-config-native" diff --git a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb index 758e5b3ca..06938055c 100644 --- a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb +++ b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "AMD Chassis" RDEPENDS:${PN}-chassis = " \ 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 ac820590f..ede8d9db5 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 @@ -13,9 +13,11 @@ PACKAGES = " \ 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 = "Ampere Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index bd82e61c5..633efa012 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -38,6 +38,7 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ " PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "mtjade-led-manager-config-native" diff --git a/meta-aspeed/conf/machine/evb-ast2500.conf b/meta-aspeed/conf/machine/evb-ast2500.conf index e8aebd18f..1ee80f8be 100644 --- a/meta-aspeed/conf/machine/evb-ast2500.conf +++ b/meta-aspeed/conf/machine/evb-ast2500.conf @@ -2,5 +2,6 @@ KERNEL_DEVICETREE = "aspeed-ast2500-evb.dtb" UBOOT_MACHINE = "ast_g5_phy_config" require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-evb-common.inc SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf index d3ee47b9c..e0aa2cdce 100644 --- a/meta-aspeed/conf/machine/evb-ast2600.conf +++ b/meta-aspeed/conf/machine/evb-ast2600.conf @@ -4,6 +4,7 @@ UBOOT_DEVICETREE = "ast2600a1-evb" SPL_BINARY = "spl/u-boot-spl.bin" require conf/machine/include/ast2600.inc +require conf/machine/include/obmc-evb-common.inc SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf index b960c743d..38fb811ff 100644 --- a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf +++ b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf @@ -9,6 +9,7 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps" VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control" VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control" diff --git a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb index c3af264a3..e9f676dc8 100644 --- a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb +++ b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb @@ -10,8 +10,10 @@ PACKAGES = " \ " PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-flash = "ASRock Flash" RDEPENDS:${PN}-flash = " \ diff --git a/meta-bytedance/meta-g220a/conf/machine/g220a.conf b/meta-bytedance/meta-g220a/conf/machine/g220a.conf index 6e89d146d..516e31683 100644 --- a/meta-bytedance/meta-g220a/conf/machine/g220a.conf +++ b/meta-bytedance/meta-g220a/conf/machine/g220a.conf @@ -30,6 +30,7 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed-sdk" PREFERRED_PROVIDER_u-boot = "u-boot-aspeed-sdk" diff --git a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb index 0de1880bc..173805635 100644 --- a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb +++ b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Bytedance Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample index 88b639111..b46503e67 100644 --- a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample +++ b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample @@ -20,3 +20,4 @@ CONF_VERSION = "2" # Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/obmc-evb-common.inc diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 415816db8..43a0c2222 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -10,6 +10,7 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" IMAGE_FEATURES:remove = "obmc-ikvm" diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index febd160af..d9c2abd53 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -18,10 +18,12 @@ PACKAGES:append:fb-withhost = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Facebook Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index 534df3581..e065f2086 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -30,6 +30,7 @@ MACHINE_FEATURES += " \ " 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" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps" diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb index e916c0f5f..800efde74 100644 --- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -12,9 +12,11 @@ PACKAGES = " \ " PROVIDES += "virtual/obmc-chassis-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" RPROVIDES:${PN}-kudo-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-kudo-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-kudo-fw += "virtual-obmc-flash-mgmt" RPROVIDES:${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" diff --git a/meta-hpe/conf/machine/include/hpe.inc b/meta-hpe/conf/machine/include/hpe.inc index 79896c713..281d2d544 100644 --- a/meta-hpe/conf/machine/include/hpe.inc +++ b/meta-hpe/conf/machine/include/hpe.inc @@ -15,6 +15,7 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-hpe-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" #PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" diff --git a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb index 9fdcd4b2e..3f16d41e7 100644 --- a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb +++ b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "HPE Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf index 6017a8885..1c217913e 100644 --- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf +++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf @@ -7,6 +7,7 @@ require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" UBOOT_MACHINE = "ast_g5_phy_config" diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb index 2d95e2332..68a2184cf 100644 --- a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Inspur Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-intel-openbmc/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc index 4287ddd80..623cd7910 100644 --- a/meta-intel-openbmc/conf/machine/include/intel.inc +++ b/meta-intel-openbmc/conf/machine/include/intel.inc @@ -14,6 +14,7 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-intel-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb index 69a523475..303a04b3d 100644 --- a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Intel Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc index 0f8419e42..9a9e9f574 100644 --- a/meta-inventec/conf/machine/include/inventec.inc +++ b/meta-inventec/conf/machine/include/inventec.inc @@ -17,6 +17,7 @@ VIRTUAL-RUNTIME_obmc-discover-system-state = "x86-power-control" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inventec-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb index 374b279a9..7996cda5b 100644 --- a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb +++ b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb @@ -15,11 +15,13 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-ipmi-oem" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-ipmi-oem += "virtual-obmc-ipmi-oem" SUMMARY:${PN}-chassis = "Inventec Chassis" diff --git a/meta-nuvoton/conf/machine/evb-npcm750.conf b/meta-nuvoton/conf/machine/evb-npcm750.conf index 74f70adbc..f0216eada 100644 --- a/meta-nuvoton/conf/machine/evb-npcm750.conf +++ b/meta-nuvoton/conf/machine/evb-npcm750.conf @@ -8,5 +8,6 @@ FLASH_SIZE = "32768" require conf/machine/include/npcm7xx.inc require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/obmc-evb-common.inc IMAGE_FSTYPES = "cpio.${INITRAMFS_CTYPE}.u-boot mtd-static" diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc index 348361e87..f6c48bfb0 100644 --- a/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openpower/conf/machine/include/openpower.inc @@ -18,6 +18,7 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-bt" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout ?= "openpower-fru-vpd-layout-native" diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index e20def697..890967f96 100644 --- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "OpenPOWER Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 572ec80f1..80c16d22e 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -27,6 +27,7 @@ # - obmc-sensors - OpenBMC sensor support # - obmc-settings-mgmt - OpenBMC settings management # - obmc-software - OpenBMC software management +# - obmc-system-mgmt - OpenBMC system management # - obmc-telemetry - OpenBMC telemetry solution # - obmc-user-mgmt - OpenBMC user management # - obmc-user-mgmt-ldap - OpenBMC LDAP users @@ -58,6 +59,7 @@ FEATURE_PACKAGES_obmc-rng ?= "packagegroup-obmc-apps-rng" FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net" FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors" FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software" +FEATURE_PACKAGES_obmc-system-mgmt ?= "${@bb.utils.contains('DISTRO_FEATURES', 'obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', '', d)}" FEATURE_PACKAGES_obmc-debug-collector ?= "packagegroup-obmc-apps-debug-collector" FEATURE_PACKAGES_obmc-settings-mgmt ?= "packagegroup-obmc-apps-settings" FEATURE_PACKAGES_obmc-network-mgmt ?= "packagegroup-obmc-apps-network" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 0e7e84945..64f293cf0 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -91,6 +91,7 @@ DISTRO_FEATURES_OBMC = " \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ + obmc-phosphor-system-mgmt \ " DISTRO_FEATURES_DEFAULT = " \ diff --git a/meta-phosphor/conf/machine/include/obmc-evb-common.inc b/meta-phosphor/conf/machine/include/obmc-evb-common.inc new file mode 100644 index 000000000..34d52505f --- /dev/null +++ b/meta-phosphor/conf/machine/include/obmc-evb-common.inc @@ -0,0 +1,2 @@ +# EVBs don't have a managed system, so remove the feature. +IMAGE_FEATURES:remove = "obmc-system-mgmt" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index 85b7f0448..494b06c7c 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -29,6 +29,7 @@ IMAGE_FEATURES += " \ obmc-net-ipmi \ obmc-sensors \ obmc-software \ + obmc-system-mgmt \ obmc-user-mgmt \ obmc-user-mgmt-ldap \ ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'read-only-rootfs', '', d)} \ diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 4a65c5dcb..8fb72f286 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -49,6 +49,7 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-net-ipmi" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-software" +IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-telemetry" IMAGE_FEATURES:remove = "obmc-debug-collector" IMAGE_FEATURES:remove = "obmc-settings-mgmt" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index 8b9a1f823..ce58a91c3 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -44,6 +44,7 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-settings-mgmt" IMAGE_FEATURES:remove = "obmc-software" +IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap" IMAGE_FEATURES:remove = "obmc-debug-collector" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf index b45d74591..a90e77bf6 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf @@ -29,5 +29,6 @@ MACHINE_FEATURES += "\ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-olympus-nuvoton-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "olympus-nuvoton-led-manager-config-native" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb index 6d69400e9..d462d6905 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-fans = "OLYMPUS NUVOTON Fans" RDEPENDS:${PN}-fans = " \ diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc index c8a762f77..d663f445a 100644 --- a/meta-supermicro/conf/machine/include/supermicro.inc +++ b/meta-supermicro/conf/machine/include/supermicro.inc @@ -14,6 +14,7 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-supermicro-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" diff --git a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb index 6a24fadc6..4549bf70f 100644 --- a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb +++ b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Supermicro Chassis" RDEPENDS:${PN}-chassis = " \ -- cgit v1.2.3 From dde1fede1f832f029742a1d27290cfe252ab1bc5 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Thu, 4 Nov 2021 08:30:27 +0000 Subject: meta-ampere: fix shellcheck issues Fix all issues from the shellcheck checked on bash shells under meta-ampere. Tested: Verify the following features: 1. Power control (on,off, cycle, graceful shutdown, hard reset). 2. UART switching. 3. UEFI firmware update. Signed-off-by: Thang Q. Nguyen Change-Id: Idabf839b7521ecadb642230cc8bb3472c787002e --- .../phosphor-software-manager/firmware_update.sh | 37 ++-- .../flash/ampere-flash-utils/ampere_flash_bios.sh | 19 +- .../ampere-mac-update/ampere_update_mac.sh | 33 ++-- .../ampere-platform-init/ampere_platform_init.sh | 3 +- .../mtjade-gpio-config/ampere_gpio_utils.sh | 50 +++--- .../platform/mtjade-utils/ampere_host_check.sh | 51 +++--- .../platform/mtjade-utils/ampere_power_util.sh | 191 ++++++++++----------- .../platform/mtjade-utils/gpio-defs.sh | 3 + .../platform/mtjade-utils/gpio-lib.sh | 32 ++-- .../console/obmc-console/ampere_uartmux_ctrl.sh | 25 +-- .../obmc-console/obmc-console-server-setup.sh | 4 +- .../gpio/fault-monitor/toggle_fault_led.sh | 10 +- .../gpio/id-button/toggle_identify_led.sh | 20 +-- .../psu-hotswap-reset/ampere_psu_reset_hotswap.sh | 14 +- 14 files changed, 230 insertions(+), 262 deletions(-) mode change 100644 => 100755 meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/ampere_psu_reset_hotswap.sh (limited to 'meta-ampere/meta-jade') diff --git a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh index af3e2bead..cc39f30fc 100755 --- a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh +++ b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh @@ -21,31 +21,29 @@ usage () { echo "Usage:" - echo " $(basename $0) " + echo " $(basename "$0") " echo "Where:" echo " : the path link to folder, which include image file and MANIFEST" echo "Example:" - echo " $(basename $0) /tmp/images/ghdh1393" + echo " $(basename "$0") /tmp/images/ghdh1393" } IMG_PATH="$1" -if [ ! -d $IMG_PATH ]; then - echo $IMG_PATH +if [ ! -d "$IMG_PATH" ]; then echo "The folder $IMG_PATH does not exist" usage exit 1 fi MANIFEST_PATH="${IMG_PATH}/MANIFEST" -if [ ! -f $MANIFEST_PATH ]; then - echo $MANIFEST_PATH +if [ ! -f "$MANIFEST_PATH" ]; then echo "The MANIFEST file $MANIFEST_PATH does not exist" usage exit 1 fi -EXTENDED_VERSION=$(awk '/ExtendedVersion/ {print}' ${MANIFEST_PATH} | cut -d "=" -f 2) +EXTENDED_VERSION=$(awk '/ExtendedVersion/ {print}' "${MANIFEST_PATH}" | cut -d "=" -f 2) # If the ExtendedVersion is empty, set default to update UEFI/EDKII on primary device if [ -z "$EXTENDED_VERSION" ] @@ -56,28 +54,28 @@ fi # Assign the command based on the ExtendedVersion case ${EXTENDED_VERSION} in "primary") - export IMAGE=$(find ${IMG_PATH} -type f \( -name "*.img" -o -name "*.bin" -o -name "*.rom" \)) - export CMD='/usr/sbin/ampere_flash_bios.sh $IMAGE 1' + IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.img" -o -name "*.bin" -o -name "*.rom" \)) + CMD="/usr/sbin/ampere_flash_bios.sh $IMAGE 1" ;; "secondary") - export IMAGE=$(find ${IMG_PATH} -type f \( -name "*.img" -o -name "*.bin" -o -name "*.rom" \)) - export CMD='/usr/sbin/ampere_flash_bios.sh $IMAGE 2' + IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.img" -o -name "*.bin" -o -name "*.rom" \)) + CMD="/usr/sbin/ampere_flash_bios.sh $IMAGE 2" ;; "scp-primary") - export IMAGE=$(find ${IMG_PATH} -type f \( -name "*.img" -o -name "*.slim" -o -name "*.rom" \)) - export CMD='/usr/sbin/ampere_firmware_upgrade.sh smpmpro $IMAGE 1' + IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.img" -o -name "*.slim" -o -name "*.rom" \)) + CMD="/usr/sbin/ampere_firmware_upgrade.sh smpmpro $IMAGE 1" ;; "scp-secondary") - export IMAGE=$(find ${IMG_PATH} -type f \( -name "*.img" -o -name "*.slim" -o -name "*.rom" \)) - export CMD='/usr/sbin/ampere_firmware_upgrade.sh smpmpro $IMAGE 2' + IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.img" -o -name "*.slim" -o -name "*.rom" \)) + CMD="/usr/sbin/ampere_firmware_upgrade.sh smpmpro $IMAGE 2" ;; "fru") - export IMAGE=$(find ${IMG_PATH} -type f \( -name "*.bin" \)) - export CMD='/usr/sbin/ampere_firmware_upgrade.sh fru $IMAGE' + IMAGE=$(find "${IMG_PATH}" -type f \( -name "*.bin" \)) + CMD="/usr/sbin/ampere_firmware_upgrade.sh fru $IMAGE" ;; *) @@ -91,11 +89,10 @@ if [ -z "$IMAGE" ] then echo "ERROR: The image file: No such file or directory" exit 1 -else - eval $CMD fi -if [[ $? -ne 0 ]]; then +if ! eval "$CMD"; +then echo "ERROR: The firmware update not successfull" exit 1 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 7a9ace30e..b7f4bc52e 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 @@ -18,7 +18,7 @@ do_flash () { OFFSET=$1 # Check the PNOR partition available - HOST_MTD=$(cat /proc/mtd | grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') + HOST_MTD=$(< /proc/mtd grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') if [ -z "$HOST_MTD" ]; then # If the PNOR partition is not available, then bind again driver @@ -26,7 +26,7 @@ do_flash () { echo 1e630000.spi > /sys/bus/platform/drivers/aspeed-smc/bind sleep 2 - HOST_MTD=$(cat /proc/mtd | grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') + HOST_MTD=$(< /proc/mtd grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') if [ -z "$HOST_MTD" ]; then echo "Fail to probe Host SPI-NOR device" @@ -35,18 +35,17 @@ do_flash () { fi echo "--- Flashing firmware to @/dev/$HOST_MTD offset=$OFFSET" - flashcp -v $IMAGE /dev/$HOST_MTD $OFFSET + flashcp -v "$IMAGE" /dev/"$HOST_MTD" "$OFFSET" } if [ $# -eq 0 ]; then - echo "Usage: $(basename $0) " + echo "Usage: $(basename "$0") " exit 0 fi IMAGE="$1" -if [ ! -f $IMAGE ]; then - echo $IMAGE +if [ ! -f "$IMAGE" ]; then echo "The image file $IMAGE does not exist" exit 1 fi @@ -70,9 +69,7 @@ fi # Switch the host SPI bus to BMC" echo "--- Switch the host SPI bus to BMC." -gpioset 0 226=0 - -if [[ $? -ne 0 ]]; then +if ! gpioset 0 226=0; then echo "ERROR: Switch the host SPI bus to BMC. Please check gpio state" exit 1 fi @@ -82,9 +79,7 @@ do_flash 0x400000 # Switch the host SPI bus to HOST." echo "--- Switch the host SPI bus to HOST." -gpioset 0 226=1 - -if [[ $? -ne 0 ]]; then +if ! gpioset 0 226=1; then echo "ERROR: Switch the host SPI bus to HOST. Please check gpio state" exit 1 fi diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.sh index 4e4d6f3e7..8182b4c8d 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.sh +++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.sh @@ -5,43 +5,44 @@ ETHERNET_INTERFACE="eth1" ETHERNET_NCSI="eth0" ENV_ETH="eth1addr" -ENV_MAC_ADDR=`fw_printenv | grep $ENV_ETH` +ENV_MAC_ADDR=$(fw_printenv | grep $ENV_ETH) # Workaround to dhcp NC-SI eth0 interface when BMC boot up ifconfig ${ETHERNET_NCSI} down ifconfig ${ETHERNET_NCSI} up # Read FRU Board Custom Field 1 to get the MAC address -CUSTOM_FIELD_1=`busctl get-property xyz.openbmc_project.FruDevice /xyz/openbmc_project/FruDevice/Mt_Jade_Motherboard xyz.openbmc_project.FruDevice BOARD_INFO_AM1` -MAC_ADDR=`echo $CUSTOM_FIELD_1 | cut -d "\"" -f 2` +CUSTOM_FIELD_1=$(busctl get-property xyz.openbmc_project.FruDevice /xyz/openbmc_project/FruDevice/Mt_Jade_Motherboard xyz.openbmc_project.FruDevice BOARD_INFO_AM1) +MAC_ADDR=$(echo "$CUSTOM_FIELD_1" | cut -d "\"" -f 2) # Check if BMC MAC address is exported if [ -z "${MAC_ADDR}" ]; then - echo "ERROR: No BMC MAC address is detected from FRU Inventory information!" - # Return 1 so that systemd knows the service failed to start - exit 1 + echo "ERROR: No BMC MAC address is detected from FRU Inventory information!" + # Return 1 so that systemd knows the service failed to start + exit 1 fi # Check if BMC MAC address is exported if [[ $ENV_MAC_ADDR =~ $MAC_ADDR ]]; then - echo "WARNING: BMC MAC address already exist!" - exit 0 + echo "WARNING: BMC MAC address already exist!" + exit 0 fi # Request to update the MAC address -fw_setenv ${ENV_ETH} ${MAC_ADDR} +fw_setenv ${ENV_ETH} "${MAC_ADDR}" -if [[ $? -ne 0 ]]; then - echo "ERROR: Fail to set MAC address to ${ENV_ETH}" - exit 1 +if fw_setenv ${ENV_ETH} "${MAC_ADDR}"; +then + echo "ERROR: Fail to set MAC address to ${ENV_ETH}" + exit 1 fi # Request to restart the service ifconfig ${ETHERNET_INTERFACE} down -ifconfig ${ETHERNET_INTERFACE} hw ether ${MAC_ADDR} -if [[ $? -ne 0 ]]; then - echo "ERROR: Can not update MAC ADDR to ${ETHERNET_INTERFACE}" - exit 1 +if ! ifconfig ${ETHERNET_INTERFACE} hw ether "${MAC_ADDR}"; +then + echo "ERROR: Can not update MAC ADDR to ${ETHERNET_INTERFACE}" + exit 1 fi ifconfig ${ETHERNET_INTERFACE} up diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh index a2578fa2f..c3772fb9a 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh +++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-platform-init/ampere_platform_init.sh @@ -1,5 +1,6 @@ #!/bin/bash +# shellcheck source=/dev/null source /usr/sbin/gpio-lib.sh # GPIOAC3 BMC_SPI0_BACKUP_SEL Boot from MAIN SPI-HOST @@ -29,7 +30,7 @@ gpio_configure_output 229 1 # ======================================================= # Below GPIOs are controlled by other services so just # initialize in A/C power only. -cmdline=`cat /proc/cmdline` +cmdline=$(cat /proc/cmdline) if [[ $cmdline == *resetreason=power* ]]; then # BMC_GPIOR2_EXT_HIGHTEMP_L gpio_configure_output 138 1 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 8e4f455bf..1a098f446 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 @@ -1,43 +1,45 @@ #!/bin/bash + +# shellcheck source=/dev/null source /usr/sbin/gpio-defs.sh source /usr/sbin/gpio-lib.sh function usage() { - echo "usage: ampere_gpio_utils.sh [power] [on|off]"; + echo "usage: ampere_gpio_utils.sh [power] [on|off]"; } 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 + 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 } set_gpio_power_on() { - echo "Setting GPIO before Power on" - gpio_configure_output $OCP_AUX_PWREN 1 - gpio_configure_output $OCP_MAIN_PWREN 1 - gpio_configure_output $SPI0_PROGRAM_SEL 1 - gpio_configure_output $SPI0_BACKUP_SEL 0 + echo "Setting GPIO before Power on" + gpio_configure_output "$OCP_AUX_PWREN" 1 + gpio_configure_output "$OCP_MAIN_PWREN" 1 + gpio_configure_output "$SPI0_PROGRAM_SEL" 1 + gpio_configure_output "$SPI0_BACKUP_SEL" 0 } if [ $# -lt 2 ]; then - echo "Total number of parameter=$#" - echo "Insufficient parameter" - usage; - exit 0; + echo "Total number of parameter=$#" + echo "Insufficient parameter" + usage; + exit 0; fi -if [ $1 == "power" ]; then - if [ $2 == "on" ]; then - set_gpio_power_on - elif [ $2 == "off" ]; then - set_gpio_power_off - fi - exit 0; +if [ "$1" == "power" ]; then + if [ "$2" == "on" ]; then + set_gpio_power_on + elif [ "$2" == "off" ]; then + set_gpio_power_off + fi + exit 0; else - echo "Invalid parameter1=$1" - usage; - exit 0; + echo "Invalid parameter1=$1" + usage; + exit 0; fi exit 0; diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_host_check.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_host_check.sh index 9eeeeca5a..024336d20 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_host_check.sh +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_host_check.sh @@ -1,45 +1,38 @@ #!/bin/bash +# shellcheck source=/dev/null source /usr/sbin/gpio-defs.sh source /usr/sbin/gpio-lib.sh -host_status() { - st=$(busctl get-property xyz.openbmc_project.State.Host /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host CurrentHostState | cut -d"." -f6) - if [ "$st" == "Running\"" ]; then - echo "on" - else - echo "off" - fi -} - createFile=$1 -setState=$2 -if [ $(host_status) == "on" ]; then - exit 0 +# Check current Host status. Do nothing when the Host is currently ON +st=$(busctl get-property xyz.openbmc_project.State.Host \ + /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host \ + CurrentHostState | cut -d"." -f6) +if [ "$st" == "Running\"" ]; then + exit 0 fi # Time out to check S0_FW_BOOT_OK is 60 seconds cnt=60 val=0 -while [ $cnt -gt 0 ]; +while [ "$cnt" -gt 0 ]; do - val=$(gpio_get_val $S0_CPU_FW_BOOT_OK) - cnt=$((cnt - 1)) - echo "$cnt S0_CPU_FW_BOOT_OK = $val" - if [ $val == 1 ]; then - # Sleep 5 second before the host is ready - sleep 5 - if [ $createFile == 1 ]; then - if [ ! -d "/run/openbmc" ]; then - mkdir -p /run/openbmc - fi - echo "Creating /run/openbmc/host@0-on" - touch /run/openbmc/host@0-on - fi - exit 0 - fi - sleep 1 + val=$(gpio_get_val "$S0_CPU_FW_BOOT_OK") + cnt=$((cnt - 1)) + echo "$cnt S0_CPU_FW_BOOT_OK = $val" + if [ "$val" == 1 ]; then + # Sleep 5 second before the host is ready + sleep 5 + if [ "$createFile" == 1 ]; then + mkdir -p /run/openbmc + echo "Creating /run/openbmc/host@0-on" + touch /run/openbmc/host@0-on + fi + exit 0 + fi + sleep 1 done exit 1 diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_power_util.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_power_util.sh index 2c8ba3d91..d9ca2ed08 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_power_util.sh +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_power_util.sh @@ -1,131 +1,120 @@ #!/bin/bash -#ampere_platform_config.sh is platform configuration file + +# shellcheck source=/dev/null source /usr/sbin/gpio-defs.sh # Usage of this utility function usage() { - echo "usage: power-util mb [status|shutdown_ack|force_reset|soft_off]"; + echo "Usage:" + echo " ampere_power_util.sh mb [status|shutdown_ack|force_reset|soft_off]"; } power_status() { - st=$(busctl get-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState | cut -d"." -f6) - if [ "$st" == "On\"" ]; then - echo "on" - else - echo "off" - fi + st=$(busctl get-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState | cut -d"." -f6) + if [ "$st" == "On\"" ]; then + echo "on" + else + echo "off" + fi } shutdown_ack() { - if [ -f "/run/openbmc/host@0-softpoweroff" ]; then - echo "Receive shutdown ACK triggered after softportoff the host." - touch /run/openbmc/host@0-softpoweroff-shutdown-ack - else - echo "Receive shutdown ACK triggered" - sleep 3 - systemctl start obmc-chassis-poweroff@0.target - fi + if [ -f "/run/openbmc/host@0-softpoweroff" ]; then + echo "Receive shutdown ACK triggered after softportoff the host." + touch /run/openbmc/host@0-softpoweroff-shutdown-ack + else + echo "Receive shutdown ACK triggered" + sleep 3 + systemctl start obmc-chassis-poweroff@0.target + fi } soft_off() { - # Trigger shutdown_req - touch /run/openbmc/host@0-softpoweroff - gpioset -l $GPIO_CHIP0_IDX $S0_SHD_REQ_L=1 - sleep 1s - gpioset -l $GPIO_CHIP0_IDX $S0_SHD_REQ_L=0 + # Trigger shutdown_req + touch /run/openbmc/host@0-softpoweroff + gpioset -l 0 "$S0_SHD_REQ_L"=1 + sleep 1s + gpioset -l 0 "$S0_SHD_REQ_L"=0 - # Wait for shutdown_ack from the host in 30 seconds - cnt=30 - while [ $cnt -gt 0 ]; - do - # Wait for SHUTDOWN_ACK and create the host@0-softpoweroff-shutdown-ack - if [ -f "/run/openbmc/host@0-softpoweroff-shutdown-ack" ]; then - break - fi - sleep 1 - cnt=$((cnt - 1)) - done - # Softpoweroff is successed - sleep 2 - rm -rf /run/openbmc/host@0-softpoweroff - if [ -f "/run/openbmc/host@0-softpoweroff-shutdown-ack" ]; then - rm -rf /run/openbmc/host@0-softpoweroff-shutdown-ack - fi - echo 0 + # Wait for shutdown_ack from the host in 30 seconds + cnt=30 + while [ $cnt -gt 0 ]; + do + # Wait for SHUTDOWN_ACK and create the host@0-softpoweroff-shutdown-ack + if [ -f "/run/openbmc/host@0-softpoweroff-shutdown-ack" ]; then + break + fi + sleep 1 + cnt=$((cnt - 1)) + done + # Softpoweroff is successed + sleep 2 + rm -rf /run/openbmc/host@0-softpoweroff + if [ -f "/run/openbmc/host@0-softpoweroff-shutdown-ack" ]; then + rm -rf /run/openbmc/host@0-softpoweroff-shutdown-ack + fi + echo 0 } force_reset() { - if [ -f "/run/openbmc/host@0-softpoweroff" ]; then - # In graceful host reset, after trigger os shutdown, - # the phosphor-state-manager will call force-warm-reset - # in this case the force_reset should wait for shutdown_ack from host - cnt=30 - while [ $cnt -gt 0 ]; - do - if [ -f "/run/openbmc/host@0-softpoweroff-shutdown-ack" ]; then - break - fi - echo "Waiting for shutdown-ack count down $cnt" - sleep 1 - cnt=$((cnt - 1)) - done - # The host OS is failed to shutdown - if [ $cnt == 0 ]; then - echo "Shutdown-ack time out after 30s." - exit 0 - fi - fi - echo "Triggering sysreset pin" - gpioset -l $GPIO_CHIP0_IDX $S0_SYSRESET_L=1 - sleep 1 - gpioset -l $GPIO_CHIP0_IDX $S0_SYSRESET_L=0 + if [ -f "/run/openbmc/host@0-softpoweroff" ]; then + # In graceful host reset, after trigger os shutdown, + # the phosphor-state-manager will call force-warm-reset + # in this case the force_reset should wait for shutdown_ack from host + cnt=30 + while [ $cnt -gt 0 ]; + do + if [ -f "/run/openbmc/host@0-softpoweroff-shutdown-ack" ]; then + break + fi + echo "Waiting for shutdown-ack count down $cnt" + sleep 1 + cnt=$((cnt - 1)) + done + # The host OS is failed to shutdown + if [ $cnt == 0 ]; then + echo "Shutdown-ack time out after 30s." + exit 0 + fi + fi + echo "Triggering sysreset pin" + gpioset -l 0 "$S0_SYSRESET_L"=1 + sleep 1 + gpioset -l 0 "$S0_SYSRESET_L"=0 } if [ $# -lt 2 ]; then - echo "Total number of parameter=$#" - echo "Insufficient parameter" - usage; - exit 0; + echo "Total number of parameter=$#" + echo "Insufficient parameter" + usage; + exit 0; fi -if [ $1 != "mb" ]; then - echo "Invalid parameter1=$1" - usage; - exit 0; +if [ "$1" != "mb" ]; then + echo "Invalid parameter1=$1" + usage; + exit 0; fi -# check if power guard enabled -dir="/run/systemd/system/" -file="reboot-guard.conf" -units=("reboot" "poweroff" "halt") -for unit in "${units[@]}"; do - if [ -f ${dir}${unit}.target.d/${file} ]; then - echo "PowerGuard enabled, cannot do power control, exit!!!" - exit -1 - fi -done - -if [ ! -d "/run/openbmc/" ]; then - mkdir -p "/run/openbmc/" -fi +mkdir -p /run/openbmc/ -if [ $2 == "shutdown_ack" ]; then - shutdown_ack -elif [ $2 == "status" ]; then - power_status -elif [ $2 == "force_reset" ]; then - force_reset -elif [ $2 == "soft_off" ]; then - ret=$(soft_off) - if [ $ret == 0 ]; then - echo "The host is already softoff" - else - echo "Failed to softoff the host" - fi - exit $ret; +if [ "$2" == "shutdown_ack" ]; then + shutdown_ack +elif [ "$2" == "status" ]; then + power_status +elif [ "$2" == "force_reset" ]; then + force_reset +elif [ "$2" == "soft_off" ]; then + ret=$(soft_off) + if [ "$ret" == 0 ]; then + echo "The host is already softoff" + else + echo "Failed to softoff the host" + fi + exit "$ret"; else - echo "Invalid parameter2=$2" - usage; + echo "Invalid parameter2=$2" + usage; fi exit 0; diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-defs.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-defs.sh index 7c887d409..fc0edd6fc 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-defs.sh +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-defs.sh @@ -1,3 +1,6 @@ +#!/bin/sh + +# shellcheck disable=SC2034 # Index of GPIO device in gpioget/gpioset GPIO_CHIP0_IDX=0 GPIO_CHIP1_IDX=1 diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-lib.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-lib.sh index 8d1aa61d7..c8721fe97 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-lib.sh +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-lib.sh @@ -1,31 +1,33 @@ #!/bin/bash + +# shellcheck source=/dev/null source /usr/sbin/gpio-defs.sh function gpio_number() { - GPIO_BASE=$(cat /sys/class/gpio/gpiochip$GPIO_CHIP0_BASE/base) - echo $((${GPIO_BASE} + $1)) + GPIO_BASE=$(cat /sys/class/gpio/gpiochip"$GPIO_CHIP0_BASE"/base) + echo $((GPIO_BASE + $1)) } # Configure GPIO as output and set its value function gpio_configure_output() { - gpioId=$(gpio_number $1) - echo $gpioId > /sys/class/gpio/export - echo out > /sys/class/gpio/gpio${gpioId}/direction - echo $2 > /sys/class/gpio/gpio${gpioId}/value - echo $gpioId > /sys/class/gpio/unexport + gpioId=$(gpio_number "$1") + echo "$gpioId" > /sys/class/gpio/export + echo out > /sys/class/gpio/gpio"${gpioId}"/direction + echo "$2" > /sys/class/gpio/gpio"${gpioId}"/value + echo "$gpioId" > /sys/class/gpio/unexport } function gpio_get_val() { - gpioId=$(gpio_number $1) - echo $gpioId > /sys/class/gpio/export - echo $(cat /sys/class/gpio/gpio$gpioId/value) - echo $gpioId > /sys/class/gpio/unexport + gpioId=$(gpio_number "$1") + echo "$gpioId" > /sys/class/gpio/export + cat /sys/class/gpio/gpio"$gpioId"/value + echo "$gpioId" > /sys/class/gpio/unexport } # Configure GPIO as input function gpio_configure_input() { - gpioId=$(gpio_number $1) - echo $gpioId > /sys/class/gpio/export - echo "in" > /sys/class/gpio/gpio${gpioId}/direction - echo $gpioId > /sys/class/gpio/unexport + gpioId=$(gpio_number "$1") + echo "$gpioId" > /sys/class/gpio/export + echo "in" > /sys/class/gpio/gpio"${gpioId}"/direction + echo "$gpioId" > /sys/class/gpio/unexport } diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/ampere_uartmux_ctrl.sh b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/ampere_uartmux_ctrl.sh index 58fffd8fe..f28589894 100755 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/ampere_uartmux_ctrl.sh +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/ampere_uartmux_ctrl.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2020 Ampere Computing LLC +# Copyright (c) 2021 Ampere Computing LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,24 +19,13 @@ # of 1 sets CPU To HDR_CONN # of 2 sets BMC to CPU (eg dropbear ssh server on port 2200) +# shellcheck source=/dev/null +source /usr/sbin/gpio-lib.sh + if [ $# -lt 2 ]; then exit 1 fi -function set_gpio_active_low() { - if [ $# -ne 2 ]; then - echo "set_gpio_active_low: need both GPIO# and initial level"; - return; - fi - - if [ ! -d /sys/class/gpio/gpio$1 ]; then - echo $1 > /sys/class/gpio/export - fi - echo $2 > /sys/class/gpio/gpio$1/direction -} - -GPIO_BASE=$(cat /sys/class/gpio/gpio*/base) - case "$1" in 1) GPIO_UARTx_MODE0=56 # CPU0 UART0 connects to BMC UART1 @@ -65,17 +54,17 @@ esac # of requested console port. # Example format: Accepted: 1; Connected: 1; CONNECTED=$(systemctl --no-pager status obmc-console-ttyS${CONSOLE_PORT}-ssh.socket | grep -w Connected | cut -d ':' -f 3 | tr -d ' ;') -if [ ! $CONNECTED -le 1 ]; then +if [ ! "$CONNECTED" -le 1 ]; then exit 0 fi echo "Ampere UART MUX CTRL UART port $1 to mode $2" case "$2" in - 1) set_gpio_active_low $((${GPIO_BASE} + ${GPIO_UARTx_MODE0})) low + 1) gpio_configure_output "${GPIO_UARTx_MODE0}" 0 exit 0 ;; - 2) set_gpio_active_low $((${GPIO_BASE} + ${GPIO_UARTx_MODE0})) high + 2) gpio_configure_output "${GPIO_UARTx_MODE0}" 1 exit 0 ;; *) echo "Invalid UART mode selection" diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-server-setup.sh b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-server-setup.sh index fe2d5ab03..4e0a01350 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-server-setup.sh +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/obmc-console-server-setup.sh @@ -14,8 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -euo pipefail - tty="$1" uart=0 @@ -39,4 +37,4 @@ esac # this value should be set to 1 /usr/sbin/ampere_uartmux_ctrl.sh ${uart} 2 -/usr/sbin/obmc-console-server --config /etc/obmc-console/server.${tty}.conf ${tty} +/usr/sbin/obmc-console-server --config /etc/obmc-console/server."${tty}".conf "${tty}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/toggle_fault_led.sh b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/toggle_fault_led.sh index 8d3d54374..1e1cbc588 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/toggle_fault_led.sh +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor/toggle_fault_led.sh @@ -22,14 +22,14 @@ PROPERTY="Asserted" # Get current state object=$(busctl tree $SERVICE --list | grep system_fault) -state=$(busctl get-property $SERVICE $object $INTERFACE $PROPERTY \ +state=$(busctl get-property $SERVICE "$object" $INTERFACE $PROPERTY \ | awk '{print $NF;}') -if [ "$state" == "false" ]; then - target='true' +if [ "$state" = "false" ]; then + target='true' else - target='false' + target='false' fi # Set target state -busctl set-property $SERVICE $object $INTERFACE $PROPERTY b $target +busctl set-property $SERVICE "$object" $INTERFACE $PROPERTY b $target diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/toggle_identify_led.sh b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/toggle_identify_led.sh index d62c84ae1..06b2d55f1 100755 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/toggle_identify_led.sh +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button/toggle_identify_led.sh @@ -22,24 +22,24 @@ PROPERTY="Asserted" # Get enclosure_identify state identify_object=$(busctl tree $SERVICE --list | grep -m 1 identify) -identify_state=$(busctl get-property $SERVICE $identify_object $INTERFACE $PROPERTY \ - | awk '{print $NF;}') +identify_state=$(busctl get-property $SERVICE "$identify_object" $INTERFACE $PROPERTY \ + | awk '{print $NF;}') # Get enclosure_identify_blink state identify_blink_object=$(busctl tree $SERVICE --list | grep identify_blink) -identify_blink_state=$(busctl get-property $SERVICE $identify_blink_object $INTERFACE $PROPERTY \ - | awk '{print $NF;}') +identify_blink_state=$(busctl get-property $SERVICE "$identify_blink_object" $INTERFACE $PROPERTY \ + | awk '{print $NF;}') # Set state -if [[ "$identify_state" == "false" && "$identify_blink_state" == "false" ]]; then +if [ "$identify_state" = "false" ] && [ "$identify_blink_state" = "false" ]; then # Turn on the UID LED - busctl set-property $SERVICE $identify_object $INTERFACE $PROPERTY b true -elif [[ "$identify_state" == "false" && "$identify_blink_state" == "true" ]]; then + busctl set-property $SERVICE "$identify_object" $INTERFACE $PROPERTY b true +elif [ "$identify_state" = "false" ] && [ "$identify_blink_state" = "true" ]; then # Turn off the UID LED when LED is blinking state - busctl set-property $SERVICE $identify_blink_object $INTERFACE $PROPERTY b false -elif [[ "$identify_state" == "true" && "$identify_blink_state" == "false" ]]; then + busctl set-property $SERVICE "$identify_blink_object" $INTERFACE $PROPERTY b false +elif [ "$identify_state" = "true" ] && [ "$identify_blink_state" = "false" ]; then # Turn off the UID LED - busctl set-property $SERVICE $identify_object $INTERFACE $PROPERTY b false + busctl set-property $SERVICE "$identify_object" $INTERFACE $PROPERTY b false else echo "Invalid case! When identify_blink_state is true, the identify_state will set to false" fi diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/ampere_psu_reset_hotswap.sh b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/ampere_psu_reset_hotswap.sh old mode 100644 new mode 100755 index 65bff9dc1..37a3ce301 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/ampere_psu_reset_hotswap.sh +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/ampere_psu_reset_hotswap.sh @@ -29,10 +29,10 @@ STATUS_MFR_SPECIFIC=0x80 # $1 will be the name of the psu PSU=$1 -if [[ $PSU == 1 ]]; then +if [ "$PSU" = 1 ]; then HSC_PMBUS_NUM=$HSC1_PMBUS_NUM HSC_SLAVE_ADDR=$HSC1_SLAVE_ADDR -elif [[ $PSU == 2 ]]; then +elif [ "$PSU" = 2 ]; then HSC_PMBUS_NUM=$HSC2_PMBUS_NUM HSC_SLAVE_ADDR=$HSC2_SLAVE_ADDR else @@ -43,22 +43,20 @@ fi # Check HOST state chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}') -if [[ "$chassisstate" == 'Off' ]]; then +if [ "$chassisstate" = 'Off' ]; then echo "HOST is being OFF, so can't access the i2c $HSC_PMBUS_NUM. Please Turn ON HOST !" exit 1 fi # Check FET health problems -data=$(i2cget -f -y $HSC_PMBUS_NUM $HSC_SLAVE_ADDR $STATUS_MFR_SPECIFIC) - -if [[ $? -ne 0 ]]; then +if ! data=$(i2cget -f -y $HSC_PMBUS_NUM $HSC_SLAVE_ADDR $STATUS_MFR_SPECIFIC); then echo "ERROR: Can't access the i2c. Please check /dev/i2c-$HSC_PMBUS_NUM" exit 1 fi psu_sts=$(((data & 0x80) != 0)) -if [[ $psu_sts == 1 ]]; then +if [ $psu_sts = 1 ]; then echo "PSU $PSU: FET health problems have been detected" echo "Reset Hot swap output on PSU $PSU" # Disable Hot swap output @@ -71,4 +69,4 @@ if [[ $psu_sts == 1 ]]; then else echo "PSU $PSU: FET health problems have not been detected" -fi \ No newline at end of file +fi -- cgit v1.2.3 From ff38979bf9dbc8bc02ee6852d707140ca97b80aa Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Fri, 15 Oct 2021 14:04:44 +0000 Subject: meta-ampere: usbnet: implement using usb-ctrl Change to implement virtual USB Ethernet using phosphor-misc's usb-ctrl. Tested: 1. Boot BMC to Linux. Login and check if usb0 ethernet interface exists. 2. Power ON the Host. Check if usb0 automatically sets its IP to 192.168.0.10 3. Restart the ampere-usbnet.service service. Check if no error happens. Signed-off-by: Thang Q. Nguyen Change-Id: I4de722a691a112db851b6dda0a7821b9f78b4d72 --- .../recipes-ac01/usbnet/ampere-usbnet.bb | 30 ------- .../usbnet/ampere-usbnet/00-bmc-usb0.network | 7 -- .../ampere-usbnet/ampere_add_usbnet_gadget.service | 13 --- .../ampere-usbnet/ampere_add_usbnet_gadget.sh | 93 ---------------------- .../recipes-phosphor/network/ampere-usbnet.bb | 28 +++++++ .../network/ampere-usbnet/00-bmc-usb0.network | 7 ++ .../network/ampere-usbnet/ampere-usbnet.service | 12 +++ .../network/ampere-usbnet/ampere_usbnet.sh | 21 +++++ .../packagegroups/packagegroup-obmc-apps.bbappend | 1 + 9 files changed, 69 insertions(+), 143 deletions(-) delete mode 100644 meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb delete mode 100644 meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/00-bmc-usb0.network delete mode 100644 meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.service delete mode 100644 meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.sh create mode 100644 meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet.bb create mode 100644 meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/00-bmc-usb0.network create mode 100644 meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere-usbnet.service create mode 100644 meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere_usbnet.sh (limited to 'meta-ampere/meta-jade') diff --git a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb deleted file mode 100644 index 3045fa557..000000000 --- a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Ampere Computing LLC Add Ethernet over USB gadget device" -DESCRIPTION = "Add Ethernet over USB gadget device for Ampere systems" -PR = "r1" - -LICENSE = "Apache-2.0" -S = "${WORKDIR}" - -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit systemd -inherit obmc-phosphor-systemd - -DEPENDS = "systemd" -RDEPENDS:${PN} = "bash" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = " \ - ampere_add_usbnet_gadget.service \ - " - -SRC_URI += "file://00-bmc-usb0.network" -SRC_URI += "file://ampere_add_usbnet_gadget.sh" - -do_install:append() { - install -d ${D}${sbindir} - install -d ${D}/etc/systemd/network - install -m 744 ${WORKDIR}/ampere_add_usbnet_gadget.sh ${D}${sbindir}/ - install -m 644 ${WORKDIR}/00-bmc-usb0.network \ - ${D}/etc/systemd/network/ -} diff --git a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/00-bmc-usb0.network b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/00-bmc-usb0.network deleted file mode 100644 index 640fe04b9..000000000 --- a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/00-bmc-usb0.network +++ /dev/null @@ -1,7 +0,0 @@ -[Match] -Name=usb0 -[Address] -Address=192.168.0.10/16 -[Network] -LinkLocalAddressing=no -IPv6AcceptRA=no diff --git a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.service b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.service deleted file mode 100644 index 428263a89..000000000 --- a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Ampere adds Ethernet over USB gadget device -Wants=systemd-networkd.service -Before=systemd-networkd.service -After=phosphor-ipmi-host.service - -[Service] -ExecStart=/usr/bin/env ampere_add_usbnet_gadget.sh -SyslogIdentifier=ampere_add_usbnet_gadget.sh -Type=oneshot - -[Install] -WantedBy=systemd-networkd.service diff --git a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.sh b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.sh deleted file mode 100644 index c4c2c273f..000000000 --- a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet/ampere_add_usbnet_gadget.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -# Add an Ethernet over USB gadget device and connect to a port of Aspeed USB -# virtual hub. If can't find any free port on virtual hub, exit with failure. -# If can't find the virtual hub, exit with failure. - -# Author: Thinh Hung Pham -# Signed-off-by: Chanh Nguyen - -UDC_SYSPATH=/sys/class/udc -VHUB_DEVICE=1e6a0000.usb-vhub:p -GADGET_CONFIG_SYSPATH=/sys/kernel/config/usb_gadget -USBNET=usbnet -# The number of port on AST2500 USB virtual hub -NUM_PORT_USB_HUB=5 -# idVendor = 0x1d6b: Linux Foundation -VENDORID=0x1d6b -# idProduct = 0x0103: NCM (Ethernet) Gadget -PRODUCTID=0x0103 -# Language code = 0x409: English – United States -LANGUAGEID=0x409 -SERIALNUMBER=cafecafe -MANUFACTURER=Aspeed -FUNCTION=ecm.usb0 - -if [ ! -d ${GADGET_CONFIG_SYSPATH} ]; then - # GADGET_CONFIG_SYSPATH is not exist - # Return 1 so that systemd knows the service failed to start - echo "ERROR: ${GADGET_CONFIG_SYSPATH} : doesn't exist!" - exit 1 -fi - -find_free_vhub_port(){ - for ((i=1;i<=${NUM_PORT_USB_HUB};i++)) - do - state=$(cat ${UDC_SYSPATH}/${VHUB_DEVICE}${i}/state) - func=$(cat ${UDC_SYSPATH}/${VHUB_DEVICE}${i}/function) - if [ "${state}" == "not attached" -a "${func}" == "" ]; then - FREEUDC=${VHUB_DEVICE}${i} - break - fi - done - if [ ${i} -eq 6 ]; then - # Can't find a free port - # Return 1 so that systemd knows the service failed to start - echo "ERROR: Can't find a free port !" - exit 1 - fi -} - -if [ -d ${GADGET_CONFIG_SYSPATH}/${USBNET} ]; then - cd ${GADGET_CONFIG_SYSPATH}/${USBNET} -else - # Create the gadget - mkdir ${GADGET_CONFIG_SYSPATH}/${USBNET} - cd ${GADGET_CONFIG_SYSPATH}/${USBNET} - - # Configure the gadget - echo ${VENDORID} > idVendor - echo ${PRODUCTID} > idProduct - mkdir strings/${LANGUAGEID} - echo ${SERIALNUMBER} > strings/${LANGUAGEID}/serialnumber - echo ${MANUFACTURER} > strings/${LANGUAGEID}/manufacturer - echo ${USBNET} > strings/${LANGUAGEID}/product - - # Create the configuration - mkdir configs/c.1 - mkdir configs/c.1/strings/${LANGUAGEID} - - # Create the function - mkdir functions/${FUNCTION} - - # Associate the function with its configuration - ln -s functions/${FUNCTION} configs/c.1 -fi - -# Find an available virtual hub port -find_free_vhub_port - -# Enable the gadget -echo ${FREEUDC} > UDC - -if [[ $? -ne 0 ]]; then - # End - cd - > /dev/null - # Virtual HUB is not available - # Return 1 so that systemd knows the service failed to start - exit 1 -fi - -# End -cd - > /dev/null - diff --git a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet.bb b/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet.bb new file mode 100644 index 000000000..d1dff35ec --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet.bb @@ -0,0 +1,28 @@ +SUMMARY = "Enable USB ethernet" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +DEPENDS += "systemd" +RDEPENDS:${PN} += "libsystemd bash" + +inherit allarch systemd + +SRC_URI += "file://ampere-usbnet.service \ + file://ampere_usbnet.sh \ + file://00-bmc-usb0.network" + +do_install() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/ampere-usbnet.service ${D}${systemd_unitdir}/system + + install -d ${D}${sysconfdir_native}/systemd/network/ + install -m 0644 ${WORKDIR}/00-bmc-usb0.network ${D}${sysconfdir_native}/systemd/network + + install -d ${D}/${sbindir} + install -m 755 ${WORKDIR}/ampere_usbnet.sh ${D}/${sbindir} +} + +NATIVE_SYSTEMD_SUPPORT = "1" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "ampere-usbnet.service" diff --git a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/00-bmc-usb0.network b/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/00-bmc-usb0.network new file mode 100644 index 000000000..640fe04b9 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/00-bmc-usb0.network @@ -0,0 +1,7 @@ +[Match] +Name=usb0 +[Address] +Address=192.168.0.10/16 +[Network] +LinkLocalAddressing=no +IPv6AcceptRA=no diff --git a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere-usbnet.service b/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere-usbnet.service new file mode 100644 index 000000000..349954325 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere-usbnet.service @@ -0,0 +1,12 @@ +[Unit] +Description=Ampere Ethernet over USB gadget device +After=phosphor-ipmi-host.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/sbin/ampere_usbnet.sh +ExecStop=/usr/bin/usb-ctrl ecm usbnet off + +[Install] +WantedBy=multi-user.target diff --git a/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere_usbnet.sh b/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere_usbnet.sh new file mode 100644 index 000000000..fd2dce610 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/network/ampere-usbnet/ampere_usbnet.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +ENV_MAC_ADDR=$(fw_printenv eth1addr) +if [ -z "$ENV_MAC_ADDR" ]; then + ENV_MAC_ADDR=$(fw_printenv ethaddr) +fi + +MAC_ADDR=$(echo "$ENV_MAC_ADDR" | cut -d "=" -f 2) + +if [ -n "$MAC_ADDR" ]; then + # Generate MAC Address from eth1addr using locally administered MAC + # https://en.wikipedia.org/wiki/MAC_address#Universal_vs._local_(U/L_bit + SUBMAC=$(echo "$MAC_ADDR" | cut -d ":" -f 2-6) + /usr/bin/usb-ctrl ecm usbnet on "06:$SUBMAC" "02:$SUBMAC" +else + /usr/bin/usb-ctrl ecm usbnet on +fi + +# Use NCM (Ethernet) Gadget instead of FunctionFS Gadget +echo 0x0103 > /sys/kernel/config/usb_gadget/usbnet/idProduct +echo "OpenBMC usbnet Device" > /sys/kernel/config/usb_gadget/usbnet/strings/0x409/product 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 7136be64f..56db56883 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 @@ -2,6 +2,7 @@ RDEPENDS:${PN}-extras:append:mtjade = " \ webui-vue \ phosphor-image-signing \ phosphor-virtual-sensor \ + phosphor-misc-usb-ctrl \ " RDEPENDS:${PN}-inventory:append:mtjade = " \ -- cgit v1.2.3 From b790fedf2d53e55e73c083af58470ce57ed3a8e0 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Fri, 5 Nov 2021 01:39:51 +0000 Subject: meta-ampere: mtjade: remove u-boot patches Remove Mt.Jade u-boot patches as we have other approach for them: 1. Patch 0001 is to set FANs to maximum speed in u-boot to avoid hardware damage in case of Host ON with high CPU usage. This can be resolved by setting FAN to maximum speed when the FAN service stop. 2. Patch 0002 is to enable I2C4 device access. With commit 0b32c1b40@linux, I2C4 enable is set via gpio-hog 3. Patch 0003 will be resolved later by supporting Aspeed watchdog with boot status. Signed-off-by: Thang Q. Nguyen Change-Id: I247f99ebac7c3ca10a2dc77f1909f5c0c519401d --- ...eed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch | 87 ---------- ...d-Disable-internal-PD-resistors-for-GPIOs.patch | 45 ------ ...ort-passing-system-reset-status-to-kernel.patch | 180 --------------------- .../recipes-bsp/u-boot/u-boot-aspeed_%.bbappend | 7 - 4 files changed, 319 deletions(-) delete mode 100644 meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch delete mode 100644 meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch delete mode 100644 meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0003-aspeed-support-passing-system-reset-status-to-kernel.patch delete mode 100644 meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend (limited to 'meta-ampere/meta-jade') diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch deleted file mode 100644 index b714be4c6..000000000 --- a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 03dcf584823b8b7db7d437257dbb45bd4b7f95b4 Mon Sep 17 00:00:00 2001 -From: Chanh Nguyen -Date: Mon, 21 Dec 2020 07:01:14 +0000 -Subject: [PATCH] aspeed/scu : Switch PWM pin to GPIO input mode - -In hardware design, the PWM pins will be at a high level if they are -configured in GPIO Input mode. This commit configures all PWM function -pins to input GPIO mode. This will allow fans to run at full speed when BMC resets or in U-boot. - -Signed-off-by: Chanh Nguyen ---- - arch/arm/include/asm/arch-aspeed/ast_scu.h | 1 + - arch/arm/mach-aspeed/ast-scu.c | 12 ++++++++++++ - board/aspeed/ast-g5/ast-g5.c | 10 ++++++++++ - include/configs/ast-g5-phy.h | 3 +++ - 4 files changed, 26 insertions(+) - -diff --git a/arch/arm/include/asm/arch-aspeed/ast_scu.h b/arch/arm/include/asm/arch-aspeed/ast_scu.h -index dcbc6730d4..d2c010a0dc 100644 ---- a/arch/arm/include/asm/arch-aspeed/ast_scu.h -+++ b/arch/arm/include/asm/arch-aspeed/ast_scu.h -@@ -45,5 +45,6 @@ extern u32 ast_scu_get_vga_memsize(void); - extern void ast_scu_init_eth(u8 num); - extern void ast_scu_multi_func_eth(u8 num); - extern void ast_scu_multi_func_romcs(u8 num); -+extern void ast_scu_switch_pwm_to_gpio_mode(void); - - #endif -diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c -index 12de9b8036..ef90ef3805 100644 ---- a/arch/arm/mach-aspeed/ast-scu.c -+++ b/arch/arm/mach-aspeed/ast-scu.c -@@ -443,6 +443,18 @@ void ast_scu_multi_func_eth(u8 num) - } - } - -+void ast_scu_switch_pwm_to_gpio_mode(void) -+{ -+ ast_scu_write(ast_scu_read(AST_SCU_FUN_PIN_CTRL3) & -+ ~SCU_FUN_PIN_VPIG2 & -+ ~SCU_FUN_PIN_VPIG3 & -+ ~SCU_FUN_PIN_VPIG4 & -+ ~SCU_FUN_PIN_VPIG5 & -+ ~SCU_FUN_PIN_VPIG6 & -+ ~SCU_FUN_PIN_VPIG7, -+ AST_SCU_FUN_PIN_CTRL3); -+} -+ - void ast_scu_multi_func_romcs(u8 num) - { - ast_scu_write(ast_scu_read(AST_SCU_FUN_PIN_CTRL3) | -diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c -index e67a4bf8b2..fba22a728e 100644 ---- a/board/aspeed/ast-g5/ast-g5.c -+++ b/board/aspeed/ast-g5/ast-g5.c -@@ -24,6 +24,16 @@ int board_init(void) - return 0; - } - -+#ifdef CONFIG_BOARD_LATE_INIT -+int board_late_init(void) -+{ -+ /* Switch PWM to GPIO mode to make FAN run in max speed */ -+ ast_scu_switch_pwm_to_gpio_mode(); -+ -+ return 0; -+} -+#endif -+ - int dram_init(void) - { - u32 vga = ast_scu_get_vga_memsize(); -diff --git a/include/configs/ast-g5-phy.h b/include/configs/ast-g5-phy.h -index 62ddb841e5..5443a26cab 100644 ---- a/include/configs/ast-g5-phy.h -+++ b/include/configs/ast-g5-phy.h -@@ -30,4 +30,7 @@ - /* platform.S */ - #define CONFIG_DRAM_ECC_SIZE 0x10000000 - -+/* Call board_late_init */ -+#define CONFIG_BOARD_LATE_INIT 1 -+ - #endif /* __AST_G5_PHY_CONFIG_H */ --- -2.25.1 - diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch deleted file mode 100644 index 249d4398f..000000000 --- a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c6e0470d82417b79b23f218c6db1099eb6e160af Mon Sep 17 00:00:00 2001 -From: "Thang Q. Nguyen" -Date: Wed, 23 Dec 2020 04:42:21 +0000 -Subject: [PATCH] aspeed: Disable internal PD resistors for GPIOs - -Configure SCU8C - Multi-function pin control 4 to disable internal pull -down resistors for GPIOJ, GPIOG/GPIOAB, GPIOD/GPIOY, GPIOC/GPIOS as -external resistors are already installed. - -Signed-off-by: Thang Q. Nguyen ---- - board/aspeed/ast-g5/ast-g5.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c -index fba22a728e..9bf6c905fe 100644 ---- a/board/aspeed/ast-g5/ast-g5.c -+++ b/board/aspeed/ast-g5/ast-g5.c -@@ -27,9 +27,23 @@ int board_init(void) - #ifdef CONFIG_BOARD_LATE_INIT - int board_late_init(void) - { -+ u32 val; -+ - /* Switch PWM to GPIO mode to make FAN run in max speed */ - ast_scu_switch_pwm_to_gpio_mode(); - -+ /* -+ * Disable internal pull down resistor for GPIOJ, -+ * GPIOG/GPIOAB, GPIOD/GPIOY, GPIOC/GPIOS as external pull up/down -+ * resistors are installed already. Unlock SCU regs before writing. -+ */ -+ writel(SCU_PROTECT_UNLOCK, AST_SCU_BASE); -+ val = readl(AST_SCU_BASE + AST_SCU_FUN_PIN_CTRL4) | 0x024C0000; -+ writel(val, AST_SCU_BASE + AST_SCU_FUN_PIN_CTRL4); -+#ifdef CONFIG_AST_SCU_LOCK -+ writel(0xaa, AST_SCU_BASE); -+#endif -+ - return 0; - } - #endif --- -2.25.1 - diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0003-aspeed-support-passing-system-reset-status-to-kernel.patch b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0003-aspeed-support-passing-system-reset-status-to-kernel.patch deleted file mode 100644 index 0381b5d84..000000000 --- a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0003-aspeed-support-passing-system-reset-status-to-kernel.patch +++ /dev/null @@ -1,180 +0,0 @@ -From af4353ab19aaf29dc68ff89a0d581102ca5be43c Mon Sep 17 00:00:00 2001 -From: "Thang Q. Nguyen" -Date: Wed, 6 Jan 2021 06:33:36 +0000 -Subject: [PATCH] aspeed: support passing system reset status to kernel via - bootargs - -This is a backport of the patch file from -openbmc/meta-yadro/meta-nicole/recipes-bsp/u-boot/ -to add the Aspeed reset reason to bootargs so kernel applications -can query it. - -Test case: /proc/cmdline must contain: - - resetreason=power after cold bmc boot - - resetreason=watchdog after warm bmc reboot - -Signed-off-by: Chanh Nguyen -Signed-off-by: Thang Q. Nguyen ---- - arch/arm/include/asm/arch-aspeed/ast_scu.h | 2 +- - arch/arm/mach-aspeed/ast-scu.c | 6 +- - board/aspeed/ast-g5/ast-g5.c | 81 ++++++++++++++++++++++ - 3 files changed, 87 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/include/asm/arch-aspeed/ast_scu.h b/arch/arm/include/asm/arch-aspeed/ast_scu.h -index d2c010a0dc..f5c9126ec0 100644 ---- a/arch/arm/include/asm/arch-aspeed/ast_scu.h -+++ b/arch/arm/include/asm/arch-aspeed/ast_scu.h -@@ -29,7 +29,7 @@ - #define __AST_SCU_H - - extern void ast_scu_show_system_info (void); --extern void ast_scu_sys_rest_info(void); -+extern u32 ast_scu_sys_rest_info(void); - extern void ast_scu_security_info(void); - extern u32 ast_scu_revision_id(void); - extern u32 ast_scu_get_vga_memsize(void); -diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c -index ef90ef3805..c7ab66415f 100644 ---- a/arch/arm/mach-aspeed/ast-scu.c -+++ b/arch/arm/mach-aspeed/ast-scu.c -@@ -494,22 +494,26 @@ void ast_scu_security_info(void) - } - } - --void ast_scu_sys_rest_info(void) -+u32 ast_scu_sys_rest_info(void) - { - u32 rest = ast_scu_read(AST_SCU_SYS_CTRL); - - if (rest & SCU_SYS_EXT_RESET_FLAG) { - printf("RST : External\n"); - ast_scu_write(SCU_SYS_EXT_RESET_FLAG, AST_SCU_SYS_CTRL); -+ rest = SCU_SYS_EXT_RESET_FLAG; - } else if (rest & SCU_SYS_WDT_RESET_FLAG) { - printf("RST : Watchdog\n"); - ast_scu_write(SCU_SYS_WDT_RESET_FLAG, AST_SCU_SYS_CTRL); -+ rest = SCU_SYS_WDT_RESET_FLAG; - } else if (rest & SCU_SYS_PWR_RESET_FLAG) { - printf("RST : Power On\n"); - ast_scu_write(SCU_SYS_PWR_RESET_FLAG, AST_SCU_SYS_CTRL); -+ rest = SCU_SYS_PWR_RESET_FLAG; - } else { - printf("RST : CLK en\n"); - } -+ return rest; - } - - u32 ast_scu_get_vga_memsize(void) -diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c -index 9bf6c905fe..9e27bce0f5 100644 ---- a/board/aspeed/ast-g5/ast-g5.c -+++ b/board/aspeed/ast-g5/ast-g5.c -@@ -8,6 +8,8 @@ - */ - - #include -+#include -+#include - #include - - #include -@@ -25,9 +27,76 @@ int board_init(void) - } - - #ifdef CONFIG_BOARD_LATE_INIT -+static void update_bootargs_cmd(const char *key, const char *value) -+{ -+ int buf_len; -+ char *buf; -+ char *cmdline; -+ char *end = NULL; -+ -+ if (!key || (key[0] == '\0')) { -+ printf("%s: Empty key not allowed\n", __func__); -+ return; -+ } -+ -+ cmdline = getenv("bootargs"); -+ -+ /* Allocate space for maximum possible new command line */ -+ buf_len = (cmdline ? strlen(cmdline) : 0) -+ + 1 /* spacebar as delimiter */ -+ + strlen(key) -+ + (value ? 1 /* equal sign */ + strlen(value) : 0) -+ + 1 /* terminating null */; -+ -+ buf = calloc(buf_len, sizeof(char)); -+ if (!buf) { -+ printf("%s: out of memory\n", __func__); -+ return; -+ } -+ -+ if (cmdline) -+ { -+ char *start = strstr(cmdline, key); -+ -+ /* Check for full word match. Match should be start of cmdline -+ * or there should be space before match -+ **/ -+ if (start && ((start == cmdline) || (*(start - 1) == ' '))) { -+ strncat(buf, cmdline, (start - cmdline)); -+ -+ /* Find the end of the keyword[=value] pair, -+ * including a single training space character, if any. -+ * Skip the found substring, mark the tail of cmdline. -+ **/ -+ end = strchr(start, ' '); -+ if (end) { -+ end++; -+ } -+ } else { -+ strcat(buf, cmdline); -+ strcat(buf, " "); -+ } -+ } -+ -+ strcat(buf, key); -+ if (value) { -+ strcat(buf, "="); -+ strcat(buf, value); -+ } -+ -+ if (end) { -+ strcat(buf, " "); -+ strcat(buf, end); -+ } -+ -+ setenv("bootargs", buf); -+ free(buf); -+} -+ - int board_late_init(void) - { - u32 val; -+ u32 reset_reason = ast_scu_sys_rest_info(); - - /* Switch PWM to GPIO mode to make FAN run in max speed */ - ast_scu_switch_pwm_to_gpio_mode(); -@@ -44,6 +113,18 @@ int board_late_init(void) - writel(0xaa, AST_SCU_BASE); - #endif - -+ if (reset_reason & SCU_SYS_EXT_RESET_FLAG) { -+ update_bootargs_cmd("resetreason", "external"); -+ } else if (reset_reason & SCU_SYS_WDT_RESET_FLAG) { -+ update_bootargs_cmd("resetreason", "watchdog"); -+ } else if (reset_reason & SCU_SYS_PWR_RESET_FLAG) { -+ update_bootargs_cmd("resetreason", "power"); -+ } else { -+ char value[32]; -+ snprintf(value, sizeof(value) - 1, "0x%x", reset_reason); -+ update_bootargs_cmd("resetreason", value); -+ } -+ - return 0; - } - #endif --- -2.25.1 - diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend deleted file mode 100644 index 6d0a5f816..000000000 --- a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch \ - file://0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch \ - file://0003-aspeed-support-passing-system-reset-status-to-kernel.patch \ - " -- cgit v1.2.3