[PATCH v3 2/7] rpi5: Use devicetree as alternative way to read IO base addresses
Matthias Brugger
mbrugger at suse.com
Fri Dec 22 12:08:10 CET 2023
On 18/12/2023 22:03, Ivan T. Ivanov wrote:
> From: Dmitry Malkin <dmitry at bedrocksystems.com>
>
> MBOX and Watchdog on RPi5/bcm2712 has a different base IO offsets.
> Find them via devicetree blob passed by bootloader.
>
> Signed-off-by: Dmitry Malkin <dmitry at bedrocksystems.com>
> Signed-off-by: Ivan T. Ivanov <iivanov at suse.de>
Reviewed-by: Matthias Brugger <mbrugger at suse.com>
> ---
> arch/arm/mach-bcm283x/include/mach/base.h | 5 ++-
> arch/arm/mach-bcm283x/include/mach/mbox.h | 3 +-
> arch/arm/mach-bcm283x/include/mach/sdhci.h | 3 +-
> arch/arm/mach-bcm283x/include/mach/timer.h | 3 +-
> arch/arm/mach-bcm283x/include/mach/wdog.h | 3 +-
> arch/arm/mach-bcm283x/init.c | 43 ++++++++++++++++++----
> 6 files changed, 43 insertions(+), 17 deletions(-)
>
> diff --git a/arch/arm/mach-bcm283x/include/mach/base.h b/arch/arm/mach-bcm283x/include/mach/base.h
> index 4ccaf69693..6de99e7ea1 100644
> --- a/arch/arm/mach-bcm283x/include/mach/base.h
> +++ b/arch/arm/mach-bcm283x/include/mach/base.h
> @@ -6,7 +6,10 @@
> #ifndef _BCM283x_BASE_H_
> #define _BCM283x_BASE_H_
>
> -extern unsigned long rpi_bcm283x_base;
> +extern unsigned long rpi_mbox_base;
> +extern unsigned long rpi_timer_base;
> +extern unsigned long rpi_sdhci_base;
> +extern unsigned long rpi_wdog_base;
>
> #ifdef CONFIG_ARMV7_LPAE
> #ifdef CONFIG_TARGET_RPI_4_32B
> diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
> index 490664f878..35d4e2f075 100644
> --- a/arch/arm/mach-bcm283x/include/mach/mbox.h
> +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
> @@ -38,8 +38,7 @@
>
> /* Raw mailbox HW */
>
> -#define BCM2835_MBOX_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \
> - rpi_bcm283x_base + 0x0000b880; })
> +#define BCM2835_MBOX_PHYSADDR rpi_mbox_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 7323690687..e837c679c4 100644
> --- a/arch/arm/mach-bcm283x/include/mach/sdhci.h
> +++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h
> @@ -8,8 +8,7 @@
>
> #include <asm/arch/base.h>
>
> -#define BCM2835_SDHCI_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \
> - rpi_bcm283x_base + 0x00300000; })
> +#define BCM2835_SDHCI_PHYSADDR rpi_sdhci_base
>
> 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 5567dbd7f3..60500a256d 100644
> --- a/arch/arm/mach-bcm283x/include/mach/timer.h
> +++ b/arch/arm/mach-bcm283x/include/mach/timer.h
> @@ -11,8 +11,7 @@
> #include <linux/bug.h>
> #endif
>
> -#define BCM2835_TIMER_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \
> - rpi_bcm283x_base + 0x00003000; })
> +#define BCM2835_TIMER_PHYSADDR rpi_timer_base
>
> #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 9942666720..b950560674 100644
> --- a/arch/arm/mach-bcm283x/include/mach/wdog.h
> +++ b/arch/arm/mach-bcm283x/include/mach/wdog.h
> @@ -8,8 +8,7 @@
>
> #include <asm/arch/base.h>
>
> -#define BCM2835_WDOG_PHYSADDR ({ BUG_ON(!rpi_bcm283x_base); \
> - rpi_bcm283x_base + 0x00100000; })
> +#define BCM2835_WDOG_PHYSADDR rpi_wdog_base
>
> struct bcm2835_wdog_regs {
> u32 unknown0[7];
> diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
> index af23b9711a..1c5c748484 100644
> --- a/arch/arm/mach-bcm283x/init.c
> +++ b/arch/arm/mach-bcm283x/init.c
> @@ -151,7 +151,11 @@ static void rpi_update_mem_map(void)
> static void rpi_update_mem_map(void) {}
> #endif
>
> -unsigned long rpi_bcm283x_base = 0x3f000000;
> +/* Default bcm283x devices addresses */
> +unsigned long rpi_mbox_base = 0x3f00b880;
> +unsigned long rpi_sdhci_base = 0x3f300000;
> +unsigned long rpi_wdog_base = 0x3f100000;
> +unsigned long rpi_timer_base = 0x3f003000;
>
> int arch_cpu_init(void)
> {
> @@ -162,22 +166,45 @@ int arch_cpu_init(void)
>
> int mach_cpu_init(void)
> {
> - int ret, soc_offset;
> + int ret, soc, offset;
> u64 io_base, size;
>
> rpi_update_mem_map();
>
> /* Get IO base from device tree */
> - soc_offset = fdt_path_offset(gd->fdt_blob, "/soc");
> - if (soc_offset < 0)
> - return soc_offset;
> + soc = fdt_path_offset(gd->fdt_blob, "/soc");
> + if (soc < 0)
> + return soc;
>
> - ret = fdt_read_range((void *)gd->fdt_blob, soc_offset, 0, NULL,
> - &io_base, &size);
> + ret = fdt_read_range((void *)gd->fdt_blob, soc, 0, NULL,
> + &io_base, &size);
> if (ret)
> return ret;
>
> - rpi_bcm283x_base = io_base;
> + rpi_mbox_base = io_base + 0x00b880;
> + rpi_sdhci_base = io_base + 0x300000;
> + rpi_wdog_base = io_base + 0x100000;
> + rpi_timer_base = io_base + 0x003000;
> +
> + offset = fdt_node_offset_by_compatible(gd->fdt_blob, soc,
> + "brcm,bcm2835-mbox");
> + if (offset > soc)
> + rpi_mbox_base = fdt_get_base_address(gd->fdt_blob, offset);
> +
> + offset = fdt_node_offset_by_compatible(gd->fdt_blob, soc,
> + "brcm,bcm2835-sdhci");
> + if (offset > soc)
> + rpi_sdhci_base = fdt_get_base_address(gd->fdt_blob, offset);
> +
> + offset = fdt_node_offset_by_compatible(gd->fdt_blob, soc,
> + "brcm,bcm2835-system-timer");
> + if (offset > soc)
> + rpi_timer_base = fdt_get_base_address(gd->fdt_blob, offset);
> +
> + offset = fdt_node_offset_by_compatible(gd->fdt_blob, soc,
> + "brcm,bcm2712-pm");
> + if (offset > soc)
> + rpi_wdog_base = fdt_get_base_address(gd->fdt_blob, offset);
>
> return 0;
> }
More information about the U-Boot
mailing list