September 2019 - U-Boot

[U-Boot] [PATCH] arm64: zynqmp: Add new jtag distro boot command
by Michal Simek 08 Oct '19

08 Oct '19

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> This patch adds new jtag distro boot command to look for bootscript file in DDR and execute it first incase of jtag bootmode. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynqmp/zynqmp.c | 2 +- include/configs/xilinx_zynqmp.h | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 0c331e332230..f36d49fded99 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -564,7 +564,7 @@ int board_late_init(void) break; case JTAG_MODE: puts("JTAG_MODE\n"); - mode = "pxe dhcp"; + mode = "jtag pxe dhcp"; env_set("modeboot", "jtagboot"); break; case QSPI_MODE_24BIT: diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 791719147ce2..070b210ffcce 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -175,7 +175,16 @@ #define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ #devtypel #instance " " +#define BOOT_TARGET_DEVICES_JTAG(func) func(JTAG, jtag, na) + +#define BOOTENV_DEV_JTAG(devtypeu, devtypel, instance) \ + "bootcmd_jtag=source $scriptaddr; echo SCRIPT FAILED: continuing...;\0" + +#define BOOTENV_DEV_NAME_JTAG(devtypeu, devtypel, instance) \ + "jtag " + #define BOOT_TARGET_DEVICES(func) \ + BOOT_TARGET_DEVICES_JTAG(func) \ BOOT_TARGET_DEVICES_MMC(func) \ BOOT_TARGET_DEVICES_QSPI(func) \ BOOT_TARGET_DEVICES_NAND(func) \ -- 2.17.1

2 1

[U-Boot] [PATCH] arm64: zynqmp: Update scriptaddr value to 512MB
by Michal Simek 08 Oct '19

08 Oct '19

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> This patch updates scriptaddr value to 512MB as having it at 32MB has high chance of script corruption incase of bigger kernel. Be aware that 512MB is used for SPL malloc area that's why images should be loaded after SPL (the best after u-boot relocation). Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/xilinx_zynqmp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index cdcf853fceb3..791719147ce2 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -112,7 +112,7 @@ "fdt_addr_r=0x40000000\0" \ "pxefile_addr_r=0x10000000\0" \ "kernel_addr_r=0x18000000\0" \ - "scriptaddr=0x02000000\0" \ + "scriptaddr=0x20000000\0" \ "ramdisk_addr_r=0x02100000\0" \ "script_offset_f=0x3e80000\0" \ "script_size_f=0x80000\0" \ -- 2.17.1

2 1

[U-Boot] [PATCH 0/4] arm64: versal: Extend distro boot
by Michal Simek 08 Oct '19

08 Oct '19

Hi, these patches are extending current distribution boot for Xilinx Versal. USB DFU and jtag with one change for spi boot mode. Thanks, Michal Siva Durga Prasad Paladugu (2): arm64: versal: Define configs related to USB DFU functionality arm64: versal: Add new jtag distro boot command T Karthik Reddy (2): arm64: versal: Add new dfu usb distro boot command arm64: versal: Change boot script offset address in versal board/xilinx/versal/board.c | 6 +++- include/configs/xilinx_versal.h | 49 +++++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 4 deletions(-) -- 2.17.1

2 5

[U-Boot] [PATCH] arm64: versal: Add platform detection code to versal_virt
by Michal Simek 08 Oct '19

08 Oct '19

Detect which platform U-Boot is running at and based on that choose DTS file which U-Boot uses for own configuration. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/mach-versal/cpu.c | 18 +++++--- arch/arm/mach-versal/include/mach/hardware.h | 9 ++++ board/xilinx/versal/board.c | 43 ++++++++++++++++++++ 3 files changed, 65 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c index f0d047d3232f..3505b4638ed8 100644 --- a/arch/arm/mach-versal/cpu.c +++ b/arch/arm/mach-versal/cpu.c @@ -7,6 +7,7 @@ #include <common.h> #include <asm/armv8/mmu.h> #include <asm/io.h> +#include <asm/sections.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> @@ -113,11 +114,18 @@ void *board_fdt_blob_setup(void) { static void *fw_dtb = (void *)CONFIG_VERSAL_OF_BOARD_DTB_ADDR; - if (fdt_magic(fw_dtb) != FDT_MAGIC) { - printf("DTB is not passed via %llx\n", (u64)fw_dtb); - return NULL; - } + if (fdt_magic(fw_dtb) == FDT_MAGIC) + return fw_dtb; + + printf("DTB is not passed via 0x%llx\n", (u64)fw_dtb); + + /* Try to look at FDT is at end of image */ + fw_dtb = (ulong *)&_end; + + if (fdt_magic(fw_dtb) == FDT_MAGIC) + return fw_dtb; - return fw_dtb; + printf("DTB is also not passed via 0x%llx\n", (u64)fw_dtb); + return NULL; } #endif diff --git a/arch/arm/mach-versal/include/mach/hardware.h b/arch/arm/mach-versal/include/mach/hardware.h index e26beab2e9cd..ac1bad02ec1c 100644 --- a/arch/arm/mach-versal/include/mach/hardware.h +++ b/arch/arm/mach-versal/include/mach/hardware.h @@ -52,6 +52,15 @@ struct rpu_regs { #define rpu_base ((struct rpu_regs *)VERSAL_RPU_BASEADDR) +#define VERSAL_PMC_TAP_BASEADDR 0xF11A0000 + +struct pmc_tap_regs { + u32 idcode; /* 0x0 */ + u32 version; /* 0x4 */ +}; + +#define pmc_base_base ((struct pmc_tap_regs *)VERSAL_PMC_TAP_BASEADDR) + #define VERSAL_CRP_BASEADDR 0xF1260000 struct crp_regs { diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 5718e1aa7e47..12ea7a0d0589 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -217,3 +217,46 @@ int dram_init(void) void reset_cpu(ulong addr) { } + +#define PMC_TAP_VERSION_PLATFORM_MASK 0xF +#define PMC_TAP_VERSION_PLATFORM_SHIFT 24 + +/* pmc_tap_version platform */ +#define PMC_TAP_VERSION_SILICON 0 +#define PMC_TAP_VERSION_SPP 1 +#define PMC_TAP_VERSION_EMU 2 +#define PMC_TAP_VERSION_QEMU 3 + +int __maybe_unused board_fit_config_name_match(const char *name) +{ + u32 version, platform; + char *platform_name = NULL; + + version = readl(&pmc_base_base->version); + platform = (version >> PMC_TAP_VERSION_PLATFORM_SHIFT) & + PMC_TAP_VERSION_PLATFORM_MASK; + + switch (platform) { + case PMC_TAP_VERSION_SILICON: + platform_name = "versal-tenzing"; /* For now */ + debug("Running on Silicon\n"); + break; + case PMC_TAP_VERSION_SPP: + platform_name = "versal-spp"; + break; + case PMC_TAP_VERSION_EMU: + platform_name = "versal-emu"; + break; + case PMC_TAP_VERSION_QEMU: + platform_name = "versal-qemu"; /* Internal QEMU */ + debug("Running on QEMU which is suspicious\n"); + break; + } + + if (!strncmp(name, platform_name, sizeof(platform_name))) { + printf("Selecting DTB %s for board %s\n", name, platform_name); + return 0; + } + + return -1; +} -- 2.17.1

2 1

[U-Boot] [PATCH] zynqmp: firmware: Add Xilinx ZynqMP firmware driver
by Michal Simek 08 Oct '19

08 Oct '19

From: Rajan Vaja <rajan.vaja(a)xilinx.com> Add simple ZynqMP firmware drive to populate child nodes under zynqmp_firmware DT node. Signed-off-by: Rajan Vaja <rajan.vaja(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/clk/Kconfig | 1 + drivers/firmware/Kconfig | 10 ++++++++++ drivers/firmware/Makefile | 1 + drivers/firmware/firmware-zynqmp.c | 15 +++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 drivers/firmware/firmware-zynqmp.c diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 95fe0aea2ce8..305cbd96f165 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -113,6 +113,7 @@ config CLK_ZYNQ config CLK_ZYNQMP bool "Enable clock driver support for ZynqMP" depends on ARCH_ZYNQMP + select ZYNQMP_FIRMWARE help This clock driver adds support for clock realted settings for ZynqMP platform. diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 873bc8c79679..b70a2063551c 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -26,3 +26,13 @@ config TI_SCI_PROTOCOL This protocol library is used by client drivers to use the features provided by the system controller. + +config ZYNQMP_FIRMWARE + bool "ZynqMP Firmware interface" + select FIRMWARE + help + Firmware interface driver is used by different + drivers to communicate with the firmware for + various platform management services. + Say yes to enable ZynqMP firmware interface driver. + If in doubt, say N. diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 6c3e12968527..a0c250a473eb 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -2,3 +2,4 @@ obj-$(CONFIG_FIRMWARE) += firmware-uclass.o obj-$(CONFIG_$(SPL_)ARM_PSCI_FW) += psci.o obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o obj-$(CONFIG_SANDBOX) += firmware-sandbox.o +obj-$(CONFIG_ZYNQMP_FIRMWARE) += firmware-zynqmp.o diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c new file mode 100644 index 000000000000..b36eda1b04be --- /dev/null +++ b/drivers/firmware/firmware-zynqmp.c @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <dm.h> + +static const struct udevice_id zynqmp_firmware_ids[] = { + { .compatible = "xlnx,zynqmp-firmware" }, + { } +}; + +U_BOOT_DRIVER(zynqmp_firmware) = { + .id = UCLASS_FIRMWARE, + .name = "zynqmp-firmware", + .probe = dm_scan_fdt_dev, + .of_match = zynqmp_firmware_ids, +}; -- 2.17.1

3 3

[U-Boot] [PATCH 1/2] arm64: versal: Enable memory mapping via DT
by Michal Simek 08 Oct '19

08 Oct '19

Code reads DT and setup MMU table based on memory node. This will ensure that only DT needs to be changed. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/mach-versal/cpu.c | 36 +++++++++++++------ arch/arm/mach-versal/include/mach/sys_proto.h | 1 + board/xilinx/versal/board.c | 9 ++++- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c index 70c1908ec4b2..dc6a9205be0e 100644 --- a/arch/arm/mach-versal/cpu.c +++ b/arch/arm/mach-versal/cpu.c @@ -12,14 +12,15 @@ DECLARE_GLOBAL_DATA_PTR; -static struct mm_region versal_mem_map[] = { +#define VERSAL_MEM_MAP_USED 6 + +#define DRAM_BANKS CONFIG_NR_DRAM_BANKS + +/* +1 is end of list which needs to be empty */ +#define VERSAL_MEM_MAP_MAX (VERSAL_MEM_MAP_USED + DRAM_BANKS + 1) + +static struct mm_region versal_mem_map[VERSAL_MEM_MAP_MAX] = { { - .virt = 0x0UL, - .phys = 0x0UL, - .size = 0x80000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_INNER_SHARE - }, { .virt = 0x80000000UL, .phys = 0x80000000UL, .size = 0x70000000UL, @@ -59,12 +60,27 @@ static struct mm_region versal_mem_map[] = { .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, { - /* List terminator */ - 0, } }; +void mem_map_fill(void) +{ + int banks = VERSAL_MEM_MAP_USED; + + for (int i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { + /* Zero size means no more DDR that's this is end */ + if (!gd->bd->bi_dram[i].size) + break; + + versal_mem_map[banks].virt = gd->bd->bi_dram[i].start; + versal_mem_map[banks].phys = gd->bd->bi_dram[i].start; + versal_mem_map[banks].size = gd->bd->bi_dram[i].size; + versal_mem_map[banks].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE; + banks = banks + 1; + } +} + struct mm_region *mem_map = versal_mem_map; u64 get_page_table_size(void) diff --git a/arch/arm/mach-versal/include/mach/sys_proto.h b/arch/arm/mach-versal/include/mach/sys_proto.h index 1dc7bf665690..05934c28d67f 100644 --- a/arch/arm/mach-versal/include/mach/sys_proto.h +++ b/arch/arm/mach-versal/include/mach/sys_proto.h @@ -9,3 +9,4 @@ enum { }; void tcm_init(u8 mode); +void mem_map_fill(void); diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 2b4edd8738b4..5718e1aa7e47 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -9,6 +9,7 @@ #include <malloc.h> #include <asm/io.h> #include <asm/arch/hardware.h> +#include <asm/arch/sys_proto.h> #include <dm/device.h> #include <dm/uclass.h> #include <versalpl.h> @@ -194,7 +195,13 @@ int board_late_init(void) int dram_init_banksize(void) { - fdtdec_setup_memory_banksize(); + int ret; + + ret = fdtdec_setup_memory_banksize(); + if (ret) + return ret; + + mem_map_fill(); return 0; } -- 2.17.1

2 2

[U-Boot] [PATCH 0/2] arm64: Setting up initrd_hi at run time
by Michal Simek 08 Oct '19

08 Oct '19

Hi, we are running one u-boot configurations on various boards with different amount of memory that setting up initrd_high is problematic. There shouldn't be a problem to setup initrd_high at run time based on DDR size detection. The same changes are done for ZynqMP and Versal. Thanks, Michal Siva Durga Prasad Paladugu (1): arm64: versal: Set initrd_high to as high as possible T Karthik Reddy (1): arm64: zynqmp: Set initrd_high to as high as possible arch/arm/Kconfig | 16 ++++++++++++++++ board/xilinx/versal/board.c | 6 ++++++ board/xilinx/zynqmp/zynqmp.c | 6 ++++++ include/configs/xilinx_versal.h | 1 - include/configs/xilinx_zynqmp.h | 1 - 5 files changed, 28 insertions(+), 2 deletions(-) -- 2.17.1

2 3

[U-Boot] [PATCH] arm64: versal: fpga: Add PL bit stream load support
by Michal Simek 08 Oct '19

08 Oct '19

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> This patch adds PL bitstream load support for Versal platform. The PL bitstream is loaded by making an SMC to ATF which in turn communicates with platform firmware which configures and loads PL bitstream on to PL. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/versal/board.c | 10 ++++++++ drivers/fpga/Kconfig | 9 +++++++ drivers/fpga/Makefile | 1 + drivers/fpga/versalpl.c | 51 +++++++++++++++++++++++++++++++++++++ drivers/fpga/xilinx.c | 8 +++++- include/versalpl.h | 20 +++++++++++++++ include/xilinx.h | 2 ++ 7 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 drivers/fpga/versalpl.c create mode 100644 include/versalpl.h diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index b5ddd0c5ad24..a2b00aa0b662 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -11,13 +11,23 @@ #include <asm/arch/hardware.h> #include <dm/device.h> #include <dm/uclass.h> +#include <versalpl.h> DECLARE_GLOBAL_DATA_PTR; +#if defined(CONFIG_FPGA_VERSALPL) +static xilinx_desc versalpl = XILINX_VERSAL_DESC; +#endif + int board_init(void) { printf("EL Level:\tEL%d\n", current_el()); +#if defined(CONFIG_FPGA_VERSALPL) + fpga_init(); + fpga_add(fpga_xilinx, &versalpl); +#endif + return 0; } diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index 105a299812f5..fe398a1d4965 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -56,6 +56,15 @@ config FPGA_ZYNQMPPL Enable FPGA driver for loading bitstream in BIT and BIN format on Xilinx Zynq UltraScale+ (ZynqMP) device. +config FPGA_VERSALPL + bool "Enable Xilinx FPGA driver for Versal" + depends on FPGA_XILINX + help + Enable FPGA driver for loading bitstream in PDI format on Xilinx + Versal device. PDI is a new programmable device image format for + Versal. The bitstream will only be generated as PDI for Versal + platform. + config FPGA_SPARTAN3 bool "Enable Spartan3 FPGA driver" depends on FPGA_XILINX diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index 5a778c10e801..04e6480f202c 100644 --- a/drivers/fpga/Makefile +++ b/drivers/fpga/Makefile @@ -6,6 +6,7 @@ obj-y += fpga.o obj-$(CONFIG_FPGA_SPARTAN2) += spartan2.o obj-$(CONFIG_FPGA_SPARTAN3) += spartan3.o +obj-$(CONFIG_FPGA_VERSALPL) += versalpl.o obj-$(CONFIG_FPGA_VIRTEX2) += virtex2.o obj-$(CONFIG_FPGA_ZYNQPL) += zynqpl.o obj-$(CONFIG_FPGA_ZYNQMPPL) += zynqmppl.o diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c new file mode 100644 index 000000000000..69617a9b1d7f --- /dev/null +++ b/drivers/fpga/versalpl.c @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * (C) Copyright 2019, Xilinx, Inc, + * Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> + */ + +#include <common.h> +#include <asm/arch/sys_proto.h> +#include <memalign.h> +#include <versalpl.h> + +static ulong versal_align_dma_buffer(ulong *buf, u32 len) +{ + ulong *new_buf; + + if ((ulong)buf != ALIGN((ulong)buf, ARCH_DMA_MINALIGN)) { + new_buf = (ulong *)ALIGN((ulong)buf, ARCH_DMA_MINALIGN); + memcpy(new_buf, buf, len); + buf = new_buf; + } + + return (ulong)buf; +} + +static int versal_load(xilinx_desc *desc, const void *buf, size_t bsize, + bitstream_type bstype) +{ + ulong bin_buf; + int ret; + u32 buf_lo, buf_hi; + u32 ret_payload[5]; + + bin_buf = versal_align_dma_buffer((ulong *)buf, bsize); + + debug("%s called!\n", __func__); + flush_dcache_range(bin_buf, bin_buf + bsize); + + buf_lo = lower_32_bits(bin_buf); + buf_hi = upper_32_bits(bin_buf); + + ret = versal_pm_request(VERSAL_PM_LOAD_PDI, VERSAL_PM_PDI_TYPE, buf_lo, + buf_hi, 0, ret_payload); + if (ret) + puts("PL FPGA LOAD fail\n"); + + return ret; +} + +struct xilinx_fpga_op versal_op = { + .load = versal_load, +}; diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c index f5135504eeb6..4b0334b6beb6 100644 --- a/drivers/fpga/xilinx.c +++ b/drivers/fpga/xilinx.c @@ -226,7 +226,10 @@ int xilinx_info(xilinx_desc *desc) case xilinx_zynqmp: printf("ZynqMP PL\n"); break; - /* Add new family types here */ + case xilinx_versal: + printf("Versal PL\n"); + break; + /* Add new family types here */ default: printf ("Unknown family type, %d\n", desc->family); } @@ -257,6 +260,9 @@ int xilinx_info(xilinx_desc *desc) case csu_dma: printf("csu_dma configuration interface (ZynqMP)\n"); break; + case cfi: + printf("CFI configuration interface (Versal)\n"); + break; /* Add new interface types here */ default: printf ("Unsupported interface type, %d\n", desc->iface); diff --git a/include/versalpl.h b/include/versalpl.h new file mode 100644 index 000000000000..b94c82e6e666 --- /dev/null +++ b/include/versalpl.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * (C) Copyright 2019 Xilinx, Inc, + * Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> + */ + +#ifndef _VERSALPL_H_ +#define _VERSALPL_H_ + +#include <xilinx.h> + +#define VERSAL_PM_LOAD_PDI 0x701 +#define VERSAL_PM_PDI_TYPE 0xF + +extern struct xilinx_fpga_op versal_op; + +#define XILINX_VERSAL_DESC \ +{ xilinx_versal, csu_dma, 1, &versal_op, 0, &versal_op } + +#endif /* _VERSALPL_H_ */ diff --git a/include/xilinx.h b/include/xilinx.h index af40befa52de..ab4537becfad 100644 --- a/include/xilinx.h +++ b/include/xilinx.h @@ -21,6 +21,7 @@ typedef enum { /* typedef xilinx_iface */ slave_selectmap, /* slave SelectMap (virtex2) */ devcfg, /* devcfg interface (zynq) */ csu_dma, /* csu_dma interface (zynqmp) */ + cfi, /* CFI interface(versal) */ max_xilinx_iface_type /* insert all new types before this */ } xilinx_iface; /* end, typedef xilinx_iface */ @@ -32,6 +33,7 @@ typedef enum { /* typedef xilinx_family */ xilinx_spartan3, /* Spartan-III Family */ xilinx_zynq, /* Zynq Family */ xilinx_zynqmp, /* ZynqMP Family */ + xilinx_versal, /* Versal Family */ max_xilinx_type /* insert all new types before this */ } xilinx_family; /* end, typedef xilinx_family */ -- 2.17.1

2 1

[U-Boot] [PATCH v2] arm64: versal: Also record versal name to versal fragment
by Michal Simek 08 Oct '19

08 Oct '19

Just to make sure that also drivers with versal name are assigned to proper fragment. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Avoid reporting myself with any universal platfrom - reported by Heinrich MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 08222fd56948..9b3c46eff0aa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -403,6 +403,7 @@ M: Michal Simek <michal.simek(a)xilinx.com> S: Maintained T: git https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze.git F: arch/arm/mach-versal/ +N: (?<!uni)versal ARM VERSATILE EXPRESS DRIVERS M: Liviu Dudau <liviu.dudau(a)foss.arm.com> -- 2.17.1

2 1

[U-Boot] [PATCH] arm64: versal: Define board_late_init for versal
by Michal Simek 08 Oct '19

08 Oct '19

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Define board_late_init which performs bootmode detection and prepares corresponding distro boot commaand sequence. Also disable it for mini platforms because simply there is no need to have it enabled. But also disable it for virtual platform because Qemu is not modelling this register space that's why travis testing would fail. This configuration should be reverted when mainline Qemu is updated. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/Kconfig | 1 + arch/arm/mach-versal/include/mach/hardware.h | 23 ++++ board/xilinx/versal/board.c | 111 +++++++++++++++++++ configs/xilinx_versal_mini_emmc0_defconfig | 1 + configs/xilinx_versal_mini_emmc1_defconfig | 1 + configs/xilinx_versal_virt_defconfig | 1 + 6 files changed, 138 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3b0e315061aa..a93138aa0ada 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -980,6 +980,7 @@ config ARCH_VERSAL select DM_MMC if MMC select DM_SERIAL select OF_CONTROL + imply BOARD_LATE_INIT config ARCH_VF610 bool "Freescale Vybrid" diff --git a/arch/arm/mach-versal/include/mach/hardware.h b/arch/arm/mach-versal/include/mach/hardware.h index 23fbc3d8f536..e26beab2e9cd 100644 --- a/arch/arm/mach-versal/include/mach/hardware.h +++ b/arch/arm/mach-versal/include/mach/hardware.h @@ -51,3 +51,26 @@ struct rpu_regs { }; #define rpu_base ((struct rpu_regs *)VERSAL_RPU_BASEADDR) + +#define VERSAL_CRP_BASEADDR 0xF1260000 + +struct crp_regs { + u32 reserved0[128]; + u32 boot_mode_usr; +}; + +#define crp_base ((struct crp_regs *)VERSAL_CRP_BASEADDR) + +/* Bootmode setting values */ +#define BOOT_MODES_MASK 0x0000000F +#define QSPI_MODE_24BIT 0x00000001 +#define QSPI_MODE_32BIT 0x00000002 +#define SD_MODE 0x00000003 /* sd 0 */ +#define SD_MODE1 0x00000005 /* sd 1 */ +#define EMMC_MODE 0x00000006 +#define USB_MODE 0x00000007 +#define OSPI_MODE 0x00000008 +#define SD1_LSHFT_MODE 0x0000000E /* SD1 Level shifter */ +#define JTAG_MODE 0x00000000 +#define BOOT_MODE_USE_ALT 0x100 +#define BOOT_MODE_ALT_SHIFT 12 diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 90751477b5e1..b5ddd0c5ad24 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -9,6 +9,8 @@ #include <malloc.h> #include <asm/io.h> #include <asm/arch/hardware.h> +#include <dm/device.h> +#include <dm/uclass.h> DECLARE_GLOBAL_DATA_PTR; @@ -65,6 +67,115 @@ int board_early_init_r(void) return 0; } +int board_late_init(void) +{ + u32 reg = 0; + u8 bootmode; + struct udevice *dev; + int bootseq = -1; + int bootseq_len = 0; + int env_targets_len = 0; + const char *mode; + char *new_targets; + char *env_targets; + + if (!(gd->flags & GD_FLG_ENV_DEFAULT)) { + debug("Saved variables - Skipping\n"); + return 0; + } + + reg = readl(&crp_base->boot_mode_usr); + + if (reg >> BOOT_MODE_ALT_SHIFT) + reg >>= BOOT_MODE_ALT_SHIFT; + + bootmode = reg & BOOT_MODES_MASK; + + puts("Bootmode: "); + switch (bootmode) { + case JTAG_MODE: + puts("JTAG_MODE\n"); + mode = "pxe dhcp"; + break; + case QSPI_MODE_24BIT: + puts("QSPI_MODE_24\n"); + mode = "xspi0"; + break; + case QSPI_MODE_32BIT: + puts("QSPI_MODE_32\n"); + mode = "xspi0"; + break; + case OSPI_MODE: + puts("OSPI_MODE\n"); + mode = "xspi0"; + break; + case EMMC_MODE: + puts("EMMC_MODE\n"); + mode = "mmc0"; + break; + case SD_MODE: + puts("SD_MODE\n"); + if (uclass_get_device_by_name(UCLASS_MMC, + "sdhci@f1040000", &dev)) { + puts("Boot from SD0 but without SD0 enabled!\n"); + return -1; + } + debug("mmc0 device found at %p, seq %d\n", dev, dev->seq); + + mode = "mmc"; + bootseq = dev->seq; + break; + case SD1_LSHFT_MODE: + puts("LVL_SHFT_"); + /* fall through */ + case SD_MODE1: + puts("SD_MODE1\n"); + if (uclass_get_device_by_name(UCLASS_MMC, + "sdhci@f1050000", &dev)) { + puts("Boot from SD1 but without SD1 enabled!\n"); + return -1; + } + debug("mmc1 device found at %p, seq %d\n", dev, dev->seq); + + mode = "mmc"; + bootseq = dev->seq; + break; + default: + mode = ""; + printf("Invalid Boot Mode:0x%x\n", bootmode); + break; + } + + if (bootseq >= 0) { + bootseq_len = snprintf(NULL, 0, "%i", bootseq); + debug("Bootseq len: %x\n", bootseq_len); + } + + /* + * One terminating char + one byte for space between mode + * and default boot_targets + */ + env_targets = env_get("boot_targets"); + if (env_targets) + env_targets_len = strlen(env_targets); + + new_targets = calloc(1, strlen(mode) + env_targets_len + 2 + + bootseq_len); + if (!new_targets) + return -ENOMEM; + + if (bootseq >= 0) + sprintf(new_targets, "%s%x %s", mode, bootseq, + env_targets ? env_targets : ""); + else + sprintf(new_targets, "%s %s", mode, + env_targets ? env_targets : ""); + + env_set("boot_targets", new_targets); + + return 0; +} + int dram_init_banksize(void) { fdtdec_setup_memory_banksize(); diff --git a/configs/xilinx_versal_mini_emmc0_defconfig b/configs/xilinx_versal_mini_emmc0_defconfig index 440035f53bbc..08d23243bee4 100644 --- a/configs/xilinx_versal_mini_emmc0_defconfig +++ b/configs/xilinx_versal_mini_emmc0_defconfig @@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_COUNTER_FREQUENCY=2720000 CONFIG_SYS_CONSOLE_INFO_QUIET=y +# CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set diff --git a/configs/xilinx_versal_mini_emmc1_defconfig b/configs/xilinx_versal_mini_emmc1_defconfig index 07ec6ebd664b..fef5cadd6ea7 100644 --- a/configs/xilinx_versal_mini_emmc1_defconfig +++ b/configs/xilinx_versal_mini_emmc1_defconfig @@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_COUNTER_FREQUENCY=2720000 CONFIG_SYS_CONSOLE_INFO_QUIET=y +# CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index 3b07545ac4af..75f8b983080d 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -12,6 +12,7 @@ CONFIG_FIT_VERBOSE=y # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_BOOTDELAY=-1 CONFIG_SUPPORT_RAW_INITRD=y +# CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set CONFIG_BOARD_EARLY_INIT_R=y CONFIG_HUSH_PARSER=y -- 2.17.1

2 1