From 5ad331c2c1c321cdb6c88c6b48d99867eacbefd9 Mon Sep 17 00:00:00 2001 From: Yangyu Chen Date: Tue, 7 May 2024 02:54:40 +0000 Subject: [PATCH] riscv: dts: correct isa string for Spacemit K1 s and u for Supervisor and User Mode support in ISA string is not in the RISC-V ISA Spec. So we should remove it. And Spacemit X60 supports Zicond, which I tested by hand. So, we add this extension to be probed by software. Signed-off-by: Yangyu Chen --- arch/riscv/boot/dts/spacemit/k1-x.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/riscv/boot/dts/spacemit/k1-x.dtsi b/arch/riscv/boot/dts/spacemit/k1-x.dtsi index 9ed218328..18ff216bf 100644 --- a/arch/riscv/boot/dts/spacemit/k1-x.dtsi +++ b/arch/riscv/boot/dts/spacemit/k1-x.dtsi @@ -45,7 +45,7 @@ cpu_0: cpu@0 { model = "Spacemit(R) X60"; reg = <0>; status = "okay"; - riscv,isa = "rv64imafdcvsu_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; + riscv,isa = "rv64imafdcv_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zicond_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; riscv,cbom-block-size = <64>; i-cache-block-size = <64>; i-cache-size = <32768>; @@ -73,7 +73,7 @@ cpu_1: cpu@1 { status = "okay"; compatible = "riscv"; model = "Spacemit(R) X60"; - riscv,isa = "rv64imafdcvsu_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; + riscv,isa = "rv64imafdcv_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zicond_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; riscv,cbom-block-size = <64>; i-cache-block-size = <64>; i-cache-size = <32768>; @@ -101,7 +101,7 @@ cpu_2: cpu@2 { status = "okay"; compatible = "riscv"; model = "Spacemit(R) X60"; - riscv,isa = "rv64imafdcvsu_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; + riscv,isa = "rv64imafdcv_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zicond_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; riscv,cbom-block-size = <64>; i-cache-block-size = <64>; i-cache-size = <32768>; @@ -129,7 +129,7 @@ cpu_3: cpu@3 { status = "okay"; compatible = "riscv"; model = "Spacemit(R) X60"; - riscv,isa = "rv64imafdcvsu_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; + riscv,isa = "rv64imafdcv_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zicond_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; riscv,cbom-block-size = <64>; i-cache-block-size = <64>; i-cache-size = <32768>; @@ -157,7 +157,7 @@ cpu_4: cpu@4 { status = "okay"; compatible = "riscv"; model = "Spacemit(R) X60"; - riscv,isa = "rv64imafdcvsu_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; + riscv,isa = "rv64imafdcv_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zicond_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; riscv,cbom-block-size = <64>; i-cache-block-size = <64>; i-cache-size = <32768>; @@ -185,7 +185,7 @@ cpu_5: cpu@5 { status = "okay"; compatible = "riscv"; model = "Spacemit(R) X60"; - riscv,isa = "rv64imafdcvsu_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; + riscv,isa = "rv64imafdcv_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zicond_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; riscv,cbom-block-size = <64>; i-cache-block-size = <64>; i-cache-size = <32768>; @@ -213,7 +213,7 @@ cpu_6: cpu@6 { status = "okay"; compatible = "riscv"; model = "Spacemit(R) X60"; - riscv,isa = "rv64imafdcvsu_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; + riscv,isa = "rv64imafdcv_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zicond_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; riscv,cbom-block-size = <64>; i-cache-block-size = <64>; i-cache-size = <32768>; @@ -241,7 +241,7 @@ cpu_7: cpu@7 { status = "okay"; compatible = "riscv"; model = "Spacemit(R) X60"; - riscv,isa = "rv64imafdcvsu_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; + riscv,isa = "rv64imafdcv_zicsr_zifencei_zicbom_zicboz_zicbop_zihintpause_zicond_zba_zbb_zbc_zbs_svpbmt_sstc_sscofpmf"; riscv,cbom-block-size = <64>; i-cache-block-size = <64>; i-cache-size = <32768>; -- Gitee