ARM: make TCM allocation static and common for all archs
Subsystems (3)
PATCH 1/1 ARM: make TCM allocation static and common for all archs
This changes the TCM handling so that a fixed area is reserved at 0xfffe0000-0xfffeffff for TCM. This areas is used by XScale but XScale does not have TCM so the mechanisms are mutually exclusive.
This change is needed to make TCM detection more dynamic while still being able to compile code into it, and is a must for the unified ARM goals: the current TCM allocation at different places in memory for each machine would be a nightmare if you want to compile a single image for more than one machine with TCM so it has to be nailed down in one place.
---
This is another TCM patch, to be applied on top of the other stuff I've sent so far. This has been tested on U300 and PB1176 however I haven't sent a patch for activating TCM on the RealViews just yet, because I want to check the potential SMP issues that would affect some of them. It would probably be possible to add it on the mach-versatile though. (I don't have one.)
--- Documentation/arm/memory.txt | 8 ++- Documentation/arm/tcm.txt | 30 ++++++---- arch/arm/include/asm/memory.h | 9 +++ arch/arm/kernel/tcm.c | 91 ++++++++++++++++-------------- arch/arm/mach-u300/include/mach/memory.h | 8 --- arch/arm/mm/init.c | 18 +++--- 6 files changed, 91 insertions(+), 73 deletions(-)
Documentation/arm/memory.txt +7 -1
@@ -33,7 +33,13 @@ ffff0000 ffff0fff CPU vector page. fffe0000 fffeffff XScale cache flush area. This is used in proc-xscale.S to flush the whole data - cache. Free for other usage on non-XScale. + cache. (XScale does not have TCM.) + +fffe8000 fffeffff DTCM mapping area for platforms with + DTCM mounted inside the CPU. + +fffe0000 fffe7fff ITCM mapping area for platforms with + ITCM mounted inside the CPU. fff00000 fffdffff Fixmap mapping region. Addresses provided by fix_to_virt() will be located here.
Documentation/arm/tcm.txt +19 -11
@@ -19,8 +19,8 @@ defines a CPUID_TCM register that you can read out from the system control coprocessor. Documentation from ARM can be found at http://infocenter.arm.com, search for "TCM Status Register" to see documents for all CPUs. Reading this register you can -determine if ITCM (bit 0) and/or DTCM (bit 16) is present in the -machine. +determine if ITCM (bits 1-0) and/or DTCM (bit 17-16) is present +in the machine. There is further a TCM region register (search for "TCM Region Registers" at the ARM site) that can report and modify the location
@@ -35,7 +35,15 @@ The TCM memory can then be remapped to another address again using the MMU, but notice that the TCM if often used in situations where the MMU is turned off. To avoid confusion the current Linux implementation will map the TCM 1 to 1 from physical to virtual -memory in the location specified by the machine. +memory in the location specified by the kernel. Currently Linux +will map ITCM to 0xfffe0000 and on, and DTCM to 0xfffe8000 and +on, supporting a maximum of 32KiB of ITCM and 32KiB of DTCM. + +Newer versions of the region registers also support dividing these +TCMs in two separate banks, so for example an 8KiB ITCM is divided +into two 4KiB banks with its own control registers. The idea is to +be able to lock and hide one of the banks for use by the secure +world (TrustZone). TCM is used for a few things:
@@ -65,18 +73,18 @@ in <asm/tcm.h>. Using this interface it is possible to: memory. Such a heap is great for things like saving device state when shutting off device power domains. -A machine that has TCM memory shall select HAVE_TCM in -arch/arm/Kconfig for itself, and then the -rest of the functionality will depend on the physical -location and size of ITCM and DTCM to be defined in -mach/memory.h for the machine. Code that needs to use -TCM shall #include <asm/tcm.h> If the TCM is not located -at the place given in memory.h it will be moved using -the TCM Region registers. +A machine that has TCM memory shall select HAVE_TCM from +arch/arm/Kconfig for itself. Code that needs to use TCM shall +#include <asm/tcm.h> Functions to go into itcm can be tagged like this: int __tcmfunc foo(int bar); +Since these are marked to become long_calls and you may want +to have functions called locally inside the TCM without +wasting space, there is also the __tcmlocalfunc prefix that +will make the call relative. + Variables to go into dtcm can be tagged like this: int __tcmdata foo;
arch/arm/include/asm/memory.h +9 -0
@@ -124,6 +124,15 @@#endif /* !CONFIG_MMU */ /* +* We fix the TCM memories max 32 KiB ITCM resp DTCM at these +* locations +*/ +#ifdef CONFIG_HAVE_TCM +#define ITCM_OFFSET UL(0xfffe0000) +#define DTCM_OFFSET UL(0xfffe8000) +#endif + +/* * Physical vs virtual RAM address space conversion. These are * private definitions which should NOT be used outside memory.h * files. Use virt_to_phys/phys_to_virt/__pa/__va instead.
arch/arm/kernel/tcm.c +48 -43
216 lines not on this page · raw message
arch/arm/mach-u300/include/mach/memory.h +0 -8
@@ -35,14 +35,6 @@#endif /* -* TCM memory whereabouts -*/ -#define ITCM_OFFSET 0xffff2000 -#define ITCM_END 0xffff3fff -#define DTCM_OFFSET 0xffff4000 -#define DTCM_END 0xffff5fff - -/* * We enable a real big DMA buffer if need be. */ #define CONSISTENT_DMA_SIZE SZ_4M
arch/arm/mm/init.c +8 -10
@@ -432,6 +432,12 @@ void __init mem_init(void) {unsigned long reserved_pages, free_pages;int i; +#ifdef CONFIG_HAVE_TCM +/* These pointers are filled in on TCM detection */ +extern u32 dtcm_end; +extern u32 itcm_end; +#endif +#ifdef CONFIG_SA1111 lmb_free (PHYS_OFFSET ,__pa (swapper_pg_dir) -PHYS_OFFSET );
@@ -505,13 +511,9 @@ void __init mem_init(void) printk(KERN_NOTICE "Virtual kernel memory layout:\n" " vector : 0x%08lx - 0x%08lx (%4ld kB)\n" #ifdef CONFIG_HAVE_TCM -#ifdef DTCM_OFFSET " DTCM : 0x%08lx - 0x%08lx (%4ld kB)\n" -#endif -#ifdef ITCM_OFFSET " ITCM : 0x%08lx - 0x%08lx (%4ld kB)\n" #endif -#endif " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" #ifdef CONFIG_MMU " DMA : 0x%08lx - 0x%08lx (%4ld MB)\n"
@@ -529,12 +531,8 @@ void __init mem_init(void) MLK(UL(CONFIG_VECTORS_BASE), UL(CONFIG_VECTORS_BASE) + (PAGE_SIZE)),#ifdef CONFIG_HAVE_TCM -#ifdef DTCM_OFFSET - MLK(UL(DTCM_OFFSET), UL(DTCM_END + 1)), -#endif -#ifdef ITCM_OFFSET - MLK(UL(ITCM_OFFSET), UL(ITCM_END + 1)), -#endif +MLK (DTCM_OFFSET , (unsigned long ) dtcm_end), +MLK (ITCM_OFFSET , (unsigned long ) itcm_end), #endifMLK (FIXADDR_START ,FIXADDR_TOP ), #ifdef CONFIG_MMU
Signature · 1 line
1.7.1
PATCH 1/1 ARM: make TCM allocation static and common for all archs
Quoted 12 lines · Linus Walleij
This changes the TCM handling so that a fixed area is reserved at 0xfffe0000-0xfffeffff for TCM. This areas is used by XScale but XScale does not have TCM so the mechanisms are mutually exclusive.
This change is needed to make TCM detection more dynamic while still being able to compile code into it, and is a must for the unified ARM goals: the current TCM allocation at different places in memory for each machine would be a nightmare if you want to compile a single image for more than one machine with TCM so it has to be nailed down in one place.
Signed-off-by Linus Walleij <[email protected]>
Quoted 8 lines
---
This is another TCM patch, to be applied on top of the other stuff I've sent so far. This has been tested on U300 and PB1176 however I haven't sent a patch for activating TCM on the RealViews just yet, because I want to check the potential SMP issues that would affect some of them. It would probably be possible to add it on the mach-versatile though. (I don't have one.)
---
Any feed back about the tcm?
Best Regards,
J.
PATCH 1/1 ARM: make TCM allocation static and common for all archs
2010/9/10 Jean-Christophe PLAGNIOL-VILLARD <[email protected]>:
Quoted 1 line
Any feed back about the tcm?
None other than it works for me on U300 and RealView PB1176.
Some two people have mailed me in private and told me they're using it for out-of-tree stuff (ARM 926 based I think.)
Alessandro Rubin tried to use it on the Nomadik NHK8815 but it turns out that the "TCM" in that machine is actually a ROM and a locked-down RAM that is used for some security stuff (not TrustZone!).
Yours,
Linus Walleij