Detect ATA driver via PCI

kernel/dev/ps2kbdev.c

@@ -117,7 +117,7 @@ static uint8_t ctlmap[256] =
   [0xc7] KB_HOME,
 };
 
-int32_t ps2kb_intr(void) {
+int32_t ps2kbdev_keycode(void) {
   static uint8_t shift;
   static uint8_t *charcode[4] = { normalmap, shiftmap, ctlmap, ctlmap };
   uint32_t st, data, c;
@@ -156,23 +156,21 @@ int32_t ps2kb_intr(void) {
 
 IpcMBus *PS2KB_MBUS;
 
-int ps2kbdev_intr(IntrStackFrame *frame) {
+void ps2kbdev_intr(IntrStackFrame *frame) {
   (void)frame;
 
-  int32_t c = ps2kb_intr();
+  int32_t c = ps2kbdev_keycode();
   if (c >= 0) {
     uint8_t b = c;
     ipc_mbuspublish("ps2kb", &b);
   }
-
-  return 0;
 }
 
 void ps2kbdev_init(void) {
-  intr_attchhandler(&ps2kbdev_intr, INTR_IRQBASE+1);
-
   Dev *ps2kbdev;
   HSHTB_ALLOC(DEVTABLE.devs, ident, "ps2kbdev", ps2kbdev);
   spinlock_init(&ps2kbdev->spinlock);
   PS2KB_MBUS = ipc_mbusmake("ps2kb", 1, 0x100);
+  
+  intr_attchhandler(&ps2kbdev_intr, INTR_IRQBASE+1);
 }

kernel/intr/intr.c

@@ -19,14 +19,14 @@
 
 typedef struct IntrHandler {
   struct IntrHandler *next;
-  int (*fn)(IntrStackFrame *frame);
+  void (*fn)(IntrStackFrame *frame);
   int irq;
 } IntrHandler;
 
 IntrHandler *INTR_HANDLERS = NULL;
 SpinLock INTR_HANDLERS_SPINLOCK;
 
-void intr_attchhandler(int (*fn)(IntrStackFrame *frame), int irq) {
+void intr_attchhandler(void (*fn)(IntrStackFrame *frame), int irq) {
   IntrHandler *ih = dlmalloc(sizeof(*ih));
   ih->fn = fn;
   ih->irq = irq;
@@ -186,7 +186,6 @@ void intr_init(void) {
   idt_init();
   intr_pic_init();
   intr_pit_init();
-  intr_disable();
 }
 
 void intr_dumpframe(IntrStackFrame *frame) {
@@ -246,13 +245,19 @@ void intr_handleintr(IntrStackFrame *frame) {
       cpu_hang();
     }
   } else if (frame->trapnum >= 32 && frame->trapnum <= 47) {
-    IntrHandler *ih, *ihtmp;
+    if (frame->trapnum == INTR_IRQBASE+0) {
-    LL_FOREACH_SAFE(INTR_HANDLERS, ih, ihtmp) {
+      PIT_TICKS++;
-      if ((uint64_t)ih->irq == frame->trapnum) {
+      intr_pic_eoi(frame->trapnum >= 40);
-        ih->fn(frame);
+      proc_sched((void *)frame);
+    } else {
+      IntrHandler *ih, *ihtmp;
+      LL_FOREACH_SAFE(INTR_HANDLERS, ih, ihtmp) {
+        if ((uint64_t)ih->irq == frame->trapnum) {
+          ih->fn(frame);
+        }
       }
+      intr_pic_eoi(frame->trapnum >= 40);
     }
-    intr_pic_eoi();
   } else if (frame->trapnum == 0x80) {
     intr_syscalldispatch(frame);
   }

kernel/intr/intr.h

@@ -35,7 +35,7 @@ typedef struct {
   uint64_t ss;
 } PACKED IntrStackFrame;
 
-void intr_attchhandler(int (*fn)(IntrStackFrame *frame), int irq);
+void intr_attchhandler(void (*fn)(IntrStackFrame *frame), int irq);
 int32_t intr_dttchhandler(int irq);
 void intr_disable(void);
 void intr_enable(void);

kernel/intr/pic.c

@@ -25,22 +25,44 @@
 
 void intr_pic_init(void) {
   io_out8(PIC1_CMD, ICW1_INIT | ICW1_ICW4);
+  io_wait();
   io_out8(PIC2_CMD, ICW1_INIT | ICW1_ICW4);
+  io_wait();
 
   io_out8(PIC1_DATA, INTR_IRQBASE);
+  io_wait();
   io_out8(PIC2_DATA, INTR_IRQBASE+8);
+  io_wait();
 
   io_out8(PIC1_DATA, 2);
+  io_wait();
   io_out8(PIC2_DATA, 2);
+  io_wait();
 
   io_out8(PIC1_DATA, ICW4_8086);
+  io_wait();
   io_out8(PIC2_DATA, ICW4_8086);
+  io_wait();
 
-  io_out8(PIC1_DATA, 0);
+  intr_pic_mask();
-  io_out8(PIC2_DATA, 0);
 }
 
-void intr_pic_eoi(void) {
+void intr_pic_mask(void) {
-  io_out8(PIC2_CMD, PIC_EOI);
+  io_out8(PIC1_DATA, 0xFF);
+  io_wait();
+  io_out8(PIC2_DATA, 0xFF);
+  io_wait();
+}
+
+void intr_pic_unmask(void) {
+  io_out8(PIC1_DATA, 0);
+  io_wait();
+  io_out8(PIC2_DATA, 0);
+  io_wait();
+}
+
+void intr_pic_eoi(bool pic2) {
+  if (pic2)
+    io_out8(PIC2_CMD, PIC_EOI);
   io_out8(PIC1_CMD, PIC_EOI);
 }

kernel/intr/pic.h

@@ -1,7 +1,11 @@
 #ifndef INTR_PIC_H_
 #define INTR_PIC_H_
 
+#include <stdbool.h>
+
 void intr_pic_init(void);
-void intr_pic_eoi(void);
+void intr_pic_eoi(bool pic2);
+void intr_pic_mask(void);
+void intr_pic_unmask(void);
 
 #endif // INTR_PIC_H_

kernel/intr/pit.c

@@ -31,14 +31,7 @@ void intr_pit_wait(uint32_t ms) {
   while (PIT_TICKS - now < ms);
 }
 
-int intr_pit_intr(IntrStackFrame *frame) {
-  PIT_TICKS++;
-  return 0;
-}
-
 void intr_pit_init(void) {
-  intr_attchhandler(&intr_pit_intr, INTR_IRQBASE+0);
-
   uint32_t hz = 1000;
   uint32_t div = PIT_FREQ / hz;
   io_out8(PIT_CMD, PIT_CMD_BINARY | PIT_CMD_MODE3 | PIT_CMD_RW_BOTH | PIT_CMD_COUNTER0);

kernel/io/io.c

@@ -45,3 +45,7 @@ void io_outs16(uint16_t port, const void *addr, int cnt) {
     : "memory", "cc"
   );
 }
+
+void io_wait(void) {
+  io_out8(0x80, 0);
+}

kernel/io/io.h

@@ -15,4 +15,6 @@ void io_out32(uint16_t port, uint32_t value);
 void io_ins16(uint16_t port, void *addr, int cnt);
 void io_outs16(uint16_t port, const void *addr, int cnt);
 
+void io_wait(void);
+
 #endif // IO_IO_H_

kernel/kmain.c

@@ -49,11 +49,11 @@ void kmain(void) {
   pmm_init();
   vmm_init();
   intr_init();
-  pci_init();
   randcrypto_init();
   ipc_mbusinit();
   dev_init();
   storedev_init();
+  pci_init();
   diskpart_init();
   baseimg_init();
   vfs_init();

kernel/pci/ide.c

@@ -0,0 +1,44 @@
+#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

@@ -0,0 +1,8 @@
+#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

@@ -5,6 +5,7 @@
 #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) {
@@ -76,6 +77,7 @@ void pci_getbar(PciBar *bar, uint32_t id, uint32_t idx) {
 }
 
 static PciMatch PCI_MATCHES[] = {
+  { 0x8086, 0x7010, &pci_ide_init },
 };
   
 void pci_visit(uint32_t bus, uint32_t dev, uint32_t fn) {
@@ -103,8 +105,7 @@ void pci_visit(uint32_t bus, uint32_t dev, uint32_t fn) {
       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)
+    if (PCI_MATCHES[i].k1 == devinfo.vendorid && PCI_MATCHES[i].k2 == devinfo.deviceid) {
-     || (PCI_MATCHES[i].k1 == devinfo.classcode && PCI_MATCHES[i].k2 == devinfo.subclass)) {
       PCI_MATCHES[i].initfn(&devinfo);
     }
   }

kernel/pci/pci.h

@@ -82,6 +82,7 @@ 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);
 
 void pci_init(void);
 

kernel/proc/proc.c

@@ -253,23 +253,17 @@ void proc_killself(void) {
   proc_kill(proc);
 }
 
-int proc_intr(IntrStackFrame *frame) {
-  intr_pic_eoi();
-  proc_sched(frame);
-  return 0;
-}
-
 void proc_init(void) {
   spinlock_init(&PROCS.spinlock);
   PROCS.procs = NULL;
 
-  intr_attchhandler(&proc_intr, INTR_IRQBASE+0);
-
   Proc *init = proc_spawnuser("base", "/bin/init");
   PROCS.current = init;
   proc_register(init);
   init->state = PROC_READY;
 
+  intr_pic_unmask();
+
   tss.rsp0 = (uint64_t)VIRT(PROCS.current->platformdata.kstack);
   proc_switch(&PROCS.current->platformdata.trapframe, (void *)PROCS.current->platformdata.cr3);
 }

kernel/spinlock/spinlock.c

@@ -17,7 +17,7 @@ void spinlock_init(SpinLock *sl) {
 
 uint64_t irqsave(void) {
   uint64_t flags;
-  asm volatile("pushfq; cli; popq %0" : "=r"(flags) :: "memory", "cc");
+  asm volatile("pushfq; popq %0; cli" : "=r"(flags) :: "memory", "cc");
   return flags;
 }
 
@@ -43,7 +43,6 @@ void irqrestore_nested(void) {
 
 void spinlock_acquire(SpinLock *sl) {
   irqsave_nested();
-
   while (atomic_test_and_set_explicit(&sl->lock, memory_order_acquire)) {
     SPINLOCK_HINT();
   }

kernel/storedev/atasd.c

@@ -106,67 +106,6 @@ uint64_t ata_probesize_bytes(uint16_t iobase, uint16_t ctrlbase, int devno) {
   }
 }
 
-void ata_probe(void) {
-  uint64_t probesize;
-
-  probesize = ata_probesize_bytes(0x1F0, 0x3F6, ATA_MASTER);
-  if (probesize > 0) {
-
-    char hs[20];
-    LOG("ata", "found ATA primary bus master, size = %s\n", human_size(probesize, hs, sizeof(hs)));
-
-    AtaSdInitExtra extra = {
-      .devno = ATA_MASTER,
-      .capacity = probesize,
-      .iobase = 0x1F0,
-      .ctrlbase = 0x3F6,
-    };
-    storedev_create(STOREDEV_ATASD, "atasd0m", (void *)&extra);
-  }
-
-  probesize = ata_probesize_bytes(0x1F0, 0x3F6, ATA_SLAVE);
-  if (probesize > 0) {
-    char hs[20];
-    LOG("ata", "found ATA primary bus slave, size = %s\n", human_size(probesize, hs, sizeof(hs)));
-
-    AtaSdInitExtra extra = {
-      .devno = ATA_SLAVE,
-      .capacity = probesize,
-      .iobase = 0x1F0,
-      .ctrlbase = 0x3F6,
-    };
-    storedev_create(STOREDEV_ATASD, "atasd0s", (void *)&extra);
-  }
-  
-  probesize = ata_probesize_bytes(0x170, 0x376, ATA_MASTER);
-  if (probesize > 0) {
-    char hs[20];
-    LOG("ata", "found ATA secondary bus master, size = %s\n", human_size(probesize, hs, sizeof(hs)));
-
-    AtaSdInitExtra extra = {
-      .devno = ATA_MASTER,
-      .capacity = probesize,
-      .iobase = 0x170,
-      .ctrlbase = 0x376,
-    };
-    storedev_create(STOREDEV_ATASD, "atasd1m", (void *)&extra);
-  }
-
-  probesize = ata_probesize_bytes(0x170, 0x376, ATA_SLAVE);
-  if (probesize > 0) {
-    char hs[20];
-    LOG("ata", "found ATA secondary bus slave, size = %s\n", human_size(probesize, hs, sizeof(hs)));
-
-    AtaSdInitExtra extra = {
-      .devno = ATA_SLAVE,
-      .capacity = probesize,
-      .iobase = 0x170,
-      .ctrlbase = 0x376,
-    };
-    storedev_create(STOREDEV_ATASD, "atasd1s", (void *)&extra);
-  }
-}
-
 void ata_setup(uint16_t iobase, uint16_t ctrlbase, int devno, uint16_t sectors, uint64_t lba) {
   io_out8(ctrlbase, 0x02);
   

kernel/storedev/atasd.h

@@ -28,7 +28,6 @@ int32_t atasd_read(struct StoreDev *sd, uint8_t *const buffer, ptrdiff_t sector,
 int32_t atasd_write(struct StoreDev *sd, const uint8_t *const buffer, ptrdiff_t sector, ptrdiff_t off, size_t size);
 int32_t atasd_cleanup(struct StoreDev *sd);
 size_t atasd_capacity(struct StoreDev *sd);
-
+uint64_t ata_probesize_bytes(uint16_t iobase, uint16_t ctrlbase, int devno);
-void ata_probe(void);
 
 #endif // STOREDEV_ATASD_H_

kernel/storedev/storedev.c

@@ -21,8 +21,6 @@ void storedev_init(void) {
   STOREDEV_LIST.head = NULL;
 
   LOG("storedev", "init\n");
-
-  ata_probe();
 }
 
 int32_t storedev_dev_read(Dev *dev, uint8_t *buffer, size_t len, uint64_t pid) {

run/qemu-x86_64-hdd.sh

@@ -3,7 +3,7 @@
 set -x
 
 qemu-system-x86_64 \
-  -cpu IvyBridge \
+  -machine pc \
   -m 4G \
   -boot d \
   -serial stdio \