* [U-Boot] [PATCH 1/2] arm64: versal: Enable memory mapping via DT
@ 2019-09-11 7:42 Michal Simek
2019-09-11 7:42 ` [U-Boot] [PATCH 2/2] arm64: zynqmp: Provide a Kconfig option to disable OCM and TCM MMU mapping Michal Simek
0 siblings, 1 reply; 3+ messages in thread
From: Michal Simek @ 2019-09-11 7:42 UTC (permalink / raw)
To: u-boot
Code reads DT and setup MMU table based on memory node. This will ensure
that only DT needs to be changed.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm/mach-versal/cpu.c | 36 +++++++++++++------
arch/arm/mach-versal/include/mach/sys_proto.h | 1 +
board/xilinx/versal/board.c | 9 ++++-
3 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index 70c1908ec4b2..dc6a9205be0e 100644
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -12,14 +12,15 @@
DECLARE_GLOBAL_DATA_PTR;
-static struct mm_region versal_mem_map[] = {
+#define VERSAL_MEM_MAP_USED 6
+
+#define DRAM_BANKS CONFIG_NR_DRAM_BANKS
+
+/* +1 is end of list which needs to be empty */
+#define VERSAL_MEM_MAP_MAX (VERSAL_MEM_MAP_USED + DRAM_BANKS + 1)
+
+static struct mm_region versal_mem_map[VERSAL_MEM_MAP_MAX] = {
{
- .virt = 0x0UL,
- .phys = 0x0UL,
- .size = 0x80000000UL,
- .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
- PTE_BLOCK_INNER_SHARE
- }, {
.virt = 0x80000000UL,
.phys = 0x80000000UL,
.size = 0x70000000UL,
@@ -59,12 +60,27 @@ static struct mm_region versal_mem_map[] = {
.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
PTE_BLOCK_NON_SHARE |
PTE_BLOCK_PXN | PTE_BLOCK_UXN
- }, {
- /* List terminator */
- 0,
}
};
+void mem_map_fill(void)
+{
+ int banks = VERSAL_MEM_MAP_USED;
+
+ for (int i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+ /* Zero size means no more DDR that's this is end */
+ if (!gd->bd->bi_dram[i].size)
+ break;
+
+ versal_mem_map[banks].virt = gd->bd->bi_dram[i].start;
+ versal_mem_map[banks].phys = gd->bd->bi_dram[i].start;
+ versal_mem_map[banks].size = gd->bd->bi_dram[i].size;
+ versal_mem_map[banks].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+ PTE_BLOCK_INNER_SHARE;
+ banks = banks + 1;
+ }
+}
+
struct mm_region *mem_map = versal_mem_map;
u64 get_page_table_size(void)
diff --git a/arch/arm/mach-versal/include/mach/sys_proto.h b/arch/arm/mach-versal/include/mach/sys_proto.h
index 1dc7bf665690..05934c28d67f 100644
--- a/arch/arm/mach-versal/include/mach/sys_proto.h
+++ b/arch/arm/mach-versal/include/mach/sys_proto.h
@@ -9,3 +9,4 @@ enum {
};
void tcm_init(u8 mode);
+void mem_map_fill(void);
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 2b4edd8738b4..5718e1aa7e47 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -9,6 +9,7 @@
#include <malloc.h>
#include <asm/io.h>
#include <asm/arch/hardware.h>
+#include <asm/arch/sys_proto.h>
#include <dm/device.h>
#include <dm/uclass.h>
#include <versalpl.h>
@@ -194,7 +195,13 @@ int board_late_init(void)
int dram_init_banksize(void)
{
- fdtdec_setup_memory_banksize();
+ int ret;
+
+ ret = fdtdec_setup_memory_banksize();
+ if (ret)
+ return ret;
+
+ mem_map_fill();
return 0;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH 2/2] arm64: zynqmp: Provide a Kconfig option to disable OCM and TCM MMU mapping
2019-09-11 7:42 [U-Boot] [PATCH 1/2] arm64: versal: Enable memory mapping via DT Michal Simek
@ 2019-09-11 7:42 ` Michal Simek
2019-10-08 7:30 ` Michal Simek
0 siblings, 1 reply; 3+ messages in thread
From: Michal Simek @ 2019-09-11 7:42 UTC (permalink / raw)
To: u-boot
This patch provides an option to enable/disable OCM and TCM memory into MMU
table with corresponding memory attributes.
The same change was done for ZynqMP by commit 189bec47ab1f
("arm64: zynqmp: Provide a Kconfig option to define OCM and TCM in MMU")
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm/mach-versal/Kconfig | 7 +++++++
arch/arm/mach-versal/cpu.c | 25 +++++++++++++++++--------
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-versal/Kconfig b/arch/arm/mach-versal/Kconfig
index 26d175637101..06a035292464 100644
--- a/arch/arm/mach-versal/Kconfig
+++ b/arch/arm/mach-versal/Kconfig
@@ -54,4 +54,11 @@ config SYS_MEM_RSVD_FOR_MMU
MMU table than the one which will be allocated during
relocation.
+config DEFINE_TCM_OCM_MMAP
+ bool "Define TCM and OCM memory in MMU Table"
+ default y if MP
+ help
+ This option if enabled defines the TCM and OCM memory and its
+ memory attributes in MMU table entry.
+
endif
diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index dc6a9205be0e..f0d047d3232f 100644
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -12,12 +12,18 @@
DECLARE_GLOBAL_DATA_PTR;
-#define VERSAL_MEM_MAP_USED 6
+#define VERSAL_MEM_MAP_USED 5
#define DRAM_BANKS CONFIG_NR_DRAM_BANKS
+#if defined(CONFIG_DEFINE_TCM_OCM_MMAP)
+#define TCM_MAP 1
+#else
+#define TCM_MAP 0
+#endif
+
/* +1 is end of list which needs to be empty */
-#define VERSAL_MEM_MAP_MAX (VERSAL_MEM_MAP_USED + DRAM_BANKS + 1)
+#define VERSAL_MEM_MAP_MAX (VERSAL_MEM_MAP_USED + DRAM_BANKS + TCM_MAP + 1)
static struct mm_region versal_mem_map[VERSAL_MEM_MAP_MAX] = {
{
@@ -34,12 +40,6 @@ static struct mm_region versal_mem_map[VERSAL_MEM_MAP_MAX] = {
.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
PTE_BLOCK_NON_SHARE |
PTE_BLOCK_PXN | PTE_BLOCK_UXN
- }, {
- .virt = 0xffe00000UL,
- .phys = 0xffe00000UL,
- .size = 0x00200000UL,
- .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
- PTE_BLOCK_INNER_SHARE
}, {
.virt = 0x400000000UL,
.phys = 0x400000000UL,
@@ -67,6 +67,15 @@ void mem_map_fill(void)
{
int banks = VERSAL_MEM_MAP_USED;
+#if defined(CONFIG_DEFINE_TCM_OCM_MMAP)
+ versal_mem_map[banks].virt = 0xffe00000UL;
+ versal_mem_map[banks].phys = 0xffe00000UL;
+ versal_mem_map[banks].size = 0x00200000UL;
+ versal_mem_map[banks].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+ PTE_BLOCK_INNER_SHARE;
+ banks = banks + 1;
+#endif
+
for (int i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
/* Zero size means no more DDR that's this is end */
if (!gd->bd->bi_dram[i].size)
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH 2/2] arm64: zynqmp: Provide a Kconfig option to disable OCM and TCM MMU mapping
2019-09-11 7:42 ` [U-Boot] [PATCH 2/2] arm64: zynqmp: Provide a Kconfig option to disable OCM and TCM MMU mapping Michal Simek
@ 2019-10-08 7:30 ` Michal Simek
0 siblings, 0 replies; 3+ messages in thread
From: Michal Simek @ 2019-10-08 7:30 UTC (permalink / raw)
To: u-boot
st 11. 9. 2019 v 9:43 odesÃlatel Michal Simek <michal.simek@xilinx.com> napsal:
>
> This patch provides an option to enable/disable OCM and TCM memory into MMU
> table with corresponding memory attributes.
>
> The same change was done for ZynqMP by commit 189bec47ab1f
> ("arm64: zynqmp: Provide a Kconfig option to define OCM and TCM in MMU")
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
> arch/arm/mach-versal/Kconfig | 7 +++++++
> arch/arm/mach-versal/cpu.c | 25 +++++++++++++++++--------
> 2 files changed, 24 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-versal/Kconfig b/arch/arm/mach-versal/Kconfig
> index 26d175637101..06a035292464 100644
> --- a/arch/arm/mach-versal/Kconfig
> +++ b/arch/arm/mach-versal/Kconfig
> @@ -54,4 +54,11 @@ config SYS_MEM_RSVD_FOR_MMU
> MMU table than the one which will be allocated during
> relocation.
>
> +config DEFINE_TCM_OCM_MMAP
> + bool "Define TCM and OCM memory in MMU Table"
> + default y if MP
> + help
> + This option if enabled defines the TCM and OCM memory and its
> + memory attributes in MMU table entry.
> +
> endif
> diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
> index dc6a9205be0e..f0d047d3232f 100644
> --- a/arch/arm/mach-versal/cpu.c
> +++ b/arch/arm/mach-versal/cpu.c
> @@ -12,12 +12,18 @@
>
> DECLARE_GLOBAL_DATA_PTR;
>
> -#define VERSAL_MEM_MAP_USED 6
> +#define VERSAL_MEM_MAP_USED 5
>
> #define DRAM_BANKS CONFIG_NR_DRAM_BANKS
>
> +#if defined(CONFIG_DEFINE_TCM_OCM_MMAP)
> +#define TCM_MAP 1
> +#else
> +#define TCM_MAP 0
> +#endif
> +
> /* +1 is end of list which needs to be empty */
> -#define VERSAL_MEM_MAP_MAX (VERSAL_MEM_MAP_USED + DRAM_BANKS + 1)
> +#define VERSAL_MEM_MAP_MAX (VERSAL_MEM_MAP_USED + DRAM_BANKS + TCM_MAP + 1)
>
> static struct mm_region versal_mem_map[VERSAL_MEM_MAP_MAX] = {
> {
> @@ -34,12 +40,6 @@ static struct mm_region versal_mem_map[VERSAL_MEM_MAP_MAX] = {
> .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
> PTE_BLOCK_NON_SHARE |
> PTE_BLOCK_PXN | PTE_BLOCK_UXN
> - }, {
> - .virt = 0xffe00000UL,
> - .phys = 0xffe00000UL,
> - .size = 0x00200000UL,
> - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
> - PTE_BLOCK_INNER_SHARE
> }, {
> .virt = 0x400000000UL,
> .phys = 0x400000000UL,
> @@ -67,6 +67,15 @@ void mem_map_fill(void)
> {
> int banks = VERSAL_MEM_MAP_USED;
>
> +#if defined(CONFIG_DEFINE_TCM_OCM_MMAP)
> + versal_mem_map[banks].virt = 0xffe00000UL;
> + versal_mem_map[banks].phys = 0xffe00000UL;
> + versal_mem_map[banks].size = 0x00200000UL;
> + versal_mem_map[banks].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
> + PTE_BLOCK_INNER_SHARE;
> + banks = banks + 1;
> +#endif
> +
> for (int i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
> /* Zero size means no more DDR that's this is end */
> if (!gd->bd->bi_dram[i].size)
> --
> 2.17.1
>
Applied both.
M
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-08 7:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-11 7:42 [U-Boot] [PATCH 1/2] arm64: versal: Enable memory mapping via DT Michal Simek
2019-09-11 7:42 ` [U-Boot] [PATCH 2/2] arm64: zynqmp: Provide a Kconfig option to disable OCM and TCM MMU mapping Michal Simek
2019-10-08 7:30 ` Michal Simek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.