Changes in uspace/srv/bd/ata_bd/ata_bd.c [aa893e0:ff65e91] in mainline

File:

• uspace/srv/bd/ata_bd/ata_bd.c (modified) (15 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -51 +51 @@
 #include <libarch/ddi.h>
 #include <ddi.h>
-#include <ipc/ipc.h>
 #include <ipc/bd.h>
 #include <async.h>
@@ -82 +81 @@
 static const size_t identify_data_size = 512;
 
-/** Size of the communication area. */
-static size_t comm_size;
-
 /** I/O base address of the command registers. */
 static uintptr_t cmd_physical;
@@ -106 +102 @@
 static void print_syntax(void);
 static int ata_bd_init(void);
-static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
+static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *);
 static int ata_bd_read_blocks(int disk_id, uint64_t ba, size_t cnt,
     void *buf);
@@ -275 +271 @@
 
 /** Block device connection handler */
-static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         void *fs_va = NULL;
@@ -282 +278 @@
         sysarg_t method;
         devmap_handle_t dh;
-        int flags;
+        size_t comm_size;       /**< Size of the communication area. */
+        unsigned int flags;
         int retval;
         uint64_t ba;
@@ -298 +295 @@
 
         if (disk_id < 0 || disk[disk_id].present == false) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 return;
         }
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         if (!async_share_out_receive(&callid, &comm_size, &flags)) {
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
@@ -312 +309 @@
         fs_va = as_get_mappable_page(comm_size);
         if (fs_va == NULL) {
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
@@ -318 +315 @@
         (void) async_share_out_finalize(callid, fs_va);
 
-        while (1) {
+        while (true) {
                 callid = async_get_call(&call);
                 method = IPC_GET_IMETHOD(call);
+                
+                if (!method) {
+                        /* The other side has hung up. */
+                        async_answer_0(callid, EOK);
+                        return;
+                }
+                
                 switch (method) {
-                case IPC_M_PHONE_HUNGUP:
-                        /* The other side has hung up. */
-                        ipc_answer_0(callid, EOK);
-                        return;
                 case BD_READ_BLOCKS:
                         ba = MERGE_LOUP32(IPC_GET_ARG1(call),
@@ -347 +347 @@
                         break;
                 case BD_GET_BLOCK_SIZE:
-                        ipc_answer_1(callid, EOK, disk[disk_id].block_size);
+                        async_answer_1(callid, EOK, disk[disk_id].block_size);
                         continue;
                 case BD_GET_NUM_BLOCKS:
-                        ipc_answer_2(callid, EOK, LOWER32(disk[disk_id].blocks),
+                        async_answer_2(callid, EOK, LOWER32(disk[disk_id].blocks),
                             UPPER32(disk[disk_id].blocks));
                         continue;
@@ -357 +357 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }
@@ -373 +373 @@
         uint16_t w;
         uint8_t c;
+        uint16_t bc;
         size_t pos, len;
         int rc;
@@ -388 +389 @@
         } else if (rc == EIO) {
                 /*
-                 * There is something, but not a register device.
-                 * It could be a packet device.
+                 * There is something, but not a register device. Check to see
+                 * whether the IDENTIFY command left the packet signature in
+                 * the registers in case this is a packet device.
+                 *
+                 * According to the ATA specification, the LBA low and
+                 * interrupt reason registers should be set to 0x01. However,
+                 * there are many devices that do not follow this and only set
+                 * the byte count registers. So, only check these.
                  */
-                rc = identify_pkt_dev(disk_id, &idata);
-                if (rc == EOK) {
-                        /* We have a packet device. */
-                        d->dev_type = ata_pkt_dev;
+                bc = ((uint16_t)pio_read_8(&cmd->cylinder_high) << 8) |
+                    pio_read_8(&cmd->cylinder_low);
+
+                if (bc == PDEV_SIGNATURE_BC) {
+                        rc = identify_pkt_dev(disk_id, &idata);
+                        if (rc == EOK) {
+                                /* We have a packet device. */
+                                d->dev_type = ata_pkt_dev;
+                        } else {
+                                return EIO;
+                        }
                 } else {
                         /* Nope. Something's there, but not recognized. */
@@ -404 +418 @@
         }
 
-        printf("device caps: 0x%04x\n", idata.caps);
         if (d->dev_type == ata_pkt_dev) {
                 /* Packet device */
@@ -567 +580 @@
 
         /*
-         * This is where we would most likely expect a non-existing device to
-         * show up by not setting SR_DRDY.
+         * Do not wait for DRDY to be set in case this is a packet device.
+         * We determine whether the device is present by waiting for DRQ to be
+         * set after issuing the command.
          */
-        if (wait_status(SR_DRDY, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK)
+        if (wait_status(0, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK)
                 return ETIMEOUT;
 
@@ -578 +592 @@
                 return ETIMEOUT;
 
+        /*
+         * If ERR is set, this may be a packet device, so return EIO to cause
+         * the caller to check for one.
+         */
+        if ((status & SR_ERR) != 0) {
+                return EIO;
+        }
+
+        if (wait_status(SR_DRQ, ~SR_BSY, &status, TIMEOUT_PROBE) != EOK)
+                return ETIMEOUT;
+
         /* Read data from the disk buffer. */
 
-        if ((status & SR_DRQ) != 0) {
-                for (i = 0; i < identify_data_size / 2; i++) {
-                        data = pio_read_16(&cmd->data_port);
-                        ((uint16_t *) buf)[i] = data;
-                }
-        }
-
-        if ((status & SR_ERR) != 0) {
-                return EIO;
+        for (i = 0; i < identify_data_size / 2; i++) {
+                data = pio_read_16(&cmd->data_port);
+                ((uint16_t *) buf)[i] = data;
         }