Skip to contentSkip to conversation

riscv: ae350: Enable CCTL_SUEN

PATCH Superseded Rick Chen 3 participants 3 messages Dec 21, 2022 – Dec 22, 2022 RISC-V

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Rick Chen

author
#0 lore raw

PATCH 1/1 riscv: ae350: Enable CCTL_SUEN

CCTL operations are available to Supervisor/User-mode software under the control of the mcache_ctl.CCTL_SUEN control bit. Enable it to support Superviosr(and User) CCTL operations.

---
 arch/riscv/cpu/ax25/cpu.c | 4 ++++
 1 file changed, 4 insertions(+)
arch/riscv/cpu/ax25/cpu.c +4 -0
index c4c2de2ef0..fc3239e1ac 100644
@@ -17,11 +17,13 @@
 
 #define V5_MCACHE_CTL_IC_EN_OFFSET      0
 #define V5_MCACHE_CTL_DC_EN_OFFSET      1
+#define V5_MCACHE_CTL_CCTL_SUEN_OFFSET	8
 #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_CCTL_SUEN	BIT(V5_MCACHE_CTL_CCTL_SUEN_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)
 
@@ -55,6 +57,8 @@ void harts_early_init(void)
 			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;
+		if (!(mcache_ctl_val & V5_MCACHE_CTL_CCTL_SUEN))
+			mcache_ctl_val |= V5_MCACHE_CTL_CCTL_SUEN;
 		csr_write(CSR_MCACHE_CTL, mcache_ctl_val);
 
 		/*
Signature · 1 line
2.17.1
#1 lore raw
Quoted 4 lines · Rick Chen

CCTL operations are available to Supervisor/User-mode software under the control of the mcache_ctl.CCTL_SUEN control bit. Enable it to support Superviosr(and User)

typo: Supervisor

Quoted 12 lines

CCTL operations.

---
 arch/riscv/cpu/ax25/cpu.c | 4 ++++
 1 file changed, 4 insertions(+)
arch/riscv/cpu/ax25/cpu.c +0 -0
index c4c2de2ef0..fc3239e1ac 100644

arch/riscv/cpu/ax25/cpu.c line 20

Quoted 4 lines
arch/riscv/cpu/ax25/cpu.c +1 -0
@@ -17,11 +17,13 @@
 
 #define V5_MCACHE_CTL_IC_EN_OFFSET      0
 #define V5_MCACHE_CTL_DC_EN_OFFSET      1
+#define V5_MCACHE_CTL_CCTL_SUEN_OFFSET 8

nits: alignment seems wrong

arch/riscv/cpu/ax25/cpu.c line 26

Quoted 6 lines
arch/riscv/cpu/ax25/cpu.c +1 -0
 #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_CCTL_SUEN        BIT(V5_MCACHE_CTL_CCTL_SUEN_OFFSET)

nits: alignment seems wrong

arch/riscv/cpu/ax25/cpu.c void harts_early_init(void)

Quoted 13 lines
arch/riscv/cpu/ax25/cpu.c +2 -1
 #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)
 
@@ -55,6 +57,8 @@ void harts_early_init(void)
                        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;
+               if (!(mcache_ctl_val & V5_MCACHE_CTL_CCTL_SUEN))
+                       mcache_ctl_val |= V5_MCACHE_CTL_CCTL_SUEN;
                csr_write(CSR_MCACHE_CTL, mcache_ctl_val);
 
                /*
--

Regards,
Bin

#2 lore raw

Hi Bin

Quoted 7 lines · Rick Chen
Quoted 4 lines

CCTL operations are available to Supervisor/User-mode software under the control of the mcache_ctl.CCTL_SUEN control bit. Enable it to support Superviosr(and User)

typo: Supervisor

OK, will fix it.

Quoted 14 lines
Quoted 14 lines

CCTL operations.

---
 arch/riscv/cpu/ax25/cpu.c | 4 ++++
 1 file changed, 4 insertions(+)
arch/riscv/cpu/ax25/cpu.c +0 -0
index c4c2de2ef0..fc3239e1ac 100644
@@ -17,11 +17,13 @@
 
Quoted 5 lines

arch/riscv/cpu/ax25/cpu.c line 20

Quoted 3 lines
arch/riscv/cpu/ax25/cpu.c +1 -0
 #define V5_MCACHE_CTL_IC_EN_OFFSET      0
 #define V5_MCACHE_CTL_DC_EN_OFFSET      1
+#define V5_MCACHE_CTL_CCTL_SUEN_OFFSET 8

nits: alignment seems wrong

OK, will fix it.

Quoted 9 lines

arch/riscv/cpu/ax25/cpu.c line 26

Quoted 7 lines
arch/riscv/cpu/ax25/cpu.c +1 -0
 #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_CCTL_SUEN        BIT(V5_MCACHE_CTL_CCTL_SUEN_OFFSET)

nits: alignment seems wrong

OK, will fix it.

Thanks for review.

Rick

Quoted 17 lines
Quoted 5 lines
arch/riscv/cpu/ax25/cpu.c +0 -0
 #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)
 

arch/riscv/cpu/ax25/cpu.c void harts_early_init(void)

Quoted 9 lines
arch/riscv/cpu/ax25/cpu.c +2 -1
@@ -55,6 +57,8 @@ void harts_early_init(void)
                        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;
+               if (!(mcache_ctl_val & V5_MCACHE_CTL_CCTL_SUEN))
+                       mcache_ctl_val |= V5_MCACHE_CTL_CCTL_SUEN;
                csr_write(CSR_MCACHE_CTL, mcache_ctl_val);
 
                /*
--

Regards,
Bin