feat: device subsystem rework

[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 f6f27186d9642cdf70e0601532e3a0d38f1150a1..c20e21dffe9bb248ae7f6f5c043b5556c34bab43 100644 (file)
--- 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/ahci/hba.h>
 #include <hal/ahci/sata.h>
 #include <hal/ahci/scsi.h>

-

 #include <hal/pci.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>
 #include <klibc/string.h>
 #include <lunaix/block.h>
 #include <lunaix/isrm.h>


@@ -27,13 +30,13 @@
 #define HBA_FIS_SIZE 256
 #define HBA_CLB_SIZE 1024
 
 #define HBA_FIS_SIZE 256
 #define HBA_CLB_SIZE 1024
 

-#define HBA_MY_IE (HBA_PxINTR_DHR | HBA_PxINTR_TFEE)
+#define HBA_MY_IE (HBA_PxINTR_DHR | HBA_PxINTR_TFE | HBA_PxINTR_OF)

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

-struct ahci_hba hba;
+DEFINE_LLIST(ahcis);

 
 static char sata_ifs[][20] = { "Not detected",
                                "SATA I (1.5Gbps)",
 
 static char sata_ifs[][20] = { "Not detected",
                                "SATA I (1.5Gbps)",


@@ -58,21 +61,6 @@ achi_register_ops(struct hba_port* port);
 void
 ahci_register_device(struct hba_device* hbadev);
 
 void
 ahci_register_device(struct hba_device* hbadev);
 

-unsigned int
-ahci_get_port_usage()
-{
-    return hba.ports_bmp;
-}
-
-struct hba_port*
-ahci_get_port(unsigned int index)
-{
-    if (index >= 32) {
-        return 0;
-    }
-    return hba.ports[index];
-}
-

 void
 __hba_reset_port(hba_reg_t* port_reg)
 {
 void
 __hba_reset_port(hba_reg_t* port_reg)
 {


@@ -85,15 +73,14 @@ __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()
+int
+ahci_driver_init(struct device_def* def, struct device* dev)

 {
 {

-    struct pci_device* ahci_dev = pci_get_device_by_class(AHCI_HBA_CLASS);
-    assert_msg(ahci_dev, "AHCI: Not found.");
+    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.");
 
     struct pci_base_addr* bar6 = &ahci_dev->bar[5];
     assert_msg(bar6->type & BAR_TYPE_MMIO, "AHCI: BAR#6 is not MMIO.");


@@ -105,33 +92,41 @@ ahci_init()
 
     pci_write_cspace(ahci_dev->cspace_base, PCI_REG_STATUS_CMD, cmd);
 
 
     pci_write_cspace(ahci_dev->cspace_base, PCI_REG_STATUS_CMD, cmd);
 

-    pci_setup_msi(ahci_dev, isrm_ivexalloc(__ahci_hba_isr));
+    int iv = isrm_ivexalloc(__ahci_hba_isr);
+    pci_setup_msi(ahci_dev, iv);
+    isrm_set_payload(iv, (ptr_t)&ahcis);

 
 

-    memset(&hba, 0, sizeof(hba));
+    struct ahci_driver* ahci_drv = vzalloc(sizeof(*ahci_drv));
+    struct ahci_hba* hba = &ahci_drv->hba;
+    ahci_drv->id = iv;

 
 

-    hba.base = (hba_reg_t*)ioremap(bar6->start, bar6->size);
+    llist_append(&ahcis, &ahci_drv->ahci_drvs);
+
+    hba->base = (hba_reg_t*)ioremap(bar6->start, bar6->size);

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

-    hba.base[HBA_RGHC] |= HBA_RGHC_RESET;
-    wait_until(!(hba.base[HBA_RGHC] & HBA_RGHC_RESET));
+    hba->base[HBA_RGHC] |= HBA_RGHC_RESET;
+    wait_until(!(hba->base[HBA_RGHC] & HBA_RGHC_RESET));

 #endif
 
     // 启用AHCI工作模式，启用中断
 #endif
 
     // 启用AHCI工作模式，启用中断

-    hba.base[HBA_RGHC] |= HBA_RGHC_ACHI_ENABLE;
-    hba.base[HBA_RGHC] |= HBA_RGHC_INTR_ENABLE;
+    hba->base[HBA_RGHC] |= HBA_RGHC_ACHI_ENABLE;
+    hba->base[HBA_RGHC] |= HBA_RGHC_INTR_ENABLE;

 
     // As per section 3.1.1, this is 0 based value.
 
     // As per section 3.1.1, this is 0 based value.

-    hba_reg_t cap = hba.base[HBA_RCAP];
-    hba_reg_t pmap = hba.base[HBA_RPI];
+    hba_reg_t cap = hba->base[HBA_RCAP];
+    hba_reg_t pmap = hba->base[HBA_RPI];

 
 

-    hba.ports_num = (cap & 0x1f) + 1;  // CAP.PI
-    hba.cmd_slots = (cap >> 8) & 0x1f; // CAP.NCS
-    hba.version = hba.base[HBA_RVER];
-    hba.ports_bmp = pmap;
+    hba->ports_num = (cap & 0x1f) + 1;  // CAP.PI
+    hba->cmd_slots = (cap >> 8) & 0x1f; // CAP.NCS
+    hba->version = hba->base[HBA_RVER];
+    hba->ports_bmp = pmap;

 
     /* ------ HBA端口配置 ------ */
 
     /* ------ HBA端口配置 ------ */

-    uintptr_t clb_pg_addr, fis_pg_addr, clb_pa, fis_pa;
+    ptr_t clb_pg_addr = 0, fis_pg_addr = 0;
+    ptr_t clb_pa = 0, fis_pa = 0;
+

     for (size_t i = 0, fisp = 0, clbp = 0; i < 32;
          i++, pmap >>= 1, fisp = (fisp + 1) % 16, clbp = (clbp + 1) % 4) {
         if (!(pmap & 0x1)) {
     for (size_t i = 0, fisp = 0, clbp = 0; i < 32;
          i++, pmap >>= 1, fisp = (fisp + 1) % 16, clbp = (clbp + 1) % 4) {
         if (!(pmap & 0x1)) {


@@ -141,7 +136,7 @@ ahci_init()
         struct hba_port* port =
           (struct hba_port*)valloc(sizeof(struct hba_port));
         hba_reg_t* port_regs =
         struct hba_port* port =
           (struct hba_port*)valloc(sizeof(struct hba_port));
         hba_reg_t* port_regs =

-          (hba_reg_t*)(&hba.base[HBA_RPBASE + i * HBA_RPSIZE]);
+          (hba_reg_t*)(&hba->base[HBA_RPBASE + i * HBA_RPSIZE]);

 
 #ifndef DO_HBA_FULL_RESET
         __hba_reset_port(port_regs);
 
 #ifndef DO_HBA_FULL_RESET
         __hba_reset_port(port_regs);


@@ -150,31 +145,34 @@ ahci_init()
         if (!clbp) {
             // 每页最多4个命令队列
             clb_pa = pmm_alloc_page(KERNEL_PID, PP_FGLOCKED);
         if (!clbp) {
             // 每页最多4个命令队列
             clb_pa = pmm_alloc_page(KERNEL_PID, PP_FGLOCKED);

-            clb_pg_addr = ioremap(clb_pa, 0x1000);
-            memset(clb_pg_addr, 0, 0x1000);
+            clb_pg_addr = (ptr_t)ioremap(clb_pa, 0x1000);
+            memset((void*)clb_pg_addr, 0, 0x1000);

         }
         if (!fisp) {
             // 每页最多16个FIS
             fis_pa = pmm_alloc_page(KERNEL_PID, PP_FGLOCKED);
         }
         if (!fisp) {
             // 每页最多16个FIS
             fis_pa = pmm_alloc_page(KERNEL_PID, PP_FGLOCKED);

-            fis_pg_addr = ioremap(fis_pa, 0x1000);
-            memset(fis_pg_addr, 0, 0x1000);
+            fis_pg_addr = (ptr_t)ioremap(fis_pa, 0x1000);
+            memset((void*)fis_pg_addr, 0, 0x1000);

         }
 
         /* 重定向CLB与FIS */
         port_regs[HBA_RPxCLB] = clb_pa + clbp * HBA_CLB_SIZE;
         port_regs[HBA_RPxFB] = fis_pa + fisp * HBA_FIS_SIZE;
 
         }
 
         /* 重定向CLB与FIS */
         port_regs[HBA_RPxCLB] = clb_pa + clbp * HBA_CLB_SIZE;
         port_regs[HBA_RPxFB] = fis_pa + fisp * HBA_FIS_SIZE;
 

-        *port = (struct hba_port){ .regs = port_regs,
-                                   .ssts = port_regs[HBA_RPxSSTS],
-                                   .cmdlst = clb_pg_addr + clbp * HBA_CLB_SIZE,
-                                   .fis = fis_pg_addr + fisp * HBA_FIS_SIZE };
+        *port = (struct hba_port){
+            .regs = port_regs,
+            .ssts = port_regs[HBA_RPxSSTS],
+            .cmdlst = (struct hba_cmdh*)(clb_pg_addr + clbp * HBA_CLB_SIZE),
+            .fis = (void*)(fis_pg_addr + fisp * HBA_FIS_SIZE),
+            .hba = hba
+        };

 
         /* 初始化端口，并置于就绪状态 */
         port_regs[HBA_RPxCI] = 0;
 
         hba_clear_reg(port_regs[HBA_RPxSERR]);
 
 
         /* 初始化端口，并置于就绪状态 */
         port_regs[HBA_RPxCI] = 0;
 
         hba_clear_reg(port_regs[HBA_RPxSERR]);
 

-        hba.ports[i] = port;
+        hba->ports[i] = port;

 
         if (!HBA_RPxSSTS_IF(port->ssts)) {
             continue;
 
         if (!HBA_RPxSSTS_IF(port->ssts)) {
             continue;


@@ -194,10 +192,13 @@ ahci_init()
                 i,
                 hbadev->model,
                 hbadev->block_size,
                 i,
                 hbadev->model,
                 hbadev->block_size,

-                (uint32_t)hbadev->max_lba);
+                (u32_t)hbadev->max_lba);

 
         ahci_register_device(hbadev);
     }
 
         ahci_register_device(hbadev);
     }

+
+    dev->underlay = ahci_drv;
+    return 0;

 }
 
 void
 }
 
 void


@@ -212,63 +213,23 @@ ahci_register_device(struct hba_device* hbadev)
     block_mount(bdev, ahci_fsexport);
 }
 
     block_mount(bdev, ahci_fsexport);
 }
 

-void
-ahci_list_device()
-{
-    kprintf(KINFO "Version: %x; Ports: %d; Slot: %d\n",
-            hba.version,
-            hba.ports_num,
-            hba.cmd_slots);
-    struct hba_port* port;
-    for (size_t i = 0; i < 32; i++) {
-        port = hba.ports[i];
-
-        // 愚蠢的gcc似乎认为 struct hba_port* 不可能为空
-        //  所以将这个非常关键的if给优化掉了。
-        //  这里将指针强制转换为整数，欺骗gcc :)
-        if ((uintptr_t)port == 0) {
-            continue;
-        }
-
-        int device_state = HBA_RPxSSTS_IF(port->ssts);
-
-        kprintf("\t Port %d: %s (%x)\n",
-                i,
-                &sata_ifs[device_state],
-                port->device->flags);
-
-        struct hba_device* dev_info = port->device;
-        if (!device_state || !dev_info) {
-            continue;
-        }
-        kprintf("\t\t capacity: %d KiB\n",
-                (dev_info->max_lba * dev_info->block_size) >> 10);
-        kprintf("\t\t block size: %dB\n", dev_info->block_size);
-        kprintf("\t\t block/sector: %d\n", dev_info->block_per_sec);
-        kprintf("\t\t alignment: %dB\n", dev_info->alignment_offset);
-        kprintf("\t\t capabilities: %x\n", dev_info->capabilities);
-        kprintf("\t\t model: %s\n", &dev_info->model);
-        kprintf("\t\t serial: %s\n", &dev_info->serial_num);
-    }
-}
-

 int
 __get_free_slot(struct hba_port* port)
 {
     hba_reg_t pxsact = port->regs[HBA_RPxSACT];
     hba_reg_t pxci = port->regs[HBA_RPxCI];
     hba_reg_t free_bmp = pxsact | pxci;
 int
 __get_free_slot(struct hba_port* port)
 {
     hba_reg_t pxsact = port->regs[HBA_RPxSACT];
     hba_reg_t pxci = port->regs[HBA_RPxCI];
     hba_reg_t free_bmp = pxsact | pxci;

-    uint32_t i = 0;
-    for (; i <= hba.cmd_slots && (free_bmp & 0x1); i++, free_bmp >>= 1)
+    u32_t i = 0;
+    for (; i <= port->hba->cmd_slots && (free_bmp & 0x1); i++, free_bmp >>= 1)

         ;
         ;

-    return i | -(i > hba.cmd_slots);
+    return i | -(i > port->hba->cmd_slots);

 }
 
 void
 sata_create_fis(struct sata_reg_fis* cmd_fis,
 }
 
 void
 sata_create_fis(struct sata_reg_fis* cmd_fis,

-                uint8_t command,
-                uint64_t lba,
-                uint16_t sector_count)
+                u8_t command,
+                lba_t lba,
+                u16_t sector_count)

 {
     cmd_fis->head.type = SATA_REG_FIS_H2D;
     cmd_fis->head.options = SATA_REG_FIS_COMMAND;
 {
     cmd_fis->head.type = SATA_REG_FIS_H2D;
     cmd_fis->head.options = SATA_REG_FIS_COMMAND;


@@ -289,10 +250,13 @@ sata_create_fis(struct sata_reg_fis* cmd_fis,
 int
 hba_bind_sbuf(struct hba_cmdh* cmdh, struct hba_cmdt* cmdt, struct membuf mbuf)
 {
 int
 hba_bind_sbuf(struct hba_cmdh* cmdh, struct hba_cmdt* cmdt, struct membuf mbuf)
 {

-    assert_msg(mbuf.size <= 0x400000, "HBA: Buffer too big");
+    assert_msg(mbuf.size <= 0x400000U, "HBA: Buffer too big");

     cmdh->prdt_len = 1;
     cmdh->prdt_len = 1;

-    cmdt->entries[0] = (struct hba_prdte){ .data_base = vmm_v2p(mbuf.buffer),
-                                           .byte_count = mbuf.size - 1 };
+    cmdt->entries[0] =
+      (struct hba_prdte){ .data_base = vmm_v2p((ptr_t)mbuf.buffer),
+                          .byte_count = mbuf.size - 1 };
+
+    return 0;

 }
 
 int
 }
 
 int


@@ -303,15 +267,17 @@ 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");
 
     do {
         assert_msg(i < HBA_MAX_PRDTE, "HBA: Too many PRDTEs");

-        assert_msg(pos->buf.size <= 0x400000, "HBA: Buffer too big");
+        assert_msg(pos->buf.size <= 0x400000U, "HBA: Buffer too big");

 
         cmdt->entries[i++] =
 
         cmdt->entries[i++] =

-          (struct hba_prdte){ .data_base = vmm_v2p(pos->buf.buffer),
+          (struct hba_prdte){ .data_base = vmm_v2p((ptr_t)pos->buf.buffer),

                               .byte_count = pos->buf.size - 1 };
         pos = list_entry(pos->components.next, struct vecbuf, components);
     } while (pos != vbuf);
 
     cmdh->prdt_len = i + 1;
                               .byte_count = pos->buf.size - 1 };
         pos = list_entry(pos->components.next, struct vecbuf, components);
     } while (pos != vbuf);
 
     cmdh->prdt_len = i + 1;

+
+    return 0;

 }
 
 int
 }
 
 int


@@ -329,7 +295,7 @@ hba_prepare_cmd(struct hba_port* port,
     memset(cmd_header, 0, sizeof(*cmd_header));
 
     // 将命令表挂到命令头上
     memset(cmd_header, 0, sizeof(*cmd_header));
 
     // 将命令表挂到命令头上

-    cmd_header->cmd_table_base = vmm_v2p(cmd_table);
+    cmd_header->cmd_table_base = vmm_v2p((ptr_t)cmd_table);

     cmd_header->options =
       HBA_CMDH_FIS_LEN(sizeof(struct sata_reg_fis)) | HBA_CMDH_CLR_BUSY;
 
     cmd_header->options =
       HBA_CMDH_FIS_LEN(sizeof(struct sata_reg_fis)) | HBA_CMDH_CLR_BUSY;
 


@@ -350,7 +316,7 @@ ahci_init_device(struct hba_port* port)
     port->regs[HBA_RPxIE] &= ~HBA_MY_IE;
 
     // 预备DMA接收缓存，用于存放HBA传回的数据
     port->regs[HBA_RPxIE] &= ~HBA_MY_IE;
 
     // 预备DMA接收缓存，用于存放HBA传回的数据

-    uint16_t* data_in = (uint16_t*)valloc_dma(512);
+    u16_t* data_in = (u16_t*)valloc_dma(512);

 
     int slot = hba_prepare_cmd(port, &cmd_table, &cmd_header);
     hba_bind_sbuf(
 
     int slot = hba_prepare_cmd(port, &cmd_table, &cmd_header);
     hba_bind_sbuf(


@@ -358,6 +324,7 @@ ahci_init_device(struct hba_port* port)
 
     port->device = vzalloc(sizeof(struct hba_device));
     port->device->port = port;
 
     port->device = vzalloc(sizeof(struct hba_device));
     port->device->port = port;

+    port->device->hba = port->hba;

 
     // 在命令表中构建命令FIS
     struct sata_reg_fis* cmd_fis = (struct sata_reg_fis*)cmd_table->command_fis;
 
     // 在命令表中构建命令FIS
     struct sata_reg_fis* cmd_fis = (struct sata_reg_fis*)cmd_table->command_fis;


@@ -432,7 +399,7 @@ ahci_init_device(struct hba_port* port)
         goto fail;
     }
 
         goto fail;
     }
 

-    scsi_parse_capacity(port->device, (uint32_t*)data_in);
+    scsi_parse_capacity(port->device, (u32_t*)data_in);

 
 done:
     // reset interrupt status and unmask D2HR interrupt
 
 done:
     // reset interrupt status and unmask D2HR interrupt


@@ -469,4 +436,14 @@ 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
+}
+
+static struct pci_device_def ahcidef = {
+    .dev_class = AHCI_HBA_CLASS,
+    .dev_vendor = PCI_ID_ANY,
+    .dev_id = PCI_ID_ANY,
+    .devdef = { .class = DEVCLASS(DEVIF_PCI, DEVFN_STORAGE, DEV_SATA, 0),
+                .name = "SATA AHCI",
+                .init_for = ahci_driver_init }
+};
+EXPORT_DEVICE(ahci, &ahcidef.devdef, load_on_demand);
\ No newline at end of file