mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-30 11:01:33 +00:00
ARMV7: OMAP3: Convert setup_auxcr() to pure asm
This function consists entirely of inline asm statements, so writing it directly in a .S file is simpler. Additionally, the inline asm is not safe as is, since registers are not guaranteed to be preserved between asm() statements. Signed-off-by: Mans Rullgard <mans@mansr.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
This commit is contained in:
parent
2984470746
commit
096ca838b5
2 changed files with 19 additions and 35 deletions
|
@ -119,41 +119,6 @@ void secureworld_exit()
|
||||||
__asm__ __volatile__("mcr p15, 0, %0, c1, c1, 0":"=r"(i));
|
__asm__ __volatile__("mcr p15, 0, %0, c1, c1, 0":"=r"(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
/******************************************************************************
|
|
||||||
* Routine: setup_auxcr()
|
|
||||||
* Description: Write to AuxCR desired value using SMI.
|
|
||||||
* general use.
|
|
||||||
*****************************************************************************/
|
|
||||||
void setup_auxcr()
|
|
||||||
{
|
|
||||||
unsigned long i;
|
|
||||||
volatile unsigned int j;
|
|
||||||
/* Save r0, r12 and restore them after usage */
|
|
||||||
__asm__ __volatile__("mov %0, r12":"=r"(j));
|
|
||||||
__asm__ __volatile__("mov %0, r0":"=r"(i));
|
|
||||||
|
|
||||||
/*
|
|
||||||
* GP Device ROM code API usage here
|
|
||||||
* r12 = AUXCR Write function and r0 value
|
|
||||||
*/
|
|
||||||
__asm__ __volatile__("mov r12, #0x3");
|
|
||||||
__asm__ __volatile__("mrc p15, 0, r0, c1, c0, 1");
|
|
||||||
/* Enabling ASA */
|
|
||||||
__asm__ __volatile__("orr r0, r0, #0x10");
|
|
||||||
/* Enable L1NEON */
|
|
||||||
__asm__ __volatile__("orr r0, r0, #1 << 5");
|
|
||||||
/* SMI instruction to call ROM Code API */
|
|
||||||
__asm__ __volatile__(".word 0xE1600070");
|
|
||||||
/* Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround) */
|
|
||||||
__asm__ __volatile__("mov r12, #0x2");
|
|
||||||
__asm__ __volatile__("mrc p15, 1, r0, c9, c0, 2");
|
|
||||||
__asm__ __volatile__("orr r0, r0, #1 << 27");
|
|
||||||
/* SMI instruction to call ROM Code API */
|
|
||||||
__asm__ __volatile__(".word 0xE1600070");
|
|
||||||
__asm__ __volatile__("mov r0, %0":"=r"(i));
|
|
||||||
__asm__ __volatile__("mov r12, %0":"=r"(j));
|
|
||||||
}
|
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Routine: try_unlock_sram()
|
* Routine: try_unlock_sram()
|
||||||
* Description: If chip is GP/EMU(special) type, unlock the SRAM for
|
* Description: If chip is GP/EMU(special) type, unlock the SRAM for
|
||||||
|
|
|
@ -43,6 +43,7 @@
|
||||||
.global invalidate_dcache
|
.global invalidate_dcache
|
||||||
.global l2_cache_enable
|
.global l2_cache_enable
|
||||||
.global l2_cache_disable
|
.global l2_cache_disable
|
||||||
|
.global setup_auxcr
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* invalidate_dcache()
|
* invalidate_dcache()
|
||||||
|
@ -156,3 +157,21 @@ l2_cache_disable:
|
||||||
mov r0, #0
|
mov r0, #0
|
||||||
b l2_cache_set
|
b l2_cache_set
|
||||||
|
|
||||||
|
/******************************************************************************
|
||||||
|
* Routine: setup_auxcr()
|
||||||
|
* Description: Write to AuxCR desired value using SMI.
|
||||||
|
* general use.
|
||||||
|
*****************************************************************************/
|
||||||
|
setup_auxcr:
|
||||||
|
mov r12, #0x3
|
||||||
|
mrc p15, 0, r0, c1, c0, 1
|
||||||
|
orr r0, r0, #0x10 @ Enable ASA
|
||||||
|
orr r0, r0, #1 << 5 @ Enable L1NEON
|
||||||
|
.word 0xE1600070 @ SMC
|
||||||
|
mov r12, #0x2
|
||||||
|
mrc p15, 1, r0, c9, c0, 2
|
||||||
|
@ Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround)
|
||||||
|
orr r0, r0, #1 << 27
|
||||||
|
.word 0xE1600070 @ SMC
|
||||||
|
bx lr
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue