Changeset 7a56e33e in mainline

Timestamp:

2011-01-29T05:10:07Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

88743b5

Parents:

ae0300b5

Message:

Detection of ATA packet devices.

Location:

uspace/srv/bd/ata_bd

Files:

• ata_bd.c (modified) (6 diffs)
• ata_bd.h (modified) (3 diffs)
• ata_hw.h (modified) (3 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -112 +112 @@
 static int disk_init(disk_t *d, int disk_id);
 static int drive_identify(int drive_id, void *buf);
+static int identify_pkt_dev(int dev_idx, void *buf);
 static void disk_print_summary(disk_t *d);
 static int coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc);
@@ -204 +205 @@
         printf("%s: ", d->model);
 
-        switch (d->amode) {
-        case am_chs:
-                printf("CHS %u cylinders, %u heads, %u sectors",
-                    disk->geom.cylinders, disk->geom.heads, disk->geom.sectors);
-                break;
-        case am_lba28:
-                printf("LBA-28");
-                break;
-        case am_lba48:
-                printf("LBA-48");
-                break;
+        if (d->dev_type == ata_reg_dev) {
+                switch (d->amode) {
+                case am_chs:
+                        printf("CHS %u cylinders, %u heads, %u sectors",
+                            disk->geom.cylinders, disk->geom.heads,
+                            disk->geom.sectors);
+                        break;
+                case am_lba28:
+                        printf("LBA-28");
+                        break;
+                case am_lba48:
+                        printf("LBA-48");
+                        break;
+                }
+        } else {
+                printf("PACKET");
         }
 
@@ -360 +366 @@
         unsigned i;
 
+        d->present = false;
+
+        /* Try identify command. */
         rc = drive_identify(disk_id, &idata);
-        if (rc != EOK) {
-                d->present = false;
-                return rc;
-        }
-
-        if ((idata.caps & cap_lba) == 0) {
+        if (rc == EOK) {
+                /* Success. It's a register (non-packet) device. */
+                printf("ATA register-only device found.\n");
+                d->present = true;
+                d->dev_type = ata_reg_dev;
+        } else if (rc == EIO) {
+                /*
+                 * There is something, but not a register device.
+                 * It could be a packet device.
+                 */
+                rc = identify_pkt_dev(disk_id, &idata);
+                if (rc == EOK) {
+                        /* We have a packet device. */
+                        d->present = true;
+                        d->dev_type = ata_pkt_dev;
+                } else {
+                        /* Nope. Something's there, but not recognized. */
+                }
+        } else {
+                /* Operation timed out. That means there is no device there. */
+        }
+
+        if (d->present == false)
+                return EIO;
+
+        printf("device caps: 0x%04x\n", idata.caps);
+        if (d->dev_type == ata_pkt_dev) {
+                /* Packet device */
+                d->amode = 0;
+
+                d->geom.cylinders = 0;
+                d->geom.heads = 0;
+                d->geom.sectors = 0;
+
+                d->blocks = 0;
+        } else if ((idata.caps & rd_cap_lba) == 0) {
                 /* Device only supports CHS addressing. */
                 d->amode = am_chs;
@@ -474 +513 @@
  * @param disk_id       Device ID, 0 or 1.
  * @param buf           Pointer to a 512-byte buffer.
+ *
+ * @return              ETIMEOUT on timeout (this can mean the device is
+ *                      not present). EIO if device responds with error.
  */
 static int drive_identify(int disk_id, void *buf)
@@ -485 +527 @@
 
         if (wait_status(0, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK)
-                return EIO;
+                return ETIMEOUT;
 
         pio_write_8(&cmd->drive_head, drv_head);
@@ -494 +536 @@
          */
         if (wait_status(SR_DRDY, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK)
-                return EIO;
+                return ETIMEOUT;
 
         pio_write_8(&cmd->command, CMD_IDENTIFY_DRIVE);
 
         if (wait_status(0, ~SR_BSY, &status, TIMEOUT_PROBE) != EOK)
-                return EIO;
+                return ETIMEOUT;
 
         /* Read data from the disk buffer. */
+
+        if ((status & SR_DRQ) != 0) {
+                for (i = 0; i < block_size / 2; i++) {
+                        data = pio_read_16(&cmd->data_port);
+                        ((uint16_t *) buf)[i] = data;
+                }
+        }
+
+        if ((status & SR_ERR) != 0) {
+                return EIO;
+        }
+
+        return EOK;
+}
+
+/** Issue Identify Packet Device command.
+ *
+ * Reads @c identify data into the provided buffer. This is used to detect
+ * whether an ATAPI device is present and if so, to determine its parameters.
+ *
+ * @param dev_idx       Device index, 0 or 1.
+ * @param buf           Pointer to a 512-byte buffer.
+ */
+static int identify_pkt_dev(int dev_idx, void *buf)
+{
+        uint16_t data;
+        uint8_t status;
+        uint8_t drv_head;
+        size_t i;
+
+        drv_head = ((dev_idx != 0) ? DHR_DRV : 0);
+
+        if (wait_status(0, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK)
+                return EIO;
+
+        pio_write_8(&cmd->drive_head, drv_head);
+
+        /* For ATAPI commands we do not need to wait for DRDY. */
+        if (wait_status(0, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK)
+                return EIO;
+
+        pio_write_8(&cmd->command, CMD_IDENTIFY_PKT_DEV);
+
+        if (wait_status(0, ~SR_BSY, &status, TIMEOUT_BSY) != EOK)
+                return EIO;
+
+        /* Read data from the device buffer. */
 
         if ((status & SR_DRQ) != 0) {

uspace/srv/bd/ata_bd/ata_bd.h

@@ -53 +53 @@
 };
 
-/** Block addressing mode. */
-enum addr_mode {
+enum ata_dev_type {
+        ata_reg_dev,    /* Register device (no packet feature set support) */
+        ata_pkt_dev     /* Packet device (supports packet feature set). */
+};
+
+/** Register device block addressing mode. */
+enum rd_addr_mode {
         am_chs,         /**< CHS block addressing */
         am_lba28,       /**< LBA-28 block addressing */
@@ -62 +67 @@
 /** Block coordinates */
 typedef struct {
-        /** Addressing mode used */
-        enum addr_mode amode;
+        enum rd_addr_mode amode;
 
         union {
@@ -90 +94 @@
 typedef struct {
         bool present;
-        enum addr_mode amode;
+
+        /** Device type */
+        enum ata_dev_type dev_type;
+
+        /** Addressing mode to use (if register device) */
+        enum rd_addr_mode amode;
 
         /*

uspace/srv/bd/ata_bd/ata_hw.h

@@ -134 +134 @@
         CMD_WRITE_SECTORS       = 0x30,
         CMD_WRITE_SECTORS_EXT   = 0x34,
+        CMD_IDENTIFY_PKT_DEV    = 0xA1,
         CMD_IDENTIFY_DRIVE      = 0xEC
 };
 
-/** Data returned from @c identify command. */
+/** Data returned from identify device and identify packet device command. */
 typedef struct {
         uint16_t gen_conf;
@@ -159 +160 @@
         uint16_t max_rw_multiple;
         uint16_t _res48;
-        uint16_t caps;
+        uint16_t caps;          /* Different meaning for packet device */
         uint16_t _res50;
         uint16_t pio_timing;
@@ -214 +215 @@
 } identify_data_t;
 
-enum ata_caps {
-        cap_iordy       = 0x0800,
-        cap_iordy_cbd   = 0x0400,
-        cap_lba         = 0x0200,
-        cap_dma         = 0x0100
+/** Capability bits for register device. */
+enum ata_regdev_caps {
+        rd_cap_iordy            = 0x0800,
+        rd_cap_iordy_cbd        = 0x0400,
+        rd_cap_lba              = 0x0200,
+        rd_cap_dma              = 0x0100
+};
+
+/** Capability bits for packet device. */
+enum ata_pktdev_caps {
+        pd_cap_ildma            = 0x8000,
+        pd_cap_cmdqueue         = 0x4000,
+        pd_cap_overlap          = 0x2000,
+        pd_cap_need_softreset   = 0x1000,       /* Obsolete (ATAPI-6) */
+        pd_cap_iordy            = 0x0800,
+        pd_cap_iordy_dis        = 0x0400,
+        pd_cap_lba              = 0x0200,       /* Must be on */
+        pd_cap_dma              = 0x0100
 };