mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 03:18:31 +00:00
[ARM] Feroceon: fix function alignment in proc-feroceon.S
One overzealous .align 10 fixed, and a few .align5 added. Signed-off-by: Nicolas Pitre <nico@marvell.com>
This commit is contained in:
parent
b46926bb2d
commit
6b29e681aa
1 changed files with 10 additions and 3 deletions
|
@ -93,7 +93,7 @@ ENTRY(cpu_feroceon_reset)
|
||||||
*
|
*
|
||||||
* Called with IRQs disabled
|
* Called with IRQs disabled
|
||||||
*/
|
*/
|
||||||
.align 10
|
.align 5
|
||||||
ENTRY(cpu_feroceon_do_idle)
|
ENTRY(cpu_feroceon_do_idle)
|
||||||
mov r0, #0
|
mov r0, #0
|
||||||
mcr p15, 0, r0, c7, c10, 4 @ Drain write buffer
|
mcr p15, 0, r0, c7, c10, 4 @ Drain write buffer
|
||||||
|
@ -106,6 +106,7 @@ ENTRY(cpu_feroceon_do_idle)
|
||||||
* Clean and invalidate all cache entries in a particular
|
* Clean and invalidate all cache entries in a particular
|
||||||
* address space.
|
* address space.
|
||||||
*/
|
*/
|
||||||
|
.align 5
|
||||||
ENTRY(feroceon_flush_user_cache_all)
|
ENTRY(feroceon_flush_user_cache_all)
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
|
|
||||||
|
@ -135,6 +136,7 @@ __flush_whole_cache:
|
||||||
* - end - end address (exclusive)
|
* - end - end address (exclusive)
|
||||||
* - flags - vm_flags describing address space
|
* - flags - vm_flags describing address space
|
||||||
*/
|
*/
|
||||||
|
.align 5
|
||||||
ENTRY(feroceon_flush_user_cache_range)
|
ENTRY(feroceon_flush_user_cache_range)
|
||||||
mov ip, #0
|
mov ip, #0
|
||||||
sub r3, r1, r0 @ calculate total size
|
sub r3, r1, r0 @ calculate total size
|
||||||
|
@ -163,6 +165,7 @@ ENTRY(feroceon_flush_user_cache_range)
|
||||||
* - start - virtual start address
|
* - start - virtual start address
|
||||||
* - end - virtual end address
|
* - end - virtual end address
|
||||||
*/
|
*/
|
||||||
|
.align 5
|
||||||
ENTRY(feroceon_coherent_kern_range)
|
ENTRY(feroceon_coherent_kern_range)
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
|
|
||||||
|
@ -194,6 +197,7 @@ ENTRY(feroceon_coherent_user_range)
|
||||||
*
|
*
|
||||||
* - addr - page aligned address
|
* - addr - page aligned address
|
||||||
*/
|
*/
|
||||||
|
.align 5
|
||||||
ENTRY(feroceon_flush_kern_dcache_page)
|
ENTRY(feroceon_flush_kern_dcache_page)
|
||||||
add r1, r0, #PAGE_SZ
|
add r1, r0, #PAGE_SZ
|
||||||
1: mcr p15, 0, r0, c7, c14, 1 @ clean+invalidate D entry
|
1: mcr p15, 0, r0, c7, c14, 1 @ clean+invalidate D entry
|
||||||
|
@ -218,6 +222,7 @@ ENTRY(feroceon_flush_kern_dcache_page)
|
||||||
*
|
*
|
||||||
* (same as v4wb)
|
* (same as v4wb)
|
||||||
*/
|
*/
|
||||||
|
.align 5
|
||||||
ENTRY(feroceon_dma_inv_range)
|
ENTRY(feroceon_dma_inv_range)
|
||||||
tst r0, #CACHE_DLINESIZE - 1
|
tst r0, #CACHE_DLINESIZE - 1
|
||||||
mcrne p15, 0, r0, c7, c10, 1 @ clean D entry
|
mcrne p15, 0, r0, c7, c10, 1 @ clean D entry
|
||||||
|
@ -241,6 +246,7 @@ ENTRY(feroceon_dma_inv_range)
|
||||||
*
|
*
|
||||||
* (same as v4wb)
|
* (same as v4wb)
|
||||||
*/
|
*/
|
||||||
|
.align 5
|
||||||
ENTRY(feroceon_dma_clean_range)
|
ENTRY(feroceon_dma_clean_range)
|
||||||
bic r0, r0, #CACHE_DLINESIZE - 1
|
bic r0, r0, #CACHE_DLINESIZE - 1
|
||||||
1: mcr p15, 0, r0, c7, c10, 1 @ clean D entry
|
1: mcr p15, 0, r0, c7, c10, 1 @ clean D entry
|
||||||
|
@ -258,10 +264,10 @@ ENTRY(feroceon_dma_clean_range)
|
||||||
* - start - virtual start address
|
* - start - virtual start address
|
||||||
* - end - virtual end address
|
* - end - virtual end address
|
||||||
*/
|
*/
|
||||||
|
.align 5
|
||||||
ENTRY(feroceon_dma_flush_range)
|
ENTRY(feroceon_dma_flush_range)
|
||||||
bic r0, r0, #CACHE_DLINESIZE - 1
|
bic r0, r0, #CACHE_DLINESIZE - 1
|
||||||
1:
|
1: mcr p15, 0, r0, c7, c14, 1 @ clean+invalidate D entry
|
||||||
mcr p15, 0, r0, c7, c14, 1 @ clean+invalidate D entry
|
|
||||||
add r0, r0, #CACHE_DLINESIZE
|
add r0, r0, #CACHE_DLINESIZE
|
||||||
cmp r0, r1
|
cmp r0, r1
|
||||||
blo 1b
|
blo 1b
|
||||||
|
@ -279,6 +285,7 @@ ENTRY(feroceon_cache_fns)
|
||||||
.long feroceon_dma_clean_range
|
.long feroceon_dma_clean_range
|
||||||
.long feroceon_dma_flush_range
|
.long feroceon_dma_flush_range
|
||||||
|
|
||||||
|
.align 5
|
||||||
ENTRY(cpu_feroceon_dcache_clean_area)
|
ENTRY(cpu_feroceon_dcache_clean_area)
|
||||||
1: mcr p15, 0, r0, c7, c10, 1 @ clean D entry
|
1: mcr p15, 0, r0, c7, c10, 1 @ clean D entry
|
||||||
add r0, r0, #CACHE_DLINESIZE
|
add r0, r0, #CACHE_DLINESIZE
|
||||||
|
|
Loading…
Reference in a new issue