[RISCV] Leftovers after porting process

bin/tetris/tetris.c

@@ -178,7 +178,7 @@ main(int argc, char *argv[])
 	if (argc)
 		usage();
 
-	fallrate = 2000000 / level;
+	fallrate = /*2000000*/ 150000 / level;
 
 	for (i = 0; i <= (NUMKEYS-1); i++) {
 		for (j = i+1; j <= (NUMKEYS-1); j++) {

etc/.kshrc

@@ -1,4 +1 @@
 export TERM=xterm
-if [ "$(stty size)" == "0 0" ]; then
-  setwinsize
-fi

include/riscv/cpufunc.h

@@ -5,6 +5,8 @@
 
 #define __wfi() __asm__ volatile("wfi")
 
+#define __fence_i() __asm __volatile("fence.i" ::: "memory")
+
 #define __sfence_vma() __asm__ volatile("sfence.vma" ::: "memory")
 
 #define __sp()                                                                 \

sys/drv/Makefile

@@ -42,6 +42,7 @@ SOURCES-RISCV = \
 	liteuart.c \
 	plic.c \
 	riscv_rootdev.c \
+	sbi_console.c \
 	sifive_uart.c
 
 CPPFLAGS += -D_MACHDEP

sys/drv/liteuart.c

@@ -28,7 +28,6 @@
 typedef struct liteuart_state {
   resource_t *csrs;
   resource_t *irq;
-  thread_t *thread;
 } liteuart_state_t;
 
 /*

sys/drv/sbi_console.c

@@ -0,0 +1,22 @@
+#include <sys/console.h>
+#include <riscv/sbi.h>
+
+static void sbi_console_init(console_t *cn __unused) {
+}
+
+static int sbi_console_getc(console_t *cn __unused) {
+  return sbi_console_getchar();
+}
+
+static void sbi_console_putc(console_t *cn __unused, int c) {
+  sbi_console_putchar(c);
+}
+
+static console_t sbi_console = {
+  .cn_init = sbi_console_init,
+  .cn_getc = sbi_console_getc,
+  .cn_putc = sbi_console_putc,
+  .cn_prio = 1,
+};
+
+CONSOLE_ADD(sbi_console);

sys/gen/pmap.c

@@ -179,6 +179,11 @@ static pte_t *pmap_lookup_pte(pmap_t *pmap, vaddr_t va) {
 static void pmap_write_pte(pmap_t *pmap, pte_t *ptep, pte_t pte, vaddr_t va) {
   *ptep = pte;
   tlb_invalidate(va, pmap->asid);
+#ifdef __riscv
+#include <machine/cpufunc.h>
+  if (pte_access(pte, VM_PROT_EXEC))
+    __fence_i();
+#endif
 }
 
 /* Return PTE pointer for `va`. Allocate page table if needed. */
@@ -218,6 +223,7 @@ void pmap_kenter(vaddr_t va, paddr_t pa, vm_prot_t prot, unsigned flags) {
   WITH_MTX_LOCK (&pmap->mtx) {
     pte_t *ptep = pmap_ensure_pte(pmap, va);
     pmap_write_pte(pmap, ptep, pte, va);
+    assert(page_aligned_p(pte_frame(*ptep)));
   }
 }
 

sys/kern/device.c

@@ -87,7 +87,7 @@ resource_t *device_take_resource(device_t *dev, res_type_t type, int rid,
   if (!r)
     return NULL;
 
-  if ((type != RT_IRQ) && flags & RF_ACTIVE)
+  if ((type != RT_IRQ) && (flags & RF_ACTIVE))
     bus_activate_resource(dev, r);
 
   return r;

sys/kern/klog.c

@@ -122,6 +122,8 @@ void klog_append(klog_origin_t origin, const char *file, unsigned line,
     if (klog.first == klog.last)
       klog.first = next(klog.first);
   }
+
+  // klog_dump();
 }
 
 unsigned klog_setmask(unsigned newmask) {

sys/kern/vm_physmem.c

@@ -36,6 +36,8 @@ MTX_DEFINE(vm_kernel_end_lock, 0);
 void _vm_physseg_plug(paddr_t start, paddr_t end, bool used) {
   assert(page_aligned_p(start) && page_aligned_p(end) && start < end);
 
+  klog("%s: %p - %p, used=%d", __func__, start, end, used);
+
   static vm_physseg_t freeseg[VM_PHYSSEG_NMAX];
   static unsigned freeseg_last = 0;
 
@@ -208,6 +210,7 @@ static vm_page_t *pm_take_page(size_t fl) {
 }
 
 vm_page_t *vm_page_alloc(size_t npages) {
+  assert(vm_boot_done);
   assert((npages > 0) && powerof2(npages));
 
   SCOPED_MTX_LOCK(&physmem_lock);