October 2023 - U-Boot

[PATCH 1/7] checkpatch.pl: Make common.h check boarder
by Tom Rini 25 Oct '23

25 Oct '23

At this point in time we should not add common.h to any new files, so make checkpatch.pl complain. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Cc: Simon Glass <sjg(a)chromium.org> This causes a bunch of patman tests, for checkpatch, to now fail and I don't really understand why, at all. And that was before I added a test for the new error, which I had hoped would clear up the problem. --- scripts/checkpatch.pl | 8 +++++++- tools/patman/test_checkpatch.py | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 488d73a0ed77..c3314da8a3c7 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2636,12 +2636,18 @@ sub u_boot_line { "All CONFIG symbols are managed by Kconfig\n" . $herecurr); } - # Don't put common.h and dm.h in header files + # Don't put dm.h in header files if ($realfile =~ /\.h$/ && $rawline =~ /^\+#include\s*<(common|dm)\.h>*/) { ERROR("BARRED_INCLUDE_IN_HDR", "Avoid including common.h and dm.h in header files\n" . $herecurr); } + # Don't add common.h to files + if ($rawline =~ /^\+#include\s*<(common|dm)\.h>*/) { + ERROR("BARRED_INCLUDE_COMMON_H", + "Do not add common.h to files\n" . $herecurr); + } + # Do not disable fdt / initrd relocation if ($rawline =~ /^\+.*(fdt|initrd)_high=0xffffffff/) { ERROR("DISABLE_FDT_OR_INITRD_RELOC", diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py index a8bb364e42b2..187736d617d5 100644 --- a/tools/patman/test_checkpatch.py +++ b/tools/patman/test_checkpatch.py @@ -401,10 +401,15 @@ index 0000000..2234c87 def test_barred_include_in_hdr(self): """Test for using a barred include in a header file""" pm = PatchMaker() - #pm.add_line('include/myfile.h', '#include <common.h>') pm.add_line('include/myfile.h', '#include <dm.h>') self.check_single_message(pm, 'BARRED_INCLUDE_IN_HDR', 'error') + def test_barred_include_common_h(self): + """Test for adding common.h to a file""" + pm = PatchMaker() + pm.add_line('include/myfile.h', '#include <common.h>') + self.check_single_message(pm, 'BARRED_INCLUDE_COMMON_H', 'error') + def test_config_is_enabled_config(self): """Test for accidental CONFIG_IS_ENABLED(CONFIG_*) calls""" pm = PatchMaker() -- 2.34.1

6 24

[PATCH 1/4] spl: atf: Improve comments and code readability
by Massimo Pegorer 25 Oct '23

25 Oct '23

Rename bl31_entry static function to avoid name clash with its first argument. Fix spaces misuse. Describe code accurately: load address is used if getting entry point address fails, and not if addresses differ. Remove not up-to-date comment about BL3-2 usage. Signed-off-by: Massimo Pegorer <massimo.pegorer+oss(a)gmail.com> --- common/spl/spl_atf.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 2c10252834..3d022ed4e7 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -189,10 +189,10 @@ static inline void raw_write_daif(unsigned int daif) typedef void (*atf_entry_t)(struct bl31_params *params, void *plat_params); -static void bl31_entry(uintptr_t bl31_entry, uintptr_t bl32_entry, - uintptr_t bl33_entry, uintptr_t fdt_addr) +static void spl_enter_atf(uintptr_t bl31_entry, uintptr_t bl32_entry, + uintptr_t bl33_entry, uintptr_t fdt_addr) { - atf_entry_t atf_entry = (atf_entry_t)bl31_entry; + atf_entry_t atf_entry = (atf_entry_t)bl31_entry; void *bl31_params; if (CONFIG_IS_ENABLED(ATF_LOAD_IMAGE_V2)) @@ -240,7 +240,7 @@ static int spl_fit_images_find(void *blob, int os) uintptr_t spl_fit_images_get_entry(void *blob, int node) { - ulong val; + ulong val; int ret; ret = fit_image_get_entry(blob, node, &val); @@ -253,25 +253,25 @@ uintptr_t spl_fit_images_get_entry(void *blob, int node) void spl_invoke_atf(struct spl_image_info *spl_image) { - uintptr_t bl32_entry = 0; - uintptr_t bl33_entry = CONFIG_TEXT_BASE; + uintptr_t bl32_entry = 0; + uintptr_t bl33_entry = CONFIG_TEXT_BASE; void *blob = spl_image->fdt_addr; uintptr_t platform_param = (uintptr_t)blob; int node; /* - * Find the OP-TEE binary (in /fit-images) load address or - * entry point (if different) and pass it as the BL3-2 entry - * point, this is optional. + * Find (in /fit-images) the TEE binary entry point address + * (or load address if entry point is missing) and pass it as + * the BL3-2 entry point. This is optional. */ node = spl_fit_images_find(blob, IH_OS_TEE); if (node >= 0) bl32_entry = spl_fit_images_get_entry(blob, node); /* - * Find the U-Boot binary (in /fit-images) load addreess or - * entry point (if different) and pass it as the BL3-3 entry - * point. + * Find (in /fit-images) the U-Boot binary entry point address + * (or load address if entry point is missing) and pass it as + * the BL3-3 entry point. * This will need to be extended to support Falcon mode. */ @@ -281,17 +281,13 @@ void spl_invoke_atf(struct spl_image_info *spl_image) /* * If ATF_NO_PLATFORM_PARAM is set, we override the platform - * parameter and always pass 0. This is a workaround for + * parameter and always pass 0. This is a workaround for * older ATF versions that have insufficiently robust (or * overzealous) argument validation. */ if (CONFIG_IS_ENABLED(ATF_NO_PLATFORM_PARAM)) platform_param = 0; - /* - * We don't provide a BL3-2 entry yet, but this will be possible - * using similar logic. - */ - bl31_entry(spl_image->entry_point, bl32_entry, - bl33_entry, platform_param); + spl_enter_atf(spl_image->entry_point, bl32_entry, + bl33_entry, platform_param); } -- 2.34.1

3 2

[PATCH v4 0/4] Allwinner R528/T113s PSCI
by Sam Edwards 25 Oct '23

25 Oct '23

Hi list, This is the third, and hopefully final, version of my patchset for PSCI support on R528/T113-s3. This one, as always, depends on Andre Przywara's T113s support series (v2), available on the list and also located on a Git branch at: https://source.denx.de/u-boot/custodians/u-boot-sunxi.git t113s-v2 NOTE THAT THIS ALSO depends on the following commit on master: 3d5e52bd97 ("ARM: psci: move GIC address override to Kconfig") For testing: I can confirm that patch 2/4 results in no change to machine code whatsoever on any supported target. Patch 1/4 results in a minor machine code change on R40 only. Patch 3/4 will likely require testing on each of the 4 "special case" sunxi targets (sun6i, sun7i, R40, H3) to ensure that register offsets are kept consistent. Patch 4/4 needs testing on R528 only. Warm regards, Sam Changes v3->v4: - The GIC base address override is done through Kconfig, instead of in sunxi-common.h Changes v2->v3: - Fix missing `cpu=0;` for the sun7i power management case. - Make sunxi_cpu_power_off() a static function, per feedback on v2. - Kevin Amadiva of MEC electronics got in touch with me off-list, reported success bringing up CPU1 of a T113 with this patchset, and kindly provided me with a Tested-by tag for patch 4/4. - Remove a comment about R40/R528 being special, per feedback on v2. - Simplify an if statement, per feedback on v2. - Add missing 'select' directives to the R528 Kconfig, per feedback on v2. Changes v1->v2: - Power clamp is now adjusted ONLY on sun{6,7}i, H3, R40. The previous version was mistakenly doing this EXCEPT on those machines. - Flattened sunxi_power_switch() into sunxi_cpu_set_power() for simplicity's sake. - Moved the "power clamp is not NULL" conditional into sunxi_cpu_set_power(). - Removed unnecessary H6 special-case, since H6 is actually ARM64. - Renamed SUNXI_CPUX_BASE to SUNXI_CPUCFG_BASE, to mirror expected changes in Andre's v2 of the R528 series (we decided against using a new name for this block). - Removed sunxi_cpucfg_reg struct, and stopped using the PRCM struct in psci.c. Sam Edwards (4): sunxi: psci: clean away preprocessor macros sunxi: psci: refactor register access to separate functions sunxi: psci: stop modeling register layout with C structs sunxi: psci: implement PSCI on R528 arch/arm/cpu/armv7/Kconfig | 3 +- arch/arm/cpu/armv7/sunxi/psci.c | 185 ++++++++++++++--------- arch/arm/include/asm/arch-sunxi/cpucfg.h | 67 -------- arch/arm/mach-sunxi/Kconfig | 4 + 4 files changed, 121 insertions(+), 138 deletions(-) delete mode 100644 arch/arm/include/asm/arch-sunxi/cpucfg.h -- 2.41.0

2 8

[v4 01/24] buildman: Use oldconfig when adjusting the config
by Tom Rini 25 Oct '23

25 Oct '23

From: Simon Glass <sjg(a)chromium.org> We cannot be sure that the new config is consistent, particularly when changing a major item like CONFIG_CMDLINE. Use 'make oldconfig' to check that and avoid any such problems. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/buildman/builder.py | 2 +- tools/buildman/builderthread.py | 6 ++++++ tools/buildman/func_test.py | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 5305477c5be6..782e59dd5cca 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -476,7 +476,7 @@ class Builder: Args: commit: Commit object that is being built brd: Board object that is being built - stage: Stage that we are at (mrproper, config, build) + stage: Stage that we are at (mrproper, config, oldconfig, build) cwd: Directory where make should be run args: Arguments to pass to make kwargs: Arguments to pass to command.run_pipe() diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index 6a61f64da1d4..a8599c0bb2a8 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -426,6 +426,12 @@ class BuilderThread(threading.Thread): # Now do the build, if everything looks OK if result.return_code == 0: + if adjust_cfg: + oldc_args = list(args) + ['oldconfig'] + oldc_result = self.make(commit, brd, 'oldconfig', cwd, + *oldc_args, env=env) + if oldc_result.return_code: + return oldc_result result = self._build(commit, brd, cwd, args, env, cmd_list, config_only) if adjust_cfg: diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index 55dd494fe8ee..6b88ed815d65 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -439,6 +439,8 @@ class TestFunctional(unittest.TestCase): tools.write_file(fname, b'CONFIG_SOMETHING=1') return command.CommandResult(return_code=0, combined='Test configuration complete') + elif stage == 'oldconfig': + return command.CommandResult(return_code=0) elif stage == 'build': stderr = '' fname = os.path.join(cwd or '', out_dir, 'u-boot') @@ -461,7 +463,7 @@ Some images are invalid''' return command.CommandResult(return_code=0) # Not handled, so abort - print('make', stage) + print('_HandleMake failure: make', stage) sys.exit(1) # Example function to print output lines -- 2.34.1

5 43

[PATCH v2] arm: init: add an option to use FDT from previous bootloader
by Caleb Connolly 24 Oct '23

24 Oct '23

Add a new config option to allow u-boot to reuse the FDT provided by the previous stage bootloader when available. On some boards the previous stage bootloader can populate platform-specific parts of the devicetree such as the memory node, this allows us to avoid hardcoding it in u-boot and instead determine it dynamically at runtime. Signed-off-by: Caleb Connolly <caleb.connolly(a)linaro.org> --- This patch will improve generic support for Qualcomm boards by enabling us to configure the memory map at runtime rather than having hardcoded maps on a per-device basis. I've gone for this approach initially to try and avoid introducing board specific code where possible, but I'm happy to rework this into mach-snapdragon if that's preferred. --- Changes in v2: - Replace pre-processor conditional with runtime IS_ENABLED() - Link to v1: https://lore.kernel.org/r/20231024-b4-prevbl-fdt-v1-1-541f71dba802@linaro.o… --- base-commit: e65b5d35c9116485366bb08138043d51220551da // Caleb (they/them) --- arch/arm/lib/save_prev_bl_data.c | 7 +++++++ boot/Kconfig | 10 ++++++++++ include/init.h | 11 +++++++++++ lib/fdtdec.c | 8 +++++++- 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c index f7b23faf0d66..b0608502535e 100644 --- a/arch/arm/lib/save_prev_bl_data.c +++ b/arch/arm/lib/save_prev_bl_data.c @@ -45,6 +45,13 @@ bool is_addr_accessible(phys_addr_t addr) return false; } +phys_addr_t get_prev_bl_fdt_addr(void) +{ + if (!is_addr_accessible((phys_addr_t)reg0)) + return 0; + return reg0; +} + int save_prev_bl_data(void) { struct fdt_header *fdt_blob; diff --git a/boot/Kconfig b/boot/Kconfig index a01e6cb8aafe..c127ba254589 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1599,6 +1599,16 @@ config SAVE_PREV_BL_INITRAMFS_START_ADDR If no initramfs was provided by previous bootloader, no env variables will be created. +config USE_PREV_BL_FDT + depends on SAVE_PREV_BL_FDT_ADDR && !OF_BOARD + bool "Use the FDT provided by the previous stage bootloader" + help + When u-boot is chain-loaded from a previous bootloader, enable this option + to use the FDT provided by the previous bootloader instead of any built-in + to u-boot. + + If no FDT was available, u-boot will fall back to its internal FDT. + menu "Configuration editor" config CEDIT diff --git a/include/init.h b/include/init.h index 4e7fe26c2004..ca78ff9f08c4 100644 --- a/include/init.h +++ b/include/init.h @@ -168,6 +168,17 @@ defined(CONFIG_SAVE_PREV_BL_FDT_ADDR) * Return: 0 if ok; -ENODATA on error */ int save_prev_bl_data(void); + +/** + * get_prev_bl_fdt_addr - When u-boot is chainloaded, get the address + * of the FDT passed by the previous bootloader. + * + * Return: the address of the FDT passed by the previous bootloader + * or 0 if not found. + */ +phys_addr_t get_prev_bl_fdt_addr(void); +#else +#define get_prev_bl_fdt_addr() 0LLU #endif /** diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 7a6916764835..b82baf08fc2f 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1222,7 +1222,7 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp) */ static void *fdt_find_separate(void) { - void *fdt_blob = NULL; + void *fdt_blob = NULL, *prevbl_fdt_blob; if (IS_ENABLED(CONFIG_SANDBOX)) return NULL; @@ -1234,6 +1234,12 @@ static void *fdt_find_separate(void) else fdt_blob = (ulong *)__bss_end; #else + if (IS_ENABLED(CONFIG_USE_PREV_BL_FDT)) { + prevbl_fdt_blob = (void *)get_prev_bl_fdt_addr(); + if (prevbl_fdt_blob) + return prevbl_fdt_blob; + } + /* FDT is at end of image */ fdt_blob = (ulong *)_end;

2 1

[tom.rini@gmail.com: Fwd: New Defects reported by Coverity Scan for Das U-Boot]
by Tom Rini 24 Oct '23

24 Oct '23

Here's the latest report ---------- Forwarded message --------- From: <scan-admin(a)coverity.com> Date: Mon, Oct 23, 2023 at 4:40 PM Subject: New Defects reported by Coverity Scan for Das U-Boot To: <tom.rini(a)gmail.com> Hi, Please find the latest report on new defect(s) introduced to Das U-Boot found with Coverity Scan. 16 new defect(s) introduced to Das U-Boot found with Coverity Scan. 6 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent build analyzed by Coverity Scan. New defect(s) Reported-by: Coverity Scan Showing 16 of 16 defect(s) ** CID 467060: (TAINTED_SCALAR) ________________________________________________________________________________________________________ *** CID 467060: (TAINTED_SCALAR) /boot/bootmeth_cros.c: 184 in scan_part() 178 if (ret != num_blks) { 179 free(hdr); 180 return log_msg_ret("inf", -EIO); 181 } 182 183 if (memcmp(VB2_KEYBLOCK_MAGIC, hdr->magic, VB2_KEYBLOCK_MAGIC_SIZE)) { >>> CID 467060: (TAINTED_SCALAR) >>> Passing tainted expression "*hdr" to "dlfree", which uses it as an offset. 184 free(hdr); 185 log_debug("no magic\n"); 186 return -ENOENT; 187 } 188 189 *hdrp = hdr; /boot/bootmeth_cros.c: 179 in scan_part() 173 blk->name, (ulong)info->start, num_blks); 174 hdr = memalign(SZ_1K, PROBE_SIZE); 175 if (!hdr) 176 return log_msg_ret("hdr", -ENOMEM); 177 ret = blk_read(blk, info->start, num_blks, hdr); 178 if (ret != num_blks) { >>> CID 467060: (TAINTED_SCALAR) >>> Passing tainted expression "*hdr" to "dlfree", which uses it as an offset. 179 free(hdr); 180 return log_msg_ret("inf", -EIO); 181 } 182 183 if (memcmp(VB2_KEYBLOCK_MAGIC, hdr->magic, VB2_KEYBLOCK_MAGIC_SIZE)) { 184 free(hdr); ** CID 467059: Integer handling issues (INCOMPATIBLE_CAST) ________________________________________________________________________________________________________ *** CID 467059: Integer handling issues (INCOMPATIBLE_CAST) /drivers/mtd/nvmxip/nvmxip_qspi.c: 47 in nvmxip_qspi_of_to_plat() 41 ret = dev_read_u32(dev, "lba_shift", &plat->lba_shift); 42 if (ret) { 43 log_err("[%s]: can not get lba_shift from device tree\n", dev->name); 44 return -EINVAL; 45 } 46 >>> CID 467059: Integer handling issues (INCOMPATIBLE_CAST) >>> Pointer "&plat->lba" points to an object whose effective type is "unsigned long" (64 bits, unsigned) but is dereferenced as a narrower "unsigned int" (32 bits, unsigned). This may lead to unexpected results depending on machine endianness. 47 ret = dev_read_u32(dev, "lba", (u32 *)&plat->lba); 48 if (ret) { 49 log_err("[%s]: can not get lba from device tree\n", dev->name); 50 return -EINVAL; 51 } 52 ** CID 467058: Insecure data handling (TAINTED_SCALAR) ________________________________________________________________________________________________________ *** CID 467058: Insecure data handling (TAINTED_SCALAR) /drivers/core/ofnode.c: 1629 in ofnode_write_u32() 1623 log_debug("%s = %x", propname, value); 1624 val = malloc(sizeof(*val)); 1625 if (!val) 1626 return -ENOMEM; 1627 *val = cpu_to_fdt32(value); 1628 >>> CID 467058: Insecure data handling (TAINTED_SCALAR) >>> Passing tainted expression "*val" to "ofnode_write_prop", which uses it as an offset. 1629 return ofnode_write_prop(node, propname, val, sizeof(value), true); 1630 } 1631 1632 int ofnode_write_u64(ofnode node, const char *propname, u64 value) 1633 { 1634 fdt64_t *val; ** CID 467057: Uninitialized variables (UNINIT) ________________________________________________________________________________________________________ *** CID 467057: Uninitialized variables (UNINIT) /boot/bootflow.c: 320 in iter_incr() 314 * Probe the bootdev. This does not probe any attached 315 * block device, since they are siblings 316 */ 317 ret = device_probe(dev); 318 log_debug("probe %s %d\n", dev->name, ret); 319 if (!log_msg_ret("probe", ret)) >>> CID 467057: Uninitialized variables (UNINIT) >>> Using uninitialized value "method_flags" when calling "bootflow_iter_set_dev". 320 bootflow_iter_set_dev(iter, dev, method_flags); 321 } 322 } 323 324 /* if there are no more bootdevs, give up */ 325 if (ret) ** CID 467056: Control flow issues (NO_EFFECT) /common/cli_readline.c: 321 in cread_line_process_ch() ________________________________________________________________________________________________________ *** CID 467056: Control flow issues (NO_EFFECT) /common/cli_readline.c: 321 in cread_line_process_ch() 315 break; 316 case CTL_CH('w'): 317 if (cls->num) { 318 uint base, wlen; 319 320 for (base = cls->num - 1; >>> CID 467056: Control flow issues (NO_EFFECT) >>> This greater-than-or-equal-to-zero comparison of an unsigned value is always true. "base >= 0U". 321 base >= 0 && buf[base] == ' ';) 322 base--; 323 for (; base > 0 && buf[base - 1] != ' ';) 324 base--; 325 326 /* now delete chars from base to cls->num */ ** CID 467055: (TAINTED_SCALAR) ________________________________________________________________________________________________________ *** CID 467055: (TAINTED_SCALAR) /boot/bootmeth_cros.c: 372 in cros_read_bootflow() 366 log_debug("- scan failed: err=%d\n", ret); 367 return log_msg_ret("scan", ret); 368 } 369 370 priv = malloc(sizeof(struct cros_priv)); 371 if (!priv) { >>> CID 467055: (TAINTED_SCALAR) >>> Passing tainted expression "*hdr" to "dlfree", which uses it as an offset. 372 free(hdr); 373 return log_msg_ret("buf", -ENOMEM); 374 } 375 bflow->bootmeth_priv = priv; 376 377 log_debug("Selected partition %d, header at %lx\n", bflow->part, /boot/bootmeth_cros.c: 391 in cros_read_bootflow() 385 /* Now read everything we can learn about kernel */ 386 #if CONFIG_IS_ENABLED(PARTITION_UUIDS) 387 uuid = info.uuid; 388 #endif 389 ret = cros_read_info(bflow, uuid, preamble); 390 preamble = NULL; >>> CID 467055: (TAINTED_SCALAR) >>> Passing tainted expression "*hdr" to "dlfree", which uses it as an offset. 391 free(hdr); 392 if (ret) { 393 free(priv->info_buf); 394 free(priv); 395 return log_msg_ret("inf", ret); 396 } ** CID 467054: Resource leaks (RESOURCE_LEAK) /tools/sfspl.c: 118 in sfspl_image_extract_subimage() ________________________________________________________________________________________________________ *** CID 467054: Resource leaks (RESOURCE_LEAK) /tools/sfspl.c: 118 in sfspl_image_extract_subimage() 112 if (fd == -1) { 113 perror("Can write file"); 114 return EXIT_FAILURE; 115 } 116 if (write(fd, &buf[hdr_size], file_size) != file_size) { 117 perror("Cannot write file"); >>> CID 467054: Resource leaks (RESOURCE_LEAK) >>> Handle variable "fd" going out of scope leaks the handle. 118 return EXIT_FAILURE; 119 } 120 close(fd); 121 122 return EXIT_SUCCESS; 123 } ** CID 467053: (RESOURCE_LEAK) /tools/mkeficapsule.c: 859 in dump_capsule_contents() /tools/mkeficapsule.c: 859 in dump_capsule_contents() ________________________________________________________________________________________________________ *** CID 467053: (RESOURCE_LEAK) /tools/mkeficapsule.c: 859 in dump_capsule_contents() 853 empty_capsule_dump(ptr); 854 } else { 855 fprintf(stderr, "Unable to decode the capsule file: %s\n", 856 capsule_file); 857 exit(EXIT_FAILURE); 858 } >>> CID 467053: (RESOURCE_LEAK) >>> Variable "ptr" going out of scope leaks the storage it points to. 859 } 860 861 /** 862 * main - main entry function of mkeficapsule 863 * @argc: Number of arguments 864 * @argv: Array of pointers to arguments /tools/mkeficapsule.c: 859 in dump_capsule_contents() 853 empty_capsule_dump(ptr); 854 } else { 855 fprintf(stderr, "Unable to decode the capsule file: %s\n", 856 capsule_file); 857 exit(EXIT_FAILURE); 858 } >>> CID 467053: (RESOURCE_LEAK) >>> Variable "ptr" going out of scope leaks the storage it points to. 859 } 860 861 /** 862 * main - main entry function of mkeficapsule 863 * @argc: Number of arguments 864 * @argv: Array of pointers to arguments ** CID 467052: Insecure data handling (TAINTED_SCALAR) ________________________________________________________________________________________________________ *** CID 467052: Insecure data handling (TAINTED_SCALAR) /drivers/core/ofnode.c: 1644 in ofnode_write_u64() 1638 log_debug("%s = %llx", propname, (unsigned long long)value); 1639 val = malloc(sizeof(*val)); 1640 if (!val) 1641 return -ENOMEM; 1642 *val = cpu_to_fdt64(value); 1643 >>> CID 467052: Insecure data handling (TAINTED_SCALAR) >>> Passing tainted expression "*val" to "ofnode_write_prop", which uses it as an offset. 1644 return ofnode_write_prop(node, propname, val, sizeof(value), true); 1645 } 1646 1647 int ofnode_write_bool(ofnode node, const char *propname, bool value) 1648 { 1649 if (value) ** CID 467051: API usage errors (CHAR_IO) /common/cli_readline.c: 550 in cread_line_simple() ________________________________________________________________________________________________________ *** CID 467051: API usage errors (CHAR_IO) /common/cli_readline.c: 550 in cread_line_simple() 544 545 for (;;) { 546 if (bootretry_tstc_timeout()) 547 return -2; /* timed out */ 548 schedule(); /* Trigger watchdog, if needed */ 549 >>> CID 467051: API usage errors (CHAR_IO) >>> Assigning the return value of "getchar" to char "c" truncates its value. 550 c = getchar(); 551 552 /* 553 * Special character handling 554 */ 555 switch (c) { ** CID 467050: Control flow issues (NO_EFFECT) /drivers/firmware/scmi/sandbox-scmi_agent.c: 220 in sandbox_scmi_base_message_attrs() ________________________________________________________________________________________________________ *** CID 467050: Control flow issues (NO_EFFECT) /drivers/firmware/scmi/sandbox-scmi_agent.c: 220 in sandbox_scmi_base_message_attrs() 214 !msg->out_msg || msg->out_msg_sz < sizeof(*out)) 215 return -EINVAL; 216 217 message_id = *(u32 *)msg->in_msg; 218 out = (struct scmi_protocol_msg_attrs_out *)msg->out_msg; 219 >>> CID 467050: Control flow issues (NO_EFFECT) >>> This greater-than-or-equal-to-zero comparison of an unsigned value is always true. "message_id >= SCMI_PROTOCOL_VERSION". 220 if (message_id >= SCMI_PROTOCOL_VERSION && 221 message_id <= SCMI_BASE_RESET_AGENT_CONFIGURATION && 222 message_id != SCMI_BASE_NOTIFY_ERRORS) { 223 out->attributes = 0; 224 out->status = SCMI_SUCCESS; 225 } else { ** CID 467049: Null pointer dereferences (REVERSE_INULL) /drivers/core/ofnode.c: 1764 in ofnode_read_bootscript_flash() ________________________________________________________________________________________________________ *** CID 467049: Null pointer dereferences (REVERSE_INULL) /drivers/core/ofnode.c: 1764 in ofnode_read_bootscript_flash() 1758 1759 ret = ofnode_read_u64(uboot, "bootscr-flash-size", 1760 bootscr_flash_size); 1761 if (ret) 1762 return -EINVAL; 1763 >>> CID 467049: Null pointer dereferences (REVERSE_INULL) >>> Null-checking "bootscr_flash_size" suggests that it may be null, but it has already been dereferenced on all paths leading to the check. 1764 if (!bootscr_flash_size) { 1765 debug("bootscr-flash-size is zero. Ignoring properties!\n"); 1766 *bootscr_flash_offset = 0; 1767 return -EINVAL; 1768 } 1769 ** CID 467048: Null pointer dereferences (FORWARD_NULL) ________________________________________________________________________________________________________ *** CID 467048: Null pointer dereferences (FORWARD_NULL) /common/cli_readline.c: 602 in cread_line_simple() 596 if (IS_ENABLED(CONFIG_AUTO_COMPLETE)) { 597 /* 598 * if auto-completion triggered just 599 * continue 600 */ 601 *p = '\0'; >>> CID 467048: Null pointer dereferences (FORWARD_NULL) >>> Passing null pointer "prompt" to "cmd_auto_complete", which dereferences it. 602 if (cmd_auto_complete(prompt, 603 console_buffer, 604 &n, &col)) { 605 p = p_buf + n; /* reset */ 606 continue; 607 } ** CID 467047: Error handling issues (CHECKED_RETURN) /boot/image-fit.c: 2477 in boot_get_fdt_fit() ________________________________________________________________________________________________________ *** CID 467047: Error handling issues (CHECKED_RETURN) /boot/image-fit.c: 2477 in boot_get_fdt_fit() 2471 /* the verbose method prints out messages on error */ 2472 err = fdt_overlay_apply_verbose(base, ovcopy); 2473 if (err < 0) { 2474 fdt_noffset = err; 2475 goto out; 2476 } >>> CID 467047: Error handling issues (CHECKED_RETURN) >>> Calling "fdt_pack" without checking return value (as is done elsewhere 4 out of 5 times). 2477 fdt_pack(base); 2478 len = fdt_totalsize(base); 2479 } 2480 #else 2481 printf("config with overlays but CONFIG_OF_LIBFDT_OVERLAY not set\n"); 2482 fdt_noffset = -EBADF; ** CID 467046: Error handling issues (CHECKED_RETURN) /drivers/phy/phy-uclass.c: 331 in generic_phy_power_on() ________________________________________________________________________________________________________ *** CID 467046: Error handling issues (CHECKED_RETURN) /drivers/phy/phy-uclass.c: 331 in generic_phy_power_on() 325 ops = phy_dev_ops(phy->dev); 326 if (ops->power_on) { 327 ret = ops->power_on(phy); 328 if (ret) { 329 dev_err(phy->dev, "PHY: Failed to power on %s: %d.\n", 330 phy->dev->name, ret); >>> CID 467046: Error handling issues (CHECKED_RETURN) >>> Calling "regulator_set_enable_if_allowed" without checking return value (as is done elsewhere 9 out of 11 times). 331 regulator_set_enable_if_allowed(counts->supply, false); 332 return ret; 333 } 334 } 335 counts->power_on_count = 1; 336 ** CID 467045: Resource leaks (RESOURCE_LEAK) /tools/mkeficapsule.c: 859 in dump_capsule_contents() ________________________________________________________________________________________________________ *** CID 467045: Resource leaks (RESOURCE_LEAK) /tools/mkeficapsule.c: 859 in dump_capsule_contents() 853 empty_capsule_dump(ptr); 854 } else { 855 fprintf(stderr, "Unable to decode the capsule file: %s\n", 856 capsule_file); 857 exit(EXIT_FAILURE); 858 } >>> CID 467045: Resource leaks (RESOURCE_LEAK) >>> Handle variable "fd" going out of scope leaks the handle. 859 } 860 861 /** 862 * main - main entry function of mkeficapsule 863 * @argc: Number of arguments 864 * @argv: Array of pointers to arguments

2 2

[PATCH 1/1] mkimage: do not write incorrect error message
by Heinrich Schuchardt 24 Oct '23

24 Oct '23

When running 'mkimage -l' is called for a valid StarFive file an error message "Error: invalid marker bytes" is written by the Renesas SPKG driver. mkimage -l may be invoked without specifying an image type. In this case mkimage iterates over all image type drivers to find the one that matches. None of the non-matching drivers should write an error message. Fix the Renesas SPKG driver. Fixes: afdfcb11f97c ("tools: spkgimage: add Renesas SPKG format") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- tools/renesas_spkgimage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/renesas_spkgimage.c b/tools/renesas_spkgimage.c index 5cd81dd5bf..ce3b2b28ae 100644 --- a/tools/renesas_spkgimage.c +++ b/tools/renesas_spkgimage.c @@ -147,7 +147,8 @@ static int spkgimage_verify_header(unsigned char *ptr, int size, /* Check the marker bytes */ if (memcmp(header->marker, marker, 4)) { - fprintf(stderr, "Error: invalid marker bytes\n"); + if (param->type == IH_TYPE_RENESAS_SPKG) + fprintf(stderr, "Error: invalid marker bytes\n"); return -EINVAL; } -- 2.40.1

2 1

Pull request: u-boot-rockchip-20231024
by Kever Yang 24 Oct '23

24 Oct '23

Hi Tom, Please pull the updates for rockchip platform: - Add Board: rk3588 NanoPC-T6, Orange Pi 5, Orange Pi 5 Plus; - clk driver fix for rk3568 and rk3588; - rkmtd cmd support for rockchip nand device; - dts update and sync from linux; CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/18275 Thanks, - Kever The following changes since commit 9a3a58396b78b1f9d0c14580dc03f81d29207dd2: Merge https://source.denx.de/u-boot/custodians/u-boot-marvell (2023-10-20 12:54:33 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20231024 for you to fetch changes up to d039b1b551e8dbb2c309d35bb19b7866caa4dcc1: rockchip: configs: sandbox: enable rkmtd command (2023-10-24 15:55:17 +0800) ---------------------------------------------------------------- Elaine Zhang (4): clk: rockchip: rk3568: support dclk_vop select more parent clks clk: rockchip: rk3588: support aclk_top_root set 750M clk: rockchip: rk3588: Avoid re-setting the pll rate of dclk_vop's parent clk: rockchip: rk3588: fix up the frac pll calculation Guochun Huang (1): clk: rk3588: Add 742.5M parameter for PLL Johan Jonker (8): mtd: nand: raw: rockchip_nfc: add NAND_SKIP_BBTSCAN option rockchip: dm: prepare rkmtd UCLASS rockchip: block: add rkmtd class and drivers rockchip: block: blk-uclass: add bounce buffer flag to blk_desc rockchip: cmd: add rkmtd command rockchip: test: dm: add rkmtd test rockchip: doc: add rkmtd.rst rockchip: configs: sandbox: enable rkmtd command John Clark (1): board: rockchip: add FriendlyElec NanoPC-T6 rk3588 board Jonas Karlman (7): rockchip: rk3568-radxa-e25: Enable pcie3x1 node rockchip: rk3588: Sync device tree from v6.7-rockchip-dts64-1 tag rockchip: rk3588-rock-5a: Enable support for USB 2.0 ports rockchip: rk3588-rock-5b: Enable support for PCIe SATA cards rockchip: rk3588-rock-5b: Sync USB3 nodes from mainline linux patches board: rockchip: Add Xunlong Orange Pi 5 board: rockchip: Add Xunlong Orange Pi 5 Plus Matwey V. Kornilov (1): rockchip: dts: rk3328: Sync rock64 device tree file from Linux Ricardo Pardini (1): mtd: spi-nor: Add support for XMC XM25QU128C Tom Fitzhenry (1): dt-bindings: leds: import common led bindings from linux v6.5 arch/arm/dts/Makefile | 3 + arch/arm/dts/rk3328-rock64.dts | 14 +- arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi | 11 +- arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi | 11 +- arch/arm/dts/rk3588-evb1-v10.dts | 136 +++ arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 36 + arch/arm/dts/rk3588-nanopc-t6.dts | 916 ++++++++++++++++ arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi | 27 + arch/arm/dts/rk3588-orangepi-5-plus.dts | 848 ++++++++++++++ arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 204 +--- arch/arm/dts/rk3588-rock-5b.dts | 145 +++ arch/arm/dts/rk3588-u-boot.dtsi | 40 +- arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi | 22 + arch/arm/dts/rk3588s-orangepi-5.dts | 662 +++++++++++ arch/arm/dts/rk3588s-pinctrl.dtsi | 44 + arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi | 4 - arch/arm/dts/rk3588s-u-boot.dtsi | 78 +- arch/arm/dts/rk3588s.dtsi | 24 + arch/arm/mach-rockchip/rk3588/Kconfig | 46 + board/friendlyelec/nanopc-t6-rk3588/Kconfig | 15 + board/friendlyelec/nanopc-t6-rk3588/MAINTAINERS | 9 + board/friendlyelec/nanopc-t6-rk3588/Makefile | 6 + .../nanopc-t6-rk3588/nanopc-t6-rk3588.c | 39 + board/rockchip/evb_rk3588/MAINTAINERS | 14 + cmd/Kconfig | 8 + cmd/Makefile | 1 + cmd/rkmtd.c | 204 ++++ configs/nanopc-t6-rk3588_defconfig | 108 ++ configs/orangepi-5-plus-rk3588_defconfig | 105 ++ configs/orangepi-5-rk3588s_defconfig | 102 ++ configs/radxa-e25-rk3568_defconfig | 1 - configs/rock5a-rk3588s_defconfig | 16 +- configs/rock5b-rk3588_defconfig | 7 +- configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + disk/part.c | 4 + doc/board/rockchip/index.rst | 1 + doc/board/rockchip/rkmtd.rst | 105 ++ doc/board/rockchip/rockchip.rst | 3 + drivers/block/Kconfig | 7 + drivers/block/Makefile | 2 + drivers/block/blk-uclass.c | 5 +- drivers/block/rkmtd.c | 1152 ++++++++++++++++++++ drivers/clk/rockchip/clk_pll.c | 102 +- drivers/clk/rockchip/clk_rk3568.c | 10 +- drivers/clk/rockchip/clk_rk3588.c | 35 +- drivers/mtd/nand/raw/Kconfig | 9 + drivers/mtd/nand/raw/rockchip_nfc.c | 3 + drivers/mtd/spi/spi-nor-ids.c | 1 + drivers/scsi/scsi.c | 4 + include/blk.h | 1 + include/configs/nanopc-t6-rk3588.h | 15 + include/dm/uclass-id.h | 1 + include/dt-bindings/leds/common.h | 7 +- include/rkmtd.h | 191 ++++ test/dm/Makefile | 1 + test/dm/rkmtd.c | 200 ++++ 57 files changed, 5472 insertions(+), 295 deletions(-) create mode 100644 arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588-nanopc-t6.dts create mode 100644 arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588-orangepi-5-plus.dts create mode 100644 arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588s-orangepi-5.dts create mode 100644 board/friendlyelec/nanopc-t6-rk3588/Kconfig create mode 100644 board/friendlyelec/nanopc-t6-rk3588/MAINTAINERS create mode 100644 board/friendlyelec/nanopc-t6-rk3588/Makefile create mode 100644 board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c create mode 100644 cmd/rkmtd.c create mode 100644 configs/nanopc-t6-rk3588_defconfig create mode 100644 configs/orangepi-5-plus-rk3588_defconfig create mode 100644 configs/orangepi-5-rk3588s_defconfig create mode 100644 doc/board/rockchip/rkmtd.rst create mode 100644 drivers/block/rkmtd.c create mode 100644 include/configs/nanopc-t6-rk3588.h create mode 100644 include/rkmtd.h create mode 100644 test/dm/rkmtd.c

2 1

Pull request: please pull u-boot-imx-20231024
by Stefano Babic 24 Oct '23

24 Oct '23

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit e65b5d35c9116485366bb08138043d51220551da: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sh (2023-10-17 09:15:56 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20231024 for you to fetch changes up to 2f96064d0cf78e21a668ad907d41d63e56f9f7bb: arm64: dts: imx8mp: Describe M24C32-D write-lockable page in DH i.MX8MP DHCOM DT (2023-10-18 21:29:59 +0200) ---------------------------------------------------------------- u-boot-imx-20231024 ------------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/18211 - Fixes for MC2432 Eeprom - i.MX93 ADC - Secondary boot mode on i.MX8M ---------------------------------------------------------------- Fedor Ross (3): ARM: imx: Factor out parsing of ROM log ARM: imx: Use correct U-Boot offset in case of secondary boot from eMMC ARM: imx: Add support for detecting primary/secondary bmode on MX8M Marek Vasut (3): spl: mmc: Introduce proper layering for spl_mmc_get_uboot_raw_sector() eeprom: at24: add ST M24C32-D Additional Write lockable page support arm64: dts: imx8mp: Describe M24C32-D write-lockable page in DH i.MX8MP DHCOM DT Sébastien Szymanski (2): arm: dts: imx93-11x11-evk: add bootph-some-ram property dm: adc: imx93-adc depends on ADC (fix boot) arch/arm/dts/imx8mp-dhcom-som-overlay-rev100.dts | 8 ++++++++ arch/arm/dts/imx8mp-dhcom-som.dtsi | 12 ++++++++++++ arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 20 ++++++++++++++++++++ arch/arm/mach-imx/Kconfig | 2 +- arch/arm/mach-imx/cmd_bmode.c | 4 ++++ arch/arm/mach-imx/image-container.c | 4 ++-- arch/arm/mach-imx/imx8m/soc.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------ arch/arm/mach-mvebu/spl.c | 4 ++-- arch/arm/mach-sunxi/board.c | 4 ++-- board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 2 +- board/data_modul/imx8mp_edm_sbc/spl.c | 2 +- board/gateworks/venice/spl.c | 2 +- common/spl/spl_mmc.c | 14 +++++++++++++- configs/imx93_11x11_evk_defconfig | 1 + drivers/adc/Kconfig | 1 + drivers/misc/i2c_eeprom.c | 8 ++++++++ include/spl.h | 26 ++++++++++++++++++++++++++ 17 files changed, 184 insertions(+), 29 deletions(-) Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[PATCH] doc: gpt: fix example of echoing variable
by Tom Fitzhenry 24 Oct '23

24 Oct '23

--- doc/usage/cmd/gpt.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/usage/cmd/gpt.rst b/doc/usage/cmd/gpt.rst index f6115ecb0ee..ea43218fa21 100644 --- a/doc/usage/cmd/gpt.rst +++ b/doc/usage/cmd/gpt.rst @@ -192,7 +192,7 @@ Get the information about the partition named 'rootfs':: Get the list of partition names on the disk:: => gpt enumerate - => echo gpt_partition_list + => echo ${gpt_partition_list} boot rootfs system-data [ext] user modules ramdisk -- 2.42.0

2 1