July 2020 - U-Boot

[PATCH 00/15] net: sun8i-emac fixes and cleanups
by Andre Przywara 12 Jul '20

12 Jul '20

Hi, while looking at several U-Boot network drivers in the past year, I typically compared them to the sun8i-emac driver, as a kind of personal reference. While doing so, I figured that there are quite some things broken in here, and other things are not so nice. This series attempts the fix those shortcomings. Fix-wise we get proper handling of PHY failures (try without a cable connected), support for external RMII PHYs (as seen on the Pine64-non-plus model), and more future-proof internal PHY handling. The rest of the patches are cleanups, which fix things that are wrong, but we get away with so far, for one or another reason. This also cleans up a good part of the cache maintenance. There is more to be done (and I have patches for that), but that requires to drop the overzealous alignment checks in cache_v7.c first, which is part of another, upcoming series. A git repo with those patches can be found here: https://github.com/apritzel/u-boot/commits/sun8i-emac-cleanup Please have a look and send comments! Cheers, Andre Andre Przywara (15): net: sun8i-emac: Bail out on PHY error net: sun8i_emac: Don't hand out TX descriptor too early net: sun8i_emac: Simplify mdio_read/mdio_write functions net: sun8i_emac: Remove pointless wrapper functions net: sun8i_emac: Name magic bits and simplify read-modify-write calls net: sun8i_emac: Improve cache maintenance on RX descriptor init net: sun8i_emac: Reduce cache maintenance on TX descriptor init net: sun8i_emac: Drop unneeded cache invalidation before sending net: sun8i_emac: Wrap and simplify cache maintenance operations net: sun8i_emac: Fix overlong lines net: sun8i_emac: Fix MAC soft reset net: sun8i_emac: Simplify and fix error handling for RX net: sun8i-emac: Make internal PHY handling more robust net: sun8i-emac: Lower MDIO frequency sunxi: Pine-H64: Explicitly enable PHY regulator configs/pine_h64_defconfig | 1 + drivers/net/sun8i_emac.c | 458 +++++++++++++++++-------------------- 2 files changed, 208 insertions(+), 251 deletions(-) -- 2.17.5

5 19

[PATCH v4 00/17] efi_loader: non-volatile and runtime variables
by Heinrich Schuchardt 12 Jul '20

12 Jul '20

With this patch series file ubootefi.var in the EFI system partition is used for saving UEFI variables. Furthermore the UEFI variables are exposed for reading at runtime. v4: Correct appending of variables when using the memory based store. Performance enhancement for the memory based store. v3: Use efi_var_mem_ins() when restoring variables from file. Remove EFI_VARIABLE_READ_ONLY attribute in runtime GetVariable(). Avoid setting efi_runtime_services.set_variable twice. v2: Rebase the series to consider OP-TEE based variables and authenticated variables. Do not enable SetVariable() at runtime as we cannot persist non-volatile variables at runtime. Display read-only attribute in printenv -e. Heinrich Schuchardt (17): efi_loader: prepare for read only OP-TEE variables efi_loader: display RO attribute in printenv -e efi_loader: separate UEFI variable API from implemementation efi_loader: OsIndicationsSupported, PlatformLangCodes efi_loader: simplify boot manager efi_loader: keep attributes in efi_set_variable_int efi_loader: value of VendorKeys efi_loader: read-only AuditMode and DeployedMode efi_loader: secure boot flag efi_loader: UEFI variable persistence efi_loader: export efi_convert_pointer() efi_loader: optional pointer for ConvertPointer efi_loader: new function efi_memcpy_runtime() efi_loader: memory buffer for variables efi_loader: use memory based variable storage efi_loader: enable UEFI variables at runtime efi_selftest: adjust runtime test for variables cmd/nvedit_efi.c | 24 +- doc/api/efi.rst | 2 + include/efi_api.h | 2 + include/efi_loader.h | 6 + include/efi_variable.h | 198 +++++ lib/efi_loader/Kconfig | 8 + lib/efi_loader/Makefile | 3 + lib/efi_loader/efi_bootmgr.c | 28 +- lib/efi_loader/efi_runtime.c | 35 +- lib/efi_loader/efi_setup.c | 59 +- lib/efi_loader/efi_var_common.c | 140 +++ lib/efi_loader/efi_var_file.c | 239 +++++ lib/efi_loader/efi_var_mem.c | 266 ++++++ lib/efi_loader/efi_variable.c | 836 ++++-------------- lib/efi_loader/efi_variable_tee.c | 130 +-- .../efi_selftest_variables_runtime.c | 13 +- 16 files changed, 1162 insertions(+), 827 deletions(-) create mode 100644 include/efi_variable.h create mode 100644 lib/efi_loader/efi_var_common.c create mode 100644 lib/efi_loader/efi_var_file.c create mode 100644 lib/efi_loader/efi_var_mem.c -- 2.27.0

1 17

[GIT PULL] UniPhier SoC updates for v2020.10
by Masahiro Yamada 11 Jul '20

11 Jul '20

Hi Tom, Please pull changes for v2020.10 Thanks. The following changes since commit 3113c84ba25ec3ceae072cc5ad450c4238425939: Merge tag 'rpi-next-2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-raspberrypi (2020-07-10 14:31:22 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier.git tags/uniphier-v2020.10 for you to fetch changes up to 5785950369cd68d4409bf4d0e34d4b1894e5d0e9: ARM: uniphier: remove NAND reset code (2020-07-11 21:56:51 +0900) ---------------------------------------------------------------- UniPhier SoC updates for v2020.10 - remove workaround for Cortex-A72 - increase U-Boot proper size to 2MB - sync DT with Linux - add system bus controller driver - improve serial driver - add reset assertion to Denali NAND driver ---------------------------------------------------------------- Ley Foon Tan (2): mtd: nand: raw: denali: Assert reset before deassert mtd: nand: raw: denali: Wait for reset completion status Masahiro Yamada (14): Revert "ARM: uniphier: add weird workaround code for LD20" ARM: uniphier: increase CONFIG_SYS_MONITOR_LEN to 2MB ARM: uniphier: consolidate SoC select menu ARM: uniphier: sync with Linux 5.8-rc4 ARM: uniphier: fix build error when CONFIG_MICRO_SUPPORT_CARD=n ARM: uniphier: remove unused uniphier_sbc_init_admulti() ARM: uniphier: remove support for NOR Flash on support card bus: uniphier-system-bus: add UniPhier System Bus driver bus: uniphier-system-bus: move hardware init from board files ARM: uniphier: remove sbc/ directory serial: uniphier: use register macros instead of structure serial: uniphier: flush transmitter before changing hardware settings serial: uniphier: enable FIFO ARM: uniphier: remove NAND reset code arch/arm/dts/uniphier-ld11-global.dts | 1 + arch/arm/dts/uniphier-ld11-ref.dts | 1 + arch/arm/dts/uniphier-ld11.dtsi | 16 ++++++- arch/arm/dts/uniphier-ld20-global.dts | 1 + arch/arm/dts/uniphier-ld20-ref.dts | 1 + arch/arm/dts/uniphier-ld20.dtsi | 28 +++++++++--- arch/arm/dts/uniphier-ld4.dtsi | 2 + arch/arm/dts/uniphier-ld6b-ref.dts | 1 + arch/arm/dts/uniphier-pro4-ace.dts | 1 + arch/arm/dts/uniphier-pro4-ref.dts | 1 + arch/arm/dts/uniphier-pro4.dtsi | 10 +++++ arch/arm/dts/uniphier-pro5.dtsi | 16 ++++++- arch/arm/dts/uniphier-pxs2-gentil.dts | 1 + arch/arm/dts/uniphier-pxs2-vodka.dts | 1 + arch/arm/dts/uniphier-pxs2.dtsi | 16 ++++++- arch/arm/dts/uniphier-pxs3-ref.dts | 28 ++++++++++++ arch/arm/dts/uniphier-pxs3.dtsi | 59 +++++++++++++++++++++++- arch/arm/dts/uniphier-sld8.dtsi | 2 + arch/arm/mach-uniphier/Kconfig | 34 +++++++------- arch/arm/mach-uniphier/Makefile | 2 - arch/arm/mach-uniphier/arm64/Makefile | 1 - arch/arm/mach-uniphier/arm64/lowlevel_init.S | 13 ------ arch/arm/mach-uniphier/board_init.c | 44 ++++++++++++------ arch/arm/mach-uniphier/boot-device/boot-device.c | 9 +++- arch/arm/mach-uniphier/init.h | 35 --------------- arch/arm/mach-uniphier/micro-support-card.c | 110 +++++---------------------------------------- arch/arm/mach-uniphier/nand-reset.c | 43 ------------------ arch/arm/mach-uniphier/sbc/Makefile | 15 ------- arch/arm/mach-uniphier/sbc/sbc-boot.c | 13 ------ arch/arm/mach-uniphier/sbc/sbc-ld11.c | 26 ----------- arch/arm/mach-uniphier/sbc/sbc-ld4.c | 25 ----------- arch/arm/mach-uniphier/sbc/sbc-pxs2.c | 23 ---------- arch/arm/mach-uniphier/sbc/sbc-regs.h | 82 --------------------------------- arch/arm/mach-uniphier/sbc/sbc.c | 95 --------------------------------------- configs/uniphier_ld4_sld8_defconfig | 4 -- configs/uniphier_v7_defconfig | 3 -- configs/uniphier_v8_defconfig | 3 -- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/bus/Kconfig | 16 +++++++ drivers/bus/Makefile | 6 +++ drivers/bus/uniphier-system-bus.c | 100 +++++++++++++++++++++++++++++++++++++++++ drivers/mtd/nand/raw/denali.c | 11 +++++ drivers/mtd/nand/raw/denali.h | 1 + drivers/mtd/nand/raw/denali_dt.c | 8 +++- drivers/serial/serial_uniphier.c | 90 +++++++++++++++++++------------------ include/configs/uniphier.h | 24 +--------- 47 files changed, 432 insertions(+), 593 deletions(-) delete mode 100644 arch/arm/mach-uniphier/arm64/lowlevel_init.S delete mode 100644 arch/arm/mach-uniphier/nand-reset.c delete mode 100644 arch/arm/mach-uniphier/sbc/Makefile delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-boot.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-ld11.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-ld4.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-pxs2.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-regs.h delete mode 100644 arch/arm/mach-uniphier/sbc/sbc.c create mode 100644 drivers/bus/Kconfig create mode 100644 drivers/bus/Makefile create mode 100644 drivers/bus/uniphier-system-bus.c

2 1

[PATCH v3 00/25] x86: Enhance MTRR functionality to support multiple CPUs
by Simon Glass 11 Jul '20

11 Jul '20

At present MTRRs are mirrored to the secondary CPUs only once, as those CPUs are started up. But U-Boot may add more MTRRs later, e.g. if it decides that a video console must be set up. This series enhances the x86 multi-processor support to allow MTRRs to be updated at any time. It also updates the 'mtrr' command to support setting the MTRRs on CPUs other than the boot CPU. Changes in v3: - Update bsp_do_flight_plan() to say 'on the BSP' - s/slow/slot/ - Use C code instead of assembler to read/write callback pointers - Update commit message to mention dropping of cpu_map - Rename flag to GD_FLG_SMP_READY - Rename flag to GD_FLG_SMP_READY - Add a comment to run_ap_work() - Rename flag to GD_FLG_SMP_READY - Update the comment for run_ap_work() to explain logical_cpu_number - Clarify meaning of @cpu_select in mp_run_on_cpus() comment - Update the comment for mp_park_aps() - Add more comments on how the iterators work - Mention that the CPU number is in hex - Remove stray asterisk from comments - Drop mention of cpu_map which was handled in a previous patch Changes in v2: - Add comments to explain what start_aps() does - Drop change to include/dm/uclass.h - Mention error return in get_bsp() - Add more comments - Rename mtrr_save_all() to mtrr_read_all() - Add a new patch to avoid enabling SMP in SPL - Add new patch to add AP_DEFAULT_BASE to coral's memory map - Rename function to mtrr_write_all() - Keep things building by temporarily renaming the function in cmd/ - Drop the renamed mtrr_set_valid_() instead of mtrr_set_valid() - Add a new patch with more comments Simon Glass (25): x86: mp_init: Switch to livetree x86: Move MP code into mp_init x86: mp_init: Avoid declarations in header files x86: mp_init: Switch parameter names in start_aps() x86: mp_init: Drop the num_cpus static variable x86: mtrr: Fix 'ensable' typo x86: mp_init: Set up the CPU numbers at the start x86: mp_init: Adjust bsp_init() to return more information x86: cpu: Remove unnecessary #ifdefs x86: mp: Support APs waiting for instructions global_data: Add a generic global_data flag for SMP state x86: Set the SMP flag when MP init is complete x86: mp: Allow running functions on multiple CPUs x86: mp: Park CPUs before running the OS x86: mp: Add iterators for CPUs x86: mtrr: Use MP calls to list the MTRRs x86: Don't enable SMP in SPL x86: coral: Update the memory map x86: mtrr: Update MTRRs on all CPUs x86: mtrr: Add support for writing to MTRRs on any CPU x86: mtrr: Update the command to use the new mtrr calls x86: mtrr: Restructure so command execution is in one place x86: mtrr: Update 'mtrr' to allow setting MTRRs on any CPU x86: mp: Add more comments to the module x86: mtrr: Enhance 'mtrr' command to list MTRRs on any CPU arch/x86/cpu/Makefile | 2 +- arch/x86/cpu/cpu.c | 63 ++-- arch/x86/cpu/i386/cpu.c | 26 +- arch/x86/cpu/mp_init.c | 514 ++++++++++++++++++++++---- arch/x86/cpu/mtrr.c | 149 ++++++++ arch/x86/include/asm/mp.h | 134 ++++++- arch/x86/include/asm/mtrr.h | 51 +++ cmd/x86/mtrr.c | 148 +++++--- doc/board/google/chromebook_coral.rst | 1 + include/asm-generic/global_data.h | 1 + 10 files changed, 900 insertions(+), 189 deletions(-) -- 2.27.0.212.ge8ba1cc988-goog

2 35

[PATCH v5 14/25] x86: mp: Park CPUs before running the OS
by Simon Glass 11 Jul '20

11 Jul '20

With the new MP features the CPUs are no-longer parked when the OS is run. Fix this by calling a special function to park them, just before the OS is started. Signed-off-by: Simon Glass <sjg(a)chromium.org> Reviewed-by: Wolfgang Wallner <wolfgang.wallner(a)br-automation.com> --- Changes in v5: - Drop timing in mp_park_aps() Changes in v3: - Update the comment for mp_park_aps() arch/x86/cpu/cpu.c | 5 +++++ arch/x86/cpu/mp_init.c | 16 ++++++++++++++++ arch/x86/include/asm/mp.h | 17 +++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index d0720fb7fb..baa7dae172 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -66,6 +66,11 @@ static const char *const x86_vendor_name[] = { int __weak x86_cleanup_before_linux(void) { + int ret; + + ret = mp_park_aps(); + if (ret) + return log_msg_ret("park", ret); bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH_ADDR, CONFIG_BOOTSTAGE_STASH_SIZE); diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index dd6d6bfab7..427ec8fc23 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -668,6 +668,22 @@ int mp_run_on_cpus(int cpu_select, mp_run_func func, void *arg) return 0; } +static void park_this_cpu(void *unused) +{ + stop_this_cpu(); +} + +int mp_park_aps(void) +{ + int ret; + + ret = mp_run_on_cpus(MP_SELECT_APS, park_this_cpu, NULL); + if (ret) + return log_ret(ret); + + return 0; +} + int mp_init(void) { int num_aps, num_cpus; diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h index eb49e690f2..f9d6c8e6bf 100644 --- a/arch/x86/include/asm/mp.h +++ b/arch/x86/include/asm/mp.h @@ -109,6 +109,15 @@ typedef void (*mp_run_func)(void *arg); * @return 0 on success, -ve on error */ int mp_run_on_cpus(int cpu_select, mp_run_func func, void *arg); + +/** + * mp_park_aps() - Park the APs ready for the OS + * + * This halts all CPUs except the main one, ready for the OS to use them + * + * @return 0 if OK, -ve on error + */ +int mp_park_aps(void); #else static inline int mp_run_on_cpus(int cpu_select, mp_run_func func, void *arg) { @@ -117,6 +126,14 @@ static inline int mp_run_on_cpus(int cpu_select, mp_run_func func, void *arg) return 0; } + +static inline int mp_park_aps(void) +{ + /* No APs to park */ + + return 0; +} + #endif #endif /* _X86_MP_H_ */ -- 2.27.0.389.gc38d7665816-goog

1 0

[PATCH] ARM: uniphier: remove NAND reset code
by Masahiro Yamada 11 Jul '20

11 Jul '20

Now that commit fceee65c878c ("mtd: nand: raw: denali: Assert reset before deassert") added the reset assertion, this code in the board file is unneeded. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/mach-uniphier/Makefile | 1 - arch/arm/mach-uniphier/board_init.c | 4 --- arch/arm/mach-uniphier/init.h | 7 ----- arch/arm/mach-uniphier/nand-reset.c | 43 ----------------------------- 4 files changed, 55 deletions(-) delete mode 100644 arch/arm/mach-uniphier/nand-reset.c diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile index e7eba75eed..38b6d904f4 100644 --- a/arch/arm/mach-uniphier/Makefile +++ b/arch/arm/mach-uniphier/Makefile @@ -22,7 +22,6 @@ endif obj-$(CONFIG_MICRO_SUPPORT_CARD) += micro-support-card.o obj-y += pinctrl-glue.o obj-$(CONFIG_MMC) += mmc-first-dev.o -obj-$(CONFIG_NAND_DENALI) += nand-reset.o obj-y += fdt-fixup.o endif diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index 39df91982c..528074f547 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -125,10 +125,6 @@ int board_init(void) if (initdata->misc_init) initdata->misc_init(); - led_puts("U3"); - - uniphier_nand_reset_assert(); - led_puts("Uboo"); return 0; diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h index a20cafdfad..dd978c0208 100644 --- a/arch/arm/mach-uniphier/init.h +++ b/arch/arm/mach-uniphier/init.h @@ -75,13 +75,6 @@ int uniphier_have_internal_stm(void); int uniphier_boot_from_backend(void); int uniphier_pin_init(const char *pinconfig_name); -#ifdef CONFIG_NAND_DENALI -void uniphier_nand_reset_assert(void); -#else -static inline void uniphier_nand_reset_assert(void) -{ -} -#endif #ifdef CONFIG_ARM64 void uniphier_mem_map_init(unsigned long dram_base, unsigned long dram_size); #else diff --git a/arch/arm/mach-uniphier/nand-reset.c b/arch/arm/mach-uniphier/nand-reset.c deleted file mode 100644 index 11cadaabd8..0000000000 --- a/arch/arm/mach-uniphier/nand-reset.c +++ /dev/null @@ -1,43 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 or later -/* - * Copyright (C) 2020 Socionext Inc. - * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> - */ - -#include <linux/errno.h> -#include <dm.h> -#include <dm/uclass-internal.h> -#include <reset.h> - -#include "init.h" - -/* - * Assert the Denali NAND controller reset if found. - * - * On LD4, the bootstrap process starts running after power-on reset regardless - * of the boot mode, here the pin-mux is not necessarily set up for NAND, then - * the controller is stuck. Assert the controller reset here, and should be - * deasserted in the driver after the pin-mux is correctly handled. For other - * SoCs, the bootstrap runs only when the boot mode selects ONFi, but it is yet - * effective when the boot swap is on. So, the reset should be asserted anyway. - */ -void uniphier_nand_reset_assert(void) -{ - struct udevice *dev; - struct reset_ctl_bulk resets; - int ret; - - ret = uclass_find_first_device(UCLASS_MTD, &dev); - if (ret || !dev) - return; - - /* make sure this is the Denali NAND controller */ - if (strcmp(dev->driver->name, "denali-nand-dt")) - return; - - ret = reset_get_bulk(dev, &resets); - if (ret) - return; - - reset_assert_bulk(&resets); -} -- 2.25.1

2 1

[PATCH 1/3] serial: uniphier: use register macros instead of structure
by Masahiro Yamada 11 Jul '20

11 Jul '20

After all, I am not a big fan of using a structure to represent the hardware register map. You do not need to know the entire register map. Add only necessary register macros. Use FIELD_PREP() instead of maintaining a pair of shift and mask. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/serial/serial_uniphier.c | 75 ++++++++++++++------------------ 1 file changed, 32 insertions(+), 43 deletions(-) diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c index c7f46e5598..2ffab004bd 100644 --- a/drivers/serial/serial_uniphier.c +++ b/drivers/serial/serial_uniphier.c @@ -7,6 +7,8 @@ #include <common.h> #include <dm.h> +#include <linux/bitfield.h> +#include <linux/bitops.h> #include <linux/bug.h> #include <linux/io.h> #include <linux/serial_reg.h> @@ -15,77 +17,67 @@ #include <serial.h> #include <fdtdec.h> -/* - * Note: Register map is slightly different from that of 16550. - */ -struct uniphier_serial { - u32 rx; /* In: Receive buffer */ -#define tx rx /* Out: Transmit buffer */ - u32 ier; /* Interrupt Enable Register */ - u32 iir; /* In: Interrupt ID Register */ - u32 char_fcr; /* Charactor / FIFO Control Register */ - u32 lcr_mcr; /* Line/Modem Control Register */ -#define LCR_SHIFT 8 -#define LCR_MASK (0xff << (LCR_SHIFT)) - u32 lsr; /* In: Line Status Register */ - u32 msr; /* In: Modem Status Register */ - u32 __rsv0; - u32 __rsv1; - u32 dlr; /* Divisor Latch Register */ -}; +#define UNIPHIER_UART_REGSHIFT 2 + +#define UNIPHIER_UART_RX (0 << (UNIPHIER_UART_REGSHIFT)) +#define UNIPHIER_UART_TX UNIPHIER_UART_RX +/* bit[15:8] = CHAR, bit[7:0] = FCR */ +#define UNIPHIER_UART_CHAR_FCR (3 << (UNIPHIER_UART_REGSHIFT)) +/* bit[15:8] = LCR, bit[7:0] = MCR */ +#define UNIPHIER_UART_LCR_MCR (4 << (UNIPHIER_UART_REGSHIFT)) +#define UNIPHIER_UART_LCR_MASK GENMASK(15, 8) +#define UNIPHIER_UART_LSR (5 << (UNIPHIER_UART_REGSHIFT)) +/* Divisor Latch Register */ +#define UNIPHIER_UART_DLR (9 << (UNIPHIER_UART_REGSHIFT)) struct uniphier_serial_priv { - struct uniphier_serial __iomem *membase; + void __iomem *membase; unsigned int uartclk; }; -#define uniphier_serial_port(dev) \ - ((struct uniphier_serial_priv *)dev_get_priv(dev))->membase - static int uniphier_serial_setbrg(struct udevice *dev, int baudrate) { struct uniphier_serial_priv *priv = dev_get_priv(dev); - struct uniphier_serial __iomem *port = uniphier_serial_port(dev); - const unsigned int mode_x_div = 16; + static const unsigned int mode_x_div = 16; unsigned int divisor; divisor = DIV_ROUND_CLOSEST(priv->uartclk, mode_x_div * baudrate); - writel(divisor, &port->dlr); + writel(divisor, priv->membase + UNIPHIER_UART_DLR); return 0; } static int uniphier_serial_getc(struct udevice *dev) { - struct uniphier_serial __iomem *port = uniphier_serial_port(dev); + struct uniphier_serial_priv *priv = dev_get_priv(dev); - if (!(readl(&port->lsr) & UART_LSR_DR)) + if (!(readl(priv->membase + UNIPHIER_UART_LSR) & UART_LSR_DR)) return -EAGAIN; - return readl(&port->rx); + return readl(priv->membase + UNIPHIER_UART_RX); } static int uniphier_serial_putc(struct udevice *dev, const char c) { - struct uniphier_serial __iomem *port = uniphier_serial_port(dev); + struct uniphier_serial_priv *priv = dev_get_priv(dev); - if (!(readl(&port->lsr) & UART_LSR_THRE)) + if (!(readl(priv->membase + UNIPHIER_UART_LSR) & UART_LSR_THRE)) return -EAGAIN; - writel(c, &port->tx); + writel(c, priv->membase + UNIPHIER_UART_TX); return 0; } static int uniphier_serial_pending(struct udevice *dev, bool input) { - struct uniphier_serial __iomem *port = uniphier_serial_port(dev); + struct uniphier_serial_priv *priv = dev_get_priv(dev); if (input) - return readl(&port->lsr) & UART_LSR_DR; + return readl(priv->membase + UNIPHIER_UART_LSR) & UART_LSR_DR; else - return !(readl(&port->lsr) & UART_LSR_THRE); + return !(readl(priv->membase + UNIPHIER_UART_LSR) & UART_LSR_THRE); } /* @@ -113,7 +105,6 @@ static const struct uniphier_serial_clk_data uniphier_serial_clk_data[] = { static int uniphier_serial_probe(struct udevice *dev) { struct uniphier_serial_priv *priv = dev_get_priv(dev); - struct uniphier_serial __iomem *port; const struct uniphier_serial_clk_data *clk_data; ofnode root_node; fdt_addr_t base; @@ -123,12 +114,10 @@ static int uniphier_serial_probe(struct udevice *dev) if (base == FDT_ADDR_T_NONE) return -EINVAL; - port = devm_ioremap(dev, base, SZ_64); - if (!port) + priv->membase = devm_ioremap(dev, base, SZ_64); + if (!priv->membase) return -ENOMEM; - priv->membase = port; - root_node = ofnode_path("/"); clk_data = uniphier_serial_clk_data; while (clk_data->compatible) { @@ -143,10 +132,10 @@ static int uniphier_serial_probe(struct udevice *dev) priv->uartclk = clk_data->clk_rate; - tmp = readl(&port->lcr_mcr); - tmp &= ~LCR_MASK; - tmp |= UART_LCR_WLEN8 << LCR_SHIFT; - writel(tmp, &port->lcr_mcr); + tmp = readl(priv->membase + UNIPHIER_UART_LCR_MCR); + tmp &= ~UNIPHIER_UART_LCR_MASK; + tmp |= FIELD_PREP(UNIPHIER_UART_LCR_MASK, UART_LCR_WLEN8); + writel(tmp, priv->membase + UNIPHIER_UART_LCR_MCR); return 0; } -- 2.25.1

2 3

[PATCH 01/10] Revert "ARM: uniphier: add weird workaround code for LD20"
by Masahiro Yamada 11 Jul '20

11 Jul '20

This reverts commit 45f41c134baf5ff1bbf59d33027f6c79884fa4d9. This weird workaround was the best I came up with at that time to boot U-Boot from TF-A. I noticed U-Boot successfully boots on LD20 (i.e. CA72 CPU) by using the latest TF-A. Specifically, since the following TF-A commit, U-Boot runs at EL2 instead of EL1, and this issue went away as a side-effect. |commit f998a052fd94ea082833109f25b94ed5bfa24e8b |Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> |Date: Thu Jul 25 10:57:38 2019 +0900 | | uniphier: run BL33 at EL2 | | All the SoCs in 64-bit UniPhier SoC family support EL2. | | Just hard-code MODE_EL2 instead of using el_implemented() helper. | | Change-Id: I7ab48002c5205bc8c013e1b46313b57d6c431db0 | Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> However, if I reverted that, this problem would come back, presumably because some EL1 code in U-Boot triggers this issue. Now that commit f8ddd8cbb513 ("arm64: issue ISB after updating system registers") fixed this issue properly, this weird workaround is no longer needed irrespective of the exception level at which U-Boot runs. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/mach-uniphier/arm64/Makefile | 1 - arch/arm/mach-uniphier/arm64/lowlevel_init.S | 13 ------------- 2 files changed, 14 deletions(-) delete mode 100644 arch/arm/mach-uniphier/arm64/lowlevel_init.S diff --git a/arch/arm/mach-uniphier/arm64/Makefile b/arch/arm/mach-uniphier/arm64/Makefile index c569551120..750c4f756e 100644 --- a/arch/arm/mach-uniphier/arm64/Makefile +++ b/arch/arm/mach-uniphier/arm64/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0+ obj-y += mem_map.o -obj-$(CONFIG_ARCH_UNIPHIER_LD20) += lowlevel_init.o diff --git a/arch/arm/mach-uniphier/arm64/lowlevel_init.S b/arch/arm/mach-uniphier/arm64/lowlevel_init.S deleted file mode 100644 index f4e5cbbbd1..0000000000 --- a/arch/arm/mach-uniphier/arm64/lowlevel_init.S +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2017 Socionext Inc. - */ - -#include <linux/linkage.h> - -ENTRY(lowlevel_init) - /* LD20 needs the following code to boot. I do not know why. */ - mrs x0, sctlr_el1 - msr sctlr_el1, x0 - ret -ENDPROC(lowlevel_init) -- 2.25.1

2 10

[PATCH v2 1/1] CI: show skipped Python tests
by Heinrich Schuchardt 11 Jul '20

11 Jul '20

Call pytest3 with argument -ra to display the reason why Python tests are skipped. The -r flag displays a test summary info for each test. -ra eliminates this info for passed tests. Pros an cons were discussed in: https://lists.denx.de/pipermail/u-boot/2020-June/417090.html Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2: Update testing in Azure and Travis too. See discussion in https://lists.denx.de/pipermail/u-boot/2020-June/417090.html --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- .travis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 9f88a539c0..98e8a4fe14 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -316,7 +316,7 @@ jobs: export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH}; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci; # "${var:+"-k $var"}" expands to "" if $var is empty, "-k $var" if not - ./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID} ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} --build-dir "$UBOOT_TRAVIS_BUILD_DIR"; + ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID} ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} --build-dir "$UBOOT_TRAVIS_BUILD_DIR"; # the below corresponds to .gitlab-ci.yml "after_script" rm -rf /tmp/uboot-test-hooks /tmp/venv EOF diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a685a7879d..d0746955b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ stages: # "${var:+"-k $var"}" expands to "" if $var is empty, "-k $var" if not - export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH}; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci; - ./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID} + ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID} ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} --build-dir "$UBOOT_TRAVIS_BUILD_DIR" diff --git a/.travis.yml b/.travis.yml index a042aa2c7d..1ff140855e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -250,7 +250,7 @@ script: virtualenv -p /usr/bin/python3 /tmp/venv; . /tmp/venv/bin/activate; pip install -r test/py/requirements.txt; - ./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID} + ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID} ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} --build-dir "$UBOOT_TRAVIS_BUILD_DIR" || exit; if [[ -n "${TEST_PY_TOOLS}" ]]; then -- 2.27.0

2 1

Please pull u-boot-dm
by Simon Glass 11 Jul '20

11 Jul '20

Hi Tom, Results here: https://gitlab.denx.de/u-boot/custodians/u-boot-dm/pipelines/3981 The following changes since commit 506d52308a2f5de48c2b9a08229fee9a0ee2842a: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86 (2020-07-09 09:54:22 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-10jul20 for you to fetch changes up to 6c3fc50ee59366df62e8345ea9fd86c3ace0c3f1: dtoc: add test for cd-gpios (2020-07-09 22:00:29 -0600) ---------------------------------------------------------------- of-platdata: better phandle and compatible-string support patman support for Python3 on Ubuntu 14.04 new checkpatch check to avoid #ifdefs ---------------------------------------------------------------- Bin Meng (3): test/dm: fdtdec: Add the missing gd declaration test/dm: fdtdec: Corect a typo in dm_test_fdtdec_set_carveout() test/dm: fdtdec: Add tests for fdtdec_add_reserved_memory() Heinrich Schuchardt (7): sandbox: handling out of memory sandbox: spi: sandbox_sf_state_name() is required sandbox: make RAM size configurable log: uclass_get_name() depends on CONFIG_SPL_DM log: don't show function by default log: use BIT() instead of 1 << cmd: fdt: remove CMD_FDT_MAX_DUMP Simon Glass (12): patman: Drop unnecessary import in gitutil patman: Avoid circular dependency between command and tools patman: Use a dict in gitutil to avoid importing series patman: Pass in maintainer dirs to avoid and import patman: Avoid importing gitutil in settings patman: Drop import of test_util in test_util dm: core: Correct comment on uclass_id_foreach_dev() patman: Rename test.py to test_checkpatch.py patman: Add a test for the 'possible new uclass' check patman: Decode output from the '--show-types' option patman: Add tests for the rest of the checkpatch checks checkpatch: Don't warn about PREFER_IF in headers/DT files Walter Lozano (14): drivers: rename drivers to match compatible string dtoc: add missing code comments core: add support for U_BOOT_DRIVER_ALIAS dtoc: add support to scan drivers dtoc: add option to disable warnings dm: doc: update of-plat with the support for driver aliases core: drop const for struct driver_info core: extend struct driver_info to point to device sandbox: Move section u_boot_list to make it RW dtoc: extend dtoc to use struct driver_info when linking nodes dm: doc: update of-plat with new phandle support arm: dts: include gpio nodes for card detect dtoc: update dtb_platdata to support cd-gpios dtoc: add test for cd-gpios arch/arm/dts/da850-evm-u-boot.dtsi | 4 + arch/arm/dts/da850-lcdk-u-boot.dtsi | 4 + arch/arm/dts/rk3288-u-boot.dtsi | 4 + arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-veyron-u-boot.dtsi | 11 ++ arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c | 6 +- arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c | 10 +- arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 4 +- arch/sandbox/Kconfig | 10 ++ arch/sandbox/cpu/state.c | 5 +- arch/sandbox/cpu/u-boot-spl.lds | 2 +- arch/sandbox/include/asm/state.h | 2 +- board/davinci/da8xxevm/omapl138_lcdk.c | 2 +- board/sandbox/sandbox.c | 2 +- cmd/fdt.c | 11 +- cmd/log.c | 4 +- common/Kconfig | 18 +++ common/log.c | 6 +- common/log_console.c | 14 +- common/log_syslog.c | 14 +- doc/driver-model/of-plat.rst | 38 +++-- drivers/clk/at91/clk-master.c | 4 +- drivers/clk/at91/clk-peripheral.c | 4 +- drivers/clk/at91/pmc.c | 6 +- drivers/clk/clk-uclass.c | 11 +- drivers/core/device.c | 28 +++- drivers/core/root.c | 6 +- drivers/core/simple-bus.c | 4 +- drivers/gpio/at91_gpio.c | 4 +- drivers/gpio/da8xx_gpio.c | 4 +- drivers/gpio/mxs_gpio.c | 8 +- drivers/gpio/rk_gpio.c | 4 +- drivers/gpio/sandbox.c | 6 +- drivers/i2c/rk_i2c.c | 6 +- drivers/input/cros_ec_keyb.c | 4 +- drivers/misc/cros_ec_sandbox.c | 4 +- drivers/misc/irq-uclass.c | 10 +- drivers/mmc/davinci_mmc.c | 2 +- drivers/mmc/ftsdc010_mci.c | 2 +- drivers/mmc/mxsmmc.c | 7 +- drivers/mmc/rockchip_dw_mmc.c | 7 +- drivers/mmc/rockchip_sdhci.c | 2 +- drivers/mtd/spi/sandbox.c | 2 - drivers/mtd/spi/sf-uclass.c | 2 +- drivers/mtd/spi/sf_probe.c | 6 +- drivers/pinctrl/nxp/pinctrl-mxs.c | 6 +- drivers/pinctrl/pinctrl-at91.c | 6 +- drivers/pinctrl/rockchip/pinctrl-rk3188.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3288.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3328.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3368.c | 2 +- drivers/power/pmic/rk8xx.c | 6 +- drivers/power/regulator/fixed.c | 4 +- drivers/ram/rockchip/dmc-rk3368.c | 2 +- drivers/ram/rockchip/sdram_rk3188.c | 2 +- drivers/ram/rockchip/sdram_rk3288.c | 2 +- drivers/ram/rockchip/sdram_rk3328.c | 2 +- drivers/ram/rockchip/sdram_rk3399.c | 2 +- drivers/serial/ns16550.c | 4 + drivers/serial/sandbox.c | 10 +- drivers/spi/mxs_spi.c | 8 +- drivers/spi/rk_spi.c | 10 +- drivers/spi/sandbox_spi.c | 4 +- drivers/tpm/tpm_tis_sandbox.c | 4 +- drivers/video/rockchip/rk3288_vop.c | 4 +- drivers/video/sandbox_sdl.c | 4 +- drivers/watchdog/at91sam9_wdt.c | 4 +- include/clk.h | 4 +- include/configs/sandbox.h | 5 +- include/dm/device-internal.h | 2 +- include/dm/device.h | 22 +++ include/dm/platdata.h | 14 ++ include/dm/uclass.h | 2 +- include/log.h | 18 ++- scripts/checkpatch.pl | 2 +- test/dm/fdtdec.c | 73 ++++++++- test/dm/gpio.c | 2 +- test/dm/spi.c | 6 +- test/log/syslog_test.c | 20 ++- test/py/tests/test_bind.py | 54 +++---- test/py/tests/test_log.py | 2 + tools/dtoc/dtb_platdata.py | 148 ++++++++++++++++-- tools/dtoc/dtoc_test_driver_alias.dts | 20 +++ tools/dtoc/dtoc_test_invalid_driver.dts | 15 ++ tools/dtoc/dtoc_test_phandle_cd_gpios.dts | 42 +++++ tools/dtoc/test_dtoc.py | 287 ++++++++++++++++++++++++++--------- tools/patman/checkpatch.py | 24 +-- tools/patman/command.py | 7 +- tools/patman/get_maintainer.py | 14 +- tools/patman/gitutil.py | 10 +- tools/patman/main.py | 6 +- tools/patman/series.py | 3 +- tools/patman/settings.py | 7 +- tools/patman/{test.py => test_checkpatch.py} | 125 ++++++++++++++- tools/patman/test_util.py | 1 - 95 files changed, 1030 insertions(+), 313 deletions(-) create mode 100644 arch/arm/dts/rk3288-veyron-u-boot.dtsi create mode 100644 tools/dtoc/dtoc_test_driver_alias.dts create mode 100644 tools/dtoc/dtoc_test_invalid_driver.dts create mode 100644 tools/dtoc/dtoc_test_phandle_cd_gpios.dts rename tools/patman/{test.py => test_checkpatch.py} (69%) Regards, SImon

2 1