riscv: ax25: cache: Remove SPL_RISCV_MMODE config check
PATCH v2 1/1 riscv: ax25: cache: Remove SPL_RISCV_MMODE config check
CONFIG_IS_ENABLED(FOO) will check FOO config option for U-Boot, SPL and TPL, so remove unnecessary CONFIG_IS_ENABLED()
--- arch/riscv/cpu/ax25/cache.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/riscv/cpu/ax25/cache.c +8 -8
@@ -12,7 +12,7 @@#include <asm/csr.h> #ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE ) +#if CONFIG_IS_ENABLED (RISCV_MMODE )/* mcctlcommand */ #define CCTL_REG_MCCTLCOMMAND_NUM 0x7cc
@@ -47,7 +47,7 @@ void flush_dcache_all(void) {#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE ) +#if CONFIG_IS_ENABLED (RISCV_MMODE )csr_write (CCTL_REG_MCCTLCOMMAND_NUM ,CCTL_L1D_WBINVAL_ALL );#endif #endif
@@ -68,7 +68,7 @@ void icache_enable(void) {#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE ) +#if CONFIG_IS_ENABLED (RISCV_MMODE ) asmvolatile ("csrr t1, mcache_ctl\n\t" "ori t0, t1, 0x1\n\t"
@@ -83,7 +83,7 @@ void icache_disable(void) {#if !CONFIG_IS_ENABLED (SYS_ICACHE_OFF )#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE ) +#if CONFIG_IS_ENABLED (RISCV_MMODE ) asmvolatile ("fence.i\n\t" "csrr t1, mcache_ctl\n\t"
@@ -99,7 +99,7 @@ void dcache_enable(void) {#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE ) +#if CONFIG_IS_ENABLED (RISCV_MMODE ) asmvolatile ("csrr t1, mcache_ctl\n\t" "ori t0, t1, 0x2\n\t"
@@ -117,7 +117,7 @@ void dcache_disable(void) {#if !CONFIG_IS_ENABLED (SYS_DCACHE_OFF )#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE ) +#if CONFIG_IS_ENABLED (RISCV_MMODE )csr_write (CCTL_REG_MCCTLCOMMAND_NUM ,CCTL_L1D_WBINVAL_ALL ); asmvolatile ( "csrr t1, mcache_ctl\n\t"
@@ -137,7 +137,7 @@ int icache_status(void)int ret =0 ;#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE ) +#if CONFIG_IS_ENABLED (RISCV_MMODE ) asmvolatile ("csrr t1, mcache_ctl\n\t" "andi %0, t1, 0x01\n\t"
@@ -156,7 +156,7 @@ int dcache_status(void)int ret =0 ;#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE ) +#if CONFIG_IS_ENABLED (RISCV_MMODE ) asmvolatile ("csrr t1, mcache_ctl\n\t" "andi %0, t1, 0x02\n\t"
Signature · 1 line
2.17.1
PATCH v2 1/1 riscv: ax25: cache: Remove SPL_RISCV_MMODE config check
Any comments on this patch ?
Quoted 100 lines
-----Original Message-----
From: Pragnesh Patel <[email protected]>
Sent: 14 March 2020 19:13
To: u-boot at lists.denx.de
Cc: atish.patra at wdc.com; palmerdabbelt at google.com; bmeng.cn at gmail.com; Paul Walmsley <[email protected]>; rick at andestech.com; Pragnesh Patel <[email protected]>; Simon Glass <[email protected]>; Trevor Woerner <[email protected]>
Subject: [PATCH v2] riscv: ax25: cache: RemoveSPL_RISCV_MMODEconfig check
CONFIG_IS_ENABLED(FOO)will check FOO config option for U-Boot, SPL and TPL, so remove unnecessaryCONFIG_IS_ENABLED()Signed-off-by Pragnesh Patel <[email protected]>Reviewed-by Bin Meng <[email protected]>---
arch/riscv/cpu/ax25/cache.c| 16 ++++++++--------1 file changed, 8 insertions(+), 8 deletions(-)arch/riscv/cpu/ax25/cache.c index renamed from arch/riscv/cpu/ax25/cache.c +0
-0
9f424198b4..9df629d23c100644arch/riscv/cpu/ax25/cache.c +2
-2@@ -12,7 +12,7 @@#include <asm/csr.h> #ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) || CONFIG_IS_ENABLED(SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED (RISCV_MMODE )/* mcctlcommand */ #define CCTL_REG_MCCTLCOMMAND_NUM 0x7cc@@ -47,7 +47,7 @@ void flush_dcache_all(void) { #if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF)#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) || CONFIG_IS_ENABLED(SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED (RISCV_MMODE ) csr_write(CCTL_REG_MCCTLCOMMAND_NUM,
CCTL_L1D_WBINVAL_ALL); #endif #endif @@ -68,7 +68,7 @@ voidicache_enable(void){ #if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF) #ifdefCONFIG_RISCV_NDS_CACHE
-#ifCONFIG_IS_ENABLED(RISCV_MMODE)||CONFIG_IS_ENABLED(SPL_RISCV_MMODE)
+#ifCONFIG_IS_ENABLED(RISCV_MMODE)asm volatile ( "csrr t1, mcache_ctl\n\t" "ori t0, t1, 0x1\n\t"arch/riscv/cpu/ax25/cache.c +3
-3@@ -83,7 +83,7 @@ void icache_disable(void) { #if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF)#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) || CONFIG_IS_ENABLED(SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED (RISCV_MMODE ) asmvolatile ("fence.i\n\t" "csrr t1, mcache_ctl\n\t"@@ -99,7 +99,7 @@ void dcache_enable(void) { #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) || CONFIG_IS_ENABLED(SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED (RISCV_MMODE ) asmvolatile ("csrr t1, mcache_ctl\n\t" "ori t0, t1, 0x2\n\t"@@ -117,7 +117,7 @@ void dcache_disable(void) { #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) || CONFIG_IS_ENABLED(SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED (RISCV_MMODE )csr_write (CCTL_REG_MCCTLCOMMAND_NUM ,CCTL_L1D_WBINVAL_ALL ); asm volatile ("csrr t1, mcache_ctl\n\t"arch/riscv/cpu/ax25/cache.c +1
-1@@ -137,7 +137,7 @@ int icache_status(void)int ret =0 ;#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED(RISCV_MMODE) asmvolatile ( "csrr t1, mcache_ctl\n\t""andi %0, t1, 0x01\n\t"arch/riscv/cpu/ax25/cache.c +1
-1@@ -156,7 +156,7 @@ int dcache_status(void)int ret =0 ;#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED(RISCV_MMODE) asmvolatile ( "csrr t1, mcache_ctl\n\t""andi %0, t1, 0x02\n\t"--
2.17.1
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/1 riscv: ax25: cache: Remove SPL_RISCV_MMODE config check
Quoted 7 lines
From: Pragnesh Patel [mailto:pragnesh.patel at sifive.com]
Sent: Saturday, April 18, 2020 10:44 PM
To: u-boot at lists.denx.de; Rick Jian-Zhi Chen(???)
Cc: atish.patra at wdc.com; palmerdabbelt at google.com; bmeng.cn at gmail.com; Paul Walmsley; Simon Glass; Trevor Woerner
Subject: RE: [PATCH v2] riscv: ax25: cache: RemoveSPL_RISCV_MMODEconfig checkAny comments on this patch ?
Thanks for reviewing.
I will pull it later.
Thanks,
Rick
Quoted 101 lines
Quoted 101 lines
-----Original Message-----
From: Pragnesh Patel <[email protected]>
Sent: 14 March 2020 19:13
To: u-boot at lists.denx.de
Cc: atish.patra at wdc.com; palmerdabbelt at google.com; bmeng.cn at gmail.com; Paul Walmsley <[email protected]>; rick at andestech.com; Pragnesh Patel <[email protected]>; Simon Glass <[email protected]>; Trevor Woerner <[email protected]>
Subject: [PATCH v2] riscv: ax25: cache: RemoveSPL_RISCV_MMODEconfig check
CONFIG_IS_ENABLED(FOO)will check FOO config option for U-Boot, SPL and TPL, so remove unnecessaryCONFIG_IS_ENABLED()Signed-off-by Pragnesh Patel <[email protected]>Reviewed-by Bin Meng <[email protected]>---
arch/riscv/cpu/ax25/cache.c| 16 ++++++++--------1 file changed, 8 insertions(+), 8 deletions(-)arch/riscv/cpu/ax25/cache.c +2
-2@@ -12,7 +12,7 @@#include <asm/csr.h> #ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) || CONFIG_IS_ENABLED(SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED (RISCV_MMODE )/* mcctlcommand */ #define CCTL_REG_MCCTLCOMMAND_NUM 0x7cc@@ -47,7 +47,7 @@ void flush_dcache_all(void) { #if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF)#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) || CONFIG_IS_ENABLED(SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED (RISCV_MMODE ) csr_write(CCTL_REG_MCCTLCOMMAND_NUM,
CCTL_L1D_WBINVAL_ALL); #endif #endif @@ -68,7 +68,7 @@ voidicache_enable(void){ #if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF) #ifdefCONFIG_RISCV_NDS_CACHE
-#ifCONFIG_IS_ENABLED(RISCV_MMODE)||CONFIG_IS_ENABLED(SPL_RISCV_MMODE)arch/riscv/cpu/ax25/cache.c +4
-3+#if CONFIG_IS_ENABLED (RISCV_MMODE ) asmvolatile ("csrr t1, mcache_ctl\n\t" "ori t0, t1, 0x1\n\t"@@ -83,7 +83,7 @@ void icache_disable(void) { #if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF)#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) || CONFIG_IS_ENABLED(SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED (RISCV_MMODE ) asmvolatile ("fence.i\n\t" "csrr t1, mcache_ctl\n\t"@@ -99,7 +99,7 @@ void dcache_enable(void) { #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) || CONFIG_IS_ENABLED(SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED (RISCV_MMODE ) asmvolatile ("csrr t1, mcache_ctl\n\t" "ori t0, t1, 0x2\n\t"@@ -117,7 +117,7 @@ void dcache_disable(void) { #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) || CONFIG_IS_ENABLED(SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED (RISCV_MMODE )csr_write (CCTL_REG_MCCTLCOMMAND_NUM ,CCTL_L1D_WBINVAL_ALL ); asm volatile ("csrr t1, mcache_ctl\n\t"arch/riscv/cpu/ax25/cache.c +1
-1@@ -137,7 +137,7 @@ int icache_status(void)int ret =0 ;#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED(RISCV_MMODE) asmvolatile ( "csrr t1, mcache_ctl\n\t""andi %0, t1, 0x01\n\t"arch/riscv/cpu/ax25/cache.c +1
-1@@ -156,7 +156,7 @@ int dcache_status(void)int ret =0 ;#ifdef CONFIG_RISCV_NDS_CACHE -#if CONFIG_IS_ENABLED (RISCV_MMODE ) ||CONFIG_IS_ENABLED (SPL_RISCV_MMODE) +#if CONFIG_IS_ENABLED(RISCV_MMODE) asmvolatile ( "csrr t1, mcache_ctl\n\t""andi %0, t1, 0x02\n\t"--
2.17.1