Skip to contentSkip to conversation

android: colibri_imx7: reserve DDR memory for Cortex-M4

PATCH New Igor Opaniuk 4 participants 12 messages Jul 12, 2019 – Dec 4, 2019 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover android: colibri_imx7: reserve DDR memory for Cortex-M4

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.

Introduce support for adding 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.

Igor Opaniuk (2):
common: fdt_support: add support for setting usable memory
board: colibri_imx7: reserve DDR memory for Cortex-M4

 arch/arm/include/asm/mach-imx/sys_proto.h |  2 ++
 board/toradex/colibri_imx7/colibri_imx7.c | 37 +++++++++++++++++++++++
 common/fdt_support.c                      | 35 +++++++++++++++++++++
 include/fdt_support.h                     |  2 ++
 4 files changed, 76 insertions(+)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 common: fdt_support: add support for setting usable memory

From: Igor Opaniuk <[email protected]>

Add support for setting linux,usable-memory property in the memory node of device tree for the kernel [1].

This property holds a base address and size, describing a limited region in which memory may be considered available for use by the kernel. Memory outside of this range is not available for use.

[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/chosen.txt

---

 common/fdt_support.c  | 35 +++++++++++++++++++++++++++++++++++
 include/fdt_support.h |  2 ++
 2 files changed, 37 insertions(+)
common/fdt_support.c +35 -0
index f31e9b0cc5..57413c7a4d 100644
@@ -473,6 +473,41 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size)
 	return fdt_fixup_memory_banks(blob, &start, &size, 1);
 }
 
+int fdt_set_usable_memory(void *blob, u64 start[], u64 size[], int areas)
+{
+	int err, nodeoffset;
+	int len;
+	u8 tmp[8 * 16]; /* Up to 64-bit address + 64-bit size */
+
+	if (areas > 8) {
+		printf("%s: num areas %d exceeds hardcoded limit %d\n",
+		       __func__, areas, 8);
+		return -1;
+	}
+
+	err = fdt_check_header(blob);
+	if (err < 0) {
+		printf("%s: %s\n", __func__, fdt_strerror(err));
+		return err;
+	}
+
+	/* find or create "/memory" node. */
+	nodeoffset = fdt_find_or_add_subnode(blob, 0, "memory");
+	if (nodeoffset < 0)
+		return nodeoffset;
+
+	len = fdt_pack_reg(blob, tmp, start, size, areas);
+
+	err = fdt_setprop(blob, nodeoffset, "linux,usable-memory", tmp, len);
+	if (err < 0) {
+		printf("WARNING: could not set %s %s.\n",
+		       "reg", fdt_strerror(err));
+		return err;
+	}
+
+	return 0;
+}
+
 void fdt_fixup_ethernet(void *fdt)
 {
 	int i = 0, j, prop;
include/fdt_support.h +2 -0
index 27fe564f0b..a868b6710e 100644
@@ -102,6 +102,8 @@ static inline int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[],
 }
 #endif
 
+int fdt_set_usable_memory(void *blob, u64 start[], u64 size[], int banks);
+
 void fdt_fixup_ethernet(void *fdt);
 int fdt_find_and_setprop(void *fdt, const char *node, const char *prop,
 			 const void *val, int len, int create);
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/2 common: fdt_support: add support for setting usable memory

Quoted 10 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

Add support for setting linux,usable-memory property in the memory node of device tree for the kernel [1].

This property holds a base address and size, describing a limited region in which memory may be considered available for use by the kernel. Memory outside of this range is not available for use.

Quoted 6 lines

[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/chosen.txt

Quoted 72 lines

---

 common/fdt_support.c  | 35 +++++++++++++++++++++++++++++++++++
 include/fdt_support.h |  2 ++
 2 files changed, 37 insertions(+)
common/fdt_support.c +35 -0
index f31e9b0cc5..57413c7a4d 100644
@@ -473,6 +473,41 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size)
        return fdt_fixup_memory_banks(blob, &start, &size, 1);
 }
 
+int fdt_set_usable_memory(void *blob, u64 start[], u64 size[], int areas)
+{
+       int err, nodeoffset;
+       int len;
+       u8 tmp[8 * 16]; /* Up to 64-bit address + 64-bit size */
+
+       if (areas > 8) {
+               printf("%s: num areas %d exceeds hardcoded limit %d\n",
+                      __func__, areas, 8);
+               return -1;
+       }
+
+       err = fdt_check_header(blob);
+       if (err < 0) {
+               printf("%s: %s\n", __func__, fdt_strerror(err));
+               return err;
+       }
+
+       /* find or create "/memory" node. */
+       nodeoffset = fdt_find_or_add_subnode(blob, 0, "memory");
+       if (nodeoffset < 0)
+               return nodeoffset;
+
+       len = fdt_pack_reg(blob, tmp, start, size, areas);
+
+       err = fdt_setprop(blob, nodeoffset, "linux,usable-memory", tmp, len);
+       if (err < 0) {
+               printf("WARNING: could not set %s %s.\n",
+                      "reg", fdt_strerror(err));
+               return err;
+       }
+
+       return 0;
+}
+
 void fdt_fixup_ethernet(void *fdt)
 {
        int i = 0, j, prop;
include/fdt_support.h +2 -1
index 27fe564f0b..a868b6710e 100644
@@ -102,6 +102,8 @@ static inline int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[],
 }
 #endif
 
+int fdt_set_usable_memory(void *blob, u64 start[], u64 size[], int banks);
+
 void fdt_fixup_ethernet(void *fdt);
 int fdt_find_and_setprop(void *fdt, const char *node, const char *prop,
                         const void *val, int len, int create);
--

2.17.1

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot

Signature · 4 lines
Best regards

Oleksandr Suvorov
cryosay at gmail.com
#3 lore raw

PATCH 1/2 common: fdt_support: add support for setting usable memory

In reply to Igor Opaniuk
Quoted 7 lines

From: Igor Opaniuk <[email protected]>
Add support for setting linux,usable-memory property in the memory node of device tree for the kernel [1].
This property holds a base address and size, describing a limited region in which memory may be considered available for use by the kernel. Memory outside of this range is not available for use.
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/chosen.txt

Quoted 5 lines

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

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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 at denx.de
=====================================================================

A message that is not in the archive (sent off-list or not yet received): [email protected]

#5 lore raw

PATCH 1/2 common: fdt_support: add support for setting usable memory

Hi Stefano,

Quoted 14 lines · On Mon, Oct 14, 2019 at 3:40 PM <[email protected]> wrote:
Quoted 8 lines

From: Igor Opaniuk <[email protected]>
Add support for setting linux,usable-memory property in the memory node of device tree for the kernel [1].
This property holds a base address and size, describing a limited region in which memory may be considered available for use by the kernel. Memory outside of this range is not available for use.
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/chosen.txt

Quoted 5 lines
Quoted 1 line

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.

Quoted 11 lines

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 at denx.de
=====================================================================

Signature · 8 lines
Best regards - Freundliche Grüsse - Meilleures salutations

Igor Opaniuk

mailto: igor.opaniuk at gmail.com
skype: igor.opanyuk
+380 (93) 836 40 67
http://ua.linkedin.com/in/iopaniuk
#6 lore raw

PATCH 1/2 common: fdt_support: add support for setting usable memory

Hi Igor,

Quoted 17 lines · Igor Opaniuk

Hi Stefano,

Quoted 14 lines · On Mon, Oct 14, 2019 at 3:40 PM <[email protected]> wrote:
Quoted 13 lines

From: Igor Opaniuk <[email protected]>
Add support for setting linux,usable-memory property in the memory node of device tree for the kernel [1].
This property holds a base address and size, describing a limited region in which memory may be considered available for use by the kernel. Memory outside of this range is not available for use.
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/chosen.txt

Quoted 5 lines
Quoted 1 line

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.

Added again, and I have found that this breaks all boards where CONFIG_ARCH_FIXUP_FDT_MEMORY is not set.

In fact, your new function calls fdt_pack_reg and this is not compiled if the define above is not set. Just ask if it does not make sense to let fdt_pack_reg() be always compiled...

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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 at denx.de
=====================================================================
#7 lore raw

PATCH 1/2 common: fdt_support: add support for setting usable memory

Hi Stefano,

Quoted 27 lines · Stefano Babic

Hi Igor,

Quoted 17 lines · Igor Opaniuk

Hi Stefano,

Quoted 14 lines · On Mon, Oct 14, 2019 at 3:40 PM <[email protected]> wrote:
Quoted 13 lines

From: Igor Opaniuk <[email protected]>
Add support for setting linux,usable-memory property in the memory node of device tree for the kernel [1].
This property holds a base address and size, describing a limited region in which memory may be considered available for use by the kernel. Memory outside of this range is not available for use.
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/chosen.txt

Quoted 5 lines
Quoted 1 line

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.

Quoted 6 lines

Added again, and I have found that this breaks all boards where CONFIG_ARCH_FIXUP_FDT_MEMORY is not set.

In fact, your new function calls fdt_pack_reg and this is not compiled if the define above is not set. Just ask if it does not make sense to let fdt_pack_reg() be always compiled...

Thanks for reporting, the fix is here [1]

[1] https://patchwork.ozlabs.org/project/uboot/list/?series=146241

Quoted 10 lines

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 at denx.de
=====================================================================

Signature · 8 lines
Best regards - Freundliche Grüsse - Meilleures salutations

Igor Opaniuk

mailto: igor.opaniuk at gmail.com
skype: igor.opanyuk
+380 (93) 836 40 67
http://ua.linkedin.com/in/iopaniuk
#8 lore raw

PATCH 2/2 board: colibri_imx7: reserve DDR memory for Cortex-M4

In reply to Igor Opaniuk

From: Igor Opaniuk <[email protected]>

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.

---

 arch/arm/include/asm/mach-imx/sys_proto.h |  2 ++
 board/toradex/colibri_imx7/colibri_imx7.c | 37 +++++++++++++++++++++++
 2 files changed, 39 insertions(+)
arch/arm/include/asm/mach-imx/sys_proto.h +2 -0
index 4925dd7894..775cd3df40 100644
@@ -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);
board/toradex/colibri_imx7/colibri_imx7.c +37 -0
index 0eb83474c4..6059088bda 100644
@@ -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 */
Signature · 1 line
2.17.1
#9 lore raw

PATCH 2/2 board: colibri_imx7: reserve DDR memory for Cortex-M4

Quoted 13 lines · Igor Opaniuk

From: Igor Opaniuk <[email protected]>

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.

Quoted 4 lines
Quoted 74 lines

---

 arch/arm/include/asm/mach-imx/sys_proto.h |  2 ++
 board/toradex/colibri_imx7/colibri_imx7.c | 37 +++++++++++++++++++++++
 2 files changed, 39 insertions(+)
arch/arm/include/asm/mach-imx/sys_proto.h +2 -0
index 4925dd7894..775cd3df40 100644
@@ -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);
board/toradex/colibri_imx7/colibri_imx7.c +37 -1
index 0eb83474c4..6059088bda 100644
@@ -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 at lists.denx.de
https://lists.denx.de/listinfo/u-boot

Signature · 6 lines
Best regards
Oleksandr Suvorov

Toradex AG
Altsagenstrasse 5 | 6048 Horw/Luzern | Switzerland | T: +41 41 500
4800 (main line)
#10 lore raw

PATCH 2/2 board: colibri_imx7: reserve DDR memory for Cortex-M4

In reply to Igor Opaniuk
Quoted 9 lines

From: Igor Opaniuk <[email protected]>
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.

Quoted 4 lines

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

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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 at denx.de
=====================================================================

A message that is not in the archive (sent off-list or not yet received): [email protected]

#12 lore raw

PATCH 2/2 board: colibri_imx7: reserve DDR memory for Cortex-M4

Hi Stefano,

Quoted 15 lines · On Mon, Oct 14, 2019 at 3:40 PM <[email protected]> wrote:
Quoted 10 lines

From: Igor Opaniuk <[email protected]>
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.

Quoted 4 lines
Quoted 1 line

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.

Quoted 11 lines

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 at denx.de
=====================================================================

Signature · 8 lines
Best regards - Freundliche Grüsse - Meilleures salutations

Igor Opaniuk

mailto: igor.opaniuk at gmail.com
skype: igor.opanyuk
+380 (93) 836 40 67
http://ua.linkedin.com/in/iopaniuk
#13 lore raw

cover android: colibri_imx7: reserve DDR memory for Cortex-M4

In reply to Igor Opaniuk
Quoted 15 lines · Igor Opaniuk

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.

Introduce support for adding 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.

Igor Opaniuk (2):
common: fdt_support: add support for setting usable memory
board: colibri_imx7: reserve DDR memory for Cortex-M4

Quoted 9 lines
 arch/arm/include/asm/mach-imx/sys_proto.h |  2 ++
 board/toradex/colibri_imx7/colibri_imx7.c | 37 +++++++++++++++++++++++
 common/fdt_support.c                      | 35 +++++++++++++++++++++
 include/fdt_support.h                     |  2 ++
 4 files changed, 76 insertions(+)

--
2.17.1

Please, don't pay attention to "android" keyword in the title (actually nothing related to android), it's just a glitch. --
Best regards - Freundliche Grüsse - Meilleures salutations

Igor Opaniuk

mailto: igor.opaniuk at gmail.com
skype: igor.opanyuk
+380 (93) 836 40 67
http://ua.linkedin.com/in/iopaniuk