September 2023 - U-Boot

[PULL] please pull u-boot-coldfire/next
by Angelo Dureghello 06 Sep '23

06 Sep '23

Hi Tom, The following changes since commit b53ab97150314674edc25508f4fc528be2baa73f: event.h: Documented some newly added portions better (2023-09-04 11:19:50 -0400) are available in the Git repository at: git://git.denx.de/u-boot-coldfire.git next for you to fetch changes up to 26af162ac8f8ab3222d32f00f06a4774a061150a: arch: m68k: Implement relocation (2023-09-06 13:28:58 +0200) ---------------------------------------------------------------- Marek Vasut (3): tools: relocate-rela: Fix BE symtab handling tools: relocate-rela: Add M68K support arch: m68k: Implement relocation arch/Kconfig | 1 - arch/m68k/Kconfig | 4 +-- arch/m68k/config.mk | 6 ++-- arch/m68k/cpu/mcf523x/start.S | 57 +++++++++++++++++++++------------ arch/m68k/cpu/mcf52x2/start.S | 57 +++++++++++++++++++++------------ arch/m68k/cpu/mcf530x/start.S | 59 +++++++++++++++++++++------------- arch/m68k/cpu/mcf532x/start.S | 57 +++++++++++++++++++++------------ arch/m68k/cpu/mcf5445x/start.S | 57 +++++++++++++++++++++------------ arch/m68k/cpu/u-boot.lds | 14 ++++++++ tools/relocate-rela.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------- 10 files changed, 303 insertions(+), 143 deletions(-)

2 1

[PULL] u-boot-usb/next
by Marek Vasut 06 Sep '23

06 Sep '23

The following changes since commit f2bb6d9ffd9ba0d0d89c00445a70cf81327a7af2: Merge tag 'doc-next' of https://source.denx.de/u-boot/custodians/u-boot-efi into next (2023-09-02 09:08:34 -0400) are available in the Git repository at: git://source.denx.de/u-boot-usb.git next for you to fetch changes up to adee3ba577a6d5902b5af6c2368faf5f509003c6: usb: host: ohci-generic: Make usage of clock/reset bulk() API (2023-09-04 18:25:20 +0200) ---------------------------------------------------------------- Fabrice Gasnier (2): usb: check for companion controller in uclass usb: host: ohci-generic: Make usage of clock/reset bulk() API drivers/usb/host/ohci-generic.c | 92 +++++++++++++---------------------------- drivers/usb/host/usb-uclass.c | 36 ++++++++++++++++ 2 files changed, 65 insertions(+), 63 deletions(-)

2 1

[PULL] u-boot-usb/master
by Marek Vasut 06 Sep '23

06 Sep '23

The following changes since commit 8999257f219d1e371c2fd66f255b8782897944d9: Merge tag 'doc-2023-10-rc4-2' of https://source.denx.de/u-boot/custodians/u-boot-efi (2023-09-02 09:08:54 -0400) are available in the Git repository at: git://source.denx.de/u-boot-usb.git master for you to fetch changes up to 7f4b73fe6939761dd3891b96628efcab47a0570e: usb: dwc3: Fix enabling USB_DR_MODE_HOST (2023-09-04 15:51:38 +0200) ---------------------------------------------------------------- Oleksandr Suvorov (2): usb: dwc3: Fix renaming SPL_USB_HOST_SUPPORT to SPL_USB_HOST usb: dwc3: Fix enabling USB_DR_MODE_HOST drivers/usb/dwc3/dwc3-layerscape.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

2 1

[PATCH v4 1/4] Add reserved-memory
by Simon Glass 06 Sep '23

06 Sep '23

Bring in this file from Linux v6.5 Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v4: - New patch .../reserved-memory/reserved-memory.yaml | 181 ++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 dtschema/schemas/reserved-memory/reserved-memory.yaml diff --git a/dtschema/schemas/reserved-memory/reserved-memory.yaml b/dtschema/schemas/reserved-memory/reserved-memory.yaml new file mode 100644 index 0000000..c680e39 --- /dev/null +++ b/dtschema/schemas/reserved-memory/reserved-memory.yaml @@ -0,0 +1,181 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/reserved-memory/reserved-memory.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: /reserved-memory Child Node Common + +maintainers: + - devicetree-spec(a)vger.kernel.org + +description: > + Reserved memory is specified as a node under the /reserved-memory node. The + operating system shall exclude reserved memory from normal usage one can + create child nodes describing particular reserved (excluded from normal use) + memory regions. Such memory regions are usually designed for the special + usage by various device drivers. + + Each child of the reserved-memory node specifies one or more regions + of reserved memory. Each child node may either use a 'reg' property to + specify a specific range of reserved memory, or a 'size' property with + optional constraints to request a dynamically allocated block of + memory. + + Following the generic-names recommended practice, node names should + reflect the purpose of the node (ie. "framebuffer" or "dma-pool"). + Unit address (@<address>) should be appended to the name if the node + is a static allocation. + +properties: + reg: true + + size: + oneOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - $ref: /schemas/types.yaml#/definitions/uint64 + description: > + Length based on parent's \#size-cells. Size in bytes of memory to + reserve. + + alignment: + oneOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - $ref: /schemas/types.yaml#/definitions/uint64 + description: > + Length based on parent's \#size-cells. Address boundary for + alignment of allocation. + + alloc-ranges: + $ref: /schemas/types.yaml#/definitions/uint32-array + description: > + Address and Length pairs. Specifies regions of memory that are + acceptable to allocate from. + + iommu-addresses: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: > + A list of phandle and specifier pairs that describe static IO virtual + address space mappings and carveouts associated with a given reserved + memory region. The phandle in the first cell refers to the device for + which the mapping or carveout is to be created. + + The specifier consists of an address/size pair and denotes the IO + virtual address range of the region for the given device. The exact + format depends on the values of the "#address-cells" and "#size-cells" + properties of the device referenced via the phandle. + + When used in combination with a "reg" property, an IOVA mapping is to + be established for this memory region. One example where this can be + useful is to create an identity mapping for physical memory that the + firmware has configured some hardware to access (such as a bootsplash + framebuffer). + + If no "reg" property is specified, the "iommu-addresses" property + defines carveout regions in the IOVA space for the given device. This + can be useful if a certain memory region should not be mapped through + the IOMMU. + + no-map: + type: boolean + description: > + Indicates the operating system must not create a virtual mapping + of the region as part of its standard mapping of system memory, + nor permit speculative access to it under any circumstances other + than under the control of the device driver using the region. + + reusable: + type: boolean + description: > + The operating system can use the memory in this region with the + limitation that the device driver(s) owning the region need to be + able to reclaim it back. Typically that means that the operating + system can use that region to store volatile or cached data that + can be otherwise regenerated or migrated elsewhere. + +allOf: + - if: + required: + - no-map + + then: + not: + required: + - reusable + + - if: + required: + - reusable + + then: + not: + required: + - no-map + +oneOf: + - oneOf: + - required: + - reg + + - required: + - size + + - oneOf: + # IOMMU reservations + - required: + - iommu-addresses + + # IOMMU mappings + - required: + - reg + - iommu-addresses + +additionalProperties: true + +examples: + - | + / { + compatible = "foo"; + model = "foo"; + + #address-cells = <2>; + #size-cells = <2>; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + adsp_resv: reservation-adsp { + /* + * Restrict IOVA mappings for ADSP buffers to the 512 MiB region + * from 0x40000000 - 0x5fffffff. Anything outside is reserved by + * the ADSP for I/O memory and private memory allocations. + */ + iommu-addresses = <&adsp 0x0 0x00000000 0x00 0x40000000>, + <&adsp 0x0 0x60000000 0xff 0xa0000000>; + }; + + fb: framebuffer@90000000 { + reg = <0x0 0x90000000 0x0 0x00800000>; + iommu-addresses = <&dc0 0x0 0x90000000 0x0 0x00800000>; + }; + }; + + bus@0 { + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x0 0x0 0x40000000>; + + adsp: adsp@2990000 { + reg = <0x2990000 0x2000>; + memory-region = <&adsp_resv>; + }; + + dc0: display@15200000 { + reg = <0x15200000 0x10000>; + memory-region = <&fb>; + }; + }; + }; +... -- 2.42.0.rc2.253.gd59a3bf2b4-goog

3 7

[PATCH 0/2] riscv: starfive: generate u-boot-spl.bin.normal.out
by Heinrich Schuchardt 06 Sep '23

06 Sep '23

The StarFive JH7110 base boards require a header to be prefixed to the SPL binary image. This has previously done with a vendor tool 'spl_tool' published under a GPL-2-or-later license. Integrate this capability into mkimage. Add a binman task into the VisionFive 2 build to build the prefixed U-Boot SPL file u-boot-spl.bin.normal.out. Heinrich Schuchardt (2): tools: mkimage: Add StarFive SPL image support riscv: dts: starfive: generate u-boot-spl.bin.normal.out .../jh7110-starfive-visionfive-2-u-boot.dtsi | 10 + boot/image.c | 1 + doc/board/starfive/visionfive2.rst | 14 +- include/image.h | 1 + tools/Makefile | 1 + tools/sfspl.c | 174 ++++++++++++++++++ 6 files changed, 189 insertions(+), 12 deletions(-) create mode 100644 tools/sfspl.c -- 2.40.1

2 5

Pull request: please pull u-boot-imx-20230905
by Stefano Babic 05 Sep '23

05 Sep '23

Hi Tom, some fixes for the release, please pull from u-boot-imx, thanks ! The following changes since commit 8999257f219d1e371c2fd66f255b8782897944d9: Merge tag 'doc-2023-10-rc4-2' of https://source.denx.de/u-boot/custodians/u-boot-efi (2023-09-02 09:08:54 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20230905 for you to fetch changes up to a79fca7b44d0dee96e14d31de5869b35b587283c: thermal: imx_tmu: Increase the polling interval (2023-09-04 17:26:44 +0200) ---------------------------------------------------------------- Fixes for release ----------------- - imx9: fix DRAM calculation - thermal: fixes - fixed for DM, DH and Gateworks boards CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/17639 ---------------------------------------------------------------- Elena Popa (1): arm: imx: imx8m: imx9: Fix DRAM size calculation due to rom_pointer Fabio Estevam (5): imx8mm_evk_defconfig: Select CONFIG_IMX_TMU thermal: imx_tmu: Fix the polling default thermal: imx_tmu: Increase the log level for high temperatures thermal: imx_tmu: Fix the temperature unit thermal: imx_tmu: Increase the polling interval Marek Vasut (5): ARM: imx: Drop CONFIG_USE_BOOTCOMMAND=n on i.MX6 DHSOM ARM: imx: Select 2 DRAM banks on Data Modul i.MX8M Mini eDM SBC ARM: imx: Use default SAVED_DRAM_TIMING_BASE on DH i.MX8M Plus DHCOM ARM: imx: Use default SAVED_DRAM_TIMING_BASE on Data Modul i.MX8M Mini eDM SBC ARM: imx: Use default SAVED_DRAM_TIMING_BASE on Data Modul i.MX8M Plus eDM SBC Tim Harvey (1): board: gateworks: venice: fix gw7904 arch/arm/mach-imx/imx8m/soc.c | 7 ++++--- arch/arm/mach-imx/imx9/soc.c | 6 +++--- configs/dh_imx6_defconfig | 1 - configs/imx8mm_data_modul_edm_sbc_defconfig | 3 +-- configs/imx8mm_evk_defconfig | 1 + configs/imx8mm_venice_defconfig | 2 +- configs/imx8mp_data_modul_edm_sbc_defconfig | 1 - configs/imx8mp_dhcom_pdk2_defconfig | 1 - configs/imx8mp_dhcom_pdk3_defconfig | 1 - drivers/thermal/imx_tmu.c | 10 +++++++--- 10 files changed, 17 insertions(+), 16 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

[PULL] u-boot-riscv/master
by Leo Liang 05 Sep '23

05 Sep '23

Hi Tom, The following changes since commit 493fd3363f6da6a784514657d689c7cda0f390d5: nokia_rx51: Remove platform (2023-09-04 21:14:32 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-riscv.git for you to fetch changes up to dfe08374943c0e898fcfaf7327f69e0fb56b7d23: risc-v: implement DBCN based debug console (2023-09-05 10:53:55 +0800) CI result shows no issue: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/17650 ---------------------------------------------------------------- + Implement OpenSBI DBCN extension for early debug console + Fixes for VisionFive2 board + Fix timer missing + Fix L2 LIM issue + Enable PCIE auto enumeration to support USB and NVMe by default + Set eth0 mac address properly + Add __noreturn attribute to spl_invoke_opensbi ---------------------------------------------------------------- Chanho Park (1): spl: add __noreturn attribute to spl_invoke_opensbi function Heinrich Schuchardt (2): risc-v: implement DBCN write byte risc-v: implement DBCN based debug console Seung-Woo Kim (1): eeprom: starfive: set eth0 mac address properly Shengyu Qu (6): configs: starfive: Enable PCIE auto enum and NVME/USB stuff for Starfive Visionfive 2 doc: board: starfive: Add more info about supported driver Kconfig: Add SPL_SYS_MALLOC_CLEAR_ON_INIT dlmalloc: Add support for SPL_SYS_MALLOC_CLEAR_ON_INIT riscv: cpu: jh7110: Imply SPL_SYS_MALLOC_CLEAR_ON_INIT configs: starfive: Disable SYS_MALLOC_CLEAR_ON_INIT by default Torsten Duwe (2): riscv: allow riscv timer to be instantiated via device tree riscv: jh7110: enable riscv,timer in the device tree Kconfig | 11 +++++++++ arch/riscv/cpu/jh7110/Kconfig | 1 + arch/riscv/dts/jh7110.dtsi | 9 +++++++ arch/riscv/include/asm/sbi.h | 1 + arch/riscv/lib/sbi.c | 16 +++++++++++++ .../starfive/visionfive2/visionfive2-i2c-eeprom.c | 2 +- common/dlmalloc.c | 6 ++--- common/spl/spl_opensbi.c | 7 +++--- configs/starfive_visionfive2_defconfig | 10 +++++++- doc/board/starfive/visionfive2.rst | 2 ++ drivers/serial/Kconfig | 5 +++- drivers/serial/serial_sbi.c | 20 ++++++++++++++++ drivers/timer/riscv_timer.c | 28 ++++++++++++++++++++-- include/spl.h | 2 +- 14 files changed, 108 insertions(+), 12 deletions(-) Best regards, Leo

2 1

Re: [PATCH] binman: Fix SyntaxWarning: invalid escape sequence '\('
by 荣涛 05 Sep '23

05 Sep '23

I Just try     binman entry-docs > entries.rst     git difff It didn't change anything. Rong Tao

1 0

[PATCH v2] dm: core: support reading a single indexed u64 value
by Michal Simek 05 Sep '23

05 Sep '23

Add helper function to allow reading a single indexed u64 value from a device-tree property containing multiple u64 values, that is an array of u64's. Co-developed-by: Ashok Reddy Soma <ashok.reddy.soma(a)amd.com> Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma(a)amd.com> Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- Changes in v2: - fix kernel-doc for of_read_u64_index() - add missing test reported by Simon - fix debug print to print 64bit value - convert of_read_u64 to use of_read_u64_index() as is done also for u32 version - fix overflow size calculation Tested on sandbox: make defconfig && make -j8 && ./u-boot --fdt arch/sandbox/dts/test.dtb --command "ut dm ofnode_u64" -v Test: dm_test_ofnode_u64: ofnode.c Test: dm_test_ofnode_u64: ofnode.c (flat tree) Failures: 0 Based on v2023.07 tag. --- arch/sandbox/dts/test.dts | 1 + drivers/core/of_access.c | 16 ++++++++++++---- drivers/core/ofnode.c | 30 ++++++++++++++++++++++++++++++ include/dm/of_access.h | 19 +++++++++++++++++++ include/dm/ofnode.h | 12 ++++++++++++ test/dm/ofnode.c | 8 ++++++++ 6 files changed, 82 insertions(+), 4 deletions(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index ff9f9222e6f9..a3c12bb09874 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -288,6 +288,7 @@ uint-value = <(-1234)>; int64-value = /bits/ 64 <0x1111222233334444>; int-array = <5678 9123 4567>; + int64-array = /bits/ 64 <0x1111222233334444 0x4444333322221111>; str-value = "test string"; interrupts-extended = <&irq 3 0>; acpi,name = "GHIJ"; diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c index 81a307992c01..1d5348bf2f50 100644 --- a/drivers/core/of_access.c +++ b/drivers/core/of_access.c @@ -570,26 +570,34 @@ int of_read_u32_index(const struct device_node *np, const char *propname, return 0; } -int of_read_u64(const struct device_node *np, const char *propname, u64 *outp) +int of_read_u64_index(const struct device_node *np, const char *propname, + int index, u64 *outp) { const __be64 *val; debug("%s: %s: ", __func__, propname); if (!np) return -EINVAL; - val = of_find_property_value_of_size(np, propname, sizeof(*outp)); + + val = of_find_property_value_of_size(np, propname, + sizeof(*outp) * (index + 1)); if (IS_ERR(val)) { debug("(not found)\n"); return PTR_ERR(val); } - *outp = be64_to_cpup(val); + *outp = be64_to_cpup(val + index); debug("%#llx (%lld)\n", (unsigned long long)*outp, - (unsigned long long)*outp); + (unsigned long long)*outp); return 0; } +int of_read_u64(const struct device_node *np, const char *propname, u64 *outp) +{ + return of_read_u64_index(np, propname, 0, outp); +} + int of_property_match_string(const struct device_node *np, const char *propname, const char *string) { diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index ec574c446079..e973c74af4cf 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -319,6 +319,36 @@ int ofnode_read_u32_index(ofnode node, const char *propname, int index, return 0; } +int ofnode_read_u64_index(ofnode node, const char *propname, int index, + u64 *outp) +{ + const fdt64_t *cell; + int len; + + assert(ofnode_valid(node)); + + if (ofnode_is_np(node)) + return of_read_u64_index(ofnode_to_np(node), propname, index, + outp); + + cell = fdt_getprop(ofnode_to_fdt(node), ofnode_to_offset(node), + propname, &len); + if (!cell) { + debug("(not found)\n"); + return -EINVAL; + } + + if (len < (sizeof(u64) * (index + 1))) { + debug("(not large enough)\n"); + return -EOVERFLOW; + } + + *outp = fdt64_to_cpu(cell[index]); + debug("%#llx (%lld)\n", *outp, *outp); + + return 0; +} + u32 ofnode_read_u32_index_default(ofnode node, const char *propname, int index, u32 def) { diff --git a/include/dm/of_access.h b/include/dm/of_access.h index c556a18f7d9c..9361d0a87bfb 100644 --- a/include/dm/of_access.h +++ b/include/dm/of_access.h @@ -333,6 +333,25 @@ int of_read_u32(const struct device_node *np, const char *propname, u32 *outp); int of_read_u32_index(const struct device_node *np, const char *propname, int index, u32 *outp); +/** + * of_read_u64_index() - Find and read a 64-bit value from a multi-value + * property + * + * @np: device node from which the property value is to be read. + * @propname: name of the property to be searched. + * @index: index of the u32 in the list of values + * @outp: pointer to return value, modified only if return value is 0. + * + * Search for a property in a device node and read a 64-bit value from + * it. + * + * Return: + * 0 on success, -EINVAL if the property does not exist, or -EOVERFLOW if the + * property data isn't large enough. + */ +int of_read_u64_index(const struct device_node *np, const char *propname, + int index, u64 *outp); + /** * of_read_u64() - Find and read a 64-bit integer from a property * diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index 443db6252ddc..c5c244c6a476 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -424,6 +424,18 @@ int ofnode_read_u32(ofnode node, const char *propname, u32 *outp); int ofnode_read_u32_index(ofnode node, const char *propname, int index, u32 *outp); +/** + * ofnode_read_u64_index() - Read a 64-bit integer from a multi-value property + * + * @node: valid node reference to read property from + * @propname: name of the property to read from + * @index: index of the integer to return + * @outp: place to put value (if found) + * Return: 0 if OK, -ve on error + */ +int ofnode_read_u64_index(ofnode node, const char *propname, int index, + u64 *outp); + /** * ofnode_read_s32() - Read a 32-bit integer from a property * diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index 473a8cef5780..08b6721e926b 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -967,6 +967,14 @@ static int dm_test_ofnode_u64(struct unit_test_state *uts) ut_asserteq_64(0x1111222233334444, val); ut_asserteq(-EINVAL, ofnode_read_u64(node, "missing", &val)); + ut_assertok(ofnode_read_u64_index(node, "int64-array", 0, &val)); + ut_asserteq_64(0x1111222233334444, val); + ut_assertok(ofnode_read_u64_index(node, "int64-array", 1, &val)); + ut_asserteq_64(0x4444333322221111, val); + ut_asserteq(-EOVERFLOW, + ofnode_read_u64_index(node, "int64-array", 2, &val)); + ut_asserteq(-EINVAL, ofnode_read_u64_index(node, "missing", 0, &val)); + return 0; } DM_TEST(dm_test_ofnode_u64, UT_TESTF_SCAN_FDT); -- 2.36.1

2 2

[PATCH v2 1/5] imx8mm_evk_defconfig: Select CONFIG_IMX_TMU
by Fabio Estevam 05 Sep '23

05 Sep '23

From: Fabio Estevam <festevam(a)denx.de> Select the i.MX8MM thermal driver as it is useful for displaying the CPU temperature and its grading: CPU: Commercial temperature grade (0C to 95C) at 38C It also prevents booting when the temperature is above the alert point. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- Changes since v1: - None configs/imx8mm_evk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig index ac9810fe1b..822c2fbfab 100644 --- a/configs/imx8mm_evk_defconfig +++ b/configs/imx8mm_evk_defconfig @@ -104,6 +104,7 @@ CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_PSCI=y CONFIG_SYSRESET_WATCHDOG=y CONFIG_DM_THERMAL=y +CONFIG_IMX_TMU=y CONFIG_USB=y CONFIG_SPL_USB_HOST=y CONFIG_USB_EHCI_HCD=y -- 2.34.1

3 10