[U-Boot] [RFC PATCH u-boot v2] ARM: arch-meson: build memory banks using reported memory from registers
Ben Dooks
ben.dooks at codethink.co.uk
Thu Oct 19 18:38:50 UTC 2017
On 2017-10-19 14:22, Neil Armstrong wrote:
> As discussed at [1], the Amlogic Meson GX SoCs can embed a BL31
> firmware
> and a secondary BL32 firmware.
> Since mid-2017, the reserved memory address of the BL31 firmware was
> moved
> and grown for security reasons.
>
> But mainline U-boot and Linux has the old address and size fixed.
>
> These SoCs have a register interface to get the two firmware reserved
> memory start and sizes.
>
> This patch adds a dynamic reservation of the memory zones in the
> device tree bootmem
> reserved memory zone used by the kernel in early boot.
> To be complete, the memory zones are also added to the EFI reserved
> zones.
>
> [1]
> http://lists.infradead.org/pipermail/linux-amlogic/2017-October/004860.html
>
> Changes since v1:
> - switch to fdt rsv mem table and efi reserve memory
> - replaced in_le32 by readl()
>
> Signed-off-by: Neil Armstrong <narmstrong at baylibre.com>
> ---
> arch/arm/include/asm/arch-meson/gxbb.h | 17 +++++
> arch/arm/mach-meson/board.c | 117
> ++++++++++++++++++++++++++++++---
> board/amlogic/odroid-c2/odroid-c2.c | 7 ++
> board/amlogic/p212/p212.c | 7 ++
> configs/odroid-c2_defconfig | 1 +
> configs/p212_defconfig | 1 +
> include/configs/meson-gxbb-common.h | 2 +-
> 7 files changed, 143 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-meson/gxbb.h
> b/arch/arm/include/asm/arch-meson/gxbb.h
> index 74d5290..117f796 100644
> --- a/arch/arm/include/asm/arch-meson/gxbb.h
> +++ b/arch/arm/include/asm/arch-meson/gxbb.h
> @@ -7,10 +7,27 @@
> #ifndef __GXBB_H__
> #define __GXBB_H__
>
> +#define GXBB_FIRMWARE_MEM_SIZE 0x1000000
> +
> +#define GXBB_AOBUS_BASE 0xc8100000
> #define GXBB_PERIPHS_BASE 0xc8834400
> #define GXBB_HIU_BASE 0xc883c000
> #define GXBB_ETH_BASE 0xc9410000
>
> +/* Always-On Peripherals registers */
> +#define GXBB_AO_ADDR(off) (GXBB_AOBUS_BASE + ((off) << 2))
> +
> +#define GXBB_AO_SEC_GP_CFG0 GXBB_AO_ADDR(0x90)
> +#define GXBB_AO_SEC_GP_CFG3 GXBB_AO_ADDR(0x93)
> +#define GXBB_AO_SEC_GP_CFG4 GXBB_AO_ADDR(0x94)
> +#define GXBB_AO_SEC_GP_CFG5 GXBB_AO_ADDR(0x95)
> +
> +#define GXBB_AO_MEM_SIZE_MASK 0xFFFF0000
> +#define GXBB_AO_MEM_SIZE_SHIFT 16
> +#define GXBB_AO_BL31_RSVMEM_SIZE_MASK 0xFFFF0000
> +#define GXBB_AO_BL31_RSVMEM_SIZE_SHIFT 16
> +#define GXBB_AO_BL32_RSVMEM_SIZE_MASK 0xFFFF
> +
> /* Peripherals registers */
> #define GXBB_PERIPHS_ADDR(off) (GXBB_PERIPHS_BASE + ((off) << 2))
>
> diff --git a/arch/arm/mach-meson/board.c b/arch/arm/mach-meson/board.c
> index e89c6aa..24733e1 100644
> --- a/arch/arm/mach-meson/board.c
> +++ b/arch/arm/mach-meson/board.c
> @@ -11,6 +11,9 @@
> #include <asm/arch/sm.h>
> #include <asm/armv8/mmu.h>
> #include <asm/unaligned.h>
> +#include <linux/sizes.h>
> +#include <efi_loader.h>
> +#include <asm/io.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
> @@ -34,16 +37,114 @@ int dram_init(void)
> return 0;
> }
>
> -int dram_init_banksize(void)
> +phys_size_t get_effective_memsize(void)
> {
> - /* Reserve first 16 MiB of RAM for firmware */
> - gd->bd->bi_dram[0].start = 0x1000000;
> - gd->bd->bi_dram[0].size = 0xf000000;
> - /* Reserve 2 MiB for ARM Trusted Firmware (BL31) */
> - gd->bd->bi_dram[1].start = 0x10000000;
> - gd->bd->bi_dram[1].size = gd->ram_size - 0x10200000;
> - return 0;
> + /* Size is reported in MiB, convert it in bytes */
> + return ((readl(GXBB_AO_SEC_GP_CFG0) & GXBB_AO_MEM_SIZE_MASK)
> + >> GXBB_AO_MEM_SIZE_SHIFT) * SZ_1M;
> +}
> +
> +#ifdef CONFIG_MESON_GXBB
> +/*
> + * Early Meson GXBB Firmware revision did not provide the reserved
> + * memory zones in the registers, keep fixed memory zone handling.
> + */
> +
> +void ft_cpu_setup(void *fdt, bd_t *bd)
> +{
> + int ret;
> +
> + /* Add first 16MiB reserved zone */
> + ret = fdt_add_mem_rsv(fdt, 0, GXBB_FIRMWARE_MEM_SIZE);
> + if (ret)
> + printf("Could not reserve zone @ 0x0\n");
> +
> +#if defined(CONFIG_EFI_LOADER)
> + efi_add_memory_map(0, ALIGN(GXBB_FIRMWARE_MEM_SIZE, EFI_PAGE_SIZE)
> + >> EFI_PAGE_SHIFT,
> + EFI_RESERVED_MEMORY_TYPE, false);
> +#endif
Could you make a sub function that does most of this and then have
only one set of #if defined ?
Would anyone mind if efi_add_memory_map had a default 'null'
implementation
if !CONFIG_EFI_LOADER ?
> +
> + /* Add BL31 reserved zone */
> + ret = fdt_add_mem_rsv(fdt, 0x10000000, 0x200000);
> + if (ret)
> + printf("Could not reserve BL1 zone @ 0x10000000\n");
> +
> +#if defined(CONFIG_EFI_LOADER)
> + efi_add_memory_map(0x10000000,
> + ALIGN(0x200000, EFI_PAGE_SIZE)
> + >> EFI_PAGE_SHIFT,
> + EFI_RESERVED_MEMORY_TYPE, false);
> +#endif
> +}
> +#endif
Can we reduce the pre-processor load here, I'm not even sure
we're testing the entire file can be compiled.
> +
> +#ifdef CONFIG_MESON_GXL
you're mixing #ifdef and #if defined.
> +void ft_cpu_setup(void *fdt, bd_t *bd)
> +{
> + u64 bl31_size, bl31_start;
> + u64 bl32_size, bl32_start;
> + u32 reg;
> + int ret;
> +
> + /*
> + * Get ARM Trusted Firmware reserved memory zones in :
> + * - AO_SEC_GP_CFG3: bl32 & bl31 size in KiB, can be 0
> + * - AO_SEC_GP_CFG5: bl31 physical start address, can be NULL
> + * - AO_SEC_GP_CFG4: bl32 physical start address, can be NULL
> + */
> +
> + reg = readl(GXBB_AO_SEC_GP_CFG3);
> +
> + bl31_size = ((reg & GXBB_AO_BL31_RSVMEM_SIZE_MASK)
> + >> GXBB_AO_BL31_RSVMEM_SIZE_SHIFT) * SZ_1K;
> + bl32_size = (reg & GXBB_AO_BL32_RSVMEM_SIZE_MASK) * SZ_1K;
> +
> + bl31_start = readl(GXBB_AO_SEC_GP_CFG5);
> + bl32_start = readl(GXBB_AO_SEC_GP_CFG4);
> +
> + /* Add first 16MiB reserved zone */
> + ret = fdt_add_mem_rsv(fdt, 0, GXBB_FIRMWARE_MEM_SIZE);
> + if (ret)
> + printf("Could not reserve zone @ 0x0\n");
> +
> +#if defined(CONFIG_EFI_LOADER)
> + efi_add_memory_map(0, ALIGN(GXBB_FIRMWARE_MEM_SIZE, EFI_PAGE_SIZE)
> + >> EFI_PAGE_SHIFT,
> + EFI_RESERVED_MEMORY_TYPE, false);
> +#endif
> +
> + /* Add BL31 reserved zone */
> + if (bl31_start && bl31_size) {
> + ret = fdt_add_mem_rsv(fdt, bl31_start, bl31_size);
> + if (ret)
> + printf("Could not reserve BL1 zone @ 0x%llx\n",
> + bl31_start);
> +
> +#if defined(CONFIG_EFI_LOADER)
> + efi_add_memory_map(bl31_start,
> + ALIGN(bl31_size, EFI_PAGE_SIZE)
> + >> EFI_PAGE_SHIFT,
> + EFI_RESERVED_MEMORY_TYPE, false);
> +#endif
> + }
> +
> + /* Add BL32 reserved zone */
> + if (bl32_start && bl32_size) {
> + ret = fdt_add_mem_rsv(fdt, bl32_start, bl32_size);
> + if (ret)
> + printf("Could not reserve BL2 zone @ 0x%llx\n",
> + bl32_start);
> +
> +#if defined(CONFIG_EFI_LOADER)
> + efi_add_memory_map(bl32_start,
> + ALIGN(bl32_size, EFI_PAGE_SIZE)
> + >> EFI_PAGE_SHIFT,
> + EFI_RESERVED_MEMORY_TYPE, false);
> +#endif
> + }
> }
> +#endif
>
> void reset_cpu(ulong addr)
> {
> diff --git a/board/amlogic/odroid-c2/odroid-c2.c
> b/board/amlogic/odroid-c2/odroid-c2.c
> index eac04d8..a9ca34c 100644
> --- a/board/amlogic/odroid-c2/odroid-c2.c
> +++ b/board/amlogic/odroid-c2/odroid-c2.c
> @@ -60,3 +60,10 @@ int misc_init_r(void)
>
> return 0;
> }
> +
> +int ft_board_setup(void *blob, bd_t *bd)
> +{
> + ft_cpu_setup(blob, bd);
> +
> + return 0;
> +}
> diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c
> index ece8096..abd4f76 100644
> --- a/board/amlogic/p212/p212.c
> +++ b/board/amlogic/p212/p212.c
> @@ -56,3 +56,10 @@ int misc_init_r(void)
>
> return 0;
> }
> +
> +int ft_board_setup(void *blob, bd_t *bd)
> +{
> + ft_cpu_setup(blob, bd);
> +
> + return 0;
> +}
> diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
> index f7f8016..4615e03 100644
> --- a/configs/odroid-c2_defconfig
> +++ b/configs/odroid-c2_defconfig
> @@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
> CONFIG_CMD_MMC=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_OF_CONTROL=y
> +CONFIG_OF_BOARD_SETUP=y
> CONFIG_NET_RANDOM_ETHADDR=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> diff --git a/configs/p212_defconfig b/configs/p212_defconfig
> index d4b5349..b6e788b 100644
> --- a/configs/p212_defconfig
> +++ b/configs/p212_defconfig
> @@ -17,6 +17,7 @@ CONFIG_CMD_MMC=y
> CONFIG_CMD_GPIO=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_OF_CONTROL=y
> +CONFIG_OF_BOARD_SETUP=y
> CONFIG_DM_GPIO=y
> CONFIG_DM_MMC=y
> CONFIG_MMC_MESON_GX=y
> diff --git a/include/configs/meson-gxbb-common.h
> b/include/configs/meson-gxbb-common.h
> index d88d42d..c2b306a 100644
> --- a/include/configs/meson-gxbb-common.h
> +++ b/include/configs/meson-gxbb-common.h
> @@ -10,7 +10,7 @@
>
> #define CONFIG_CPU_ARMV8
> #define CONFIG_REMAKE_ELF
> -#define CONFIG_NR_DRAM_BANKS 2
> +#define CONFIG_NR_DRAM_BANKS 1
> #define CONFIG_ENV_SIZE 0x2000
> #define CONFIG_SYS_MAXARGS 32
> #define CONFIG_SYS_MALLOC_LEN (32 << 20)
More information about the U-Boot
mailing list