Changeset 116

Timestamp:

Mar 26, 2010 1:01:39 PM (3 years ago)

Author:

stepan

Message:

improve IDE error handling

Signed-off-by: Stefan Reinauer <stepan@…>

Location:

trunk/filo

Files:

• drivers/ide_new.c (modified) (7 diffs)
• drivers/ide_new.h (modified) (1 diff)
• fs/blockdev.c (modified) (2 diffs)

trunk/filo/drivers/ide_new.c

@@ -4 +4 @@
  *   Copyright (C) 2004 Jens Axboe <axboe@suse.de>
  *   Copyright (C) 2005 Stefan Reinauer <stepan@openbios.org>
- *   Copyright (C) 2009 coresystems GmbH
+ *   Copyright (C) 2009-2010 coresystems GmbH
  *
  *   Credit goes to Hale Landis for his excellent ata demo software
@@ -165 +165 @@
                 stat = ob_ide_pio_readb(drive, IDEREG_STATUS);
 
-        printf("ob_ide_error drive<%d>: %s:\n", drive->nr, msg);
-        printf("    cmd=%x, stat=%x", chan->ata_cmd.command, stat);
+        debug("ob_ide_error ");
+        printf("drive<%d>: %s:\n", drive->nr, msg);
+        debug("    cmd=%x, stat=%x", chan->ata_cmd.command, stat);
 
         if ((stat & (BUSY_STAT | ERR_STAT)) == ERR_STAT) {
                 err = ob_ide_pio_readb(drive, IDEREG_ERROR);
-                printf(", err=%x", err);
-        }
-        printf("\n");
+                debug(", err=%x", err);
+        }
+        debug("\n");
 
         /*
@@ -184 +185 @@
                         old_cdb = cmd->old_cdb;
 
-                        printf("    atapi opcode=%02x", old_cdb);
+                        debug("    atapi opcode=%02x", old_cdb);
                 } else {
                         int i;
 
-                        printf("    cdb: ");
+                        debug("    cdb: ");
                         for (i = 0; i < sizeof(cmd->cdb); i++)
-                                printf("%02x ", cmd->cdb[i]);
+                                debug("%02x ", cmd->cdb[i]);
                 }
                 if (cmd->sense_valid)
-                        printf(", sense: %02x/%02x/%02x", cmd->sense.sense_key, cmd->sense.asc, cmd->sense.ascq);
+                        debug(", sense: %02x/%02x/%02x", cmd->sense.sense_key, cmd->sense.asc, cmd->sense.ascq);
                 else
-                        printf(", no sense");
-                printf("\n");
+                        debug(", no sense");
+                debug("\n");
         }
 }
@@ -568 +569 @@
                  * ... except 'medium not present'
                  */
-                if (cmd->sense.asc == 0x3a)
-                        break;
-
-                udelay(1000000);
+                if (cmd->sense.asc == 0x3a) {
+                        /* 'medium not present' is not an error */
+                        ret = 0;
+                        /* force reevaluation */
+                        drive->channel->present = 0;
+                        break;
+                }
+
+                mdelay(1000);
         } while (retries--);
 
@@ -614 +620 @@
         struct atapi_command *cmd = &drive->channel->atapi_cmd;
         struct atapi_capacity cap;
+        int i;
 
         /*
          * Test Unit Ready is like a ping
-         */
+         * But wait a bit, as the drive might take a while
+         */
+        i = 30;
+        while (i-- != 0) {
+                memset(cmd, 0, sizeof(*cmd));
+                cmd->cdb[0] = ATAPI_TUR;
+
+                if (!ob_ide_atapi_packet(drive,cmd)) break;
+
+                /* Give the drive some time to breathe */
+                mdelay(500);
+        }
+
         memset(cmd, 0, sizeof(*cmd));
         cmd->cdb[0] = ATAPI_TUR;
@@ -672 +691 @@
 
         if (ob_ide_atapi_drive_ready(drive))
-                return 1;
+                return RETURN_NO_MEDIUM;
 
         if (drive->bs == 2048) {
@@ -1150 +1169 @@
                                 continue;
 
-                        if (val == 0xac8f104c) {
+                        // skip TI bridges on Rocky (ac8f) and Getac (803b)
+                        // There must be a better way to do this...
+                        if (val == 0xac8f104c || val == 0x803b104c) {
                                 debug("Skipping TI bridge\n");
                                 continue;

trunk/filo/drivers/ide_new.h

@@ -4 +4 @@
 #include <arch/io.h>
 #include "hdreg.h"
+
+/*
+ * Return values
+ */
+
+#define RETURN_OK               0x00
+#define RETURN_ERROR            0x01
+#define RETURN_NO_MEDIUM        0x02
 
 /*

trunk/filo/fs/blockdev.c

@@ -395 +395 @@
                 {
                         int count = (NUM_CACHE-hash>8)?8:(NUM_CACHE-hash);
-                        if (ide_read_blocks(dev_drive, sector, count, buf) != 0)
+                        int ret;
+                        ret = ide_read_blocks(dev_drive, sector, count, buf);
+                        if (ret == 2)
+                                goto nomedium;
+                        if (ret != 0)
                                 goto readerr;
                         while (--count>0) {
@@ -440 +444 @@
         printf("Disk read error dev=%d drive=%d sector=%lu\n",
                dev_type, dev_drive, sector);
+        flush_cache();
+        dev_name[0] = '\0';     /* force re-open the device next time */
+        return 0;
+      nomedium:
+        printf("No disk in drive.\n");
+        flush_cache();
         dev_name[0] = '\0';     /* force re-open the device next time */
         return 0;