Merge branch 'master' into vfs-dev

[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 156267605b013a1189c800ea52ce841dfbb67ce6..0551ee547fe9283bf4c063895bc61db89806d4fd 100644 (file)
--- 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 <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>
 #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_RPxSERR] = -1;
 

-        port_regs[HBA_RPxIE] |= (HBA_PxINTR_D2HR);
-

         hba.ports[i] = port;
 
         if (!HBA_RPxSSTS_IF(port->ssts)) {
         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");
         }
         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)
 {
 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");
 }
 
     kprintf(KDEBUG "HBA INTR\n");
 }
 


@@ -277,7 +279,7 @@ hba_prepare_cmd(struct hba_port* port,
 
     // 构建命令头（Command Header）和命令表（Command Table）
     struct hba_cmdh* cmd_header = &port->cmdlst[slot];
 
     // 构建命令头（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));
 
 
     memset(cmd_header, 0, sizeof(*cmd_header));
 


@@ -306,6 +308,9 @@ ahci_init_device(struct hba_port* port)
     struct hba_cmdt* cmd_table;
     struct hba_cmdh* cmd_header;
 
     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)));
 
     // 确保端口是空闲的
     wait_until(!(port->regs[HBA_RPxTFD] & (HBA_PxTFD_BSY)));
 


@@ -399,6 +404,9 @@ ahci_init_device(struct hba_port* port)
     scsi_parse_capacity(port->device, (uint32_t*)data_in);
 
 done:
     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);
     achi_register_ops(port);
 
     vfree_dma(data_in);


@@ -407,6 +415,8 @@ done:
     return 1;
 
 fail:
     return 1;
 
 fail:

+    port->regs[HBA_RPxIS] = -1;
+    port->regs[HBA_RPxIE] |= HBA_PxINTR_DHR;

     vfree_dma(data_in);
     vfree_dma(cmd_table);
 
     vfree_dma(data_in);
     vfree_dma(cmd_table);