[PATCH v2 01/10] include: fdtdec: decouple fdt_addr_t and phys_addr_t size
kever.yang at rock-chips.com
Thu Feb 16 08:41:29 CET 2023
On 2023/2/7 22:51, Johan Jonker wrote:
> The DT specification supports CPUs with both 32-bit and 64-bit addressing
> capabilities. In U-boot the fdt_addr_t and phys_addr_t size are coupled
> by a typedef. The MTD NAND drivers for 32-bit CPU's can describe partitions
> with a 64-bit reg property. These partitions synced from Linux end up with
> the wrong offset and sizes when only the lower 32-bit is passed.
> Decouple the fdt_addr_t and phys_addr_t size as they don't necessary
> Signed-off-by: Johan Jonker <jbx6244 at gmail.com>
> Reviewed-by: Simon Glass <sjg at chromium.org>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
> Changed V2:
> Most drivers still assume that FDT and CPU capabilities are identical.
> In order to use these variables a cast is needed.
> Kconfig | 8 ++++++++
> include/fdtdec.h | 13 +++++++++----
> 2 files changed, 17 insertions(+), 4 deletions(-)
> diff --git a/Kconfig b/Kconfig
> index a75cce7e..7697dade 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -422,11 +422,19 @@ endif # EXPERT
> config PHYS_64BIT
> bool "64bit physical address support"
> + select FDT_64BIT
> Say Y here to support 64bit physical memory address.
> This can be used not only for 64bit SoCs, but also for
> large physical address extension on 32bit SoCs.
> +config FDT_64BIT
> + bool "64bit fdt address support"
> + help
> + Say Y here to support 64bit fdt addresses.
> + This can be used not only for 64bit SoCs, but also
> + for large address extensions on 32bit SoCs.
> config HAS_ROM
> select BINMAN
> diff --git a/include/fdtdec.h b/include/fdtdec.h
> index 12355afd..af29ac0c 100644
> --- a/include/fdtdec.h
> +++ b/include/fdtdec.h
> @@ -18,15 +18,18 @@
> #include <pci.h>
> - * A typedef for a physical address. Note that fdt data is always big
> + * Support for 64bit fdt addresses.
> + * This can be used not only for 64bit SoCs, but also
> + * for large address extensions on 32bit SoCs.
> + * Note that fdt data is always big
> * endian even on a litle endian machine.
> -typedef phys_addr_t fdt_addr_t;
> -typedef phys_size_t fdt_size_t;
> #define FDT_SIZE_T_NONE (-1U)
> -#ifdef CONFIG_PHYS_64BIT
> +#ifdef CONFIG_FDT_64BIT
> +typedef u64 fdt_addr_t;
> +typedef u64 fdt_size_t;
> #define FDT_ADDR_T_NONE ((ulong)(-1))
> #define fdt_addr_to_cpu(reg) be64_to_cpu(reg)
> @@ -35,6 +38,8 @@ typedef phys_size_t fdt_size_t;
> #define cpu_to_fdt_size(reg) cpu_to_be64(reg)
> typedef fdt64_t fdt_val_t;
> +typedef u32 fdt_addr_t;
> +typedef u32 fdt_size_t;
> #define FDT_ADDR_T_NONE (-1U)
> #define fdt_addr_to_cpu(reg) be32_to_cpu(reg)
More information about the U-Boot