refactor: isrm to centeralize interrupt/irq resources management.

[lunaix-os.git] / lunaix-os / hal / ahci / ata.c

diff --git a/lunaix-os/hal/ahci/ata.c b/lunaix-os/hal/ahci/ata.c
index f6ff7c15a43acc04f2ac4be1b4c1353e524ee727..845f4202bfdcbb59bded40c9bbf0e6fd0996cae2 100644 (file)
--- a/lunaix-os/hal/ahci/ata.c
+++ b/lunaix-os/hal/ahci/ata.c
@@ -1,3 +1,4 @@
+#include <hal/ahci/ahci.h>

 #include <hal/ahci/hba.h>
 #include <hal/ahci/sata.h>
 
 #include <hal/ahci/hba.h>
 #include <hal/ahci/sata.h>
 


@@ -5,8 +6,17 @@
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>
 
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>
 

+void
+sata_read_error(struct hba_port* port)
+{
+    uint32_t tfd = port->regs[HBA_RPxTFD];
+    port->device->last_result.sense_key = (tfd & 0xf000) >> 12;
+    port->device->last_result.error = (tfd & 0x0f00) >> 8;
+    port->device->last_result.status = tfd & 0x00ff;
+}
+

 int
 int

-__sata_buffer_io(struct hba_port* port,
+__sata_buffer_io(struct hba_device* dev,

                  uint64_t lba,
                  void* buffer,
                  uint32_t size,
                  uint64_t lba,
                  void* buffer,
                  uint32_t size,


@@ -14,20 +24,15 @@ __sata_buffer_io(struct hba_port* port,
 {
     assert_msg(((uintptr_t)buffer & 0x3) == 0, "HBA: Bad buffer alignment");
 
 {
     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_prepare_cmd(port, &table, &header, buffer, size);
     struct hba_cmdh* header;
     struct hba_cmdt* table;
     int slot = hba_prepare_cmd(port, &table, &header, buffer, size);

-    int bitmask = 1 << slot;
-
-    // 确保端口是空闲的
-    wait_until(!(port->regs[HBA_RPxTFD] & (HBA_PxTFD_BSY | HBA_PxTFD_DRQ)));
-
-    port->regs[HBA_RPxIS] = 0;

 
     header->options |= HBA_CMDH_WRITE * (write == 1);
 
     uint16_t count = ICEIL(size, port->device->block_size);
 
     header->options |= HBA_CMDH_WRITE * (write == 1);
 
     uint16_t count = ICEIL(size, port->device->block_size);

-    struct sata_reg_fis* fis = table->command_fis;
+    struct sata_reg_fis* fis = (struct sata_reg_fis*)table->command_fis;

 
     if ((port->device->flags & HBA_DEV_FEXTLBA)) {
         // 如果该设备支持48位LBA寻址
 
     if ((port->device->flags & HBA_DEV_FEXTLBA)) {
         // 如果该设备支持48位LBA寻址


@@ -47,50 +52,26 @@ __sata_buffer_io(struct hba_port* port,
     */
     fis->dev = (1 << 6);
 
     */
     fis->dev = (1 << 6);
 

-    int retries = 0;
-
-    while (retries < MAX_RETRY) {
-        port->regs[HBA_RPxCI] = bitmask;
+    int is_ok = ahci_try_send(port, slot);

 
 

-        wait_until(!(port->regs[HBA_RPxCI] & bitmask));
-
-        if ((port->regs[HBA_RPxTFD] & HBA_PxTFD_ERR)) {
-            // 有错误
-            sata_read_error(port);
-            retries++;
-        } else {
-            vfree_dma(table);
-            return 1;
-        }
-    }
-
-fail:

     vfree_dma(table);
     vfree_dma(table);

-    return 0;
+    return is_ok;

 }
 
 int
 }
 
 int

-sata_read_buffer(struct hba_port* port,
+sata_read_buffer(struct hba_device* dev,

                  uint64_t lba,
                  void* buffer,
                  uint32_t size)
 {
                  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
 }
 
 int

-sata_write_buffer(struct hba_port* port,
+sata_write_buffer(struct hba_device* dev,

                   uint64_t lba,
                   void* buffer,
                   uint32_t size)
 {
                   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
-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