Changeset 645d3832 in mainline for uspace/lib/ata/src/ata.c

Timestamp:

2024-06-10T17:29:13Z (4 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

a38d504

Parents:

69c376b5

git-author:

Jiri Svoboda <jiri@…> (2024-06-10 17:24:58)

git-committer:

Jiri Svoboda <jiri@…> (2024-06-10 17:29:13)

Message:

Add DMA support to PCI-IDE / libata (register commands)

File:

• uspace/lib/ata/src/ata.c (modified) (7 diffs)

uspace/lib/ata/src/ata.c

@@ -118 +118 @@
     unsigned);
 static errno_t wait_irq(ata_channel_t *, uint8_t *, unsigned);
+static void ata_dma_chan_setup(ata_device_t *, void *, size_t, ata_dma_dir_t);
+static void ata_dma_chan_teardown(ata_device_t *);
 
 static bd_ops_t ata_bd_ops = {
@@ -849 +851 @@
 }
 
+/** DMA command protocol.
+ *
+ * @param device ATA device
+ * @param cmd Command code
+ * @param buf Data buffer
+ * @param buf_size Data buffer size in bytes
+ * @param dir DMA direction
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t ata_dma_proto(ata_device_t *device, uint8_t cmd, void *buf,
+    size_t buf_size, ata_dma_dir_t dir)
+{
+        ata_channel_t *chan = device->chan;
+        uint8_t status;
+        errno_t rc;
+
+        /* Set up DMA channel */
+        ata_dma_chan_setup(device, buf, buf_size, dir);
+
+        ata_write_cmd_8(chan, REG_COMMAND, cmd);
+
+        if (chan->params.have_irq)
+                rc = wait_irq(chan, &status, TIMEOUT_BSY);
+        else
+                rc = wait_status(chan, 0, ~SR_BSY, &status, TIMEOUT_BSY);
+
+        if (rc != EOK) {
+                ata_msg_debug(chan, "wait_irq/wait_status failed");
+                return EIO;
+        }
+
+        /* Tear down DMA channel */
+        ata_dma_chan_teardown(device);
+
+        if ((status & SR_ERR) != 0) {
+                ata_msg_debug(chan, "status & SR_ERR != 0");
+                return EIO;
+        }
+
+        return EOK;
+}
+
 /** Issue IDENTIFY DEVICE command.
  *
@@ -1184 +1229 @@
         uint8_t drv_head;
         block_coord_t bc;
+        uint8_t cmd;
         errno_t rc;
 
@@ -1222 +1268 @@
         coord_sc_program(chan, &bc, blk_cnt);
 
-        ata_write_cmd_8(chan, REG_COMMAND, device->amode == am_lba48 ?
-            CMD_READ_SECTORS_EXT : CMD_READ_SECTORS);
-
-        rc = ata_pio_data_in(device, buf, blk_cnt * device->block_size,
-            device->block_size, blk_cnt);
+        if (chan->params.use_dma) {
+                cmd = (device->amode == am_lba48) ? CMD_READ_DMA_EXT :
+                    CMD_READ_DMA;
+
+                rc = ata_dma_proto(device, cmd, buf,
+                    blk_cnt * device->block_size, ata_dma_read);
+                if (rc != EOK) {
+                        ata_msg_note(chan, "ata_rcmd_read() -> dma_proto->%d",
+                            rc);
+                }
+        } else {
+                ata_write_cmd_8(chan, REG_COMMAND, device->amode == am_lba48 ?
+                    CMD_READ_SECTORS_EXT : CMD_READ_SECTORS);
+
+                rc = ata_pio_data_in(device, buf, blk_cnt * device->block_size,
+                    device->block_size, blk_cnt);
+                if (rc != EOK) {
+                        ata_msg_note(chan, "ata_rcmd_read() -> pio_data_in->%d",
+                            rc);
+                }
+        }
 
         fibril_mutex_unlock(&chan->lock);
 
-        if (rc != EOK)
-                ata_msg_note(chan, "ata_rcmd_read() -> pio_data_in->%d", rc);
         return rc;
 }
@@ -1250 +1310 @@
         uint8_t drv_head;
         block_coord_t bc;
+        uint8_t cmd;
         errno_t rc;
 
@@ -1284 +1345 @@
         coord_sc_program(chan, &bc, cnt);
 
-        ata_write_cmd_8(chan, REG_COMMAND, device->amode == am_lba48 ?
-            CMD_WRITE_SECTORS_EXT : CMD_WRITE_SECTORS);
-
-        rc = ata_pio_data_out(device, buf, cnt * device->block_size,
-            device->block_size, cnt);
+        if (chan->params.use_dma) {
+                cmd = (device->amode == am_lba48) ? CMD_WRITE_DMA_EXT :
+                    CMD_WRITE_DMA;
+
+                rc = ata_dma_proto(device, cmd, (void *)buf,
+                    cnt * device->block_size, ata_dma_write);
+                if (rc != EOK) {
+                        ata_msg_note(chan, "ata_rcmd_write() -> dma_proto->%d",
+                            rc);
+                }
+        } else {
+                ata_write_cmd_8(chan, REG_COMMAND, device->amode == am_lba48 ?
+                    CMD_WRITE_SECTORS_EXT : CMD_WRITE_SECTORS);
+
+                rc = ata_pio_data_out(device, buf, cnt * device->block_size,
+                    device->block_size, cnt);
+                if (rc != EOK) {
+                        ata_msg_note(chan,
+                            "ata_rcmd_read() -> pio_data_out->%d", rc);
+                }
+        }
 
         fibril_mutex_unlock(&chan->lock);
@@ -1522 +1599 @@
 }
 
+/** Set up DMA channel.
+ *
+ * @param device ATA device
+ * @param buf Data buffer
+ * @param buf_size Data buffer size in bytes
+ * @param dir DMA direction
+ */
+static void ata_dma_chan_setup(ata_device_t *device, void *buf,
+    size_t buf_size, ata_dma_dir_t dir)
+{
+        device->chan->params.dma_chan_setup(device->chan->params.arg,
+            buf, buf_size, dir);
+}
+
+/** Tear down DMA channel.
+ *
+ * @param device ATA device
+ */
+static void ata_dma_chan_teardown(ata_device_t *device)
+{
+        device->chan->params.dma_chan_teardown(device->chan->params.arg);
+}
+
 /** Interrupt handler.
  *