May 2020 - U-Boot

[PATCH 0/8] CLK: ARC: HSDK: add separate clock map for HSDK-4xD
by Eugeniy Paltsev 08 May '20

08 May '20

HSDK and HSDK-4xD clock trees are slightly different. commit 1dfb2ec0d7fb ("ARC: HSDK: CGU: add support for timer clock") introduce regression for HSDK board cause crash when setting tunnel clock. Fix that and do required code cleanup. Eugeniy Paltsev (8): CLK: ARC: HSDK: avoid code duplication CLK: ARC: HSDK: drop unused offset CLK: ARC: HSDK: use appropriate config data types CLK: ARC: HSDK: driver cleanup CLK: ARC: HSDK: prepare for multiple clock maps support CLK: ARC: HSDK: make set_clock optional CLK: ARC: HSDK: define clock map with DT binding constants CLK: ARC: HSDK: add separate clock map for HSDK-4xD drivers/clk/Kconfig | 7 +- drivers/clk/clk-hsdk-cgu.c | 355 +++++++++++++++++++++---------------- 2 files changed, 202 insertions(+), 160 deletions(-) -- 2.21.3

1 8

None
by Patrick Wildt 08 May '20

08 May '20

Bcc: Subject: Re: [PATCH 2/3] mksunxi_fit_atf.sh: Update FIT component descriptions Reply-To: In-Reply-To: <20200507232035.31892-2-samuel(a)sholland.org> Hi, now this really confuses me. commit 0db0ba6141f402b1d496ef53d9fa69978f75ec61 has explicitly made u-boot the firmware and moved atf into the loadables on NXP i.MX. Here you do the complete opposite for sunxi. Can people please make up their minds how it is *supposed* to work? Oh, and your previous diff about the "minimal os parsing", I need that too for my use-case, so I like that one! Patrick On Thu, May 07, 2020 at 06:20:34PM -0500, Samuel Holland wrote: > Since commit d879616e9e64 ("spl: fit: simplify logic for FDT loading for > non-OS boots"), the SPL looks at the "os" properties of FIT images to > determine where to append the FDT. > > The "os" property of the "firmware" image also determines how to execute > the next stage of the boot process, as in 1d3790905d9c ("spl: atf: > introduce spl_invoke_atf and make bl31_entry private"). > > To support this additional functionality, and to properly model the boot > process, where ATF runs before U-Boot, add the "os" properties and swap > the firmware/loadable images in the FIT image. > > Signed-off-by: Samuel Holland <samuel(a)sholland.org> > --- > board/sunxi/mksunxi_fit_atf.sh | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/board/sunxi/mksunxi_fit_atf.sh b/board/sunxi/mksunxi_fit_atf.sh > index 88ad719747..4dfd22db78 100755 > --- a/board/sunxi/mksunxi_fit_atf.sh > +++ b/board/sunxi/mksunxi_fit_atf.sh > @@ -31,6 +31,7 @@ cat << __HEADER_EOF > description = "U-Boot (64-bit)"; > data = /incbin/("u-boot-nodtb.bin"); > type = "standalone"; > + os = "u-boot"; > arch = "arm64"; > compression = "none"; > load = <0x4a000000>; > @@ -39,6 +40,7 @@ cat << __HEADER_EOF > description = "ARM Trusted Firmware"; > data = /incbin/("$BL31"); > type = "firmware"; > + os = "arm-trusted-firmware"; > arch = "arm64"; > compression = "none"; > load = <$BL31_ADDR>; > @@ -73,8 +75,8 @@ do > cat << __CONF_SECTION_EOF > config_$cnt { > description = "$(basename $dtname .dtb)"; > - firmware = "uboot"; > - loadables = "atf"; > + firmware = "atf"; > + loadables = "uboot"; > fdt = "fdt_$cnt"; > }; > __CONF_SECTION_EOF > -- > 2.24.1 >

1 0

[PATCH] efi_loader: image_loader: fix a Coverity check against array access
by AKASHI Takahiro 08 May '20

08 May '20

Coverity detected: Using "&opt->CheckSum" as an array. This might corrupt or misinterpret adjacent memory locations. The code should work as far as a structure, IMAGE_OPTIONAL_HEADER(64) is packed, but modify it in more logical form. Subsystem is a member next to CheckSum. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Reported-by: Coverity (CID 300339) --- lib/efi_loader/efi_image_loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 2f270e5497aa..894103c6e4dd 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -293,12 +293,12 @@ bool efi_image_parse(void *efi, size_t len, struct efi_image_regions **regp, efi_image_region_add(regs, efi, &opt->CheckSum, 0); if (nt64->OptionalHeader.NumberOfRvaAndSizes <= ctidx) { efi_image_region_add(regs, - &opt->CheckSum + 1, + &opt->Subsystem, efi + opt->SizeOfHeaders, 0); } else { /* Skip Certificates Table */ efi_image_region_add(regs, - &opt->CheckSum + 1, + &opt->Subsystem, &opt->DataDirectory[ctidx], 0); efi_image_region_add(regs, &opt->DataDirectory[ctidx] + 1, @@ -313,7 +313,7 @@ bool efi_image_parse(void *efi, size_t len, struct efi_image_regions **regp, IMAGE_OPTIONAL_HEADER32 *opt = &nt->OptionalHeader; efi_image_region_add(regs, efi, &opt->CheckSum, 0); - efi_image_region_add(regs, &opt->CheckSum + 1, + efi_image_region_add(regs, &opt->Subsystem, &opt->DataDirectory[ctidx], 0); efi_image_region_add(regs, &opt->DataDirectory[ctidx] + 1, efi + opt->SizeOfHeaders, 0); -- 2.25.2

1 0

[PATCH] efi_loader: variable: check a return value of uuid__str_to_bin()
by AKASHI Takahiro 08 May '20

08 May '20

The only error case is that a given UUID is in wrong format. So just return EFI_INVALID_PARAMETER here. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Reported-by: Coverity (CID 300333) --- lib/efi_loader/efi_variable.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index f40b194b13bf..38d21b9314f2 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -866,7 +866,10 @@ static efi_status_t parse_uboot_variable(char *variable, /* guid */ c = *(name - 1); *(name - 1) = '\0'; /* guid need be null-terminated here */ - uuid_str_to_bin(guid, (unsigned char *)vendor, UUID_STR_FORMAT_GUID); + if (uuid_str_to_bin(guid, (unsigned char *)vendor, + UUID_STR_FORMAT_GUID)) + /* The only error would be EINVAL. */ + return EFI_INVALID_PARAMETER; *(name - 1) = c; /* attributes */ -- 2.25.2

1 0

[PATCH] cmd: efidebug: fix a wrong handling of arguments
by AKASHI Takahiro 08 May '20

08 May '20

Coverity detected a dead code, but actually there is a bug in a check against a number of arguments. So simply fix it. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Reported-by: Coverity (CID 300330) --- cmd/efidebug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/efidebug.c b/cmd/efidebug.c index 70aba446a937..56bf9af77248 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -606,7 +606,7 @@ static int do_efi_boot_add(cmd_tbl_t *cmdtp, int flag, + sizeof(struct efi_device_path); /* for END */ /* optional data */ - if (argc < 6) + if (argc == 6) lo.optional_data = NULL; else lo.optional_data = (const u8 *)argv[6]; -- 2.25.2

1 0

[PATCH] cmd: efidebug: add a comment against Coverity check (300329)
by AKASHI Takahiro 08 May '20

08 May '20

The check here, "Null pointer dereferences," is a false positive. So leave a comment. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> Reported-by: Coverity (CID 300329) --- cmd/efidebug.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/efidebug.c b/cmd/efidebug.c index 9769aeeac58b..70aba446a937 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -481,6 +481,11 @@ static int do_efi_show_memmap(cmd_tbl_t *cmdtp, int flag, EFI_PHYS_ADDR_WIDTH - 5, spc, EFI_PHYS_ADDR_WIDTH - 3, spc); printf("================ %.*s %.*s ==========\n", EFI_PHYS_ADDR_WIDTH, sep, EFI_PHYS_ADDR_WIDTH, sep); + /* + * Coverity check: dereferencing null pointer "map." + * This is a false positive as memmap will always be + * populated by allocate_pool() above. + */ for (i = 0, map = memmap; i < map_size / sizeof(*map); map++, i++) { if (map->type < EFI_MAX_MEMORY_TYPE) type = efi_mem_type_string[map->type]; -- 2.25.2

1 0

[PATCH] ddr: k3-am654: EMIF Tool update to 2.02 for IO optimizations and fixes
by praneeth＠ti.com 08 May '20

08 May '20

From: Praneeth Bajjuri <praneeth(a)ti.com> EMIF tool for AM65x [1] is now updated from rev 1.98 to 2.02 This update includes * Optimizations in IO configuration. * Fix for byte enablement in GCR registers. * Fixes for PG2.0 including ZQ control. [1]: http://www.ti.com/lit/zip/sprcah7 Acked-by: James Doublesin <doublesin(a)ti.com> Signed-off-by: Praneeth Bajjuri <praneeth(a)ti.com> --- .../dts/k3-am654-base-board-ddr4-1600MTs.dtsi | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm/dts/k3-am654-base-board-ddr4-1600MTs.dtsi b/arch/arm/dts/k3-am654-base-board-ddr4-1600MTs.dtsi index d07aaea93f..5638321903 100644 --- a/arch/arm/dts/k3-am654-base-board-ddr4-1600MTs.dtsi +++ b/arch/arm/dts/k3-am654-base-board-ddr4-1600MTs.dtsi @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ - * This file was generated by AM65x_DRA80xM_EMIF_Tool_1.98.xlsm + * Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ + * This file was generated by AM65x_DRA80xM_EMIF_Tool_2.02.xlsm * http://www.ti.com/lit/pdf/spracj0 * Configuration Parameters * Memory Type: DDR4 @@ -24,7 +24,7 @@ #define DDRCTL_INIT4 0x00000020 #define DDRCTL_INIT5 0x00100000 #define DDRCTL_INIT6 0x00000480 -#define DDRCTL_INIT7 0x000004E8 +#define DDRCTL_INIT7 0x00000497 #define DDRCTL_DRAMTMG0 0x0C0A1B0D #define DDRCTL_DRAMTMG1 0x00030313 #define DDRCTL_DRAMTMG2 0x0506050A @@ -33,10 +33,10 @@ #define DDRCTL_DRAMTMG5 0x04040302 #define DDRCTL_DRAMTMG6 0x00000004 #define DDRCTL_DRAMTMG7 0x00000404 -#define DDRCTL_DRAMTMG8 0x03030A05 +#define DDRCTL_DRAMTMG8 0x03030C05 #define DDRCTL_DRAMTMG9 0x00020208 #define DDRCTL_DRAMTMG10 0x001C180A -#define DDRCTL_DRAMTMG11 0x0E06010E +#define DDRCTL_DRAMTMG11 0x1106010E #define DDRCTL_DRAMTMG12 0x00020008 #define DDRCTL_DRAMTMG13 0x0B100002 #define DDRCTL_DRAMTMG14 0x00000000 @@ -84,33 +84,33 @@ #define DDRPHY_DCR 0x0000040C #define DDRPHY_DTPR0 0x041A0B06 #define DDRPHY_DTPR1 0x28140000 -#define DDRPHY_DTPR2 0x0034E255 -#define DDRPHY_DTPR3 0x01D50800 +#define DDRPHY_DTPR2 0x0034E300 +#define DDRPHY_DTPR3 0x02800800 #define DDRPHY_DTPR4 0x31180805 #define DDRPHY_DTPR5 0x00250B06 #define DDRPHY_DTPR6 0x00000505 #define DDRPHY_ZQCR 0x008A2A58 #define DDRPHY_ZQ0PR0 0x000077DD -#define DDRPHY_ZQ1PR0 0x000077DD +#define DDRPHY_ZQ1PR0 0x00007799 #define DDRPHY_MR0 0x00000214 #define DDRPHY_MR1 0x00000501 #define DDRPHY_MR2 0x00000000 #define DDRPHY_MR3 0x00000020 #define DDRPHY_MR4 0x00000000 #define DDRPHY_MR5 0x00000480 -#define DDRPHY_MR6 0x000004E8 +#define DDRPHY_MR6 0x00000497 #define DDRPHY_MR11 0x00000000 #define DDRPHY_MR12 0x00000000 #define DDRPHY_MR13 0x00000000 #define DDRPHY_MR14 0x00000000 #define DDRPHY_MR22 0x00000000 -#define DDRPHY_VTCR0 0xF3C32028 +#define DDRPHY_VTCR0 0xF3C32017 #define DDRPHY_DX8SL0PLLCR0 0x021c4000 #define DDRPHY_DX8SL1PLLCR0 0x021c4000 #define DDRPHY_DX8SL2PLLCR0 0x021c4000 #define DDRPHY_DTCR0 0x8000B1C7 #define DDRPHY_DTCR1 0x00010236 -#define DDRPHY_ACIOCR0 0x30070000 +#define DDRPHY_ACIOCR0 0xF0070000 #define DDRPHY_ACIOCR3 0x00000001 #define DDRPHY_ACIOCR5 0x04800000 #define DDRPHY_IOVCR0 0x0F0C0C0C @@ -157,6 +157,6 @@ #define DDRPHY_DX8SL0DXCTL2 0x00141830 #define DDRPHY_DX8SL1DXCTL2 0x00141830 #define DDRPHY_DX8SL2DXCTL2 0x00141830 -#define DDRPHY_DX8SL0DQSCTL 0x01264000 -#define DDRPHY_DX8SL1DQSCTL 0x01264000 -#define DDRPHY_DX8SL2DQSCTL 0x01264000 +#define DDRPHY_DX8SL0DQSCTL 0x01264300 +#define DDRPHY_DX8SL1DQSCTL 0x01264300 +#define DDRPHY_DX8SL2DQSCTL 0x01264300 -- 2.17.1

1 0

[RFC PATCH 0/2] Move FSP configuration to devicetree
by Bernhard Messerklinger 08 May '20

08 May '20

This patch series moves the configuration of FPS-S and FSP-M for Apollo Lake based SoCs from the code to the devicetree. In order to make the FSP configuration easy to extend and maintain new binding structs for FSP-M and FSP-S are introduced. These structs contain the information of which devicetree settings need to be copied to which offset in the FSP config structure. The actual code handling these structs is rather small, and generic for both FSP-S and FSP-M. This patch series replaces the previous sent patches: "arch: x86: apl: Read FSP-M configuration from device-tree" [1] "Move FSP-S configuration to device-tree" [2] Changes to [1] and [2]: - No default settings within U-Boot, the default settings in FSP are used directly - The code for copying the data was simplified, and the information of what needs to be copied was moved to newly introduced structures [1]: https://lists.denx.de/pipermail/u-boot/2020-April/405852.html [2]: https://lists.denx.de/pipermail/u-boot/2020-April/406590.html Bernhard Messerklinger (2): arch: x86: apl: Only load VBT if CONFIG_HAVE_VBT is enabled arch: x86: apl: Use devicetree for FSP configuration arch/x86/cpu/apollolake/Makefile | 1 + arch/x86/cpu/apollolake/fsp_bindings.c | 2096 +++++++++++++++++ arch/x86/cpu/apollolake/fsp_m.c | 164 +- arch/x86/cpu/apollolake/fsp_s.c | 404 +--- arch/x86/dts/chromebook_coral.dts | 72 +- .../asm/arch-apollolake/fsp/fsp_m_upd.h | 168 ++ .../asm/arch-apollolake/fsp/fsp_s_upd.h | 202 ++ .../asm/arch-apollolake/fsp_bindings.h | 74 + .../fsp/fsp2/apollolake/fsp-m.txt | 320 +++ .../fsp/fsp2/apollolake/fsp-s.txt | 483 ++++ 10 files changed, 3432 insertions(+), 552 deletions(-) create mode 100644 arch/x86/cpu/apollolake/fsp_bindings.c create mode 100644 arch/x86/include/asm/arch-apollolake/fsp_bindings.h create mode 100644 doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt create mode 100644 doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt -- 2.26.0

2 7

efi_loader: pkcs7_parse_message() returns error pointer
by Patrick Wildt 08 May '20

08 May '20

Since pkcs7_parse_message() returns an error pointer, we must not check for NULL. We have to explicitly set msg to NULL in the error case, otherwise the call to pkcs7_free_message() on the goto err path will assume it's a valid object. Signed-off-by: Patrick Wildt <patrick(a)blueri.se> diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 5a9a6424cc..43a53d3dd1 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -538,8 +538,9 @@ static bool efi_image_authenticate(void *efi, size_t efi_size) } msg = pkcs7_parse_message((void *)wincert + sizeof(*wincert), wincert->dwLength - sizeof(*wincert)); - if (!msg) { + if (IS_ERR(msg)) { debug("Parsing image's signature failed\n"); + msg = NULL; goto err; }

3 3

[PATCH] ARC: DTS: cleanup USB node names
by Eugeniy Paltsev 08 May '20

08 May '20

Remove redundant '0x' from node names. Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> --- arch/arc/dts/axs10x_mb.dtsi | 4 ++-- arch/arc/dts/hsdk-common.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi index 5b77642b8d7..33b05934387 100644 --- a/arch/arc/dts/axs10x_mb.dtsi +++ b/arch/arc/dts/axs10x_mb.dtsi @@ -62,12 +62,12 @@ max-speed = <100>; }; - ehci@0x40000 { + ehci@40000 { compatible = "generic-ehci"; reg = < 0x40000 0x100 >; }; - ohci@0x60000 { + ohci@60000 { compatible = "generic-ohci"; reg = < 0x60000 0x100 >; }; diff --git a/arch/arc/dts/hsdk-common.dtsi b/arch/arc/dts/hsdk-common.dtsi index ea6cc468f83..9aa10e4b25d 100644 --- a/arch/arc/dts/hsdk-common.dtsi +++ b/arch/arc/dts/hsdk-common.dtsi @@ -84,7 +84,7 @@ phy-mode = "gmii"; }; - ehci@0xf0040000 { + ehci@f0040000 { compatible = "generic-ehci"; reg = <0xf0040000 0x100>; @@ -96,7 +96,7 @@ resets = <&cgu_rst HSDK_USB_RESET>; }; - ohci@0xf0060000 { + ohci@f0060000 { compatible = "generic-ohci"; reg = <0xf0060000 0x100>; }; -- 2.21.3

1 0