From d09aea5472ef7f91ba9cba16decd4c6674792534 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 25 May 2021 10:01:55 +0930 Subject: u-boot-aspeed: Move to SDK v00.04.00 This rebases on the latest SDK release. Notably this release includes support for the A3 and disables debug backdoors in line with the defaults in the A3 silicon. Changes kept downstream from ASPEED's SDK in the OpenBMC branch: Eddie James (1): ARM: dts: Aspeed: Tacoma and Rainier: Add eMMC nodes and parameters Joel Stanley (15): board: ast2600: Disable eSPI early init by default dts: ast2600-evb: Enable FSI masters tools: Add script for generating recovery image configs: Add OpenBMC spl defconfig for AST2600 boards clk: ast2600: Add divisor settings for 100MHz PLL ram: ast2600: Enable device tree based DDR config ast2600: tacoma: Run DDR at 1333 ast2600: Allow selection of SPL boot devices ast2600: Modify SPL SRAM layout crypto: Add driver for Aspeed HACE ast2600: Enable HACE probing in SPL ast2600: Add HACE to device tree ast2600: spl: Add ASPEED_LOADERS option ast2600: spl: Support common boot loader features config: ast2600: Add config for SPL MMC boot with FIT signature verification Changes in the ASPEED SDK when moving from v00.03.03 include the branch of fixes that were backported for FIT support, plus the following changes from the ASPEED team: Bing-Hua Wang (3): configs: evb-ast2500-spl_defconfig: Use platform.S DDR init ast2500: spl: Skip SPI timing calibration ast2500: Fix VRAM size detection Chia-Wei Wang (2): ast2600: Disable backdoor to align A3 design ast2600: Enable UART Debug based on FWSPIMISO Chia-Wei, Wang (4): board: ast2600: Add eSPI early init sequence board: ast2600-intel: Add Intel EGS CRB support aspeed: ast2600: Fix incorrect chip revision ID board: ast2600: Enable eSPI early init by default Chin-Ting Kuo (4): sdhci: ast2600: HS200 support porting mmc: Enable SDMA feature when boot from eMMC uart: Fix UART1 route problem on A3 spi-nor: Porting MT25Q02G flash part Dylan Hung (18): cmd:aspeed: fix missing setting for the tx single packet cmd:aspeed: change broadcom id matching cmd:aspeed: add support of broadcom 54210/54213 test cmd:aspeed: refactor phy internal loopback cmd:aspeed: fix typo cmd:aspeed: remove redundant debug print cmd:aspeed: skip deselect package for I350 IOP issue cmd:aspeed: add NCSI_VERBOSE_TEST (default off) cmd:aspeed: add 100ms for phy ready cmd:aspeed: bug fixed of the length decoding of the dramtest arm:dts: revise ast2600 mac1/2 rgmii delay setting net:phy: add phy-mode support on broadcom 5461 series cmd:aspeed: add phy tx/rx delay control arguments cmd:aspeed: add bcm54615, rtl8211f and marvell88e15 delay setting cmd:aspeed: restore default page ram:aspeed: revise coding style ram:aspeed: refactor coding style arm:dts: revise rgmii tx/rx delay Fugang Duan (1): net: phy: realtek: add rx delay support for RTL8211F Jamin Lin (1): Add evb-ast2600-obmc-emmc-cot_defconfig config to support AST2600 emmc secure boot for OpenBMC Johnny Huang (6): otp: fix a1 program issue otp: fix otp cmd stuck otp: update version number to 1.0.2 otp: add AST2600A3 secure boot: fix public key exponent otp: update print otp image Ryan Chen (3): AST2600:platform.S for AST2600A3 fix for reset. it will apply for AST2600A1/A2/A3 ast2600:ddr: fix memory bandwidth issue sdram : ast2600 Troy Lee (2): config: ast2600: support OpenBMC boot from eMMC image config: ast2600-evb for openbmc boot command update chin-ting_kuo (1): Revert "mmc: Enable SDMA feature when boot from eMMC" The previous version of v2019.04-aspeed-openbmc is kept in the branch archive/v2019.04-aspeed-openbmc-3. Change-Id: Ie492bdbfaec32c3e3e0caf8d4fa1806fcd1febec Signed-off-by: Joel Stanley --- meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index b662bf442..9da3e5a44 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -8,7 +8,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "44a8c618c1215e0faac0f335f0afd56ed4240e76" +SRCREV = "e1417368fdc3ba45ffde51a4b13290114a643be4" SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" -- cgit v1.2.3 From 74b7540bc1bf70ec395970ee91212cfd4909515a Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 26 May 2021 16:12:34 +0930 Subject: linux-aspeed: MCTP LPC Andrew Jeffery (1): mctp-lpc: Match register addresses to updated devicetree Change-Id: I40acb45d536d3dae36971671bc95f69ff3c254a7 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 084606b61..a3a24b613 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" LINUX_VERSION ?= "5.10.39" -SRCREV="45c6dc0de963bfdd8b468dceeea24f56a8e51424" +SRCREV="12165f912d1906426670cb9fde2244568a024c28" require linux-aspeed.inc -- cgit v1.2.3 From 382191051d848fbf4b3b75b6e569212a374cabba Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 4 Jun 2021 21:10:37 +0930 Subject: linux-aspeed: Move to v5.10.42 stable release This includes security and bug fixes from the 5.10.40 through to 5.10.42 stable releases. This stable release inclues a fix for the VUART on AST2600: Andrew Jeffery (1): serial: 8250: Add UART_BUG_TXRACE workaround for Aspeed VUART Change-Id: I8249b9564e2839e6ff9b19fbc247700d3f44699f Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index a3a24b613..5bfc62845 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" -LINUX_VERSION ?= "5.10.39" +LINUX_VERSION ?= "5.10.42" -SRCREV="12165f912d1906426670cb9fde2244568a024c28" +SRCREV="7590e064c6a69cbb12535a84414c6a04840ae82e" require linux-aspeed.inc -- cgit v1.2.3 From 25633f1351521fd26469b21ddbe339e3f874182d Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 4 Jun 2021 22:24:09 +0930 Subject: linux-aspeed: Backports of MMC, FSI, DTS These changes have been merged to mainline since v5.10 was released, including patches that are queued for v5.14. There are enhancements and bug fixes for FSI, clock phase compensation for MMC to enable HS200 mode, and device tree backports for Mt Jade and the IBM P10 systems. Andrew Jeffery (5): mmc: core: Add helper for parsing clock phase properties mmc: sdhci-of-aspeed: Expose clock phase controls mmc: sdhci-of-aspeed: Add AST2600 bus clock support mmc: sdhci-of-aspeed: Add KUnit tests for phase calculations mmc: sdhci-of-aspeed: Fix kunit-related build error Colin Ian King (1): fsi: core: Fix return of error values on failures Eddie James (3): fsi: scom: Reset the FSI2PIB engine for any error fsi: Aspeed: Reduce poll timeout ARM: dts: aspeed: Rainier 4U: Remove fan updates Jisheng Zhang (1): mmc: sdhci: replace mmc->parent with mmc_dev() for consistency Joel Stanley (4): fsi: aspeed: Emit fewer barriers in opb operations fsi: scom: Remove retries ARM: dts: aspeed: Set earlycon boot argument ARM: dts: aspeed-g5: Add SCU phandle to GFX node Quan Nguyen (3): ARM: dts: aspeed: mtjade: Enable OCP card support via NC-SI ARM: dts: aspeed: mtjade: Add PSU support ARM: dts: aspeed: mtjade: switch to 64MB flash layout Santosh Puranik (1): ARM: dts: aspeed: Everest: Fix cable card PCA chips Souptick Joarder (1): pinctrl: aspeed: Fix minor documentation error Steven Lee (6): pinctrl: pinctrl-aspeed-g6: Add sgpio pinctrl settings mmc: sdhci-of-aspeed: Configure the SDHCIs as specified by the devicetree. ARM: dts: aspeed: ast2600evb: Add sdhci node and gpio regulator for A2 evb. ARM: dts: aspeed: ast2600evb: Add phase correction for emmc controller. ARM: dts: aspeed: ast2600evb: Add dts file for A1 and A0 ARM: dts: aspeed-g6: Add pinctrl settings Troy Lee (1): ARM: dts: aspeed: Grow u-boot partition 64MiB OpenBMC flash layout Vishwanatha Subbanna (1): ARM: dts: aspeed: Everest: Add directly controlled LEDs Yangtao Li (1): fsi: aspeed: convert to devm_platform_ioremap_resource Zhen Lei (1): fsi: master-ast-cf: Remove redundant error printing in fsi_master_acf_probe() Zou Wei (1): fsi: Add missing MODULE_DEVICE_TABLE Change-Id: I236f1b3f3d96c08b1237a0d9860786ebe25566fd Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 5bfc62845..bf8391181 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" LINUX_VERSION ?= "5.10.42" -SRCREV="7590e064c6a69cbb12535a84414c6a04840ae82e" +SRCREV="a03dcbf1719162744ef9f1a73c9823f8ba3714ec" require linux-aspeed.inc -- cgit v1.2.3 From 639b932db6eaed21a4ddeded29604ed0bf72fd78 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 8 Jun 2021 21:02:15 +0930 Subject: linux-aspeed: Everest LEDs, Rainier, EVB fixes Andrew Jeffery (1): mmc: sdhci-of-aspeed: Turn down a phase correction warning Eddie James (1): ARM: dts: aspeed: Rainier 1S4U: Fix fan nodes Steven Lee (1): ARM: dts: aspeed: ast2600evb: Actually add dts file for A1 and A0 Vishwanatha Subbanna (6): ARM: dts: aspeed: everest: Add system level indicator leds ARM: dts: aspeed: everest: Add nvme and fan indicator leds ARM: dts: aspeed: everest: Add pcie slot indicator leds ARM: dts: aspeed: everest: Add dimm indicator leds ARM: dts: aspeed: everest: Add vrm and other indicator leds ARM: dts: aspeed: everest: Add pcie cable card indicator leds Change-Id: Ibdbc319fcc3490d9bae1e3845f1410150662bd4d Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index bf8391181..ee8e74b89 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" LINUX_VERSION ?= "5.10.42" -SRCREV="a03dcbf1719162744ef9f1a73c9823f8ba3714ec" +SRCREV="2c578b3ad5aa7eedf7c9bdd620205ccca4c19366" require linux-aspeed.inc -- cgit v1.2.3 From 271bf3dce908697dc7cada21df04b73708cc16b7 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 10 Jun 2021 15:05:45 +0930 Subject: meta-aspeed: Enable hardened allocator feature SLAB_FREELIST_HARDENED can protect from freelist overwrite attacks with really small overhead. It works best with the SLUB allocator, so make SLUB the default by removing SLAB=y. total used free shared buff/cache available SLAB 425596 44065.3+/-220 311099+/-3800 14864+/-3900 70432+/-3700 352767+/-3900 SLUB 425592 44225.3+/-280 313275+/-600 12132+/-3.3 68092+/-530 355295+/-280 These figures are the average memory usage from three boots of each option in qemu, running the Romulus userspace. The output is from free(1), reported in kilobytes. Change-Id: I3c3ce67bc202dffbc3084382227f3dbc77f4cf85 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig | 2 +- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig | 2 +- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig index d128c7a82..6a2c6d98a 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig @@ -21,8 +21,8 @@ CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLAB_FREELIST_HARDENED=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_ASPEED=y CONFIG_MACH_ASPEED_G4=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig index 459a40dd7..bd7711f09 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -23,8 +23,8 @@ CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_ARCH_MULTI_V6=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_ASPEED=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index b80042396..9734f46c3 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -23,8 +23,8 @@ CONFIG_BPF_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set -CONFIG_SLAB=y CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_ARCH_ASPEED=y CONFIG_MACH_ASPEED_G6=y # CONFIG_CACHE_L2X0 is not set -- cgit v1.2.3 From d5e99fd1ecdeaad3e006aa6c4a014beccf8b7d0b Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 10 Jun 2021 22:10:31 +0930 Subject: linux-aspeed: Move to v5.10.43 stable release This includes security and bug fixes from the 5.10.43 stable release. Change-Id: I80b2c7f29a96ca11e2d291957bd573c5c70310e9 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index ee8e74b89..c514bcf5a 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" -LINUX_VERSION ?= "5.10.42" +LINUX_VERSION ?= "5.10.43" -SRCREV="2c578b3ad5aa7eedf7c9bdd620205ccca4c19366" +SRCREV="ba046d1e841cb21cfed9314f248e136d04ba90cf" require linux-aspeed.inc -- cgit v1.2.3 From d84b7f4455406807637b7fecf9e96b73e17fcf62 Mon Sep 17 00:00:00 2001 From: Troy Lee Date: Wed, 16 Jun 2021 14:35:31 +0800 Subject: evb-ast2600: enabling u-boot-spl feature Currently, machine evb-ast2600 frozed during u-boot booting. This patchset has been tested with AST2600-A1 and AST2600-A3 EVB: AST2600-A1: ``` U-Boot SPL 2019.04 (Jun 16 2021 - 05:59:38 +0000) already initialized, Trying to boot from RAM U-Boot 2019.04 (Jun 16 2021 - 05:59:38 +0000) SOC: AST2600-A1 RST: WDT1 SOC PCI RST: #2 LPC Mode: SIO:Enable : SuperIO-2e Eth: MAC0: RGMII, MAC1: RGMII, MAC2: RGMII, MAC3: RGMII Model: AST2600 EVB DRAM: already initialized, 1008 MiB (capacity:1024 MiB, VGA:16 MiB), ECC off MMC: sdhci_slot0@100: 1, sdhci_slot1@200: 2, emmc_slot0@100: 0 Loading Environment from SPI Flash... SF: Detected w25q512jv with page size 256 Bytes, erase size 4 KiB, total 64 MiB OK In: serial@1e784000 ``` AST2600-A3: ``` BP0c00 U-Boot SPL 2019.04 (Jun 16 2021 - 05:59:38 +0000) already initialized, Trying to boot from RAM U-Boot 2019.04 (Jun 16 2021 - 05:59:38 +0000) SOC: AST2600-A3 RST: WDT1 SOC PCI RST: #2 eSPI Mode: SIO:Enable : SuperIO-2e Eth: MAC0: RGMII, MAC1: RGMII, MAC2: RGMII, MAC3: RGMII Model: AST2600 EVB DRAM: already initialized, 960 MiB (capacity:1024 MiB, VGA:64 MiB), ECC off MMC: sdhci_slot0@100: 1, sdhci_slot1@200: 2, emmc_slot0@100: 0 Loading Environment from SPI Flash... SF: Detected w25q512jv with page size 256 Bytes, erase size 4 KiB, total 64 MiB OK In: serial@1e784000 ``` Signed-off-by: Troy Lee Change-Id: I77ec3c2928ca96ee3f51290fd3435fca08bb058a --- meta-aspeed/conf/machine/evb-ast2600.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf index e011045d2..d3ee47b9c 100644 --- a/meta-aspeed/conf/machine/evb-ast2600.conf +++ b/meta-aspeed/conf/machine/evb-ast2600.conf @@ -1,6 +1,7 @@ KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb" -UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" UBOOT_DEVICETREE = "ast2600a1-evb" +SPL_BINARY = "spl/u-boot-spl.bin" require conf/machine/include/ast2600.inc -- cgit v1.2.3 From 25c718531699ac48114dfdadcf81d47f9bf7a907 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 17 Jun 2021 12:17:46 +0930 Subject: linux-aspeed: KCS Andrew Jeffery (16): ipmi: kcs_bmc_aspeed: Use of match data to extract KCS properties ipmi: kcs_bmc: Make status update atomic ipmi: kcs_bmc: Rename {read,write}_{status,data}() functions ipmi: kcs_bmc: Split out kcs_bmc_cdev_ipmi ipmi: kcs_bmc: Turn the driver data-structures inside-out ipmi: kcs_bmc: Split headers into device and client ipmi: kcs_bmc: Strip private client data from struct kcs_bmc ipmi: kcs_bmc: Decouple the IPMI chardev from the core ipmi: kcs_bmc: Allow clients to control KCS IRQ state ipmi: kcs_bmc: Enable IBF on open ipmi: kcs_bmc: Add serio adaptor dt-bindings: ipmi: Convert ASPEED KCS binding to schema dt-bindings: ipmi: Add optional SerIRQ property to ASPEED KCS devices ipmi: kcs_bmc_aspeed: Implement KCS SerIRQ configuration ipmi: kcs_bmc_aspeed: Fix IBFIE typo from datasheet ipmi: kcs_bmc_aspeed: Optionally apply status address Change-Id: If4267164d165c0ecb5039d55438d4a58926ecce3 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index c514bcf5a..c932b47c2 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" LINUX_VERSION ?= "5.10.43" -SRCREV="ba046d1e841cb21cfed9314f248e136d04ba90cf" +SRCREV="ba6fcacfd32bbce4d1394467310df9d279a62231" require linux-aspeed.inc -- cgit v1.2.3 From 58b76bfddc1417d3c761c038c87f028bf0b496d3 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Mon, 7 Jun 2021 12:12:04 +0930 Subject: meta-aspeed: aspeed-g6: Enable KCS adapter for raw SerIO Raw SerIO is used by the debug-trigger application to take signals from the host that applications are unresponsive on the BMC for p10bmc systems. Change-Id: Ie5ee683c3b08ebe922f2c5a7b5bf52b1e18069f4 Signed-off-by: Andrew Jeffery --- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index 9734f46c3..48e2e7509 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -139,7 +139,7 @@ CONFIG_KEYBOARD_GPIO_POLLED=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_IBM_PANEL=y -# CONFIG_SERIO is not set +CONFIG_SERIO_RAW=y # CONFIG_VT is not set # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_8250=y @@ -153,6 +153,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_ASPEED_KCS_IPMI_BMC=y +CONFIG_IPMI_KCS_BMC_SERIO=y CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y CONFIG_DEVMEM_BOOTPARAM=y -- cgit v1.2.3 From 34b3077d0643563c0487f47ab39680d30874d7e4 Mon Sep 17 00:00:00 2001 From: Eddie James Date: Thu, 1 Apr 2021 08:30:02 -0500 Subject: AST2600: Update default env for multiple FIT config Add environment variables to the AST2600 to boot a certain FIT configuration of the kernel based on the "fitconfig" environment variable. The boot command will fall back to the default FIT config in case all other boot attempts fail. Also fix the kernel boot arguments in the case that boot failure occurs. The boot sequence would be: - boota with fitconfig, if it fails: - boota without fitconfig, if it fails: - bootb with fitconfig, if it fails: - bootb without fitconfig Tested: Set fitconfig to a dummy variable, and also changed the bootm command to a dummy command to force a boot failure, and verified the sequence was as expected: ast# boot boota Error loading kernel FIT image with fitconfig rainier-dummy Unknown command 'bootm-dummy' - try 'help' Error loading kernel FIT image bootb Error loading kernel FIT image with fitconfig rainier-dummy Unknown command 'bootm-dummy' - try 'help' Error loading kernel FIT image Signed-off-by: Eddie James Signed-off-by: Adriana Kobylak Change-Id: I14cf935a707bdb95b0a6e4e607919ea0e027d18c --- meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt b/meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt index 47a474c92..15dd2f522 100644 --- a/meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt +++ b/meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt @@ -1,9 +1,11 @@ bootargs=console=ttyS4,115200n8 -boota=setenv bootpart 2; setenv rootfs rofs-a; run setmmcargs; ext4load mmc 0:${bootpart} ${loadaddr} fitImage && bootm; echo Error loading kernel FIT image -bootb=setenv bootpart 3; setenv rootfs rofs-b; run setmmcargs; ext4load mmc 0:${bootpart} ${loadaddr} fitImage && bootm; echo Error loading kernel FIT image -bootcmd=if test "${bootside}" = "b"; then run bootb; run boota; else run boota; run bootb; fi +boota=setenv bootpart 2; setenv rootfs rofs-a; run bootmmc +bootb=setenv bootpart 3; setenv rootfs rofs-b; run bootmmc +bootcmd=setenv origbootargs ${bootargs}; run bootconfcmd; run bootsidecmd +bootconfcmd=if test ${fitconfig} -n; then setenv bootmconf "#${fitconfig}"; fi bootdelay=2 +bootmmc=run setmmcargs; ext4load mmc 0:${bootpart} ${loadaddr} fitImage && bootm ${loadaddr}${bootmconf}; echo Error loading kernel FIT image with fitconfig ${fitconfig}; bootm ${loadaddr}; echo Error loading kernel FIT image bootside=a +bootsidecmd=if test ${bootside} = b; then run bootb; run boota; else run boota; run bootb; fi loadaddr=0x83000000 -rootfs=rofs-a -setmmcargs=setenv bootargs ${bootargs} rootwait root=PARTLABEL=${rootfs} +setmmcargs=setenv bootargs ${origbootargs} rootwait root=PARTLABEL=${rootfs} -- cgit v1.2.3 From aaecf6b84b0f227dd4329060026064e59b56c1a5 Mon Sep 17 00:00:00 2001 From: Lei YU Date: Mon, 21 Jun 2021 10:48:58 +0800 Subject: meta-aspeed: linux: Enable CONFIG_IPMI_KCS_BMC_CDEV_IPMI The CONFIG_IPMI_KCS_BMC_CDEV_IPMI is necessary for the new KCS driver refactor to create the ipmi-kcs devices. Tested: Verify on g220a that the ipmi-kcs3/4 devices are created and the inband IPMI via KCS works fine. Signed-off-by: Lei YU Change-Id: I2a1e7842f231fb4ee8284c194ed9cf28f668885e --- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig | 1 + meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig | 1 + meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig | 1 + 3 files changed, 3 insertions(+) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig index 6a2c6d98a..e16c47c73 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig @@ -133,6 +133,7 @@ CONFIG_SERIAL_8250_ASPEED_VUART=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_ASPEED_KCS_IPMI_BMC=y +CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y CONFIG_DEVMEM_BOOTPARAM=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig index bd7711f09..7803eb795 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -140,6 +140,7 @@ CONFIG_SERIAL_8250_ASPEED_VUART=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_ASPEED_KCS_IPMI_BMC=y +CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y CONFIG_DEVMEM_BOOTPARAM=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index 48e2e7509..b648a274d 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -153,6 +153,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_ASPEED_KCS_IPMI_BMC=y +CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y CONFIG_IPMI_KCS_BMC_SERIO=y CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y -- cgit v1.2.3 From 5c3273bbcc59a5f41810a3c977d6eba7933ebd2e Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Mon, 21 Jun 2021 16:14:32 +0930 Subject: u-boot-aspeed: Add environment for booting from mmc This adds the u-boot environment to the u-boot binary. On the 2600 with mmc we currently rely on the default environment being populated in the image. This has the downside that if something corrupts the environment, the system won't know how to boot itself. This wasn't a problem for NOR based systems as the built in command knew how to boot the system (unless you were using a 'special' setup such as Witherspoon's UBI setup). The ast2600_openbmc_mmc.txt is copied from meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt. Adriana has indicated she will update openbmc to use the .txt from the u-boot tree to generate the filesystem image (or we could stop doing that, and simply use the default?). The environment processing step requires xxd on the build system. Joel Stanley (2): Makefile: Conditionally add defaultenv_h to envtools target ast2600: Add environment for booting from mmc Change-Id: I0381ac168285bade75115b7b415e18dd7fc8694e Signed-off-by: Joel Stanley --- meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index 9da3e5a44..ab4b5200c 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -1,6 +1,6 @@ HOMEPAGE = "https://github.com/AspeedTech-BMC/u-boot" SECTION = "bootloaders" -DEPENDS += "flex-native bison-native" +DEPENDS += "flex-native bison-native xxd-native" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" @@ -8,7 +8,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "e1417368fdc3ba45ffde51a4b13290114a643be4" +SRCREV = "cfc04136e001e208a1eab83c9fe0aa78a3fd6d7f" SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" -- cgit v1.2.3 From 2751c204a74f4d4861bdc272499a6f89db6d6dbe Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Wed, 23 Jun 2021 08:35:46 +0930 Subject: meta-aspeed: linux: Enable raw KCS driver Change-Id: I844441c5e33eba55eb252ea445b75835bab2f735 Signed-off-by: Andrew Jeffery --- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig | 1 + meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig | 1 + meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig | 1 + 3 files changed, 3 insertions(+) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig index e16c47c73..6ef0c4cc4 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig @@ -134,6 +134,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_ASPEED_KCS_IPMI_BMC=y CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y +CONFIG_IPMI_KCS_BMC_CDEV_RAW=y CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y CONFIG_DEVMEM_BOOTPARAM=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig index 7803eb795..43230b075 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -141,6 +141,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_ASPEED_KCS_IPMI_BMC=y CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y +CONFIG_IPMI_KCS_BMC_CDEV_RAW=y CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y CONFIG_DEVMEM_BOOTPARAM=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index b648a274d..c2363b280 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -154,6 +154,7 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_ASPEED_KCS_IPMI_BMC=y CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y +CONFIG_IPMI_KCS_BMC_CDEV_RAW=y CONFIG_IPMI_KCS_BMC_SERIO=y CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y -- cgit v1.2.3 From 2763316cd41d2ec470131823831470e5601e9200 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 24 Jun 2021 19:20:44 +0930 Subject: linux-aspeed: KCS raw, Everest PSU, Rainier PSU presence Andrew Jeffery (7): ARM: dts: aspeed: rainier: Add eMMC clock phase compensation ipmi: kcs_bmc: Add a "raw" character device interface ARM: configs: Enable IPMI KCS raw chardev ARM: dts: p10bmc: Drop the openbmc, mctp-lpc node misc: Remove obsolete mctp-lpc chardev ARM: dts: aspeed: p10bmc: Switch to KCS 3 for MCTP binding ARM: dts: aspeed: p10bmc: Enable KCS channel 2 B. J. Wyman (2): ARM: dts: aspeed: Everest PSU #3 address change ARM: dts: aspeed: Rainier remove PSU gpio-keys Colin Ian King (1): ipmi: kcs_bmc_aspeed: Fix less than zero comparison of a unsigned int Joel Stanley (2): ARM: config: aspeed: Enable KCS adapter for raw SerIO ARM: dts: aspeed: Fix AST2600 machines line names Signed-off-by: Joel Stanley Change-Id: Ib9c46a3693b8c04512004363501770e4bbd93432 --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index c932b47c2..c83b69b63 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" LINUX_VERSION ?= "5.10.43" -SRCREV="ba6fcacfd32bbce4d1394467310df9d279a62231" +SRCREV="fe782f261ec9b2bccc8665576fb3c4d16032c0c9" require linux-aspeed.inc -- cgit v1.2.3 From c92dc16d4685cc58e92b37d76915c0671de50eff Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 24 Jun 2021 21:53:39 +0930 Subject: linux-aspeed: Move to v5.10.46 stable release This includes security and bug fixes from the 5.10.44 through to 5.10.46 stable releases. Change-Id: I7e6c006628b4b6cb7242cf3a51de36742fa86e8c Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index c83b69b63..963db1db5 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" -LINUX_VERSION ?= "5.10.43" +LINUX_VERSION ?= "5.10.46" -SRCREV="fe782f261ec9b2bccc8665576fb3c4d16032c0c9" +SRCREV="c7100e6e662152e0cadd2877755c8c0a64ef34b0" require linux-aspeed.inc -- cgit v1.2.3 From a9d3e58bf3f398ee28cc9b8769a1a011ccb841a1 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 24 Jun 2021 21:57:35 +0930 Subject: u-boot-aspeed: MMC env and AST2600 SPI boot fixes Adriana Kobylak (1): configs: aspeed-common: Add redundant env for mmc Troy Lee (2): ast2600: spl: Fixes boot from RAM device ast2600: Provide u-boot FIT image boot from RAM offset Change-Id: I9fd8c76593d83d32504288a6405c2b4c41fdb381 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index ab4b5200c..553d52dd8 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -8,7 +8,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "cfc04136e001e208a1eab83c9fe0aa78a3fd6d7f" +SRCREV = "e5902174d9e0d9611619a8b468a5a9b73ab402b5" SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" -- cgit v1.2.3 From fec94c7b8f7adb79e6d63db1a7e88b54eecc1749 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Mon, 28 Jun 2021 13:34:44 +0930 Subject: linux-aspeed: AST2600 eMMC fixes Andrew Jeffery (2): ARM: dts: tacoma: Add phase corrections for eMMC ARM: dts: everest: Add phase corrections for eMMC Change-Id: I24a1c0f0c6505f7bb16c437eea03edbb254fee93 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 963db1db5..063970a6f 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.10" LINUX_VERSION ?= "5.10.46" -SRCREV="c7100e6e662152e0cadd2877755c8c0a64ef34b0" +SRCREV="dd1e9367157f900616f0eae3cef897c23d4e7452" require linux-aspeed.inc -- cgit v1.2.3