Merge pull request sifive#621 from sifive/dev/zongl/unmatched_timebase

paul-walmsley-sifive · web-flow · commit 5194114c55a8 · 2021-10-07T14:28:36.000-07:00
[ESAT-425] FESDK-public: Change timebase-frequency for Unmatched to 1.2GHz
diff --git a/bsp/sifive-hifive-unmatched/core.dts b/bsp/sifive-hifive-unmatched/core.dts
@@ -12,7 +12,7 @@
 	L72: cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
-		timebase-frequency = <1000000>;
+		timebase-frequency = <1196000000>;
 		L12: cpu@0 {
 			clock-frequency = <0>;
 			compatible = "sifive,bullet0", "riscv";
@@ -29,7 +29,6 @@
 			sifive,buserror = <&L11>;
 			sifive,dtim = <&L10>;
 			status = "okay";
-			timebase-frequency = <1000000>;
 			L8: interrupt-controller {
 				#interrupt-cells = <1>;
 				compatible = "riscv,cpu-intc";
@@ -59,7 +58,6 @@
 			riscv,pmpregions = <8>;
 			sifive,buserror = <&L15>;
 			status = "okay";
-			timebase-frequency = <1000000>;
 			tlb-split;
 			L13: interrupt-controller {
 				#interrupt-cells = <1>;
@@ -90,7 +88,6 @@
 			riscv,pmpregions = <8>;
 			sifive,buserror = <&L19>;
 			status = "okay";
-			timebase-frequency = <1000000>;
 			tlb-split;
 			L17: interrupt-controller {
 				#interrupt-cells = <1>;
@@ -121,7 +118,6 @@
 			riscv,pmpregions = <8>;
 			sifive,buserror = <&L23>;
 			status = "okay";
-			timebase-frequency = <1000000>;
 			tlb-split;
 			L21: interrupt-controller {
 				#interrupt-cells = <1>;
@@ -152,7 +148,6 @@
 			riscv,pmpregions = <8>;
 			sifive,buserror = <&L27>;
 			status = "okay";
-			timebase-frequency = <1000000>;
 			tlb-split;
 			L25: interrupt-controller {
 				#interrupt-cells = <1>;
diff --git a/bsp/sifive-hifive-unmatched/metal.h b/bsp/sifive-hifive-unmatched/metal.h
@@ -384,19 +384,19 @@ static __inline__ int __metal_driver_cpu_hartid(struct metal_cpu *cpu)
 static __inline__ int __metal_driver_cpu_timebase(struct metal_cpu *cpu)
 {
 	if ((uintptr_t)cpu == (uintptr_t)&__metal_dt_cpu_0) {
-		return 1000000;
+		return 1196000000;
 	}
 	else if ((uintptr_t)cpu == (uintptr_t)&__metal_dt_cpu_1) {
-		return 1000000;
+		return 1196000000;
 	}
 	else if ((uintptr_t)cpu == (uintptr_t)&__metal_dt_cpu_2) {
-		return 1000000;
+		return 1196000000;
 	}
 	else if ((uintptr_t)cpu == (uintptr_t)&__metal_dt_cpu_3) {
-		return 1000000;
+		return 1196000000;
 	}
 	else if ((uintptr_t)cpu == (uintptr_t)&__metal_dt_cpu_4) {
-		return 1000000;
+		return 1196000000;
 	}
 	else {
 		return 0;
diff --git a/bsp/sifive-hifive-unmatched/settings.mk b/bsp/sifive-hifive-unmatched/settings.mk
@@ -8,6 +8,6 @@ RISCV_SERIES = sifive-7-series
 
 TARGET_TAGS = board openocd
 TARGET_DHRY_ITERS = 20000000
-TARGET_CORE_ITERS = 5000
+TARGET_CORE_ITERS = 110000
 TARGET_FREERTOS_WAIT_MS = 1000
 TARGET_INTR_WAIT_CYCLE  = 0
diff --git a/scripts/esdk-settings-generator b/scripts/esdk-settings-generator
@@ -1 +1 @@
-Subproject commit 168014cce6ad07aa2c42f2592ce534970a38dcee
+Subproject commit 823f838b468edb0ef720427a73f9b30eb864ff6a

Original file line number	Diff line number	Diff line change
`@@ -384,19 +384,19 @@ static __inline__ int __metal_driver_cpu_hartid(struct metal_cpu *cpu)`
`384`	`384`	`static __inline__ int __metal_driver_cpu_timebase(struct metal_cpu *cpu)`
`385`	`385`	`{`
`386`	`386`	`if ((uintptr_t)cpu == (uintptr_t)&__metal_dt_cpu_0) {`
`387`		`- return 1000000;`
	`387`	`+ return 1196000000;`
`388`	`388`	`}`
`389`	`389`	`else if ((uintptr_t)cpu == (uintptr_t)&__metal_dt_cpu_1) {`
`390`		`- return 1000000;`
	`390`	`+ return 1196000000;`
`391`	`391`	`}`
`392`	`392`	`else if ((uintptr_t)cpu == (uintptr_t)&__metal_dt_cpu_2) {`
`393`		`- return 1000000;`
	`393`	`+ return 1196000000;`
`394`	`394`	`}`
`395`	`395`	`else if ((uintptr_t)cpu == (uintptr_t)&__metal_dt_cpu_3) {`
`396`		`- return 1000000;`
	`396`	`+ return 1196000000;`
`397`	`397`	`}`
`398`	`398`	`else if ((uintptr_t)cpu == (uintptr_t)&__metal_dt_cpu_4) {`
`399`		`- return 1000000;`
	`399`	`+ return 1196000000;`
`400`	`400`	`}`
`401`	`401`	`else {`
`402`	`402`	`return 0;`