Changeset c2844735 in mainline

Timestamp:

2014-08-03T15:37:06Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

251d4dd

Parents:

94c49fd3

Message:

ATAPI CD-ROM needs to return device capacity. (Could not mount HelenOS CD since block address check was added to libblock.)

Location:

uspace/drv/block/ata_bd

Files:

• Makefile (modified) (1 diff)
• ata_bd.c (modified) (11 diffs)

uspace/drv/block/ata_bd/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBSCSI_PREFIX)/libscsi.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBSCSI_PREFIX)/include
 BINARY = ata_bd
 

uspace/drv/block/ata_bd/ata_bd.c

@@ -54 +54 @@
 #include <bd_srv.h>
 #include <fibril_synch.h>
+#include <scsi/sbc.h>
 #include <stdint.h>
 #include <str.h>
@@ -103 +104 @@
 static int ata_identify_pkt_dev(disk_t *disk, void *buf);
 static int ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size,
-    void *obuf, size_t obuf_size);
-static int ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size);
+    void *obuf, size_t obuf_size, size_t *rcvd_size);
+static int ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size,
+    size_t *rcvd_size);
 static int ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt,
     void *obuf, size_t obuf_size);
+static int ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks,
+    size_t *block_size);
 static int ata_pcmd_read_toc(disk_t *disk, uint8_t ses,
     void *obuf, size_t obuf_size);
@@ -340 +344 @@
         uint8_t model[40];
         ata_inquiry_data_t inq_data;
+        size_t isize;
         uint16_t w;
         uint8_t c;
         uint16_t bc;
+        uint64_t nblocks;
+        size_t block_size;
         size_t pos, len;
         int rc;
@@ -457 +464 @@
         if (d->dev_type == ata_pkt_dev) {
                 /* Send inquiry. */
-                rc = ata_pcmd_inquiry(d, &inq_data, sizeof(inq_data));
-                if (rc != EOK) {
+                rc = ata_pcmd_inquiry(d, &inq_data, sizeof(inq_data), &isize);
+                if (rc != EOK || isize < sizeof(inq_data)) {
                         ddf_msg(LVL_ERROR, "Device inquiry failed.");
                         d->present = false;
@@ -468 +475 @@
                         ddf_msg(LVL_WARN, "Peripheral device type is not CD-ROM.");
 
-                /* Assume 2k block size for now. */
-                d->block_size = 2048;
+                rc = ata_pcmd_read_capacity(d, &nblocks, &block_size);
+                if (rc != EOK) {
+                        ddf_msg(LVL_ERROR, "Read capacity command failed.");
+                        d->present = false;
+                        return EIO;
+                }
+
+                d->blocks = nblocks;
+                d->block_size = block_size;
         } else {
                 /* Assume register Read always uses 512-byte blocks. */
@@ -722 +736 @@
  * @param obuf          Buffer for storing data read from device
  * @param obuf_size     Size of obuf in bytes
+ * @param rcvd_size     Place to store number of bytes read or @c NULL
  *
  * @return EOK on success, EIO on error.
  */
 static int ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size,
-    void *obuf, size_t obuf_size)
+    void *obuf, size_t obuf_size, size_t *rcvd_size)
 {
         ata_ctrl_t *ctrl = disk->ctrl;
@@ -800 +815 @@
                 return EIO;
 
+        if (rcvd_size != NULL)
+                *rcvd_size = data_size;
         return EOK;
 }
@@ -811 +828 @@
  * @return EOK on success, EIO on error.
  */
-static int ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size)
+static int ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size,
+    size_t *rcvd_size)
 {
         ata_pcmd_inquiry_t cp;
@@ -821 +839 @@
         cp.alloc_len = min(obuf_size, 0xff); /* Allocation length */
 
-        rc = ata_cmd_packet(disk, &cp, sizeof(cp), obuf, obuf_size);
+        rc = ata_cmd_packet(disk, &cp, sizeof(cp), obuf, obuf_size, rcvd_size);
         if (rc != EOK)
                 return rc;
+
+        return EOK;
+}
+
+/** Issue ATAPI read capacity(10) command.
+ *
+ * @param disk          Disk
+ * @param nblocks       Place to store number of blocks
+ * @param block_size    Place to store block size
+ *
+ * @return EOK on success, EIO on error.
+ */
+static int ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks,
+    size_t *block_size)
+{
+        scsi_cdb_read_capacity_10_t cdb;
+        scsi_read_capacity_10_data_t data;
+        size_t rsize;
+        int rc;
+
+        memset(&cdb, 0, sizeof(cdb));
+        cdb.op_code = SCSI_CMD_READ_CAPACITY_10;
+
+        rc = ata_cmd_packet(disk, &cdb, sizeof(cdb), &data, sizeof(data), &rsize);
+        if (rc != EOK)
+                return rc;
+
+        if (rsize != sizeof(data))
+                return EIO;
+
+        *nblocks = uint32_t_be2host(data.last_lba) + 1;
+        *block_size = uint32_t_be2host(data.block_size);
 
         return EOK;
@@ -856 +906 @@
         cp.nblocks = host2uint32_t_be(cnt);
 
-        rc = ata_cmd_packet(disk, &cp, sizeof(cp), obuf, obuf_size);
+        rc = ata_cmd_packet(disk, &cp, sizeof(cp), obuf, obuf_size, NULL);
         if (rc != EOK)
                 return rc;
@@ -895 +945 @@
         cp.oldformat = 0x40; /* 0x01 = multi-session mode (shifted to MSB) */
         
-        rc = ata_cmd_packet(disk, &cp, sizeof(cp), obuf, obuf_size);
+        rc = ata_cmd_packet(disk, &cp, sizeof(cp), obuf, obuf_size, NULL);
         if (rc != EOK)
                 return rc;