|
@@ -24,6 +24,7 @@
|
|
|
|
|
|
#include "mmu.h"
|
|
|
|
|
|
+/*----- Keil -----------------------------------------------------------------*/
|
|
|
#ifdef __CC_ARM
|
|
|
void mmu_setttbase(rt_uint32_t i)
|
|
|
{
|
|
@@ -35,32 +36,22 @@ void mmu_setttbase(rt_uint32_t i)
|
|
|
* set by page table entry
|
|
|
*/
|
|
|
value = 0;
|
|
|
- __asm
|
|
|
- {
|
|
|
- mcr p15, 0, value, c8, c7, 0
|
|
|
- }
|
|
|
-
|
|
|
+ __asm volatile{ mcr p15, 0, value, c8, c7, 0 }
|
|
|
value = 0x55555555;
|
|
|
- __asm
|
|
|
- {
|
|
|
- mcr p15, 0, value, c3, c0, 0
|
|
|
- mcr p15, 0, i, c2, c0, 0
|
|
|
- }
|
|
|
+ __asm volatile { mcr p15, 0, value, c3, c0, 0 }
|
|
|
+ __asm volatile { mcr p15, 0, i, c2, c0, 0 }
|
|
|
}
|
|
|
|
|
|
void mmu_set_domain(rt_uint32_t i)
|
|
|
{
|
|
|
- __asm
|
|
|
- {
|
|
|
- mcr p15,0, i, c3, c0, 0
|
|
|
- }
|
|
|
+ __asm volatile { mcr p15, 0, i, c3, c0, 0 }
|
|
|
}
|
|
|
|
|
|
void mmu_enable()
|
|
|
{
|
|
|
register rt_uint32_t value;
|
|
|
|
|
|
- __asm
|
|
|
+ __asm volatile
|
|
|
{
|
|
|
mrc p15, 0, value, c1, c0, 0
|
|
|
orr value, value, #0x01
|
|
@@ -72,7 +63,7 @@ void mmu_disable()
|
|
|
{
|
|
|
register rt_uint32_t value;
|
|
|
|
|
|
- __asm
|
|
|
+ __asm volatile
|
|
|
{
|
|
|
mrc p15, 0, value, c1, c0, 0
|
|
|
bic value, value, #0x01
|
|
@@ -84,7 +75,7 @@ void mmu_enable_icache()
|
|
|
{
|
|
|
register rt_uint32_t value;
|
|
|
|
|
|
- __asm
|
|
|
+ __asm volatile
|
|
|
{
|
|
|
mrc p15, 0, value, c1, c0, 0
|
|
|
orr value, value, #0x1000
|
|
@@ -96,7 +87,7 @@ void mmu_enable_dcache()
|
|
|
{
|
|
|
register rt_uint32_t value;
|
|
|
|
|
|
- __asm
|
|
|
+ __asm volatile
|
|
|
{
|
|
|
mrc p15, 0, value, c1, c0, 0
|
|
|
orr value, value, #0x04
|
|
@@ -108,7 +99,7 @@ void mmu_disable_icache()
|
|
|
{
|
|
|
register rt_uint32_t value;
|
|
|
|
|
|
- __asm
|
|
|
+ __asm volatile
|
|
|
{
|
|
|
mrc p15, 0, value, c1, c0, 0
|
|
|
bic value, value, #0x1000
|
|
@@ -120,7 +111,7 @@ void mmu_disable_dcache()
|
|
|
{
|
|
|
register rt_uint32_t value;
|
|
|
|
|
|
- __asm
|
|
|
+ __asm volatile
|
|
|
{
|
|
|
mrc p15, 0, value, c1, c0, 0
|
|
|
bic value, value, #0x04
|
|
@@ -132,7 +123,7 @@ void mmu_enable_alignfault()
|
|
|
{
|
|
|
register rt_uint32_t value;
|
|
|
|
|
|
- __asm
|
|
|
+ __asm volatile
|
|
|
{
|
|
|
mrc p15, 0, value, c1, c0, 0
|
|
|
orr value, value, #0x02
|
|
@@ -144,7 +135,7 @@ void mmu_disable_alignfault()
|
|
|
{
|
|
|
register rt_uint32_t value;
|
|
|
|
|
|
- __asm
|
|
|
+ __asm volatile
|
|
|
{
|
|
|
mrc p15, 0, value, c1, c0, 0
|
|
|
bic value, value, #0x02
|
|
@@ -154,10 +145,7 @@ void mmu_disable_alignfault()
|
|
|
|
|
|
void mmu_clean_invalidated_cache_index(int index)
|
|
|
{
|
|
|
- __asm
|
|
|
- {
|
|
|
- mcr p15, 0, index, c7, c14, 2
|
|
|
- }
|
|
|
+ __asm volatile { mcr p15, 0, index, c7, c14, 2 }
|
|
|
}
|
|
|
|
|
|
void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size)
|
|
@@ -168,10 +156,7 @@ void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size)
|
|
|
|
|
|
while(ptr < buffer + size)
|
|
|
{
|
|
|
- __asm
|
|
|
- {
|
|
|
- MCR p15, 0, ptr, c7, c14, 1
|
|
|
- }
|
|
|
+ __asm volatile { MCR p15, 0, ptr, c7, c14, 1 }
|
|
|
ptr += CACHE_LINE_SIZE;
|
|
|
}
|
|
|
}
|
|
@@ -184,10 +169,7 @@ void mmu_clean_dcache(rt_uint32_t buffer, rt_uint32_t size)
|
|
|
|
|
|
while (ptr < buffer + size)
|
|
|
{
|
|
|
- __asm
|
|
|
- {
|
|
|
- MCR p15, 0, ptr, c7, c10, 1
|
|
|
- }
|
|
|
+ __asm volatile { MCR p15, 0, ptr, c7, c10, 1 }
|
|
|
ptr += CACHE_LINE_SIZE;
|
|
|
}
|
|
|
}
|
|
@@ -200,10 +182,7 @@ void mmu_invalidate_dcache(rt_uint32_t buffer, rt_uint32_t size)
|
|
|
|
|
|
while (ptr < buffer + size)
|
|
|
{
|
|
|
- __asm
|
|
|
- {
|
|
|
- MCR p15, 0, ptr, c7, c6, 1
|
|
|
- }
|
|
|
+ __asm volatile { MCR p15, 0, ptr, c7, c6, 1 }
|
|
|
ptr += CACHE_LINE_SIZE;
|
|
|
}
|
|
|
}
|
|
@@ -213,10 +192,7 @@ void mmu_invalidate_tlb()
|
|
|
register rt_uint32_t value;
|
|
|
|
|
|
value = 0;
|
|
|
- __asm
|
|
|
- {
|
|
|
- mcr p15, 0, value, c8, c7, 0
|
|
|
- }
|
|
|
+ __asm volatile { mcr p15, 0, value, c8, c7, 0 }
|
|
|
}
|
|
|
|
|
|
void mmu_invalidate_icache()
|
|
@@ -225,10 +201,7 @@ void mmu_invalidate_icache()
|
|
|
|
|
|
value = 0;
|
|
|
|
|
|
- __asm
|
|
|
- {
|
|
|
- mcr p15, 0, value, c7, c5, 0
|
|
|
- }
|
|
|
+ __asm volatile { mcr p15, 0, value, c7, c5, 0 }
|
|
|
}
|
|
|
|
|
|
|
|
@@ -238,12 +211,10 @@ void mmu_invalidate_dcache_all()
|
|
|
|
|
|
value = 0;
|
|
|
|
|
|
- __asm
|
|
|
- {
|
|
|
- mcr p15, 0, value, c7, c6, 0
|
|
|
- }
|
|
|
+ __asm volatile { mcr p15, 0, value, c7, c6, 0 }
|
|
|
}
|
|
|
-#elif defined(__GNUC__)
|
|
|
+/*----- GNU ------------------------------------------------------------------*/
|
|
|
+#elif defined(__GNUC__) || defined(__ICCARM__)
|
|
|
void mmu_setttbase(register rt_uint32_t i)
|
|
|
{
|
|
|
register rt_uint32_t value;
|
|
@@ -254,311 +225,117 @@ void mmu_setttbase(register rt_uint32_t i)
|
|
|
* set by page table entry
|
|
|
*/
|
|
|
value = 0;
|
|
|
- asm ("mcr p15, 0, %0, c8, c7, 0"::"r"(value));
|
|
|
+ asm volatile ("mcr p15, 0, %0, c8, c7, 0"::"r"(value));
|
|
|
|
|
|
value = 0x55555555;
|
|
|
- asm ("mcr p15, 0, %0, c3, c0, 0"::"r"(value));
|
|
|
- asm ("mcr p15, 0, %0, c2, c0, 0"::"r"(i));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_set_domain(register rt_uint32_t i)
|
|
|
-{
|
|
|
- asm ("mcr p15,0, %0, c3, c0, 0": :"r" (i));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_enable()
|
|
|
-{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i |= 0x1;
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_disable()
|
|
|
-{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i &= ~0x1;
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_enable_icache()
|
|
|
-{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i |= (1 << 12);
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_enable_dcache()
|
|
|
-{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i |= (1 << 2);
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_disable_icache()
|
|
|
-{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i &= ~(1 << 12);
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_disable_dcache()
|
|
|
-{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i &= ~(1 << 2);
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_enable_alignfault()
|
|
|
-{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i |= (1 << 1);
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_disable_alignfault()
|
|
|
-{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i &= ~(1 << 1);
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_clean_invalidated_cache_index(int index)
|
|
|
-{
|
|
|
- asm ("mcr p15, 0, %0, c7, c14, 2": :"r" (index));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size)
|
|
|
-{
|
|
|
- unsigned int ptr;
|
|
|
-
|
|
|
- ptr = buffer & ~(CACHE_LINE_SIZE - 1);
|
|
|
-
|
|
|
- while(ptr < buffer + size)
|
|
|
- {
|
|
|
- asm ("mcr p15, 0, %0, c7, c14, 1": :"r" (ptr));
|
|
|
- ptr += CACHE_LINE_SIZE;
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-
|
|
|
-void mmu_clean_dcache(rt_uint32_t buffer, rt_uint32_t size)
|
|
|
-{
|
|
|
- unsigned int ptr;
|
|
|
-
|
|
|
- ptr = buffer & ~(CACHE_LINE_SIZE - 1);
|
|
|
-
|
|
|
- while (ptr < buffer + size)
|
|
|
- {
|
|
|
- asm ("mcr p15, 0, %0, c7, c10, 1": :"r" (ptr));
|
|
|
- ptr += CACHE_LINE_SIZE;
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_invalidate_dcache(rt_uint32_t buffer, rt_uint32_t size)
|
|
|
-{
|
|
|
- unsigned int ptr;
|
|
|
-
|
|
|
- ptr = buffer & ~(CACHE_LINE_SIZE - 1);
|
|
|
-
|
|
|
- while (ptr < buffer + size)
|
|
|
- {
|
|
|
- asm ("mcr p15, 0, %0, c7, c6, 1": :"r" (ptr));
|
|
|
- ptr += CACHE_LINE_SIZE;
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_invalidate_tlb()
|
|
|
-{
|
|
|
- asm ("mcr p15, 0, %0, c8, c7, 0": :"r" (0));
|
|
|
-}
|
|
|
-
|
|
|
-void mmu_invalidate_icache()
|
|
|
-{
|
|
|
- asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (0));
|
|
|
-}
|
|
|
+ asm volatile ("mcr p15, 0, %0, c3, c0, 0"::"r"(value));
|
|
|
|
|
|
-void mmu_invalidate_dcache_all()
|
|
|
-{
|
|
|
- asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (0));
|
|
|
-}
|
|
|
-#elif defined(__ICCARM__)
|
|
|
-void mmu_setttbase(register rt_uint32_t i)
|
|
|
-{
|
|
|
- register rt_uint32_t value;
|
|
|
+ asm volatile ("mcr p15, 0, %0, c2, c0, 0"::"r"(i));
|
|
|
|
|
|
- /* Invalidates all TLBs.Domain access is selected as
|
|
|
- * client by configuring domain access register,
|
|
|
- * in that case access controlled by permission value
|
|
|
- * set by page table entry
|
|
|
- */
|
|
|
- value = 0;
|
|
|
- asm ("mcr p15, 0, %0, c8, c7, 0"::"r"(value));
|
|
|
-
|
|
|
- value = 0x55555555;
|
|
|
- asm ("mcr p15, 0, %0, c3, c0, 0"::"r"(value));
|
|
|
- asm ("mcr p15, 0, %0, c2, c0, 0"::"r"(i));
|
|
|
}
|
|
|
|
|
|
void mmu_set_domain(register rt_uint32_t i)
|
|
|
{
|
|
|
- asm ("mcr p15,0, %0, c3, c0, 0": :"r" (i));
|
|
|
+ asm volatile ("mcr p15,0, %0, c3, c0, 0": :"r" (i));
|
|
|
}
|
|
|
|
|
|
void mmu_enable()
|
|
|
{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i |= 0x1;
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
+ asm volatile
|
|
|
+ (
|
|
|
+ "mrc p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ "orr r0, r0, #0x1 \n"
|
|
|
+ "mcr p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ :::"r0"
|
|
|
+ );
|
|
|
}
|
|
|
|
|
|
void mmu_disable()
|
|
|
{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i &= ~0x1;
|
|
|
+ asm volatile
|
|
|
+ (
|
|
|
+ "mrc p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ "bic r0, r0, #0x1 \n"
|
|
|
+ "mcr p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ :::"r0"
|
|
|
+ );
|
|
|
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
}
|
|
|
|
|
|
void mmu_enable_icache()
|
|
|
{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i |= (1 << 12);
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
+ asm volatile
|
|
|
+ (
|
|
|
+ "mrc p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ "orr r0, r0, #(1<<12) \n"
|
|
|
+ "mcr p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ :::"r0"
|
|
|
+ );
|
|
|
}
|
|
|
|
|
|
void mmu_enable_dcache()
|
|
|
{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i |= (1 << 2);
|
|
|
+ asm volatile
|
|
|
+ (
|
|
|
+ "mrc p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ "orr r0, r0, #(1<<2) \n"
|
|
|
+ "mcr p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ :::"r0"
|
|
|
+ );
|
|
|
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
}
|
|
|
|
|
|
void mmu_disable_icache()
|
|
|
{
|
|
|
- register rt_uint32_t i;
|
|
|
+ asm volatile
|
|
|
+ (
|
|
|
+ "mrc p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ "bic r0, r0, #(1<<12) \n"
|
|
|
+ "mcr p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ :::"r0"
|
|
|
+ );
|
|
|
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i &= ~(1 << 12);
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
}
|
|
|
|
|
|
void mmu_disable_dcache()
|
|
|
{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
+ asm volatile
|
|
|
+ (
|
|
|
+ "mrc p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ "bic r0, r0, #(1<<2) \n"
|
|
|
+ "mcr p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ :::"r0"
|
|
|
+ );
|
|
|
|
|
|
- i &= ~(1 << 2);
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
}
|
|
|
|
|
|
void mmu_enable_alignfault()
|
|
|
{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
+ asm volatile
|
|
|
+ (
|
|
|
+ "mrc p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ "orr r0, r0, #1 \n"
|
|
|
+ "mcr p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ :::"r0"
|
|
|
+ );
|
|
|
|
|
|
- i |= (1 << 1);
|
|
|
-
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
}
|
|
|
|
|
|
void mmu_disable_alignfault()
|
|
|
{
|
|
|
- register rt_uint32_t i;
|
|
|
-
|
|
|
- /* read control register */
|
|
|
- asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
|
|
|
-
|
|
|
- i &= ~(1 << 1);
|
|
|
+ asm volatile
|
|
|
+ (
|
|
|
+ "mrc p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ "bic r0, r0, #1 \n"
|
|
|
+ "mcr p15, 0, r0, c1, c0, 0 \n"
|
|
|
+ :::"r0"
|
|
|
+ );
|
|
|
|
|
|
- /* write back to control register */
|
|
|
- asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
|
|
|
}
|
|
|
|
|
|
void mmu_clean_invalidated_cache_index(int index)
|
|
|
{
|
|
|
- asm ("mcr p15, 0, %0, c7, c14, 2": :"r" (index));
|
|
|
+ asm volatile ("mcr p15, 0, %0, c7, c14, 2": :"r" (index));
|
|
|
}
|
|
|
|
|
|
void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size)
|
|
@@ -569,7 +346,8 @@ void mmu_clean_invalidated_dcache(rt_uint32_t buffer, rt_uint32_t size)
|
|
|
|
|
|
while(ptr < buffer + size)
|
|
|
{
|
|
|
- asm ("mcr p15, 0, %0, c7, c14, 1": :"r" (ptr));
|
|
|
+ asm volatile ("mcr p15, 0, %0, c7, c14, 1": :"r" (ptr));
|
|
|
+
|
|
|
ptr += CACHE_LINE_SIZE;
|
|
|
}
|
|
|
}
|
|
@@ -583,7 +361,8 @@ void mmu_clean_dcache(rt_uint32_t buffer, rt_uint32_t size)
|
|
|
|
|
|
while (ptr < buffer + size)
|
|
|
{
|
|
|
- asm ("mcr p15, 0, %0, c7, c10, 1": :"r" (ptr));
|
|
|
+ asm volatile ("mcr p15, 0, %0, c7, c10, 1": :"r" (ptr));
|
|
|
+
|
|
|
ptr += CACHE_LINE_SIZE;
|
|
|
}
|
|
|
}
|
|
@@ -596,35 +375,40 @@ void mmu_invalidate_dcache(rt_uint32_t buffer, rt_uint32_t size)
|
|
|
|
|
|
while (ptr < buffer + size)
|
|
|
{
|
|
|
- asm ("mcr p15, 0, %0, c7, c6, 1": :"r" (ptr));
|
|
|
+ asm volatile ("mcr p15, 0, %0, c7, c6, 1": :"r" (ptr));
|
|
|
+
|
|
|
ptr += CACHE_LINE_SIZE;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
void mmu_invalidate_tlb()
|
|
|
{
|
|
|
- asm ("mcr p15, 0, %0, c8, c7, 0": :"r" (0));
|
|
|
+ asm volatile ("mcr p15, 0, %0, c8, c7, 0": :"r" (0));
|
|
|
+
|
|
|
}
|
|
|
|
|
|
void mmu_invalidate_icache()
|
|
|
{
|
|
|
- asm ("mcr p15, 0, %0, c7, c5, 0": :"r" (0));
|
|
|
+ asm volatile ("mcr p15, 0, %0, c7, c5, 0": :"r" (0));
|
|
|
+
|
|
|
}
|
|
|
|
|
|
void mmu_invalidate_dcache_all()
|
|
|
{
|
|
|
- asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (0));
|
|
|
+ asm volatile ("mcr p15, 0, %0, c7, c6, 0": :"r" (0));
|
|
|
+
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
/* level1 page table */
|
|
|
#if defined(__ICCARM__)
|
|
|
#pragma data_alignment=(16*1024)
|
|
|
-static volatile unsigned int _page_table[4*1024];;
|
|
|
+static volatile rt_uint32_t _page_table[4*1024];
|
|
|
#else
|
|
|
-static volatile unsigned int _page_table[4*1024] \
|
|
|
-__attribute__((aligned(16*1024)));
|
|
|
+static volatile rt_uint32_t _page_table[4*1024] \
|
|
|
+ __attribute__((aligned(16*1024)));
|
|
|
#endif
|
|
|
+
|
|
|
void mmu_setmtt(rt_uint32_t vaddrStart, rt_uint32_t vaddrEnd,
|
|
|
rt_uint32_t paddrStart, rt_uint32_t attr)
|
|
|
{
|