August 2021 - U-Boot

[PATCH u-boot-marvell 00/29] kwboot higher baudrate
by Marek Behún 28 Aug '21

28 Aug '21

Hello Stefan and others, this series adds support for booting Marvell platforms via UART (those bootable with kwboot) at higher baudrates. Tested on Turris Omnia up to 5.15 MBd, which is 44x faster than 115200 Bd. The user can direct kwboot to use higher baudrate via the -B option. (BTW this option was there before but did not work with the -b option.) Only the payload part of the KWB image is uploaded at this higher baudrate. The header part is still uploaded at 115200 Bd, since the code that changes baudrate is injected into header as a binary extension. (The payload part makes up majority of the binary, though. On Turris Omnia the payload currently makes ~87%.) The series also contains various other fixes, refactors and improvements of the code, upon which the main change is done. Marek & Pali Marek Behún (13): tools: kwbimage: Fix printf format warning tools: kwboot: Fix buffer overflow in kwboot_terminal() tools: kwboot: Make the quit sequence buffer const tools: kwboot: Refactor and fix writing buffer tools: kwboot: Fix comparison of integers with different size tools: kwboot: Use a function to check whether received byte is a Xmodem reply tools: kwboot: Print new line after SPL output tools: kwboot: Allow greater timeout when executing header code tools: kwbimage: Simplify iteration over version 1 optional headers tools: kwbimage: Refactor image_version() tools: kwbimage: Refactor kwbimage header size determination doc/kwboot.1: Update man page MAINTAINERS: Add entry for kwbimage / kwboot tools Pali Rohár (16): tools: kwboot: Print version information header tools: kwboot: Fix kwboot_xm_sendblock() function when kwboot_tty_recv() fails tools: kwboot: Fix return type of kwboot_xm_makeblock() function tools: kwboot: Fix printing progress tools: kwboot: Print newline on error when progress was not completed tools: kwboot: Split sending image into header and data stages tools: kwboot: Allow non-xmodem text output from BootROM only in a specific case tools: kwboot: Properly finish xmodem transfer tools: kwboot: Always call kwboot_img_patch_hdr() tools: kwboot: Don't patch image header if signed tools: kwboot: Patch source address in image header tools: kwboot: Patch destination address to DDR area for SPI image tools: kwboot: Round up header size to 128 B when patching tools: kwboot: Support higher baudrates when booting via UART tools: kwboot: Allow any baudrate on Linux tools: kwboot: Add Pali and Marek as authors MAINTAINERS | 10 + doc/kwboot.1 | 58 ++- tools/kwbimage.c | 127 ++--- tools/kwbimage.h | 93 +++- tools/kwboot.c | 1103 +++++++++++++++++++++++++++++++++++------ tools/termios_linux.h | 170 +++++++ 6 files changed, 1289 insertions(+), 272 deletions(-) create mode 100644 tools/termios_linux.h -- 2.31.1

4 44

[GIT PULL] xilinx patches for v2021.10-rc3
by Michal Simek 27 Aug '21

27 Aug '21

Hi Tom, please pull these patches to your tree. Gitlab CI is not showing any issue and I have also tested qspi/sd flows on zynq and zynqmp boards. There are a lot of fixes and alignments with also some features like rtc/soc drivers and correcting capsule update. Code for multi_fit is also added but not enabled by default. SPI driver needs to be fixed. Patches have been sent today. I will take care about them soon. Thanks, Michal The following changes since commit ab97eb341cb4fdbd69e33bd4a53714db95b5b63e: Merge branch '2021-08-04-assorted-minor-fixes' (2021-08-04 21:18:33 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2021.10-rc3 for you to fetch changes up to 229cb5c6ba3469cbc4a0bcc69389fe61c51fd3b4: xilinx: zynqmp: Enable stack relocation to DDR (2021-08-26 08:14:43 +0200) ---------------------------------------------------------------- Xilinx changes for v2021.10-rc3 xilinx: - Disable CONFIG_ARCH_FIXUP_FDT_MEMORY - Print information about cpu via soc drivers and enable DISPLAY_CPUINFO - Wire infrastructure for DTB_RESELECT and MULTI_DTB_FIT zynq: - Wire single QSPI - Use power-source instead of io-standard properties - Enable nor on zc770-xm012 zynqmp: - Change handling around multi_boot() - Setup offset for u-boot.itb in spi - Generate run time dfu_alt_info for capsule update - Use explicit values for enums (zynqmp_firmware.h) - Enable RTC/SHA1/BUTTON/BUTTON_GPIO command - Disable WDT driver by default - Bind usb/scsi via preboot because of EFI - DT updates/fixes - Add soc driver - Fix SPL SPI boot mode versal: - Add soc driver sdhci: - Update tap delay programming for zynq_sdhci driver cmd: - Fix RTC uclass handling in date command - Update pwm help message - Update reset help message watchdog: - Fix wwdt compilation rtc: - Deal with seq alias in rtc uclass - Add zynqmp RTC driver fdt: - Add kernel-doc for fdt_fixup_memory_banks() ---------------------------------------------------------------- Ashok Reddy Soma (6): mmc: zynq_sdhci: Return errors from arasan_sdhci_set_tapdelay mmc: sdhci: Change prototype of set_delay to return errors mmc: zynq_sdhci: Add xilinx_pm_request() method to set tapdelays mmc: zynq_sdhci: Move setting tapdelay code to driver mmc: zynq_sdhci: Use set_control_reg from sdhci.c watchdog: versal: Include header file needed for dev_ functions Michal Simek (37): xilinx: zynqmp: Free allocated field for target variable xilinx: zynqmp: Change multi_boot() to return value xilinx: zynqmp: use zynqmp_mmio_read() in multi_boot() xilinx: zynqmp: Config non zero SYS_SPI_U_BOOT_OFFS xilinx: zynqmp: Add support for runtime dfu_alt_info setup firmware: xilinx: Use explicit values for all enum values dm: rtc: uclass: Add flag to control sequence numbering cmd: date: rtc: Update command to read the first RTC with seq 0 rtc: zynqmp: Add support for ZynqMP RTC xilinx: zynqmp: Enable CMD_RTC command with Zynqmp RTC driver reset: zynqmp: Add reset controller for ZynqMP SoC arm64: zynqmp: Disable WDT_CDNS driver by default xilinx: zynqmp: Initialize usb and scsi via preboot arm64: zynqmp: Fix node name for ds35/36 leds arm64: zynqmp: Fix header alignment on kv260 boards arm64: zynqmp: Update comment style sm-k26 ARM: zynq: Wire single qspi on couple of boards ARM: zynq: Enable smcc and nor for zc770-xm012 xilinx: Disable ARCH_FIXUP_FDT_MEMORY fdt_support: Add kernel-doc for fdt_fixup_memory_banks() cmd: pwm: Remove additional pwm description cmd: boot: Update reset usage message xilinx: zynqmp: Add debug messages for boot mode arm64: zynqmp: Enable sha1sum command xilinx: zynqmp: Enable gpio-key/button driver xilinx: fru: Replace spaces with \0 in detected name xilinx: Use variable for passing board_name xilinx: common: Change board_info[] handling xilinx: common: Free allocated structure xilinx: Add support for generic board detection xilinx: zynqmp: Check that DT is 64bit aligned Makefile: Align fit-dtb.blob and u-boot.itb by 64bits arm64: dts: Make sure that all DTBs are 64bit aligned xilinx: zynqmp: Generate different u-boot.itb for MULTI_DTB_FIT xilinx: common: Enabling generic function for DT reselection xilinx: zynqmp: Update descriptions for u-boot.its xilinx: zynqmp: Enable stack relocation to DDR Raju Kumar Pothuraju (1): xilinx: Add jedec compatible string for QSPI (Zynq/ZynqMP) Sai Krishna Potthuri (1): ARM: zynq: Replace 'io-standard' with 'power-source' property T Karthik Reddy (6): zynqmp_firmware: Add zynqmp firmware related enums mmc: zynq_sdhci: Wait till sd card detect state is stable soc: xilinx: zynqmp: Add soc_xilinx_zynqmp driver soc: xilinx: versal: Add soc_xilinx_versal driver xilinx: common: Add function to print SoC info xilinx: Enable config to display cpuinfo MAINTAINERS | 4 +++ Makefile | 3 ++ arch/arm/Kconfig | 2 ++ arch/arm/dts/Makefile | 2 +- arch/arm/dts/zynq-cc108.dts | 2 +- arch/arm/dts/zynq-cse-qspi.dtsi | 2 +- arch/arm/dts/zynq-topic-miami.dts | 2 +- arch/arm/dts/zynq-zc702.dts | 30 ++++++++++------- arch/arm/dts/zynq-zc706.dts | 26 +++++++++------ arch/arm/dts/zynq-zc770-xm010.dts | 8 +++++ arch/arm/dts/zynq-zc770-xm012.dts | 9 ++++++ arch/arm/dts/zynq-zc770-xm013.dts | 8 +++++ arch/arm/dts/zynqmp-sck-kv-g-revA.dts | 8 ++--- arch/arm/dts/zynqmp-sck-kv-g-revB.dts | 8 ++--- arch/arm/dts/zynqmp-sm-k26-revA.dts | 9 ++++-- arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts | 2 +- arch/arm/mach-versal/cpu.c | 5 +++ arch/arm/mach-versal/include/mach/hardware.h | 4 +++ arch/arm/mach-zynqmp/cpu.c | 5 +++ arch/arm/mach-zynqmp/include/mach/hardware.h | 3 ++ arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 51 +++++++++++++++++++++++++++-- board/xilinx/common/board.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------- board/xilinx/zynqmp/Makefile | 2 -- board/xilinx/zynqmp/tap_delays.c | 101 --------------------------------------------------------- board/xilinx/zynqmp/zynqmp.c | 74 ++++++++++++++++++++++++++++++++++++++---- cmd/boot.c | 3 +- cmd/date.c | 9 ++++-- cmd/pwm.c | 7 ++-- common/fdt_support.c | 18 +++++++++++ configs/xilinx_versal_virt_defconfig | 3 +- configs/xilinx_zynq_virt_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 16 +++++++-- drivers/mmc/sdhci.c | 10 ++++-- drivers/mmc/zynq_sdhci.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------- drivers/reset/Kconfig | 9 ++++++ drivers/reset/Makefile | 1 + drivers/reset/reset-zynqmp.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/rtc/Kconfig | 7 ++++ drivers/rtc/Makefile | 1 + drivers/rtc/rtc-uclass.c | 1 + drivers/rtc/zynqmp_rtc.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/soc/Kconfig | 16 +++++++++ drivers/soc/Makefile | 2 ++ drivers/soc/soc_xilinx_versal.c | 76 +++++++++++++++++++++++++++++++++++++++++++ drivers/soc/soc_xilinx_zynqmp.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ drivers/watchdog/xilinx_wwdt.c | 1 + include/sdhci.h | 2 +- include/zynqmp_firmware.h | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- include/zynqmp_tap_delay.h | 21 ------------ 49 files changed, 1395 insertions(+), 294 deletions(-) delete mode 100644 board/xilinx/zynqmp/tap_delays.c create mode 100644 drivers/reset/reset-zynqmp.c create mode 100644 drivers/rtc/zynqmp_rtc.c create mode 100644 drivers/soc/soc_xilinx_versal.c create mode 100644 drivers/soc/soc_xilinx_zynqmp.c delete mode 100644 include/zynqmp_tap_delay.h

2 1

Broken CONFIG_SPL_SATA_SUPPORT=y
by Pali Rohár 27 Aug '21

27 Aug '21

Hello! Option CONFIG_SPL_SATA_SUPPORT=y is currently broken in u-boot master branch. If I try to enable it for A38x platform I'm getting following compiler error: LD spl/u-boot-spl arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.o: in function `ahci_probe_scsi_pci': drivers/ata/ahci.c:1205: undefined reference to `dm_pci_map_bar' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1215: undefined reference to `dm_pci_read_config16' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1216: undefined reference to `dm_pci_read_config16' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1220: undefined reference to `dm_pci_map_bar' make[1]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1 make: *** [Makefile:1977: spl/u-boot-spl] Error 2 You can reproduce it by running following commands: $ make turris_omnia_defconfig $ echo CONFIG_SPL_SATA_SUPPORT=y >> .config $ make CROSS_COMPILE=arm-linux-gnueabihf- I workaround it by following patch: diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index d4047c04f5d0..6bad72e4cfa4 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1196,7 +1196,7 @@ int ahci_probe_scsi(struct udevice *ahci_dev, ulong base) return 0; } -#ifdef CONFIG_DM_PCI +#if CONFIG_IS_ENABLED(DM_PCI) int ahci_probe_scsi_pci(struct udevice *ahci_dev) { ulong base; It fixed this particular problem. So it looks like that CONFIG_DM_PCI is defined also when building SPL even when it is not enabled for SPL. Whole PCI is disabled in SPL. But then I got another compile error: LD spl/u-boot-spl arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci-pci.o: in function `ahci_pci_probe': drivers/ata/ahci-pci.c:21: undefined reference to `ahci_probe_scsi_pci' make[1]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1 make: *** [Makefile:1977: spl/u-boot-spl] Error 2 Seems that u-boot is trying to compile and link ahci-pci.o into SPL binary even when it is not enabled nor used. PCI is completed disabled in SPL for this case. I workaround it by putting whole ahci-pci.c file into one big #idef: diff --git a/drivers/ata/ahci-pci.c b/drivers/ata/ahci-pci.c index b1d231e0f9e1..34afebd2f87f 100644 --- a/drivers/ata/ahci-pci.c +++ b/drivers/ata/ahci-pci.c @@ -9,6 +9,8 @@ #include <dm.h> #include <pci.h> +#if CONFIG_IS_ENABLED(DM_PCI) + static int ahci_pci_bind(struct udevice *dev) { struct udevice *scsi_dev; @@ -42,3 +44,5 @@ static struct pci_device_id ahci_pci_supported[] = { }; U_BOOT_PCI_DEVICE(ahci_pci, ahci_pci_supported); + +#endif And then finally U-Boot produced final target image u-boot-spl.kwb: LD spl/u-boot-spl OBJCOPY spl/u-boot-spl-nodtb.bin SYM spl/u-boot-spl.sym CAT spl/u-boot-spl-dtb.bin COPY spl/u-boot-spl.bin MKIMAGE u-boot-spl.kwb So this looks like a bug in Kconfig or Makefile dependences that build system is trying to compile and link also files which should not be linked at all.

3 23

[PATCH v4 00/10] handling all DM watchdogs in watchdog_reset()
by Rasmus Villemoes 27 Aug '21

27 Aug '21

This series is an attempt at expanding the wdt-uclass provided watchdog_reset() to handle all DM watchdogs, not just the first one. Some of the ad hoc work done for the first DM watchdog in initr_watchdog() is now moved to a .pre_probe hook so it is automatically done for all devices. It also includes a patch adding a driver for a gpio-petted watchdog device (and a sandbox test of that) - it is included here because that also gives a relatively easy way to have more than one (kind of) watchdog device in the sandbox, which is then used at the end to test that watchdog_reset() behaves as expected. v2 here: https://lore.kernel.org/u-boot/20210527220017.1266765-1-rasmus.villemoes@pr… v3 here: https://lore.kernel.org/u-boot/20210702124510.124401-1-rasmus.villemoes@pre… Changes in v4: - Do not make init_watchdog_dev() into a .post_probe hook, but call it from within the probing loop in initr_watchdog(). Rasmus Villemoes (10): watchdog: wdt-uclass.c: use wdt_start() in wdt_expire_now() watchdog: wdt-uclass.c: introduce struct wdt_priv watchdog: wdt-uclass.c: neaten UCLASS_DRIVER definition watchdog: wdt-uclass.c: refactor initr_watchdog() watchdog: wdt-uclass.c: keep track of each device's running state sandbox: disable CONFIG_WATCHDOG_AUTOSTART watchdog: wdt-uclass.c: handle all DM watchdogs in watchdog_reset() watchdog: add gpio watchdog driver sandbox: add test of wdt_gpio driver sandbox: add test of wdt-uclass' watchdog_reset() arch/sandbox/dts/test.dts | 8 + configs/sandbox64_defconfig | 2 + configs/sandbox_defconfig | 2 + .../watchdog/gpio-wdt.txt | 19 ++ drivers/watchdog/Kconfig | 9 + drivers/watchdog/Makefile | 1 + drivers/watchdog/gpio_wdt.c | 68 +++++++ drivers/watchdog/wdt-uclass.c | 167 ++++++++++++------ include/asm-generic/global_data.h | 6 - test/dm/wdt.c | 90 +++++++++- 10 files changed, 314 insertions(+), 58 deletions(-) create mode 100644 doc/device-tree-bindings/watchdog/gpio-wdt.txt create mode 100644 drivers/watchdog/gpio_wdt.c -- 2.31.1

5 33

boot hangs on new board with SAMA5D27C-D5M
by Alexander Dahl 27 Aug '21

27 Aug '21

Hello, I'm currently porting a brand new custom board with Microchip's 64 MiB SAMA5D2 SiP SoC. Second stage bootloader is at91bootstrap, for development I load U- Boot directly to RAM with SAM-BA to the same address (0x23f00000) and execute from there. RAM base address is 0x20000000 and size 0x04000000 (64 MiB). Code is based on the U-Boot v2021.07 upstream code of the SAMA5D2-SOM1-EK1 board (which has 128 MiB). I get to a U-Boot shell and can access SD card and LEDs if I do not activate NAND flash support in menuconfig. The log with debug messages is attached. >From IRC marex and I suspect some overwritten memory if the u-boot-dtb.bin file gets too big, but I can not spot any error in those addresses in debug output. The last function called is initr_malloc() from common/board_r.c but I can not spot what's wrong with that, especially because mem_malloc_init() prints a probably valid memory area and malloc_bin_reloc() should be a noop. If I disable CONFIG_SYS_MALLOC_CLEAR_ON_INIT, I get to a shell, if I enable it again, boot hangs. So the memset() of the malloc area, which is supposed to be valid to my knowledge, causes the hang. I can try one of the other boards (there are 4 prototype boards) to rule out an hardware issue, but I'm curious if anyone has an idea what's wrong here? Greets Alex

1 1

Re: [PATCH 0/2] Fix qspi read and write issues
by Michal Simek 27 Aug '21

27 Aug '21

On 8/27/21 10:36 AM, Ashok Reddy Soma wrote: > This patch series fixes below issues > - Switch genfifo start to manual start mode > - Unaligned DMA reads > - Minor improvements in initialization > > > > Ashok Reddy Soma (2): > spi: zynqmp_gqspi: Switch genfifo start to manual mode > spi: zynqmp_gqspi: Fix dma alignment issue > > drivers/spi/zynqmp_gqspi.c | 30 ++++++++++++++---------------- > 1 file changed, 14 insertions(+), 16 deletions(-) > Tested-by: Michal Simek <michal.simek(a)xilinx.com> Thanks, Michal

1 0

[PATCH] ARM: zynq: Enable capsule update for qspi and mmc
by Michal Simek 27 Aug '21

27 Aug '21

Generate dfu_alt_info setup at runtime for capsule update. Enabling this feature will help with upgrading boards without remembering what is where. The similar change was done for ZynqMP by commit b86f43de0be0 ("xilinx: zynqmp: Add support for runtime dfu_alt_info setup"). Code needs to be enabled by CONFIG_SET_DFU_ALT_INFO. And also enable capsule on disk for RAW firmware images with efidebug command. Two indexes are supported for SPL flow. Images can be generated like: ./tools/mkeficapsule --raw spl/boot.bin --index 1 capsule1.bin ./tools/mkeficapsule --raw u-boot.img --index 2 capsule2.bin Then place them to SD card and load them: load mmc 0 10000000 capsule1.bin && efidebug capsule update -v 10000000 load mmc 0 10000000 capsule2.bin && efidebug capsule update -v 10000000 FSBL flow will also work where only index 1 capsule is used. There should be enough space for using boot.bin with bitstream too. Zynq also support multiple boot locations in SPI or MMC but it is not wired by this patch. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynq/board.c | 35 ++++++++++++++++++++++++++++++ configs/xilinx_zynq_virt_defconfig | 6 +++++ 2 files changed, 41 insertions(+) diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 61e0a90c119b..1111ad6fca9c 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -13,6 +13,7 @@ #include <fdtdec.h> #include <fpga.h> #include <malloc.h> +#include <memalign.h> #include <mmc.h> #include <watchdog.h> #include <wdt.h> @@ -151,3 +152,37 @@ enum env_location env_get_location(enum env_operation op, int prio) return ENVL_NOWHERE; } } + +#if defined(CONFIG_SET_DFU_ALT_INFO) + +#define DFU_ALT_BUF_LEN SZ_1K + +void set_dfu_alt_info(char *interface, char *devstr) +{ + ALLOC_CACHE_ALIGN_BUFFER(char, buf, DFU_ALT_BUF_LEN); + + if (env_get("dfu_alt_info")) + return; + + memset(buf, 0, sizeof(buf)); + + switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) { + case ZYNQ_BM_SD: + snprintf(buf, DFU_ALT_BUF_LEN, + "mmc 0:1=boot.bin fat 0 1;" + "u-boot.img fat 0 1"); + break; + case ZYNQ_BM_QSPI: + snprintf(buf, DFU_ALT_BUF_LEN, + "sf 0:0=boot.bin raw 0 0x1500000;" + "u-boot.img raw 0x%x 0x500000", + CONFIG_SYS_SPI_U_BOOT_OFFS); + break; + default: + return; + } + + env_set("dfu_alt_info", buf); + puts("DFU alt info setting: done\n"); +} +#endif diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index 573a10fe221b..09ee066fdce2 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -49,6 +49,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y CONFIG_CMD_CACHE=y +CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y CONFIG_CMD_EXT4_WRITE=y @@ -69,6 +70,8 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y +CONFIG_DFU_SF=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_SYS_DFU_DATA_BUF_SIZE=0x600000 CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQPL=y @@ -123,3 +126,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y CONFIG_DISPLAY=y CONFIG_SPL_GZIP=y +CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y +CONFIG_EFI_CAPSULE_ON_DISK=y +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y -- 2.33.0

1 0

[PATCH] zynqmp: restore the jtag interface
by Jorge Ramirez-Ortiz 27 Aug '21

27 Aug '21

As a security feature, if boot.bin was configured for secure boot the CSU will disable the JTAG interface on all cases. Some boards might rely on this interface for flashing to QSPI in which case those systems might end up bricked during development. This commit attempts to restore the interface - if the CSU allows for it. Signed-off-by: Jorge Ramirez-Ortiz <jorge(a)foundries.io> --- arch/arm/mach-zynqmp/Kconfig | 9 ++++++++ arch/arm/mach-zynqmp/include/mach/hardware.h | 23 +++++++++++++------ board/xilinx/zynqmp/zynqmp.c | 24 ++++++++++++++++++++ 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-zynqmp/Kconfig b/arch/arm/mach-zynqmp/Kconfig index 39144d654e..1e551c0020 100644 --- a/arch/arm/mach-zynqmp/Kconfig +++ b/arch/arm/mach-zynqmp/Kconfig @@ -149,6 +149,15 @@ config SPL_ZYNQMP_ALT_BOOTMODE_ENABLED Overwrite bootmode selected via boot mode pins to tell SPL what should be the next boot device. +config SPL_ZYNQMP_RESTORE_JTAG + bool "Restore JTAG" + depends on SPL + default n + help + Booting SPL in secure mode causes the CSU to disable the JTAG interface + even if no eFuses were burnt. This option restores the interface if + possible. + config ZYNQ_SDHCI_MAX_FREQ default 200000000 diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h index 3776499070..58822e3f25 100644 --- a/arch/arm/mach-zynqmp/include/mach/hardware.h +++ b/arch/arm/mach-zynqmp/include/mach/hardware.h @@ -42,17 +42,20 @@ struct crlapb_regs { u32 reserved0[36]; u32 cpu_r5_ctrl; /* 0x90 */ - u32 reserved1[37]; + u32 reserved1[7]; + u32 dbg_lpd_ctrl; /* 0xB0 */ + u32 reserved2[29]; u32 timestamp_ref_ctrl; /* 0x128 */ - u32 reserved2[53]; + u32 reserved3[53]; u32 boot_mode; /* 0x200 */ - u32 reserved3_0[7]; + u32 reserved4_0[7]; u32 reset_reason; /* 0x220 */ - u32 reserved3_1[6]; + u32 reserved4_1[6]; u32 rst_lpd_top; /* 0x23C */ - u32 reserved4[4]; + u32 rst_lpd_dbg; /* 0x240 */ + u32 reserved5[3]; u32 boot_pin_ctrl; /* 0x250 */ - u32 reserved5[21]; + u32 reserved6[21]; }; #define crlapb_base ((struct crlapb_regs *)ZYNQMP_CRL_APB_BASEADDR) @@ -141,9 +144,15 @@ struct apu_regs { struct csu_regs { u32 reserved0[4]; u32 multi_boot; - u32 reserved1[11]; + u32 reserved1[7]; + u32 jtag_chain_status_wr; + u32 jtag_chain_status; + u32 jtag_sec; + u32 jtag_dap_cfg; u32 idcode; u32 version; + u32 reserved2[3055]; + u32 pcap_prog; }; #define csu_base ((struct csu_regs *)ZYNQMP_CSU_BASEADDR) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 1748fec2e4..feffda54e7 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -355,6 +355,25 @@ static int multi_boot(void) return 0; } +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ZYNQMP_RESTORE_JTAG) +static void restore_jtag(void) +{ + const u32 disable_security_gate = 0xff; + const u32 setup_clock = 0x01002002; + const u32 setup_jtag = 0x3; + const u32 release_pl = 0x1; + const u32 enable_debug = 0xff; + const u32 do_reset = 0x0; + + writel(disable_security_gate, &csu_base->jtag_sec); + writel(enable_debug, &csu_base->jtag_dap_cfg); + writel(setup_jtag, &csu_base->jtag_chain_status_wr); + writel(setup_clock, &crlapb_base->dbg_lpd_ctrl); + writel(do_reset, &crlapb_base->rst_lpd_dbg); + writel(release_pl, &csu_base->pcap_prog); +} +#endif + #define PS_SYSMON_ANALOG_BUS_VAL 0x3210 #define PS_SYSMON_ANALOG_BUS_REG 0xFFA50914 @@ -374,6 +393,11 @@ int board_init(void) zynqmp_pmufw_load_config_object(zynqmp_pm_cfg_obj, zynqmp_pm_cfg_obj_size); printf("Silicon version:\t%d\n", zynqmp_get_silicon_version()); + +#if defined(CONFIG_SPL_ZYNQMP_RESTORE_JTAG) + /* the CSU disables the JTAG interface when secure boot is enabled */ + restore_jtag(); +#endif #else if (CONFIG_IS_ENABLED(DM_I2C) && CONFIG_IS_ENABLED(I2C_EEPROM)) xilinx_read_eeprom(); -- 2.31.1

3 4

[PATCH v2 0/6] efi_loader: fix secure boot mode transitions
by Heinrich Schuchardt 27 Aug '21

27 Aug '21

The UEFI specification 2.9 defines the different modes that secure boot may be in. The patch series adds support for the "Deployed Mode" and the "Setup Mode". Furthermore the secure boot signature database must only be loaded from tamper-resistant storage. So we must not load it from ubootefi.var on the EFI system partition but only from the preseed variables store or via the OP-TEE driver for the eMMC replay protected memory partition. v2: correct variable name in lib/efi_loader/efi_variable_tee.c Heinrich Schuchardt (6): efi_loader: stop recursion in efi_init_secure_state efi_loader: correct determination of secure boot state efi_loader: don't load signature database from file efi_loader: correct secure boot state transition efi_loader: writing AuditMode, DeployedMode efi_loader: always initialize the secure boot state include/efi_variable.h | 6 ++- lib/efi_loader/efi_var_common.c | 66 +++++++++++++++++++++++-------- lib/efi_loader/efi_var_file.c | 41 +++++++++++-------- lib/efi_loader/efi_variable.c | 20 ++++++---- lib/efi_loader/efi_variable_tee.c | 4 +- 5 files changed, 95 insertions(+), 42 deletions(-) -- 2.30.2

4 20

[PATCH] arm64: zynqmp: Print the secure boot status information in EL3
by Jorge Ramirez-Ortiz 27 Aug '21

27 Aug '21

Confirm the secure boot configuration on the console. Signed-off-by: Jorge Ramirez-Ortiz <jorge(a)foundries.io> --- arch/arm/mach-zynqmp/include/mach/hardware.h | 3 ++- board/xilinx/zynqmp/zynqmp.c | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h index 3776499070..3d3ffa086e 100644 --- a/arch/arm/mach-zynqmp/include/mach/hardware.h +++ b/arch/arm/mach-zynqmp/include/mach/hardware.h @@ -139,7 +139,8 @@ struct apu_regs { #define ZYNQMP_SILICON_VER_SHIFT 0 struct csu_regs { - u32 reserved0[4]; + u32 status; + u32 reserved0[3]; u32 multi_boot; u32 reserved1[11]; u32 idcode; diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 1748fec2e4..b7d11630d1 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -355,6 +355,18 @@ static int multi_boot(void) return 0; } +static void secure_boot(void) +{ + u32 status; + + status = readl(&csu_base->status); + if (status & (BIT(0) | BIT(1))) { + printf("Secure Boot:\t%s%s\n", + status & BIT(0) ? "authenticated" : "not authenticated", + status & BIT(1) ? ", encrypted" : ", not encrypted"); + } +} + #define PS_SYSMON_ANALOG_BUS_VAL 0x3210 #define PS_SYSMON_ANALOG_BUS_REG 0xFFA50914 @@ -391,8 +403,10 @@ int board_init(void) fpga_add(fpga_xilinx, &zynqmppl); #endif - if (current_el() == 3) + if (current_el() == 3) { multi_boot(); + secure_boot(); + } return 0; } -- 2.31.1

4 4