November 2023 - U-Boot

[PATCH v2] smbios: arm64: Allow table to be written at a fixed addr
by Simon Glass 19 Nov '23

19 Nov '23

U-Boot typically sets up its malloc() pool near the top of memory. On ARM64 systems this can result in an SMBIOS table above 4GB which is not supported by SMBIOSv2. Work around this problem by providing a new option to choose an address below 4GB (but as high as possible), if needed. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Update to search for a suitable area automatically, if enabled lib/Kconfig | 12 +++++++ lib/efi_loader/efi_smbios.c | 63 ++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/lib/Kconfig b/lib/Kconfig index f6ca559897e7..a1eec98b392f 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -994,6 +994,18 @@ config GENERATE_SMBIOS_TABLE See also SMBIOS_SYSINFO which allows SMBIOS values to be provided in the devicetree. +config SMBIOS_TABLE_FIXED + bool "Place the SMBIOS table at a special address" + depends on GENERATE_SMBIOS_TABLE && ARM64 && SMBIOS && EFI_LOADER + default y + help + Use this option to place the SMBIOS table at a special address. + + U-Boot typically sets up its malloc() pool near the top of memory. On + ARM64 systems this can result in an SMBIOS table above 4GB which is + not supported by SMBIOSv2. This option works around this problem by + chosing an address just below 4GB, if needed. + endmenu config LIB_RATIONAL diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c index 48446f654d9b..bdbce4c4d785 100644 --- a/lib/efi_loader/efi_smbios.c +++ b/lib/efi_loader/efi_smbios.c @@ -47,6 +47,60 @@ efi_status_t efi_smbios_register(void) map_sysmem(addr, 0)); } +/** + * find_addr_below() - Find a usable region below the given max_addr + * + * Check if *addrp is suitable to define a memory region which finishes below + * @max_addr + @req_size. If so, do nothing and return 0 + * + * As a backup, if CONFIG_SMBIOS_TABLE_FIXED is enabled, search for a + * 4KB-aligned DRAM region which is large enough. Make sure it is below U-Boot's + * stack space, assumed to be 64KB. + * + * @max_addr: Maximum address that can be used (region must finish before here) + * @req:size: Required size of region + * @addrp: On entry: Current proposed address; on exit, holds the new address, + * on success + * Return 0 if OK (existing region was OK, or a new one was found), -ENOSPC if + * nothing suitable was found + */ +static int find_addr_below(ulong max_addr, ulong req_size, ulong *addrp) +{ + struct bd_info *bd = gd->bd; + ulong max_base; + int i; + + max_base = max_addr - req_size; + if (*addrp <= max_base) + return 0; + + if (!IS_ENABLED(CONFIG_SMBIOS_TABLE_FIXED)) + return -ENOSPC; + + /* Make sure that the base is at least 64KB below the stack */ + max_base = min(max_base, + ALIGN(gd->start_addr_sp - SZ_64K - req_size, SZ_4K)); + + for (i = CONFIG_NR_DRAM_BANKS - 1; i >= 0; i--) { + ulong start = bd->bi_dram[i].start; + ulong size = bd->bi_dram[i].size; + ulong addr; + + /* chose an address at most req_size bytes before the end */ + addr = min(max_base, start - req_size + size); + + /* check this is in the range */ + if (addr >= start && addr + req_size < start + size) { + *addrp = addr; + log_warning("Forcing SMBIOS table to address %lx\n", + addr); + return 0; + } + } + + return -ENOSPC; +} + static int install_smbios_table(void) { ulong addr; @@ -61,7 +115,14 @@ static int install_smbios_table(void) return log_msg_ret("mem", -ENOMEM); addr = map_to_sysmem(buf); - if (!write_smbios_table(addr)) { + + /* + * Deal with a fixed address if needed. For simplicity we assume that + * the SMBIOS-table size is <64KB. If a suitable address cannot be + * found, then write_smbios_table() returns an error. + */ + if (find_addr_below(SZ_4G, SZ_64K, &addr) || + !write_smbios_table(addr)) { log_err("Failed to write SMBIOS table\n"); return log_msg_ret("smbios", -EINVAL); } -- 2.42.0.758.gaed0368e0e-goog

3 16

[PATCH] configs: rockpro64: Enable SPI command and full BOOTSTD
by Shantur Rathore 19 Nov '23

19 Nov '23

RockPro64 has a 16MB onboard SPI chip and current u-boot takes around 2MB, we can enable more features. Updating config to enable SPI commands and full BootSTD support. --- configs/rockpro64-rk3399_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig index 4cd6b76665..cad0b8a5d7 100644 --- a/configs/rockpro64-rk3399_defconfig +++ b/configs/rockpro64-rk3399_defconfig @@ -46,10 +46,12 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y +CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y CONFIG_CMD_BOOTSTAGE=y +CONFIG_BOOTSTD_FULL=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_SPI_FLASH=y -- 2.40.1

3 13

[PATCH 0/4] clk: ccf: fix enable_count mismatch
by Yang Xiwen via B4 Relay 18 Nov '23

18 Nov '23

As described in [1], enable_count is incremented by 2 when ccf_clk_enable() is called. This series of patch fixed this issue and added a testcase for that. [1]: https://lore.kernel.org/all/SEZPR06MB695927A6DEEEF8489A06897396A7A@SEZPR06M… Signed-off-by: Yang Xiwen <forbidden405(a)outlook.com> --- Yang Xiwen (4): clk: clk_sandbox_ccf: assign ccf_clk_ops to .ops of the driver clk: get correct ops for clk_enable() and clk_disable() clk: clk_sandbox: get devm clock i2c_root test: dm: clk_ccf: get "i2c_root" clock from &clk_ccf arch/sandbox/dts/test.dts | 6 ++++-- arch/sandbox/include/asm/clk.h | 1 + drivers/clk/clk-uclass.c | 2 ++ drivers/clk/clk_sandbox_ccf.c | 1 + drivers/clk/clk_sandbox_test.c | 5 +++++ test/dm/clk_ccf.c | 14 +++++++++++--- 6 files changed, 24 insertions(+), 5 deletions(-) --- base-commit: 3b913c148249a2b9d12ff25517ec311646e83bee change-id: 20231111-enable_count-ad5001326815 Best regards, -- Yang Xiwen <forbidden405(a)outlook.com>

1 4

[PATCH v2 0/2] cmd: acpi: fix acpi list command
by Heinrich Schuchardt 18 Nov '23

18 Nov '23

The size of the ACPI table header is not a multiple of 8. We have to mark struct acpi_xsdt as packed to correctly access field Entry. Add a unit test for the offsets of field Entry in the RSDT and XSDT tables. ACPI tables may comprise either RSDT, XSDT, or both. The current code fails to check the presence of the RSDT table before accessing it. This leads to an exception if the RSDT table is not provided. The XSDT table takes precedence over the RSDT table. Addresses in the XSDT table are 64-bit. Adjust the output accordingly. As the RSDT table has to be ignored if the XSDT command is present there is no need to compare the tables in a display command. Anyway the specification does not require that the sequence of addresses in the RSDT and XSDT table are the same. The FACS table header does not provide revision information. Correct the description of dump_hdr(). Adjust the ACPI test to match the changed output format of the 'acpi list' command. v2: merge patch 2 and 3 remove leading zeros from address output Heinrich Schuchardt (2): acpi: fix struct acpi_xsdt cmd: acpi: fix acpi list command cmd/acpi.c | 48 +++++++++++++++++++++++---------------- include/acpi/acpi_table.h | 2 +- test/dm/acpi.c | 28 +++++++++++++++-------- 3 files changed, 49 insertions(+), 29 deletions(-) -- 2.40.1

2 5

[PATCH 1/1] acpi: consider XSDT in acpi_find_table()
by Heinrich Schuchardt 18 Nov '23

18 Nov '23

The RSDT table is deprecated and does not exist on all systems. By preference scan XSDT for the table to find. If no XSDT table exists, try to use the RSDT table. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/acpi/acpi.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/acpi/acpi.c b/lib/acpi/acpi.c index 14b15754f4..3938946fc6 100644 --- a/lib/acpi/acpi.c +++ b/lib/acpi/acpi.c @@ -16,18 +16,30 @@ struct acpi_table_header *acpi_find_table(const char *sig) { struct acpi_rsdp *rsdp; struct acpi_rsdt *rsdt; + struct acpi_xsdt *xsdt; int len, i, count; rsdp = map_sysmem(gd_acpi_start(), 0); if (!rsdp) return NULL; - rsdt = map_sysmem(rsdp->rsdt_address, 0); - len = rsdt->header.length - sizeof(rsdt->header); - count = len / sizeof(u32); + xsdt = map_sysmem(rsdp->xsdt_address, 0); + if (xsdt) { + len = xsdt->header.length - sizeof(xsdt->header); + count = len / sizeof(u64); + } else { + rsdt = map_sysmem(rsdp->rsdt_address, 0); + if (!rsdt) + return NULL; + len = rsdt->header.length - sizeof(rsdt->header); + count = len / sizeof(u32); + } for (i = 0; i < count; i++) { struct acpi_table_header *hdr; - hdr = map_sysmem(rsdt->entry[i], 0); + if (xsdt) + hdr = map_sysmem(xsdt->entry[i], 0); + else + hdr = map_sysmem(rsdt->entry[i], 0); if (!memcmp(hdr->signature, sig, ACPI_NAME_LEN)) return hdr; if (!memcmp(hdr->signature, "FACP", ACPI_NAME_LEN)) { -- 2.40.1

2 1

[PATCH 0/6] risc-v: add ACPI support on QEMU
by Heinrich Schuchardt 18 Nov '23

18 Nov '23

QEMU 8.1.2 can create ACPI tables for the RISC-V architecture. Allow passing them through to the operating system. Provide a new defconfig that enables this. Heinrich Schuchardt (6): acpi: do not write ACPI tables on TARGET_QEMU_VIRT risc-v: add ACPI fields to global data risc-v: add support for QEMU provided ACPI tables riscv: qemu: copy ACPI tables from QEMU riscv: allow usage of ACPI configs: defconfig for QEMU RISC-V with ACPI arch/Kconfig | 1 + arch/riscv/include/asm/global_data.h | 4 ++++ board/emulation/qemu-riscv/Kconfig | 2 ++ board/emulation/qemu-riscv/MAINTAINERS | 1 + board/emulation/qemu-riscv/qemu-riscv.c | 17 ++++++++++++++ configs/qemu-riscv64_acpi_smode_defconfig | 27 +++++++++++++++++++++++ lib/Kconfig | 2 +- lib/acpi/Makefile | 2 +- lib/acpi/acpi_writer.c | 2 +- 9 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 configs/qemu-riscv64_acpi_smode_defconfig -- 2.40.1

3 16

[PATCH v2 0/5] bootm: Handle compressed arm64 images with bootm
by Simon Glass 18 Nov '23

18 Nov '23

This little series corrects a problem I noticed with arm64 images, where the kernel is not recognised if compression is used: U-Boot> tftp image.fit Using ethernet@7d580000 device TFTP from server 192.168.4.7; our IP address is 192.168.4.147 Filename 'image.fit'. Load address: 0x1000000 Loading: ################################################## 23 MiB 20.5 MiB/s done Bytes transferred = 24118272 (1700400 hex) U-Boot> bootm ## Loading kernel from FIT Image at 01000000 ... Using 'conf-768' configuration Trying 'kernel' kernel subimage Description: Linux Type: Kernel Image (no loading done) Compression: gzip compressed Data Start: 0x01000120 Data Size: 13662338 Bytes = 13 MiB Verifying Hash Integrity ... OK Bad Linux ARM64 Image magic! With this series: U-Boot> tftp 20000000 image.fit Using ethernet@7d580000 device TFTP from server 192.168.4.7; our IP address is 192.168.4.147 Filename 'image.fit'. Load address: 0x20000000 Loading: ################################################## 23.5 MiB 20.8 MiB/s done Bytes transferred = 24642560 (1780400 hex) U-Boot> bootm 0x20000000 ## Loading kernel from FIT Image at 20000000 ... Using 'conf-768' configuration Trying 'kernel' kernel subimage Description: Linux Type: Kernel Image (no loading done) Compression: zstd compressed Data Start: 0x20000120 Data Size: 14333475 Bytes = 13.7 MiB Verifying Hash Integrity ... OK Using kernel load address 80000 ## Loading fdt from FIT Image at 20000000 ... Using 'conf-768' configuration Trying 'fdt-768' fdt subimage Description: Raspberry Pi 4 Model B Type: Flat Device Tree Compression: zstd compressed Data Start: 0x215f820c Data Size: 9137 Bytes = 8.9 KiB Architecture: AArch64 Verifying Hash Integrity ... OK Uncompressing Flat Device Tree to 3aff3010 Booting using the fdt blob at 0x3aff3010 Working FDT set to 3aff3010 Uncompressing Kernel Image (no loading done) to 80000 Moving Image from 0x80000 to 0x200000, end=2b00000 Using Device Tree in place at 000000003aff3010, end 000000003afff4c4 Working FDT set to 3aff3010 Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd083] The problem is that the arm64 magic is checked before the image is decompressed. However this is only part of it. The kernel_noload image type should not be permitted with compression, so this series adds a check for that. Another issue is that the arm64 handling is done too early, before the image is loaded. This series moves it to after loading, so that compression can be handled. This series also adjusts the 'load' address to be optional, since it is often not possible to select a load address which can work with all boards. We can use the kernel_addr_r environment variable instead. A patch is included to show the kernel load-address, so it is easy to see what is going on. One annoying feature of arm64 is that the image is often copied to another address. It might be possible for U-Boot to figure that out earlier and decompress it to the right place, but perhaps not. With all of this it should be possible to boot a compressed kernel on any of the 990 arm64 boards supported by Linux, although I have only tested two. Changes in v2: - Allow omitting the load address rather than messing with kernel_noload - Rework the patch based on a better understanding of events - Add a 'success' case to the cover letter - Redo how the arm64 support is implemented Simon Glass (5): image: Correct load_bug typo image: Show the load address when decompressing bootm: Allow omitting the load address bootm: Move arm64-image processing later boot: Don't allow kernel_noload with compression boot/bootm.c | 67 ++++++++++++++++++---------- boot/image.c | 13 ++++-- doc/usage/fit/source_file_format.rst | 7 ++- include/image.h | 2 +- 4 files changed, 60 insertions(+), 29 deletions(-) -- 2.42.0.869.gea05f2083d-goog

2 11

[PATCH v4 0/3] [PATCH v4 0/3] [PATCH v3 0/3] BOOTP/DHCPv4 enhancements
by seanedmond＠linux.microsoft.com 18 Nov '23

18 Nov '23

From: Sean Edmond <seanedmond(a)microsoft.com> In our datacenter application, a single DHCP server is servicing 36000+ clients. Improvements are required to the DHCPv4 retransmission behavior to align with RFC and ensure less pressure is exerted on the server: - retransmission backoff interval maximum is configurable (environment variable bootpretransmitperiodmax) - initial retransmission backoff interval is configurable (environment variable bootpretransmitperiodinit) - transaction ID is kept the same for each BOOTP/DHCPv4 request (not recreated on each retry) For our application we'll use: - bootpretransmitperiodmax=16000 - bootpretransmitperiodinit=2000 A new configuration BOOTP_RANDOM_XID has been added to enable a randomized BOOTP/DHCPv4 transaction ID. Enhance DHCPv4 sending/parsing option 209 (PXE config file). A previous patch was accepted. A new patch fixes a possible double free() and addresses latest review comments. changes in v4: - rebase master and resolve conflicts - change commit description for DHCP option 209 patch (this is now an enhancement patch) - default y for BOOTP_PXE_DHCP_OPTION (feedback from review) - Add "select LIB_RAND" for "config CMD_BOOTP" (retransmission improvements require rand()) changes in v3: - add define for option 209 and rfc5071 reference - Set RETRANSMIT_PERIOD_MAX_MS=60000 - Add randomization factor to retransmission timeout - Add depends for BOOTP_RANDOM_XID changes in v2: - use env_get_ulong() to get environment variables Sean Edmond (3): net: Additional fixes for dhcp option 209 net: bootp: BOOTP/DHCPv4 retransmission improvements net: bootp: add config option BOOTP_RANDOM_XID cmd/Kconfig | 10 ++++++- cmd/pxe.c | 2 ++ net/bootp.c | 76 +++++++++++++++++++++++++++++++++++++++++------------ net/bootp.h | 2 ++ 4 files changed, 72 insertions(+), 18 deletions(-) -- 2.42.0

3 6

[PATCH v2 00/15] nand: Add sandbox tests
by Sean Anderson 18 Nov '23

18 Nov '23

This series tests raw nand flash in sandbox and fixes various bugs discovered in the process. I've tried to do things in a contemporary manner, avoiding the (numerous) variations present on only a few boards. The test is pretty minimal. Future work could test the rest of the nand API as well as the MTD API. Bloat (for v1) at [1] (for boards with SPL_NAND_SUPPORT enabled). Almost everything grows by a few bytes due to nand_page_size. A few boards grow more, mostly those using nand_spl_loaders.c. CI at [2]. [1] https://gist.github.com/Forty-Bot/9694f3401893c9e706ccc374922de6c2 [2] https://source.denx.de/u-boot/custodians/u-boot-clk/-/pipelines/18443 Changes in v2: - Don't set load->priv for spl_nand_legacy_read since it doesn't use it. - Rename SYS_NAND_PAGE_COUNT to SYS_NAND_BLOCK_PAGES - Remove spurious form feed character - Use ECC bytes from the layout, since we already are using the layout for the ECC byte position. - Add some documentation for the device tree binding - Fix unused expression warning with clang Sean Anderson (15): spl: nand: Fix NULL-pointer dereference nand: Don't dereference NULL manufacturer_desc nand: Calculate SYS_NAND_BLOCK_PAGES (neé SYS_NAND_PAGE_COUNT) automatically nand: spl_loaders: Only read enough pages to load the image spl: legacy: Honor bl_len when decompressing spl: nand: Set bl_len to page size cmd: nand: Map memory before accessing it spl: nand: Map memory before accessing it mtd: Rename SPL_MTD_SUPPORT to SPL_MTD mtd: Add some fallbacks for add/del_mtd_device nand: Add function to unregister NAND devices nand: Allow reinitialization arch: sandbox: Add function to create temporary files nand: Add sandbox driver test: spl: Add a test for NAND README | 9 +- arch/sandbox/cpu/os.c | 17 + arch/sandbox/dts/test.dts | 65 ++ arch/sandbox/include/asm/spl.h | 1 + cmd/nand.c | 26 +- common/spl/Kconfig | 2 +- common/spl/spl_legacy.c | 18 +- common/spl/spl_nand.c | 20 +- configs/am335x_baltos_defconfig | 3 +- configs/am335x_evm_defconfig | 3 +- configs/am335x_evm_spiboot_defconfig | 2 +- configs/am335x_guardian_defconfig | 1 - configs/am335x_hs_evm_defconfig | 2 +- configs/am335x_hs_evm_uart_defconfig | 2 +- configs/am335x_igep003x_defconfig | 3 +- configs/am335x_sl50_defconfig | 2 +- configs/am3517_evm_defconfig | 3 +- configs/am43xx_evm_defconfig | 3 +- configs/am43xx_evm_rtconly_defconfig | 3 +- configs/am43xx_evm_usbhost_boot_defconfig | 3 +- configs/am43xx_hs_evm_defconfig | 3 +- configs/am62ax_evm_r5_defconfig | 2 +- configs/am65x_evm_a53_defconfig | 2 +- configs/axm_defconfig | 1 - configs/chiliboard_defconfig | 1 - configs/cm_t43_defconfig | 2 +- configs/corvus_defconfig | 1 - configs/da850evm_nand_defconfig | 1 - configs/devkit3250_defconfig | 1 - configs/devkit8000_defconfig | 1 - configs/dra7xx_evm_defconfig | 1 - configs/draco_defconfig | 1 - configs/etamin_defconfig | 1 - .../gardena-smart-gateway-at91sam_defconfig | 1 - configs/igep00x0_defconfig | 3 +- configs/imx6ulz_smm_m2_defconfig | 2 +- configs/imx8mn_bsh_smm_s2_defconfig | 2 +- configs/j7200_evm_a72_defconfig | 2 +- configs/j7200_evm_r5_defconfig | 2 +- configs/j721e_evm_a72_defconfig | 2 +- configs/j721e_evm_r5_defconfig | 2 +- configs/j721s2_evm_a72_defconfig | 2 +- configs/j721s2_evm_r5_defconfig | 2 +- configs/m53menlo_defconfig | 1 - configs/omap35_logic_defconfig | 3 +- configs/omap35_logic_somlv_defconfig | 3 +- configs/omap3_beagle_defconfig | 3 +- configs/omap3_evm_defconfig | 3 +- configs/omap3_logic_defconfig | 3 +- configs/omap3_logic_somlv_defconfig | 3 +- configs/omapl138_lcdk_defconfig | 1 - configs/phycore-am335x-r2-regor_defconfig | 3 +- configs/phycore-am335x-r2-wega_defconfig | 3 +- configs/pxm2_defconfig | 1 - configs/rastaban_defconfig | 1 - configs/rut_defconfig | 1 - configs/sama5d3_xplained_nandflash_defconfig | 1 - configs/sama5d3xek_nandflash_defconfig | 1 - configs/sama5d4_xplained_nandflash_defconfig | 1 - configs/sama5d4ek_nandflash_defconfig | 1 - configs/sandbox64_defconfig | 10 +- configs/sandbox_defconfig | 9 + configs/sandbox_noinst_defconfig | 21 +- configs/smartweb_defconfig | 1 - configs/socfpga_secu1_defconfig | 2 +- configs/stm32746g-eval_spl_defconfig | 2 +- configs/stm32f746-disco_spl_defconfig | 2 +- configs/stm32f769-disco_spl_defconfig | 2 +- configs/stm32mp15_basic_defconfig | 2 +- configs/stm32mp15_dhcom_basic_defconfig | 2 +- configs/stm32mp15_dhcor_basic_defconfig | 2 +- configs/taurus_defconfig | 1 - configs/thuban_defconfig | 1 - .../nand/sandbox,nand.txt | 57 ++ drivers/mtd/Makefile | 2 +- drivers/mtd/nand/raw/Kconfig | 27 +- drivers/mtd/nand/raw/Makefile | 1 + drivers/mtd/nand/raw/am335x_spl_bch.c | 8 +- drivers/mtd/nand/raw/atmel_nand.c | 10 +- drivers/mtd/nand/raw/denali_spl.c | 5 + drivers/mtd/nand/raw/fsl_ifc_spl.c | 8 + drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 5 + drivers/mtd/nand/raw/mt7621_nand_spl.c | 5 + drivers/mtd/nand/raw/mxc_nand_spl.c | 10 +- drivers/mtd/nand/raw/mxs_nand_spl.c | 5 + drivers/mtd/nand/raw/nand.c | 66 +- drivers/mtd/nand/raw/nand_base.c | 7 +- drivers/mtd/nand/raw/nand_spl_loaders.c | 5 +- drivers/mtd/nand/raw/nand_spl_simple.c | 10 +- drivers/mtd/nand/raw/omap_gpmc.c | 3 +- drivers/mtd/nand/raw/sand_nand.c | 707 ++++++++++++++++++ drivers/mtd/nand/raw/sunxi_nand_spl.c | 8 +- drivers/mtd/onenand/onenand_uboot.c | 2 - include/linux/mtd/mtd.h | 12 + include/mtd/cfi_flash.h | 2 +- include/nand.h | 3 + include/os.h | 13 + include/system-constants.h | 4 + test/dm/Makefile | 1 + test/dm/nand.c | 104 +++ test/image/Kconfig | 9 + test/image/Makefile | 1 + test/image/spl_load_nand.c | 54 ++ 103 files changed, 1318 insertions(+), 152 deletions(-) create mode 100644 doc/device-tree-bindings/nand/sandbox,nand.txt create mode 100644 drivers/mtd/nand/raw/sand_nand.c create mode 100644 test/dm/nand.c create mode 100644 test/image/spl_load_nand.c -- 2.37.1

3 17

[RFC PATCH 2/2] rpi5: initial support
by Dmitry Malkin 18 Nov '23

18 Nov '23

rpi5: add initial memory map for bcm2712 --- arch/arm/mach-bcm283x/init.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c index d76c8e5eb2..3424b116d5 100644 --- a/arch/arm/mach-bcm283x/init.c +++ b/arch/arm/mach-bcm283x/init.c @@ -68,6 +68,26 @@ static struct mm_region bcm2711_mem_map[MEM_MAP_MAX_ENTRIES] = { } }; +static struct mm_region bcm2712_mem_map[MEM_MAP_MAX_ENTRIES] = { + { + .virt = 0x00000000UL, + .phys = 0x00000000UL, + .size = 0x3f800000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE + }, { + .virt = 0x107c000000UL, + .phys = 0x107c000000UL, + .size = 0x0004000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* List terminator */ + 0, + } +}; + struct mm_region *mem_map = bcm283x_mem_map; /* @@ -78,6 +98,7 @@ static const struct udevice_id board_ids[] = { { .compatible = "brcm,bcm2837", .data = (ulong)&bcm283x_mem_map}, { .compatible = "brcm,bcm2838", .data = (ulong)&bcm2711_mem_map}, { .compatible = "brcm,bcm2711", .data = (ulong)&bcm2711_mem_map}, + { .compatible = "brcm,bcm2712", .data = (ulong)&bcm2712_mem_map}, { }, }; -- 2.40.1

1 0