| Message ID | 20190927090032.13953-2-matthias.bgg@kernel.org |
|---|---|
| State | Changes Requested |
| Delegated to: | Matthias Brugger |
| Headers | show |
| Series | RPi one binary for RPi3/4 and RPi1/2 | expand |
On 27.09.19 11:00, matthias.bgg@kernel.org wrote: > From: Matthias Brugger <mbrugger@suse.com> > > 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. > > Signed-off-by: Matthias Brugger <mbrugger@suse.com> > --- > > arch/arm/mach-bcm283x/include/mach/base.h | 11 +++++++++++ > arch/arm/mach-bcm283x/include/mach/mbox.h | 2 +- > arch/arm/mach-bcm283x/include/mach/sdhci.h | 2 +- > arch/arm/mach-bcm283x/include/mach/timer.h | 2 +- > arch/arm/mach-bcm283x/include/mach/wdog.h | 2 +- > arch/arm/mach-bcm283x/init.c | 8 ++++++++ > arch/arm/mach-bcm283x/mbox.c | 8 ++++++-- > arch/arm/mach-bcm283x/reset.c | 7 +++++-- > board/raspberrypi/rpi/lowlevel_init.S | 8 ++++++++ > include/configs/rpi.h | 7 ++++++- > 10 files changed, 48 insertions(+), 9 deletions(-) > create mode 100644 arch/arm/mach-bcm283x/include/mach/base.h > > diff --git a/arch/arm/mach-bcm283x/include/mach/base.h b/arch/arm/mach-bcm283x/include/mach/base.h > new file mode 100644 > index 0000000000..c4ae39852f > --- /dev/null > +++ b/arch/arm/mach-bcm283x/include/mach/base.h > @@ -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 > diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h > index 0b6c2543d5..39cf2cf9d5 100644 > --- a/arch/arm/mach-bcm283x/include/mach/mbox.h > +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h > @@ -37,7 +37,7 @@ > > /* Raw mailbox HW */ > > -#define BCM2835_MBOX_PHYSADDR (CONFIG_BCM283x_BASE + 0x0000b880) > +#define BCM2835_MBOX_OFFSET 0x0000b880 Why rename and not just redefine as (rpi_bcm283x_base + 0x000...)? Also, you may want to add a BUG_ON(!rpi_bcm283x_base) in the query. There was some fancy way to do that in C. Something like #define BCM2835_MBOX_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); rpi_bcm283x_base + 0x0000b880; }) may do the trick. Also, shouldn't mbox.h just contain the definition for rpi_bcm283x_base? > > struct bcm2835_mbox_regs { > u32 read; > diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h > index b443c379d8..16af5787c2 100644 > --- a/arch/arm/mach-bcm283x/include/mach/sdhci.h > +++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h > @@ -6,7 +6,7 @@ > #ifndef _BCM2835_SDHCI_H_ > #define _BCM2835_SDHCI_H_ > > -#define BCM2835_SDHCI_BASE (CONFIG_BCM283x_BASE + 0x00300000) > +#define BCM2835_SDHCI_OFFSET 0x00300000 > > int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq); > > diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h > index 014355e759..c789e188be 100644 > --- a/arch/arm/mach-bcm283x/include/mach/timer.h > +++ b/arch/arm/mach-bcm283x/include/mach/timer.h > @@ -6,7 +6,7 @@ > #ifndef _BCM2835_TIMER_H > #define _BCM2835_TIMER_H > > -#define BCM2835_TIMER_PHYSADDR (CONFIG_BCM283x_BASE + 0x00003000) > +#define BCM2835_TIMER_OFFSET 0x00003000 > > #define BCM2835_TIMER_CS_M3 (1 << 3) > #define BCM2835_TIMER_CS_M2 (1 << 2) > diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h > index 8292b3cf1f..2ca0e8c035 100644 > --- a/arch/arm/mach-bcm283x/include/mach/wdog.h > +++ b/arch/arm/mach-bcm283x/include/mach/wdog.h > @@ -6,7 +6,7 @@ > #ifndef _BCM2835_WDOG_H > #define _BCM2835_WDOG_H > > -#define BCM2835_WDOG_PHYSADDR (CONFIG_BCM283x_BASE + 0x00100000) > +#define BCM2835_WDOG_OFFSET 0x00100000 > > struct bcm2835_wdog_regs { > u32 unknown0[7]; > diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c > index 97414415a6..9dcc96ba2e 100644 > --- a/arch/arm/mach-bcm283x/init.c > +++ b/arch/arm/mach-bcm283x/init.c > @@ -8,6 +8,8 @@ > > #include <common.h> > > +extern unsigned long rpi_bcm283x_base; Why doesn't this just include the header that you create above? > + > 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) > { > diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c > index 3c67f68c17..21a7ce113d 100644 > --- a/arch/arm/mach-bcm283x/mbox.c > +++ b/arch/arm/mach-bcm283x/mbox.c > @@ -10,13 +10,17 @@ > > #define TIMEOUT 1000 /* ms */ > > +extern unsigned long rpi_bcm283x_base; Header? Alex > + > int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv) > { > - struct bcm2835_mbox_regs *regs = > - (struct bcm2835_mbox_regs *)BCM2835_MBOX_PHYSADDR; > + struct bcm2835_mbox_regs *regs; > ulong endtime = get_timer(0) + TIMEOUT; > u32 val; > > + regs = (struct bcm2835_mbox_regs *)(rpi_bcm283x_base > + + BCM2835_MBOX_OFFSET); > + > debug("time: %lu timeout: %lu\n", get_timer(0), endtime); > > if (send & BCM2835_CHAN_MASK) { > diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c > index b3da0c7cd6..aff894b3c6 100644 > --- a/arch/arm/mach-bcm283x/reset.c > +++ b/arch/arm/mach-bcm283x/reset.c > @@ -11,6 +11,8 @@ > #include <asm/arch/wdog.h> > #include <efi_loader.h> > > +extern unsigned long rpi_bcm283x_base; > + > #define RESET_TIMEOUT 10 > > /* > @@ -25,8 +27,7 @@ > > 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) > { > @@ -77,6 +78,8 @@ void __efi_runtime EFIAPI efi_reset_system( > > efi_status_t efi_reset_system_init(void) > { > + wdog_regs = (struct bcm2835_wdog_regs *)(rpi_bcm283x_base + > + BCM2835_WDOG_OFFSET); > return efi_add_runtime_mmio(&wdog_regs, sizeof(*wdog_regs)); > } > > diff --git a/board/raspberrypi/rpi/lowlevel_init.S b/board/raspberrypi/rpi/lowlevel_init.S > index 435eed521f..fcb99ebef7 100644 > --- a/board/raspberrypi/rpi/lowlevel_init.S > +++ b/board/raspberrypi/rpi/lowlevel_init.S > @@ -7,6 +7,14 @@ > #include <config.h> > > .align 8 > +.global rpi_bcm283x_base > +rpi_bcm283x_base: > +#ifdef CONFIG_ARM64 > + .dword 0x0 > +#else > + .word 0x0 > +#endif > + > .global fw_dtb_pointer > fw_dtb_pointer: > #ifdef CONFIG_ARM64 > diff --git a/include/configs/rpi.h b/include/configs/rpi.h > index 77d2d5458a..88496ac44d 100644 > --- a/include/configs/rpi.h > +++ b/include/configs/rpi.h > @@ -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 > @@ -19,7 +23,8 @@ > #ifndef CONFIG_ARM64 > #define CONFIG_SYS_TIMER_RATE 1000000 > #define CONFIG_SYS_TIMER_COUNTER \ > - (&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo) > + (&((struct bcm2835_timer_regs *)(rpi_bcm283x_base \ > + + BCM2835_TIMER_OFFSET))->clo) > #endif > > /*
On 9/27/19 3:00 AM, matthias.bgg@kernel.org wrote: > From: Matthias Brugger <mbrugger@suse.com> > > 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. How will this work, given that the memory layout is hard-coded into the the DTB? Hopefully we aren't going to do some kind of nasty bundle-all-the-dtbs-and-select-between-them approach, or edit-the-dtb-at-runtime.
On 27.09.19 17:01, Stephen Warren wrote: > On 9/27/19 3:00 AM, matthias.bgg@kernel.org wrote: >> From: Matthias Brugger <mbrugger@suse.com> >> >> 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. > > How will this work, given that the memory layout is hard-coded into > the the DTB? > > Hopefully we aren't going to do some kind of nasty > bundle-all-the-dtbs-and-select-between-them approach, or > edit-the-dtb-at-runtime. With CONFIG_OF_BOARD the DT comes from the RPi firmware blob which already provides the correct DTB for the target system. Alex
On 9/27/19 9:22 AM, Alexander Graf wrote: > > On 27.09.19 17:01, Stephen Warren wrote: >> On 9/27/19 3:00 AM, matthias.bgg@kernel.org wrote: >>> From: Matthias Brugger <mbrugger@suse.com> >>> >>> 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. >> >> How will this work, given that the memory layout is hard-coded into >> the the DTB? >> >> Hopefully we aren't going to do some kind of nasty >> bundle-all-the-dtbs-and-select-between-them approach, or >> edit-the-dtb-at-runtime. > > > With CONFIG_OF_BOARD the DT comes from the RPi firmware blob which > already provides the correct DTB for the target system. OK. Why does the U-Boot source code contain RPi DTBs then? Were they just not deleted when that CONFIG_ option was enabled, or is the transition to using FW-supplied DTBs still a work-in-progress?
On 27.09.19 18:11, Stephen Warren wrote: > On 9/27/19 9:22 AM, Alexander Graf wrote: >> >> On 27.09.19 17:01, Stephen Warren wrote: >>> On 9/27/19 3:00 AM, matthias.bgg@kernel.org wrote: >>>> From: Matthias Brugger <mbrugger@suse.com> >>>> >>>> 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. >>> >>> How will this work, given that the memory layout is hard-coded into >>> the the DTB? >>> >>> Hopefully we aren't going to do some kind of nasty >>> bundle-all-the-dtbs-and-select-between-them approach, or >>> edit-the-dtb-at-runtime. >> >> >> With CONFIG_OF_BOARD the DT comes from the RPi firmware blob which >> already provides the correct DTB for the target system. > > OK. Why does the U-Boot source code contain RPi DTBs then? Were they > just not deleted when that CONFIG_ option was enabled, or is the > transition to using FW-supplied DTBs still a work-in-progress? The default option is to not use CONFIG_OF_BOARD. Making that the default is exactly what Matthias was referring to as a later step to enable a single binary. Alex
diff --git a/arch/arm/mach-bcm283x/include/mach/base.h b/arch/arm/mach-bcm283x/include/mach/base.h new file mode 100644 index 0000000000..c4ae39852f --- /dev/null +++ b/arch/arm/mach-bcm283x/include/mach/base.h @@ -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 diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h index 0b6c2543d5..39cf2cf9d5 100644 --- a/arch/arm/mach-bcm283x/include/mach/mbox.h +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h @@ -37,7 +37,7 @@ /* Raw mailbox HW */ -#define BCM2835_MBOX_PHYSADDR (CONFIG_BCM283x_BASE + 0x0000b880) +#define BCM2835_MBOX_OFFSET 0x0000b880 struct bcm2835_mbox_regs { u32 read; diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h index b443c379d8..16af5787c2 100644 --- a/arch/arm/mach-bcm283x/include/mach/sdhci.h +++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h @@ -6,7 +6,7 @@ #ifndef _BCM2835_SDHCI_H_ #define _BCM2835_SDHCI_H_ -#define BCM2835_SDHCI_BASE (CONFIG_BCM283x_BASE + 0x00300000) +#define BCM2835_SDHCI_OFFSET 0x00300000 int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq); diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h index 014355e759..c789e188be 100644 --- a/arch/arm/mach-bcm283x/include/mach/timer.h +++ b/arch/arm/mach-bcm283x/include/mach/timer.h @@ -6,7 +6,7 @@ #ifndef _BCM2835_TIMER_H #define _BCM2835_TIMER_H -#define BCM2835_TIMER_PHYSADDR (CONFIG_BCM283x_BASE + 0x00003000) +#define BCM2835_TIMER_OFFSET 0x00003000 #define BCM2835_TIMER_CS_M3 (1 << 3) #define BCM2835_TIMER_CS_M2 (1 << 2) diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h index 8292b3cf1f..2ca0e8c035 100644 --- a/arch/arm/mach-bcm283x/include/mach/wdog.h +++ b/arch/arm/mach-bcm283x/include/mach/wdog.h @@ -6,7 +6,7 @@ #ifndef _BCM2835_WDOG_H #define _BCM2835_WDOG_H -#define BCM2835_WDOG_PHYSADDR (CONFIG_BCM283x_BASE + 0x00100000) +#define BCM2835_WDOG_OFFSET 0x00100000 struct bcm2835_wdog_regs { u32 unknown0[7]; diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c index 97414415a6..9dcc96ba2e 100644 --- a/arch/arm/mach-bcm283x/init.c +++ b/arch/arm/mach-bcm283x/init.c @@ -8,6 +8,8 @@ #include <common.h> +extern 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) { diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c index 3c67f68c17..21a7ce113d 100644 --- a/arch/arm/mach-bcm283x/mbox.c +++ b/arch/arm/mach-bcm283x/mbox.c @@ -10,13 +10,17 @@ #define TIMEOUT 1000 /* ms */ +extern unsigned long rpi_bcm283x_base; + int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv) { - struct bcm2835_mbox_regs *regs = - (struct bcm2835_mbox_regs *)BCM2835_MBOX_PHYSADDR; + struct bcm2835_mbox_regs *regs; ulong endtime = get_timer(0) + TIMEOUT; u32 val; + regs = (struct bcm2835_mbox_regs *)(rpi_bcm283x_base + + BCM2835_MBOX_OFFSET); + debug("time: %lu timeout: %lu\n", get_timer(0), endtime); if (send & BCM2835_CHAN_MASK) { diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c index b3da0c7cd6..aff894b3c6 100644 --- a/arch/arm/mach-bcm283x/reset.c +++ b/arch/arm/mach-bcm283x/reset.c @@ -11,6 +11,8 @@ #include <asm/arch/wdog.h> #include <efi_loader.h> +extern unsigned long rpi_bcm283x_base; + #define RESET_TIMEOUT 10 /* @@ -25,8 +27,7 @@ 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) { @@ -77,6 +78,8 @@ void __efi_runtime EFIAPI efi_reset_system( efi_status_t efi_reset_system_init(void) { + wdog_regs = (struct bcm2835_wdog_regs *)(rpi_bcm283x_base + + BCM2835_WDOG_OFFSET); return efi_add_runtime_mmio(&wdog_regs, sizeof(*wdog_regs)); } diff --git a/board/raspberrypi/rpi/lowlevel_init.S b/board/raspberrypi/rpi/lowlevel_init.S index 435eed521f..fcb99ebef7 100644 --- a/board/raspberrypi/rpi/lowlevel_init.S +++ b/board/raspberrypi/rpi/lowlevel_init.S @@ -7,6 +7,14 @@ #include <config.h> .align 8 +.global rpi_bcm283x_base +rpi_bcm283x_base: +#ifdef CONFIG_ARM64 + .dword 0x0 +#else + .word 0x0 +#endif + .global fw_dtb_pointer fw_dtb_pointer: #ifdef CONFIG_ARM64 diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 77d2d5458a..88496ac44d 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -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 @@ -19,7 +23,8 @@ #ifndef CONFIG_ARM64 #define CONFIG_SYS_TIMER_RATE 1000000 #define CONFIG_SYS_TIMER_COUNTER \ - (&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo) + (&((struct bcm2835_timer_regs *)(rpi_bcm283x_base \ + + BCM2835_TIMER_OFFSET))->clo) #endif /*