dts:fix sbi dts

Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>

Author: QQxiaoming

.github/workflows/main_ci.yml

@@ -167,7 +167,7 @@ jobs:
       - name: Install prerequisites
         run: |
           brew install libffi gettext glib pkg-config autoconf automake pixman ninja
-          
+
       - name: Build all
         run: |
           ./build.sh qemu_macos

dts/quard_star.dtsi

@@ -169,7 +169,9 @@
 				core6 {
 					cpu = <&cpu6>;
 				};
+			};
 
+			cluster1 {
 				core7 {
 					cpu = <&cpu7>;
 				};

dts/quard_star_sbi.dts

@@ -12,6 +12,30 @@
 		opensbi-domains {
 		    compatible = "opensbi,domain,config";
 
+            tmem0: tmem0 {
+                compatible = "opensbi,domain,memregion";
+                base = <0x0 0xBF800000>;
+                order = <22>;
+            };
+
+            tmem1: tmem1 {
+                compatible = "opensbi,domain,memregion";
+                base = <0x0 0xBFC00000>;
+                order = <21>;
+            };
+
+            tmem2: tmem2 {
+                compatible = "opensbi,domain,memregion";
+                base = <0x0 0xBFE00000>;
+                order = <20>;
+            };
+
+            tmem3: tmem3 {
+                compatible = "opensbi,domain,memregion";
+                base = <0x0 0xBFF00000>;
+                order = <19>;
+            };
+
             tuart: tuart {
                 compatible = "opensbi,domain,memregion";
                 base = <0x0 0x10002000>;
@@ -29,7 +53,7 @@
             tdomain: trusted-domain {
                 compatible = "opensbi,domain,instance";
                 possible-harts = <&cpu7>;
-                regions = <&tuart 0x7>, <&allmem 0x7>;
+                regions = <&tmem0 0x7>, <&tmem1 0x7>, <&tmem2 0x7>, <&tmem3 0x7>, <&tuart 0x7>, <&allmem 0x7>;
                 boot-hart = <&cpu7>;
                 next-arg1 = <0x0 0x00000000>;
 		        next-addr = <0x0 0xBF800000>;
@@ -40,7 +64,7 @@
 		    udomain: untrusted-domain {
 		        compatible = "opensbi,domain,instance";
 		        possible-harts = <&cpu0 &cpu1 &cpu2 &cpu3 &cpu4 &cpu5 &cpu6>;
-		        regions = <&tuart 0x0>, <&allmem 0x7>;
+		        regions = <&tmem0 0x0>, <&tmem1 0x0>, <&tmem2 0x0>, <&tmem3 0x0>, <&tuart 0x0>, <&allmem 0x7>;
 				boot-hart = <&cpu0>;
 		        next-arg1 = <0x0 0xB0000000>;
 		        next-addr = <0x0 0xB0200000>;
@@ -119,4 +143,3 @@
 &test {
 	status = "okay";
 };
-		

qemu-7.0.0/hw/riscv/quard_star.c

@@ -31,6 +31,8 @@
 #include "hw/riscv/boot.h"
 #include "hw/riscv/numa.h"
 #include "hw/intc/riscv_aclint.h"
+#include "hw/intc/riscv_aplic.h"
+#include "hw/intc/riscv_imsic.h"
 #include "hw/intc/sifive_plic.h"
 #include "hw/misc/quard_star_syscon.h"
 #include "hw/audio/wm8750.h"
@@ -42,7 +44,7 @@ static const MemMapEntry quard_star_memmap[] = {
     [QUARD_STAR_MROM]        = { 0x00000000,   0x20000 },
     [QUARD_STAR_SRAM]        = { 0x00020000,   0xe0000 },
 
-    [QUARD_STAR_TEST]        = { 0x00100000,    0x1000 },
+    [QUARD_STAR_SYSCTL]      = { 0x00100000,    0x1000 },
     [QUARD_STAR_CLINT]       = { 0x02000000,   0x10000 },
     [QUARD_STAR_PLIC]        = { 0x0c000000, 0x4000000 },
 
@@ -256,7 +258,7 @@ static void quard_star_serial_create(MachineState *machine)
 
 static void quard_star_system_control_create(MachineState *machine)
 {    
-    quard_star_syscon_create(quard_star_memmap[QUARD_STAR_TEST].base);
+    quard_star_syscon_create(quard_star_memmap[QUARD_STAR_SYSCTL].base);
 }
 
 static void quard_star_rtc_create(MachineState *machine)

qemu-7.0.0/include/hw/riscv/quard_star.h

@@ -85,7 +85,7 @@ enum {
     QUARD_STAR_GPIO,
     QUARD_STAR_SDIO,
     QUARD_STAR_I2S,
-    QUARD_STAR_TEST,
+    QUARD_STAR_SYSCTL,
     QUARD_STAR_VIRTIO0,
     QUARD_STAR_VIRTIO1,
     QUARD_STAR_VIRTIO2,