riscv: cache: Implement i/dcache [status, enable, disable]
PATCH v2 1/1 riscv: cache: Implement i/dcache [status, enable, disable]
From: Rick Chen <[email protected]>
AndeStar RISC-V(V5) provide mcache_ctl register which can configure I/D cache as enabled or disabled.
This CSR will be encapsulated by CONFIG_RISCV_NDS. If you want to configure cache on AndeStar V5 AE350 platform. YOu can enable [*] AndeStar V5 ISA support by make menuconfig.
This approach also provide the expansion when the
vender specific features are going to join in.
--- arch/riscv/Kconfig | 8 ++++ arch/riscv/cpu/ax25/Makefile | 1 + arch/riscv/cpu/ax25/cache.c | 89 ++++++++++++++++++++++++++++++++++++++++++ arch/riscv/cpu/ax25/cpu.c | 4 ++ arch/riscv/cpu/qemu/cpu.c | 2 +- arch/riscv/cpu/start.S | 6 +++ arch/riscv/include/asm/cache.h | 9 +++++ arch/riscv/lib/cache.c | 30 +++++++++----- 8 files changed, 138 insertions(+), 11 deletions(-) create mode 100644 arch/riscv/cpu/ax25/cache.c
arch/riscv/Kconfig +8 -0
@@ -74,4 +74,12 @@ config 32BIT config 64BIT bool +config RISCV_NDS + bool "AndeStar V5 ISA support" + default n + help + Say Y here if you plan to run U-Boot on AndeStar v5 + platforms and use some specific features which are + provided by Andes Technology AndeStar V5 Families. + endmenu
arch/riscv/cpu/ax25/Makefile +1 -0
@@ -4,3 +4,4 @@ # Rick Chen, Andes Technology Corporation <[email protected]> obj-y := cpu.o +obj-y += cache.o
arch/riscv/cpu/ax25/cache.c new file +89 -0
89 lines not on this page · raw message
arch/riscv/cpu/ax25/cpu.c +4 -0
@@ -6,6 +6,7 @@/* CPU specific code */ #include <common.h> +#include <asm/cache.h> /* * cleanup_before_linux() is called just before we call linux
@@ -18,6 +19,9 @@ int cleanup_before_linux(void)disable_interrupts ();/* turn off I/D-cache */ +cache_flush (); +icache_disable (); +dcache_disable ();return 0 ; }
arch/riscv/cpu/qemu/cpu.c +1 -1
@@ -15,7 +15,7 @@ int cleanup_before_linux(void) {disable_interrupts (); -/* turn off I/D-cache */ +cache_flush ();return 0 ; }
arch/riscv/cpu/start.S +6 -0
@@ -46,6 +46,10 @@ _start: /* mask all interrupts */ csrw mie, zero +/* Enable cache */ +jal icache_enable +jal dcache_enable + /* * Set stackpointer in internal/ex RAM to call board_init_f */
@@ -181,6 +185,8 @@ clbss_l: * initialization, now running from RAM. */ call_board_init_r: + jal invalidate_icache_all + jal flush_dcache_all la t0, board_init_r mv t4, t0 /* offset of board_init_r() */ add t4, t4, t6 /* real address of board_init_r() */
arch/riscv/include/asm/cache.h +9 -0
@@ -7,6 +7,15 @@#ifndef _ASM_RISCV_CACHE_H#define _ASM_RISCV_CACHE_H +/* cache */ +int icache_status (void ); +void icache_enable (void ); +void icache_disable (void ); +int dcache_status (void ); +void dcache_enable (void ); +void dcache_disable (void ); +void cache_flush (void ); +/* * The current upper bound for RISCV L1 data cache line sizes is 32 bytes. * We use that value for aligning DMA buffers unless the board config has
arch/riscv/lib/cache.c +20 -10
@@ -6,6 +6,15 @@#include <common.h> +void invalidate_icache_all (void ) +{ + asmvolatile ("fence.i" :::"memory" ); +} + +void flush_dcache_all (void ) +{ + asmvolatile ("fence" :::"memory" ); +}void flush_dcache_range (unsigned long start,unsigned long end) { }
@@ -19,41 +28,42 @@ void invalidate_icache_range(unsigned long start, unsigned long end)invalidate_icache_all (); } -void invalidate_icache_all (void ) +void invalidate_dcache_range (unsigned long start,unsigned long end) { - asmvolatile ("fence.i" :::"memory" ); } -void invalidate_dcache_range (unsigned long start,unsigned long end) +void cache_flush (void ) { +invalidate_icache_all (); +flush_dcache_all (); } -void flush_cache (unsigned long addr,unsigned long size) +__weak void flush_cache (unsigned long addr,unsigned long size) { } -void icache_enable (void ) +__weak void icache_enable (void ) { } -void icache_disable (void ) +__weak void icache_disable (void ) { } -int icache_status (void ) +__weak int icache_status (void ) {return 0 ; } -void dcache_enable (void ) +__weak void dcache_enable (void ) { } -void dcache_disable (void ) +__weak void dcache_disable (void ) { } -int dcache_status (void ) +__weak int dcache_status (void ) {return 0 ; }
Signature · 1 line
2.7.4
Auer
PATCH v2 1/1 riscv: cache: Implement i/dcache [status, enable, disable]
Hi Rick,
Quoted 74 lines · Andes
From: Rick Chen <[email protected]>
AndeStar RISC-V(V5) provide
mcache_ctlregister which can configure I/D cache as enabled or disabled.This CSR will be encapsulated by
CONFIG_RISCV_NDS. If you want to configure cache on AndeStar V5 AE350 platform. YOu can enable [*] AndeStar V5 ISA support by make menuconfig.This approach also provide the expansion when the vender specific features are going to join in.
Signed-off-by Rick Chen <[email protected]>Cc Greentime Hu <[email protected]>--- arch/riscv/Kconfig | 8 ++++ arch/riscv/cpu/ax25/Makefile | 1 + arch/riscv/cpu/ax25/cache.c | 89 ++++++++++++++++++++++++++++++++++++++++++ arch/riscv/cpu/ax25/cpu.c | 4 ++ arch/riscv/cpu/qemu/cpu.c | 2 +- arch/riscv/cpu/start.S | 6 +++ arch/riscv/include/asm/cache.h | 9 +++++ arch/riscv/lib/cache.c | 30 +++++++++----- 8 files changed, 138 insertions(+), 11 deletions(-) create mode 100644 arch/riscv/cpu/ax25/cache.carch/riscv/Kconfig +8
-0@@ -74,4 +74,12 @@ config 32BIT config 64BIT bool +config RISCV_NDS + bool "AndeStar V5 ISA support" + default n + help + Say Y here if you plan to run U-Boot on AndeStar v5 + platforms and use some specific features which are + provided by Andes Technology AndeStar V5 Families. + endmenuarch/riscv/cpu/ax25/Makefile +1
-0@@ -4,3 +4,4 @@ # Rick Chen, Andes Technology Corporation <[email protected]> obj-y := cpu.o +obj-y += cache.oarch/riscv/cpu/ax25/cache.c new file +12
-0@@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2017 Andes Technology Corporation +* Rick Chen, Andes Technology Corporation <[email protected]> +*/ + +#include <common.h> + +void icache_enable (void ) +{ +#ifndef CONFIG_SYS_ICACHE_OFF +#ifdef CONFIG_RISCV_NDS
arch/riscv/cpu/ax25/cache.c line 22
Quoted 10 lines
arch/riscv/cpu/ax25/cache.c new file +10
-0+ asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"ori t0, t1, 0x1\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +#endif +} + +void icache_disable (void )
Just wondering, why do you not have the same #ifndef CONFIG_SYS_ICACHE_OFF as above here?
Quoted 80 lines
arch/riscv/cpu/ax25/cache.c new file +67
-0+{ +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi t0, t1, ~0x1\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +} + +void dcache_enable (void ) +{ +#ifndef CONFIG_SYS_ICACHE_OFF +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"ori t0, t1, 0x2\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +#endif +} + +void dcache_disable (void ) +{ +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi t0, t1, ~0x2\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +} + +int icache_status (void ) +{ +int ret =0 ; + +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi %0, t1, 0x01\n\t" + :"=r" (ret) + : + :"memory" + ); +#endif + +return ret; +} + +int dcache_status (void ) +{ +int ret =0 ; + +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi %0, t1, 0x02\n\t" + :"=r" (ret) + : + :"memory" + ); +#endif + +return ret; +}arch/riscv/cpu/ax25/cpu.c +1
-0@@ -6,6 +6,7 @@/* CPU specific code */ #include <common.h> +#include <asm/cache.h> /* * cleanup_before_linux() is called just before we call linux
arch/riscv/cpu/ax25/cpu.c int cleanup_before_linux(void) · line 24
Quoted 6 lines
arch/riscv/cpu/ax25/cpu.c +3
-0@@ -18,6 +19,9 @@ int cleanup_before_linux(void)disable_interrupts ();/* turn off I/D-cache */ +cache_flush (); +icache_disable (); +dcache_disable ();
This is a separate change from the one described in the commit message, please move this into a new patch.
I think we should do the same thing as ARM here. This is the implementation on armv8, for example. This sequence is chosen so that any new entries to the cache just before it is disabled get invalidated as well.
/*
* Turn off I-cache and invalidate it
*/icache_disable();invalidate_icache_all();
/*
* turn off D-cache
* dcache_disable() in turn flushes the d-cache and disables MMU */dcache_disable();invalidate_dcache_all();
Quoted 21 lines
arch/riscv/cpu/ax25/cpu.c +0
-0return 0 ; }arch/riscv/cpu/qemu/cpu.c +1
-1@@ -15,7 +15,7 @@ int cleanup_before_linux(void) {disable_interrupts (); -/* turn off I/D-cache */ +cache_flush ();return 0 ; }arch/riscv/cpu/start.S +0
-0
arch/riscv/cpu/start.S _start: · line 52
Quoted 7 lines
arch/riscv/cpu/start.S +4
-0@@ -46,6 +46,10 @@ _start: /* mask all interrupts */ csrw mie, zero +/* Enable cache */ +jal icache_enable +jal dcache_enable +
I think we should also define a enable_caches() function, like on ARM, to enable the caches. This works as well, but I think it makes sense to copy what other architectures do. What do you think?
arch/riscv/cpu/start.S clbss_l: · line 189
Quoted 9 lines
arch/riscv/cpu/start.S +2
-0/* * Set stackpointer in internal/ex RAM to call board_init_f */@@ -181,6 +185,8 @@ clbss_l: * initialization, now running from RAM. */ call_board_init_r: + jal invalidate_icache_all + jal flush_dcache_all
Is this required, perhaps this should be called from icache/dcache_enable?
Quoted 11 lines
arch/riscv/cpu/start.S +0
-0la t0, board_init_r mv t4, t0 /* offset of board_init_r() */add t4, t4, t6 /* real address of
board_init_r()*/arch/riscv/include/asm/cache.h +0
-0
arch/riscv/include/asm/cache.h line 16
Quoted 10 lines
arch/riscv/include/asm/cache.h +7
-0@@ -7,6 +7,15 @@#ifndef _ASM_RISCV_CACHE_H#define _ASM_RISCV_CACHE_H +/* cache */ +int icache_status (void ); +void icache_enable (void ); +void icache_disable (void ); +int dcache_status (void ); +void dcache_enable (void ); +void dcache_disable (void );
These are not required, include/common.h already has the function prototypes.
Quoted 13 lines
arch/riscv/include/asm/cache.h +2
-0+void cache_flush (void ); +/* * The current upper bound for RISCV L1 data cache line sizes is 32 bytes.
* We use that value for aligning DMA buffers unless the board
config hasarch/riscv/lib/cache.c +0
-0@@ -6,6 +6,15 @@
arch/riscv/lib/cache.c line 16
Quoted 10 lines
arch/riscv/lib/cache.c +8
-0#include <common.h> +void invalidate_icache_all (void ) +{ + asmvolatile ("fence.i" :::"memory" ); +} + +void flush_dcache_all (void ) +{ + asmvolatile ("fence" :::"memory" );
nit: there should be a space after "volatile" and ":::" to match the style from invalidate_icache_all :)
arch/riscv/lib/cache.c line 18
Quoted 2 lines
arch/riscv/lib/cache.c +1
-0+}void flush_dcache_range (unsigned long start,unsigned long end)
Can you also implement the flush_dcache_range and flush_cache functions? We might run into unexpected behavior if we don't flush the cache here.
Quoted 12 lines
arch/riscv/lib/cache.c +1
-2{ }@@ -19,41 +28,42 @@ void invalidate_icache_range(unsigned long start, unsigned long end)invalidate_icache_all (); } -void invalidate_icache_all (void ) +void invalidate_dcache_range (unsigned long start,unsigned long end) { - asmvolatile ("fence.i" :::"memory" ); }
arch/riscv/lib/cache.c void invalidate_icache_range(unsigned long start, · line 42
Quoted 10 lines
arch/riscv/lib/cache.c +4
-2-void invalidate_dcache_range (unsigned long start,unsigned long end) +void cache_flush (void ) { +invalidate_icache_all (); +flush_dcache_all (); } -void flush_cache (unsigned long addr,unsigned long size) +__weak void flush_cache (unsigned long addr,unsigned long size)
You are not overwriting this function, so it doesn't have to be defined as weak.
Thanks,
Lukas
Quoted 34 lines
arch/riscv/lib/cache.c +6
-6{ } -void icache_enable (void ) +__weak void icache_enable (void ) { } -void icache_disable (void ) +__weak void icache_disable (void ) { } -int icache_status (void ) +__weak int icache_status (void ) {return 0 ; } -void dcache_enable (void ) +__weak void dcache_enable (void ) { } -void dcache_disable (void ) +__weak void dcache_disable (void ) { } -int dcache_status (void ) +__weak int dcache_status (void ) {return 0 ;}
PATCH v2 1/1 riscv: cache: Implement i/dcache [status, enable, disable]
Auer, Lukas <[email protected]> 於 2018年11月4日 週日 下午10:21寫道:
Quoted 83 lines
Hi Rick,
Quoted 79 lines · Andes
From: Rick Chen <[email protected]>
AndeStar RISC-V(V5) provide
mcache_ctlregister which can configure I/D cache as enabled or disabled.This CSR will be encapsulated by
CONFIG_RISCV_NDS. If you want to configure cache on AndeStar V5 AE350 platform. YOu can enable [*] AndeStar V5 ISA support by make menuconfig.This approach also provide the expansion when the vender specific features are going to join in.
Signed-off-by Rick Chen <[email protected]>Cc Greentime Hu <[email protected]>--- arch/riscv/Kconfig | 8 ++++ arch/riscv/cpu/ax25/Makefile | 1 + arch/riscv/cpu/ax25/cache.c | 89 ++++++++++++++++++++++++++++++++++++++++++ arch/riscv/cpu/ax25/cpu.c | 4 ++ arch/riscv/cpu/qemu/cpu.c | 2 +- arch/riscv/cpu/start.S | 6 +++ arch/riscv/include/asm/cache.h | 9 +++++ arch/riscv/lib/cache.c | 30 +++++++++----- 8 files changed, 138 insertions(+), 11 deletions(-) create mode 100644 arch/riscv/cpu/ax25/cache.carch/riscv/Kconfig +8
-0@@ -74,4 +74,12 @@ config 32BIT config 64BIT bool +config RISCV_NDS + bool "AndeStar V5 ISA support" + default n + help + Say Y here if you plan to run U-Boot on AndeStar v5 + platforms and use some specific features which are + provided by Andes Technology AndeStar V5 Families. + endmenuarch/riscv/cpu/ax25/Makefile +1
-0@@ -4,3 +4,4 @@ # Rick Chen, Andes Technology Corporation <[email protected]> obj-y := cpu.o +obj-y += cache.oarch/riscv/cpu/ax25/cache.c new file +17
-0@@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2017 Andes Technology Corporation +* Rick Chen, Andes Technology Corporation <[email protected]> +*/ + +#include <common.h> + +void icache_enable (void ) +{ +#ifndef CONFIG_SYS_ICACHE_OFF +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"ori t0, t1, 0x1\n\t" +"csrw mcache_ctl, t0\n\t" + );
Quoted 9 lines
arch/riscv/cpu/ax25/cache.c line 22
Quoted 5 lines
arch/riscv/cpu/ax25/cache.c new file +5
-0+#endif +#endif +} + +void icache_disable (void )Just wondering, why do you not have the same #ifndef
CONFIG_SYS_ICACHE_OFFas above here?
I only add CONFIG_SYS_XXX_OFF in enable function, not in disable funtion. This can control cache enable or disable when u-boot start-up, on other reason. If you care about this, I can add CONFIG_SYS_XXX_OFF for all.
Quoted 90 lines
Quoted 80 lines
arch/riscv/cpu/ax25/cache.c new file +67
-0+{ +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi t0, t1, ~0x1\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +} + +void dcache_enable (void ) +{ +#ifndef CONFIG_SYS_ICACHE_OFF +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"ori t0, t1, 0x2\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +#endif +} + +void dcache_disable (void ) +{ +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi t0, t1, ~0x2\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +} + +int icache_status (void ) +{ +int ret =0 ; + +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi %0, t1, 0x01\n\t" + :"=r" (ret) + : + :"memory" + ); +#endif + +return ret; +} + +int dcache_status (void ) +{ +int ret =0 ; + +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi %0, t1, 0x02\n\t" + :"=r" (ret) + : + :"memory" + ); +#endif + +return ret; +}arch/riscv/cpu/ax25/cpu.c +1
-0@@ -6,6 +6,7 @@/* CPU specific code */ #include <common.h> +#include <asm/cache.h> /* * cleanup_before_linux() is called just before we call linux arch/riscv/cpu/ax25/cpu.c int cleanup_before_linux(void) · line 24
Quoted 6 lines
arch/riscv/cpu/ax25/cpu.c +3
-0@@ -18,6 +19,9 @@ int cleanup_before_linux(void)disable_interrupts ();/* turn off I/D-cache */ +cache_flush (); +icache_disable (); +dcache_disable ();This is a separate change from the one described in the commit message, please move this into a new patch.
Quoted 4 lines
I think we should do the same thing as ARM here. This is the implementation on armv8, for example. This sequence is chosen so that any new entries to the cache just before it is disabled get invalidated as well.
This is RISC-V not armv8./lib/cache.c is for RISC-V generic cache implement. /cpu/ax25/cache.c is for Andes RISC-V cache implement.
You can add a platform which is armv8 relative as below And modify the necessary flow as you want /cpu/armv8/cache.c
Quoted 38 lines
/*
* Turn off I-cache and invalidate it
*/icache_disable();invalidate_icache_all();/*
* turn off D-cache
*dcache_disable()in turn flushes the d-cache and disables MMU */dcache_disable();invalidate_dcache_all();Quoted 24 lines
arch/riscv/cpu/ax25/cpu.c +0
-0return 0 ; }arch/riscv/cpu/qemu/cpu.c +1
-1@@ -15,7 +15,7 @@ int cleanup_before_linux(void) {disable_interrupts (); -/* turn off I/D-cache */ +cache_flush ();return 0 ; }arch/riscv/cpu/start.S +0
-0@@ -46,6 +46,10 @@ _start: /* mask all interrupts */ csrw mie, zero
Quoted 9 lines
arch/riscv/cpu/start.S _start: · line 52
Quoted 4 lines
arch/riscv/cpu/start.S +4
-0+/* Enable cache */ +jal icache_enable +jal dcache_enable +I think we should also define a
enable_caches()function, like on ARM, to enable the caches. This works as well, but I think it makes sense to copy what other architectures do. What do you think?
Both coding style are exist in whole U-Boot
I can not find enable_caches be used in start.S But it can be found
bl dcache_enable
in arch\powerpc\cpu\mpc86xx\start.S
So I prefer to not modify this flow.
Unless it indeed affect your platform and cause some error.
And I modify it as jal icache_enable the coding flow. It is because you do not like CONFIG_SYS_ICACHE_OFF. It may let you make some mistakes.
So I move CONFIG_SYS_ICACHE_OFF in /cpi/ax25/cache.c
Quoted 4 lines
Quoted 4 lines
arch/riscv/cpu/start.S +0
-0/* * Set stackpointer in internal/ex RAM to call board_init_f */@@ -181,6 +185,8 @@ clbss_l:
Quoted 8 lines
arch/riscv/cpu/start.S clbss_l: · line 189
Quoted 5 lines
arch/riscv/cpu/start.S +2
-0* initialization, now running from RAM. */ call_board_init_r: + jal invalidate_icache_all + jal flush_dcache_allIs this required, perhaps this should be called from icache/dcache_enable?
Yes. It is required.
It can not be called to icache/dcache_enable
Cache shall be inval and flush after relocation.
Quoted 15 lines
Quoted 15 lines
arch/riscv/cpu/start.S +0
-0la t0, board_init_r mv t4, t0 /* offset of board_init_r() */add t4, t4, t6 /* real address of
board_init_r()*/arch/riscv/include/asm/cache.h +0
-0@@ -7,6 +7,15 @@#ifndef _ASM_RISCV_CACHE_H#define _ASM_RISCV_CACHE_H
Quoted 11 lines
arch/riscv/include/asm/cache.h line 16
Quoted 7 lines
arch/riscv/include/asm/cache.h +7
-0+/* cache */ +int icache_status (void ); +void icache_enable (void ); +void icache_disable (void ); +int dcache_status (void ); +void dcache_enable (void ); +void dcache_disable (void );These are not required,
include/common.halready has the function prototypes.
I will remove them from cache.h.
Quoted 15 lines
Quoted 15 lines
arch/riscv/include/asm/cache.h +2
-0+void cache_flush (void ); +/* * The current upper bound for RISCV L1 data cache line sizes is 32 bytes.
* We use that value for aligning DMA buffers unless the board
config hasarch/riscv/lib/cache.c +0
-0@@ -6,6 +6,15 @@#include <common.h>
Quoted 11 lines
arch/riscv/lib/cache.c line 16
Quoted 8 lines
arch/riscv/lib/cache.c +8
-0+void invalidate_icache_all (void ) +{ + asmvolatile ("fence.i" :::"memory" ); +} + +void flush_dcache_all (void ) +{ + asmvolatile ("fence" :::"memory" );nit: there should be a space after "volatile" and ":::" to match the style from
invalidate_icache_all:)
I will modify it.
Quoted 8 lines
arch/riscv/lib/cache.c line 18
Quoted 3 lines
arch/riscv/lib/cache.c +1
-0+}void flush_dcache_range (unsigned long start,unsigned long end)Can you also implement the
flush_dcache_rangeandflush_cachefunctions? We might run into unexpected behavior if we don't flush the cache here.
I do not modify it for the reason:
I separate one cache.c to/lib/cache.c
/cpu/ax25/cache.c
I plan /lib/cache.c will be maintained by you
That is why I do not implement this two function.
If you said that I will implement flush_dcache_range and flush_cache in V2
Quoted 20 lines
Quoted 20 lines
arch/riscv/lib/cache.c +4
-3{ }@@ -19,41 +28,42 @@ void invalidate_icache_range(unsigned long start, unsigned long end)invalidate_icache_all (); } -void invalidate_icache_all (void ) +void invalidate_dcache_range (unsigned long start,unsigned long end) { - asmvolatile ("fence.i" :::"memory" ); } -void invalidate_dcache_range (unsigned long start,unsigned long end) +void cache_flush (void ) { +invalidate_icache_all (); +flush_dcache_all (); }
Quoted 6 lines
arch/riscv/lib/cache.c void invalidate_icache_range(unsigned long start, unsigned long end) · line 41
Quoted 2 lines
arch/riscv/lib/cache.c +1
-1-void flush_cache (unsigned long addr,unsigned long size) +__weak void flush_cache (unsigned long addr,unsigned long size)You are not overwriting this function, so it doesn't have to be defined as weak.
Actually I will have aflush_cache(unsigned long addr, unsigned long size) in /cpu/ax25/cache.c in the future.
And I declare it as weak in /lib/cache.c
So next time when I send a patch/lib/cache.c can't be modified anymore.
Maybe it is not a good idea.
I will recovery it as not weak here in V2.
Quoted 37 lines
Thanks,
LukasQuoted 34 lines
arch/riscv/lib/cache.c +6
-6{ } -void icache_enable (void ) +__weak void icache_enable (void ) { } -void icache_disable (void ) +__weak void icache_disable (void ) { } -int icache_status (void ) +__weak int icache_status (void ) {return 0 ; } -void dcache_enable (void ) +__weak void dcache_enable (void ) { } -void dcache_disable (void ) +__weak void dcache_disable (void ) { } -int dcache_status (void ) +__weak int dcache_status (void ) {return 0 ;}
Auer
PATCH v2 1/1 riscv: cache: Implement i/dcache [status, enable, disable]
Hi Rick,
Quoted 95 lines · Rick Chen
Auer, Lukas <[email protected]> 於 2018年11月4日 週日 下午10:21寫道:
Quoted 83 lines
Hi Rick,
Quoted 79 lines · Andes
From: Rick Chen <[email protected]>
AndeStar RISC-V(V5) provide
mcache_ctlregister which can configure I/D cache as enabled or disabled.This CSR will be encapsulated by
CONFIG_RISCV_NDS. If you want to configure cache on AndeStar V5 AE350 platform. YOu can enable [*] AndeStar V5 ISA support by make menuconfig.This approach also provide the expansion when the vender specific features are going to join in.
Signed-off-by Rick Chen <[email protected]>Cc Greentime Hu <[email protected]>--- arch/riscv/Kconfig | 8 ++++ arch/riscv/cpu/ax25/Makefile | 1 + arch/riscv/cpu/ax25/cache.c | 89 ++++++++++++++++++++++++++++++++++++++++++ arch/riscv/cpu/ax25/cpu.c | 4 ++ arch/riscv/cpu/qemu/cpu.c | 2 +- arch/riscv/cpu/start.S | 6 +++ arch/riscv/include/asm/cache.h | 9 +++++ arch/riscv/lib/cache.c | 30 +++++++++----- 8 files changed, 138 insertions(+), 11 deletions(-) create mode 100644 arch/riscv/cpu/ax25/cache.carch/riscv/Kconfig +8
-0@@ -74,4 +74,12 @@ config 32BIT config 64BIT bool +config RISCV_NDS + bool "AndeStar V5 ISA support" + default n + help + Say Y here if you plan to run U-Boot on AndeStar v5 + platforms and use some specific features which are + provided by Andes Technology AndeStar V5 Families. + endmenuarch/riscv/cpu/ax25/Makefile +1
-0@@ -4,3 +4,4 @@ # Rick Chen, Andes Technology Corporation <[email protected]> obj-y := cpu.o +obj-y += cache.oarch/riscv/cpu/ax25/cache.c new file +17
-0@@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2017 Andes Technology Corporation +* Rick Chen, Andes Technology Corporation <[email protected]> +*/ + +#include <common.h> + +void icache_enable (void ) +{ +#ifndef CONFIG_SYS_ICACHE_OFF +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"ori t0, t1, 0x1\n\t" +"csrw mcache_ctl, t0\n\t" + );Quoted 9 lines
arch/riscv/cpu/ax25/cache.c line 22
Quoted 5 lines
arch/riscv/cpu/ax25/cache.c new file +5
-0+#endif +#endif +} + +void icache_disable (void )Just wondering, why do you not have the same #ifndef
CONFIG_SYS_ICACHE_OFFas above here?
Quoted 6 lines
I only add
CONFIG_SYS_XXX_OFFin enable function, not in disable funtion.
This can control cache enable or disable when u-boot start-up, on other reason.
If you care about this, I can addCONFIG_SYS_XXX_OFFfor all.
I was just wondering why, you can leave it as is.
Quoted 99 lines
Quoted 92 lines
Quoted 81 lines
arch/riscv/cpu/ax25/cache.c new file +67
-0+{ +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi t0, t1, ~0x1\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +} + +void dcache_enable (void ) +{ +#ifndef CONFIG_SYS_ICACHE_OFF +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"ori t0, t1, 0x2\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +#endif +} + +void dcache_disable (void ) +{ +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi t0, t1, ~0x2\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +} + +int icache_status (void ) +{ +int ret =0 ; + +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi %0, t1, 0x01\n\t" + :"=r" (ret) + : + :"memory" + ); +#endif + +return ret; +} + +int dcache_status (void ) +{ +int ret =0 ; + +#ifdef CONFIG_RISCV_NDS + asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"andi %0, t1, 0x02\n\t" + :"=r" (ret) + : + :"memory" + ); +#endif + +return ret; +}arch/riscv/cpu/ax25/cpu.c +1
-0@@ -6,6 +6,7 @@/* CPU specific code */ #include <common.h> +#include <asm/cache.h> /* * cleanup_before_linux() is called just before we call linux arch/riscv/cpu/ax25/cpu.c int cleanup_before_linux(void) · line 24
Quoted 6 lines
arch/riscv/cpu/ax25/cpu.c +3
-0@@ -18,6 +19,9 @@ int cleanup_before_linux(void)disable_interrupts ();/* turn off I/D-cache */ +cache_flush (); +icache_disable (); +dcache_disable ();This is a separate change from the one described in the commit message,
please move this into a new patch.Quoted 6 lines
I think we should do the same thing as ARM here. This is the implementation on armv8, for example. This sequence is chosen so that
any new entries to the cache just before it is disabled get invalidated
as well.
Quoted 8 lines
This is RISC-V not armv8.
/lib/cache.cis for RISC-V generic cache implement. /cpu/ax25/cache.c is for Andes RISC-V cache implement.You can add a platform which is armv8 relative as below And modify the necessary flow as you want /cpu/armv8/cache.c
Of course this is not armv8. I was referring to the sequence in which the cache is disabled, i.e. first disable, then invalidate. This might not be needed, but is nevertheless a good idea to ensure all entries in the cache are invalidated.
Quoted 51 lines
Quoted 39 lines
/*
* Turn off I-cache and invalidate it
*/icache_disable();invalidate_icache_all();/*
* turn off D-cache
*dcache_disable()in turn flushes the d-cache and disables MMU */dcache_disable();invalidate_dcache_all();Quoted 25 lines
arch/riscv/cpu/ax25/cpu.c +0
-0return 0 ; }arch/riscv/cpu/qemu/cpu.c +1
-1@@ -15,7 +15,7 @@ int cleanup_before_linux(void) {disable_interrupts (); -/* turn off I/D-cache */ +cache_flush ();return 0 ; }arch/riscv/cpu/start.S +0
-0@@ -46,6 +46,10 @@ _start: /* mask all interrupts */ csrw mie, zeroQuoted 11 lines
arch/riscv/cpu/start.S _start: · line 52
Quoted 4 lines
arch/riscv/cpu/start.S +4
-0+/* Enable cache */ +jal icache_enable +jal dcache_enable +I think we should also define a
enable_caches()function, like on ARM,
to enable the caches. This works as well, but I think it makes sense to
copy what other architectures do. What do you think?
Quoted 8 lines
Both coding style are exist in whole U-Boot
I can not findenable_cachesbe used instart.SBut it can be found
bldcache_enable
in arch\powerpc\cpu\mpc86xx\start.S
So I prefer to not modify this flow.
Unless it indeed affect your platform and cause some error.
enable_caches is, for example, defined in arch/arm/cpu/armv8/cache_v8.c. It is called by initr_caches() in board_init_r, this means the caches are only enabled once U-Boot has been relocated.
I prefer this way, because I think it is better if the caches are enabled in a file common to all platforms, which also initializes other parts of the system. Of course, this is my personal opinion, if you still prefer this way, you can leave it like this.
Quoted 5 lines
And I modify it as jal
icache_enablethe coding flow. It is because you do not likeCONFIG_SYS_ICACHE_OFF. It may let you make some mistakes.
So I moveCONFIG_SYS_ICACHE_OFFin /cpi/ax25/cache.c
I am completely fine with CONFIG_SYS_ICACHE_OFF, in fact, I think it should be used here :)
Quoted 14 lines
Quoted 13 lines
arch/riscv/cpu/start.S clbss_l: · line 189
Quoted 10 lines
arch/riscv/cpu/start.S +2
-0/* * Set stackpointer in internal/ex RAM to call board_init_f */@@ -181,6 +185,8 @@ clbss_l: * initialization, now running from RAM. */ call_board_init_r: + jal invalidate_icache_all + jal flush_dcache_allIs this required, perhaps this should be called from icache/dcache_enable?
Quoted 4 lines
Yes. It is required.
It can not be called to icache/dcache_enable
Cache shall be inval and flush after relocation.
Ah I see, yes that is definitely required. However, I think this should go into relocate_code of start.S, just so it's clear why the caches are cleared at this point.
Quoted 76 lines
Quoted 15 lines
Quoted 15 lines
arch/riscv/cpu/start.S +0
-0la t0, board_init_r mv t4, t0 /* offset of board_init_r() */add t4, t4, t6 /* real address of
board_init_r()*/arch/riscv/include/asm/cache.h +0
-0@@ -7,6 +7,15 @@#ifndef _ASM_RISCV_CACHE_H#define _ASM_RISCV_CACHE_HQuoted 11 lines
arch/riscv/include/asm/cache.h line 16
Quoted 7 lines
arch/riscv/include/asm/cache.h +7
-0+/* cache */ +int icache_status (void ); +void icache_enable (void ); +void icache_disable (void ); +int dcache_status (void ); +void dcache_enable (void ); +void dcache_disable (void );These are not required,
include/common.halready has the function prototypes.I will remove them from
cache.h.Quoted 16 lines
Quoted 16 lines
arch/riscv/include/asm/cache.h +2
-0+void cache_flush (void ); +/* * The current upper bound for RISCV L1 data cache line sizes is 32
bytes.
* We use that value for aligning DMA buffers unless the board
config hasarch/riscv/lib/cache.c +0
-0@@ -6,6 +6,15 @@#include <common.h> Quoted 12 lines
arch/riscv/lib/cache.c line 16
Quoted 8 lines
arch/riscv/lib/cache.c +8
-0+void invalidate_icache_all (void ) +{ + asmvolatile ("fence.i" :::"memory" ); +} + +void flush_dcache_all (void ) +{ + asmvolatile ("fence" :::"memory" );nit: there should be a space after "volatile" and ":::" to match the
style frominvalidate_icache_all:)I will modify it.
Quoted 9 lines
arch/riscv/lib/cache.c line 18
Quoted 3 lines
arch/riscv/lib/cache.c +1
-0+}void flush_dcache_range (unsigned long start,unsigned long end)Can you also implement the
flush_dcache_rangeandflush_cachefunctions? We might run into unexpected behavior if we don't flush the
cache here.I do not modify it for the reason:
I separate onecache.cto/lib/cache.c
/cpu/ax25/cache.c
Quoted 6 lines
I plan
/lib/cache.cwill be maintained by you
That is why I do not implement this two function.If you said that I will implement
flush_dcache_rangeandflush_cachein V2
Ok, I can send a patch to implement them.
Quoted 36 lines
Quoted 24 lines
Quoted 24 lines
arch/riscv/lib/cache.c +4
-3{ }@@ -19,41 +28,42 @@ void invalidate_icache_range(unsigned long start, unsigned long end)invalidate_icache_all (); } -void invalidate_icache_all (void ) +void invalidate_dcache_range (unsigned long start,unsigned long end) { - asmvolatile ("fence.i" :::"memory" ); } -void invalidate_dcache_range (unsigned long start,unsigned long end) +void cache_flush (void ) { +invalidate_icache_all (); +flush_dcache_all (); }Quoted 7 lines
arch/riscv/lib/cache.c void invalidate_icache_range(unsigned long start, unsigned long end) · line 41
Quoted 2 lines
arch/riscv/lib/cache.c +1
-1-void flush_cache (unsigned long addr,unsigned long size) +__weak void flush_cache (unsigned long addr,unsigned long size)You are not overwriting this function, so it doesn't have to be defined
as weak.Actually I will have a
flush_cache(unsigned long addr, unsigned long size)in /cpu/ax25/cache.c in the future.
Quoted 7 lines
And I declare it as weak in
/lib/cache.c
So next time when I send a patch/lib/cache.ccan't be modified anymore.Maybe it is not a good idea.
I will recovery it as not weak here in V2.
That makes sense, the weak doesn't break anything, so you can also leave it I think.
Thanks,
Lukas
PATCH v2 1/1 riscv: cache: Implement i/dcache [status, enable, disable]
In reply to AndesHi Rick,
Quoted 33 lines · Andes
From: Rick Chen <[email protected]>
AndeStar RISC-V(V5) provide
mcache_ctlregister which can configure I/D cache as enabled or disabled.This CSR will be encapsulated by
CONFIG_RISCV_NDS. If you want to configure cache on AndeStar V5 AE350 platform. YOu can enable [*] AndeStar V5 ISA support by make menuconfig.This approach also provide the expansion when the
vender specific features are going to join in.Signed-off-by Rick Chen <[email protected]>Cc Greentime Hu <[email protected]>--- arch/riscv/Kconfig | 8 ++++ arch/riscv/cpu/ax25/Makefile | 1 + arch/riscv/cpu/ax25/cache.c | 89 ++++++++++++++++++++++++++++++++++++++++++ arch/riscv/cpu/ax25/cpu.c | 4 ++ arch/riscv/cpu/qemu/cpu.c | 2 +- arch/riscv/cpu/start.S | 6 +++ arch/riscv/include/asm/cache.h | 9 +++++ arch/riscv/lib/cache.c | 30 +++++++++----- 8 files changed, 138 insertions(+), 11 deletions(-) create mode 100644 arch/riscv/cpu/ax25/cache.carch/riscv/Kconfig +0
-0
arch/riscv/Kconfig config 32BIT · line 77
Quoted 4 lines
arch/riscv/Kconfig +1
-0@@ -74,4 +74,12 @@ config 32BIT config 64BIT bool +config RISCV_NDS
This needs better be moved to arch/riscv/cpu/ax25/Kconfig. I have a patch to organize the Kconfig options in a hierarchy way @
http://git.denx.de/?p=u-boot/u-boot-x86.git;a=commitdiff;h=5a650689410482907a37f77b2a4257d81bb4daa2;hp=11f2be3a168230d6e3afddb75b1a63adb0c1b838
arch/riscv/Kconfig config 32BIT · line 79
Quoted 2 lines
arch/riscv/Kconfig +2
-0+ bool "AndeStar V5 ISA support" + default n
nits: default n is not needed.
If we move this to arch/riscv/cpu/ax25/Kconfig, this option can be selected by the board config.
Quoted 23 lines
arch/riscv/Kconfig +5
-0+ help + Say Y here if you plan to run U-Boot on AndeStar v5 + platforms and use some specific features which are + provided by Andes Technology AndeStar V5 Families. + endmenuarch/riscv/cpu/ax25/Makefile +1
-0@@ -4,3 +4,4 @@ # Rick Chen, Andes Technology Corporation <[email protected]> obj-y := cpu.o +obj-y += cache.oarch/riscv/cpu/ax25/cache.c new file +2
-0@@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
arch/riscv/cpu/ax25/cache.c line 12
Quoted 10 lines
arch/riscv/cpu/ax25/cache.c new file +10
-0+* Copyright (C) 2017 Andes Technology Corporation +* Rick Chen, Andes Technology Corporation <[email protected]> +*/ + +#include <common.h> + +void icache_enable (void ) +{ +#ifndef CONFIG_SYS_ICACHE_OFF +#ifdef CONFIG_RISCV_NDS
There is no need to #ifdef here.
arch/riscv/cpu/ax25/cache.c line 21
Quoted 9 lines
arch/riscv/cpu/ax25/cache.c new file +9
-0+ asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"ori t0, t1, 0x1\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +#endif +} +
[snip]
Regards,
Bin
PATCH v2 1/1 riscv: cache: Implement i/dcache [status, enable, disable]
Hi Bin
Bin Meng <[email protected]> 於 2018年11月4日 週日 下午10:31寫道:
Quoted 40 lines
Hi Rick,
Quoted 36 lines · Andes
From: Rick Chen <[email protected]>
AndeStar RISC-V(V5) provide
mcache_ctlregister which can configure I/D cache as enabled or disabled.This CSR will be encapsulated by
CONFIG_RISCV_NDS. If you want to configure cache on AndeStar V5 AE350 platform. YOu can enable [*] AndeStar V5 ISA support by make menuconfig.This approach also provide the expansion when the
vender specific features are going to join in.Signed-off-by Rick Chen <[email protected]>Cc Greentime Hu <[email protected]>--- arch/riscv/Kconfig | 8 ++++ arch/riscv/cpu/ax25/Makefile | 1 + arch/riscv/cpu/ax25/cache.c | 89 ++++++++++++++++++++++++++++++++++++++++++ arch/riscv/cpu/ax25/cpu.c | 4 ++ arch/riscv/cpu/qemu/cpu.c | 2 +- arch/riscv/cpu/start.S | 6 +++ arch/riscv/include/asm/cache.h | 9 +++++ arch/riscv/lib/cache.c | 30 +++++++++----- 8 files changed, 138 insertions(+), 11 deletions(-) create mode 100644 arch/riscv/cpu/ax25/cache.carch/riscv/Kconfig +0
-0@@ -74,4 +74,12 @@ config 32BIT config 64BIT bool
Quoted 4 lines
arch/riscv/Kconfig config 32BIT · line 77
Quoted 1 line
arch/riscv/Kconfig +1
-0+config RISCV_NDSThis needs better be moved to
arch/riscv/cpu/ax25/Kconfig. I have a patch to organize theKconfigoptions in a hierarchy way @
I will move this to arch/riscv/cpu/ax25/Kconfig
Quoted 6 lines
arch/riscv/Kconfig config 32BIT · line 79
Quoted 2 lines
arch/riscv/Kconfig +2
-0+ bool "AndeStar V5 ISA support" + default nnits: default n is not needed.
It may still needed.
Or it will fail in auto build with generic RISC-V toolchain. It do not recognize this mcache_ctl csr .
Quoted 54 lines
If we move this to
arch/riscv/cpu/ax25/Kconfig, this option can be selected by the board config.Quoted 23 lines
arch/riscv/Kconfig +5
-0+ help + Say Y here if you plan to run U-Boot on AndeStar v5 + platforms and use some specific features which are + provided by Andes Technology AndeStar V5 Families. + endmenuarch/riscv/cpu/ax25/Makefile +1
-0@@ -4,3 +4,4 @@ # Rick Chen, Andes Technology Corporation <[email protected]> obj-y := cpu.o +obj-y += cache.oarch/riscv/cpu/ax25/cache.c new file +2
-0@@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* arch/riscv/cpu/ax25/cache.c line 12
Quoted 10 lines
arch/riscv/cpu/ax25/cache.c new file +10
-0+* Copyright (C) 2017 Andes Technology Corporation +* Rick Chen, Andes Technology Corporation <[email protected]> +*/ + +#include <common.h> + +void icache_enable (void ) +{ +#ifndef CONFIG_SYS_ICACHE_OFF +#ifdef CONFIG_RISCV_NDS There is no need to #ifdef here.
arch/riscv/cpu/ax25/cache.c line 21
Quoted 9 lines
arch/riscv/cpu/ax25/cache.c new file +9
-0+ asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"ori t0, t1, 0x1\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +#endif +} +[snip]
Regards,
Bin
PATCH v2 1/1 riscv: cache: Implement i/dcache [status, enable, disable]
Hi Rick,
Quoted 53 lines · Rick Chen
Hi Bin
Bin Meng <[email protected]> 於 2018年11月4日 週日 下午10:31寫道:
Quoted 40 lines
Hi Rick,
Quoted 36 lines · Andes
From: Rick Chen <[email protected]>
AndeStar RISC-V(V5) provide
mcache_ctlregister which can configure I/D cache as enabled or disabled.This CSR will be encapsulated by
CONFIG_RISCV_NDS. If you want to configure cache on AndeStar V5 AE350 platform. YOu can enable [*] AndeStar V5 ISA support by make menuconfig.This approach also provide the expansion when the
vender specific features are going to join in.Signed-off-by Rick Chen <[email protected]>Cc Greentime Hu <[email protected]>--- arch/riscv/Kconfig | 8 ++++ arch/riscv/cpu/ax25/Makefile | 1 + arch/riscv/cpu/ax25/cache.c | 89 ++++++++++++++++++++++++++++++++++++++++++ arch/riscv/cpu/ax25/cpu.c | 4 ++ arch/riscv/cpu/qemu/cpu.c | 2 +- arch/riscv/cpu/start.S | 6 +++ arch/riscv/include/asm/cache.h | 9 +++++ arch/riscv/lib/cache.c | 30 +++++++++----- 8 files changed, 138 insertions(+), 11 deletions(-) create mode 100644 arch/riscv/cpu/ax25/cache.carch/riscv/Kconfig +0
-0@@ -74,4 +74,12 @@ config 32BIT config 64BIT boolQuoted 4 lines
arch/riscv/Kconfig config 32BIT · line 77
Quoted 1 line
arch/riscv/Kconfig +1
-0+config RISCV_NDSThis needs better be moved to
arch/riscv/cpu/ax25/Kconfig. I have a patch to organize theKconfigoptions in a hierarchy way @I will move this to
arch/riscv/cpu/ax25/Kconfig
Quoted 9 lines
Quoted 4 lines
arch/riscv/Kconfig config 32BIT · line 79
Quoted 2 lines
arch/riscv/Kconfig +2
-0+ bool "AndeStar V5 ISA support" + default nnits: default n is not needed.
It may still needed.
Or it will fail in auto build with generic RISC-V toolchain. It do not recognize thismcache_ctlcsr .
I mean from Kconfig language perspective, specifying 'default n', or omitting it, does not make any difference. So you need need explicitly write 'default n' here.
Quoted 40 lines
Quoted 40 lines
If we move this to
arch/riscv/cpu/ax25/Kconfig, this option can be selected by the board config.Quoted 23 lines
arch/riscv/Kconfig +5
-0+ help + Say Y here if you plan to run U-Boot on AndeStar v5 + platforms and use some specific features which are + provided by Andes Technology AndeStar V5 Families. + endmenuarch/riscv/cpu/ax25/Makefile +1
-0@@ -4,3 +4,4 @@ # Rick Chen, Andes Technology Corporation <[email protected]> obj-y := cpu.o +obj-y += cache.oarch/riscv/cpu/ax25/cache.c new file +2
-0@@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* arch/riscv/cpu/ax25/cache.c line 12
Quoted 10 lines
arch/riscv/cpu/ax25/cache.c new file +10
-0+* Copyright (C) 2017 Andes Technology Corporation +* Rick Chen, Andes Technology Corporation <[email protected]> +*/ + +#include <common.h> + +void icache_enable (void ) +{ +#ifndef CONFIG_SYS_ICACHE_OFF +#ifdef CONFIG_RISCV_NDS There is no need to #ifdef here.
Quoted 10 lines
Quoted 10 lines
arch/riscv/cpu/ax25/cache.c line 21
Quoted 9 lines
arch/riscv/cpu/ax25/cache.c new file +9
-0+ asmvolatile ( +"csrr t1, mcache_ctl\n\t" +"ori t0, t1, 0x1\n\t" +"csrw mcache_ctl, t0\n\t" + ); +#endif +#endif +} +
Regards,
Bin