X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/45e1f8b055043e54be35462852ab6649d634da7c..8c06c883e7b13c115d5ff207f79d4b68fccd5ad6:/lunaix-os/hal/ahci/ahci.c

diff --git a/lunaix-os/hal/ahci/ahci.c b/lunaix-os/hal/ahci/ahci.c
index 249b699..33dc87e 100644
--- a/lunaix-os/hal/ahci/ahci.c
+++ b/lunaix-os/hal/ahci/ahci.c
@@ -12,8 +12,11 @@
 #include <hal/ahci/hba.h>
 #include <hal/ahci/sata.h>
 #include <hal/ahci/scsi.h>
-
 #include <hal/pci.h>
+
+#include <sys/pci_hba.h>
+#include <sys/port_io.h>
+
 #include <klibc/string.h>
 #include <lunaix/block.h>
 #include <lunaix/isrm.h>
@@ -28,18 +31,21 @@
 #define HBA_CLB_SIZE 1024
 
 #define HBA_MY_IE (HBA_PxINTR_DHR | HBA_PxINTR_TFE | HBA_PxINTR_OF)
+#define AHCI_DEVCLASS DEVCLASS(DEVIF_PCI, DEVFN_STORAGE, DEV_SATA)
 
 // #define DO_HBA_FULL_RESET
 
 LOG_MODULE("AHCI")
 
-struct llist_header ahcis;
+DEFINE_LLIST(ahcis);
 
 static char sata_ifs[][20] = { "Not detected",
                                "SATA I (1.5Gbps)",
                                "SATA II (3.0Gbps)",
                                "SATA III (6.0Gbps)" };
 
+static struct devclass ahci_class = AHCI_DEVCLASS;
+
 extern void
 ahci_fsexport(struct block_dev* bdev, void* fs_node);
 
@@ -58,9 +64,6 @@ achi_register_ops(struct hba_port* port);
 void
 ahci_register_device(struct hba_device* hbadev);
 
-void*
-ahci_driver_init(struct pci_device* ahci_dev);
-
 void
 __hba_reset_port(hba_reg_t* port_reg)
 {
@@ -73,20 +76,15 @@ __hba_reset_port(hba_reg_t* port_reg)
     }
     // 如果port未响应，则继续执行重置
     port_reg[HBA_RPxSCTL] = (port_reg[HBA_RPxSCTL] & ~0xf) | 1;
-    io_delay(100000); // 等待至少一毫秒，差不多就行了
+    port_delay(100000); // 等待至少一毫秒，差不多就行了
     port_reg[HBA_RPxSCTL] &= ~0xf;
 }
 
-void
-ahci_init()
+int
+ahci_driver_init(struct device_def* def, struct device* dev)
 {
-    llist_init_head(&ahcis);
-    pci_add_driver("Serial ATA AHCI", AHCI_HBA_CLASS, 0, 0, ahci_driver_init);
-}
+    struct pci_device* ahci_dev = container_of(dev, struct pci_device, dev);
 
-void*
-ahci_driver_init(struct pci_device* ahci_dev)
-{
     struct pci_base_addr* bar6 = &ahci_dev->bar[5];
     assert_msg(bar6->type & BAR_TYPE_MMIO, "AHCI: BAR#6 is not MMIO.");
 
@@ -99,6 +97,7 @@ ahci_driver_init(struct pci_device* ahci_dev)
 
     int iv = isrm_ivexalloc(__ahci_hba_isr);
     pci_setup_msi(ahci_dev, iv);
+    isrm_set_payload(iv, (ptr_t)&ahcis);
 
     struct ahci_driver* ahci_drv = vzalloc(sizeof(*ahci_drv));
     struct ahci_hba* hba = &ahci_drv->hba;
@@ -187,12 +186,12 @@ ahci_driver_init(struct pci_device* ahci_dev)
         port_regs[HBA_RPxCMD] |= HBA_PxCMD_ST;
 
         if (!ahci_init_device(port)) {
-            kprintf(KERROR "init fail: 0x%x@p%d\n", port->regs[HBA_RPxSIG], i);
+            kprintf(KERROR "init fail: 0x%x@p%d", port->regs[HBA_RPxSIG], i);
             continue;
         }
 
         struct hba_device* hbadev = port->device;
-        kprintf(KINFO "sata%d: %s, blk_size=%d, blk=0..%d\n",
+        kprintf(KINFO "sata%d: %s, blk_size=%d, blk=0..%d",
                 i,
                 hbadev->model,
                 hbadev->block_size,
@@ -201,7 +200,8 @@ ahci_driver_init(struct pci_device* ahci_dev)
         ahci_register_device(hbadev);
     }
 
-    return ahci_drv;
+    pci_bind_instance(ahci_dev, ahci_drv);
+    return 0;
 }
 
 void
@@ -212,6 +212,7 @@ ahci_register_device(struct hba_device* hbadev)
 
     bdev->end_lba = hbadev->max_lba;
     bdev->blk_size = hbadev->block_size;
+    bdev->class = &ahci_class;
 
     block_mount(bdev, ahci_fsexport);
 }
@@ -439,4 +440,13 @@ achi_register_ops(struct hba_port* port)
     } else {
         port->device->ops.submit = scsi_submit;
     }
-}
\ No newline at end of file
+}
+
+static struct pci_device_def ahcidef = {
+    .dev_class = AHCI_HBA_CLASS,
+    .ident_mask = PCI_MATCH_ANY,
+    .devdef = { .class = DEVCLASS(DEVIF_PCI, DEVFN_STORAGE, DEV_SATA),
+                .name = "Serial ATA Controller",
+                .bind = ahci_driver_init }
+};
+EXPORT_PCI_DEVICE(ahci, &ahcidef);
\ No newline at end of file