Unifying the Lunaix's Physical Memory Model (#28)

[lunaix-os.git] / lunaix-os / hal / ahci / ahci.c

diff --git a/lunaix-os/hal/ahci/ahci.c b/lunaix-os/hal/ahci/ahci.c
index 33dc87e3a05287e859baebcdd06c1f6b4e337aeb..11e16214b7afa07f269f47dc9ef141efa0fac901 100644 (file)
--- a/lunaix-os/hal/ahci/ahci.c
+++ b/lunaix-os/hal/ahci/ahci.c
@@ -21,9 +21,8 @@
 #include <lunaix/block.h>
 #include <lunaix/isrm.h>
 #include <lunaix/mm/mmio.h>
 #include <lunaix/block.h>
 #include <lunaix/isrm.h>
 #include <lunaix/mm/mmio.h>

-#include <lunaix/mm/pmm.h>

 #include <lunaix/mm/valloc.h>
 #include <lunaix/mm/valloc.h>

-#include <lunaix/mm/vmm.h>
+#include <lunaix/mm/page.h>

 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 


@@ -49,9 +48,6 @@ static struct devclass ahci_class = AHCI_DEVCLASS;
 extern void
 ahci_fsexport(struct block_dev* bdev, void* fs_node);
 
 extern void
 ahci_fsexport(struct block_dev* bdev, void* fs_node);
 

-extern void
-__ahci_hba_isr(const isr_param* param);
-

 extern void
 __ahci_blkio_handler(struct blkio_req* req);
 
 extern void
 __ahci_blkio_handler(struct blkio_req* req);
 


@@ -80,32 +76,18 @@ __hba_reset_port(hba_reg_t* port_reg)
     port_reg[HBA_RPxSCTL] &= ~0xf;
 }
 
     port_reg[HBA_RPxSCTL] &= ~0xf;
 }
 

-int
-ahci_driver_init(struct device_def* def, struct device* dev)
+struct ahci_driver*
+ahci_driver_init(struct ahci_driver_param* param)

 {
 {

-    struct pci_device* ahci_dev = container_of(dev, struct pci_device, dev);
-
-    struct pci_base_addr* bar6 = &ahci_dev->bar[5];
-    assert_msg(bar6->type & BAR_TYPE_MMIO, "AHCI: BAR#6 is not MMIO.");
-
-    pci_reg_t cmd = pci_read_cspace(ahci_dev->cspace_base, PCI_REG_STATUS_CMD);
-
-    // 禁用传统中断（因为我们使用MSI），启用MMIO访问，允许PCI设备间访问
-    cmd |= (PCI_RCMD_MM_ACCESS | PCI_RCMD_DISABLE_INTR | PCI_RCMD_BUS_MASTER);
-
-    pci_write_cspace(ahci_dev->cspace_base, PCI_REG_STATUS_CMD, cmd);
-
-    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;
     struct ahci_driver* ahci_drv = vzalloc(sizeof(*ahci_drv));
     struct ahci_hba* hba = &ahci_drv->hba;

-    ahci_drv->id = iv;
+    ahci_drv->id = param->ahci_iv;
+
+    isrm_set_payload(param->ahci_iv, (ptr_t)&ahcis);

 
     llist_append(&ahcis, &ahci_drv->ahci_drvs);
 
 
     llist_append(&ahcis, &ahci_drv->ahci_drvs);
 

-    hba->base = (hba_reg_t*)ioremap(bar6->start, bar6->size);
+    hba->base = (hba_reg_t*)ioremap(param->mmio_base, param->mmio_size);

 
 #ifdef DO_HBA_FULL_RESET
     // 重置HBA
 
 #ifdef DO_HBA_FULL_RESET
     // 重置HBA


@@ -145,16 +127,19 @@ ahci_driver_init(struct device_def* def, struct device* dev)
         __hba_reset_port(port_regs);
 #endif
 
         __hba_reset_port(port_regs);
 #endif
 

+        struct leaflet* leaflet;

         if (!clbp) {
             // 每页最多4个命令队列
         if (!clbp) {
             // 每页最多4个命令队列

-            clb_pa = pmm_alloc_page(KERNEL_PID, PP_FGLOCKED);
-            clb_pg_addr = (ptr_t)ioremap(clb_pa, 0x1000);
+            leaflet = alloc_leaflet(0);
+            clb_pa = leaflet_addr(leaflet);
+            clb_pg_addr = vmap(leaflet, KERNEL_DATA);

             memset((void*)clb_pg_addr, 0, 0x1000);
         }
         if (!fisp) {
             // 每页最多16个FIS
             memset((void*)clb_pg_addr, 0, 0x1000);
         }
         if (!fisp) {
             // 每页最多16个FIS

-            fis_pa = pmm_alloc_page(KERNEL_PID, PP_FGLOCKED);
-            fis_pg_addr = (ptr_t)ioremap(fis_pa, 0x1000);
+            leaflet = alloc_leaflet(0);
+            fis_pa = leaflet_addr(leaflet);
+            fis_pg_addr = vmap(leaflet, KERNEL_DATA);

             memset((void*)fis_pg_addr, 0, 0x1000);
         }
 
             memset((void*)fis_pg_addr, 0, 0x1000);
         }
 


@@ -186,7 +171,7 @@ ahci_driver_init(struct device_def* def, struct device* dev)
         port_regs[HBA_RPxCMD] |= HBA_PxCMD_ST;
 
         if (!ahci_init_device(port)) {
         port_regs[HBA_RPxCMD] |= HBA_PxCMD_ST;
 
         if (!ahci_init_device(port)) {

-            kprintf(KERROR "init fail: 0x%x@p%d", port->regs[HBA_RPxSIG], i);
+            ERROR("init fail: 0x%x@p%d", port->regs[HBA_RPxSIG], i);

             continue;
         }
 
             continue;
         }
 


@@ -200,8 +185,7 @@ ahci_driver_init(struct device_def* def, struct device* dev)
         ahci_register_device(hbadev);
     }
 
         ahci_register_device(hbadev);
     }
 

-    pci_bind_instance(ahci_dev, ahci_drv);
-    return 0;
+    return ahci_drv;

 }
 
 void
 }
 
 void


@@ -441,12 +425,3 @@ achi_register_ops(struct hba_port* port)
         port->device->ops.submit = scsi_submit;
     }
 }
         port->device->ops.submit = scsi_submit;
     }
 }

-
-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