TEST: Read 50 byte from sd card and write to terminal

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "rocket-chip"]
 	path = rocket-chip
-	url = https://github.com/ucb-bar/rocket-chip.git
+	url = https://git.tiband.de/riscv/rocket-chip.git
 [submodule "sifive-blocks"]
 	path = sifive-blocks
-	url = https://github.com/sifive/sifive-blocks.git
+	url = https://git.tiband.de/riscv/sifive-blocks.git
 [submodule "fpga-shells"]
 	path = fpga-shells
 	url = https://git.tiband.de/riscv/fpga-shells.git

bootrom/sdboot/head.S

@@ -8,7 +8,7 @@
   .globl _prog_start
 _prog_start:
   smp_pause(s1, s2)
-  li sp, (PAYLOAD_DEST + 0x7fff000)
+  li sp, (PAYLOAD_DEST + 0xffff000)
   call main
   smp_resume(s1, s2)
   csrr a0, mhartid

bootrom/sdboot/kprintf.h

@@ -20,7 +20,8 @@ static volatile uint32_t * const uart = (void *)(UART_CTRL_ADDR);
 
 static inline void kputc(char c)
 {
-	volatile uint32_t *tx = &REG32(uart, UART_REG_TXFIFO);
+	//volatile uint32_t *tx = &REG32(uart, UART_REG_TXFIFO);
+	volatile uint32_t *tx = (void *) 0x64003000; // Terminal (32 bit)
 #ifdef __riscv_atomic
 	int32_t r;
 	do {

bootrom/sdboot/sd.c

@@ -12,7 +12,7 @@
 
 #define PAYLOAD_SIZE	(16 << 11)
 
-#define F_CLK 50000000UL
+#define F_CLK 60000000UL
 
 static volatile uint32_t * const spi = (void *)(SPI_CTRL_ADDR);
 
@@ -160,7 +160,8 @@ static int copy(void)
 	int rc = 0;
 
 	dputs("CMD18");
-	kprintf("LOADING  ");
+	//~ kprintf("LOADING  ");
+	kprintf("READ: ");
 
 	REG32(spi, SPI_REG_SCKDIV) = (F_CLK / 20000000UL);
 	if (sd_cmd(0x52, 0, 0xE1) != 0x00) {
@@ -172,14 +173,18 @@ static int copy(void)
 		long n;
 
 		crc = 0;
-		n = 512;
+		//~ n = 512;
+		n = 50;
 		while (sd_dummy() != 0xFE);
 		do {
 			uint8_t x = sd_dummy();
-			*p++ = x;
+			kputc(x);
-			crc = crc16_round(crc, x);
+			//~ *p++ = x;
+			//~ crc = crc16_round(crc, x);
 		} while (--n > 0);
 
+		return 0;
+
 		crc_exp = ((uint16_t)sd_dummy() << 8);
 		crc_exp |= sd_dummy();
 
@@ -202,10 +207,60 @@ static int copy(void)
 	return rc;
 }
 
+// leave room for 2 MiB stack (SP = 8FFFF000)
+#define RAMTEST_START (uint32_t*)(0x80000000)
+#define RAMTEST_END   (uint32_t*)(0x8FDFF000)
+
 int main(void)
 {
-	REG32(uart, UART_REG_TXCTRL) = UART_TXEN;
+	//REG32(uart, UART_REG_TXCTRL) = UART_TXEN;
 
+	//GPIO_REG(GPIO_INPUT_EN) = 0xFF;
+	GPIO_REG(GPIO_OUTPUT_EN) = 0xFF;
+	GPIO_REG(GPIO_OUTPUT_VAL) = 0xFF;
+
+	kprintf("\nFilling RAM from %lx to %lx...\n", RAMTEST_START, RAMTEST_END);
+
+	uint32_t counter = 0;
+	for(uint32_t* ram = RAMTEST_START; ram < RAMTEST_END; ++ram) {
+		*ram = counter++;
+	}
+
+	kprintf("\rChecking RAM...\n");
+
+	counter = 0;
+	uint32_t correct = 0;
+	uint32_t wrong = 0;
+	for(uint32_t* ram = RAMTEST_START; ram < RAMTEST_END; ++ram) {
+		if(*ram != counter) {
+			kprintf("\rMismatch at %lx: read %x, expected %x\n", ram, *ram, counter);
+			++wrong;
+		} else {
+			++correct;
+		}
+		++counter;
+	}
+	kprintf("\rSummary: %x matches, %x mismatches.\n", correct, wrong);
+
+	kprintf("\nTrying to read from SD card...\n");
+
+	kputs("POWERON");
+	sd_poweron();
+	kprintf("sd_cmd0: %hx\n", sd_cmd0());
+	kprintf("sd_cmd8: %hx\n", sd_cmd8());
+	kprintf("sd_acmd41: %hx\n", sd_acmd41());
+	kprintf("sd_cmd58: %hx\n", sd_cmd58());
+	kprintf("sd_cmd16: %hx\n", sd_cmd16());
+	kprintf("\ncopy: %hx\n", copy());
+
+	while(1) {
+		//uint8_t dip_value = GPIO_REG(GPIO_INPUT_VAL) & 0b01111111;
+		//kprintf("dip value: %hx, ram value: %c\n", dip_value, ram[dip_value]);
+
+		GPIO_REG(GPIO_OUTPUT_VAL) ^= 0xFF;
+	}
+	return 0;
+/*
 	kputs("INIT");
 	sd_poweron();
 	if (sd_cmd0() ||
@@ -221,5 +276,5 @@ int main(void)
 	kputs("BOOT");
 
 	__asm__ __volatile__ ("fence.i" : : : "memory");
-	return 0;
+	return 0;*/
 }

src/main/scala/unleashed/u500ml507devkit/Config.scala

@@ -12,8 +12,9 @@ import freechips.rocketchip.tile._
 import sifive.blocks.devices.gpio._
 import sifive.blocks.devices.spi._
 import sifive.blocks.devices.uart._
+import sifive.blocks.devices.terminal._
 
-import sifive.freedom.unleashed.u500ml507devkit.fpga._
+import sifive.fpgashells.devices.xilinx.xilinxml507mig._
 
 // Default FreedomUML507Config
 class FreedomUML507Config extends Config(
@@ -32,6 +33,8 @@ class U500ML507DevKitPeripherals extends Config((site, here, up) => {
     SPIParams(rAddress = BigInt(0x64001000L)))
   case PeripheryGPIOKey => List(
     GPIOParams(address = BigInt(0x64002000L), width = 8))
+  case PeripheryTerminalKey =>
+    TerminalParams(address = BigInt(0x64003000L))
   case PeripheryMaskROMKey => List(
     MaskROMParams(address = 0x10000, name = "BootROM"))
 })
@@ -42,10 +45,10 @@ class U500ML507DevKitConfig extends Config(
   new U500ML507DevKitPeripherals ++
   new FreedomUML507Config().alter((site,here,up) => {
     case ErrorParams => ErrorParams(Seq(AddressSet(0x3000, 0xfff)), maxAtomic=site(XLen)/8, maxTransfer=128)
-    case PeripheryBusKey => up(PeripheryBusKey, site).copy(frequency = 50000000) // 50 MHz hperiphery
+    case PeripheryBusKey => up(PeripheryBusKey, site).copy(frequency = 60000000) // 60 MHz clock
-    case MemoryML507Key => MemoryML507Params(address = Seq(AddressSet(0x80000000L,0x10000000L-1))) // 256 MiB
+    case MemoryML507Key => XilinxML507MIGParams(address = Seq(AddressSet(0x80000000L,0x10000000L-1))) // 256 MiB
     case DTSTimebase => BigInt(1000000)
-    case ExtMem => up(ExtMem).copy(size = 0x40000000L)
+    case ExtMem => up(ExtMem).copy(size = 0x10000000L)
     case JtagDTMKey => new JtagDTMConfig (
       idcodeVersion = 2,      // 1 was legacy (FE310-G000, Acai).
       idcodePartNum = 0x000,  // Decided to simplify.

src/main/scala/unleashed/u500ml507devkit/FPGAChip.scala

@@ -41,6 +41,8 @@ class U500ML507DevKitFPGAChip(implicit override val p: Parameters)
     // Connect peripherals
     //---------------------------------------------------------------------
 
+    connectTerminal (dut)
+    connectDDRMemory(dut)
     connectDebugJTAG(dut)
     connectSPI      (dut)
     connectUART     (dut)
@@ -54,9 +56,10 @@ class U500ML507DevKitFPGAChip(implicit override val p: Parameters)
 
     GPIOPinsFromPort(gpio_pins, dut.gpio(0))
 
-    gpio_pins.pins.foreach { _.i.ival := Bool(false) }
     gpio_pins.pins.zipWithIndex.foreach {
-      case(pin, idx) => led(idx) := pin.o.oval
+      case(pin, idx) =>
+        pin.i.ival := dip(idx)
+        led(idx) := pin.o.oval
     }
   }
 

src/main/scala/unleashed/u500ml507devkit/System.scala

@@ -13,8 +13,9 @@ import freechips.rocketchip.system._
 import sifive.blocks.devices.gpio._
 import sifive.blocks.devices.spi._
 import sifive.blocks.devices.uart._
+import sifive.blocks.devices.terminal._
 
-import sifive.freedom.unleashed.u500ml507devkit.fpga._
+import sifive.fpgashells.devices.xilinx.xilinxml507mig._
 
 //-------------------------------------------------------------------------
 // U500ML507DevKitSystem
@@ -25,6 +26,7 @@ class U500ML507DevKitSystem(implicit p: Parameters) extends RocketSubsystem
     with HasPeripheryDebug
     with HasSystemErrorSlave
     with HasPeripheryUART
+    with HasPeripheryTerminal
     with HasPeripherySPI
     with HasPeripheryGPIO
     with HasMemoryML507 {
@@ -36,8 +38,10 @@ class U500ML507DevKitSystemModule[+L <: U500ML507DevKitSystem](_outer: L)
     with HasRTCModuleImp
     with HasPeripheryDebugModuleImp
     with HasPeripheryUARTModuleImp
+    with HasPeripheryTerminalModuleImp
     with HasPeripherySPIModuleImp
-    with HasPeripheryGPIOModuleImp {
+    with HasPeripheryGPIOModuleImp
+    with HasMemoryML507ModuleImp {
   // Reset vector is set to the location of the mask rom
   val maskROMParams = p(PeripheryMaskROMKey)
   global_reset_vector := maskROMParams(0).address.U

src/main/scala/unleashed/u500ml507devkit/fpga/Memory.scala

@@ -1,55 +0,0 @@
-// See LICENSE.SiFive for license details.
-
-package sifive.freedom.unleashed.u500ml507devkit.fpga
-
-import Chisel._
-import freechips.rocketchip.config.{Field, Parameters}
-import freechips.rocketchip.diplomacy._
-import freechips.rocketchip.subsystem.BaseSubsystem
-import freechips.rocketchip.tilelink._
-import freechips.rocketchip.util._
-
-case class MemoryML507Params(
-    address: Seq[AddressSet]
-)
-
-case object MemoryML507Key extends Field[MemoryML507Params]
-
-trait HasMemoryML507 { this: BaseSubsystem =>
-    val memory = LazyModule(new TLMemoryML507(p(MemoryML507Key)))
-
-    // TODO: right TL/memory node chain?
-    memory.node := memBuses.head.toDRAMController(Some("ml507mig"))()
-}
-
-class TLMemoryML507(c: MemoryML507Params)(implicit p: Parameters) extends LazyModule {
-    val width = 512
-    val beatBytes = width/8 // TODO: To wide? TLFragmenter? fixedSize?
-
-    val device = new MemoryDevice
-    val node = TLManagerNode(
-        Seq(TLManagerPortParameters(
-            Seq(TLManagerParameters(
-                address         = c.address,
-                resources       = device.reg,
-                regionType      = RegionType.UNCACHED,
-                executable      = true,
-                supportsGet     = TransferSizes(1, beatBytes),
-                supportsPutFull = TransferSizes(1, beatBytes),
-                fifoId          = Some(0) // in-order
-            )),
-            beatBytes = beatBytes
-        ))
-    )
-
-    lazy val module = new LazyModuleImp(this) {
-        val (in, edge)= node.in(0)
-
-        // Tie off unused channels
-        in.a.ready := Bool(false)
-        in.b.valid := Bool(false)
-        in.c.ready := Bool(false)
-        in.d.valid := Bool(false)
-        in.e.ready := Bool(false)
-    }
-}