fix: incorrect settings of msi registers.

[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 09076646d520d621b526cc6403cd870369510d7c..aadb41b2aaf8ca294ec80d78b86799ffafa71e9c 100644 (file)
--- a/lunaix-os/hal/ahci/ahci.c
+++ b/lunaix-os/hal/ahci/ahci.c
@@ -160,7 +160,7 @@ ahci_init()
         // 需要通过全部置位去清空这些寄存器（相当的奇怪……）
         port_regs[HBA_RPxSERR] = -1;
 
         // 需要通过全部置位去清空这些寄存器（相当的奇怪……）
         port_regs[HBA_RPxSERR] = -1;
 

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

 
         hba.ports[i] = port;
 
 
         hba.ports[i] = port;
 


@@ -265,13 +265,15 @@ sata_create_fis(struct sata_reg_fis* cmd_fis,
 }
 
 int
 }
 
 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");
 {
     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];
 
     // 构建命令头（Command Header）和命令表（Command Table）
     struct hba_cmdh* cmd_header = &port->cmdlst[slot];


@@ -281,8 +283,15 @@ hba_alloc_slot(struct hba_port* port,
 
     // 将命令表挂到命令头上
     cmd_header->cmd_table_base = vmm_v2p(cmd_table);
 
     // 将命令表挂到命令头上
     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) | (0x80000000) };
+    }

 
     *cmdh = cmd_header;
     *cmdt = cmd_table;
 
     *cmdh = cmd_header;
     *cmdt = cmd_table;


@@ -300,20 +309,15 @@ ahci_init_device(struct hba_port* port)
     // 确保端口是空闲的
     wait_until(!(port->regs[HBA_RPxTFD] & (HBA_PxTFD_BSY)));
 
     // 确保端口是空闲的
     wait_until(!(port->regs[HBA_RPxTFD] & (HBA_PxTFD_BSY)));
 

-    int slot = hba_alloc_slot(port, &cmd_table, &cmd_header, 0);
+    // 预备DMA接收缓存，用于存放HBA传回的数据
+    uint16_t* data_in = (uint16_t*)valloc_dma(512);
+
+    int slot = hba_prepare_cmd(port, &cmd_table, &cmd_header, data_in, 512);

 
     // 清空任何待响应的中断
     port->regs[HBA_RPxIS] = 0;
     port->device = vcalloc(sizeof(struct hba_device));
 
 
     // 清空任何待响应的中断
     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;
-

     // 在命令表中构建命令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;