X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/88d981e8325ea91ca6ca21cdba3c73308fe84541..a5338b60e111972364a8bc6f07011c6defd213d2:/lunaix-os/hal/ahci/ahci.c

diff --git a/lunaix-os/hal/ahci/ahci.c b/lunaix-os/hal/ahci/ahci.c
index 0907664..0551ee5 100644
--- a/lunaix-os/hal/ahci/ahci.c
+++ b/lunaix-os/hal/ahci/ahci.c
@@ -16,6 +16,7 @@
 
 #include <hal/pci.h>
 #include <klibc/string.h>
+#include <lunaix/block.h>
 #include <lunaix/mm/mmio.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/valloc.h>
@@ -160,8 +161,6 @@ ahci_init()
         // 需要通过全部置位去清空这些寄存器（相当的奇怪……）
         port_regs[HBA_RPxSERR] = -1;
 
-        port_regs[HBA_RPxIE] |= (HBA_PxINTR_D2HR);
-
         hba.ports[i] = port;
 
         if (!HBA_RPxSSTS_IF(port->ssts)) {
@@ -175,6 +174,8 @@ ahci_init()
         if (!ahci_init_device(port)) {
             kprintf(KERROR "fail to init device");
         }
+
+        block_mount_disk(port->device);
     }
 }
 
@@ -186,7 +187,8 @@ char sata_ifs[][20] = { "Not detected",
 void
 __ahci_hba_isr(isr_param param)
 {
-    // TODO: hba interrupt
+    // TODO: clear the interrupt status
+    // TODO: I/O-operation scheduler should be here
     kprintf(KDEBUG "HBA INTR\n");
 }
 
@@ -265,24 +267,33 @@ sata_create_fis(struct sata_reg_fis* cmd_fis,
 }
 
 int
-hba_alloc_slot(struct hba_port* port,
-               struct hba_cmdt** cmdt,
-               struct hba_cmdh** cmdh,
-               uint16_t header_options)
+hba_prepare_cmd(struct hba_port* port,
+                struct hba_cmdt** cmdt,
+                struct hba_cmdh** cmdh,
+                void* buffer,
+                unsigned int size)
 {
     int slot = __get_free_slot(port);
     assert_msg(slot >= 0, "HBA: No free slot");
+    assert_msg(size <= 0x400000, "HBA: buffer too big");
 
     // 构建命令头（Command Header）和命令表（Command Table）
     struct hba_cmdh* cmd_header = &port->cmdlst[slot];
-    struct hba_cmdt* cmd_table = vcalloc_dma(sizeof(struct hba_cmdt));
+    struct hba_cmdt* cmd_table = vzalloc_dma(sizeof(struct hba_cmdt));
 
     memset(cmd_header, 0, sizeof(*cmd_header));
 
     // 将命令表挂到命令头上
     cmd_header->cmd_table_base = vmm_v2p(cmd_table);
-    cmd_header->options = HBA_CMDH_FIS_LEN(sizeof(struct sata_reg_fis)) |
-                          HBA_CMDH_CLR_BUSY | (header_options & ~0x1f);
+    cmd_header->options =
+      HBA_CMDH_FIS_LEN(sizeof(struct sata_reg_fis)) | HBA_CMDH_CLR_BUSY;
+
+    if (buffer) {
+        cmd_header->prdt_len = 1;
+        cmd_table->entries[0] =
+          (struct hba_prdte){ .data_base = vmm_v2p(buffer),
+                              .byte_count = size - 1 };
+    }
 
     *cmdh = cmd_header;
     *cmdt = cmd_table;
@@ -297,22 +308,21 @@ ahci_init_device(struct hba_port* port)
     struct hba_cmdt* cmd_table;
     struct hba_cmdh* cmd_header;
 
+    // mask DHR interrupt
+    port->regs[HBA_RPxIE] &= ~HBA_PxINTR_DHR;
+
     // 确保端口是空闲的
     wait_until(!(port->regs[HBA_RPxTFD] & (HBA_PxTFD_BSY)));
 
-    int slot = hba_alloc_slot(port, &cmd_table, &cmd_header, 0);
-
-    // 清空任何待响应的中断
-    port->regs[HBA_RPxIS] = 0;
-    port->device = vcalloc(sizeof(struct hba_device));
-
     // 预备DMA接收缓存，用于存放HBA传回的数据
     uint16_t* data_in = (uint16_t*)valloc_dma(512);
 
-    cmd_table->entries[0] =
-      (struct hba_prdte){ .data_base = vmm_v2p(data_in),
-                          .byte_count = 511 }; // byte_count是从0开始算的
-    cmd_header->prdt_len = 1;
+    int slot = hba_prepare_cmd(port, &cmd_table, &cmd_header, data_in, 512);
+
+    // 清空任何待响应的中断
+    port->regs[HBA_RPxIS] = 0;
+    port->device = vzalloc(sizeof(struct hba_device));
+    port->device->port = port;
 
     // 在命令表中构建命令FIS
     struct sata_reg_fis* cmd_fis = (struct sata_reg_fis*)cmd_table->command_fis;
@@ -394,6 +404,9 @@ ahci_init_device(struct hba_port* port)
     scsi_parse_capacity(port->device, (uint32_t*)data_in);
 
 done:
+    // reset interrupt status and unmask D2HR interrupt
+    port->regs[HBA_RPxIS] = -1;
+    port->regs[HBA_RPxIE] |= HBA_PxINTR_DHR;
     achi_register_ops(port);
 
     vfree_dma(data_in);
@@ -402,6 +415,8 @@ done:
     return 1;
 
 fail:
+    port->regs[HBA_RPxIS] = -1;
+    port->regs[HBA_RPxIE] |= HBA_PxINTR_DHR;
     vfree_dma(data_in);
     vfree_dma(cmd_table);