riscv: cpu: ax25: Simplify cache enabling logic in harts_early_init()
PATCH v2 1/1 riscv: cpu: ax25: Simplify cache enabling logic in harts_early_init()
This patch improves the cache enabling operation in harts_early_init(), also moves the CSR definition to include/asm/arch-andes/csr.h and drops unnecessary i/d-cache disable functions from cleanup_before_linux().
Signed-off-by Yu Chien Peter Lin <[email protected]>
Reviewed-by Leo Yu-Chi Liang <[email protected]>
---
Changes v1 -> v2
* Combine the raised bits of mcache_ctl (suggested by Leo [1])
* Improve the comment
[1] https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
--- arch/riscv/cpu/ax25/cpu.c | 45 +++++++------------------ arch/riscv/include/asm/arch-andes/csr.h | 29 ++++++++++++++++ 2 files changed, 41 insertions(+), 33 deletions(-) create mode 100644 arch/riscv/include/asm/arch-andes/csr.h
arch/riscv/cpu/ax25/cpu.c +12 -33
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright (C) 2017 Andes Technology Corporation +* Copyright (C) 2023 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <[email protected]> */
@@ -10,21 +10,7 @@#include <irq_func.h> #include <asm/cache.h> #include <asm/csr.h> - -#define CSR_MCACHE_CTL 0x7ca -#define CSR_MMISC_CTL 0x7d0 -#define CSR_MARCHID 0xf12 - -#define V5_MCACHE_CTL_IC_EN_OFFSET 0 -#define V5_MCACHE_CTL_DC_EN_OFFSET 1 -#define V5_MCACHE_CTL_DC_COHEN_OFFSET 19 -#define V5_MCACHE_CTL_DC_COHSTA_OFFSET 20 - -#define V5_MCACHE_CTL_IC_EN BIT(V5_MCACHE_CTL_IC_EN_OFFSET) -#define V5_MCACHE_CTL_DC_EN BIT(V5_MCACHE_CTL_DC_EN_OFFSET) -#define V5_MCACHE_CTL_DC_COHEN_EN BIT(V5_MCACHE_CTL_DC_COHEN_OFFSET) -#define V5_MCACHE_CTL_DC_COHSTA_EN BIT(V5_MCACHE_CTL_DC_COHSTA_OFFSET) - +#include <asm/arch-andes/csr.h> /* * cleanup_before_linux() is called just before we call linux
@@ -36,36 +22,29 @@ int cleanup_before_linux(void) {disable_interrupts (); -/* turn off I/D-cache */ cache_flush (); -icache_disable (); -dcache_disable ();return 0 ; }void harts_early_init (void ) { +/* Enable I/D-cache in SPL */ if (CONFIG_IS_ENABLED (RISCV_MMODE )) { -unsigned long long mcache_ctl_val =csr_read (CSR_MCACHE_CTL ); +unsigned long mcache_ctl_val =csr_read (CSR_MCACHE_CTL ); + + mcache_ctl_val |= (MCACHE_CTL_DC_COHEN |MCACHE_CTL_IC_EN | +MCACHE_CTL_DC_EN ); -if (!(mcache_ctl_val &V5_MCACHE_CTL_DC_COHEN_EN )) - mcache_ctl_val |=V5_MCACHE_CTL_DC_COHEN_EN ; -if (!(mcache_ctl_val &V5_MCACHE_CTL_IC_EN )) - mcache_ctl_val |=V5_MCACHE_CTL_IC_EN ; -if (!(mcache_ctl_val &V5_MCACHE_CTL_DC_EN )) - mcache_ctl_val |=V5_MCACHE_CTL_DC_EN ;csr_write (CSR_MCACHE_CTL , mcache_ctl_val);/* -* Check DC_COHEN_EN, if cannot write to mcache_ctl, -* we assume this bitmap not support L2 CM +* Check mcache_ctl.DC_COHEN, we assume this platform does +* not support CM if the bit is hard-wired 0. */ - mcache_ctl_val =csr_read (CSR_MCACHE_CTL ); -if ((mcache_ctl_val &V5_MCACHE_CTL_DC_COHEN_EN )) { -/* Wait for DC_COHSTA bit be set */ -while (!(mcache_ctl_val &V5_MCACHE_CTL_DC_COHSTA_EN )) - mcache_ctl_val =csr_read (CSR_MCACHE_CTL ); +if (csr_read (CSR_MCACHE_CTL ) &MCACHE_CTL_DC_COHEN ) { +/* Wait for DC_COHSTA bit to be set */ +while (!(csr_read (CSR_MCACHE_CTL ) &MCACHE_CTL_DC_COHSTA )); } } }
arch/riscv/include/asm/arch-andes/csr.h new file +29 -0
@@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2023 Andes Technology Corporation +*/ + +#ifndef _ASM_ANDES_CSR_H +#define _ASM_ANDES_CSR_H + +#include <asm/asm.h> +#include <linux/const.h> + +#define CSR_MCACHE_CTL 0x7ca +#define CSR_MMISC_CTL 0x7d0 +#define CSR_MARCHID 0xf12 +#define CSR_MCCTLCOMMAND 0x7cc + +#define MCACHE_CTL_IC_EN_OFFSET 0 +#define MCACHE_CTL_DC_EN_OFFSET 1 +#define MCACHE_CTL_DC_COHEN_OFFSET 19 +#define MCACHE_CTL_DC_COHSTA_OFFSET 20 + +#define MCACHE_CTL_IC_EN BIT(MCACHE_CTL_IC_EN_OFFSET) +#define MCACHE_CTL_DC_EN BIT(MCACHE_CTL_DC_EN_OFFSET) +#define MCACHE_CTL_DC_COHEN BIT(MCACHE_CTL_DC_COHEN_OFFSET) +#define MCACHE_CTL_DC_COHSTA BIT(MCACHE_CTL_DC_COHSTA_OFFSET) + +#define CCTL_L1D_WBINVAL_ALL 6 + +#endif /* _ASM_ANDES_CSR_H */
Signature · 1 line
2.34.1