diagdummy srpr2 wait for device lock

kernel/Makefile

@@ -69,6 +69,9 @@ SRCFILES += $(call GRABSRC, \
 							cpu \
 							vmm \
 							pci \
+							pci/ata \
+							pci/qemu_pci_serial \
+							cjob \
             )
 
 CFILES  := $(call GET_CFILES, $(SRCFILES))

kernel/cjob/cjob.c

@@ -0,0 +1,36 @@
+#include <stdint.h>
+#include <stddef.h>
+#include "spinlock/spinlock.h"
+#include "cjob/cjob.h"
+#include "dlmalloc/malloc.h"
+#include "util/util.h"
+
+CJobs CJOBS;
+static uint64_t cjobids = 0;
+
+void cjob_init(void) {
+  spinlock_init(&CJOBS.spinlock);
+  CJOBS.cjobs = NULL;
+}
+
+int32_t cjob_register(CJobFn fn, void *arg) {
+  CJob *cjob = dlmalloc(sizeof(*cjob));
+  cjob->fn = fn;
+  cjob->arg = arg;
+  int32_t id = cjob->id = cjobids++;
+
+  spinlock_acquire(&CJOBS.spinlock);
+  LL_APPEND(CJOBS.cjobs, cjob);
+  spinlock_release(&CJOBS.spinlock);
+
+  return id;
+}
+
+void cjob_runjobs(void) {
+  CJob *cjob, *cjobtmp;
+  spinlock_acquire(&CJOBS.spinlock);
+  LL_FOREACH_SAFE(CJOBS.cjobs, cjob, cjobtmp) {
+    cjob->fn(cjob->arg);
+  }
+  spinlock_release(&CJOBS.spinlock);
+}

kernel/cjob/cjob.h

@@ -0,0 +1,29 @@
+#ifndef CJOB_CJOB_H_
+#define CJOB_CJOB_H_
+
+#include <stdint.h>
+#include <stddef.h>
+#include "spinlock/spinlock.h"
+
+typedef void (*CJobFn)(void *arg);
+
+typedef struct CJob {
+  struct CJob *next;
+  CJobFn fn;
+  void *arg;
+  int32_t id;
+} CJob;
+
+typedef struct {
+  SpinLock spinlock;
+  CJob *cjobs;
+} CJobs;
+
+extern CJobs CJOBS;
+
+void cjob_init(void);
+
+int32_t cjob_register(CJobFn fn, void *arg);
+void cjob_runjobs(void);
+
+#endif // CJOB_CJOB_H_

kernel/dev/dev.c

@@ -4,7 +4,6 @@
 #include "std/string.h"
 #include "dev/dev.h"
 #include "dev/ps2kbdev.h"
-#include "dev/serialdev.h"
 #include "hshtb.h"
 
 DevTable DEVTABLE;
@@ -14,5 +13,4 @@ void dev_init(void) {
   spinlock_init(&DEVTABLE.spinlock);
 
   ps2kbdev_init();
-  serialdev_init();
 }

kernel/dev/serialdev.c

@@ -1,81 +0,0 @@
-#include <stdint.h>
-#include <stddef.h>
-#include "dev/dev.h"
-#include "dev/serialdev.h"
-#include "util/util.h"
-#include "sysdefs/dev.h"
-#include "io/io.h"
-#include "errors.h"
-#include "hshtb.h"
-#include "kprintf.h"
-
-// https://wiki.osdev.org/Serial_Ports
-
-#define PORT 0x3f8
-
-void serial_init(void) {
-  io_out8(PORT+1, 0x00);
-  io_out8(PORT+3, 0x80);
-  io_out8(PORT+0, 0x03);
-  io_out8(PORT+1, 0x00);
-  io_out8(PORT+3, 0x03);
-  io_out8(PORT+2, 0xC7);
-  io_out8(PORT+4, 0x0B);
-  io_out8(PORT+4, 0x1E);
-  io_out8(PORT+0, 0xAE);
-
-  if (io_in8(PORT+0) != 0xAE) {
-    ERR("serial", "serial is faulty!\n");
-    return;
-  }
-
-  io_out8(PORT+4, 0x0F);
-}
-
-int serial_recvready(void) {
-  return io_in8(PORT+5) & 1;
-}
-
-uint8_t serial_recvb(void) {
-  return io_in8(PORT);
-}
-
-int serial_sendready(void) {
-  return io_in8(PORT+5) & 0x20;
-}
-
-void serial_sendb(uint8_t b) {
-  io_out8(PORT, b);
-}
-
-int32_t serialdev_sendb(struct Dev *dev, uint8_t *buffer, size_t len, uint64_t pid) {
-  (void)dev; (void)len; (void)pid;
-  serial_sendb(buffer[0]);
-  return E_OK;
-}
-
-int32_t serialdev_sendready(struct Dev *dev, uint8_t *buffer, size_t len, uint64_t pid) {
-  (void)dev; (void)buffer; (void)len; (void)pid;
-  return serial_sendready();
-}
-
-int32_t serialdev_recvb(struct Dev *dev, uint8_t *buffer, size_t len, uint64_t pid) {
-  (void)dev; (void)buffer; (void)len; (void)pid;
-  return serial_recvb();
-}
-
-int32_t serialdev_recvready(struct Dev *dev, uint8_t *buffer, size_t len, uint64_t pid) {
-  (void)dev; (void)buffer; (void)len; (void)pid;
-  return serial_recvready();
-}
-
-void serialdev_init(void) {
-  Dev *serialdev = NULL;
-  HSHTB_ALLOC(DEVTABLE.devs, ident, "serialdev", serialdev);
-  serialdev->fns[DEV_SERIALDEV_SENDB] = &serialdev_sendb;
-  serialdev->fns[DEV_SERIALDEV_SENDREADY] = &serialdev_sendready;
-  serialdev->fns[DEV_SERIALDEV_RECVB] = &serialdev_recvb;
-  serialdev->fns[DEV_SERIALDEV_RECVREADY] = &serialdev_recvready;
-  spinlock_init(&serialdev->spinlock);
-  serial_init();
-}

kernel/dev/serialdev.h

@@ -1,6 +0,0 @@
-#ifndef DEV_SERIALDEV_H_
-#define DEV_SERIALDEV_H_
-
-void serialdev_init(void);
-
-#endif // DEV_SERIALDEV_H_

kernel/intr/intr0.S

@@ -66,7 +66,9 @@
   _push_regs
   cld
   movq %rsp, %rdi
+  sub $0x8, %rsp
   call intr_handleintr
+  add $0x8, %rsp
   _pop_regs
   add $0x10, %rsp
   iretq

kernel/ipc/mbus/mbus.c

@@ -7,15 +7,47 @@
 #include "std/string.h"
 #include "dlmalloc/malloc.h"
 #include "util/util.h"
+#include "cjob/cjob.h"
 #include "hshtb.h"
 #include "errors.h"
 #include "kprintf.h"
 
 IpcMBuses IPC_MBUSES;
 
+void ipc_mbus_gc_cjob(void *arg) {
+  for (size_t i = 0; i < LEN(IPC_MBUSES.mbuses); i++) {
+    spinlock_acquire(&IPC_MBUSES.spinlock);
+    IpcMBus *mbus = &IPC_MBUSES.mbuses[i];
+    spinlock_release(&IPC_MBUSES.spinlock);
+
+    spinlock_acquire(&mbus->spinlock);
+    if (mbus->_hshtbstate != HSHTB_TAKEN) {
+      spinlock_release(&mbus->spinlock);
+      continue;
+    }
+
+    IpcMBusCons *cons, *constmp;
+    LL_FOREACH_SAFE(mbus->consumers, cons, constmp) {
+      spinlock_acquire(&PROCS.spinlock);
+      Proc *proc = NULL;
+      LL_FINDPROP(PROCS.procs, proc, pid, cons->pid);
+      spinlock_release(&PROCS.spinlock);
+
+      if (proc == NULL) {
+        LL_REMOVE(mbus->consumers, cons);
+        dlfree(cons->rbuf.buffer);
+        dlfree(cons);
+      }
+    }
+    spinlock_release(&mbus->spinlock);
+  }
+}
+
 void ipc_mbusinit(void) {
   memset(&IPC_MBUSES, 0, sizeof(IPC_MBUSES));
   spinlock_init(&IPC_MBUSES.spinlock);
+
+  cjob_register(&ipc_mbus_gc_cjob, NULL);
 }
 
 IpcMBus *ipc_mbusmake(const char *name, size_t objsize, size_t objmax) {
@@ -174,32 +206,3 @@ int32_t ipc_mbusdttch(const char *name, uint64_t pid) {
 
   return E_OK;
 }
-
-void ipc_mbustick(void) {
-  for (size_t i = 0; i < LEN(IPC_MBUSES.mbuses); i++) {
-    spinlock_acquire(&IPC_MBUSES.spinlock);
-    IpcMBus *mbus = &IPC_MBUSES.mbuses[i];
-    spinlock_release(&IPC_MBUSES.spinlock);
-
-    spinlock_acquire(&mbus->spinlock);
-    if (mbus->_hshtbstate != HSHTB_TAKEN) {
-      spinlock_release(&mbus->spinlock);
-      continue;
-    }
-
-    IpcMBusCons *cons, *constmp;
-    LL_FOREACH_SAFE(mbus->consumers, cons, constmp) {
-      spinlock_acquire(&PROCS.spinlock);
-      Proc *proc = NULL;
-      LL_FINDPROP(PROCS.procs, proc, pid, cons->pid);
-      spinlock_release(&PROCS.spinlock);
-
-      if (proc == NULL) {
-        LL_REMOVE(mbus->consumers, cons);
-        dlfree(cons->rbuf.buffer);
-        dlfree(cons);
-      }
-    }
-    spinlock_release(&mbus->spinlock);
-  }
-}

kernel/ipc/mbus/mbus.h

@@ -34,6 +34,5 @@ int32_t ipc_mbuspublish(const char *name, const uint8_t *const buffer);
 int32_t ipc_mbusconsume(const char *name, uint8_t *const buffer, uint64_t pid);
 int32_t ipc_mbusattch(const char *name, uint64_t pid);
 int32_t ipc_mbusdttch(const char *name, uint64_t pid);
-void ipc_mbustick(void);
 
 #endif // IPC_MBUS_MBUS_H_

kernel/kmain.c

@@ -19,6 +19,7 @@
 #include "cpu/gdt.h"
 #include "ipc/mbus/mbus.h"
 #include "pci/pci.h"
+#include "cjob/cjob.h"
 
 void log_bootinfo(void) {
   char buf[100];
@@ -50,6 +51,7 @@ void kmain(void) {
   vmm_init();
   intr_init();
   randcrypto_init();
+  cjob_init();
   ipc_mbusinit();
   dev_init();
   storedev_init();

kernel/pci/ata/ata.c

@@ -0,0 +1,54 @@
+#include <stdint.h>
+#include <stddef.h>
+#include "pci/pci.h"
+#include "storedev/storedev.h"
+#include "storedev/atasd.h"
+#include "kprintf.h"
+
+#define ATA_PROBE(STRING, IOBASE, CTRLBASE, S_OR_M) \
+  ps = ata_probesize_bytes((IOBASE), (CTRLBASE), (S_OR_M)); \
+  if (ps > 0) { \
+    AtaSdInitExtra extra = { \
+      .devno = (S_OR_M), \
+      .capacity = ps, \
+      .iobase = (IOBASE), \
+      .ctrlbase = (CTRLBASE), \
+    }; \
+    storedev_create(STOREDEV_ATASD, (STRING), (void *)&extra); \
+  }
+
+#define ATA_MASTER 0x00
+#define ATA_SLAVE  0x01
+
+#define ATA_PRIM_IO     0x1F0
+#define ATA_PRIM_CTRL   0x3F6
+#define ATA_SCND_IO     0x170
+#define ATA_SCND_CTRL   0x376
+
+void pci_ata_init(void) {
+  PciDev dev = pci_getdev(0x8086, 0x7010, -1);
+  
+  uint16_t iobase, ctrlbase;
+  uint64_t ps;
+
+  uint32_t bar0 = pci_read(dev, PCI_BAR0);
+  uint32_t bar1 = pci_read(dev, PCI_BAR1);
+  uint32_t bar2 = pci_read(dev, PCI_BAR2);
+  uint32_t bar3 = pci_read(dev, PCI_BAR3);
+
+  LOG("pci", "ATA bar0=0x%x, bar1=0x%x, bar2=0x%x, bar3=0x%x\n", bar0, bar1, bar2, bar3);
+
+  iobase = (bar0 & 0xFFFFFFFC) + ATA_PRIM_IO * (!bar0);
+  ctrlbase = (bar1 & 0xFFFFFFFC) + ATA_PRIM_CTRL * (!bar1);
+  LOG("pci", "ATA CHANNEL PRIM: iobase=0x%x, ctrlbase=0x%x\n", iobase, ctrlbase);
+  if (!bar0 || !bar1) LOG("pci", "falling back to ISA\n");
+  ATA_PROBE("atasd0m", iobase, ctrlbase, ATA_MASTER);
+  ATA_PROBE("atasd0s", iobase, ctrlbase, ATA_SLAVE);
+  
+  iobase = (bar2 & 0xFFFFFFFC) + ATA_SCND_IO * (!bar2);
+  ctrlbase = (bar3 & 0xFFFFFFFC) + ATA_SCND_CTRL * (!bar3);
+  LOG("pci", "ATA CHANNEL SCND: iobase=0x%x, ctrlbase=0x%x\n", iobase, ctrlbase);
+  if (!bar2 || !bar3) LOG("pci", "falling back to ISA\n");
+  ATA_PROBE("atasd1m", iobase, ctrlbase, ATA_MASTER);
+  ATA_PROBE("atasd2s", iobase, ctrlbase, ATA_SLAVE);
+}

kernel/pci/ata/ata.h

@@ -0,0 +1,6 @@
+#ifndef PCI_ATA_ATA_H_
+#define PCI_ATA_ATA_H_
+
+void pci_ata_init(void);
+
+#endif // PCI_ATA__ATA_H_

kernel/pci/ide.c

@@ -1,44 +0,0 @@
-#include <stdint.h>
-#include <stddef.h>
-#include "pci/pci.h"
-#include "pci/ide.h"
-#include "storedev/atasd.h"
-#include "storedev/storedev.h"
-#include "util/util.h"
-#include "kprintf.h"
-
-#define ATA_MASTER 0x00
-#define ATA_SLAVE  0x01
-
-#define ATA_PROBE(STRING, IOBASE, CTRLBASE, S_OR_M) \
-  ps = ata_probesize_bytes((IOBASE), (CTRLBASE), (S_OR_M)); \
-  if (ps > 0) { \
-    AtaSdInitExtra extra = { \
-      .devno = (S_OR_M), \
-      .capacity = ps, \
-      .iobase = (IOBASE), \
-      .ctrlbase = (CTRLBASE), \
-    }; \
-    storedev_create(STOREDEV_ATASD, (STRING), (void *)&extra); \
-  }
-
-void pci_ide_init(PciDevInfo *devinfo) {
-  LOG("pci", "init ATA drive\n");
-
-  uint16_t iobase, ctrlbase;
-  uint64_t ps;
-
-  if (!(devinfo->progintf & 0x1)) {
-    iobase = 0x1F0;
-    ctrlbase = 0x3F6;
-  }
-  ATA_PROBE("atasd0m", iobase, ctrlbase, ATA_MASTER)
-  ATA_PROBE("atasd0s", iobase, ctrlbase, ATA_SLAVE)
-  
-  if (!(devinfo->progintf & 0x4)) {
-    iobase = 0x170;
-    ctrlbase = 0x376;
-  }
-  ATA_PROBE("atasd1m", iobase, ctrlbase, ATA_MASTER)
-  ATA_PROBE("atasd1s", iobase, ctrlbase, ATA_SLAVE)
-}

kernel/pci/ide.h

@@ -1,8 +0,0 @@
-#ifndef PCI_IDE_H_
-#define PCI_IDE_H_
-
-#include "pci/pci.h"
-
-void pci_ide_init(PciDevInfo *devinfo);
-
-#endif // PCI_IDE_H_

kernel/pci/pci.c

@@ -1,126 +1,185 @@
 #include <stdint.h>
 #include <stddef.h>
 #include "pci/pci.h"
-#include "pci/reg.h"
+#include "pci/ata/ata.h"
+#include "pci/qemu_pci_serial/qemu_pci_serial.h"
 #include "io/io.h"
 #include "std/string.h"
 #include "util/util.h"
-#include "pci/ide.h"
 #include "kprintf.h"
 
-uint8_t pci_read8(uint32_t id, uint32_t reg) {
-  uint32_t addr = 0x80000000 | id | (reg & 0xFC);
-  io_out32(PCI_CONFIG_ADDR, addr);
-  return io_in8(PCI_CONFIG_DATA + (reg & 0x03));
-}
+static PciDev PCI_DEV_ZERO = {0};
+uint32_t PCI_SIZE_MAP[100] = {0};
 
-uint16_t pci_read16(uint32_t id, uint32_t reg) {
-  uint32_t addr = 0x80000000 | id | (reg & 0xFC);
-  io_out32(PCI_CONFIG_ADDR, addr);
-  return io_in16(PCI_CONFIG_DATA + (reg & 0x02));
-}
+uint32_t pci_read(PciDev dev, uint32_t field) {
+  dev.fieldnum = (field & 0xFC) >> 2;
+  dev.enable = 1;
+  io_out32(PCI_CFG_ADDR, dev.bits);
 
-uint32_t pci_read32(uint32_t id, uint32_t reg) {
-  uint32_t addr = 0x80000000 | id | (reg & 0xFC);
-  io_out32(PCI_CONFIG_ADDR, addr);
-  return io_in32(PCI_CONFIG_DATA + reg);
-}
-
-void pci_write8(uint32_t id, uint32_t reg, uint8_t v) {
-  uint32_t addr = 0x80000000 | id | (reg & 0xFC);
-  io_out32(PCI_CONFIG_ADDR, addr);
-  io_out8(PCI_CONFIG_DATA + (reg & 0x03), v);
-}
-
-void pci_write16(uint32_t id, uint32_t reg, uint16_t v) {
-  uint32_t addr = 0x80000000 | id | (reg & 0xFC);
-  io_out32(PCI_CONFIG_ADDR, addr);
-  io_out16(PCI_CONFIG_DATA + (reg & 0x02), v);
-}
-
-void pci_write32(uint32_t id, uint32_t reg, uint32_t v) {
-  uint32_t addr = 0x80000000 | id | (reg & 0xFC);
-  io_out32(PCI_CONFIG_ADDR, addr);
-  io_out32(PCI_CONFIG_DATA + reg, v);
-}
-
-void pci_readbar(uint32_t id, uint32_t idx, uint32_t *addr, uint32_t *mask) {
-  uint32_t reg = PCI_BAR0 + idx * sizeof(uint32_t);
-  *addr = pci_read32(id, reg);
-  pci_write32(id, reg, 0xffffffff);
-  *mask = pci_read32(id, reg);
-  pci_write32(id, reg, *addr);
-}
-
-void pci_getbar(PciBar *bar, uint32_t id, uint32_t idx) {
-  uint32_t addrlo;
-  uint32_t masklo;
-  pci_readbar(id, idx, &addrlo, &masklo);
-
-  if (addrlo & PCI_BAR_MEM32) {
-    bar->u.addr = (void *)((uint64_t)(addrlo & ~0x3));
-    bar->size = ~(masklo & ~0xF) + 1;
-    bar->flags = addrlo & 0xF;
-  } else if (addrlo & PCI_BAR_MEM64) {
-    uint32_t addrhi;
-    uint32_t maskhi;
-    pci_readbar(id, idx+1, &addrhi, &maskhi);
-
-    bar->u.addr = (void *)(((uint64_t)addrhi << 32) | ((uint64_t)addrlo & ~0xF));
-    bar->size = ~(((uint64_t)maskhi << 32) | ((uint64_t)masklo & ~0xF)) + 1;
-    bar->flags = addrlo & 0xF;
-  } else if (addrlo & PCI_BAR_IO) {
-    bar->u.port = (uint16_t)(addrlo & ~0x3);
-    bar->size = (uint16_t)(~(masklo & ~0x3) + 1);
-    bar->flags = addrlo & 0x3;
+  uint32_t size = PCI_SIZE_MAP[field];
+  uint8_t u8; uint16_t u16; uint32_t u32;
+  switch (size) {
+    case 1:
+      u8 = io_in8(PCI_CFG_DATA + (field & 0x3));
+      return (uint32_t)u8;
+    case 2:
+      u16 = io_in16(PCI_CFG_DATA + (field & 0x2));
+      return (uint32_t)u16;
+    case 4:
+      u32 = io_in32(PCI_CFG_DATA);
+      return u32;
+    default:
+      return 0xFFFF;
   }
 }
 
-static PciMatch PCI_MATCHES[] = {
-  { 0x8086, 0x7010, &pci_ide_init },
+void pci_write(PciDev dev, uint32_t field, uint32_t v) {
+  dev.fieldnum = (field & 0xFC) >> 2;
+  dev.enable = 1;
+  io_out32(PCI_CFG_ADDR, dev.bits);
+  io_out32(PCI_CFG_DATA, v);
+}
+
+uint32_t pci_devtype(PciDev dev) {
+  uint32_t a = pci_read(dev, PCI_CLASS) << 8;
+  uint32_t b = pci_read(dev, PCI_SUBCLASS);
+  return a | b;
+}
+
+uint32_t pci_scndrybus(PciDev dev) {
+  return pci_read(dev, PCI_SCNDRY_BUS);
+}
+
+uint32_t pci_isend(PciDev dev) {
+  return !(pci_read(dev, PCI_HDRTYPE));
+}
+
+PciDev pci_scanfn(uint16_t vendorid, uint16_t deviceid, uint32_t bus,
+                  uint32_t device, uint32_t fn, int devtype) {
+  PciDev dev; memset(&dev, 0, sizeof(dev));
+  dev.busnum = bus;
+  dev.devnum = device;
+  dev.fnnum = fn;
+
+  // bridge
+  if (pci_devtype(dev) == 0x0604) {
+    pci_scanbus(vendorid, deviceid, pci_scndrybus(dev), devtype);
+  }
+  if (devtype == -1 || (uint32_t)devtype == pci_devtype(dev)) {
+    uint32_t venid = pci_read(dev, PCI_VENDORID);
+    uint32_t devid = pci_read(dev, PCI_DEVICEID);
+
+    if (devid == deviceid && venid == vendorid) {
+      return dev;
+    }
+  }
+  return PCI_DEV_ZERO;
+}
+
+PciDev pci_scanbus(uint16_t vendorid, uint16_t deviceid,
+                   uint32_t bus, int devtype) {
+  for (uint32_t device = 0; device < PCI_DEV_PER_BUS; device++) {
+    PciDev d = pci_scandev(vendorid, deviceid, bus, device, devtype);
+    if (d.bits) {
+      return d;
+    }
+  }
+  return PCI_DEV_ZERO;
+}
+
+PciDev pci_scandev(uint16_t vendorid, uint16_t deviceid,
+                  uint32_t bus, uint32_t device, int devtype) {
+  PciDev dev; memset(&dev, 0, sizeof(dev));
+  dev.busnum = bus;
+  dev.devnum = device;
+
+  if (pci_read(dev, PCI_VENDORID) == 0xFFFF) {
+    return PCI_DEV_ZERO;
+  }
+
+  PciDev d = pci_scanfn(vendorid, deviceid, bus, device, 0, devtype);
+  if (d.bits) {
+    return d;
+  }
+
+  if (pci_isend(dev)) {
+    return PCI_DEV_ZERO;
+  }
+
+  for (uint32_t fn = 1; fn < PCI_FN_PER_DEV; fn++) {
+    if (pci_read(dev, PCI_VENDORID) != 0xFFFF) {
+      d = pci_scanfn(vendorid, deviceid, bus, device, fn, devtype);
+      if (d.bits) {
+        return d;
+      }
+    }
+  }
+  return PCI_DEV_ZERO;
+}
+
+PciDev pci_getdev(uint16_t vendorid, uint16_t deviceid, int devtype) {
+  PciDev d = pci_scanbus(vendorid, deviceid, 0, devtype);
+  if (d.bits) {
+    return d;
+  }
+
+  if (pci_isend(PCI_DEV_ZERO)) {
+    ERR("pci", "pci_getdev() failed for 0x%04x/0x%04x,%d\n", vendorid, deviceid, devtype);
+    return PCI_DEV_ZERO;
+  }
+
+  for (uint32_t fn = 1; fn < PCI_FN_PER_DEV; fn++) {
+    PciDev d2; memset(&d2, 0, sizeof(d2));
+    d2.fnnum = fn;
+
+    if (pci_read(d2, PCI_VENDORID) == 0xFFFF) {
+      break;
+    }
+
+    d = pci_scanbus(vendorid, deviceid, fn, devtype);
+    if (d.bits) {
+      return d;
+    }
+  }
+
+  return PCI_DEV_ZERO;
+}
+
+void pci_init_size_map(void) {
+  PCI_SIZE_MAP[PCI_VENDORID]    = 2;
+  PCI_SIZE_MAP[PCI_DEVICEID]    = 2;
+  PCI_SIZE_MAP[PCI_CMD]         = 2;
+  PCI_SIZE_MAP[PCI_STATUS]      = 2;
+  PCI_SIZE_MAP[PCI_SUBCLASS]    = 1;
+  PCI_SIZE_MAP[PCI_CLASS]       = 1;
+  PCI_SIZE_MAP[PCI_CACHELINESZ] = 1;
+  PCI_SIZE_MAP[PCI_LTNCY_TIMER] = 1;
+  PCI_SIZE_MAP[PCI_HDRTYPE]     = 1;
+  PCI_SIZE_MAP[PCI_BIST]        = 1;
+  PCI_SIZE_MAP[PCI_BAR0]        = 4;
+  PCI_SIZE_MAP[PCI_BAR1]        = 4;
+  PCI_SIZE_MAP[PCI_BAR2]        = 4;
+  PCI_SIZE_MAP[PCI_BAR3]        = 4;
+  PCI_SIZE_MAP[PCI_BAR4]        = 4;
+  PCI_SIZE_MAP[PCI_BAR5]        = 4;
+  PCI_SIZE_MAP[PCI_INTRLINE]    = 1;
+  PCI_SIZE_MAP[PCI_SCNDRY_BUS]  = 1;
+}
+
+
+PciInitFn PCI_INIT_ARRAY[PCI_INIT_ARRAY_MAX] = {
+  &pci_ata_init,
+  &pci_qemu_pci_serial_init,
 };
 
-void pci_visit(uint32_t bus, uint32_t dev, uint32_t fn) {
-  uint32_t id = PCI_MAKE_ID(bus, dev, fn);
-
-  PciDevInfo devinfo;
-  memset(&devinfo, 0, sizeof(devinfo));
-
-  devinfo.vendorid = pci_read16(id, PCI_VENDORID);
-  if (devinfo.vendorid == 0xffff) {
-    return;
-  }
-
-  devinfo.deviceid = pci_read16(id, PCI_DEVICEID);
-  devinfo.progintf = pci_read8(id, PCI_PROGINTF);
-  devinfo.subclass = pci_read8(id, PCI_SUBCLASS);
-  devinfo.classcode = pci_read8(id, PCI_CLASSCODE);
-
-  devinfo.bus = bus;
-  devinfo.dev = dev;
-  devinfo.fn = fn;
-
-  LOG("pci", "%02X:%02X:%u 0x%04X/0x%04X: %s\n",
-      bus, dev, fn, devinfo.vendorid, devinfo.deviceid,
-      pci_classname(devinfo.classcode, devinfo.subclass, devinfo.progintf));
-
-  for (size_t i = 0; i < LEN(PCI_MATCHES); i++) {
-    if (PCI_MATCHES[i].k1 == devinfo.vendorid && PCI_MATCHES[i].k2 == devinfo.deviceid) {
-      PCI_MATCHES[i].initfn(&devinfo);
-    }
+void pci_init_devs(void) {
+  for (size_t i = 0; i < LEN(PCI_INIT_ARRAY); i++) {
+    if (PCI_INIT_ARRAY[i] != NULL)
+      PCI_INIT_ARRAY[i]();
   }
 }
 
 void pci_init(void) {
-  for (uint32_t bus = 0; bus < 0x100; bus++) {
-    for (uint32_t dev = 0; dev < 32; dev++) {
-      uint32_t baseid = PCI_MAKE_ID(bus, dev, 0);
-      uint8_t hdrtype = pci_read8(baseid, PCI_HDRTYPE);
-      uint32_t fncount = hdrtype & PCI_MULTIFN ? 8 : 1;
-
-      for (uint32_t fn = 0; fn < fncount; fn++) {
-        pci_visit(bus, dev, fn);
-      }
-    }
-  }
+  pci_init_size_map();
+  pci_init_devs();
 }

kernel/pci/pci.h

@@ -4,86 +4,68 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#define PCI_MAKE_ID(bus, dev, fn) (((bus)<<16) | ((dev)<<11) | ((fn)<<8))
-
-#define PCI_CONFIG_ADDR 0xCF8
-#define PCI_CONFIG_DATA 0xCFC
-
-#define PCI_MULTIFN         0x80
-#define PCI_GENERIC         0x00
-#define PCI_PCI_BRIDGE      0x01
-#define PCI_CARDBUS_BRIDGE  0x02
-
-#define PCI_VENDORID     0x00
-#define PCI_DEVICEID     0x02
-#define PCI_CMD          0x04
-#define PCI_STATUS       0x06
-#define PCI_REVID        0x08
-#define PCI_PROGINTF     0x09
-#define PCI_SUBCLASS     0x0A
-#define PCI_CLASSCODE    0x0B
-#define PCI_CACHELINESZ  0x0C
-#define PCI_LATENCY      0x0D
-#define PCI_HDRTYPE      0x0E
-#define PCI_BIST         0x0F
-
-#define PCI_BAR0              0x10
-#define PCI_BAR1              0x14
-#define PCI_BAR2              0x18
-#define PCI_BAR3              0x1C
-#define PCI_BAR4              0x20
-#define PCI_BAR5              0x24
-#define PCI_CARBUS_CIS        0x28
-#define PCI_SUBSYS_VENDORID   0x2C
-#define PCI_SUBSYS_DEVICEID   0x2E
-#define PCI_EXPROM            0x30
-#define PCI_CAP               0x34
-#define PCI_INTRLINE          0x3C
-#define PCI_INTRPIN           0x3D
-#define PCI_MIN_GRANT         0x3E
-#define PCI_MAX_LATENCY       0x3F
-
-#define PCI_BAR_IO        0x01
-#define PCI_BAR_MEM32     0x02
-#define PCI_BAR_MEM64     0x04
-#define PCI_BAR_PREFETCH  0x08
-
-typedef struct {
-  union { void *addr; uint16_t port; } u;
-  uint64_t size;
-  uint32_t flags;
-} PciBar;
-
-typedef struct {
-  uint16_t vendorid;
-  uint16_t deviceid;
-  uint8_t classcode;
-  uint8_t subclass;
-  uint8_t progintf;
-
-  uint32_t bus, dev, fn;
-} PciDevInfo;
-
-typedef struct {
-  uint16_t k1;
-  uint16_t k2;
-  void (*initfn)(PciDevInfo *info);
-} PciMatch;
-
-#define PCI_DEV_MAGIC 0xAB0BA
-
-typedef struct {
-  PciDevInfo devinfo;
+typedef union {
+  uint32_t bits;
+  struct {
+    uint32_t alwayszero: 2;
+    uint32_t fieldnum: 6;
+    uint32_t fnnum: 3;
+    uint32_t devnum: 5;
+    uint32_t busnum: 8;
+    uint32_t resv: 7;
+    uint32_t enable: 1;
+  };
 } PciDev;
 
-uint8_t pci_read8(uint32_t id, uint32_t reg);
-uint16_t pci_read16(uint32_t id, uint32_t reg);
-uint32_t pci_read32(uint32_t id, uint32_t reg);
-void pci_write8(uint32_t id, uint32_t reg, uint8_t v);
-void pci_write16(uint32_t id, uint32_t reg, uint16_t v);
-void pci_write32(uint32_t id, uint32_t reg, uint32_t v);
-void pci_getbar(PciBar *bar, uint32_t id, uint32_t idx);
+#define PCI_CFG_ADDR  0xCF8
+#define PCI_CFG_DATA  0xCFC
+
+#define PCI_VENDORID    0x00
+#define PCI_DEVICEID    0x02
+#define PCI_CMD         0x04
+#define PCI_STATUS      0x06
+#define PCI_REVID       0x08
+#define PCI_PROGIF      0x09
+#define PCI_SUBCLASS    0x0A
+#define PCI_CLASS       0x0B
+#define PCI_CACHELINESZ 0x0C
+#define PCI_LTNCY_TIMER 0x0D
+#define PCI_HDRTYPE     0x0E
+#define PCI_BIST        0x0F
+#define PCI_BAR0        0x10
+#define PCI_BAR1        0x14
+#define PCI_BAR2        0x18
+#define PCI_BAR3        0x1C
+#define PCI_BAR4        0x20
+#define PCI_BAR5        0x24
+#define PCI_INTRLINE    0x3C
+#define PCI_SCNDRY_BUS  0x09
+
+#define PCI_HDR_DEV     0
+#define PCI_HDR_BRIDGE  1
+#define PCI_HDR_CARDBUS 2
+
+#define PCI_DEV_PER_BUS   32
+#define PCI_FN_PER_DEV    32
+
+uint32_t pci_read(PciDev dev, uint32_t field);
+void pci_write(PciDev dev, uint32_t field, uint32_t v);
+uint32_t pci_devtype(PciDev dev);
+uint32_t pci_scndrybus(PciDev dev);
+uint32_t pci_isend(PciDev dev);
+PciDev pci_scanfn(uint16_t vendorid, uint16_t deviceid, uint32_t bus,
+                  uint32_t device, uint32_t fn, int devtype);
+PciDev pci_scanbus(uint16_t vendorid, uint16_t deviceid,
+                   uint32_t bus, int devtype);
+PciDev pci_scandev(uint16_t vendorid, uint16_t deviceid,
+                  uint32_t bus, uint32_t device, int devtype);
+PciDev pci_getdev(uint16_t vendorid, uint16_t deviceid, int devtype);
 
 void pci_init(void);
 
+#define PCI_INIT_ARRAY_MAX 0x100
+
+typedef void (*PciInitFn)(void);
+extern PciInitFn PCI_INIT_ARRAY[PCI_INIT_ARRAY_MAX];
+
 #endif // PCI_PCI_H_

kernel/pci/qemu_pci_serial/qemu_pci_serial.c

@@ -0,0 +1,187 @@
+#include <stdint.h>
+#include <stddef.h>
+#include "pci/pci.h"
+#include "pci/qemu_pci_serial/qemu_pci_serial.h"
+#include "io/io.h"
+#include "sysdefs/dev.h"
+#include "util/util.h"
+#include "dev/dev.h"
+#include "cjob/cjob.h"
+#include "proc/proc.h"
+#include "errors.h"
+#include "hshtb.h"
+#include "kprintf.h"
+
+static QemuPciSerialDev QEMU_PCI_SERIAL_DEV;
+
+// https://wiki.osdev.org/Serial_Ports
+
+void _serial_init(uint16_t iobase) {
+  io_out8(iobase+1, 0x00);
+  io_out8(iobase+3, 0x80);
+  io_out8(iobase+0, 0x03);
+  io_out8(iobase+1, 0x00);
+  io_out8(iobase+3, 0x03);
+  io_out8(iobase+2, 0xC7);
+  io_out8(iobase+4, 0x0B);
+  io_out8(iobase+4, 0x1E);
+  io_out8(iobase+0, 0xAE);
+
+  if (io_in8(iobase+0) != 0xAE) {
+    ERR("pci", "QEMU_PCI_SERIAL serial is faulty!\n");
+    return;
+  }
+
+  io_out8(iobase+4, 0x0F);
+}
+
+int _serial_recvready(uint16_t iobase) {
+  return io_in8(iobase+5) & 1;
+}
+
+uint8_t _serial_recvb(uint16_t iobase) {
+  return io_in8(iobase);
+}
+
+int _serial_sendready(uint16_t iobase) {
+  return io_in8(iobase+5) & 0x20;
+}
+
+void _serial_sendb(uint16_t iobase, uint8_t b) {
+  io_out8(iobase, b);
+}
+
+int32_t qemu_pci_serial_dev_sendb(struct Dev *dev, uint8_t *buffer, size_t len, uint64_t pid) {
+  (void)len; (void)pid;
+
+  QemuPciSerialDev *qpsd = dev->extra;
+
+  if (qpsd->lockstate != -1 && qpsd->lockstate != (int)pid) {
+    return E_DEVLOCKED;
+  }
+
+  _serial_sendb(qpsd->iobase, buffer[0]);
+
+  return E_OK;
+}
+
+int32_t qemu_pci_serial_dev_sendready(struct Dev *dev, uint8_t *buffer, size_t len, uint64_t pid) {
+  (void)buffer; (void)len; (void)pid;
+
+  QemuPciSerialDev *qpsd = dev->extra;
+  
+  if (qpsd->lockstate != -1 && qpsd->lockstate != (int)pid) {
+    return E_DEVLOCKED;
+  }
+
+  return _serial_sendready(qpsd->iobase);
+}
+
+int32_t qemu_pci_serial_dev_recvb(struct Dev *dev, uint8_t *buffer, size_t len, uint64_t pid) {
+  (void)buffer; (void)len; (void)pid;
+  
+  QemuPciSerialDev *qpsd = dev->extra;
+  
+  if (qpsd->lockstate != -1 && qpsd->lockstate != (int)pid) {
+    return E_DEVLOCKED;
+  }
+
+  return _serial_recvb(qpsd->iobase);
+}
+
+int32_t qemu_pci_serial_dev_recvready(struct Dev *dev, uint8_t *buffer, size_t len, uint64_t pid) {
+  (void)buffer; (void)len; (void)pid;
+  
+  QemuPciSerialDev *qpsd = dev->extra;
+  
+  if (qpsd->lockstate != -1 && qpsd->lockstate != (int)pid) {
+    return E_DEVLOCKED;
+  }
+
+  return _serial_recvready(qpsd->iobase);
+}
+
+int32_t qemu_pci_serial_dev_lock(struct Dev *dev, uint8_t *buffer, size_t len, uint64_t pid) {
+  (void)buffer; (void)len; (void)pid;
+  
+  QemuPciSerialDev *qpsd = dev->extra;
+
+  if (qpsd->lockstate == (int)pid) {
+    return E_OK;
+  }
+
+  if (qpsd->lockstate == -1) {
+    qpsd->lockstate = (int)pid;
+    return E_OK;
+  }
+  return E_DEVLOCKED;
+}
+
+int32_t qemu_pci_serial_dev_unlock(struct Dev *dev, uint8_t *buffer, size_t len, uint64_t pid) {
+  (void)buffer; (void)len; (void)pid;
+  
+  QemuPciSerialDev *qpsd = dev->extra;
+
+  if (qpsd->lockstate == (int)pid) {
+    qpsd->lockstate = -1;
+    return E_OK;
+  }
+  return E_DEVNOTYOURLOCK;
+}
+
+void pci_qemu_pci_serial_gc_cjob(void *arg) {
+  Dev *dev = arg;
+
+  QemuPciSerialDev *qpsd;
+
+  spinlock_acquire(&dev->spinlock);
+  qpsd = dev->extra;
+  uint64_t pid = qpsd->lockstate;  
+  spinlock_release(&dev->spinlock);
+
+  Proc *proc = NULL;
+  spinlock_acquire(&PROCS.spinlock);
+  LL_FINDPROP(PROCS.procs, proc, pid, pid);
+  spinlock_release(&PROCS.spinlock);
+
+  if (proc == NULL) {
+    spinlock_acquire(&dev->spinlock);
+    qpsd = dev->extra;
+    qpsd->lockstate = -1;
+    spinlock_release(&dev->spinlock);
+  }
+}
+
+void pci_qemu_pci_serial_init(void) {
+  PciDev dev = pci_getdev(0x1B36, 0x0002, -1);
+  if (!dev.bits) {
+    return;
+  }
+  
+  uint32_t bar0 = pci_read(dev, PCI_BAR0);
+
+  LOG("pci", "QEMU_PCI_SERIAL bar0=0x%x\n", bar0);
+  
+  uint16_t iobase = bar0 & 0xFFFFFFFC;
+  LOG("pci", "QEMU_PCI_SERIAL iobase=0x%x\n", iobase);
+
+  QEMU_PCI_SERIAL_DEV._magic = QEMU_PCI_SERIAL_MAGIC;
+  QEMU_PCI_SERIAL_DEV.iobase = iobase;
+  QEMU_PCI_SERIAL_DEV.lockstate = -1;
+
+  Dev *serialdev = NULL;
+  HSHTB_ALLOC(DEVTABLE.devs, ident, "serialdev", serialdev);
+  serialdev->fns[0] = &qemu_pci_serial_dev_sendb;
+  serialdev->fns[1] = &qemu_pci_serial_dev_sendready;
+  serialdev->fns[2] = &qemu_pci_serial_dev_recvb;
+  serialdev->fns[3] = &qemu_pci_serial_dev_recvready;
+  serialdev->fns[4] = &qemu_pci_serial_dev_lock;
+  serialdev->fns[5] = &qemu_pci_serial_dev_unlock;
+  spinlock_init(&serialdev->spinlock);
+  serialdev->extra = &QEMU_PCI_SERIAL_DEV;
+
+  cjob_register(&pci_qemu_pci_serial_gc_cjob, serialdev);
+
+  _serial_init(QEMU_PCI_SERIAL_DEV.iobase);
+}
+

kernel/pci/qemu_pci_serial/qemu_pci_serial.h

@@ -0,0 +1,17 @@
+#ifndef PCI_QEMU_PCI_SERIAL_QEMU_PCI_SERIAL_H_
+#define PCI_QEMU_PCI_SERIAL_QEMU_PCI_SERIAL_H_
+
+#include <stdint.h>
+#include <stddef.h>
+
+#define QEMU_PCI_SERIAL_MAGIC 0x1234
+
+typedef struct {
+  uint32_t _magic;
+  uint16_t iobase;
+  int lockstate;
+} QemuPciSerialDev;
+
+void pci_qemu_pci_serial_init(void);
+
+#endif // PCI_QEMU_PCI_SERIAL_QEMU_PCI_SERIAL_H_

kernel/pci/reg.c

@@ -1,113 +0,0 @@
-#include <stdint.h>
-#include <stddef.h>
-#include "pci/reg.h"
-
-const char *pci_devname(uint32_t vendorid, uint32_t deviceid) {
-    return "Unknown Device";
-}
-
-const char *pci_classname(uint32_t classcode, uint32_t subclass, uint32_t progintf) {
-    switch ((classcode << 8) | subclass)
-    {
-    case PCI_VGA_COMPATIBLE:            return "VGA-Compatible Device";
-    case PCI_STORAGE_SCSI:              return "SCSI Storage Controller";
-    case PCI_STORAGE_IDE:               return "IDE Interface";
-    case PCI_STORAGE_FLOPPY:            return "Floppy Disk Controller";
-    case PCI_STORAGE_IPI:               return "IPI Bus Controller";
-    case PCI_STORAGE_RAID:              return "RAID Bus Controller";
-    case PCI_STORAGE_ATA:               return "ATA Controller";
-    case PCI_STORAGE_SATA:              return "SATA Controller";
-    case PCI_STORAGE_OTHER:             return "Mass Storage Controller";
-    case PCI_NETWORK_ETHERNET:          return "Ethernet Controller";
-    case PCI_NETWORK_TOKEN_RING:        return "Token Ring Controller";
-    case PCI_NETWORK_FDDI:              return "FDDI Controller";
-    case PCI_NETWORK_ATM:               return "ATM Controller";
-    case PCI_NETWORK_ISDN:              return "ISDN Controller";
-    case PCI_NETWORK_WORLDFIP:          return "WorldFip Controller";
-    case PCI_NETWORK_PICGMG:            return "PICMG Controller";
-    case PCI_NETWORK_OTHER:             return "Network Controller";
-    case PCI_DISPLAY_VGA:               return "VGA-Compatible Controller";
-    case PCI_DISPLAY_XGA:               return "XGA-Compatible Controller";
-    case PCI_DISPLAY_3D:                return "3D Controller";
-    case PCI_DISPLAY_OTHER:             return "Display Controller";
-    case PCI_MULTIMEDIA_VIDEO:          return "Multimedia Video Controller";
-    case PCI_MULTIMEDIA_AUDIO:          return "Multimedia Audio Controller";
-    case PCI_MULTIMEDIA_PHONE:          return "Computer Telephony Device";
-    case PCI_MULTIMEDIA_AUDIO_DEVICE:   return "Audio Device";
-    case PCI_MULTIMEDIA_OTHER:          return "Multimedia Controller";
-    case PCI_MEMORY_RAM:                return "RAM Memory";
-    case PCI_MEMORY_FLASH:              return "Flash Memory";
-    case PCI_MEMORY_OTHER:              return "Memory Controller";
-    case PCI_BRIDGE_HOST:               return "Host Bridge";
-    case PCI_BRIDGE_ISA:                return "ISA Bridge";
-    case PCI_BRIDGE_EISA:               return "EISA Bridge";
-    case PCI_BRIDGE_MCA:                return "MicroChannel Bridge";
-    case PCI_BRIDGE_PCI:                return "PCI Bridge";
-    case PCI_BRIDGE_PCMCIA:             return "PCMCIA Bridge";
-    case PCI_BRIDGE_NUBUS:              return "NuBus Bridge";
-    case PCI_BRIDGE_CARDBUS:            return "CardBus Bridge";
-    case PCI_BRIDGE_RACEWAY:            return "RACEway Bridge";
-    case PCI_BRIDGE_OTHER:              return "Bridge Device";
-    case PCI_COMM_SERIAL:               return "Serial Controller";
-    case PCI_COMM_PARALLEL:             return "Parallel Controller";
-    case PCI_COMM_MULTIPORT:            return "Multiport Serial Controller";
-    case PCI_COMM_MODEM:                return "Modem";
-    case PCI_COMM_OTHER:                return "Communication Controller";
-    case PCI_SYSTEM_PIC:                return "PIC";
-    case PCI_SYSTEM_DMA:                return "DMA Controller";
-    case PCI_SYSTEM_TIMER:              return "Timer";
-    case PCI_SYSTEM_RTC:                return "RTC";
-    case PCI_SYSTEM_PCI_HOTPLUG:        return "PCI Hot-Plug Controller";
-    case PCI_SYSTEM_SD:                 return "SD Host Controller";
-    case PCI_SYSTEM_OTHER:              return "System Peripheral";
-    case PCI_INPUT_KEYBOARD:            return "Keyboard Controller";
-    case PCI_INPUT_PEN:                 return "Pen Controller";
-    case PCI_INPUT_MOUSE:               return "Mouse Controller";
-    case PCI_INPUT_SCANNER:             return "Scanner Controller";
-    case PCI_INPUT_GAMEPORT:            return "Gameport Controller";
-    case PCI_INPUT_OTHER:               return "Input Controller";
-    case PCI_DOCKING_GENERIC:           return "Generic Docking Station";
-    case PCI_DOCKING_OTHER:             return "Docking Station";
-    case PCI_PROCESSOR_386:             return "386";
-    case PCI_PROCESSOR_486:             return "486";
-    case PCI_PROCESSOR_PENTIUM:         return "Pentium";
-    case PCI_PROCESSOR_ALPHA:           return "Alpha";
-    case PCI_PROCESSOR_MIPS:            return "MIPS";
-    case PCI_PROCESSOR_CO:              return "CO-Processor";
-    case PCI_SERIAL_FIREWIRE:           return "FireWire (IEEE 1394)";
-    case PCI_SERIAL_SSA:                return "SSA";
-    case PCI_SERIAL_USB:
-        switch (progintf)
-        {
-        case PCI_SERIAL_USB_UHCI:       return "USB (UHCI)";
-        case PCI_SERIAL_USB_OHCI:       return "USB (OHCI)";
-        case PCI_SERIAL_USB_EHCI:       return "USB2";
-        case PCI_SERIAL_USB_XHCI:       return "USB3";
-        case PCI_SERIAL_USB_OTHER:      return "USB Controller";
-        default:                        return "Unknown USB Class";
-        }
-        break;
-    case PCI_SERIAL_FIBER:              return "Fiber Channel";
-    case PCI_SERIAL_SMBUS:              return "SMBus";
-    case PCI_WIRELESS_IRDA:             return "iRDA Compatible Controller";
-    case PCI_WIRLESSS_IR:               return "Consumer IR Controller";
-    case PCI_WIRLESSS_RF:               return "RF Controller";
-    case PCI_WIRLESSS_BLUETOOTH:        return "Bluetooth";
-    case PCI_WIRLESSS_BROADBAND:        return "Broadband";
-    case PCI_WIRLESSS_ETHERNET_A:       return "802.1a Controller";
-    case PCI_WIRLESSS_ETHERNET_B:       return "802.1b Controller";
-    case PCI_WIRELESS_OTHER:            return "Wireless Controller";
-    case PCI_INTELLIGENT_I2O:           return "I2O Controller";
-    case PCI_SATELLITE_TV:              return "Satellite TV Controller";
-    case PCI_SATELLITE_AUDIO:           return "Satellite Audio Controller";
-    case PCI_SATELLITE_VOICE:           return "Satellite Voice Controller";
-    case PCI_SATELLITE_DATA:            return "Satellite Data Controller";
-    case PCI_CRYPT_NETWORK:             return "Network and Computing Encryption Device";
-    case PCI_CRYPT_ENTERTAINMENT:       return "Entertainment Encryption Device";
-    case PCI_CRYPT_OTHER:               return "Encryption Device";
-    case PCI_SP_DPIO:                   return "DPIO Modules";
-    case PCI_SP_OTHER:                  return "Signal Processing Controller";
-    }
-
-    return "Unknown PCI Class";
-}

kernel/pci/reg.h

@@ -1,169 +0,0 @@
-#ifndef PCI_REG_H_
-#define PCI_REG_H_
-
-#include <stdint.h>
-#include <stddef.h>
-
-// PCI Vendors
-#define PCI_VENDOR_INTEL                    0x8086
-
-// PCI Classes
-#define PCI_CLASS_LEGACY                0x00
-#define PCI_CLASS_STORAGE               0x01
-#define PCI_CLASS_NETWORK               0x02
-#define PCI_CLASS_DISPLAY               0x03
-#define PCI_CLASS_MULTIMEDIA            0x04
-#define PCI_CLASS_MEMORY                0x05
-#define PCI_CLASS_BRIDGE_DEVICE         0x06
-#define PCI_CLASS_COMMUNICATION         0x07
-#define PCI_CLASS_PERIHPERALS           0x08
-#define PCI_CLASS_INPUT_DEVICES         0x09
-#define PCI_CLASS_DOCKING_STATION       0x0a
-#define PCI_CLASS_PROCESSOR             0x0b
-#define PCI_CLASS_SERIAL_BUS            0x0c
-#define PCI_CLASS_WIRELESS              0x0d
-#define PCI_CLASS_INTELLIGENT_IO        0x0e
-#define PCI_CLASS_SATELLITE             0x0f
-#define PCI_CLASS_CRYPT                 0x10
-#define PCI_CLASS_SIGNAL_PROCESSING     0x11
-#define PCI_CLASS_UNDEFINED             0xff
-
-// Undefined Class
-#define PCI_UNCLASSIFIED                0x0000
-#define PCI_VGA_COMPATIBLE              0x0001
-
-// Mass Storage Controller
-#define PCI_STORAGE_SCSI                0x0100
-#define PCI_STORAGE_IDE                 0x0101
-#define PCI_STORAGE_FLOPPY              0x0102
-#define PCI_STORAGE_IPI                 0x0103
-#define PCI_STORAGE_RAID                0x0104
-#define PCI_STORAGE_ATA                 0x0105
-#define PCI_STORAGE_SATA                0x0106
-#define PCI_STORAGE_OTHER               0x0180
-
-// Network Controller
-#define PCI_NETWORK_ETHERNET            0x0200
-#define PCI_NETWORK_TOKEN_RING          0x0201
-#define PCI_NETWORK_FDDI                0x0202
-#define PCI_NETWORK_ATM                 0x0203
-#define PCI_NETWORK_ISDN                0x0204
-#define PCI_NETWORK_WORLDFIP            0x0205
-#define PCI_NETWORK_PICGMG              0x0206
-#define PCI_NETWORK_OTHER               0x0280
-
-// Display Controller
-#define PCI_DISPLAY_VGA                 0x0300
-#define PCI_DISPLAY_XGA                 0x0301
-#define PCI_DISPLAY_3D                  0x0302
-#define PCI_DISPLAY_OTHER               0x0380
-
-// Multimedia Controller
-#define PCI_MULTIMEDIA_VIDEO            0x0400
-#define PCI_MULTIMEDIA_AUDIO            0x0401
-#define PCI_MULTIMEDIA_PHONE            0x0402
-#define PCI_MULTIMEDIA_AUDIO_DEVICE     0x0403
-#define PCI_MULTIMEDIA_OTHER            0x0480
-
-// Memory Controller
-#define PCI_MEMORY_RAM                  0x0500
-#define PCI_MEMORY_FLASH                0x0501
-#define PCI_MEMORY_OTHER                0x0580
-
-// Bridge Device
-#define PCI_BRIDGE_HOST                 0x0600
-#define PCI_BRIDGE_ISA                  0x0601
-#define PCI_BRIDGE_EISA                 0x0602
-#define PCI_BRIDGE_MCA                  0x0603
-#define PCI_BRIDGE_PCI                  0x0604
-#define PCI_BRIDGE_PCMCIA               0x0605
-#define PCI_BRIDGE_NUBUS                0x0606
-#define PCI_BRIDGE_CARDBUS              0x0607
-#define PCI_BRIDGE_RACEWAY              0x0608
-#define PCI_BRIDGE_OTHER                0x0680
-
-// Simple Communication Controller
-#define PCI_COMM_SERIAL                 0x0700
-#define PCI_COMM_PARALLEL               0x0701
-#define PCI_COMM_MULTIPORT              0x0702
-#define PCI_COMM_MODEM                  0x0703
-#define PCI_COMM_GPIB                   0x0704
-#define PCI_COMM_SMARTCARD              0x0705
-#define PCI_COMM_OTHER                  0x0780
-
-// Base System Peripherals
-#define PCI_SYSTEM_PIC                  0x0800
-#define PCI_SYSTEM_DMA                  0x0801
-#define PCI_SYSTEM_TIMER                0x0802
-#define PCI_SYSTEM_RTC                  0x0803
-#define PCI_SYSTEM_PCI_HOTPLUG          0x0804
-#define PCI_SYSTEM_SD                   0x0805
-#define PCI_SYSTEM_OTHER                0x0880
-
-// Input Devices
-#define PCI_INPUT_KEYBOARD              0x0900
-#define PCI_INPUT_PEN                   0x0901
-#define PCI_INPUT_MOUSE                 0x0902
-#define PCI_INPUT_SCANNER               0x0903
-#define PCI_INPUT_GAMEPORT              0x0904
-#define PCI_INPUT_OTHER                 0x0980
-
-// Docking Stations
-#define PCI_DOCKING_GENERIC             0x0a00
-#define PCI_DOCKING_OTHER               0x0a80
-
-// Processors
-#define PCI_PROCESSOR_386               0x0b00
-#define PCI_PROCESSOR_486               0x0b01
-#define PCI_PROCESSOR_PENTIUM           0x0b02
-#define PCI_PROCESSOR_ALPHA             0x0b10
-#define PCI_PROCESSOR_POWERPC           0x0b20
-#define PCI_PROCESSOR_MIPS              0x0b30
-#define PCI_PROCESSOR_CO                0x0b40
-
-// Serial Bus Controllers
-#define PCI_SERIAL_FIREWIRE             0x0c00
-#define PCI_SERIAL_ACCESS               0x0c01
-#define PCI_SERIAL_SSA                  0x0c02
-#define PCI_SERIAL_USB                  0x0c03
-#define PCI_SERIAL_FIBER                0x0c04
-#define PCI_SERIAL_SMBUS                0x0c05
-
-#define PCI_SERIAL_USB_UHCI             0x00
-#define PCI_SERIAL_USB_OHCI             0x10
-#define PCI_SERIAL_USB_EHCI             0x20
-#define PCI_SERIAL_USB_XHCI             0x30
-#define PCI_SERIAL_USB_OTHER            0x80
-
-// Wireless Controllers
-#define PCI_WIRELESS_IRDA               0x0d00
-#define PCI_WIRLESSS_IR                 0x0d01
-#define PCI_WIRLESSS_RF                 0x0d10
-#define PCI_WIRLESSS_BLUETOOTH          0x0d11
-#define PCI_WIRLESSS_BROADBAND          0x0d12
-#define PCI_WIRLESSS_ETHERNET_A         0x0d20
-#define PCI_WIRLESSS_ETHERNET_B         0x0d21
-#define PCI_WIRELESS_OTHER              0x0d80
-
-// Intelligent I/O Controllers
-#define PCI_INTELLIGENT_I2O             0x0e00
-
-// Satellite Communication Controllers
-#define PCI_SATELLITE_TV                0x0f00
-#define PCI_SATELLITE_AUDIO             0x0f01
-#define PCI_SATELLITE_VOICE             0x0f03
-#define PCI_SATELLITE_DATA              0x0f04
-
-// Encryption/Decryption Controllers
-#define PCI_CRYPT_NETWORK               0x1000
-#define PCI_CRYPT_ENTERTAINMENT         0x1001
-#define PCI_CRYPT_OTHER                 0x1080
-
-// Data Acquisition and Signal Processing Controllers
-#define PCI_SP_DPIO                     0x1100
-#define PCI_SP_OTHER                    0x1180
-
-const char *pci_devname(uint32_t vendorid, uint32_t deviceid);
-const char *pci_classname(uint32_t classcode, uint32_t subclass, uint32_t progintf);
-
-#endif // PCI_REG_H_

kernel/proc/proc.c

@@ -19,6 +19,7 @@
 #include "intr/pic.h"
 #include "vmm/vmm.h"
 #include "proc/switch.h"
+#include "cjob/cjob.h"
 #include "elf.h"
 #include "errors.h"
 #include "kprintf.h"
@@ -174,7 +175,33 @@ Proc *proc_nextready(void) {
   }
 }
 
-void proc_reaper(void) {
+void proc_sched(void *cpustate) {
+  intr_disable();
+
+  memcpy(&PROCS.current->platformdata.trapframe, cpustate, sizeof(IntrStackFrame));
+  
+  PROCS.current = proc_nextready();
+
+  cjob_runjobs();
+
+  tss.rsp0 = (uint64_t)VIRT(PROCS.current->platformdata.kstack);
+  proc_switch(&PROCS.current->platformdata.trapframe, (void *)PROCS.current->platformdata.cr3);
+}
+
+void proc_kill(Proc *proc) {
+  spinlock_acquire(&PROCS.spinlock);
+  proc->state = PROC_ZOMBIE;
+  spinlock_release(&PROCS.spinlock);
+}
+
+void proc_killself(void) {
+  spinlock_acquire(&PROCS.spinlock);
+  Proc *proc = PROCS.current;
+  spinlock_release(&PROCS.spinlock);
+  proc_kill(proc);
+}
+
+void proc_gc_cjob(void *arg) {
   spinlock_acquire(&PROCS.spinlock);
   Proc *head, *tmp;
   LL_FOREACH_SAFE(PROCS.procs, head, tmp) {
@@ -222,41 +249,12 @@ void proc_reaper(void) {
   spinlock_release(&PROCS.spinlock);
 }
 
-void proc_tick(void) {
-  proc_reaper();
-  ipc_mbustick();
-}
-
-void proc_sched(void *cpustate) {
-  intr_disable();
-
-  memcpy(&PROCS.current->platformdata.trapframe, cpustate, sizeof(IntrStackFrame));
-  
-  PROCS.current = proc_nextready();
-
-  proc_tick();  
-
-  tss.rsp0 = (uint64_t)VIRT(PROCS.current->platformdata.kstack);
-  proc_switch(&PROCS.current->platformdata.trapframe, (void *)PROCS.current->platformdata.cr3);
-}
-
-void proc_kill(Proc *proc) {
-  spinlock_acquire(&PROCS.spinlock);
-  proc->state = PROC_ZOMBIE;
-  spinlock_release(&PROCS.spinlock);
-}
-
-void proc_killself(void) {
-  spinlock_acquire(&PROCS.spinlock);
-  Proc *proc = PROCS.current;
-  spinlock_release(&PROCS.spinlock);
-  proc_kill(proc);
-}
-
 void proc_init(void) {
   spinlock_init(&PROCS.spinlock);
   PROCS.procs = NULL;
 
+  cjob_register(&proc_gc_cjob, NULL);
+
   Proc *init = proc_spawnuser("base", "/bin/init");
   PROCS.current = init;
   proc_register(init);

kernel/proc/switch.S

@@ -2,10 +2,7 @@
 
 .global proc_switch
 proc_switch:
-  testq %rsi, %rsi
-  je 1f
   movq %rsi, %cr3
-1:
   mov %rdi, %rsp
   _pop_regs
   add $0x10, %rsp

kernel/spinlock/spinlock.c

@@ -6,8 +6,8 @@
 
 #define SPINLOCK_HINT() asm volatile("pause")
 
-struct {
-  uint64_t irq_flags;
+static struct {
+  volatile uint64_t irq_flags;
   atomic_int irq_nest;
 } IRQ_CTX = {0};
 

kernel/vfs/vfs.c

@@ -104,6 +104,31 @@ int32_t vfs_init_fat16(VfsMountPoint *mp, bool format) {
   return E_OK;
 }
 
+int32_t vfs_init_fat32(VfsMountPoint *mp, bool format) {
+  mp->fs.fatfs.instance.extra = mp;
+  fl_init(&mp->fs.fatfs.instance);
+  int err = fl_attach_media(&mp->fs.fatfs.instance, &portfatfs_diskio_read, &portfatfs_diskio_write);
+  if (err != FAT_INIT_OK) {
+    ERR("vfs", "FAT32 mount failed %d\n", err);
+    return E_MOUNTERR;
+  }
+  if (format) {
+    fatfs_format_fat32(&mp->fs.fatfs.instance,
+                       &mp->fs.fatfs.instance._fs,
+                       mp->backingsd->capacity(mp->backingsd) / FAT_SECTOR_SIZE,
+                       "MOP2 FAT32"
+    );
+  }
+
+  mp->cleanup     = &fatfs_cleanup;
+  mp->open        = &fatfs_open;
+  mp->stat        = &fatfs_stat;
+  mp->fetchdirent = &fatfs_fetchdirent;
+  mp->mkdir       = &fatfs_mkdir;
+  mp->delete      = &fatfs_delete;
+  return E_OK;
+}
+
 int32_t vfs_stat(char *mountpoint, const char *path, FsStat *stat) {
   VfsMountPoint *mp = NULL;
 
@@ -188,6 +213,9 @@ int32_t vfs_mount(char *mountpoint, int32_t fstype, StoreDev *backingsd, bool fo
     case VFS_FAT16:
       err = vfs_init_fat16(mp, format);
       break;
+    case VFS_FAT32:
+      err = vfs_init_fat32(mp, format);
+      break;
     default:
       return E_UNKNOWN_FSTYPE;
   }

legal/LICENSE-fat_io_lib.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

run/qemu-x86_64-hdd.sh

@@ -6,6 +6,6 @@ qemu-system-x86_64 \
   -machine pc \
   -m 4G \
   -boot d \
-  -serial stdio \
-  -drive file=disk.hdd,format=raw,if=ide \
+  -hda disk.hdd \
+  -device pci-serial,chardev=char0 -chardev stdio,id=char0 \
   $@

share/errors.h

@@ -17,6 +17,8 @@
 #define E_SPAWNERROR       -13
 #define E_NOTYET           -14
 #define E_MOUNTERR         -15
+#define E_DEVLOCKED        -16
+#define E_DEVNOTYOURLOCK   -17
 
 #if !defined(__ASSEMBLER__)
 
@@ -38,6 +40,8 @@ static const char *_ERROR_STRINGS[] = {
   "Process spawn error",
   "Data isn't ready yet",
   "File system mount error",
+  "This device is locked",
+  "Device is hasn't been locked by this process",
 };
 
 #define ERRSTRING_INDEX(ioh) ((size_t)((ioh) < 0 ? (ioh) * (-1) : (ioh)))

share/sysdefs/dev.h

@@ -4,11 +4,6 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#define DEV_SERIALDEV_SENDB     0
-#define DEV_SERIALDEV_SENDREADY 1
-#define DEV_SERIALDEV_RECVB     2
-#define DEV_SERIALDEV_RECVREADY 3
-
 #define DEV_STOREDEV_READ       0
 #define DEV_STOREDEV_WRITE      1
 #define DEV_STOREDEV_SECCOUNT   2

ulib/Makefile

@@ -10,7 +10,6 @@ SRCFILES := $(call GRABSRC, \
 							string \
 							system \
 							printf \
-							sync \
 							args \
 							util \
 							ubsan \

ulib/_premain.c

@@ -9,8 +9,8 @@
 #include <umalloc/umalloc.h>
 
 extern void main(void);
-extern uint8_t _bss_start[];
-extern uint8_t _bss_end[];
+extern volatile uint8_t _bss_start[];
+extern volatile uint8_t _bss_end[];
 
 void clearbss(void) {
   uint8_t *p = _bss_start;
@@ -20,7 +20,7 @@ void clearbss(void) {
 }
 
 #define MAX_ARGS 25
-static char *_args[MAX_ARGS];
+static volatile char *_args[MAX_ARGS];
 
 size_t _argslen;
 
@@ -40,7 +40,7 @@ void _premain(void) {
     _args[i] = umalloc(PROC_ARG_MAX);
   }
 
-  proc_argv(-1, &_argslen, _args, MAX_ARGS);
+  proc_argv(-1, &_argslen, (char **)_args, MAX_ARGS);
 
   main();
   proc_kill(proc_getpid());

ulib/_start.S

@@ -4,4 +4,9 @@
 
 .global _start
 _start:
+  xor %rbp, %rbp
+  mov %rsp, %rbp
+  and $-0x10, %rsp
+  sub $0x8, %rsp
+
   call _premain

ulib/sync/spinlock.c

@@ -1,18 +0,0 @@
-#include <stdatomic.h>
-#include <sync/spinlock.h>
-
-#define HINT() asm volatile("pause");
-
-void spinlock_init(SpinLock *sl) {
-  atomic_store(&sl->lock, false);
-}
-
-void spinlock_acquire(SpinLock *sl) {
-  while (atomic_test_and_set_explicit(&sl->lock, memory_order_release)) {
-    HINT();
-  }
-}
-
-void spinlock_release(SpinLock *sl) {
-  atomic_clear_flag_explicit(&sl->lock, memory_order_release);
-}

ulib/sync/spinlock.h

@@ -1,14 +0,0 @@
-#ifndef ULIB_SYNC_SPINLOCK_H_
-#define ULIB_SYNC_SPINLOCK_H_
-
-#include <stdatomic.h>
-
-typedef struct {
-  atomic_bool lock;
-} SpinLock;
-
-void spinlock_init(SpinLock *sl);
-void spinlock_acquire(SpinLock *sl);
-void spinlock_release(SpinLock *sl);
-
-#endif // ULIB_SYNC_SPINLOCK_H_

ulib/ulib.h

@@ -7,7 +7,6 @@
 #include <string/stringbuffer.h>
 #include <string/conv.h>
 #include <string/char.h>
-#include <sync/spinlock.h>
 #include <syscall/syscall.h>
 #include <system/system.h>
 #include <util/util.h>

user/diagdummy/diagdummy.c

@@ -1,7 +1,8 @@
 #include <ulib.h>
 
 #define CMDS(X)           \
-  X(block)      X(openf)
+  X(block)      X(openf)  \
+  X(srpr)       X(srpr2)  \
 
 void main(void) {
   if (argslen() == 0) {

user/diagdummy/serial.c

@@ -0,0 +1,49 @@
+#include <stdint.h>
+#include <stddef.h>
+#include <ulib.h>
+
+#define SENDB     0
+#define SENDREADY 1
+#define RECVB     2
+#define RECVREADY 3
+#define LOCK      4
+#define UNLOCK    5
+
+void diagdummy_srpr(void) {
+  char *str = "Hello world\n";
+
+  if (argslen() >= 2) {
+    str = args()[1];
+  }
+
+  Dev_t serialdev;
+  dev_gethandle(&serialdev, "serialdev");
+
+  char *s = str;
+  while (*s) {
+    while(!dev_cmd(&serialdev, SENDREADY, NULL, 0));
+    dev_cmd(&serialdev, SENDB, s, 1);
+    s++;
+  }
+}
+
+void diagdummy_srpr2(void) {
+  if (argslen() < 2) {
+    return;
+  }
+    
+  char *str = args()[1];
+
+  Dev_t serialdev;
+  dev_gethandle(&serialdev, "serialdev");
+
+  while(dev_cmd(&serialdev, LOCK, NULL, 0) != E_OK);
+
+  for (;;) {
+    while (!dev_cmd(&serialdev, SENDREADY, NULL, 0));
+    dev_cmd(&serialdev, SENDB, str, 1);
+    schedsleep(500);
+  }
+
+  dev_cmd(&serialdev, UNLOCK, NULL, 0);
+}