rework external irq system, introduce hierarchical irq

[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 249b6992cfbd119dd57b6e88ceacf7a8991d8e8e..7d0b9b2396c18ee9447313e34e72a4afe1b0330a 100644 (file)
--- a/lunaix-os/hal/ahci/ahci.c
+++ b/lunaix-os/hal/ahci/ahci.c
@@ -12,15 +12,16 @@
 #include <hal/ahci/hba.h>
 #include <hal/ahci/sata.h>
 #include <hal/ahci/scsi.h>
 #include <hal/ahci/hba.h>
 #include <hal/ahci/sata.h>
 #include <hal/ahci/scsi.h>

-

 #include <hal/pci.h>
 #include <hal/pci.h>

+
+#include <asm/x86_pmio.h>
+

 #include <klibc/string.h>
 #include <lunaix/block.h>
 #include <klibc/string.h>
 #include <lunaix/block.h>

-#include <lunaix/isrm.h>
+#include <asm-generic/isrm.h>

 #include <lunaix/mm/mmio.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>
 


@@ -28,23 +29,23 @@
 #define HBA_CLB_SIZE 1024
 
 #define HBA_MY_IE (HBA_PxINTR_DHR | HBA_PxINTR_TFE | HBA_PxINTR_OF)
 #define HBA_CLB_SIZE 1024
 
 #define HBA_MY_IE (HBA_PxINTR_DHR | HBA_PxINTR_TFE | HBA_PxINTR_OF)

+#define AHCI_DEVCLASS DEVCLASS(LUNAIX, STORAGE, SATA)

 
 // #define DO_HBA_FULL_RESET
 
 LOG_MODULE("AHCI")
 
 
 // #define DO_HBA_FULL_RESET
 
 LOG_MODULE("AHCI")
 

-struct llist_header ahcis;
+static DEFINE_LLIST(ahcis);

 
 static char sata_ifs[][20] = { "Not detected",
                                "SATA I (1.5Gbps)",
                                "SATA II (3.0Gbps)",
                                "SATA III (6.0Gbps)" };
 
 
 static char sata_ifs[][20] = { "Not detected",
                                "SATA I (1.5Gbps)",
                                "SATA II (3.0Gbps)",
                                "SATA III (6.0Gbps)" };
 

-extern void
-ahci_fsexport(struct block_dev* bdev, void* fs_node);
+static struct devclass ahci_class = AHCI_DEVCLASS;

 
 extern void
 
 extern void

-__ahci_hba_isr(const isr_param* param);
+ahci_fsexport(struct block_dev* bdev, void* fs_node);

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


@@ -58,9 +59,6 @@ achi_register_ops(struct hba_port* port);
 void
 ahci_register_device(struct hba_device* hbadev);
 
 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)
 {
 void
 __hba_reset_port(hba_reg_t* port_reg)
 {


@@ -73,40 +71,21 @@ __hba_reset_port(hba_reg_t* port_reg)
     }
     // 如果port未响应，则继续执行重置
     port_reg[HBA_RPxSCTL] = (port_reg[HBA_RPxSCTL] & ~0xf) | 1;
     }
     // 如果port未响应，则继续执行重置
     port_reg[HBA_RPxSCTL] = (port_reg[HBA_RPxSCTL] & ~0xf) | 1;

-    io_delay(100000); // 等待至少一毫秒，差不多就行了
+    port_delay(100000); // 等待至少一毫秒，差不多就行了

     port_reg[HBA_RPxSCTL] &= ~0xf;
 }
 
     port_reg[HBA_RPxSCTL] &= ~0xf;
 }
 

-void
-ahci_init()
+struct ahci_driver*
+ahci_driver_init(struct ahci_driver_param* param)

 {
 {

-    llist_init_head(&ahcis);
-    pci_add_driver("Serial ATA AHCI", AHCI_HBA_CLASS, 0, 0, ahci_driver_init);
-}
-
-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.");
-
-    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);
-

     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->irq->vector;

 
 

+    irq_set_payload(param->irq, &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


@@ -146,16 +125,19 @@ ahci_driver_init(struct pci_device* ahci_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);
         }
 


@@ -187,12 +169,12 @@ ahci_driver_init(struct pci_device* ahci_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\n", port->regs[HBA_RPxSIG], i);
+            ERROR("init fail: 0x%x@p%d", port->regs[HBA_RPxSIG], i);

             continue;
         }
 
         struct hba_device* hbadev = port->device;
             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,
                 i,
                 hbadev->model,
                 hbadev->block_size,


@@ -212,6 +194,7 @@ ahci_register_device(struct hba_device* hbadev)
 
     bdev->end_lba = hbadev->max_lba;
     bdev->blk_size = hbadev->block_size;
 
     bdev->end_lba = hbadev->max_lba;
     bdev->blk_size = hbadev->block_size;

+    bdev->class = &ahci_class;

 
     block_mount(bdev, ahci_fsexport);
 }
 
     block_mount(bdev, ahci_fsexport);
 }


@@ -271,6 +254,7 @@ hba_bind_vbuf(struct hba_cmdh* cmdh, struct hba_cmdt* cmdt, struct vecbuf* vbuf)
     do {
         assert_msg(i < HBA_MAX_PRDTE, "HBA: Too many PRDTEs");
         assert_msg(pos->buf.size <= 0x400000U, "HBA: Buffer too big");
     do {
         assert_msg(i < HBA_MAX_PRDTE, "HBA: Too many PRDTEs");
         assert_msg(pos->buf.size <= 0x400000U, "HBA: Buffer too big");

+        assert_msg(pos->buf.size, "HBA: expect a non-zero buffer size");

 
         cmdt->entries[i++] =
           (struct hba_prdte){ .data_base = vmm_v2p((ptr_t)pos->buf.buffer),
 
         cmdt->entries[i++] =
           (struct hba_prdte){ .data_base = vmm_v2p((ptr_t)pos->buf.buffer),


@@ -426,6 +410,7 @@ int
 ahci_identify_device(struct hba_device* device)
 {
     // 用于重新识别设备（比如在热插拔的情况下）
 ahci_identify_device(struct hba_device* device)
 {
     // 用于重新识别设备（比如在热插拔的情况下）

+    // FIXME this is not right...

     vfree(device);
     return ahci_init_device(device->port);
 }
     vfree(device);
     return ahci_init_device(device->port);
 }


@@ -439,4 +424,4 @@ achi_register_ops(struct hba_port* port)
     } else {
         port->device->ops.submit = scsi_submit;
     }
     } else {
         port->device->ops.submit = scsi_submit;
     }

-}
\ No newline at end of file
+}