commit 219a81b099f373542af62430903628fb8fe0a8c7
author Anton Blanchard <anton@linux.ibm.com> Thu Apr 28 21:01:02 2022 +1000
committer Anton Blanchard <anton@ozlabs.org> Fri Apr 29 09:14:37 2022 +1000
tree d86d3014f65e3c87b492582fa9c2084f94933e71
parent e0cd7cfc4123185b09646d195d42ed5c33c06ed4

Fix simplebus_minimal test

verilog/dv/microwatt/simplebus_minimal/microwatt.c

diff --git a/verilog/dv/microwatt/simplebus_minimal/microwatt.c b/verilog/dv/microwatt/simplebus_minimal/microwatt.c
index 44aee9e..71cfdc3 100644
--- a/verilog/dv/microwatt/simplebus_minimal/microwatt.c
+++ b/verilog/dv/microwatt/simplebus_minimal/microwatt.c
@@ -19,11 +19,13 @@
 	*p = 0xACEACEACEACEACEA;
 	__asm__ __volatile__("");
 
-	if (*q == 0x0102030405060708)
-		microwatt_success();
-	else
-		microwatt_failure();
+	if (*q == 0x0102030405060708) {
+		writel(0x00040000, GPIO_REG_DIR);
+		writel(0x00040000, GPIO_REG_OUT);
+	}
 
+	// We only have 1 spare pin to communicate status, so
+	// failure is represented by a timeout.
 	while (1)
 		/* Do Nothing */ ;
 }

verilog/dv/microwatt/simplebus_minimal/simplebus_minimal_tb.v

diff --git a/verilog/dv/microwatt/simplebus_minimal/simplebus_minimal_tb.v b/verilog/dv/microwatt/simplebus_minimal/simplebus_minimal_tb.v
index 2a98791..0e7b493 100644
--- a/verilog/dv/microwatt/simplebus_minimal/simplebus_minimal_tb.v
+++ b/verilog/dv/microwatt/simplebus_minimal/simplebus_minimal_tb.v
@@ -187,7 +187,7 @@
 
 	wire gpio;
 	wire [37:0] mprj_io;
-	wire [1:0] checkbits;
+	wire checkbit;
 	wire user_flash_csb;
 	wire user_flash_clk;
 	inout user_flash_io0;
@@ -208,7 +208,7 @@
 	assign user_flash_io0 = mprj_io[10];
 	assign mprj_io[11] = user_flash_io1;
 
-	assign checkbits = mprj_io[17:16];
+	assign checkbit = mprj_io[37];
 
 	assign mprj_io[3] = 1'b1;  // Force CSB high.
 
@@ -237,7 +237,10 @@
 
 		$display("Microwatt external bus minimal test");
 
-		repeat (1000000) begin
+		// We've only got 1 bit of status from the test case, and
+		// failure gets fed back as a timeout, so set this somewhat
+		// close to how long a successful run should take.
+		repeat (40000) begin
 			@(posedge clock);
 		end
 
@@ -249,7 +252,7 @@
 		RSTB <= 1'b0;
 		microwatt_reset <= 1'b1;
 		#2000;
-		// Would prefer to keep the management engine in reset
+		// Keep the management engine in reset
 		//RSTB <= 1'b1;
 		//#500;
 		microwatt_reset <= 1'b0;
@@ -273,18 +276,12 @@
 		power4 <= 1'b1;
 	end
 
-	//initial begin
-		//wait(checkbits == 2'h1);
-		//$display("Management engine started");
-
-		//wait(checkbits == 2'h2);
-		//$display("Microwatt alive!");
-
-		//// Wait for Microwatt to respond with success
-		//wait(checkbits == 2'h3);
-		//$display("Success!");
-		//$finish;
-	//end
+	initial begin
+		// Wait for Microwatt to respond with success
+		wait(checkbit == 1'h1);
+		$display("Success!");
+		$finish;
+	end
 
 	wire VDD3V3 = power1;
 	wire VDD1V8 = power2;