February 2022 - U-Boot

[PATCH v2] apple: Fix debug uart clock rate
by Mark Kettenis 11 Feb '22

11 Feb '22

The clock rate for the serial console on Apple M1 systems is 24 MHz instead of 240 kHz. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- ChangeLog: v2: - Fix typo in comment configs/apple_m1_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig index cb235e4e7d..71ffbc6ec4 100644 --- a/configs/apple_m1_defconfig +++ b/configs/apple_m1_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_APPLE=y CONFIG_DEFAULT_DEVICE_TREE="t8103-j274" CONFIG_DEBUG_UART_BASE=0x235200000 -CONFIG_DEBUG_UART_CLOCK=240000 +CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x880000000 CONFIG_USE_PREBOOT=y -- 2.34.1

2 1

[PATCH 1/2] powerpc: mpc8xx: drop CONFIG_SYS_RESET_ADDRESS
by Ovidiu Panait 11 Feb '22

11 Feb '22

There are no boards that define CONFIG_SYS_RESET_ADDRESS, so drop the associated mpc8xx code that checks for it. Signed-off-by: Ovidiu Panait <ovidiu.panait(a)windriver.com> --- arch/powerpc/cpu/mpc8xx/cpu.c | 11 ++--------- scripts/config_whitelist.txt | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 893aecef21..6d16ed084e 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -215,19 +215,12 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) /* * Trying to execute the next instruction at a non-existing address * should cause a machine check, resulting in reset - */ -#ifdef CONFIG_SYS_RESET_ADDRESS - addr = CONFIG_SYS_RESET_ADDRESS; -#else - /* + * * note: when CONFIG_SYS_MONITOR_BASE points to a RAM address, * CONFIG_SYS_MONITOR_BASE - sizeof (ulong) is usually a valid address. - * Better pick an address known to be invalid on your system and assign - * it to CONFIG_SYS_RESET_ADDRESS. - * "(ulong)-1" used to be a good choice for many systems... */ addr = CONFIG_SYS_MONITOR_BASE - sizeof(ulong); -#endif + ((void (*)(void)) addr)(); return 1; } diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7b45d578a3..84e46e3763 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1837,7 +1837,6 @@ CONFIG_SYS_RCAR_I2C1_BASE CONFIG_SYS_RCAR_I2C2_BASE CONFIG_SYS_RCAR_I2C3_BASE CONFIG_SYS_RESET_ADDR -CONFIG_SYS_RESET_ADDRESS CONFIG_SYS_RFD CONFIG_SYS_RGMII1_PHY_ADDR CONFIG_SYS_RGMII2_PHY_ADDR -- 2.25.1

5 7

[PATCH v2 0/2] Apple M1 laptop keyboard support
by Mark Kettenis 11 Feb '22

11 Feb '22

This short series implements support for the laptop keyboards on the Apple Silicon Mac laptops. These keyboards are connected to an SPI bus, so this adds a driver for the SPI controller integrated on the SoC, as well as the driver for the keyboard itself. This makes it possible to interact with U-Boot and EFI applications without the need for an external USB keyboard. ChangeLog: v2: - Drop delay after enabling controller - Check for errors in spi calls - Add comments Mark Kettenis (2): spi: apple: Add driver for Apple SPI controller input: apple: Add support for Apple SPI keyboard arch/arm/Kconfig | 2 + configs/apple_m1_defconfig | 1 + drivers/input/Kconfig | 8 + drivers/input/Makefile | 1 + drivers/input/apple_spi_kbd.c | 271 ++++++++++++++++++++++++++++++++ drivers/spi/Kconfig | 7 + drivers/spi/Makefile | 1 + drivers/spi/apple_spi.c | 285 ++++++++++++++++++++++++++++++++++ include/configs/apple.h | 2 +- 9 files changed, 577 insertions(+), 1 deletion(-) create mode 100644 drivers/input/apple_spi_kbd.c create mode 100644 drivers/spi/apple_spi.c -- 2.34.1

2 4

[PATCH v2 0/9] Apple M1 NVMe storage support
by Mark Kettenis 11 Feb '22

11 Feb '22

This adds support for the (rather quirky) NVMe storage controller integrated on Apple SoCs. This makes it possible to boot from the NVMe storage that is present on all the M1 machines that Apple has released so far. The series has been designed to have as little impact on the existing NVMe support as possible. It splits out the PCIe-specific bits in its own file/driver and adds a platform driver for the Apple controller. This platform driver handles all the quirkiness through driver ops. The existing logic is retained when the driver ops aren't set. I've tested this on a firefly-rk3399 board with: nvme0 at pci1 dev 0 function 0 "Silicon Motion SM2260 NVMe" rev 0x03: msix, NVMe 1.2 nvme0: ADATA SX8000NP, firmware C2.2.1, serial 2H1220011170 (for those not familliar with OpenBSD, that's an ADATA SX8000NP NVMe M.2 SSD with a Silicon Motion controller) ChangeLog: v2: - Add various comments - Change SYS_SOC from "m1" to "apple" - Change include paths to take advantage of SYS_SOC change - Change alloc_queue op into setup_queue Mark Kettenis (9): nvme: Split out PCI support mailbox: apple: Add driver for Apple IOP mailbox arm: apple: Change SoC name from "m1" into "apple" arm: apple: Add RTKit support nvme: Introduce driver ops nvme: Add shutdown function power: domain: apple: Add reset support nvme: apple: Add driver for Apple NVMe storage controller configs: apple: Add NVMe boot target arch/arm/Kconfig | 2 + arch/arm/include/asm/arch-apple/rtkit.h | 11 + .../asm/{arch-m1 => arch-apple}/uart.h | 0 arch/arm/mach-apple/Kconfig | 2 +- arch/arm/mach-apple/Makefile | 1 + arch/arm/mach-apple/rtkit.c | 231 +++++++++++++++++ configs/apple_m1_defconfig | 1 + configs/clearfog_gt_8k_defconfig | 2 +- configs/firefly-rk3399_defconfig | 2 +- configs/khadas-vim3_android_ab_defconfig | 2 +- configs/khadas-vim3_android_defconfig | 2 +- configs/khadas-vim3_defconfig | 2 +- configs/khadas-vim3l_android_ab_defconfig | 2 +- configs/khadas-vim3l_android_defconfig | 2 +- configs/khadas-vim3l_defconfig | 2 +- configs/kontron_sl28_defconfig | 2 +- configs/ls1012afrdm_qspi_defconfig | 2 +- configs/ls1012afrdm_tfa_defconfig | 2 +- .../ls1012afrwy_qspi_SECURE_BOOT_defconfig | 2 +- configs/ls1012afrwy_qspi_defconfig | 2 +- configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1012afrwy_tfa_defconfig | 2 +- configs/ls1012aqds_qspi_defconfig | 2 +- configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1012aqds_tfa_defconfig | 2 +- configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 2 +- configs/ls1012ardb_qspi_defconfig | 2 +- configs/ls1012ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1012ardb_tfa_defconfig | 2 +- configs/ls1021aiot_qspi_defconfig | 2 +- configs/ls1021aiot_sdcard_defconfig | 2 +- configs/ls1021aqds_ddr4_nor_defconfig | 2 +- configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 2 +- configs/ls1021aqds_nand_defconfig | 2 +- configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 2 +- configs/ls1021aqds_nor_defconfig | 2 +- configs/ls1021aqds_nor_lpuart_defconfig | 2 +- configs/ls1021aqds_qspi_defconfig | 2 +- configs/ls1021aqds_sdcard_ifc_defconfig | 2 +- configs/ls1021aqds_sdcard_qspi_defconfig | 2 +- configs/ls1021atsn_qspi_defconfig | 2 +- configs/ls1021atsn_sdcard_defconfig | 2 +- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 2 +- configs/ls1021atwr_nor_defconfig | 2 +- configs/ls1021atwr_nor_lpuart_defconfig | 2 +- configs/ls1021atwr_qspi_defconfig | 2 +- configs/ls1021atwr_sdcard_ifc_defconfig | 2 +- configs/ls1021atwr_sdcard_qspi_defconfig | 2 +- configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1028aqds_tfa_defconfig | 2 +- configs/ls1028aqds_tfa_lpuart_defconfig | 2 +- configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1028ardb_tfa_defconfig | 2 +- configs/ls1043aqds_defconfig | 2 +- configs/ls1043aqds_lpuart_defconfig | 2 +- configs/ls1043aqds_nand_defconfig | 2 +- configs/ls1043aqds_nor_ddr3_defconfig | 2 +- configs/ls1043aqds_qspi_defconfig | 2 +- configs/ls1043aqds_sdcard_ifc_defconfig | 2 +- configs/ls1043aqds_sdcard_qspi_defconfig | 2 +- configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1043aqds_tfa_defconfig | 2 +- configs/ls1043ardb_SECURE_BOOT_defconfig | 2 +- configs/ls1043ardb_defconfig | 2 +- configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 2 +- configs/ls1043ardb_nand_defconfig | 2 +- configs/ls1043ardb_sdcard_defconfig | 2 +- configs/ls1043ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1043ardb_tfa_defconfig | 2 +- configs/ls1046afrwy_tfa_defconfig | 2 +- configs/ls1046aqds_SECURE_BOOT_defconfig | 2 +- configs/ls1046aqds_defconfig | 2 +- configs/ls1046aqds_lpuart_defconfig | 2 +- configs/ls1046aqds_nand_defconfig | 2 +- configs/ls1046aqds_qspi_defconfig | 2 +- configs/ls1046aqds_sdcard_ifc_defconfig | 2 +- configs/ls1046aqds_sdcard_qspi_defconfig | 2 +- configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1046aqds_tfa_defconfig | 2 +- configs/ls1046ardb_emmc_defconfig | 2 +- configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 2 +- configs/ls1046ardb_qspi_defconfig | 2 +- configs/ls1046ardb_qspi_spl_defconfig | 2 +- configs/ls1046ardb_sdcard_defconfig | 2 +- configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1046ardb_tfa_defconfig | 2 +- configs/ls1088aqds_defconfig | 2 +- configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 2 +- configs/ls1088aqds_qspi_defconfig | 2 +- configs/ls1088aqds_sdcard_ifc_defconfig | 2 +- configs/ls1088aqds_sdcard_qspi_defconfig | 2 +- configs/ls1088aqds_tfa_defconfig | 2 +- configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 2 +- configs/ls1088ardb_qspi_defconfig | 2 +- configs/ls1088ardb_sdcard_qspi_defconfig | 2 +- configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls1088ardb_tfa_defconfig | 2 +- configs/ls2080aqds_SECURE_BOOT_defconfig | 2 +- configs/ls2080aqds_defconfig | 2 +- configs/ls2080aqds_nand_defconfig | 2 +- configs/ls2080aqds_qspi_defconfig | 2 +- configs/ls2080aqds_sdcard_defconfig | 2 +- configs/ls2080ardb_SECURE_BOOT_defconfig | 2 +- configs/ls2080ardb_defconfig | 2 +- configs/ls2080ardb_nand_defconfig | 2 +- configs/ls2081ardb_defconfig | 2 +- configs/ls2088aqds_tfa_defconfig | 2 +- configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 2 +- configs/ls2088ardb_qspi_defconfig | 2 +- configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/ls2088ardb_tfa_defconfig | 2 +- configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 2 +- configs/lx2160aqds_tfa_defconfig | 2 +- configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 2 +- configs/lx2160ardb_tfa_defconfig | 2 +- configs/lx2160ardb_tfa_stmm_defconfig | 2 +- configs/mvebu_crb_cn9130_defconfig | 2 +- configs/mvebu_db_armada8k_defconfig | 2 +- configs/mvebu_db_cn9130_defconfig | 2 +- configs/mvebu_espressobin-88f3720_defconfig | 2 +- configs/mvebu_mcbin-88f8040_defconfig | 2 +- configs/mvebu_puzzle-m801-88f8040_defconfig | 2 +- configs/nanopc-t4-rk3399_defconfig | 2 +- configs/octeontx2_96xx_defconfig | 2 +- configs/octeontx_81xx_defconfig | 2 +- configs/octeontx_83xx_defconfig | 2 +- configs/p3450-0000_defconfig | 2 +- configs/pinebook-pro-rk3399_defconfig | 2 +- configs/qemu-x86_64_defconfig | 2 +- configs/qemu-x86_defconfig | 2 +- configs/qemu_arm64_defconfig | 2 +- configs/qemu_arm_defconfig | 2 +- configs/rcar3_salvator-x_defconfig | 2 +- configs/roc-pc-mezzanine-rk3399_defconfig | 2 +- configs/rock-pi-4-rk3399_defconfig | 2 +- configs/rock-pi-4c-rk3399_defconfig | 2 +- configs/rock-pi-n10-rk3399pro_defconfig | 2 +- configs/rock960-rk3399_defconfig | 2 +- configs/rockpro64-rk3399_defconfig | 2 +- configs/sandbox64_defconfig | 2 +- configs/sandbox_defconfig | 2 +- configs/sandbox_flattree_defconfig | 2 +- configs/sandbox_noinst_defconfig | 2 +- configs/sandbox_spl_defconfig | 2 +- configs/sifive_unmatched_defconfig | 2 +- configs/synquacer_developerbox_defconfig | 2 +- configs/turris_mox_defconfig | 2 +- configs/turris_omnia_defconfig | 2 +- doc/develop/driver-model/nvme.rst | 1 + drivers/mailbox/Kconfig | 11 + drivers/mailbox/Makefile | 1 + drivers/mailbox/apple-mbox.c | 92 +++++++ drivers/nvme/Kconfig | 21 +- drivers/nvme/Makefile | 2 + drivers/nvme/nvme.c | 86 ++----- drivers/nvme/nvme.h | 70 +++++ drivers/nvme/nvme_apple.c | 240 ++++++++++++++++++ drivers/nvme/nvme_pci.c | 49 ++++ drivers/power/domain/apple-pmgr.c | 73 +++++- include/configs/apple.h | 7 + include/linux/apple-mailbox.h | 19 ++ 161 files changed, 998 insertions(+), 204 deletions(-) create mode 100644 arch/arm/include/asm/arch-apple/rtkit.h rename arch/arm/include/asm/{arch-m1 => arch-apple}/uart.h (100%) create mode 100644 arch/arm/mach-apple/rtkit.c create mode 100644 drivers/mailbox/apple-mbox.c create mode 100644 drivers/nvme/nvme_apple.c create mode 100644 drivers/nvme/nvme_pci.c create mode 100644 include/linux/apple-mailbox.h -- 2.34.1

5 22

[PATCH] arm:dts:k3-am64-sk: EMIF tool update to 0.8.0 with 1333MTs for lpddr4
by Sinthu Raja 11 Feb '22

11 Feb '22

From: Sinthu Raja <sinthu.raja(a)ti.com> EMIF tool for AM64 SK is now updated to 0.8.0 that includes * disabled Write DQ training * improve CA ODT to 60 ohms The lpddr4 enabled with periodic WDQ training is causing periodic 26us stall. This makes the SoC stall without doing anything which leads to R5 interrupt latency in TCM memory. Due to this periodic training there are some outstanding CPU transactions waiting for the lpddr4 to complete. Hence, disable the periodic write DQ training during the non-initialization stage of lpddr4 which results in an approximate 1us stall. Also, update the lpddr4 config to improve CA ODT by 60 ohms The rationales are as follows: - PI_WDQLVL_EN: 2 Bits register field to support write DQ leveling, disable bit 1 that supports Write DQ during non-initialization to avoid ~26us stall during code execution. - MR11_DATA_F1/F2_x register fields value changed to 0x66 that changes the CA ODT from 48ohm to 60ohm to improve the eye margin on CA bus by increasing the signal swing. Signed-off-by: James Doublesin <doublesin(a)ti.com> Signed-off-by: Sinthu Raja <sinthu.raja(a)ti.com> --- arch/arm/dts/k3-am64-sk-lp4-1333MTs.dtsi | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm/dts/k3-am64-sk-lp4-1333MTs.dtsi b/arch/arm/dts/k3-am64-sk-lp4-1333MTs.dtsi index 64a159f6d0..dde5ab150d 100644 --- a/arch/arm/dts/k3-am64-sk-lp4-1333MTs.dtsi +++ b/arch/arm/dts/k3-am64-sk-lp4-1333MTs.dtsi @@ -2,8 +2,8 @@ /* * Copyright (C) 2021 Texas Instruments Incorporated - http://www.ti.com/ * This file was generated with the - * AM64x SysConfig DDR Subsystem Register Configuration Tool v0.06.00 - * Mon Apr 26 2021 20:47:47 GMT-0500 (Central Daylight Time) + * AM64x SysConfig DDR Subsystem Register Configuration Tool v0.08.00 + * Wed Oct 13 2021 10:08:29 GMT-0500 (Central Daylight Time) * DDR Type: LPDDR4 * F0 = 50MHz F1 = 666.7MHz F2 = 666.7MHz * Density (per channel): 16Gb @@ -268,8 +268,8 @@ #define DDRSS_CTL_251_DATA 0x00000000 #define DDRSS_CTL_252_DATA 0x00000000 #define DDRSS_CTL_253_DATA 0x00000000 -#define DDRSS_CTL_254_DATA 0x66006666 -#define DDRSS_CTL_255_DATA 0x00002766 +#define DDRSS_CTL_254_DATA 0x46004646 +#define DDRSS_CTL_255_DATA 0x00002746 #define DDRSS_CTL_256_DATA 0x00000027 #define DDRSS_CTL_257_DATA 0x00000027 #define DDRSS_CTL_258_DATA 0x00000027 @@ -660,13 +660,13 @@ #define DDRSS_PI_220_DATA 0x000000A7 #define DDRSS_PI_221_DATA 0x00001900 #define DDRSS_PI_222_DATA 0x32000056 -#define DDRSS_PI_223_DATA 0x06000301 +#define DDRSS_PI_223_DATA 0x06000101 #define DDRSS_PI_224_DATA 0x001D0204 #define DDRSS_PI_225_DATA 0x32120059 -#define DDRSS_PI_226_DATA 0x05000301 +#define DDRSS_PI_226_DATA 0x05000101 #define DDRSS_PI_227_DATA 0x001D0409 #define DDRSS_PI_228_DATA 0x32120059 -#define DDRSS_PI_229_DATA 0x05000301 +#define DDRSS_PI_229_DATA 0x05000101 #define DDRSS_PI_230_DATA 0x00000409 #define DDRSS_PI_231_DATA 0x05030900 #define DDRSS_PI_232_DATA 0x00040900 @@ -748,7 +748,7 @@ #define DDRSS_PI_308_DATA 0x00000031 #define DDRSS_PI_309_DATA 0x00000000 #define DDRSS_PI_310_DATA 0x00000000 -#define DDRSS_PI_311_DATA 0x66000000 +#define DDRSS_PI_311_DATA 0x46000000 #define DDRSS_PI_312_DATA 0x00150F27 #define DDRSS_PI_313_DATA 0x00000000 #define DDRSS_PI_314_DATA 0x00000024 @@ -756,7 +756,7 @@ #define DDRSS_PI_316_DATA 0x00000031 #define DDRSS_PI_317_DATA 0x00000000 #define DDRSS_PI_318_DATA 0x00000000 -#define DDRSS_PI_319_DATA 0x66000000 +#define DDRSS_PI_319_DATA 0x46000000 #define DDRSS_PI_320_DATA 0x00150F27 #define DDRSS_PI_321_DATA 0x00000000 #define DDRSS_PI_322_DATA 0x00000004 @@ -772,7 +772,7 @@ #define DDRSS_PI_332_DATA 0x00000031 #define DDRSS_PI_333_DATA 0x00000000 #define DDRSS_PI_334_DATA 0x00000000 -#define DDRSS_PI_335_DATA 0x66000000 +#define DDRSS_PI_335_DATA 0x46000000 #define DDRSS_PI_336_DATA 0x00150F27 #define DDRSS_PI_337_DATA 0x00000000 #define DDRSS_PI_338_DATA 0x00000024 @@ -780,7 +780,7 @@ #define DDRSS_PI_340_DATA 0x00000031 #define DDRSS_PI_341_DATA 0x00000000 #define DDRSS_PI_342_DATA 0x00000000 -#define DDRSS_PI_343_DATA 0x66000000 +#define DDRSS_PI_343_DATA 0x46000000 #define DDRSS_PI_344_DATA 0x00150F27 #define DDRSS_PHY_0_DATA 0x04F00000 #define DDRSS_PHY_1_DATA 0x00000000 @@ -873,7 +873,7 @@ #define DDRSS_PHY_88_DATA 0x51516041 #define DDRSS_PHY_89_DATA 0x31C06000 #define DDRSS_PHY_90_DATA 0x07AB0340 -#define DDRSS_PHY_91_DATA 0x0100C0C0 +#define DDRSS_PHY_91_DATA 0x0000C0C0 #define DDRSS_PHY_92_DATA 0x03040000 #define DDRSS_PHY_93_DATA 0x00000403 #define DDRSS_PHY_94_DATA 0x42100010 @@ -1129,7 +1129,7 @@ #define DDRSS_PHY_344_DATA 0x51516041 #define DDRSS_PHY_345_DATA 0x31C06000 #define DDRSS_PHY_346_DATA 0x07AB0340 -#define DDRSS_PHY_347_DATA 0x0100C0C0 +#define DDRSS_PHY_347_DATA 0x0000C0C0 #define DDRSS_PHY_348_DATA 0x03040000 #define DDRSS_PHY_349_DATA 0x00000403 #define DDRSS_PHY_350_DATA 0x42100010 @@ -2157,7 +2157,7 @@ #define DDRSS_PHY_1372_DATA 0x00000002 #define DDRSS_PHY_1373_DATA 0x00000000 #define DDRSS_PHY_1374_DATA 0x00001142 -#define DDRSS_PHY_1375_DATA 0x030207AB +#define DDRSS_PHY_1375_DATA 0x03020000 #define DDRSS_PHY_1376_DATA 0x00000080 #define DDRSS_PHY_1377_DATA 0x03900390 #define DDRSS_PHY_1378_DATA 0x03900390 -- 2.31.1

3 4

[PULL] u-boot-riscv/master
by Leo Liang 11 Feb '22

11 Feb '22

Hi Tom, The following changes since commit 531c00894577a0a852431adf61ade76925f8b162: Merge branch '2022-02-08-TI-platform-updates' (2022-02-08 12:28:04 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-riscv.git for you to fetch changes up to 7c08680aa32db12e5a7e2765cfc8b7e8ce8895ff: doc: qemu-riscv: Update documentation for QEMU spike machine (2022-02-10 11:19:15 +0800) CI result shows no issue: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/10941 ---------------------------------------------------------------- Anup Patel (4): serial: Add RISC-V HTIF console driver riscv: qemu: Enable HTIF console support riscv: qemu: Implement is_flash_available() for MTD NOR doc: qemu-riscv: Update documentation for QEMU spike machine board/emulation/qemu-riscv/Kconfig | 1 + board/emulation/qemu-riscv/qemu-riscv.c | 12 +++ doc/board/emulation/qemu-riscv.rst | 48 ++++++--- drivers/serial/Kconfig | 8 ++ drivers/serial/Makefile | 1 + drivers/serial/serial_htif.c | 178 ++++++++++++++++++++++++++++++++ 6 files changed, 232 insertions(+), 16 deletions(-) create mode 100644 drivers/serial/serial_htif.c Best regards, Leo

2 1

Please pull u-boot-dm (take 3)
by Simon Glass 11 Feb '22

11 Feb '22

Hi Tom, This just drops off the final patch of 'take 2' since that is being reworked. running here: https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/10936 The following changes since commit 859703251251d9567f29ab10c0a29f98eb0aff5c: Merge branch '2022-02-08-Kconfig-updates' (2022-02-09 09:29:07 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-8feb22-take3 for you to fetch changes up to f3078d4ea707931c2307a623ecf6e4d215b413d5: binman: Convert FIT entry type to a subclass of Section entry type (2022-02-09 12:30:13 -0700) ---------------------------------------------------------------- patman snake-case conversion binman fit improvements ACPI fixes and making MCFG available to ARM ---------------------------------------------------------------- Alper Nebi Yasak (4): binman: Fix subentry expansion for FIT entry type binman: Register and check bintools from FIT subentries binman: Check missing bintools of Section subclasses binman: Convert FIT entry type to a subclass of Section entry type Heiko Schocher (2): serial: remove nulldev_serial_input serial-uclass: fix build warning Heinrich Schuchardt (1): sandbox: fix build failure with musl and SDL Moritz Fischer (2): arch: x86: lib: acpi_table: Fix MCFG entries acpi: Move MCFG implementation to common lib Rasmus Villemoes (1): dts: automatically build necessary .dtb files Simon Glass (16): patman: Convert camel case in tools.py patman: Convert camel case in command.py patman: Convert camel case in checkpatch.py patman: Convert camel case in commit.py patman: Convert camel case in cros_subprocess.py patman: Convert camel case in func_test.py patman: Convert camel case in get_maintainer.py patman: Convert camel case in gitutil.py patman: Convert camel case in project.py patman: Convert camel case in test_checkpatch.py patman: Convert camel case in test_util.py patman: Convert camel case in tout.py patman: Rename Print() to Tprint() patman: Rename Color() method to build() patman: Convert camel case in terminal.py patman: Update with new pylint scores Sughosh Ganu (1): dm: Use parenthesis for the device_get_ops macro argument arch/arc/dts/Makefile | 2 + arch/arm/dts/Makefile | 2 + arch/m68k/dts/Makefile | 2 + arch/microblaze/dts/Makefile | 2 + arch/mips/dts/Makefile | 2 + arch/nds32/dts/Makefile | 2 + arch/nios2/dts/Makefile | 2 + arch/powerpc/dts/Makefile | 2 + arch/riscv/dts/Makefile | 2 + arch/sandbox/Makefile | 7 + arch/sandbox/cpu/Makefile | 11 +- arch/sandbox/dts/Makefile | 2 + arch/sh/dts/Makefile | 2 + arch/x86/cpu/intel_common/acpi.c | 15 +- arch/x86/cpu/tangier/acpi.c | 11 +- arch/x86/dts/Makefile | 2 + arch/x86/include/asm/acpi_table.h | 1 - arch/x86/lib/acpi_table.c | 52 ------- arch/xtensa/dts/Makefile | 2 + drivers/serial/serial-uclass.c | 2 +- drivers/serial/serial_nulldev.c | 5 - dts/Kconfig | 8 +- include/dm/device.h | 2 +- lib/acpi/Makefile | 1 + lib/acpi/mcfg.c | 64 ++++++++ scripts/Makefile.dts | 3 + scripts/pylint.base | 34 ++--- tools/binman/bintool.py | 30 ++-- tools/binman/bintool_test.py | 34 ++--- tools/binman/btool/lz4.py | 8 +- tools/binman/btool/lzma_alone.py | 16 +- tools/binman/cbfs_util.py | 12 +- tools/binman/cbfs_util_test.py | 20 +-- tools/binman/control.py | 74 +++++----- tools/binman/elf.py | 20 +-- tools/binman/elf_test.py | 20 +-- tools/binman/entry.py | 42 +++--- tools/binman/entry_test.py | 4 +- tools/binman/etype/atf_fip.py | 2 +- tools/binman/etype/blob.py | 4 +- tools/binman/etype/blob_ext_list.py | 2 +- tools/binman/etype/fdtmap.py | 2 +- tools/binman/etype/files.py | 2 +- tools/binman/etype/fill.py | 2 +- tools/binman/etype/fit.py | 77 +++++----- tools/binman/etype/fmap.py | 6 +- tools/binman/etype/gbb.py | 10 +- tools/binman/etype/intel_ifwi.py | 12 +- tools/binman/etype/mkimage.py | 8 +- tools/binman/etype/section.py | 27 ++-- tools/binman/etype/text.py | 4 +- tools/binman/etype/u_boot_elf.py | 6 +- tools/binman/etype/u_boot_env.py | 4 +- tools/binman/etype/u_boot_spl_bss_pad.py | 4 +- tools/binman/etype/u_boot_spl_expanded.py | 2 +- tools/binman/etype/u_boot_tpl_bss_pad.py | 4 +- tools/binman/etype/u_boot_tpl_expanded.py | 2 +- tools/binman/etype/u_boot_ucode.py | 4 +- tools/binman/etype/u_boot_with_ucode_ptr.py | 2 +- tools/binman/etype/vblock.py | 10 +- tools/binman/fdt_test.py | 4 +- tools/binman/fip_util.py | 16 +- tools/binman/fip_util_test.py | 36 ++--- tools/binman/fmap_util.py | 2 +- tools/binman/ftest.py | 383 +++++++++++++++++++++++++++--------------------- tools/binman/image.py | 16 +- tools/binman/main.py | 6 +- tools/binman/state.py | 34 ++--- tools/binman/test/220_fit_subentry_bintool.dts | 39 +++++ tools/buildman/builder.py | 108 +++++++------- tools/buildman/builderthread.py | 12 +- tools/buildman/control.py | 46 +++--- tools/buildman/func_test.py | 20 +-- tools/buildman/main.py | 4 +- tools/buildman/test.py | 30 ++-- tools/buildman/toolchain.py | 26 ++-- tools/dtoc/fdt.py | 4 +- tools/dtoc/fdt_util.py | 12 +- tools/dtoc/main.py | 6 +- tools/dtoc/test_dtoc.py | 76 +++++----- tools/dtoc/test_fdt.py | 34 ++--- tools/dtoc/test_src_scan.py | 12 +- tools/patman/checkpatch.py | 36 ++--- tools/patman/command.py | 30 ++-- tools/patman/commit.py | 10 +- tools/patman/control.py | 20 +-- tools/patman/cros_subprocess.py | 59 ++++---- tools/patman/func_test.py | 74 +++++----- tools/patman/get_maintainer.py | 8 +- tools/patman/gitutil.py | 176 +++++++++++----------- tools/patman/main.py | 10 +- tools/patman/patchstream.py | 12 +- tools/patman/project.py | 4 +- tools/patman/series.py | 32 ++-- tools/patman/settings.py | 4 +- tools/patman/status.py | 22 +-- tools/patman/terminal.py | 56 +++---- tools/patman/test_checkpatch.py | 80 +++++----- tools/patman/test_util.py | 10 +- tools/patman/tools.py | 86 +++++------ tools/patman/tout.py | 58 ++++---- tools/rmboard.py | 16 +- 102 files changed, 1290 insertions(+), 1157 deletions(-) create mode 100644 lib/acpi/mcfg.c create mode 100644 scripts/Makefile.dts create mode 100644 tools/binman/test/220_fit_subentry_bintool.dts Regards, Simon

2 6

[PATCH] cmd/mmc: fix output of mmc info for e-MMC
by Markus Niebel 10 Feb '22

10 Feb '22

From: Max Merchel <Max.Merchel(a)tq-group.com> e-MMC and SD standards differ for some CID fields: - 6 Byte Name - assigned by Manufacturer (SD 5 Byte) - 1 Byte OEM - assigned by Jedec (SD 2 Byte) See e-MMC standard (JEDEC Standard No. 84-B51), 7.2.3 (OID) and 7.2.4 (PNM) Signed-off-by: Max Merchel <Max.Merchel(a)tq-group.com> Signed-off-by: Markus Niebel <Markus.Niebel(a)ew.tq-group.com> --- cmd/mmc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/cmd/mmc.c b/cmd/mmc.c index 96d81ffdf36..ca5622c45d0 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -22,10 +22,18 @@ static void print_mmcinfo(struct mmc *mmc) printf("Device: %s\n", mmc->cfg->name); printf("Manufacturer ID: %x\n", mmc->cid[0] >> 24); - printf("OEM: %x\n", (mmc->cid[0] >> 8) & 0xffff); - printf("Name: %c%c%c%c%c \n", mmc->cid[0] & 0xff, - (mmc->cid[1] >> 24), (mmc->cid[1] >> 16) & 0xff, - (mmc->cid[1] >> 8) & 0xff, mmc->cid[1] & 0xff); + if (IS_SD(mmc)) { + printf("OEM: %x\n", (mmc->cid[0] >> 8) & 0xffff); + printf("Name: %c%c%c%c%c \n", mmc->cid[0] & 0xff, + (mmc->cid[1] >> 24), (mmc->cid[1] >> 16) & 0xff, + (mmc->cid[1] >> 8) & 0xff, mmc->cid[1] & 0xff); + } else { + printf("OEM: %x\n", (mmc->cid[0] >> 8) & 0xff); + printf("Name: %c%c%c%c%c%c \n", mmc->cid[0] & 0xff, + (mmc->cid[1] >> 24), (mmc->cid[1] >> 16) & 0xff, + (mmc->cid[1] >> 8) & 0xff, mmc->cid[1] & 0xff, + (mmc->cid[2] >> 24)); + } printf("Bus Speed: %d\n", mmc->clock); #if CONFIG_IS_ENABLED(MMC_VERBOSE) -- 2.17.1

2 1

Re: [PATCH] Replace echo -n's used in environment processing with touch
by Simon Glass 10 Feb '22

10 Feb '22

Hi Qthedev, On Wed, 9 Feb 2022 at 08:25, qthedev <qthedev(a)protonmail.com> wrote: > > On Monday, February 7th, 2022 at 11:22 PM, Simon Glass <sjg(a)chromium.org> wrote: > > > Hi, > > > > On Sat, 5 Feb 2022 at 06:49, qthedev qthedev(a)protonmail.com wrote: > > > > > echo -n does not give the intended effect when invoked in macOS through /bin/sh, which is the shell make uses by default, see "https://stackoverflow.com/questions/11675070/makefile-echo-n-not-working" for a detailed explanation. In this case, it resulted in "-n" being written to env.txt and env.in even though they should be empty, which caused compilation to fail with "Your board uses a text-file environment, so must not define CONFIG_EXTRA_ENV_SETTINGS". > > > > > > This patch prevents the error by replacing echo -n's with touch, as they are used to create empty files in these cases. > > > > Please word-wrap your commit message and use a real name :-) > > > > > diff --git a/Makefile b/Makefile > > > > > > index 184223ec63..3101aa0132 100644 > > > > > > --- a/Makefile > > > > > > +++ b/Makefile > > > > > > @@ -1843,7 +1843,7 @@ quiet_cmd_gen_envp = ENVP $@ > > > > > > -I$(srctree)/arch/$(ARCH)/include \ > > > > > > $< -o $@; \ > > > > > > else \ > > > > > > - echo -n >$@ ; \\ > > > > > > > > > > > > - touch $@ ; \\ > > > fi > > > > > > > > > > > > include/generated/env.in: include/generated/env.txt FORCE > > > > > > $(call cmd,gen_envp) > > > > > > @@ -1860,7 +1860,7 @@ quiet_cmd_envc = ENVC $@ > > > > > > elif [ -n "$(ENV_SOURCE_FILE)" ]; then \ > > > > > > echo "Missing file $(ENV_FILE_CFG)"; \ > > > > > > else \ > > > > > > - echo -n >$@ ; \\ > > > > > > > > > > > > - touch $@ ; \\ > > > fi > > > > > > > > > > > > include/generated/env.txt: $(wildcard $(ENV_FILE)) FORCE > > > > Regards, > > > > Simon > > Hi, > > I am not able to use my real name for privacy reasons, I hope it is not a problem. > Here is the patch with a word wrapped version of the commit message: > > echo -n does not give the intended effect when invoked in macOS > through /bin/sh, which is the shell make uses by default, see > "https://stackoverflow.com/questions/11675070/makefile-echo-n-not-working" > for a detailed explanation. In this case, it resulted in "-n" being > written to env.txt and env.in even though they should be empty, which > caused compilation to fail with "Your board uses a text-file environment, > so must not define CONFIG_EXTRA_ENV_SETTINGS". > > This patch prevents the error by replacing echo -n's with touch, > as they are used to create empty files in these cases. > > diff --git a/Makefile b/Makefile > index 184223ec63..3101aa0132 100644 > --- a/Makefile > +++ b/Makefile > @@ -1843,7 +1843,7 @@ quiet_cmd_gen_envp = ENVP $@ > -I$(srctree)/arch/$(ARCH)/include \ > $< -o $@; \ > else \ > - echo -n >$@ ; \ > + touch $@ ; \ > fi > include/generated/env.in: include/generated/env.txt FORCE > $(call cmd,gen_envp) > @@ -1860,7 +1860,7 @@ quiet_cmd_envc = ENVC $@ > elif [ -n "$(ENV_SOURCE_FILE)" ]; then \ > echo "Missing file $(ENV_FILE_CFG)"; \ > else \ > - echo -n >$@ ; \ > + touch $@ ; \ > fi > > include/generated/env.txt: $(wildcard $(ENV_FILE)) FORCE I don't think we can accept anonymous patches since the sign-off is not meaningful in that situation. Perhaps you could get someone else to submit it for you and sign off? Information about submitting patches is here: https://www.denx.de/wiki/U-Boot/Patches +U-Boot Mailing List +Tom Rini for thoughts on this Regards, Simon

2 1

[PATCH V4] usb: ehci-mx6: Enable OTG detection on imx8mm and imx8mn
by Adam Ford 10 Feb '22

10 Feb '22

The imx8mm and imx8mn appear compatible with imx7d-usb flags in the OTG driver. If the dr_mode is defined as host or peripheral, the device appears to operate correctly, however the auto host/peripheral detection results in an error. The solution isn't just adding checks for imx8mm and imx8mn to the check for imx7, because the USB clock needs to be running to read from the USBNC_PHY_STATUS_OFFSET register or it will hang. Marek requested that I not enable the clocks in ehci_usb_of_to_plat, so I modified that function to return an unknown state if the device tree does not explicitly state whether it is a host or a peripheral. When the driver probes, it looks to see if it's in the unknown state, and only then will it read the register to auto-detect. Signed-off-by: Adam Ford <aford173(a)gmail.com> Tested-by: Tim Harvey <tharvey(a)gateworks.com> --- V4: Fix 'err_clk' reference, so it is not encapsulated in an ifdef making it available at all times. V3: Keep ehci_usb_of_to_plat but add the ability to return and unknown state instead of reading the register. If the probe determines the states is unknown, it will query the register after the clocks have been enabled. Because of the slight behavior change, I removed any review or tested tags. V2: Rename ehci_usb_of_to_plat to ehci_usb_dr_mode and call it from the probe after t diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 1bd6147c76..060b02accc 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -543,7 +543,7 @@ static int ehci_usb_phy_mode(struct udevice *dev) plat->init_type = USB_INIT_DEVICE; else plat->init_type = USB_INIT_HOST; - } else if (is_mx7()) { + } else if (is_mx7() || is_imx8mm() || is_imx8mn()) { phy_status = (void __iomem *)(addr + USBNC_PHY_STATUS_OFFSET); val = readl(phy_status); @@ -573,9 +573,8 @@ static int ehci_usb_of_to_plat(struct udevice *dev) case USB_DR_MODE_PERIPHERAL: plat->init_type = USB_INIT_DEVICE; break; - case USB_DR_MODE_OTG: - case USB_DR_MODE_UNKNOWN: - return ehci_usb_phy_mode(dev); + default: + plat->init_type = USB_INIT_UNKNOWN; }; return 0; @@ -677,6 +676,20 @@ static int ehci_usb_probe(struct udevice *dev) mdelay(1); #endif + /* + * If the device tree didn't specify host or device, + * the default is USB_INIT_UNKNOWN, so we need to check + * the register. For imx8mm and imx8mn, the clocks need to be + * running first, so we defer the check until they are. + */ + if (priv->init_type == USB_INIT_UNKNOWN) { + ret = ehci_usb_phy_mode(dev); + if (ret) + goto err_clk; + else + priv->init_type = plat->init_type; + } + #if CONFIG_IS_ENABLED(DM_REGULATOR) ret = device_get_supply_regulator(dev, "vbus-supply", &priv->vbus_supply); @@ -741,8 +754,8 @@ err_regulator: #if CONFIG_IS_ENABLED(DM_REGULATOR) if (priv->vbus_supply) regulator_set_enable(priv->vbus_supply, false); -err_clk: #endif +err_clk: #if CONFIG_IS_ENABLED(CLK) clk_disable(&priv->clk); #else diff --git a/include/usb.h b/include/usb.h index f032de8af9..7e3796bd5b 100644 --- a/include/usb.h +++ b/include/usb.h @@ -163,7 +163,8 @@ struct int_queue; */ enum usb_init_type { USB_INIT_HOST, - USB_INIT_DEVICE + USB_INIT_DEVICE, + USB_INIT_UNKNOWN, }; /********************************************************************** -- 2.32.0

4 11