X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/88e668538d6c0d394e6ea34516052f010ca6e8d2..6fefc6f5af83f316e18b0cb9dbbde1cea0b98add:/lunaix-os/hal/ahci/ata.c

diff --git a/lunaix-os/hal/ahci/ata.c b/lunaix-os/hal/ahci/ata.c
index 91863fd..a2f10ba 100644
--- a/lunaix-os/hal/ahci/ata.c
+++ b/lunaix-os/hal/ahci/ata.c
@@ -6,7 +6,7 @@
 #include <lunaix/spike.h>
 
 int
-__sata_buffer_io(struct hba_port* port,
+__sata_buffer_io(struct hba_device* dev,
                  uint64_t lba,
                  void* buffer,
                  uint32_t size,
@@ -14,9 +14,10 @@ __sata_buffer_io(struct hba_port* port,
 {
     assert_msg(((uintptr_t)buffer & 0x3) == 0, "HBA: Bad buffer alignment");
 
+    struct hba_port* port = dev->port;
     struct hba_cmdh* header;
     struct hba_cmdt* table;
-    int slot = hba_alloc_slot(port, &table, &header, 0);
+    int slot = hba_prepare_cmd(port, &table, &header, buffer, size);
     int bitmask = 1 << slot;
 
     // 确保端口是空闲的
@@ -24,9 +25,6 @@ __sata_buffer_io(struct hba_port* port,
 
     port->regs[HBA_RPxIS] = 0;
 
-    table->entries[0] = (struct hba_prdte){ .byte_count = size - 1,
-                                            .data_base = vmm_v2p(buffer) };
-    header->prdt_len = 1;
     header->options |= HBA_CMDH_WRITE * (write == 1);
 
     uint16_t count = ICEIL(size, port->device->block_size);
@@ -36,10 +34,19 @@ __sata_buffer_io(struct hba_port* port,
         // 如果该设备支持48位LBA寻址
         sata_create_fis(
           fis, write ? ATA_WRITE_DMA_EXT : ATA_READ_DMA_EXT, lba, count);
-        fis->dev = (1 << 6) * (!write);
     } else {
         sata_create_fis(fis, write ? ATA_WRITE_DMA : ATA_READ_DMA, lba, count);
     }
+    /*
+          确保我们使用的是LBA寻址模式
+          注意：在ACS-3中（甚至在ACS-4），只有在(READ/WRITE)_DMA_EXT指令中明确注明了需要将这一位置位
+        而并没有在(READ/WRITE)_DMA注明。
+          但是这在ACS-2中是有的！于是这也就导致了先前的测试中，LBA=0根本无法访问，因为此时
+        的访问模式是在CHS下，也就是说LBA=0 => Sector=0，是非法的。
+          所以，我猜测，这要么是QEMU/VirtualBox根据ACS-2来编写的AHCI模拟，
+        要么是标准出错了（毕竟是working draft）
+    */
+    fis->dev = (1 << 6);
 
     int retries = 0;
 
@@ -64,21 +71,21 @@ fail:
 }
 
 int
-sata_read_buffer(struct hba_port* port,
+sata_read_buffer(struct hba_device* dev,
                  uint64_t lba,
                  void* buffer,
                  uint32_t size)
 {
-    return __sata_buffer_io(port, lba, buffer, size, 0);
+    return __sata_buffer_io(dev, lba, buffer, size, 0);
 }
 
 int
-sata_write_buffer(struct hba_port* port,
+sata_write_buffer(struct hba_device* dev,
                   uint64_t lba,
                   void* buffer,
                   uint32_t size)
 {
-    return __sata_buffer_io(port, lba, buffer, size, 1);
+    return __sata_buffer_io(dev, lba, buffer, size, 1);
 }
 
 void
@@ -86,4 +93,5 @@ sata_read_error(struct hba_port* port)
 {
     uint32_t tfd = port->regs[HBA_RPxTFD];
     port->device->last_error = (tfd >> 8) & 0xff;
+    port->device->last_status = tfd & 0xff;
 }
\ No newline at end of file