qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: remove bogus cp_delay() function 

The cp_delay() function was introduced because of a missing 'volatile'
attribute to the 'asm' statement in get_cr() which led to the 'mrc'
instruction in get_cr() being optimised out eventually.
This has been fixed in commit 53fd4b8c22 ("arm: mmu: Add missing volatile for reading SCTLR register")
but the bogus cp_delay() function which was introduced as a workaround
for the malfunctioning get_cr() was never removed.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
This commit is contained in:
Lothar Waßmann 2017-06-08 09:48:41 +02:00 committed by Tom Rini
parent 1afcf9cb25
commit 53d4ed704b
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/lib/cache-cp15.c
View File

@ -22,16 +22,6 @@ __weak void arm_init_domains(void)
{ {
} }
static void cp_delay (void)
{
volatile int i;
/* copro seems to need some delay between reading and writing */
for (i = 0; i < 100; i++)
nop();
asm volatile("" : : : "memory");
}
void set_section_dcache(int section, enum dcache_option option) void set_section_dcache(int section, enum dcache_option option)
{ {
#ifdef CONFIG_ARMV7_LPAE #ifdef CONFIG_ARMV7_LPAE
@ -205,7 +195,6 @@ static inline void mmu_setup(void)
/* and enable the mmu */ /* and enable the mmu */
reg = get_cr(); /* get control reg. */ reg = get_cr(); /* get control reg. */
cp_delay();
set_cr(reg | CR_M); set_cr(reg | CR_M);
} }
@ -223,7 +212,6 @@ static void cache_enable(uint32_t cache_bit)
if ((cache_bit == CR_C) && !mmu_enabled()) if ((cache_bit == CR_C) && !mmu_enabled())
mmu_setup(); mmu_setup();
reg = get_cr(); /* get control reg. */ reg = get_cr(); /* get control reg. */
cp_delay();
set_cr(reg | cache_bit); set_cr(reg | cache_bit);
} }
@ -233,7 +221,6 @@ static void cache_disable(uint32_t cache_bit)
uint32_t reg; uint32_t reg;
reg = get_cr(); reg = get_cr();
cp_delay();
if (cache_bit == CR_C) { if (cache_bit == CR_C) {
/* if cache isn;t enabled no need to disable */ /* if cache isn;t enabled no need to disable */
@ -243,7 +230,7 @@ static void cache_disable(uint32_t cache_bit)
cache_bit |= CR_M; cache_bit |= CR_M;
} }
reg = get_cr(); reg = get_cr();
cp_delay();
if (cache_bit == (CR_C | CR_M)) if (cache_bit == (CR_C | CR_M))
flush_dcache_all(); flush_dcache_all();
set_cr(reg & ~cache_bit); set_cr(reg & ~cache_bit);