RPi one binary for RPi3/4 and RPi1/2
Subsystems (5)
v3 cover RPi one binary for RPi3/4 and RPi1/2
From: Matthias Brugger <[email protected]>
In this series we prepare the RaspberryPi source code
to be able to build one binary for RPi[3,4] and one for RPi[1,2]. To achieve this we need to set the IO base address on runtime. Apart from that, for arm64 we also need to set memory region correctly.
This patches fix this stuff. With this we could create one binary for each armv7 and armv8 based RPis. There is still some work to do to create a unified config, which will be done in a later patch series.
Changes in v3:
- fix armv7 build
Changes in v2:
- push fw_dtb_pointer into the .data section
- fix register access in reset_cpu()
- rename BCM2838 to BCM2711 in the correct patch
- push rpi_bcm283x_base into the .data section
- Move mem_map out of assembly file
- push mem_map into the .data section
- update the members of mem_map inestead of the pointer
Matthias Brugger (4):
rpi: push fw_dtb_pointer in the .data section
ARM: bcm283x: Move BCM283x_BASE to a global variable
ARM: bcm283x: Set rpi_bcm283x_base at run-time
ARM: bcm283x: Set memory map at run-time
arch/arm/mach-bcm283x/Kconfig | 6 - arch/arm/mach-bcm283x/include/mach/base.h | 11 ++ arch/arm/mach-bcm283x/include/mach/mbox.h | 4 +- arch/arm/mach-bcm283x/include/mach/sdhci.h | 5 +- arch/arm/mach-bcm283x/include/mach/timer.h | 7 +- arch/arm/mach-bcm283x/include/mach/wdog.h | 5 +- arch/arm/mach-bcm283x/init.c | 140 +++++++++++++++++++++ arch/arm/mach-bcm283x/mbox.c | 1 + arch/arm/mach-bcm283x/reset.c | 20 ++- board/raspberrypi/rpi/lowlevel_init.S | 12 +- board/raspberrypi/rpi/rpi.c | 49 +------- include/configs/rpi.h | 4 + 12 files changed, 192 insertions(+), 72 deletions(-) create mode 100644 arch/arm/mach-bcm283x/include/mach/base.h
Signature · 1 line
2.24.0
PATCH v3 1/4 rpi: push fw_dtb_pointer in the .data section
From: Matthias Brugger <[email protected]>
The fw_dtb_pointer was defined in the assembly code, which makes him live in section .text_rest
Put that's not necessary, we can push the variable in the .data section.
This will prevent relocation errors like:
board/raspberrypi/rpi/rpi.c:317:(.text.board_get_usable_ram_top+0x8):
relocation truncated to fit: R_AARCH64_LDST64_ABS_LO12_NC against symbol `fw_dtb_pointer' defined in .text section in board/raspberrypi/rpi/built-in.o
---
Changes in v3:
- fix armv7 build
Changes in v2:
- push fw_dtb_pointer into the .data section
board/raspberrypi/rpi/lowlevel_init.S | 12 ++---------- board/raspberrypi/rpi/rpi.c | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-)
board/raspberrypi/rpi/lowlevel_init.S +2 -10
@@ -6,15 +6,6 @@ #include <config.h> -.align 8 -.global fw_dtb_pointer -fw_dtb_pointer: -#ifdef CONFIG_ARM64 - .dword 0x0 -#else - .word 0x0 -#endif - /* * Routine: save_boot_params (called after reset from start.S) * Description: save ATAG/FDT address provided by the firmware at boot time
@@ -28,7 +19,8 @@ save_boot_params: adr x8, fw_dtb_pointer str x0, [x8] #else - str r2, fw_dtb_pointer + ldr r8, =fw_dtb_pointer + str r2, [r8] #endif /* Returns */
board/raspberrypi/rpi/rpi.c +2 -2
@@ -27,8 +27,8 @@DECLARE_GLOBAL_DATA_PTR ; -/* From lowlevel_init.S */ -extern unsigned long fw_dtb_pointer; +/* Assigned in lowlevel_init.S */ +unsigned long fw_dtb_pointer =0x1 ;/* TODO(sjg at chromium.org): Move these to the msg.c file */ struct msg_get_arm_mem {
Signature · 1 line
2.24.0
PATCH v3 1/4 rpi: push fw_dtb_pointer in the .data section
Quoted 60 lines · matthias.bgg at kernel.org
From: Matthias Brugger <[email protected]>
The
fw_dtb_pointerwas defined in the assembly code, which makes him live in section .text_rest
Put that's not necessary, we can push the variable in the .data section.This will prevent relocation errors like:
board/raspberrypi/rpi/rpi.c:317:(.text.board_get_usable_ram_top+0x8):
relocation truncated to fit:R_AARCH64_LDST64_ABS_LO12_NCagainst symbol `fw_dtb_pointer' defined in .text section inboard/raspberrypi/rpi/built-in.oSigned-off-by Matthias Brugger <[email protected]>---
Changes in v3:
- fix armv7 buildChanges in v2:
- pushfw_dtb_pointerinto the .data sectionboard/raspberrypi/rpi/lowlevel_init.S | 12 ++---------- board/raspberrypi/rpi/rpi.c | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-)board/raspberrypi/rpi/lowlevel_init.S +2
-10@@ -6,15 +6,6 @@ #include <config.h> -.align 8 -.global fw_dtb_pointer -fw_dtb_pointer: -#ifdef CONFIG_ARM64 - .dword 0x0 -#else - .word 0x0 -#endif - /* * Routine: save_boot_params (called after reset from start.S) * Description: save ATAG/FDT address provided by the firmware at boot time@@ -28,7 +19,8 @@ save_boot_params: adr x8, fw_dtb_pointer str x0, [x8] #else - str r2, fw_dtb_pointer + ldr r8, =fw_dtb_pointer + str r2, [r8] #endif /* Returns */board/raspberrypi/rpi/rpi.c +0
-0
board/raspberrypi/rpi/rpi.c line 31
Quoted 7 lines
board/raspberrypi/rpi/rpi.c +2
-2@@ -27,8 +27,8 @@DECLARE_GLOBAL_DATA_PTR ; -/* From lowlevel_init.S */ -extern unsigned long fw_dtb_pointer; +/* Assigned in lowlevel_init.S */ +unsigned long fw_dtb_pointer =0x1 ;
I assume you assign the 0x1 here so that it doesn't land in .bss which may get cleared after you wrote it? If so, please document that in the comment. Also even better yet, document it in a comment and just manually assign the variable to the ".data" section using
 __attribute__((section(".data")))
Alex
PATCH v3 1/4 rpi: push fw_dtb_pointer in the .data section
Quoted 61 lines · Alexander Graf
Quoted 59 lines · matthias.bgg at kernel.org
From: Matthias Brugger <[email protected]>
The
fw_dtb_pointerwas defined in the assembly code, which makes him live in section .text_rest
Put that's not necessary, we can push the variable in the .data section.This will prevent relocation errors like:
board/raspberrypi/rpi/rpi.c:317:(.text.board_get_usable_ram_top+0x8):
relocation truncated to fit:R_AARCH64_LDST64_ABS_LO12_NCagainst symbol `fw_dtb_pointer' defined in .text section inboard/raspberrypi/rpi/built-in.oSigned-off-by Matthias Brugger <[email protected]>---
Changes in v3:
- fix armv7 buildChanges in v2:
- pushfw_dtb_pointerinto the .data section
board/raspberrypi/rpi/lowlevel_init.S| 12 ++---------- board/raspberrypi/rpi/rpi.c | 4 ++--2 files changed, 4 insertions(+), 12 deletions(-)board/raspberrypi/rpi/lowlevel_init.S +0
-0@@ -6,15 +6,6 @@ #include <config.h>-.align 8
-.globalfw_dtb_pointerboard/raspberrypi/rpi/lowlevel_init.S +0
-7-fw_dtb_pointer: -#ifdef CONFIG_ARM64 - .dword 0x0 -#else - .word 0x0 -#endif -/*
* Routine:save_boot_params(called after reset fromstart.S)
* Description: save ATAG/FDT address provided by the firmware at boot timeboard/raspberrypi/rpi/lowlevel_init.S +0
-0@@ -28,7 +19,8 @@ save_boot_params:adr x8,
fw_dtb_pointer
str x0, [x8]
#else
- str r2,fw_dtb_pointer
+ ldr r8, =fw_dtb_pointer
+ str r2, [r8]
#endif
/* Returns */board/raspberrypi/rpi/rpi.c +0
-0@@ -27,8 +27,8 @@ DECLARE_GLOBAL_DATA_PTR;
Quoted 8 lines
board/raspberrypi/rpi/rpi.c line 31
Quoted 4 lines
-/* From
lowlevel_init.S*/board/raspberrypi/rpi/rpi.c +2
-1-extern unsigned long fw_dtb_pointer; +/* Assigned in lowlevel_init.S */ +unsigned long fw_dtb_pointer =0x1 ;I assume you assign the
0x1here so that it doesn't land in .bss which may get cleared after you wrote it? If so, please document that in the comment. Also
Yes exactly.
Quoted 5 lines
even better yet, document it in a comment and just manually assign the variable to the ".data" section using
__attribute__((section(".data")))
Agree that's a cleaner approach then adding any random value to the pointer.
Regards,
Matthias
PATCH v3 2/4 ARM: bcm283x: Move BCM283x_BASE to a global variable
In reply to matthias.bgg at kernel.orgFrom: Matthias Brugger <[email protected]>
We move the per SOC define BCM283x_BASE to a global variable. This is a first step to provide a single binary for several bcm283x SoCs.
---
Changes in v3: None
Changes in v2:
- fix register access in reset_cpu()
arch/arm/mach-bcm283x/include/mach/base.h | 11 +++++++++++ arch/arm/mach-bcm283x/include/mach/mbox.h | 4 +++- arch/arm/mach-bcm283x/include/mach/sdhci.h | 5 ++++- arch/arm/mach-bcm283x/include/mach/timer.h | 7 ++++++- arch/arm/mach-bcm283x/include/mach/wdog.h | 5 ++++- arch/arm/mach-bcm283x/init.c | 8 ++++++++ arch/arm/mach-bcm283x/mbox.c | 1 + arch/arm/mach-bcm283x/reset.c | 20 +++++++++++++++----- include/configs/rpi.h | 4 ++++ 9 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 arch/arm/mach-bcm283x/include/mach/base.h
arch/arm/mach-bcm283x/include/mach/base.h new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* (C) Copyright 2019 Matthias Brugger +*/ + +#ifndef _BCM283x_BASE_H_ +#define _BCM283x_BASE_H_ + +extern unsigned long rpi_bcm283x_base; + +#endif
arch/arm/mach-bcm283x/include/mach/mbox.h +3 -1
@@ -7,6 +7,7 @@#define _BCM2835_MBOX_H#include <linux/compiler.h> +#include <asm/arch/base.h> /* * The BCM2835 SoC contains (at least) two CPUs; the VideoCore (a/k/a "GPU")
@@ -37,7 +38,8 @@/* Raw mailbox HW */ -#define BCM2835_MBOX_PHYSADDR (CONFIG_BCM283x_BASE + 0x0000b880) +#define BCM2835_MBOX_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \ + rpi_bcm283x_base + 0x0000b880; })struct bcm2835_mbox_regs {u32 read;
arch/arm/mach-bcm283x/include/mach/sdhci.h +4 -1
@@ -6,7 +6,10 @@#ifndef _BCM2835_SDHCI_H_#define _BCM2835_SDHCI_H_ -#define BCM2835_SDHCI_BASE (CONFIG_BCM283x_BASE + 0x00300000) +#include <asm/arch/base.h> + +#define BCM2835_SDHCI_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \ + rpi_bcm283x_base + 0x00300000; })int bcm2835_sdhci_init (u32 regbase,u32 emmc_freq);
arch/arm/mach-bcm283x/include/mach/timer.h +6 -1
@@ -6,7 +6,12 @@#ifndef _BCM2835_TIMER_H#define _BCM2835_TIMER_H -#define BCM2835_TIMER_PHYSADDR (CONFIG_BCM283x_BASE + 0x00003000) +#ifndef __ASSEMBLY__ +#include <asm/arch/base.h> +#endif + +#define BCM2835_TIMER_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \ + rpi_bcm283x_base + 0x00003000; })#define BCM2835_TIMER_CS_M3 (1 << 3)#define BCM2835_TIMER_CS_M2 (1 << 2)
arch/arm/mach-bcm283x/include/mach/wdog.h +4 -1
@@ -6,7 +6,10 @@ #ifndef _BCM2835_WDOG_H #define _BCM2835_WDOG_H -#define BCM2835_WDOG_PHYSADDR (CONFIG_BCM283x_BASE + 0x00100000) +#include <asm/arch/base.h> + +#define BCM2835_WDOG_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \ + rpi_bcm283x_base + 0x00100000; }) struct bcm2835_wdog_regs { u32 unknown0[7];
arch/arm/mach-bcm283x/init.c +8 -0
@@ -8,6 +8,8 @@#include <common.h> +unsigned long rpi_bcm283x_base; +int arch_cpu_init (void ) {icache_enable ();
@@ -15,6 +17,12 @@ int arch_cpu_init(void)return 0 ; } +int mach_cpu_init (void ) +{ + rpi_bcm283x_base = CONFIG_BCM283x_BASE; + +return 0 ; +}#ifdef CONFIG_ARMV7_LPAE void enable_caches (void ) {
arch/arm/mach-bcm283x/mbox.c +1 -0
@@ -5,6 +5,7 @@#include <common.h> #include <asm/io.h> +#include <asm/arch/base.h> #include <asm/arch/mbox.h> #include <phys2bus.h>
arch/arm/mach-bcm283x/reset.c +15 -5
@@ -8,6 +8,7 @@#include <common.h> #include <asm/io.h> +#include <asm/arch/base.h> #include <asm/arch/wdog.h> #include <efi_loader.h>
@@ -25,10 +26,10 @@void hw_watchdog_disable (void ) {} -__efi_runtime_data struct bcm2835_wdog_regs *wdog_regs = - (struct bcm2835_wdog_regs *)BCM2835_WDOG_PHYSADDR ; +__efi_runtime_data struct bcm2835_wdog_regs *wdog_regs; -void __efi_runtime reset_cpu(ulong ticks) +static void __efi_runtime +__reset_cpu (struct bcm2835_wdog_regs *wdog_regs,ulong ticks) {uint32_t rstc, timeout;
@@ -46,6 +47,14 @@ void __efi_runtime reset_cpu(ulong ticks)writel (BCM2835_WDOG_PASSWORD | rstc, &wdog_regs->rstc); } +void reset_cpu (ulong ticks) +{ +struct bcm2835_wdog_regs *regs = + (struct bcm2835_wdog_regs *)BCM2835_WDOG_PHYSADDR ; + +__reset_cpu (regs,0 ); +} +#ifdef CONFIG_EFI_LOADER void __efi_runtime EFIAPI efi_reset_system(
@@ -58,7 +67,7 @@ void __efi_runtime EFIAPI efi_reset_system(if (reset_type ==EFI_RESET_COLD || reset_type ==EFI_RESET_WARM || reset_type ==EFI_RESET_PLATFORM_SPECIFIC ) { -reset_cpu (0 ); +__reset_cpu (wdog_regs,0 ); }else if (reset_type ==EFI_RESET_SHUTDOWN ) {/* * We set the watchdog hard reset bit here to distinguish this reset
@@ -69,7 +78,7 @@ void __efi_runtime EFIAPI efi_reset_system( val |=BCM2835_WDOG_PASSWORD ; val |=BCM2835_WDOG_RSTS_RASPBERRYPI_HALT ;writel (val, &wdog_regs->rsts); -reset_cpu (0 ); +__reset_cpu (wdog_regs,0 ); }while (1 ) { }
@@ -77,6 +86,7 @@ void __efi_runtime EFIAPI efi_reset_system(efi_status_t efi_reset_system_init (void ) { + wdog_regs = (struct bcm2835_wdog_regs *)BCM2835_WDOG_PHYSADDR ;return efi_add_runtime_mmio (&wdog_regs,sizeof (*wdog_regs)); }
include/configs/rpi.h +4 -0
@@ -9,6 +9,10 @@#include <linux/sizes.h> #include <asm/arch/timer.h> +#ifndef __ASSEMBLY__ +#include <asm/arch/base.h> +#endif +#if defined(CONFIG_TARGET_RPI_2 ) || defined(CONFIG_TARGET_RPI_3_32B )#define CONFIG_SKIP_LOWLEVEL_INIT #endif
Signature · 1 line
2.24.0
PATCH v3 3/4 ARM: bcm283x: Set rpi_bcm283x_base at run-time
In reply to matthias.bgg at kernel.orgFrom: Matthias Brugger <[email protected]>
As part of the effort to create one binary for several bcm83x SoCs we use the SoC compatible to decide which IO base address we use.
---
Changes in v3: None
Changes in v2:
- rename BCM2838 to BCM2711 in the correct patch
- push rpi_bcm283x_base into the .data section
arch/arm/mach-bcm283x/Kconfig | 6 ---- arch/arm/mach-bcm283x/init.c | 62 +++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 8 deletions(-)
arch/arm/mach-bcm283x/Kconfig +0 -6
@@ -202,10 +202,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "rpi" -config BCM283x_BASE - hex - default "0x20000000" if BCM2835 - default "0x3f000000" if BCM2836 || BCM2837 - default "0xfe000000" if BCM2711 - endmenu
arch/arm/mach-bcm283x/init.c +60 -2
78 lines not on this page · raw message
Signature · 1 line
2.24.0
PATCH v3 3/4 ARM: bcm283x: Set rpi_bcm283x_base at run-time
Quoted 6 lines · matthias.bgg at kernel.org
From: Matthias Brugger <[email protected]>
As part of the effort to create one binary for several bcm83x SoCs we use the SoC compatible to decide which IO base address we use.
Signed-off-by Matthias Brugger <[email protected]>
Is there any reason we can't just base on the ranges property of the /soc node instead? That way we don't duplicate the base offset all over the place.
Alex
Quoted 111 lines
---
Changes in v3: None
Changes in v2:
- rename BCM2838 to BCM2711 in the correct patch
- pushrpi_bcm283x_baseinto the .data sectionarch/arm/mach-bcm283x/Kconfig | 6 ---- arch/arm/mach-bcm283x/init.c | 62 +++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 8 deletions(-)arch/arm/mach-bcm283x/Kconfig +0
-6@@ -202,10 +202,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "rpi" -config BCM283x_BASE - hex - default "0x20000000" if BCM2835 - default "0x3f000000" if BCM2836 || BCM2837 - default "0xfe000000" if BCM2711 - endmenuarch/arm/mach-bcm283x/init.c +60
-2@@ -7,8 +7,48 @@*/ #include <common.h> +#include <dm/device.h> -unsigned long rpi_bcm283x_base; +#define PDATA_BCM2835 0 +#define PDATA_BCM2836 1 +#define PDATA_BCM2837 2 +#define PDATA_BCM2711 3 + +unsigned long rpi_bcm283x_base =0x3f000000 ; + +struct bcm283x_pdata { +unsigned long io_base; +}; + +struct bcm283x_pdata pdata_bcm283x[] = { + [PDATA_BCM2835 ] = { + .io_base =0x20000000 , + }, + [PDATA_BCM2836 ] = { + .io_base =0x3f000000 , + }, +#ifdef CONFIG_ARM64 + [PDATA_BCM2837] = { + .io_base =0x3f000000 , + }, + [PDATA_BCM2711 ] = { + .io_base =0xfe000000 , + }, +#endif +}; + +/* +* I/O address space varies on different chip versions. +* We set the base address by inspecting the DTB. +*/ +static const struct udevice_id board_ids[] = { + { .compatible ="brcm,bcm2835" , .data =PDATA_BCM2835 }, + { .compatible ="brcm,bcm2836" , .data =PDATA_BCM2836 }, + { .compatible ="brcm,bcm2837" , .data =PDATA_BCM2837 }, + { .compatible ="brcm,bcm2838" , .data =PDATA_BCM2711 }, + { .compatible ="brcm,bcm2711" , .data =PDATA_BCM2711 }, + { }, +};int arch_cpu_init (void ) {@@ -19,10 +59,28 @@ int arch_cpu_init(void)int mach_cpu_init (void ) { - rpi_bcm283x_base = CONFIG_BCM283x_BASE; +const struct udevice_id *of_match = board_ids; +int ret; + + rpi_bcm283x_base =0 ; + +while (of_match->compatible) { +struct bcm283x_pdata pdat; + + ret =fdt_node_check_compatible (gd->fdt_blob,0 , + of_match->compatible); +if (!ret) { + pdat = pdata_bcm283x[of_match->data]; + rpi_bcm283x_base = pdat.io_base; +break ; + } + + of_match++; + }return 0 ; } +#ifdef CONFIG_ARMV7_LPAE void enable_caches (void ) {
PATCH v3 4/4 ARM: bcm283x: Set memory map at run-time
In reply to matthias.bgg at kernel.orgFrom: Matthias Brugger <[email protected]>
For bcm283x based on arm64 we also have to change the mm_region. Add assign this in mach_cpu_init() so we can create now one binary for RPi3 and RPi4.
---
Changes in v3: None
Changes in v2:
- Move mem_map out of assembly file
- push mem_map into the .data section
- update the members of mem_map inestead of the pointer
arch/arm/mach-bcm283x/init.c | 74 ++++++++++++++++++++++++++++++++++++ board/raspberrypi/rpi/rpi.c | 45 ---------------------- 2 files changed, 74 insertions(+), 45 deletions(-)
arch/arm/mach-bcm283x/init.c +74 -0
@@ -8,6 +8,9 @@#include <common.h> #include <dm/device.h> +#ifdef CONFIG_ARM64 +#include <asm/armv8/mmu.h> +#endif #define PDATA_BCM2835 0#define PDATA_BCM2836 1
@@ -16,23 +19,77 @@unsigned long rpi_bcm283x_base =0x3f000000 ; +#ifdef CONFIG_ARM64 +static struct mm_region bcm283x_mem_map[] = { + { + .virt =0x00000000UL , + .phys =0x00000000UL , + .size =0x3f000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | +PTE_BLOCK_INNER_SHARE + }, { + .virt =0x3f000000UL , + .phys =0x3f000000UL , + .size =0x01000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | +PTE_BLOCK_NON_SHARE | +PTE_BLOCK_PXN |PTE_BLOCK_UXN + }, { +/* List terminator */ +0 , + } +}; + +static struct mm_region bcm2711_mem_map[] = { + { + .virt =0x00000000UL , + .phys =0x00000000UL , + .size =0xfe000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | +PTE_BLOCK_INNER_SHARE + }, { + .virt =0xfe000000UL , + .phys =0xfe000000UL , + .size =0x01800000UL , + .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; + +#else +struct mm_region { +/* dummy struct */ +}; +#endif +struct bcm283x_pdata {unsigned long io_base; +struct mm_region *m_map; };struct bcm283x_pdata pdata_bcm283x[] = { [PDATA_BCM2835 ] = { .io_base =0x20000000 , + .m_map =NULL , }, [PDATA_BCM2836 ] = { .io_base =0x3f000000 , + .m_map =NULL , }, #ifdef CONFIG_ARM64 [PDATA_BCM2837] = { .io_base =0x3f000000 , + .m_map = bcm283x_mem_map, }, [PDATA_BCM2711 ] = { .io_base =0xfe000000 , + .m_map = bcm2711_mem_map }, #endif };
@@ -57,6 +114,22 @@ int arch_cpu_init(void)return 0 ; } +#ifdef CONFIG_ARM64 +static void rpi_updated_mem_map (struct mm_region *pd) +{ +int i; + +for (i =0 ; i <2 ; i++) { + mem_map[i].virt = pd[i].virt; + mem_map[i].phys = pd[i].phys; + mem_map[i].size = pd[i].size; + mem_map[i].attrs = pd[i].attrs; + } +} +#else +static void rpi_updated_mem_map (struct mm_region *pd) {} +#endif +int mach_cpu_init (void ) {const struct udevice_id *of_match = board_ids;
@@ -72,6 +145,7 @@ int mach_cpu_init(void)if (!ret) { pdat = pdata_bcm283x[of_match->data]; rpi_bcm283x_base = pdat.io_base; +rpi_updated_mem_map (pdat.m_map);break ; }
board/raspberrypi/rpi/rpi.c +0 -45
51 lines not on this page · raw message
Signature · 1 line
2.24.0
PATCH v3 4/4 ARM: bcm283x: Set memory map at run-time
Quoted 7 lines · matthias.bgg at kernel.org
From: Matthias Brugger <[email protected]>
For bcm283x based on arm64 we also have to change the
mm_region. Add assign this inmach_cpu_init()so we can create now one binary for RPi3 and RPi4.Signed-off-by Matthias Brugger <[email protected]>
For the future, can you think of a reason why we could not always generate the map at runtime?
Alex
Quoted 192 lines
---
Changes in v3: None
Changes in v2:
- Movemem_mapout of assembly file
- pushmem_mapinto the .data section
- update the members ofmem_mapinestead of the pointerarch/arm/mach-bcm283x/init.c | 74 ++++++++++++++++++++++++++++++++++++ board/raspberrypi/rpi/rpi.c | 45 ---------------------- 2 files changed, 74 insertions(+), 45 deletions(-)arch/arm/mach-bcm283x/init.c +74
-0@@ -8,6 +8,9 @@#include <common.h> #include <dm/device.h> +#ifdef CONFIG_ARM64 +#include <asm/armv8/mmu.h> +#endif #define PDATA_BCM2835 0#define PDATA_BCM2836 1@@ -16,23 +19,77 @@unsigned long rpi_bcm283x_base =0x3f000000 ; +#ifdef CONFIG_ARM64 +static struct mm_region bcm283x_mem_map[] = { + { + .virt =0x00000000UL , + .phys =0x00000000UL , + .size =0x3f000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | +PTE_BLOCK_INNER_SHARE + }, { + .virt =0x3f000000UL , + .phys =0x3f000000UL , + .size =0x01000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | +PTE_BLOCK_NON_SHARE | +PTE_BLOCK_PXN |PTE_BLOCK_UXN + }, { +/* List terminator */ +0 , + } +}; + +static struct mm_region bcm2711_mem_map[] = { + { + .virt =0x00000000UL , + .phys =0x00000000UL , + .size =0xfe000000UL , + .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | +PTE_BLOCK_INNER_SHARE + }, { + .virt =0xfe000000UL , + .phys =0xfe000000UL , + .size =0x01800000UL , + .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; + +#else +struct mm_region { +/* dummy struct */ +}; +#endif +struct bcm283x_pdata {unsigned long io_base; +struct mm_region *m_map; };struct bcm283x_pdata pdata_bcm283x[] = { [PDATA_BCM2835 ] = { .io_base =0x20000000 , + .m_map =NULL , }, [PDATA_BCM2836 ] = { .io_base =0x3f000000 , + .m_map =NULL , }, #ifdef CONFIG_ARM64 [PDATA_BCM2837] = { .io_base =0x3f000000 , + .m_map = bcm283x_mem_map, }, [PDATA_BCM2711 ] = { .io_base =0xfe000000 , + .m_map = bcm2711_mem_map }, #endif };@@ -57,6 +114,22 @@ int arch_cpu_init(void)return 0 ; } +#ifdef CONFIG_ARM64 +static void rpi_updated_mem_map (struct mm_region *pd) +{ +int i; + +for (i =0 ; i <2 ; i++) { + mem_map[i].virt = pd[i].virt; + mem_map[i].phys = pd[i].phys; + mem_map[i].size = pd[i].size; + mem_map[i].attrs = pd[i].attrs; + } +} +#else +static void rpi_updated_mem_map (struct mm_region *pd) {} +#endif +int mach_cpu_init (void ) {const struct udevice_id *of_match = board_ids;@@ -72,6 +145,7 @@ int mach_cpu_init(void)if (!ret) { pdat = pdata_bcm283x[of_match->data]; rpi_bcm283x_base = pdat.io_base; +rpi_updated_mem_map (pdat.m_map);break ; }board/raspberrypi/rpi/rpi.c +0
-45@@ -248,51 +248,6 @@ static uint32_t rev_scheme;static uint32_t rev_type;static const struct rpi_model *model; -#ifdef CONFIG_ARM64 -#ifndef CONFIG_BCM2711 -static struct mm_region bcm283x_mem_map[] = { - { - .virt =0x00000000UL , - .phys =0x00000000UL , - .size =0x3f000000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | -PTE_BLOCK_INNER_SHARE - }, { - .virt =0x3f000000UL , - .phys =0x3f000000UL , - .size =0x01000000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | -PTE_BLOCK_NON_SHARE | -PTE_BLOCK_PXN |PTE_BLOCK_UXN - }, { -/* List terminator */ -0 , - } -}; -#else -static struct mm_region bcm283x_mem_map[] = { - { - .virt =0x00000000UL , - .phys =0x00000000UL , - .size =0xfe000000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_NORMAL ) | -PTE_BLOCK_INNER_SHARE - }, { - .virt =0xfe000000UL , - .phys =0xfe000000UL , - .size =0x01800000UL , - .attrs =PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) | -PTE_BLOCK_NON_SHARE | -PTE_BLOCK_PXN |PTE_BLOCK_UXN - }, { -/* List terminator */ -0 , - } -}; -#endif -struct mm_region *mem_map = bcm283x_mem_map; -#endif -int dram_init (void ) { ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_arm_mem, msg, 1);
PATCH v3 4/4 ARM: bcm283x: Set memory map at run-time
Quoted 8 lines · Alexander Graf
Quoted 6 lines · matthias.bgg at kernel.org
From: Matthias Brugger <[email protected]>
For bcm283x based on arm64 we also have to change the
mm_region. Add assign this inmach_cpu_init()so we can create now one binary for RPi3 and RPi4.
Quoted 6 lines
Quoted 1 line
Signed-off-by Matthias Brugger <[email protected]>For the future, can you think of a reason why we could not always generate the map at runtime?
The only reason I can think of, is that the core of U-Boot changes so that mach_cpu_init() would be too late. But in this case we would only need to update the mem_map earlier, which shouldn't be an issue.
Regards,
Matthias
Quoted 188 lines
Alex
Quoted 184 lines
---
Changes in v3: None
Changes in v2:
- Movemem_mapout of assembly file
- pushmem_mapinto the .data section
- update the members ofmem_mapinestead of the pointer
arch/arm/mach-bcm283x/init.c| 74 ++++++++++++++++++++++++++++++++++++ board/raspberrypi/rpi/rpi.c | 45 ----------------------2 files changed, 74 insertions(+), 45 deletions(-)arch/arm/mach-bcm283x/init.c +3
-0@@ -8,6 +8,9 @@ #include <common.h> #include <dm/device.h> +#ifdef CONFIG_ARM64 +#include <asm/armv8/mmu.h> +#endif #define PDATA_BCM2835 0 #define PDATA_BCM2836 1@@ -16,23 +19,77 @@ unsigned long rpi_bcm283x_base = 0x3f000000;+#ifdef
CONFIG_ARM64arch/arm/mach-bcm283x/init.c +48
-0+static struct mm_region bcm283x_mem_map[] = { + { + .virt = 0x00000000UL, + .phys = 0x00000000UL, + .size = 0x3f000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE + }, { + .virt = 0x3f000000UL, + .phys = 0x3f000000UL, + .size = 0x01000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* List terminator */ + 0, + } +}; + +static struct mm_region bcm2711_mem_map[] = { + { + .virt = 0x00000000UL, + .phys = 0x00000000UL, + .size = 0xfe000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE + }, { + .virt = 0xfe000000UL, + .phys = 0xfe000000UL, + .size = 0x01800000UL, + .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; + +#else +struct mm_region { + /* dummy struct */ +}; +#endif +struct
bcm283x_pdata{
unsigned longio_base;
+ structmm_region*m_map;
};
structbcm283x_pdatapdata_bcm283x[] = {
[PDATA_BCM2835] = {
.io_base =0x20000000,
+ .m_map = NULL,
},
[PDATA_BCM2836] = {
.io_base =0x3f000000,
+ .m_map = NULL,
},
#ifdefCONFIG_ARM64
[PDATA_BCM2837] = {
.io_base =0x3f000000,
+ .m_map =bcm283x_mem_map,
},
[PDATA_BCM2711] = {
.io_base =0xfe000000,
+ .m_map =bcm2711_mem_map
},
#endif
};arch/arm/mach-bcm283x/init.c +0
-0@@ -57,6 +114,22 @@ int arch_cpu_init(void) return 0; }+#ifdef
CONFIG_ARM64arch/arm/mach-bcm283x/init.c +15
-0+static void rpi_updated_mem_map (struct mm_region *pd) +{ + int i; + + for (i = 0; i < 2; i++) { + mem_map[i].virt = pd[i].virt; + mem_map[i].phys = pd[i].phys; + mem_map[i].size = pd[i].size; + mem_map[i].attrs = pd[i].attrs; + } +} +#else +static void rpi_updated_mem_map (struct mm_region *pd) {} +#endif +int
mach_cpu_init(void)
{
const structudevice_id*of_match=board_ids;arch/arm/mach-bcm283x/init.c +1
-0@@ -72,6 +145,7 @@ int mach_cpu_init(void) if (!ret) { pdat = pdata_bcm283x[of_match->data]; rpi_bcm283x_base = pdat.io_base; + rpi_updated_mem_map(pdat.m_map); break; }diff --git
a/board/raspberrypi/rpi/rpi.cb/board/raspberrypi/rpi/rpi.cindex0e05d59e1f..248d04bfd2100644board/raspberrypi/rpi/rpi.c +0
-0@@ -248,51 +248,6 @@ static uint32_t rev_scheme; static uint32_t rev_type; static const struct rpi_model *model;-#ifdef
CONFIG_ARM64board/raspberrypi/rpi/rpi.c +0
-44-#ifndef CONFIG_BCM2711 -static struct mm_region bcm283x_mem_map[] = { - { - .virt = 0x00000000UL, - .phys = 0x00000000UL, - .size = 0x3f000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_INNER_SHARE - }, { - .virt = 0x3f000000UL, - .phys = 0x3f000000UL, - .size = 0x01000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | - PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, { - /* List terminator */ - 0, - } -}; -#else -static struct mm_region bcm283x_mem_map[] = { - { - .virt = 0x00000000UL, - .phys = 0x00000000UL, - .size = 0xfe000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_INNER_SHARE - }, { - .virt = 0xfe000000UL, - .phys = 0xfe000000UL, - .size = 0x01800000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | - PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, { - /* List terminator */ - 0, - } -}; -#endif -struct mm_region *mem_map = bcm283x_mem_map; -#endif -int
dram_init(void)
{
ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_arm_mem, msg, 1);