diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-16 10:54:37 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-16 10:54:37 +0200 |
commit | 0ae461c2ee6baed1a94b88c0ecfc4a9d0f4e5201 (patch) | |
tree | 7c6e35c227d10607d6f15e91b69fb2e96f6c1a8c /arch | |
parent | 226938796e525f42e002769f21dc66d16ac26f9b (diff) | |
parent | 73a9619b85497d19b74e6a023aa9ce0e88a1143d (diff) | |
download | barebox-0ae461c2ee6baed1a94b88c0ecfc4a9d0f4e5201.tar.gz |
Merge branch 'for-next/overlapping-memory-banks'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boards/qemu-virt/board.c | 3 | ||||
-rw-r--r-- | arch/arm/cpu/dtb.c | 4 | ||||
-rw-r--r-- | arch/arm/include/asm/memory.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/ddramc.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/esdctl.c | 56 | ||||
-rw-r--r-- | arch/arm/mach-omap/am33xx_scrm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-stm32mp/ddrctrl.c | 4 | ||||
-rw-r--r-- | arch/kvx/lib/dtb.c | 4 | ||||
-rw-r--r-- | arch/mips/boot/dtb.c | 13 | ||||
-rw-r--r-- | arch/openrisc/lib/dtb.c | 4 | ||||
-rw-r--r-- | arch/riscv/lib/dtb.c | 5 | ||||
-rw-r--r-- | arch/sandbox/board/dtb.c | 4 |
12 files changed, 49 insertions, 62 deletions
diff --git a/arch/arm/boards/qemu-virt/board.c b/arch/arm/boards/qemu-virt/board.c index d0a7e3da4f..5ce1ecfc24 100644 --- a/arch/arm/boards/qemu-virt/board.c +++ b/arch/arm/boards/qemu-virt/board.c @@ -40,9 +40,8 @@ static int replace_dtb(void) { overlay = of_unflatten_dtb(__dtb_overlay_of_flash_start); of_overlay_apply_tree(root, overlay); - barebox_register_of(root); - return 0; + return barebox_register_of(root); } pure_initcall(replace_dtb); diff --git a/arch/arm/cpu/dtb.c b/arch/arm/cpu/dtb.c index 35f251d99a..9aa979ca08 100644 --- a/arch/arm/cpu/dtb.c +++ b/arch/arm/cpu/dtb.c @@ -26,8 +26,6 @@ static int of_arm_init(void) return 0; } - barebox_register_fdt(fdt); - - return 0; + return barebox_register_fdt(fdt); } core_initcall(of_arm_init); diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 52114d0c4e..2279306179 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -10,10 +10,10 @@ */ #define UL(x) _AC(x, UL) -static inline void arm_add_mem_device(const char* name, resource_size_t start, - resource_size_t size) +static inline int arm_add_mem_device(const char* name, resource_size_t start, + resource_size_t size) { - barebox_add_memory_bank(name, start, size); + return barebox_add_memory_bank(name, start, size); } #endif /* __ASM_ARM_MEMORY_H */ diff --git a/arch/arm/mach-at91/ddramc.c b/arch/arm/mach-at91/ddramc.c index 0aece5345f..8f70b4ada2 100644 --- a/arch/arm/mach-at91/ddramc.c +++ b/arch/arm/mach-at91/ddramc.c @@ -44,9 +44,7 @@ static int sama5_ddr_probe(struct device_d *dev) return PTR_ERR(iores); base = IOMEM(iores->start); - arm_add_mem_device("ram0", SAMA5_DDRCS, sama5_ramsize(base)); - - return 0; + return arm_add_mem_device("ram0", SAMA5_DDRCS, sama5_ramsize(base)); } static struct of_device_id sama5_ddr_dt_ids[] = { diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c index f297cd35d5..5355f55c6f 100644 --- a/arch/arm/mach-imx/esdctl.c +++ b/arch/arm/mach-imx/esdctl.c @@ -32,7 +32,7 @@ struct imx_esdctl_data { unsigned long base0; unsigned long base1; - void (*add_mem)(void *esdctlbase, struct imx_esdctl_data *); + int (*add_mem)(void *esdctlbase, struct imx_esdctl_data *); }; static int imx_esdctl_disabled; @@ -182,9 +182,11 @@ static inline u64 __imx6_mmdc_sdram_size(void __iomem *mmdcbase, int cs) return memory_sdram_size(cols, rows, banks, width); } -static void add_mem(unsigned long base0, unsigned long size0, +static int add_mem(unsigned long base0, unsigned long size0, unsigned long base1, unsigned long size1) { + int ret0 = 0, ret1 = 0; + debug("%s: cs0 base: 0x%08lx cs0 size: 0x%08lx\n", __func__, base0, size0); debug("%s: cs1 base: 0x%08lx cs1 size: 0x%08lx\n", __func__, base1, size1); @@ -192,16 +194,16 @@ static void add_mem(unsigned long base0, unsigned long size0, /* * concatenate both chip selects to a single bank */ - arm_add_mem_device("ram0", base0, size0 + size1); - - return; + return arm_add_mem_device("ram0", base0, size0 + size1); } if (size0) - arm_add_mem_device("ram0", base0, size0); + ret0 = arm_add_mem_device("ram0", base0, size0); if (size1) - arm_add_mem_device(size0 ? "ram1" : "ram0", base1, size1); + ret1 = arm_add_mem_device(size0 ? "ram1" : "ram0", base1, size1); + + return ret0 ? ret0 : ret1; } /* @@ -224,35 +226,35 @@ static inline void imx_esdctl_v2_disable_default(void __iomem *esdctlbase) } } -static void imx_esdctl_v1_add_mem(void *esdctlbase, struct imx_esdctl_data *data) +static int imx_esdctl_v1_add_mem(void *esdctlbase, struct imx_esdctl_data *data) { - add_mem(data->base0, imx_v1_sdram_size(esdctlbase, 0), + return add_mem(data->base0, imx_v1_sdram_size(esdctlbase, 0), data->base1, imx_v1_sdram_size(esdctlbase, 1)); } -static void imx_esdctl_v2_add_mem(void *esdctlbase, struct imx_esdctl_data *data) +static int imx_esdctl_v2_add_mem(void *esdctlbase, struct imx_esdctl_data *data) { - add_mem(data->base0, imx_v2_sdram_size(esdctlbase, 0), + return add_mem(data->base0, imx_v2_sdram_size(esdctlbase, 0), data->base1, imx_v2_sdram_size(esdctlbase, 1)); } -static void imx_esdctl_v2_bug_add_mem(void *esdctlbase, struct imx_esdctl_data *data) +static int imx_esdctl_v2_bug_add_mem(void *esdctlbase, struct imx_esdctl_data *data) { imx_esdctl_v2_disable_default(esdctlbase); - add_mem(data->base0, imx_v2_sdram_size(esdctlbase, 0), + return add_mem(data->base0, imx_v2_sdram_size(esdctlbase, 0), data->base1, imx_v2_sdram_size(esdctlbase, 1)); } -static void imx_esdctl_v3_add_mem(void *esdctlbase, struct imx_esdctl_data *data) +static int imx_esdctl_v3_add_mem(void *esdctlbase, struct imx_esdctl_data *data) { - add_mem(data->base0, imx_v3_sdram_size(esdctlbase, 0), + return add_mem(data->base0, imx_v3_sdram_size(esdctlbase, 0), data->base1, imx_v3_sdram_size(esdctlbase, 1)); } -static void imx_esdctl_v4_add_mem(void *esdctlbase, struct imx_esdctl_data *data) +static int imx_esdctl_v4_add_mem(void *esdctlbase, struct imx_esdctl_data *data) { - add_mem(data->base0, imx_v4_sdram_size(esdctlbase, 0), + return add_mem(data->base0, imx_v4_sdram_size(esdctlbase, 0), data->base1, imx_v4_sdram_size(esdctlbase, 1)); } @@ -281,9 +283,9 @@ static inline resource_size_t imx6_mmdc_sdram_size(void __iomem *mmdcbase) return size; } -static void imx6_mmdc_add_mem(void *mmdcbase, struct imx_esdctl_data *data) +static int imx6_mmdc_add_mem(void *mmdcbase, struct imx_esdctl_data *data) { - arm_add_mem_device("ram0", data->base0, + return arm_add_mem_device("ram0", data->base0, imx6_mmdc_sdram_size(mmdcbase)); } @@ -303,9 +305,9 @@ static inline resource_size_t vf610_ddrmc_sdram_size(void __iomem *ddrmc) return memory_sdram_size(cols, rows, banks, width); } -static void vf610_ddrmc_add_mem(void *mmdcbase, struct imx_esdctl_data *data) +static int vf610_ddrmc_add_mem(void *mmdcbase, struct imx_esdctl_data *data) { - arm_add_mem_device("ram0", data->base0, + return arm_add_mem_device("ram0", data->base0, vf610_ddrmc_sdram_size(mmdcbase)); } @@ -467,9 +469,9 @@ static resource_size_t imx8m_ddrc_sdram_size(void __iomem *ddrc) reduced_adress_space); } -static void imx8m_ddrc_add_mem(void *mmdcbase, struct imx_esdctl_data *data) +static int imx8m_ddrc_add_mem(void *mmdcbase, struct imx_esdctl_data *data) { - arm_add_mem_device("ram0", data->base0, + return arm_add_mem_device("ram0", data->base0, imx8m_ddrc_sdram_size(mmdcbase)); } @@ -509,9 +511,9 @@ static resource_size_t imx7d_ddrc_sdram_size(void __iomem *ddrc) reduced_adress_space); } -static void imx7d_ddrc_add_mem(void *mmdcbase, struct imx_esdctl_data *data) +static int imx7d_ddrc_add_mem(void *mmdcbase, struct imx_esdctl_data *data) { - arm_add_mem_device("ram0", data->base0, + return arm_add_mem_device("ram0", data->base0, imx7d_ddrc_sdram_size(mmdcbase)); } @@ -534,9 +536,7 @@ static int imx_esdctl_probe(struct device_d *dev) if (imx_esdctl_disabled) return 0; - data->add_mem(base, data); - - return 0; + return data->add_mem(base, data); } static __maybe_unused struct imx_esdctl_data imx1_data = { diff --git a/arch/arm/mach-omap/am33xx_scrm.c b/arch/arm/mach-omap/am33xx_scrm.c index 80510cf5b4..0f13a9deb6 100644 --- a/arch/arm/mach-omap/am33xx_scrm.c +++ b/arch/arm/mach-omap/am33xx_scrm.c @@ -24,9 +24,7 @@ static int am33xx_scrm_probe(struct device_d *dev) { - arm_add_mem_device("ram0", 0x80000000, am335x_sdram_size()); - - return 0; + return arm_add_mem_device("ram0", 0x80000000, am335x_sdram_size()); } static __maybe_unused struct of_device_id am33xx_scrm_dt_ids[] = { diff --git a/arch/arm/mach-stm32mp/ddrctrl.c b/arch/arm/mach-stm32mp/ddrctrl.c index 646fe4401a..43486c57c5 100644 --- a/arch/arm/mach-stm32mp/ddrctrl.c +++ b/arch/arm/mach-stm32mp/ddrctrl.c @@ -132,9 +132,7 @@ static int stm32mp1_ddr_probe(struct device_d *dev) return PTR_ERR(iores); base = IOMEM(iores->start); - arm_add_mem_device("ram0", STM32_DDR_BASE, ddrctrl_ramsize(base)); - - return 0; + return arm_add_mem_device("ram0", STM32_DDR_BASE, ddrctrl_ramsize(base)); } static __maybe_unused struct of_device_id stm32mp1_ddr_dt_ids[] = { diff --git a/arch/kvx/lib/dtb.c b/arch/kvx/lib/dtb.c index 09898017c9..3d65bd7bd4 100644 --- a/arch/kvx/lib/dtb.c +++ b/arch/kvx/lib/dtb.c @@ -9,8 +9,6 @@ static int of_kvx_init(void) { - barebox_register_fdt(boot_dtb); - - return 0; + return barebox_register_fdt(boot_dtb); } core_initcall(of_kvx_init); diff --git a/arch/mips/boot/dtb.c b/arch/mips/boot/dtb.c index 6fce4700cc..ece1494e5f 100644 --- a/arch/mips/boot/dtb.c +++ b/arch/mips/boot/dtb.c @@ -14,21 +14,24 @@ void *glob_fdt; u32 glob_fdt_size; -void of_add_memory_bank(struct device_node *node, bool dump, int r, +int of_add_memory_bank(struct device_node *node, bool dump, int r, u64 base, u64 size) { static char str[12]; + int ret; if (IS_ENABLED(CONFIG_MMU)) { sprintf(str, "kseg0_ram%d", r); - barebox_add_memory_bank(str, CKSEG0 | base, size); + ret = barebox_add_memory_bank(str, CKSEG0 | base, size); } else { sprintf(str, "kseg1_ram%d", r); - barebox_add_memory_bank(str, CKSEG1 | base, size); + ret = barebox_add_memory_bank(str, CKSEG1 | base, size); } if (dump) pr_info("%s: %s: 0x%llx@0x%llx\n", node->name, str, size, base); + + return ret; } extern char __dtb_start[]; @@ -41,8 +44,6 @@ static int of_mips_init(void) if (!fdt) fdt = __dtb_start; - barebox_register_fdt(fdt); - - return 0; + return barebox_register_fdt(fdt); } core_initcall(of_mips_init); diff --git a/arch/openrisc/lib/dtb.c b/arch/openrisc/lib/dtb.c index 61cf35ddf3..0507eed1d7 100644 --- a/arch/openrisc/lib/dtb.c +++ b/arch/openrisc/lib/dtb.c @@ -28,8 +28,6 @@ static int of_openrisc_init(void) if (root) return 0; - barebox_register_fdt(__dtb_start); - - return 0; + return barebox_register_fdt(__dtb_start); } core_initcall(of_openrisc_init); diff --git a/arch/riscv/lib/dtb.c b/arch/riscv/lib/dtb.c index 8c2f5b2518..aa28795387 100644 --- a/arch/riscv/lib/dtb.c +++ b/arch/riscv/lib/dtb.c @@ -9,6 +9,7 @@ static int of_riscv_init(void) { void *fdt; + int ret; /* See if we are provided a dtb in boarddata */ fdt = barebox_riscv_boot_dtb(); @@ -20,11 +21,11 @@ static int of_riscv_init(void) pr_debug("using boarddata provided DTB\n"); - barebox_register_fdt(fdt); + ret = barebox_register_fdt(fdt); /* do it now, before clocksource drivers run postcore */ timer_init(); - return 0; + return ret; } core_initcall(of_riscv_init); diff --git a/arch/sandbox/board/dtb.c b/arch/sandbox/board/dtb.c index 4a8cbfb26f..98d2e774b8 100644 --- a/arch/sandbox/board/dtb.c +++ b/arch/sandbox/board/dtb.c @@ -39,8 +39,6 @@ static int of_sandbox_init(void) if (!dtb) dtb = __dtb_sandbox_start; - barebox_register_fdt(dtb); - - return 0; + return barebox_register_fdt(dtb); } core_initcall(of_sandbox_init); |