diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2017-07-13 13:10:00 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-23 02:22:50 (GMT) |
| commit | 1e7cefef585c972ed40e016ba8739f5c5091254b (patch) | |
| tree | e9323035b7cba5f696db3c99f2faae3a05749280 /arch/powerpc | |
| parent | 36d3260756ec6277acf474e1c407fdd9a104f9cb (diff) | |
| download | u-boot-fsl-qoriq-1e7cefef585c972ed40e016ba8739f5c5091254b.tar.xz | |
powerpc, 8xx: Move cache function into C files
Avoid unnecessary assembly functions when they can easily be written
in C.
Also remove dc_read() as it is nowhere referenced
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/Makefile | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/cache.c | 49 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/start.S | 56 |
3 files changed, 50 insertions, 56 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/Makefile b/arch/powerpc/cpu/mpc8xx/Makefile index b40bffb..40f3892 100644 --- a/arch/powerpc/cpu/mpc8xx/Makefile +++ b/arch/powerpc/cpu/mpc8xx/Makefile @@ -14,3 +14,4 @@ obj-$(CONFIG_CMD_IMMAP) += immap.o obj-y += interrupts.o obj-$(CONFIG_CMD_REGINFO) += reginfo.o obj-y += speed.o +obj-y += cache.o diff --git a/arch/powerpc/cpu/mpc8xx/cache.c b/arch/powerpc/cpu/mpc8xx/cache.c new file mode 100644 index 0000000..f8cd5f5 --- /dev/null +++ b/arch/powerpc/cpu/mpc8xx/cache.c @@ -0,0 +1,49 @@ +/* + * (C) Copyright 2017 + * Christophe Leroy, CS Systemes d'Information, christophe.leroy@c-s.fr + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/processor.h> +#include <asm/ppc.h> +#include <asm/io.h> +#include <asm/mmu.h> + +int icache_status(void) +{ + return !!(mfspr(IC_CST) & IDC_ENABLED); +} + +void icache_enable(void) +{ + sync(); + mtspr(IC_CST, IDC_INVALL); + mtspr(IC_CST, IDC_ENABLE); +} + +void icache_disable(void) +{ + sync(); + mtspr(IC_CST, IDC_DISABLE); +} + +int dcache_status(void) +{ + return !!(mfspr(IC_CST) & IDC_ENABLED); +} + +void dcache_enable(void) +{ + mtspr(MD_CTR, MD_RESETVAL); /* Set cache mode with MMU off */ + mtspr(DC_CST, IDC_INVALL); + mtspr(DC_CST, IDC_ENABLE); +} + +void dcache_disable(void) +{ + sync(); + mtspr(DC_CST, IDC_DISABLE); + mtspr(DC_CST, IDC_INVALL); +} diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S index b00696f..cd3b294 100644 --- a/arch/powerpc/cpu/mpc8xx/start.S +++ b/arch/powerpc/cpu/mpc8xx/start.S @@ -305,62 +305,6 @@ int_return: SYNC rfi -/* Cache functions. -*/ - .globl icache_enable -icache_enable: - SYNC - lis r3, IDC_INVALL@h - mtspr IC_CST, r3 - lis r3, IDC_ENABLE@h - mtspr IC_CST, r3 - blr - - .globl icache_disable -icache_disable: - SYNC - lis r3, IDC_DISABLE@h - mtspr IC_CST, r3 - blr - - .globl icache_status -icache_status: - mfspr r3, IC_CST - srwi r3, r3, 31 /* >>31 => select bit 0 */ - blr - - .globl dcache_enable -dcache_enable: - lis r3, 0x0400 /* Set cache mode with MMU off */ - mtspr MD_CTR, r3 - - lis r3, IDC_INVALL@h - mtspr DC_CST, r3 - lis r3, IDC_ENABLE@h - mtspr DC_CST, r3 - blr - - .globl dcache_disable -dcache_disable: - SYNC - lis r3, IDC_DISABLE@h - mtspr DC_CST, r3 - lis r3, IDC_INVALL@h - mtspr DC_CST, r3 - blr - - .globl dcache_status -dcache_status: - mfspr r3, DC_CST - srwi r3, r3, 31 /* >>31 => select bit 0 */ - blr - - .globl dc_read -dc_read: - mtspr DC_ADR, r3 - mfspr r3, DC_DAT - blr - /* * unsigned int get_immr (unsigned int mask) * |