Second Extended Filesystem (ext2) and other improvements (#33)

[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 397c7338033602ab916f23589fab9e99388a151a..841ee3113a2e51bfc2b364d0279cde9b672801b9 100644 (file)
--- a/lunaix-os/hal/ahci/atapi.c
+++ b/lunaix-os/hal/ahci/atapi.c
@@ -1,7 +1,7 @@
+#include <hal/ahci/ahci.h>

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

-#include <hal/ahci/utils.h>

 
 #include <klibc/string.h>
 #include <lunaix/mm/valloc.h>
 
 #include <klibc/string.h>
 #include <lunaix/mm/valloc.h>


@@ -11,9 +11,9 @@
 
 void
 scsi_create_packet12(struct scsi_cdb12* cdb,
 
 void
 scsi_create_packet12(struct scsi_cdb12* cdb,

-                     uint8_t opcode,
-                     uint32_t lba,
-                     uint32_t alloc_size)
+                     u8_t opcode,
+                     u32_t lba,
+                     u32_t alloc_size)

 {
     memset(cdb, 0, sizeof(*cdb));
     cdb->opcode = opcode;
 {
     memset(cdb, 0, sizeof(*cdb));
     cdb->opcode = opcode;


@@ -23,103 +23,69 @@ scsi_create_packet12(struct scsi_cdb12* cdb,
 
 void
 scsi_create_packet16(struct scsi_cdb16* cdb,
 
 void
 scsi_create_packet16(struct scsi_cdb16* cdb,

-                     uint8_t opcode,
-                     uint64_t lba,
-                     uint32_t alloc_size)
+                     u8_t opcode,
+                     lba_t lba,
+                     u32_t alloc_size)

 {
     memset(cdb, 0, sizeof(*cdb));
     cdb->opcode = opcode;
 {
     memset(cdb, 0, sizeof(*cdb));
     cdb->opcode = opcode;

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

     cdb->length = SCSI_FLIP(alloc_size);
 }
 
 void
     cdb->length = SCSI_FLIP(alloc_size);
 }
 
 void

-scsi_parse_capacity(struct hba_device* device, uint32_t* parameter)
+scsi_parse_capacity(struct hba_device* device, u32_t* parameter)

 {
 {

-    device->max_lba = SCSI_FLIP(*(parameter + 1));
-    device->block_size = SCSI_FLIP(*(parameter + 2));
+    if (device->cbd_size == SCSI_CDB16) {
+        device->max_lba = (lba_t)SCSI_FLIP(*(parameter + 1)) |
+                          ((lba_t)SCSI_FLIP(*parameter) << 32);
+        device->block_size = SCSI_FLIP(*(parameter + 2));
+    } else {
+        // for READ_CAPACITY(10)
+        device->max_lba = SCSI_FLIP(*(parameter));
+        device->block_size = SCSI_FLIP(*(parameter + 1));
+    }

 }
 
 void
 }
 
 void

-__scsi_buffer_io(struct hba_port* port,
-                 uint64_t lba,
-                 void* buffer,
-                 uint32_t size,
-                 int write)
+scsi_submit(struct hba_device* dev, struct blkio_req* io_req)

 {
 {

-    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;
     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;
+    int write = !!(io_req->flags & BLKIO_WRITE);
+    int slot = hba_prepare_cmd(port, &table, &header);
+    hba_bind_vbuf(header, table, io_req->vbuf);

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

-    uint32_t count = ICEIL(size, port->device->block_size);
+    size_t size = vbuf_size(io_req->vbuf);
+    u32_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;

     void* cdb = table->atapi_cmd;
     sata_create_fis(fis, ATA_PACKET, (size << 8), 0);
     fis->feature = 1 | ((!write) << 2);
 
     void* cdb = table->atapi_cmd;
     sata_create_fis(fis, ATA_PACKET, (size << 8), 0);
     fis->feature = 1 | ((!write) << 2);
 

-    if (port->device->cbd_size == 16) {
+    if (port->device->cbd_size == SCSI_CDB16) {

         scsi_create_packet16((struct scsi_cdb16*)cdb,
                              write ? SCSI_WRITE_BLOCKS_16 : SCSI_READ_BLOCKS_16,
         scsi_create_packet16((struct scsi_cdb16*)cdb,
                              write ? SCSI_WRITE_BLOCKS_16 : SCSI_READ_BLOCKS_16,

-                             lba,
+                             io_req->blk_addr,

                              count);
     } else {
         scsi_create_packet12((struct scsi_cdb12*)cdb,
                              write ? SCSI_WRITE_BLOCKS_12 : SCSI_READ_BLOCKS_12,
                              count);
     } else {
         scsi_create_packet12((struct scsi_cdb12*)cdb,
                              write ? SCSI_WRITE_BLOCKS_12 : SCSI_READ_BLOCKS_12,

-                             lba,
+                             io_req->blk_addr & (u32_t)-1,

                              count);
     }
 
     // field: cdb->misc1
                              count);
     }
 
     // field: cdb->misc1

-    *((uint8_t*)cdb + 1) = 3 << 5; // RPROTECT=011b 禁用保护检查
-
-    int retries = 0;
-
-    while (retries < MAX_RETRY) {
-        port->regs[HBA_RPxCI] = bitmask;
-
-        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;
-        }
-    }
+    *((u8_t*)cdb + 1) = 3 << 5; // RPROTECT=011b 禁用保护检查

 
 

-fail:
-    vfree_dma(table);
-    return 0;
-}
-
-void
-scsi_read_buffer(struct hba_port* port,
-                 uint64_t lba,
-                 void* buffer,
-                 uint32_t size)
-{
-    __scsi_buffer_io(port, lba, buffer, size, 0);
-}
-
-void
-scsi_write_buffer(struct hba_port* port,
-                  uint64_t lba,
-                  void* buffer,
-                  uint32_t size)
-{
-    __scsi_buffer_io(port, lba, buffer, size, 1);
+    // The async way...
+    struct hba_cmd_state* cmds = valloc(sizeof(struct hba_cmd_state));
+    *cmds = (struct hba_cmd_state){ .cmd_table = table, .state_ctx = io_req };
+    ahci_post(port, cmds, slot);

 }
\ No newline at end of file
 }
\ No newline at end of file