Changes in uspace/drv/block/ata_bd/ata_bd.c [c2844735:4abe919] in mainline

File:

• uspace/drv/block/ata_bd/ata_bd.c (modified) (13 diffs)

uspace/drv/block/ata_bd/ata_bd.c

@@ -54 +54 @@
 #include <bd_srv.h>
 #include <fibril_synch.h>
+#include <scsi/mmc.h>
 #include <scsi/sbc.h>
+#include <scsi/spc.h>
 #include <stdint.h>
 #include <str.h>
@@ -95 +97 @@
 static int ata_bd_get_block_size(bd_srv_t *, size_t *);
 static int ata_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static int ata_bd_sync_cache(bd_srv_t *, aoff64_t, size_t);
 
 static int ata_rcmd_read(disk_t *disk, uint64_t ba, size_t cnt,
@@ -100 +103 @@
 static int ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt,
     const void *buf);
+static int ata_rcmd_flush_cache(disk_t *disk);
 static int disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id);
 static int ata_identify_dev(disk_t *disk, void *buf);
@@ -127 +131 @@
         .write_blocks = ata_bd_write_blocks,
         .get_block_size = ata_bd_get_block_size,
-        .get_num_blocks = ata_bd_get_num_blocks
+        .get_num_blocks = ata_bd_get_num_blocks,
+        .sync_cache = ata_bd_sync_cache
 };
 
@@ -343 +348 @@
         identify_data_t idata;
         uint8_t model[40];
-        ata_inquiry_data_t inq_data;
+        scsi_std_inquiry_data_t inq_data;
         size_t isize;
         uint16_t w;
@@ -472 +477 @@
 
                 /* Check device type. */
-                if (INQUIRY_PDEV_TYPE(inq_data.pdev_type) != PDEV_TYPE_CDROM)
+                if (INQUIRY_PDEV_TYPE(inq_data.pqual_devtype) != SCSI_DEV_CD_DVD)
                         ddf_msg(LVL_WARN, "Peripheral device type is not CD-ROM.");
 
@@ -584 +589 @@
 }
 
+/** Flush cache. */
+static int ata_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt)
+{
+        disk_t *disk = bd_srv_disk(bd);
+
+        /* ATA cannot flush just some blocks, we just flush everything. */
+        (void)ba;
+        (void)cnt;
+
+        return ata_rcmd_flush_cache(disk);
+}
+
 /** PIO data-in command protocol. */
 static int ata_pio_data_in(disk_t *disk, void *obuf, size_t obuf_size,
@@ -637 +654 @@
                 }
         }
+
+        if (status & SR_ERR)
+                return EIO;
+
+        return EOK;
+}
+
+/** PIO non-data command protocol. */
+static int ata_pio_nondata(disk_t *disk)
+{
+        ata_ctrl_t *ctrl = disk->ctrl;
+        uint8_t status;
+
+        if (wait_status(ctrl, 0, ~SR_BSY, &status, TIMEOUT_BSY) != EOK)
+                return EIO;
 
         if (status & SR_ERR)
@@ -831 +863 @@
     size_t *rcvd_size)
 {
-        ata_pcmd_inquiry_t cp;
+        uint8_t cpb[12];
+        scsi_cdb_inquiry_t *cp = (scsi_cdb_inquiry_t *)cpb;
         int rc;
 
-        memset(&cp, 0, sizeof(cp));
-
-        cp.opcode = PCMD_INQUIRY;
-        cp.alloc_len = min(obuf_size, 0xff); /* Allocation length */
-
-        rc = ata_cmd_packet(disk, &cp, sizeof(cp), obuf, obuf_size, rcvd_size);
+        memset(cpb, 0, sizeof(cpb));
+
+        /*
+         * For SFF 8020 compliance the inquiry must be padded to 12 bytes
+         * and allocation length must fit in one byte.
+         */
+        cp->op_code = SCSI_CMD_INQUIRY;
+
+        /* Allocation length */
+        cp->alloc_len = host2uint16_t_be(min(obuf_size, 0xff));
+
+        rc = ata_cmd_packet(disk, cpb, sizeof(cpb), obuf, obuf_size, rcvd_size);
         if (rc != EOK)
                 return rc;
@@ -894 +933 @@
     void *obuf, size_t obuf_size)
 {
-        ata_pcmd_read_12_t cp;
+        scsi_cdb_read_12_t cp;
         int rc;
 
@@ -902 +941 @@
         memset(&cp, 0, sizeof(cp));
 
-        cp.opcode = PCMD_READ_12;
-        cp.ba = host2uint32_t_be(ba);
-        cp.nblocks = host2uint32_t_be(cnt);
+        cp.op_code = SCSI_CMD_READ_12;
+        cp.lba = host2uint32_t_be(ba);
+        cp.xfer_len = host2uint32_t_be(cnt);
 
         rc = ata_cmd_packet(disk, &cp, sizeof(cp), obuf, obuf_size, NULL);
@@ -933 +972 @@
     size_t obuf_size)
 {
-        ata_pcmd_read_toc_t cp;
+        uint8_t cpb[12];
+        scsi_cdb_read_toc_t *cp = (scsi_cdb_read_toc_t *)cpb;
         int rc;
 
-        memset(&cp, 0, sizeof(cp));
-
-        cp.opcode = PCMD_READ_TOC;
-        cp.msf = 0;
-        cp.format = 0x01; /* 0x01 = multi-session mode */
-        cp.start = session;
-        cp.size = host2uint16_t_be(obuf_size);
-        cp.oldformat = 0x40; /* 0x01 = multi-session mode (shifted to MSB) */
-        
-        rc = ata_cmd_packet(disk, &cp, sizeof(cp), obuf, obuf_size, NULL);
+        memset(cpb, 0, sizeof(cpb));
+
+        cp->op_code = SCSI_CMD_READ_TOC;
+        cp->msf = 0;
+        cp->format = 0x01; /* 0x01 = multi-session mode */
+        cp->track_sess_no = session;
+        cp->alloc_len = host2uint16_t_be(obuf_size);
+        cp->control = 0x40; /* 0x01 = multi-session mode (shifted to MSB) */
+
+        rc = ata_cmd_packet(disk, cpb, sizeof(cpb), obuf, obuf_size, NULL);
         if (rc != EOK)
                 return rc;
-        
+
         return EOK;
 }
@@ -1066 +1106 @@
         rc = ata_pio_data_out(disk, buf, cnt * disk->block_size,
             disk->block_size, cnt);
+
+        fibril_mutex_unlock(&ctrl->lock);
+        return rc;
+}
+
+/** Flush cached data to nonvolatile storage.
+ *
+ * @param disk          Disk
+ *
+ * @return EOK on success, EIO on error.
+ */
+static int ata_rcmd_flush_cache(disk_t *disk)
+{
+        ata_ctrl_t *ctrl = disk->ctrl;
+        uint8_t drv_head;
+        int rc;
+
+        /* New value for Drive/Head register */
+        drv_head =
+            (disk_dev_idx(disk) != 0) ? DHR_DRV : 0;
+
+        fibril_mutex_lock(&ctrl->lock);
+
+        /* Program a Flush Cache operation. */
+
+        if (wait_status(ctrl, 0, ~SR_BSY, NULL, TIMEOUT_BSY) != EOK) {
+                fibril_mutex_unlock(&ctrl->lock);
+                return EIO;
+        }
+
+        pio_write_8(&ctrl->cmd->drive_head, drv_head);
+
+        if (wait_status(ctrl, SR_DRDY, ~SR_BSY, NULL, TIMEOUT_DRDY) != EOK) {
+                fibril_mutex_unlock(&ctrl->lock);
+                return EIO;
+        }
+
+        pio_write_8(&ctrl->cmd->command, CMD_FLUSH_CACHE);
+
+        rc = ata_pio_nondata(disk);
 
         fibril_mutex_unlock(&ctrl->lock);