Merge branch 'sata-ahci-dev'

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

diff --git a/lunaix-os/hal/ahci/atapi.c b/lunaix-os/hal/ahci/atapi.c
index c245c0a060ac599529232205a5fc63751bffdb6d..397c7338033602ab916f23589fab9e99388a151a 100644 (file)
--- a/lunaix-os/hal/ahci/atapi.c
+++ b/lunaix-os/hal/ahci/atapi.c
@@ -4,7 +4,10 @@
 #include <hal/ahci/utils.h>
 
 #include <klibc/string.h>
 #include <hal/ahci/utils.h>
 
 #include <klibc/string.h>

+#include <lunaix/mm/valloc.h>
+#include <lunaix/mm/vmm.h>

 #include <lunaix/spike.h>
 #include <lunaix/spike.h>

+#include <lunaix/syslog.h>

 
 void
 scsi_create_packet12(struct scsi_cdb12* cdb,
 
 void
 scsi_create_packet12(struct scsi_cdb12* cdb,


@@ -15,7 +18,7 @@ scsi_create_packet12(struct scsi_cdb12* cdb,
     memset(cdb, 0, sizeof(*cdb));
     cdb->opcode = opcode;
     cdb->lba_be = SCSI_FLIP(lba);
     memset(cdb, 0, sizeof(*cdb));
     cdb->opcode = opcode;
     cdb->lba_be = SCSI_FLIP(lba);

-    cdb->length = alloc_size;
+    cdb->length = SCSI_FLIP(alloc_size);

 }
 
 void
 }
 
 void


@@ -26,9 +29,9 @@ scsi_create_packet16(struct scsi_cdb16* cdb,
 {
     memset(cdb, 0, sizeof(*cdb));
     cdb->opcode = opcode;
 {
     memset(cdb, 0, sizeof(*cdb));
     cdb->opcode = opcode;

-    cdb->lba_be_hi = SCSI_FLIP(lba >> 32);
+    cdb->lba_be_hi = SCSI_FLIP((uint32_t)(lba >> 32));

     cdb->lba_be_lo = SCSI_FLIP((uint32_t)lba);
     cdb->lba_be_lo = SCSI_FLIP((uint32_t)lba);

-    cdb->length = alloc_size;
+    cdb->length = SCSI_FLIP(alloc_size);

 }
 
 void
 }
 
 void


@@ -49,29 +52,22 @@ __scsi_buffer_io(struct hba_port* port,
 
     struct hba_cmdh* header;
     struct hba_cmdt* table;
 
     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;
 
     // 确保端口是空闲的
     int bitmask = 1 << slot;
 
     // 确保端口是空闲的

-    wait_until(!(port->regs[HBA_RPxTFD] & (HBA_PxTFD_BSY)));
+    wait_until(!(port->regs[HBA_RPxTFD] & (HBA_PxTFD_BSY | HBA_PxTFD_DRQ)));

 
     port->regs[HBA_RPxIS] = 0;
 
 
     port->regs[HBA_RPxIS] = 0;
 

-    table->entries[0] =
-      (struct hba_prdte){ .byte_count = size - 1, .data_base = buffer };
-    header->prdt_len = 1;

     header->options |= (HBA_CMDH_WRITE * (write == 1)) | HBA_CMDH_ATAPI;
 
     header->options |= (HBA_CMDH_WRITE * (write == 1)) | HBA_CMDH_ATAPI;
 

-    uint32_t count = size / port->device->block_size;
-    if (count == 0) {
-        // 对ATAPI设备来说，READ/WRITE (16/12) 没有这个count=0的 special case
-        //  但是对于READ/WRITE (6)，就存在这个special case
-        goto fail;
-    }
+    uint32_t count = ICEIL(size, port->device->block_size);

 
     struct sata_reg_fis* fis = table->command_fis;
     void* cdb = table->atapi_cmd;
 
     struct sata_reg_fis* fis = table->command_fis;
     void* cdb = table->atapi_cmd;

-    sata_create_fis(fis, ATA_PACKET, (size << 8) & 0xffffff, 0);
+    sata_create_fis(fis, ATA_PACKET, (size << 8), 0);
+    fis->feature = 1 | ((!write) << 2);

 
     if (port->device->cbd_size == 16) {
         scsi_create_packet16((struct scsi_cdb16*)cdb,
 
     if (port->device->cbd_size == 16) {
         scsi_create_packet16((struct scsi_cdb16*)cdb,


@@ -85,18 +81,25 @@ __scsi_buffer_io(struct hba_port* port,
                              count);
     }
 
                              count);
     }
 

-    port->regs[HBA_RPxCI] = bitmask;
+    // field: cdb->misc1
+    *((uint8_t*)cdb + 1) = 3 << 5; // RPROTECT=011b 禁用保护检查

 
 

-    wait_until(!(port->regs[HBA_RPxCI] & bitmask));
+    int retries = 0;

 
 

-    if ((port->regs[HBA_RPxTFD] & HBA_PxTFD_ERR)) {
-        // 有错误
-        sata_read_error(port);
-        goto fail;
-    }
+    while (retries < MAX_RETRY) {
+        port->regs[HBA_RPxCI] = bitmask;

 
 

-    vfree_dma(table);
-    return 1;
+        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);
 
 fail:
     vfree_dma(table);