diff mbox series

[U-Boot,v1,2/2] board: colibri_imx7: reserve DDR memory for Cortex-M4

Message ID 20190712105031.11455-3-igor.opaniuk@gmail.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show
Series android: colibri_imx7: reserve DDR memory for Cortex-M4 | expand

Commit Message

Igor Opaniuk July 12, 2019, 10:50 a.m. UTC
From: Igor Opaniuk <igor.opaniuk@toradex.com>

i.MX 7's Cortex-M4 core can run from DDR and uses DDR memory for
the rpmsg communication. Both use cases need a fixed location of
memory reserved. For the rpmsg use case the reserved area needs
to be in sync with the kernel's hardcoded vring descriptor location.

Use the linux,usable-memory property to carve out 1MB of memory
in case the M4 core is running. Also make sure that the i.MX 7
specific rpmsg driver does not get loaded in case we do not carve
out memory.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>

Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
---

 arch/arm/include/asm/mach-imx/sys_proto.h |  2 ++
 board/toradex/colibri_imx7/colibri_imx7.c | 37 +++++++++++++++++++++++
 2 files changed, 39 insertions(+)

Comments

Oleksandr Suvorov July 12, 2019, 11:23 a.m. UTC | #1
On Fri, 12 Jul 2019 at 13:50, Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
>
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
>
> i.MX 7's Cortex-M4 core can run from DDR and uses DDR memory for
> the rpmsg communication. Both use cases need a fixed location of
> memory reserved. For the rpmsg use case the reserved area needs
> to be in sync with the kernel's hardcoded vring descriptor location.
>
> Use the linux,usable-memory property to carve out 1MB of memory
> in case the M4 core is running. Also make sure that the i.MX 7
> specific rpmsg driver does not get loaded in case we do not carve
> out memory.
>
> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>

Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

> ---
>
>  arch/arm/include/asm/mach-imx/sys_proto.h |  2 ++
>  board/toradex/colibri_imx7/colibri_imx7.c | 37 +++++++++++++++++++++++
>  2 files changed, 39 insertions(+)
>
> diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
> index 4925dd7894..775cd3df40 100644
> --- a/arch/arm/include/asm/mach-imx/sys_proto.h
> +++ b/arch/arm/include/asm/mach-imx/sys_proto.h
> @@ -113,6 +113,8 @@ void init_src(void);
>  void init_snvs(void);
>  void imx_wdog_disable_powerdown(void);
>
> +int arch_auxiliary_core_check_up(u32 core_id);
> +
>  int board_mmc_get_env_dev(int devno);
>
>  int nxp_board_rev(void);
> diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
> index 0eb83474c4..6059088bda 100644
> --- a/board/toradex/colibri_imx7/colibri_imx7.c
> +++ b/board/toradex/colibri_imx7/colibri_imx7.c
> @@ -333,6 +333,43 @@ int checkboard(void)
>  #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
>  int ft_board_setup(void *blob, bd_t *bd)
>  {
> +#if defined(CONFIG_IMX_BOOTAUX)
> +       int up;
> +
> +       up = arch_auxiliary_core_check_up(0);
> +       if (up) {
> +               int ret;
> +               int areas = 1;
> +               u64 start[2], size[2];
> +
> +               /*
> +                * Reserve 1MB of memory for M4 (1MiB is also the minimum
> +                * alignment for Linux due to MMU section size restrictions).
> +                */
> +               start[0] = gd->bd->bi_dram[0].start;
> +               size[0] = SZ_256M - SZ_1M;
> +
> +               /* If needed, create a second entry for memory beyond 256M */
> +               if (gd->bd->bi_dram[0].size > SZ_256M) {
> +                       start[1] = gd->bd->bi_dram[0].start + SZ_256M;
> +                       size[1] = gd->bd->bi_dram[0].size - SZ_256M;
> +                       areas = 2;
> +               }
> +
> +               ret = fdt_set_usable_memory(blob, start, size, areas);
> +               if (ret) {
> +                       eprintf("Cannot set usable memory\n");
> +                       return ret;
> +               }
> +       } else {
> +               int off;
> +
> +               off = fdt_node_offset_by_compatible(blob, -1,
> +                                                   "fsl,imx7d-rpmsg");
> +               if (off > 0)
> +                       fdt_status_disabled(blob, off);
> +       }
> +#endif
>  #if defined(CONFIG_FDT_FIXUP_PARTITIONS)
>         static const struct node_info nodes[] = {
>                 { "fsl,imx7d-gpmi-nand", MTD_DEV_TYPE_NAND, }, /* NAND flash */
> --
> 2.17.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
Stefano Babic Oct. 14, 2019, 12:40 p.m. UTC | #2
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> i.MX 7's Cortex-M4 core can run from DDR and uses DDR memory for
> the rpmsg communication. Both use cases need a fixed location of
> memory reserved. For the rpmsg use case the reserved area needs
> to be in sync with the kernel's hardcoded vring descriptor location.
> Use the linux,usable-memory property to carve out 1MB of memory
> in case the M4 core is running. Also make sure that the i.MX 7
> specific rpmsg driver does not get loaded in case we do not carve
> out memory.
> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
Igor Opaniuk Nov. 28, 2019, 3:21 p.m. UTC | #3
Hi Stefano,

On Mon, Oct 14, 2019 at 3:40 PM <sbabic@denx.de> wrote:
>
> > From: Igor Opaniuk <igor.opaniuk@toradex.com>
> > i.MX 7's Cortex-M4 core can run from DDR and uses DDR memory for
> > the rpmsg communication. Both use cases need a fixed location of
> > memory reserved. For the rpmsg use case the reserved area needs
> > to be in sync with the kernel's hardcoded vring descriptor location.
> > Use the linux,usable-memory property to carve out 1MB of memory
> > in case the M4 core is running. Also make sure that the i.MX 7
> > specific rpmsg driver does not get loaded in case we do not carve
> > out memory.
> > Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
> > Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> > Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
> > Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
>
> Applied to u-boot-imx, master, thanks !

Unfortunately I can't find this commit neither in u-boot-imx/next
neither in u-boot-imx/master.

>
> Best regards,
> Stefano Babic
>
> --
> =====================================================================
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
> =====================================================================
>
diff mbox series

Patch

diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index 4925dd7894..775cd3df40 100644
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -113,6 +113,8 @@  void init_src(void);
 void init_snvs(void);
 void imx_wdog_disable_powerdown(void);
 
+int arch_auxiliary_core_check_up(u32 core_id);
+
 int board_mmc_get_env_dev(int devno);
 
 int nxp_board_rev(void);
diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 0eb83474c4..6059088bda 100644
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -333,6 +333,43 @@  int checkboard(void)
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, bd_t *bd)
 {
+#if defined(CONFIG_IMX_BOOTAUX)
+	int up;
+
+	up = arch_auxiliary_core_check_up(0);
+	if (up) {
+		int ret;
+		int areas = 1;
+		u64 start[2], size[2];
+
+		/*
+		 * Reserve 1MB of memory for M4 (1MiB is also the minimum
+		 * alignment for Linux due to MMU section size restrictions).
+		 */
+		start[0] = gd->bd->bi_dram[0].start;
+		size[0] = SZ_256M - SZ_1M;
+
+		/* If needed, create a second entry for memory beyond 256M */
+		if (gd->bd->bi_dram[0].size > SZ_256M) {
+			start[1] = gd->bd->bi_dram[0].start + SZ_256M;
+			size[1] = gd->bd->bi_dram[0].size - SZ_256M;
+			areas = 2;
+		}
+
+		ret = fdt_set_usable_memory(blob, start, size, areas);
+		if (ret) {
+			eprintf("Cannot set usable memory\n");
+			return ret;
+		}
+	} else {
+		int off;
+
+		off = fdt_node_offset_by_compatible(blob, -1,
+						    "fsl,imx7d-rpmsg");
+		if (off > 0)
+			fdt_status_disabled(blob, off);
+	}
+#endif
 #if defined(CONFIG_FDT_FIXUP_PARTITIONS)
 	static const struct node_info nodes[] = {
 		{ "fsl,imx7d-gpmi-nand", MTD_DEV_TYPE_NAND, }, /* NAND flash */