Changeset d30e067 in mainline for uspace/lib/ata/src/ata.c

Timestamp:

2025-03-02T20:02:33Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8cdf360

Parents:

7debda3 (diff), 4285f384 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

File:

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

uspace/lib/ata/src/ata.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -96 +96 @@
 static errno_t ata_bd_get_block_size(bd_srv_t *, size_t *);
 static errno_t ata_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static errno_t ata_bd_eject(bd_srv_t *);
 static errno_t ata_bd_sync_cache(bd_srv_t *, aoff64_t, size_t);
 
@@ -105 +106 @@
 static errno_t ata_identify_dev(ata_device_t *, void *);
 static errno_t ata_identify_pkt_dev(ata_device_t *, void *);
-static errno_t ata_cmd_packet(ata_device_t *, const void *, size_t, void *,
+static errno_t ata_cmd_packet_nondata(ata_device_t *, const void *, size_t);
+static errno_t ata_cmd_packet_din(ata_device_t *, const void *, size_t, void *,
     size_t, size_t *);
 static errno_t ata_pcmd_inquiry(ata_device_t *, void *, size_t, size_t *);
@@ -111 +113 @@
 static errno_t ata_pcmd_read_capacity(ata_device_t *, uint64_t *, size_t *);
 static errno_t ata_pcmd_read_toc(ata_device_t *, uint8_t, void *, size_t);
+static errno_t ata_pcmd_start_stop_unit(ata_device_t *, uint8_t);
 static void disk_print_summary(ata_device_t *);
 static size_t ata_disk_maxnb(ata_device_t *);
@@ -129 +132 @@
         .get_block_size = ata_bd_get_block_size,
         .get_num_blocks = ata_bd_get_num_blocks,
-        .sync_cache = ata_bd_sync_cache
+        .sync_cache = ata_bd_sync_cache,
+        .eject = ata_bd_eject
 };
 
@@ -257 +261 @@
 
         for (i = 0; i < MAX_DEVICES; i++) {
+                if (chan->device[i].present == false)
+                        continue;
+
                 rc = ata_device_remove(&chan->device[i]);
                 if (rc != EOK) {
                         ata_msg_error(chan, "Unable to remove device %d.", i);
-                        break;
+                        fibril_mutex_unlock(&chan->lock);
+                        return rc;
                 }
         }
@@ -266 +274 @@
         ata_bd_fini_irq(chan);
         fibril_mutex_unlock(&chan->lock);
+        free(chan);
 
         return rc;
@@ -753 +762 @@
 }
 
+/** Eject medium. */
+static errno_t ata_bd_eject(bd_srv_t *bd)
+{
+        ata_device_t *device = bd_srv_device(bd);
+
+        ata_msg_debug(device->chan, "ata_bd_eject()");
+        return ata_pcmd_start_stop_unit(device, ssf_pc_no_change |
+            ssf_loej);
+}
+
 /** PIO data-in command protocol. */
 static errno_t ata_pio_data_in(ata_device_t *device, void *obuf, size_t obuf_size,
@@ -1083 +1102 @@
 }
 
-/** Issue packet command (i. e. write a command packet to the device).
- *
- * Only data-in commands are supported (e.g. inquiry, read).
+/** Issue packet command (i. e. write a command packet to the device)
+ * with no data transfer.
  *
  * @param device        Device
+ * @param cpkt          Command packet
+ * @param cpkt_size     Command packet size in bytes
+ *
+ * @return EOK on success, EIO on error.
+ */
+static errno_t ata_cmd_packet_nondata(ata_device_t *device, const void *cpkt,
+    size_t cpkt_size)
+{
+        ata_channel_t *chan = device->chan;
+        uint8_t status;
+        uint8_t drv_head;
+        errno_t rc;
+
+        ata_msg_debug(chan, "ata_cmd_packet_nondata()");
+
+        fibril_mutex_lock(&chan->lock);
+
+        /* New value for Drive/Head register */
+        drv_head =
+            ((disk_dev_idx(device) != 0) ? DHR_DRV : 0);
+
+        if (wait_status(chan, 0, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK) {
+                fibril_mutex_unlock(&chan->lock);
+                return EIO;
+        }
+
+        ata_write_cmd_8(chan, REG_DRIVE_HEAD, drv_head);
+
+        if (wait_status(chan, 0, ~(SR_BSY | SR_DRQ), NULL, TIMEOUT_BSY) != EOK) {
+                fibril_mutex_unlock(&chan->lock);
+                return EIO;
+        }
+
+        ata_write_cmd_8(chan, REG_COMMAND, CMD_PACKET);
+
+        if (wait_status(chan, SR_DRQ, ~SR_BSY, &status, TIMEOUT_BSY) != EOK) {
+                if (chan->params.use_dma)
+                        ata_dma_chan_teardown(device);
+                fibril_mutex_unlock(&chan->lock);
+                return EIO;
+        }
+
+        /* Write command packet. */
+        ata_write_data_16(chan, ((uint16_t *) cpkt), (cpkt_size + 1) / 2);
+
+        rc = ata_pio_nondata(device);
+
+        fibril_mutex_unlock(&chan->lock);
+
+        return rc;
+}
+
+/** Issue packet command (i. e. write a command packet to the device)
+ * performing data-in transfer.
+ *
+ * @param device        Device
+ * @param cpkt          Command packet
+ * @param cpkt_size     Command packet size in bytes
  * @param obuf          Buffer for storing data read from device
  * @param obuf_size     Size of obuf in bytes
@@ -1094 +1170 @@
  * @return EOK on success, EIO on error.
  */
-static errno_t ata_cmd_packet(ata_device_t *device, const void *cpkt, size_t cpkt_size,
-    void *obuf, size_t obuf_size, size_t *rcvd_size)
+static errno_t ata_cmd_packet_din(ata_device_t *device, const void *cpkt,
+    size_t cpkt_size, void *obuf, size_t obuf_size, size_t *rcvd_size)
 {
         ata_channel_t *chan = device->chan;
@@ -1190 +1266 @@
         cp->alloc_len = host2uint16_t_be(min(obuf_size, 0xff));
 
-        rc = ata_cmd_packet(device, cpb, sizeof(cpb), obuf, obuf_size, rcvd_size);
+        rc = ata_cmd_packet_din(device, cpb, sizeof(cpb), obuf, obuf_size,
+            rcvd_size);
         if (rc != EOK)
                 return rc;
@@ -1216 +1293 @@
         cdb.op_code = SCSI_CMD_READ_CAPACITY_10;
 
-        rc = ata_cmd_packet(device, &cdb, sizeof(cdb), &data, sizeof(data), &rsize);
+        rc = ata_cmd_packet_din(device, &cdb, sizeof(cdb), &data, sizeof(data),
+            &rsize);
         if (rc != EOK)
                 return rc;
@@ -1257 +1335 @@
         cp.xfer_len = host2uint32_t_be(cnt);
 
-        rc = ata_cmd_packet(device, &cp, sizeof(cp), obuf, obuf_size, NULL);
+        rc = ata_cmd_packet_din(device, &cp, sizeof(cp), obuf, obuf_size, NULL);
         if (rc != EOK)
                 return rc;
@@ -1297 +1375 @@
         cp->control = 0x40; /* 0x01 = multi-session mode (shifted to MSB) */
 
-        rc = ata_cmd_packet(device, cpb, sizeof(cpb), obuf, obuf_size, NULL);
+        rc = ata_cmd_packet_din(device, cpb, sizeof(cpb), obuf, obuf_size,
+            NULL);
         if (rc != EOK)
                 return rc;
+
+        return EOK;
+}
+
+/** Issue Start Stop Unit command.
+ *
+ * @param device        Device
+ * @param flags         Flags field of Start Stop Unit command (ssf_*)
+ * @return EOK on success, EIO on error.
+ */
+static errno_t ata_pcmd_start_stop_unit(ata_device_t *device, uint8_t flags)
+{
+        uint8_t cpb[12];
+        scsi_cdb_start_stop_unit_t *cp = (scsi_cdb_start_stop_unit_t *)cpb;
+        errno_t rc;
+
+        ata_msg_debug(device->chan, "ata_pcmd_start_stop_unit(device, 0x%x)",
+            flags);
+
+        memset(cpb, 0, sizeof(cpb));
+
+        /*
+         * For SFF 8020 compliance the command must be padded to 12 bytes.
+         */
+        cp->op_code = SCSI_CMD_START_STOP_UNIT;
+        cp->immed = 0;
+        cp->flags = flags;
+        cp->control = 0;
+
+        rc = ata_cmd_packet_nondata(device, cpb, sizeof(cpb));
+        if (rc != EOK)
+                return rc;
+
+        ata_msg_debug(device->chan, "ata_pcmd_start_stop_unit(): "
+            "ata_cmd_packet_nondata -> %d", rc);
 
         return EOK;
@@ -1532 +1646 @@
          * exceed DMA buffer size.
          */
-        dma_maxnb = d->chan->params.max_dma_xfer / d->block_size;
-        if (dma_maxnb < maxnb)
-                maxnb = dma_maxnb;
+        if (d->chan->params.use_dma) {
+                dma_maxnb = d->chan->params.max_dma_xfer / d->block_size;
+                if (dma_maxnb < maxnb)
+                        maxnb = dma_maxnb;
+        }
 
         return maxnb;