[PATCH 14/16] arm: rmobile: Support RZ/G2L memory map
Paul Barker
paul.barker.ct at bp.renesas.com
Wed Oct 4 11:18:40 CEST 2023
On 03/10/2023 14:32, Marek Vasut wrote:
> On 9/20/23 14:42, Paul Barker wrote:
>> The memory map for the RZ/G2L family differs from that of previous R-Car
>> gen3/gen4 SoCs.
>
> Gen3 / Gen4
>
>> A high level memory map can be seen in figure 5.2 (section 5.2.1) of the
>> RZ/G2L data sheet rev 1.30 published May 12, 2023. A summary is included
>> here (note that this is a 34-bit address space):
>> * 0x0_0000_0000 - 0x0_0002_FFFF SRAM area
>> * 0x0_0003_0000 - 0x0_0FFF_FFFF Reserved area
>> * 0x0_1000_0000 - 0x0_1FFF_FFFF I/O register area
>> * 0x0_2000_0000 - 0x0_2FFF_FFFF SPI Multi area
>> * 0x0_3000_0000 - 0x0_3FFF_FFFF Reserved area
>> * 0x0_4000_0000 - 0x1_3FFF_FFFF DDR area (4 GiB)
>> * 0x1_4000_0000 - 0x3_FFFF_FFFF Reserved area
>>
>> Within the DDR area, the first 128 MiB are reserved by TrustedFirmware.
>>
>> Signed-off-by: Paul Barker <paul.barker.ct at bp.renesas.com>
>> Reviewed-by: Biju Das <biju.das.jz at bp.renesas.com>
>> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj at bp.renesas.com>
>> ---
>> arch/arm/mach-rmobile/Makefile | 8 +-
>> arch/arm/mach-rmobile/memmap-rzg2l.c | 115 +++++++++++++++++++++++++++
>> 2 files changed, 119 insertions(+), 4 deletions(-)
>> create mode 100644 arch/arm/mach-rmobile/memmap-rzg2l.c
>>
>> diff --git a/arch/arm/mach-rmobile/Makefile b/arch/arm/mach-rmobile/Makefile
>> index 45d6a0e2a28a..ff8b0c7bae25 100644
>> --- a/arch/arm/mach-rmobile/Makefile
>> +++ b/arch/arm/mach-rmobile/Makefile
>> @@ -10,11 +10,11 @@ obj-$(CONFIG_DISPLAY_BOARDINFO) += board.o
>> obj-$(CONFIG_TMU_TIMER) += ../../sh/lib/time.o
>> obj-$(CONFIG_R8A7740) += lowlevel_init.o cpu_info-r8a7740.o pfc-r8a7740.o
>> obj-$(CONFIG_RCAR_GEN2) += lowlevel_init_ca15.o cpu_info-rcar.o
>> -obj-$(CONFIG_RCAR_64) += lowlevel_init_gen3.o memmap-gen3.o
>> -obj-$(CONFIG_RCAR_GEN3) += cpu_info-rcar.o
>> -obj-$(CONFIG_RCAR_GEN4) += cpu_info-rcar.o
>> +obj-$(CONFIG_RCAR_64) += lowlevel_init_gen3.o
>> +obj-$(CONFIG_RCAR_GEN3) += cpu_info-rcar.o memmap-gen3.o
>> +obj-$(CONFIG_RCAR_GEN4) += cpu_info-rcar.o memmap-gen3.o
>> obj-$(CONFIG_RZ_G2) += cpu_info-rzg.o
>> -obj-$(CONFIG_RZG2L) += cpu_info-rzg2l.o
>> +obj-$(CONFIG_RZG2L) += cpu_info-rzg2l.o memmap-rzg2l.o
>>
>> ifneq ($(CONFIG_R8A779A0),)
>> obj-$(CONFIG_ARMV8_PSCI) += psci-r8a779a0.o
>> diff --git a/arch/arm/mach-rmobile/memmap-rzg2l.c b/arch/arm/mach-rmobile/memmap-rzg2l.c
>> new file mode 100644
>> index 000000000000..d0509424fb73
>> --- /dev/null
>> +++ b/arch/arm/mach-rmobile/memmap-rzg2l.c
>> @@ -0,0 +1,115 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * Renesas RZ/G2L family memory map tables
>> + *
>> + * Copyright (C) 2017 Marek Vasut <marek.vasut at gmail.com>
>> + * Copyright (C) 2023 Renesas Electronics Corp.
>> + */
>> +
>> +#include <common.h>
>> +#include <asm/armv8/mmu.h>
>> +#include <asm/global_data.h>
>> +#include <cpu_func.h>
>> +
>> +#define RZG2L_NR_REGIONS 16
>> +
>> +/*
>> + * RZ/G2L supports up to 4 GiB RAM starting at 0x40000000, of
>> + * which the first 128 MiB is reserved by TF-A.
>> + */
>
> Are those 4 GiB continuous , or is there some "low" mem alias and then
> full "high" mem above the 32bit barrier ?
This is a contiguous 4GB region, there's no aliased region on these SoCs.
>
>> +static struct mm_region rzg2l_mem_map[RZG2L_NR_REGIONS] = {
>> + {
>> + .virt = 0x0UL,
>> + .phys = 0x0UL,
>> + .size = 0x40000000UL,
>> + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
>> + PTE_BLOCK_NON_SHARE |
>> + PTE_BLOCK_PXN | PTE_BLOCK_UXN
>> + }, {
>> + .virt = 0x40000000UL,
>> + .phys = 0x40000000UL,
>> + .size = 0x03F00000UL,
>> + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
>> + PTE_BLOCK_INNER_SHARE
>> + }, {
>> + .virt = 0x47E00000UL,
>
> What's this part about ?
This is copied from the RCar Gen3 memory map.
>
>> + .phys = 0x47E00000UL,
>> + .size = 0xF8200000UL,
>> + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
>> + PTE_BLOCK_INNER_SHARE
>> + }, {
>> + /* List terminator */
>> + 0,
>> + }
>> +};
>> +
>> +struct mm_region *mem_map = rzg2l_mem_map;
>> +
>> +DECLARE_GLOBAL_DATA_PTR;
>> +
>> +#define debug_memmap(i, map) \
>> + debug("memmap %d: virt 0x%llx -> phys 0x%llx, size=0x%llx, attrs=0x%llx\n", \
>> + i, map[i].virt, map[i].phys, map[i].size, map[i].attrs)
>> +
>> +void enable_caches(void)
>> +{
>> + unsigned int bank, i = 0;
>> + u64 start, size;
>> +
>> + /* Create map for register access */
>> + rzg2l_mem_map[i].virt = 0x0ULL;
>> + rzg2l_mem_map[i].phys = 0x0ULL;
>> + rzg2l_mem_map[i].size = 0x40000000ULL;
>> + rzg2l_mem_map[i].attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
>> + PTE_BLOCK_NON_SHARE |
>> + PTE_BLOCK_PXN | PTE_BLOCK_UXN;
>> + debug_memmap(i, rzg2l_mem_map);
>> + i++;
>> +
>> + /* Generate entries for DRAM in 32bit address space */
>> + for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) {
>> + start = gd->bd->bi_dram[bank].start;
>> + size = gd->bd->bi_dram[bank].size;
>> +
>> + /* Skip empty DRAM banks */
>> + if (!size)
>> + continue;
>> +
>> + /* Mark memory reserved by ATF as cacheable too. */
>> + if (start == 0x48000000) {
>> + /* Unmark protection area (0x43F00000 to 0x47DFFFFF) */
>> + rzg2l_mem_map[i].virt = 0x40000000ULL;
>> + rzg2l_mem_map[i].phys = 0x40000000ULL;
>> + rzg2l_mem_map[i].size = 0x03F00000ULL;
>> + rzg2l_mem_map[i].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
>> + PTE_BLOCK_INNER_SHARE;
>> + debug_memmap(i, rzg2l_mem_map);
>> + i++;
>> +
>> + start = 0x47E00000ULL;
>> + size += 0x00200000ULL;
>> + }
>> +
>> + rzg2l_mem_map[i].virt = start;
>> + rzg2l_mem_map[i].phys = start;
>> + rzg2l_mem_map[i].size = size;
>> + rzg2l_mem_map[i].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
>> + PTE_BLOCK_INNER_SHARE;
>> + debug_memmap(i, rzg2l_mem_map);
>> + i++;
>> + }
>
> Is this somehow copied from R-Car ? Can this be deduplicated ?
This is based on the R-Car memory map. We discussed internally whether
to modify memmap-gen3.c or create a separate memmap-rzg2l.c and decided
that it was safer not to change the known working code for R-Car systems.
To merge the two, we'll need to add a few if(IS_ENABLED(CONFIG_RZG2L))
conditionals to memmap-gen3.c. I'm happy to do that if that's the
approach you'd prefer.
Thanks,
Paul
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_0x27F4B3459F002257.asc
Type: application/pgp-keys
Size: 3520 bytes
Desc: OpenPGP public key
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20231004/b071e811/attachment.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 236 bytes
Desc: OpenPGP digital signature
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20231004/b071e811/attachment.sig>
More information about the U-Boot
mailing list