November 2022 - U-Boot

[PATCH v3 0/9] Add DM support for atmel NAND driver
by Balamanikandan Gunasundar 09 Dec '22

09 Dec '22

Change include: - Adapt GPIO descriptor apis for U-Boot. Use gpio_request_by_name_nodev, dm_gpio_get_value etc. - Use U_BOOT_DRIVER instead of platform_driver. - Replace struct platform_device with struct udevice - Check the status of nfc exec operation by polling the status register instead of interrupt based handling - DMA operations not supported. Remove it - Adapt DT parsing to U-Boot APIs Note: I need some advise or help in alligning the DT with Linux as per the discussion. https://lore.kernel.org/all/CABGWkvoLDez=yWzpXgO2s+gVs0aUDCEUAYSa8zo_+wGVf4… v3: - Do not check return values while requesting optional gpio pins (cs-gpios and rb-gpios) - Commit message for adding SMC helper function reworded - The unwanted indentation in the DT is fixed. The changes are made on top of "275943dba4 ARM: dts: at91: sam9x60ek: fix indentation for pinctrl sub-nodes" v2: - Add linux reference version in the commit message from which the driver is ported from - Reword the commit message to describe the changes clearly Balamanikandan Gunasundar (9): nand: atmel: Add DM based NAND driver nand: atmel: Add pmecc driver mfd: syscon: Add atmel-matrix registers definition memory: atmel-ebi: add Atmel EBI (External Bus Interface) driver mfd: syscon: atmel-smc: Add new helpers to ease SMC regs manipulation configs: at91: sam9x60ek: Enable DM based nand driver ARM: dts: at91: sam9x60: Add nodes for EBI and NAND ARM: dts: at91: sam9x60ek: Enable NAND support board: sam9x60ek: remove nand init from board file MAINTAINERS | 1 + arch/arm/dts/sam9x60.dtsi | 42 + arch/arm/dts/sam9x60ek.dts | 103 + board/atmel/sam9x60ek/sam9x60ek.c | 59 - configs/sam9x60ek_mmc_defconfig | 9 +- configs/sam9x60ek_nandflash_defconfig | 9 +- configs/sam9x60ek_qspiflash_defconfig | 8 +- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/memory/Kconfig | 7 + drivers/memory/Makefile | 1 + drivers/memory/atmel_ebi.c | 37 + drivers/mfd/Kconfig | 4 + drivers/mfd/Makefile | 1 + drivers/mfd/atmel-smc.c | 364 +++ drivers/mtd/nand/raw/Kconfig | 8 + drivers/mtd/nand/raw/Makefile | 1 + drivers/mtd/nand/raw/atmel/Makefile | 5 + drivers/mtd/nand/raw/atmel/nand-controller.c | 2286 ++++++++++++++++++ drivers/mtd/nand/raw/atmel/pmecc.c | 965 ++++++++ drivers/mtd/nand/raw/atmel/pmecc.h | 94 + include/configs/sam9x60ek.h | 5 - include/linux/mfd/syscon/atmel-matrix.h | 112 + include/linux/mfd/syscon/atmel-smc.h | 119 + 24 files changed, 4170 insertions(+), 73 deletions(-) create mode 100644 drivers/memory/atmel_ebi.c create mode 100644 drivers/mfd/Kconfig create mode 100644 drivers/mfd/Makefile create mode 100644 drivers/mfd/atmel-smc.c create mode 100644 drivers/mtd/nand/raw/atmel/Makefile create mode 100644 drivers/mtd/nand/raw/atmel/nand-controller.c create mode 100644 drivers/mtd/nand/raw/atmel/pmecc.c create mode 100644 drivers/mtd/nand/raw/atmel/pmecc.h create mode 100644 include/linux/mfd/syscon/atmel-matrix.h create mode 100644 include/linux/mfd/syscon/atmel-smc.h -- 2.25.1

4 16

[PATCH v2 1/2] usb: hub: allow to increase HUB_DEBOUNCE_TIMEOUT
by Patrick Delaunay 09 Dec '22

09 Dec '22

Add a new CONFIG_USB_HUB_DEBOUNCE_TIMEOUT to increase the HUB_DEBOUNCE_TIMEOUT value, for example to 2s because some usb device needs around 1.5s or more to make the hub port status to be connected steadily after being powered off and powered on. This 2s value is aligned with Linux driver and avoids to configure "usb_pgood_delay" as a workaround for connection timeout on some USB device; normally the env variable "usb_pgood_delay" is used to delay the first query after power ON and thus the device answer, but this variable not used to increase the connection timeout delay. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- Hi, V2 of previous patch [1] after Marek request to a add a CONFIG_. I think this patch solves a general issue because a 1s timeout for USB connection is too short on problematic USB keys / USB HUB. The issue was introduced by the commit c998da0d6709 ("usb: Change power-on / scanning timeout handling") Patching usb_hub allows to avoid to patch in each board/driver. For example, commit 0417169054cb ("imx: ventana: add usb_pgood_delay 2sec default") => use pgood_delay = 2s !? or ("ARM: stm32: Increase USB power-good delay on DHSOM") https://patchwork.ozlabs.org/project/uboot/patch/20211113022444.231801-1-ma… or commit 2bf352f0c1b7 ("usb: dwc2: Add delay to fix the USB detection problem on SoCFPGA") => patch in USB DWC2 driver to add a timeout in driver The commit 319418c01c95 ("usb: hub: allow pgood_delay to be specified via env") introduces an env variable for warm-up times managed by hub->query_delay. But it is not linked to the connect timeout after power on managed by hub->connect_timeout. This patch allow to increase the boot time for some board when USB device is not available; the default value = 1s of the config CONFIG_USB_HUB_DEBOUNCE_TIMEOUT allow to keep the current behavior. This issue appears with DWC2 and USB HUB used in STM32MP135F-DK board; pgood_delay=2 is not enough to solved all the USB key detection issues. [1] [2/2] usb: hub: increase HUB_DEBOUNCE_TIMEOUT http://patchwork.ozlabs.org/project/uboot/patch/20220704124540.2.I5eabf3f9f… Patrick Changes in v2: - allow defconfig configuration by CONFIG_USB_HUB_DEBOUNCE_TIMEOUT common/Kconfig | 12 ++++++++++++ common/usb_hub.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/common/Kconfig b/common/Kconfig index e7914ca750a..fedb643ea58 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -992,3 +992,15 @@ config FDT_SIMPLEFB These functions can be used by board to indicate to the OS the presence of the simple frame buffer with associated reserved memory + +config USB_HUB_DEBOUNCE_TIMEOUT + int "Timeout in milliseconds for USB HUB connection" + depends on USB + default 1000 + help + Value in milliseconds of the USB connection timeout, the max delay to + wait the hub port status to be connected steadily after being powered + off and powered on in the usb hub driver. + This define allows to increase the HUB_DEBOUNCE_TIMEOUT default + value = 1s because some usb device needs around 1.5s to be initialized + and a 2s value should solve detection issue on problematic USB keys. diff --git a/common/usb_hub.c b/common/usb_hub.c index d73638950b9..87fd93c55db 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -47,7 +47,7 @@ #define HUB_SHORT_RESET_TIME 20 #define HUB_LONG_RESET_TIME 200 -#define HUB_DEBOUNCE_TIMEOUT 1000 +#define HUB_DEBOUNCE_TIMEOUT CONFIG_USB_HUB_DEBOUNCE_TIMEOUT #define PORT_OVERCURRENT_MAX_SCAN_COUNT 3 -- 2.25.1

4 8

[PATCH] firmware: scmi: use protocol node name to bind the scmi regulator driver
by Patrick Delaunay 08 Dec '22

08 Dec '22

In scmi firmware driver, it is better to bind the scmi protocol driver "scmi_voltage_domain" with the node name of the protocol 17 and not the sub-node named "regulator", because is a fixed string which doesn't provide information and because it is not aligned with the other scmi protocol nodes. For example on stm32mp135f-dk board with device tree in stm32mp131.dtsi scmi: scmi { compatible = "linaro,scmi-optee"; #address-cells = <1>; #size-cells = <0>; linaro,optee-channel-id = <0>; shmem = <&scmi_shm>; scmi_clk: protocol@14 { reg = <0x14>; #clock-cells = <1>; }; scmi_reset: protocol@16 { reg = <0x16>; #reset-cells = <1>; }; scmi_voltd: protocol@17 { reg = <0x17>; scmi_regu: regulators { #address-cells = <1>; #size-cells = <0>; scmi_reg11: voltd-reg11 { reg = <VOLTD_SCMI_REG11>; regulator-name = "reg11"; }; scmi_reg18: voltd-reg18 { reg = <VOLTD_SCMI_REG18>; regulator-name = "reg18"; }; scmi_usb33: voltd-usb33 { reg = <VOLTD_SCMI_USB33>; regulator-name = "usb33"; }; }; }; }; Before the patch: > dm tree scmi_agent 0 [ + ] scmi-over-optee |-- scmi clk 1 [ + ] scmi_clk | |-- protocol@14 ... reset 1 [ ] scmi_reset_domain | |-- protocol@16 nop 2 [ + ] scmi_voltage_domain | `-- regulators regulator 0 [ + ] scmi_regulator | |-- voltd-reg11 regulator 1 [ + ] scmi_regulator | |-- voltd-reg18 regulator 2 [ + ] scmi_regulator | |-- voltd-usb33 ... after the patch: > dm tree scmi_agent 0 [ + ] scmi-over-optee |-- scmi clk 1 [ + ] scmi_clk | |-- protocol@14 ... reset 1 [ ] scmi_reset_domain | |-- protocol@16 nop 2 [ + ] scmi_voltage_domain | `-- protocol@17 regulator 0 [ + ] scmi_regulator | |-- voltd-reg11 regulator 1 [ + ] scmi_regulator | |-- voltd-reg18 regulator 2 [ + ] scmi_regulator | |-- voltd-usb33 ... Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- drivers/firmware/scmi/scmi_agent-uclass.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/scmi/scmi_agent-uclass.c b/drivers/firmware/scmi/scmi_agent-uclass.c index 8f48de30c8cc..9a32678617d7 100644 --- a/drivers/firmware/scmi/scmi_agent-uclass.c +++ b/drivers/firmware/scmi/scmi_agent-uclass.c @@ -60,6 +60,7 @@ static int scmi_bind_protocols(struct udevice *dev) { int ret = 0; ofnode node; + const char *name; dev_for_each_subnode(node, dev) { struct driver *drv = NULL; @@ -71,6 +72,7 @@ static int scmi_bind_protocols(struct udevice *dev) if (ofnode_read_u32(node, "reg", &protocol_id)) continue; + name = ofnode_get_name(node); switch (protocol_id) { case SCMI_PROTOCOL_ID_CLOCK: if (IS_ENABLED(CONFIG_CLK_SCMI)) @@ -100,8 +102,7 @@ static int scmi_bind_protocols(struct udevice *dev) continue; } - ret = device_bind(dev, drv, ofnode_get_name(node), NULL, node, - NULL); + ret = device_bind(dev, drv, name, NULL, node, NULL); if (ret) break; } -- 2.25.1

2 1

(no subject)
by Marc Kleine-Budde 08 Dec '22

08 Dec '22

Hello, the first patch cleans up the error message output if struct image_type_params::set_header is set, the other adds support for creating legacy images with type flat_dt. regards, Marc Changes since v2: - renamed new image type to "fdt_legacy" (suggested by Sean Anderson) Changes since v1: - introduce new image type (suggested by Sean Anderson) instead of adding new cmd line parameter

4 6

[PATCH] tools: fdtgrep: Fix handle leak
by Mikhail Ilin 08 Dec '22

08 Dec '22

The handle "fd" was created in fdtgrep.c:708 by calling the "open" function and is lost in fdtgrep.c:716 and fdtgrep.c:723. Close file descriptor 'fd' before exiting with an error from function utilfdt_read_err_len(const char *filename, char **buffp, off_t *len). Fixes: 1043d0a0296a ("fdt: Add fdtgrep tool") Signed-off-by: Mikhail Ilin <ilin.mikhail.ol(a)gmail.com> --- tools/fdtgrep.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c index 641d6a2e3e..7eabcab439 100644 --- a/tools/fdtgrep.c +++ b/tools/fdtgrep.c @@ -712,15 +712,19 @@ int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len) /* Loop until we have read everything */ buf = malloc(bufsize); - if (!buf) + if (!buf) { + close(fd); return -ENOMEM; + } do { /* Expand the buffer to hold the next chunk */ if (offset == bufsize) { bufsize *= 2; buf = realloc(buf, bufsize); - if (!buf) + if (!buf) { + close(fd); return -ENOMEM; + } } ret = read(fd, &buf[offset], bufsize - offset); -- 2.17.1

3 2

[PATCH] tools: mkimage: Fix nullptr at strchr() The 'file' pointer can be null. Thus, before using it in the strchr() function, you need to make sure that it is not null.
by Mikhail Ilin 08 Dec '22

08 Dec '22

Fixes: 0b0c6af38738 ("Prepare v2020.01") Signed-off-by: Mikhail Ilin <ilin.mikhail.ol(a)gmail.com> --- tools/mkimage.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/mkimage.c b/tools/mkimage.c index 5f51d2cc89..95005d8414 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -509,6 +509,8 @@ int main(int argc, char **argv) file = params.datafile; for (;;) { + if (!file) + break; char *sep = strchr(file, ':'); if (sep) { *sep = '\0'; -- 2.17.1

4 5

[PATCH] fs: ext4: Fix free(NULL) The 'depth_dirname', 'ptr', 'parent_inode' and 'first_inode' pointers may be null. Thus, it is necessary to check them before using free() to avoid free(NULL) cases.
by Mikhail Ilin 08 Dec '22

08 Dec '22

Fixes: 934b14f2bb30 ("ext4: free allocations by parse_path()") Signed-off-by: Mikhail Ilin <ilin.mikhail.ol(a)gmail.com> --- fs/ext4/ext4_common.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 5bf78b530a..422497c257 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -847,15 +847,20 @@ end: fail: free(depth_dirname); - free(parse_dirname); - for (i = 0; i < depth; i++) { - if (!ptr[i]) - break; - free(ptr[i]); + if (parse_dirname) + free(parse_dirname); + if (ptr) { + for (i = 0; i < depth; i++) { + if (!ptr[i]) + break; + free(ptr[i]); + } + free(ptr); } - free(ptr); - free(parent_inode); - free(first_inode); + if (parent_inode) + free(parent_inode); + if (first_inode) + free(first_inode); return result_inode_no; } -- 2.17.1

2 1

[PATCH] tool: ifwitool: Fix buffer overflow
by Mikhail Ilin 08 Dec '22

08 Dec '22

An incorrect 1st parameter is passed to the fix_member() function. Should use a pointer to the beginning of the parent structure (bpdt or subpart_dir, because are boxed), not to their fields. Otherwise, this leads to an overrun of the structure boundary, since in the fix_member() function, an 'offset' is made, relative to the 1st argument, which itself is an 'offset' from the beginning of the structure. Signed-off-by: Mikhail Ilin <ilin.mikhail.ol(a)gmail.com> --- tools/ifwitool.c | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/tools/ifwitool.c b/tools/ifwitool.c index 543e9d4e70..5cc0981411 100644 --- a/tools/ifwitool.c +++ b/tools/ifwitool.c @@ -1443,23 +1443,20 @@ static void bpdt_fixup_write_buffer(struct buffer *buf) size_t offset = 0; - offset = fix_member(&h->signature, offset, sizeof(h->signature)); - offset = fix_member(&h->descriptor_count, offset, - sizeof(h->descriptor_count)); - offset = fix_member(&h->bpdt_version, offset, sizeof(h->bpdt_version)); - offset = fix_member(&h->xor_redundant_block, offset, - sizeof(h->xor_redundant_block)); - offset = fix_member(&h->ifwi_version, offset, sizeof(h->ifwi_version)); - offset = fix_member(&h->fit_tool_version, offset, - sizeof(h->fit_tool_version)); + offset = fix_member(&s, offset, sizeof(h->signature)); + offset = fix_member(&s, offset, sizeof(h->descriptor_count)); + offset = fix_member(&s, offset, sizeof(h->bpdt_version)); + offset = fix_member(&s, offset, sizeof(h->xor_redundant_block)); + offset = fix_member(&s, offset, sizeof(h->ifwi_version)); + offset = fix_member(&s, offset, sizeof(h->fit_tool_version)); uint32_t i; for (i = 0; i < count; i++) { - offset = fix_member(&e[i].type, offset, sizeof(e[i].type)); - offset = fix_member(&e[i].flags, offset, sizeof(e[i].flags)); - offset = fix_member(&e[i].offset, offset, sizeof(e[i].offset)); - offset = fix_member(&e[i].size, offset, sizeof(e[i].size)); + offset = fix_member(&s, offset, sizeof(e[i].type)); + offset = fix_member(&s, offset, sizeof(e[i].flags)); + offset = fix_member(&s, offset, sizeof(e[i].offset)); + offset = fix_member(&s, offset, sizeof(e[i].size)); } } @@ -1657,24 +1654,21 @@ static void subpart_dir_fixup_write_buffer(struct buffer *buf) size_t count = h->num_entries; size_t offset = 0; - offset = fix_member(&h->marker, offset, sizeof(h->marker)); - offset = fix_member(&h->num_entries, offset, sizeof(h->num_entries)); - offset = fix_member(&h->header_version, offset, - sizeof(h->header_version)); - offset = fix_member(&h->entry_version, offset, - sizeof(h->entry_version)); - offset = fix_member(&h->header_length, offset, - sizeof(h->header_length)); - offset = fix_member(&h->checksum, offset, sizeof(h->checksum)); + offset = fix_member(&s, offset, sizeof(h->marker)); + offset = fix_member(&s, offset, sizeof(h->num_entries)); + offset = fix_member(&s, offset, sizeof(h->header_version)); + offset = fix_member(&s, offset, sizeof(h->entry_version)); + offset = fix_member(&s, offset, sizeof(h->header_length)); + offset = fix_member(&s, offset, sizeof(h->checksum)); offset += sizeof(h->name); uint32_t i; for (i = 0; i < count; i++) { offset += sizeof(e[i].name); - offset = fix_member(&e[i].offset, offset, sizeof(e[i].offset)); - offset = fix_member(&e[i].length, offset, sizeof(e[i].length)); - offset = fix_member(&e[i].rsvd, offset, sizeof(e[i].rsvd)); + offset = fix_member(&s, offset, sizeof(e[i].offset)); + offset = fix_member(&s, offset, sizeof(e[i].length)); + offset = fix_member(&s, offset, sizeof(e[i].rsvd)); } } -- 2.17.1

3 2

[PATCH v2020.01] tool: ifwitool: The function localtime() can return NULL.
by Mikhail Ilin 08 Dec '22

08 Dec '22

This will cause the local_time pointer is passed as the 4th argument to function strftime() to also point to NULL. This result in a segmentation fault. Thus, it's necessary to add a check of the local_time pointer to NULL. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Mikhail Ilin <ilin.mikhail.ol(a)gmail.com> --- tools/ifwitool.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/ifwitool.c b/tools/ifwitool.c index 543e9d4e70..b9873deb6b 100644 --- a/tools/ifwitool.c +++ b/tools/ifwitool.c @@ -1630,6 +1630,8 @@ static void init_manifest_header(struct manifest_header *hdr, size_t size) curr_time = time(NULL); local_time = localtime(&curr_time); + assert(local_time != NULL); + strftime(buffer, sizeof(buffer), "0x%Y%m%d", local_time); hdr->date = strtoul(buffer, NULL, 16); -- 2.17.1

3 2

[PATCH] tools: env: fw_env: Fix unused-result warning
by Jaehoon Chung 08 Dec '22

08 Dec '22

Fix unused-result warning about fread. tools/env/fw_env.c: In function ‘find_nvmem_device’: tools/env/fw_env.c:1751:3: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result [-Wunused-result] 1751 | fread(buf, sizeof(buf), 1, fp); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- tools/env/fw_env.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index c251e2e6ba7d..c9a8774acefb 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1733,6 +1733,7 @@ static int find_nvmem_device(void) while (!nvmem && (dent = readdir(dir))) { FILE *fp; + size_t size; if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, "..")) { continue; @@ -1748,7 +1749,14 @@ static int find_nvmem_device(void) continue; } - fread(buf, sizeof(buf), 1, fp); + size = fread(buf, sizeof(buf), 1, fp); + if (size != 1) { + fprintf(stderr, + "read failed about %s\n", comp); + fclose(fp); + return -EIO; + } + if (!strcmp(buf, "u-boot,env")) { bytes = asprintf(&nvmem, "%s/%s/nvmem", path, dent->d_name); -- 2.25.1

2 1