October 2018 - U-Boot

[U-Boot] i2c: Fix pca953x endianess issue, commit daa75b34828d45b7c1d63009188d45f4a32d06ba
by Joakim Tjernlund 12 Oct '18

12 Oct '18

This commit broke our pca953x usage(on ppc). I wonder why gpio pins here has an endian, its not a number. If there must be an endian connected with this, should it not be a cpu_to_be16 instead, which will retain compatibility ?

4 4

[U-Boot] [PATCH 1/1] efi_loader: PSCI reset and shutdown for EL1
by Heinrich Schuchardt 12 Oct '18

12 Oct '18

When starting an aarch64 system under QEMU it runs in EL1/EL0. So we have to use HVC for PSCI calls. Without the patch resetting Linux started with bootefi under qemu-system-aarch64 results in a crash. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/arm/cpu/armv8/fwcall.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c index 0ba3dad8cc..f1b6e60bae 100644 --- a/arch/arm/cpu/armv8/fwcall.c +++ b/arch/arm/cpu/armv8/fwcall.c @@ -78,12 +78,10 @@ void __efi_runtime smc_call(struct pt_regs *args) } /* - * For now, all systems we support run at least in EL2 and thus - * trigger PSCI calls to EL3 using SMC. If anyone ever wants to - * use PSCI on U-Boot running below a hypervisor, please detect - * this and set the flag accordingly. + * This flag controls if SMC or HVC is used to call PSCI services. If U-Boot has + * been called by a hypervisor (e.g. QEMU), it has to be set to false. */ -static const __efi_runtime_data bool use_smc_for_psci = true; +static __efi_runtime_data bool use_smc_for_psci = true; void __noreturn __efi_runtime psci_system_reset(void) { @@ -138,6 +136,12 @@ void reset_misc(void) } #ifdef CONFIG_EFI_LOADER +efi_status_t efi_reset_system_init(void) +{ + use_smc_for_psci = (current_el() >= 2); + return EFI_SUCCESS; +} + void __efi_runtime EFIAPI efi_reset_system( enum efi_reset_type reset_type, efi_status_t reset_status, -- 2.19.1

2 2

[U-Boot] [PATCH] ARC: Don't use COMMON section for global not-initialized variables
by Alexey Brodkin 11 Oct '18

11 Oct '18

By default GCC puts global non-initialized variables in COMMON section. And we used to ignore existence of COMMON section in our linker scripts though smart LD silently appended it right after .bss. And the problem here is variables from COMMON section even though require zeroing in run-time were not zeroed as they were placed right after __bss_end symbol. It was a pure luck we never faced serious problem due to this, but now it is fixed. Now as for some other architectures we'll just force GCC to put those global variables in normal .bss section. This solution is much nicer than adding COMMON section to each and every linker script. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- arch/arc/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arc/config.mk b/arch/arc/config.mk index d255c90..18005d9 100644 --- a/arch/arc/config.mk +++ b/arch/arc/config.mk @@ -43,7 +43,7 @@ PLATFORM_CPPFLAGS += -mcpu=archs endif PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -gdwarf-2 -mno-sdata -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -fno-common # Needed for relocation LDFLAGS_FINAL += -pie --gc-sections -- 2.7.4

1 0

[U-Boot] [PATCH] iot_dk: Link for eFlash
by Alexey Brodkin 11 Oct '18

11 Oct '18

That's what we'll have in production. But note it won't work for loading via JTAG as eFlash is not directly writable, one needs to use prebootloader to flash uboot.bin from SD-card into eFlash. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- configs/iot_devkit_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/iot_devkit_defconfig b/configs/iot_devkit_defconfig index 3facce1..1b6dd9e 100644 --- a/configs/iot_devkit_defconfig +++ b/configs/iot_devkit_defconfig @@ -4,7 +4,7 @@ CONFIG_CPU_ARCEM6=y CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y CONFIG_TARGET_IOT_DEVKIT=y -CONFIG_SYS_TEXT_BASE=0x20000000 +CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SYS_CLK_FREQ=16000000 CONFIG_LOCALVERSION="-iotdk-1.0" # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set -- 2.7.4

1 0

[U-Boot] [PATCH] axs10x/emdk/hsdk/iot_dk: Implement board_mmc_getcd()
by Alexey Brodkin 11 Oct '18

11 Oct '18

So now we may detect MMC/SD-card existence and instead of completely misleading message on missing card: ------------------------>8----------------------- Loading Environment from FAT... Card did not respond to voltage select! ------------------------>8----------------------- we now get very clear one: ------------------------>8----------------------- Loading Environment from FAT... MMC: no card present ------------------------>8----------------------- Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- board/synopsys/axs10x/axs10x.c | 7 +++++++ board/synopsys/emdk/emdk.c | 7 +++++++ board/synopsys/hsdk/hsdk.c | 7 +++++++ board/synopsys/iot_devkit/iot_devkit.c | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c index af78127..c95f7af 100644 --- a/board/synopsys/axs10x/axs10x.c +++ b/board/synopsys/axs10x/axs10x.c @@ -33,6 +33,13 @@ int board_mmc_init(bd_t *bis) return 0; } +int board_mmc_getcd(struct mmc *mmc) +{ + struct dwmci_host *host = mmc->priv; + + return !(dwmci_readl(host, DWMCI_CDETECT) & 1); +} + #define AXS_MB_CREG 0xE0011000 int board_early_init_f(void) diff --git a/board/synopsys/emdk/emdk.c b/board/synopsys/emdk/emdk.c index bbb946a..79cafef 100644 --- a/board/synopsys/emdk/emdk.c +++ b/board/synopsys/emdk/emdk.c @@ -34,6 +34,13 @@ int board_mmc_init(bd_t *bis) return 0; } +int board_mmc_getcd(struct mmc *mmc) +{ + struct dwmci_host *host = mmc->priv; + + return !(dwmci_readl(host, DWMCI_CDETECT) & 1); +} + #define CREG_BASE 0xF0001000 #define CREG_BOOT_OFFSET 0 #define CREG_BOOT_WP_OFFSET 8 diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c index 4f46d2e..b6aefdb 100644 --- a/board/synopsys/hsdk/hsdk.c +++ b/board/synopsys/hsdk/hsdk.c @@ -1019,6 +1019,13 @@ int board_late_init(void) return 0; } +int board_mmc_getcd(struct mmc *mmc) +{ + struct dwmci_host *host = mmc->priv; + + return !(dwmci_readl(host, DWMCI_CDETECT) & 1); +} + int board_mmc_init(bd_t *bis) { struct dwmci_host *host = NULL; diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c index 40c29e7..f8838fb 100644 --- a/board/synopsys/iot_devkit/iot_devkit.c +++ b/board/synopsys/iot_devkit/iot_devkit.c @@ -170,6 +170,13 @@ int board_mmc_init(bd_t *bis) return 0; } +int board_mmc_getcd(struct mmc *mmc) +{ + struct dwmci_host *host = mmc->priv; + + return !(dwmci_readl(host, DWMCI_CDETECT) & 1); +} + #define IOTDK_RESET_SEQ 0x55AA6699 void reset_cpu(ulong addr) -- 2.7.4

1 0

[U-Boot] [PATCH] iot_dk: Save CPU clock value to gd->cpu_clk
by Alexey Brodkin 11 Oct '18

11 Oct '18

Since gd->cpu_clk is a global item we may once populate it from .dtb ans use it then in other places like for printing CPU info etc. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- board/synopsys/iot_devkit/iot_devkit.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c index 04e003c..40c29e7 100644 --- a/board/synopsys/iot_devkit/iot_devkit.c +++ b/board/synopsys/iot_devkit/iot_devkit.c @@ -108,7 +108,7 @@ extern u8 __ram_end[]; */ int mach_cpu_init(void) { - int offset, freq; + int offset; /* Don't relocate U-Boot */ gd->flags |= GD_FLG_SKIP_RELOC; @@ -129,12 +129,12 @@ int mach_cpu_init(void) if (offset < 0) return offset; - freq = fdtdec_get_int(gd->fdt_blob, offset, "clock-frequency", 0); - if (!freq) + gd->cpu_clk = fdtdec_get_int(gd->fdt_blob, offset, "clock-frequency", 0); + if (!gd->cpu_clk) return -EINVAL; /* If CPU freq > 100 MHz, divide eFLASH clock by 2 */ - if (freq > 100000000) { + if (gd->cpu_clk > 100000000) { u32 reg = readl(AHBCKDIV); reg &= ~(0xF << 8); @@ -142,7 +142,7 @@ int mach_cpu_init(void) writel(reg, AHBCKDIV); } - return set_cpu_freq(freq); + return set_cpu_freq(gd->cpu_clk); } #define ARC_PERIPHERAL_BASE 0xF0000000 @@ -186,7 +186,9 @@ int checkboard(void) #ifdef CONFIG_DISPLAY_CPUINFO int print_cpuinfo(void) { - printf("CPU: ARC EM9D\n"); + char mhz[8]; + + printf("CPU: ARC EM9D at %s MHz\n", strmhz(mhz, gd->cpu_clk)); return 0; } #endif /* CONFIG_DISPLAY_CPUINFO */ -- 2.7.4

1 0

[U-Boot] [PATCH] iot_dk: Add support of 136 MHz clock
by Alexey Brodkin 11 Oct '18

11 Oct '18

Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- board/synopsys/iot_devkit/iot_devkit.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c index fb39e6d..04e003c 100644 --- a/board/synopsys/iot_devkit/iot_devkit.c +++ b/board/synopsys/iot_devkit/iot_devkit.c @@ -68,6 +68,14 @@ static int set_cpu_freq(unsigned int clk) writel((readl(PLLCON) & PLL_MASK_2) | 0x200191, PLLCON); break; + case 136: + writel(readl(PLLCON) & PLL_MASK_0, PLLCON); + /* pll_off=1, M=17, N=1, OD=1, PLL_OUT_CLK=136M */ + writel((readl(PLLCON) & PLL_MASK_1) | 0x100111, PLLCON); + /* pll_off=0, M=17, N=1, OD=1, PLL_OUT_CLK=136M */ + writel((readl(PLLCON) & PLL_MASK_2) | 0x100111, PLLCON); + break; + case 144: writel(readl(PLLCON) & PLL_MASK_0, PLLCON); /* pll_off=1, M=18, N=1, OD=1, PLL_OUT_CLK=144M */ -- 2.7.4

1 0

[U-Boot] [PATCH] iot_dk: Implement board reset
by Alexey Brodkin 11 Oct '18

11 Oct '18

It is done by writing some magic sequence in a special register. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- board/synopsys/iot_devkit/iot_devkit.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c index 1d848dd..fb39e6d 100644 --- a/board/synopsys/iot_devkit/iot_devkit.c +++ b/board/synopsys/iot_devkit/iot_devkit.c @@ -17,6 +17,7 @@ DECLARE_GLOBAL_DATA_PTR; #define AHBCKDIV (void *)(SYSCON_BASE + 0x04) #define APBCKDIV (void *)(SYSCON_BASE + 0x08) #define APBCKEN (void *)(SYSCON_BASE + 0x0C) +#define RESET_REG (void *)(SYSCON_BASE + 0x18) #define CLKSEL (void *)(SYSCON_BASE + 0x24) #define CLKSTAT (void *)(SYSCON_BASE + 0x28) #define PLLCON (void *)(SYSCON_BASE + 0x2C) @@ -161,6 +162,13 @@ int board_mmc_init(bd_t *bis) return 0; } +#define IOTDK_RESET_SEQ 0x55AA6699 + +void reset_cpu(ulong addr) +{ + writel(IOTDK_RESET_SEQ, RESET_REG); +} + int checkboard(void) { puts("Board: Synopsys IoT Development Kit\n"); -- 2.7.4

1 0

[U-Boot] [PATCH 0/2] ARC: Allow per-board more precise CPU identification
by Alexey Brodkin 11 Oct '18

11 Oct '18

Some of ARC boards do sport real silicon and given how flexible ARC cores might be configured it's hard to tell what "template" was used initially. For FPGA-based boards we're left with basic info derived from IDENTITY register but for real silicon we may know more details so let's print them then. Alexey Brodkin (2): ARC: make generic print_cpuinfo() weak iot_dk/hsdk: Implement its own print_cpuinfo() arch/arc/lib/cpu.c | 2 +- board/synopsys/hsdk/hsdk.c | 8 ++++++++ board/synopsys/iot_devkit/iot_devkit.c | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) -- 2.7.4

1 2

[U-Boot] [PATCH] iot_dk: Add localversion string
by Alexey Brodkin 11 Oct '18

11 Oct '18

Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- configs/iot_devkit_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/iot_devkit_defconfig b/configs/iot_devkit_defconfig index 1f0f9c3..0c5aba3 100644 --- a/configs/iot_devkit_defconfig +++ b/configs/iot_devkit_defconfig @@ -6,6 +6,7 @@ CONFIG_SYS_DCACHE_OFF=y CONFIG_TARGET_IOT_DEVKIT=y CONFIG_SYS_TEXT_BASE=0x20000000 CONFIG_SYS_CLK_FREQ=16000000 +CONFIG_LOCALVERSION="-iotdk-1.0" # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_SYS_PROMPT="IoTDK# " # CONFIG_CMD_BOOTD is not set -- 2.7.4

1 0