refactor: abstract out the code for prdte creation (by imposing a constrain on buffer...

fix: free the alloced dma memory when we done the io test

diff --git a/lunaix-os/hal/ahci/ahci.c b/lunaix-os/hal/ahci/ahci.c
index 09076646d520d621b526cc6403cd870369510d7c..133513b049e096d74542c7f2ce9a20cff4cf4d17 100644 (file)
--- a/lunaix-os/hal/ahci/ahci.c
+++ b/lunaix-os/hal/ahci/ahci.c
@@ -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 };
+    }

 
     *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;
 

diff --git a/lunaix-os/hal/ahci/ata.c b/lunaix-os/hal/ahci/ata.c
index 486d69d7c76ac7a551c125f96c0da4e68b10b845..f6ff7c15a43acc04f2ac4be1b4c1353e524ee727 100644 (file)
--- a/lunaix-os/hal/ahci/ata.c
+++ b/lunaix-os/hal/ahci/ata.c
@@ -16,7 +16,7 @@ __sata_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;
 
     // 确保端口是空闲的


@@ -24,9 +24,6 @@ __sata_buffer_io(struct hba_port* port,
 
     port->regs[HBA_RPxIS] = 0;
 
 
     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);
     header->options |= HBA_CMDH_WRITE * (write == 1);
 
     uint16_t count = ICEIL(size, port->device->block_size);


@@ -95,4 +92,5 @@ sata_read_error(struct hba_port* port)
 {
     uint32_t tfd = port->regs[HBA_RPxTFD];
     port->device->last_error = (tfd >> 8) & 0xff;
 {
     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
 }
\ No newline at end of file

diff --git a/lunaix-os/hal/ahci/atapi.c b/lunaix-os/hal/ahci/atapi.c
index 32ec5dfbdded07325b7526eaf530f7ca059fff5b..397c7338033602ab916f23589fab9e99388a151a 100644 (file)
--- a/lunaix-os/hal/ahci/atapi.c
+++ b/lunaix-os/hal/ahci/atapi.c
@@ -52,7 +52,7 @@ __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;
 
     // 确保端口是空闲的


@@ -60,9 +60,6 @@ __scsi_buffer_io(struct hba_port* port,
 
     port->regs[HBA_RPxIS] = 0;
 
 
     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)) | HBA_CMDH_ATAPI;
 
     uint32_t count = ICEIL(size, port->device->block_size);
     header->options |= (HBA_CMDH_WRITE * (write == 1)) | HBA_CMDH_ATAPI;
 
     uint32_t count = ICEIL(size, port->device->block_size);


@@ -77,15 +74,16 @@ __scsi_buffer_io(struct hba_port* port,
                              write ? SCSI_WRITE_BLOCKS_16 : SCSI_READ_BLOCKS_16,
                              lba,
                              count);
                              write ? SCSI_WRITE_BLOCKS_16 : SCSI_READ_BLOCKS_16,
                              lba,
                              count);

-        ((struct scsi_cdb16*)cdb)->misc1 = 3 << 5; // 禁用保护检查

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

-        ((struct scsi_cdb12*)cdb)->misc1 = 3 << 5; // 禁用保护检查

     }
 
     }
 

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

     int retries = 0;
 
     while (retries < MAX_RETRY) {
     int retries = 0;
 
     while (retries < MAX_RETRY) {

diff --git a/lunaix-os/includes/hal/ahci/hba.h b/lunaix-os/includes/hal/ahci/hba.h
index 9dc7071aa2d71e5320f960d615cf05fc0ddf4553..e7f8d01f7cfe5f0d04d8c4ff63879f94ac31e682 100644 (file)
--- a/lunaix-os/includes/hal/ahci/hba.h
+++ b/lunaix-os/includes/hal/ahci/hba.h
@@ -139,9 +139,10 @@ struct ahci_hba
 };
 
 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);

 
 #endif /* __LUNAIX_HBA_H */
 
 #endif /* __LUNAIX_HBA_H */

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index be7d46885530f7b2afd4f5bdaf55b06d4b2b3210..759db2c0d19906bdffd2a34e8639615659e50bdb 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -142,6 +142,8 @@ __test_disk_io()
     } else {
         kprint_hex(buffer, 256);
     }
     } else {
         kprint_hex(buffer, 256);
     }

+
+    vfree_dma(buffer);

 }
 
 void
 }
 
 void