|
@@ -57,491 +57,518 @@ static int ide_bus_ok[CONFIG_SYS_IDE_MAXBUS];
|
|
|
struct blk_desc ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE];
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
-#ifdef CONFIG_IDE_RESET
|
|
|
-static void ide_reset(void);
|
|
|
-#else
|
|
|
-#define ide_reset() /* dummy */
|
|
|
-#endif
|
|
|
-
|
|
|
-static void ide_ident(struct blk_desc *dev_desc);
|
|
|
-static uchar ide_wait(int dev, ulong t);
|
|
|
-
|
|
|
#define IDE_TIME_OUT 2000 /* 2 sec timeout */
|
|
|
|
|
|
#define ATAPI_TIME_OUT 7000 /* 7 sec timeout (5 sec seems to work...) */
|
|
|
|
|
|
#define IDE_SPIN_UP_TIME_OUT 5000 /* 5 sec spin-up timeout */
|
|
|
|
|
|
-static void ident_cpy(unsigned char *dest, unsigned char *src,
|
|
|
- unsigned int len);
|
|
|
-
|
|
|
#ifndef CONFIG_SYS_ATA_PORT_ADDR
|
|
|
#define CONFIG_SYS_ATA_PORT_ADDR(port) (port)
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_ATAPI
|
|
|
-static void atapi_inquiry(struct blk_desc *dev_desc);
|
|
|
-static ulong atapi_read(struct blk_desc *block_dev, lbaint_t blknr,
|
|
|
- lbaint_t blkcnt, void *buffer);
|
|
|
+#ifndef CONFIG_IDE_LED /* define LED macros, they are not used anyways */
|
|
|
+# define DEVICE_LED(x) 0
|
|
|
+# define LED_IDE1 1
|
|
|
+# define LED_IDE2 2
|
|
|
#endif
|
|
|
|
|
|
+#ifdef CONFIG_IDE_RESET
|
|
|
+extern void ide_set_reset(int idereset);
|
|
|
|
|
|
-/* ------------------------------------------------------------------------- */
|
|
|
-
|
|
|
-int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
|
|
|
+static void ide_reset(void)
|
|
|
{
|
|
|
- int rcode = 0;
|
|
|
-
|
|
|
- switch (argc) {
|
|
|
- case 0:
|
|
|
- case 1:
|
|
|
- return CMD_RET_USAGE;
|
|
|
- case 2:
|
|
|
- if (strncmp(argv[1], "res", 3) == 0) {
|
|
|
- puts("\nReset IDE"
|
|
|
-#ifdef CONFIG_IDE_8xx_DIRECT
|
|
|
- " on PCMCIA " PCMCIA_SLOT_MSG
|
|
|
-#endif
|
|
|
- ": ");
|
|
|
-
|
|
|
- ide_init();
|
|
|
- return 0;
|
|
|
- } else if (strncmp(argv[1], "inf", 3) == 0) {
|
|
|
- int i;
|
|
|
+ int i;
|
|
|
|
|
|
- putc('\n');
|
|
|
+ curr_device = -1;
|
|
|
+ for (i = 0; i < CONFIG_SYS_IDE_MAXBUS; ++i)
|
|
|
+ ide_bus_ok[i] = 0;
|
|
|
+ for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; ++i)
|
|
|
+ ide_dev_desc[i].type = DEV_TYPE_UNKNOWN;
|
|
|
|
|
|
- for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; ++i) {
|
|
|
- if (ide_dev_desc[i].type == DEV_TYPE_UNKNOWN)
|
|
|
- continue; /* list only known devices */
|
|
|
- printf("IDE device %d: ", i);
|
|
|
- dev_print(&ide_dev_desc[i]);
|
|
|
- }
|
|
|
- return 0;
|
|
|
+ ide_set_reset(1); /* assert reset */
|
|
|
|
|
|
- } else if (strncmp(argv[1], "dev", 3) == 0) {
|
|
|
- if ((curr_device < 0)
|
|
|
- || (curr_device >= CONFIG_SYS_IDE_MAXDEVICE)) {
|
|
|
- puts("\nno IDE devices available\n");
|
|
|
- return 1;
|
|
|
- }
|
|
|
- printf("\nIDE device %d: ", curr_device);
|
|
|
- dev_print(&ide_dev_desc[curr_device]);
|
|
|
- return 0;
|
|
|
- } else if (strncmp(argv[1], "part", 4) == 0) {
|
|
|
- int dev, ok;
|
|
|
+ /* the reset signal shall be asserted for et least 25 us */
|
|
|
+ udelay(25);
|
|
|
|
|
|
- for (ok = 0, dev = 0;
|
|
|
- dev < CONFIG_SYS_IDE_MAXDEVICE;
|
|
|
- ++dev) {
|
|
|
- if (ide_dev_desc[dev].part_type !=
|
|
|
- PART_TYPE_UNKNOWN) {
|
|
|
- ++ok;
|
|
|
- if (dev)
|
|
|
- putc('\n');
|
|
|
- part_print(&ide_dev_desc[dev]);
|
|
|
- }
|
|
|
- }
|
|
|
- if (!ok) {
|
|
|
- puts("\nno IDE devices available\n");
|
|
|
- rcode++;
|
|
|
- }
|
|
|
- return rcode;
|
|
|
- }
|
|
|
- return CMD_RET_USAGE;
|
|
|
- case 3:
|
|
|
- if (strncmp(argv[1], "dev", 3) == 0) {
|
|
|
- int dev = (int)simple_strtoul(argv[2], NULL, 10);
|
|
|
+ WATCHDOG_RESET();
|
|
|
|
|
|
- printf("\nIDE device %d: ", dev);
|
|
|
- if (dev >= CONFIG_SYS_IDE_MAXDEVICE) {
|
|
|
- puts("unknown device\n");
|
|
|
- return 1;
|
|
|
- }
|
|
|
- dev_print(&ide_dev_desc[dev]);
|
|
|
- /*ide_print (dev); */
|
|
|
+ /* de-assert RESET signal */
|
|
|
+ ide_set_reset(0);
|
|
|
|
|
|
- if (ide_dev_desc[dev].type == DEV_TYPE_UNKNOWN)
|
|
|
- return 1;
|
|
|
+ /* wait 250 ms */
|
|
|
+ for (i = 0; i < 250; ++i)
|
|
|
+ udelay(1000);
|
|
|
+}
|
|
|
+#else
|
|
|
+#define ide_reset() /* dummy */
|
|
|
+#endif /* CONFIG_IDE_RESET */
|
|
|
|
|
|
- curr_device = dev;
|
|
|
+/*
|
|
|
+ * Wait until Busy bit is off, or timeout (in ms)
|
|
|
+ * Return last status
|
|
|
+ */
|
|
|
+static uchar ide_wait(int dev, ulong t)
|
|
|
+{
|
|
|
+ ulong delay = 10 * t; /* poll every 100 us */
|
|
|
+ uchar c;
|
|
|
|
|
|
- puts("... is now current device\n");
|
|
|
+ while ((c = ide_inb(dev, ATA_STATUS)) & ATA_STAT_BUSY) {
|
|
|
+ udelay(100);
|
|
|
+ if (delay-- == 0)
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ return c;
|
|
|
+}
|
|
|
|
|
|
- return 0;
|
|
|
- } else if (strncmp(argv[1], "part", 4) == 0) {
|
|
|
- int dev = (int)simple_strtoul(argv[2], NULL, 10);
|
|
|
+/*
|
|
|
+ * copy src to dest, skipping leading and trailing blanks and null
|
|
|
+ * terminate the string
|
|
|
+ * "len" is the size of available memory including the terminating '\0'
|
|
|
+ */
|
|
|
+static void ident_cpy(unsigned char *dst, unsigned char *src,
|
|
|
+ unsigned int len)
|
|
|
+{
|
|
|
+ unsigned char *end, *last;
|
|
|
|
|
|
- if (ide_dev_desc[dev].part_type != PART_TYPE_UNKNOWN) {
|
|
|
- part_print(&ide_dev_desc[dev]);
|
|
|
- } else {
|
|
|
- printf("\nIDE device %d not available\n",
|
|
|
- dev);
|
|
|
- rcode = 1;
|
|
|
- }
|
|
|
- return rcode;
|
|
|
- }
|
|
|
+ last = dst;
|
|
|
+ end = src + len - 1;
|
|
|
|
|
|
- return CMD_RET_USAGE;
|
|
|
- default:
|
|
|
- /* at least 4 args */
|
|
|
+ /* reserve space for '\0' */
|
|
|
+ if (len < 2)
|
|
|
+ goto OUT;
|
|
|
|
|
|
- if (strcmp(argv[1], "read") == 0) {
|
|
|
- ulong addr = simple_strtoul(argv[2], NULL, 16);
|
|
|
- ulong cnt = simple_strtoul(argv[4], NULL, 16);
|
|
|
- struct blk_desc *dev_desc;
|
|
|
- ulong n;
|
|
|
+ /* skip leading white space */
|
|
|
+ while ((*src) && (src < end) && (*src == ' '))
|
|
|
+ ++src;
|
|
|
|
|
|
-#ifdef CONFIG_SYS_64BIT_LBA
|
|
|
- lbaint_t blk = simple_strtoull(argv[3], NULL, 16);
|
|
|
+ /* copy string, omitting trailing white space */
|
|
|
+ while ((*src) && (src < end)) {
|
|
|
+ *dst++ = *src;
|
|
|
+ if (*src++ != ' ')
|
|
|
+ last = dst;
|
|
|
+ }
|
|
|
+OUT:
|
|
|
+ *last = '\0';
|
|
|
+}
|
|
|
|
|
|
- printf("\nIDE read: device %d block # %lld, count %ld...",
|
|
|
- curr_device, blk, cnt);
|
|
|
-#else
|
|
|
- lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
|
|
|
+#ifdef CONFIG_ATAPI
|
|
|
+/****************************************************************************
|
|
|
+ * ATAPI Support
|
|
|
+ */
|
|
|
|
|
|
- printf("\nIDE read: device %d block # %ld, count %ld...",
|
|
|
- curr_device, blk, cnt);
|
|
|
-#endif
|
|
|
+#if defined(CONFIG_IDE_SWAP_IO)
|
|
|
+/* since ATAPI may use commands with not 4 bytes alligned length
|
|
|
+ * we have our own transfer functions, 2 bytes alligned */
|
|
|
+__weak void ide_output_data_shorts(int dev, ushort *sect_buf, int shorts)
|
|
|
+{
|
|
|
+ ushort *dbuf;
|
|
|
+ volatile ushort *pbuf;
|
|
|
|
|
|
- dev_desc = &ide_dev_desc[curr_device];
|
|
|
- n = blk_dread(dev_desc, blk, cnt, (ulong *)addr);
|
|
|
- /* flush cache after read */
|
|
|
- flush_cache(addr,
|
|
|
- cnt * ide_dev_desc[curr_device].blksz);
|
|
|
+ pbuf = (ushort *)(ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
+ dbuf = (ushort *)sect_buf;
|
|
|
|
|
|
- printf("%ld blocks read: %s\n",
|
|
|
- n, (n == cnt) ? "OK" : "ERROR");
|
|
|
- if (n == cnt)
|
|
|
- return 0;
|
|
|
- else
|
|
|
- return 1;
|
|
|
- } else if (strcmp(argv[1], "write") == 0) {
|
|
|
- ulong addr = simple_strtoul(argv[2], NULL, 16);
|
|
|
- ulong cnt = simple_strtoul(argv[4], NULL, 16);
|
|
|
- ulong n;
|
|
|
+ debug("in output data shorts base for read is %lx\n",
|
|
|
+ (unsigned long) pbuf);
|
|
|
|
|
|
-#ifdef CONFIG_SYS_64BIT_LBA
|
|
|
- lbaint_t blk = simple_strtoull(argv[3], NULL, 16);
|
|
|
+ while (shorts--) {
|
|
|
+ EIEIO;
|
|
|
+ *pbuf = *dbuf++;
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
- printf("\nIDE write: device %d block # %lld, count %ld...",
|
|
|
- curr_device, blk, cnt);
|
|
|
-#else
|
|
|
- lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
|
|
|
+__weak void ide_input_data_shorts(int dev, ushort *sect_buf, int shorts)
|
|
|
+{
|
|
|
+ ushort *dbuf;
|
|
|
+ volatile ushort *pbuf;
|
|
|
|
|
|
- printf("\nIDE write: device %d block # %ld, count %ld...",
|
|
|
- curr_device, blk, cnt);
|
|
|
-#endif
|
|
|
- n = ide_write(&ide_dev_desc[curr_device], blk, cnt,
|
|
|
- (ulong *)addr);
|
|
|
+ pbuf = (ushort *)(ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
+ dbuf = (ushort *)sect_buf;
|
|
|
|
|
|
- printf("%ld blocks written: %s\n",
|
|
|
- n, (n == cnt) ? "OK" : "ERROR");
|
|
|
- if (n == cnt)
|
|
|
- return 0;
|
|
|
- else
|
|
|
- return 1;
|
|
|
- } else {
|
|
|
- return CMD_RET_USAGE;
|
|
|
- }
|
|
|
+ debug("in input data shorts base for read is %lx\n",
|
|
|
+ (unsigned long) pbuf);
|
|
|
|
|
|
- return rcode;
|
|
|
+ while (shorts--) {
|
|
|
+ EIEIO;
|
|
|
+ *dbuf++ = *pbuf;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
|
|
|
+#else /* ! CONFIG_IDE_SWAP_IO */
|
|
|
+__weak void ide_output_data_shorts(int dev, ushort *sect_buf, int shorts)
|
|
|
{
|
|
|
- return common_diskboot(cmdtp, "ide", argc, argv);
|
|
|
+ outsw(ATA_CURR_BASE(dev) + ATA_DATA_REG, sect_buf, shorts);
|
|
|
}
|
|
|
|
|
|
-/* ------------------------------------------------------------------------- */
|
|
|
-
|
|
|
-__weak void ide_led(uchar led, uchar status)
|
|
|
+__weak void ide_input_data_shorts(int dev, ushort *sect_buf, int shorts)
|
|
|
{
|
|
|
-#if defined(CONFIG_IDE_LED) && defined(PER8_BASE) /* required by LED_PORT */
|
|
|
- static uchar led_buffer; /* Buffer for current LED status */
|
|
|
-
|
|
|
- uchar *led_port = LED_PORT;
|
|
|
+ insw(ATA_CURR_BASE(dev) + ATA_DATA_REG, sect_buf, shorts);
|
|
|
+}
|
|
|
|
|
|
- if (status) /* switch LED on */
|
|
|
- led_buffer |= led;
|
|
|
- else /* switch LED off */
|
|
|
- led_buffer &= ~led;
|
|
|
+#endif /* CONFIG_IDE_SWAP_IO */
|
|
|
|
|
|
- *led_port = led_buffer;
|
|
|
-#endif
|
|
|
-}
|
|
|
-
|
|
|
-#ifndef CONFIG_IDE_LED /* define LED macros, they are not used anyways */
|
|
|
-# define DEVICE_LED(x) 0
|
|
|
-# define LED_IDE1 1
|
|
|
-# define LED_IDE2 2
|
|
|
-#endif
|
|
|
-
|
|
|
-/* ------------------------------------------------------------------------- */
|
|
|
-
|
|
|
-__weak void ide_outb(int dev, int port, unsigned char val)
|
|
|
+/*
|
|
|
+ * Wait until (Status & mask) == res, or timeout (in ms)
|
|
|
+ * Return last status
|
|
|
+ * This is used since some ATAPI CD ROMs clears their Busy Bit first
|
|
|
+ * and then they set their DRQ Bit
|
|
|
+ */
|
|
|
+static uchar atapi_wait_mask(int dev, ulong t, uchar mask, uchar res)
|
|
|
{
|
|
|
- debug("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n",
|
|
|
- dev, port, val,
|
|
|
- (ATA_CURR_BASE(dev) + CONFIG_SYS_ATA_PORT_ADDR(port)));
|
|
|
+ ulong delay = 10 * t; /* poll every 100 us */
|
|
|
+ uchar c;
|
|
|
|
|
|
-#if defined(CONFIG_IDE_AHB)
|
|
|
- if (port) {
|
|
|
- /* write command */
|
|
|
- ide_write_register(dev, port, val);
|
|
|
- } else {
|
|
|
- /* write data */
|
|
|
- outb(val, (ATA_CURR_BASE(dev)));
|
|
|
+ /* prevents to read the status before valid */
|
|
|
+ c = ide_inb(dev, ATA_DEV_CTL);
|
|
|
+
|
|
|
+ while (((c = ide_inb(dev, ATA_STATUS)) & mask) != res) {
|
|
|
+ /* break if error occurs (doesn't make sense to wait more) */
|
|
|
+ if ((c & ATA_STAT_ERR) == ATA_STAT_ERR)
|
|
|
+ break;
|
|
|
+ udelay(100);
|
|
|
+ if (delay-- == 0)
|
|
|
+ break;
|
|
|
}
|
|
|
-#else
|
|
|
- outb(val, (ATA_CURR_BASE(dev) + CONFIG_SYS_ATA_PORT_ADDR(port)));
|
|
|
-#endif
|
|
|
+ return c;
|
|
|
}
|
|
|
|
|
|
-__weak unsigned char ide_inb(int dev, int port)
|
|
|
+/*
|
|
|
+ * issue an atapi command
|
|
|
+ */
|
|
|
+unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen,
|
|
|
+ unsigned char *buffer, int buflen)
|
|
|
{
|
|
|
- uchar val;
|
|
|
-
|
|
|
-#if defined(CONFIG_IDE_AHB)
|
|
|
- val = ide_read_register(dev, port);
|
|
|
-#else
|
|
|
- val = inb((ATA_CURR_BASE(dev) + CONFIG_SYS_ATA_PORT_ADDR(port)));
|
|
|
-#endif
|
|
|
+ unsigned char c, err, mask, res;
|
|
|
+ int n;
|
|
|
|
|
|
- debug("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n",
|
|
|
- dev, port,
|
|
|
- (ATA_CURR_BASE(dev) + CONFIG_SYS_ATA_PORT_ADDR(port)), val);
|
|
|
- return val;
|
|
|
-}
|
|
|
+ ide_led(DEVICE_LED(device), 1); /* LED on */
|
|
|
|
|
|
-void ide_init(void)
|
|
|
-{
|
|
|
- unsigned char c;
|
|
|
- int i, bus;
|
|
|
+ /* Select device
|
|
|
+ */
|
|
|
+ mask = ATA_STAT_BUSY | ATA_STAT_DRQ;
|
|
|
+ res = 0;
|
|
|
+ ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
|
|
|
+ c = atapi_wait_mask(device, ATAPI_TIME_OUT, mask, res);
|
|
|
+ if ((c & mask) != res) {
|
|
|
+ printf("ATAPI_ISSUE: device %d not ready status %X\n", device,
|
|
|
+ c);
|
|
|
+ err = 0xFF;
|
|
|
+ goto AI_OUT;
|
|
|
+ }
|
|
|
+ /* write taskfile */
|
|
|
+ ide_outb(device, ATA_ERROR_REG, 0); /* no DMA, no overlaped */
|
|
|
+ ide_outb(device, ATA_SECT_CNT, 0);
|
|
|
+ ide_outb(device, ATA_SECT_NUM, 0);
|
|
|
+ ide_outb(device, ATA_CYL_LOW, (unsigned char) (buflen & 0xFF));
|
|
|
+ ide_outb(device, ATA_CYL_HIGH,
|
|
|
+ (unsigned char) ((buflen >> 8) & 0xFF));
|
|
|
+ ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
|
|
|
|
|
|
-#ifdef CONFIG_IDE_8xx_PCCARD
|
|
|
- extern int ide_devices_found; /* Initialized in check_ide_device() */
|
|
|
-#endif /* CONFIG_IDE_8xx_PCCARD */
|
|
|
+ ide_outb(device, ATA_COMMAND, ATAPI_CMD_PACKET);
|
|
|
+ udelay(50);
|
|
|
|
|
|
-#ifdef CONFIG_IDE_PREINIT
|
|
|
- WATCHDOG_RESET();
|
|
|
+ mask = ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR;
|
|
|
+ res = ATA_STAT_DRQ;
|
|
|
+ c = atapi_wait_mask(device, ATAPI_TIME_OUT, mask, res);
|
|
|
|
|
|
- if (ide_preinit()) {
|
|
|
- puts("ide_preinit failed\n");
|
|
|
- return;
|
|
|
+ if ((c & mask) != res) { /* DRQ must be 1, BSY 0 */
|
|
|
+ printf("ATAPI_ISSUE: Error (no IRQ) before sending ccb dev %d status 0x%02x\n",
|
|
|
+ device, c);
|
|
|
+ err = 0xFF;
|
|
|
+ goto AI_OUT;
|
|
|
}
|
|
|
-#endif /* CONFIG_IDE_PREINIT */
|
|
|
|
|
|
- WATCHDOG_RESET();
|
|
|
+ /* write command block */
|
|
|
+ ide_output_data_shorts(device, (unsigned short *)ccb, ccblen / 2);
|
|
|
|
|
|
+ /* ATAPI Command written wait for completition */
|
|
|
+ udelay(5000); /* device must set bsy */
|
|
|
+
|
|
|
+ mask = ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR;
|
|
|
/*
|
|
|
- * Reset the IDE just to be sure.
|
|
|
- * Light LED's to show
|
|
|
+ * if no data wait for DRQ = 0 BSY = 0
|
|
|
+ * if data wait for DRQ = 1 BSY = 0
|
|
|
*/
|
|
|
- ide_led((LED_IDE1 | LED_IDE2), 1); /* LED's on */
|
|
|
-
|
|
|
- /* ATAPI Drives seems to need a proper IDE Reset */
|
|
|
- ide_reset();
|
|
|
-
|
|
|
-#ifdef CONFIG_IDE_INIT_POSTRESET
|
|
|
- WATCHDOG_RESET();
|
|
|
-
|
|
|
- if (ide_init_postreset()) {
|
|
|
- puts("ide_preinit_postreset failed\n");
|
|
|
- return;
|
|
|
+ res = 0;
|
|
|
+ if (buflen)
|
|
|
+ res = ATA_STAT_DRQ;
|
|
|
+ c = atapi_wait_mask(device, ATAPI_TIME_OUT, mask, res);
|
|
|
+ if ((c & mask) != res) {
|
|
|
+ if (c & ATA_STAT_ERR) {
|
|
|
+ err = (ide_inb(device, ATA_ERROR_REG)) >> 4;
|
|
|
+ debug("atapi_issue 1 returned sense key %X status %02X\n",
|
|
|
+ err, c);
|
|
|
+ } else {
|
|
|
+ printf("ATAPI_ISSUE: (no DRQ) after sending ccb (%x) status 0x%02x\n",
|
|
|
+ ccb[0], c);
|
|
|
+ err = 0xFF;
|
|
|
+ }
|
|
|
+ goto AI_OUT;
|
|
|
}
|
|
|
-#endif /* CONFIG_IDE_INIT_POSTRESET */
|
|
|
+ n = ide_inb(device, ATA_CYL_HIGH);
|
|
|
+ n <<= 8;
|
|
|
+ n += ide_inb(device, ATA_CYL_LOW);
|
|
|
+ if (n > buflen) {
|
|
|
+ printf("ERROR, transfer bytes %d requested only %d\n", n,
|
|
|
+ buflen);
|
|
|
+ err = 0xff;
|
|
|
+ goto AI_OUT;
|
|
|
+ }
|
|
|
+ if ((n == 0) && (buflen < 0)) {
|
|
|
+ printf("ERROR, transfer bytes %d requested %d\n", n, buflen);
|
|
|
+ err = 0xff;
|
|
|
+ goto AI_OUT;
|
|
|
+ }
|
|
|
+ if (n != buflen) {
|
|
|
+ debug("WARNING, transfer bytes %d not equal with requested %d\n",
|
|
|
+ n, buflen);
|
|
|
+ }
|
|
|
+ if (n != 0) { /* data transfer */
|
|
|
+ debug("ATAPI_ISSUE: %d Bytes to transfer\n", n);
|
|
|
+ /* we transfer shorts */
|
|
|
+ n >>= 1;
|
|
|
+ /* ok now decide if it is an in or output */
|
|
|
+ if ((ide_inb(device, ATA_SECT_CNT) & 0x02) == 0) {
|
|
|
+ debug("Write to device\n");
|
|
|
+ ide_output_data_shorts(device, (unsigned short *)buffer,
|
|
|
+ n);
|
|
|
+ } else {
|
|
|
+ debug("Read from device @ %p shorts %d\n", buffer, n);
|
|
|
+ ide_input_data_shorts(device, (unsigned short *)buffer,
|
|
|
+ n);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ udelay(5000); /* seems that some CD ROMs need this... */
|
|
|
+ mask = ATA_STAT_BUSY | ATA_STAT_ERR;
|
|
|
+ res = 0;
|
|
|
+ c = atapi_wait_mask(device, ATAPI_TIME_OUT, mask, res);
|
|
|
+ if ((c & ATA_STAT_ERR) == ATA_STAT_ERR) {
|
|
|
+ err = (ide_inb(device, ATA_ERROR_REG) >> 4);
|
|
|
+ debug("atapi_issue 2 returned sense key %X status %X\n", err,
|
|
|
+ c);
|
|
|
+ } else {
|
|
|
+ err = 0;
|
|
|
+ }
|
|
|
+AI_OUT:
|
|
|
+ ide_led(DEVICE_LED(device), 0); /* LED off */
|
|
|
+ return err;
|
|
|
+}
|
|
|
|
|
|
- /*
|
|
|
- * Wait for IDE to get ready.
|
|
|
- * According to spec, this can take up to 31 seconds!
|
|
|
- */
|
|
|
- for (bus = 0; bus < CONFIG_SYS_IDE_MAXBUS; ++bus) {
|
|
|
- int dev =
|
|
|
- bus * (CONFIG_SYS_IDE_MAXDEVICE /
|
|
|
- CONFIG_SYS_IDE_MAXBUS);
|
|
|
+/*
|
|
|
+ * sending the command to atapi_issue. If an status other than good
|
|
|
+ * returns, an request_sense will be issued
|
|
|
+ */
|
|
|
|
|
|
-#ifdef CONFIG_IDE_8xx_PCCARD
|
|
|
- /* Skip non-ide devices from probing */
|
|
|
- if ((ide_devices_found & (1 << bus)) == 0) {
|
|
|
- ide_led((LED_IDE1 | LED_IDE2), 0); /* LED's off */
|
|
|
- continue;
|
|
|
- }
|
|
|
-#endif
|
|
|
- printf("Bus %d: ", bus);
|
|
|
+#define ATAPI_DRIVE_NOT_READY 100
|
|
|
+#define ATAPI_UNIT_ATTN 10
|
|
|
|
|
|
- ide_bus_ok[bus] = 0;
|
|
|
+unsigned char atapi_issue_autoreq(int device,
|
|
|
+ unsigned char *ccb,
|
|
|
+ int ccblen,
|
|
|
+ unsigned char *buffer, int buflen)
|
|
|
+{
|
|
|
+ unsigned char sense_data[18], sense_ccb[12];
|
|
|
+ unsigned char res, key, asc, ascq;
|
|
|
+ int notready, unitattn;
|
|
|
|
|
|
- /* Select device
|
|
|
- */
|
|
|
- udelay(100000); /* 100 ms */
|
|
|
- ide_outb(dev, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(dev));
|
|
|
- udelay(100000); /* 100 ms */
|
|
|
- i = 0;
|
|
|
- do {
|
|
|
- udelay(10000); /* 10 ms */
|
|
|
+ unitattn = ATAPI_UNIT_ATTN;
|
|
|
+ notready = ATAPI_DRIVE_NOT_READY;
|
|
|
|
|
|
- c = ide_inb(dev, ATA_STATUS);
|
|
|
- i++;
|
|
|
- if (i > (ATA_RESET_TIME * 100)) {
|
|
|
- puts("** Timeout **\n");
|
|
|
- /* LED's off */
|
|
|
- ide_led((LED_IDE1 | LED_IDE2), 0);
|
|
|
- return;
|
|
|
- }
|
|
|
- if ((i >= 100) && ((i % 100) == 0))
|
|
|
- putc('.');
|
|
|
+retry:
|
|
|
+ res = atapi_issue(device, ccb, ccblen, buffer, buflen);
|
|
|
+ if (res == 0)
|
|
|
+ return 0; /* Ok */
|
|
|
|
|
|
- } while (c & ATA_STAT_BUSY);
|
|
|
+ if (res == 0xFF)
|
|
|
+ return 0xFF; /* error */
|
|
|
|
|
|
- if (c & (ATA_STAT_BUSY | ATA_STAT_FAULT)) {
|
|
|
- puts("not available ");
|
|
|
- debug("Status = 0x%02X ", c);
|
|
|
-#ifndef CONFIG_ATAPI /* ATAPI Devices do not set DRDY */
|
|
|
- } else if ((c & ATA_STAT_READY) == 0) {
|
|
|
- puts("not available ");
|
|
|
- debug("Status = 0x%02X ", c);
|
|
|
-#endif
|
|
|
- } else {
|
|
|
- puts("OK ");
|
|
|
- ide_bus_ok[bus] = 1;
|
|
|
- }
|
|
|
- WATCHDOG_RESET();
|
|
|
- }
|
|
|
+ debug("(auto_req)atapi_issue returned sense key %X\n", res);
|
|
|
|
|
|
- putc('\n');
|
|
|
+ memset(sense_ccb, 0, sizeof(sense_ccb));
|
|
|
+ memset(sense_data, 0, sizeof(sense_data));
|
|
|
+ sense_ccb[0] = ATAPI_CMD_REQ_SENSE;
|
|
|
+ sense_ccb[4] = 18; /* allocation Length */
|
|
|
|
|
|
- ide_led((LED_IDE1 | LED_IDE2), 0); /* LED's off */
|
|
|
+ res = atapi_issue(device, sense_ccb, 12, sense_data, 18);
|
|
|
+ key = (sense_data[2] & 0xF);
|
|
|
+ asc = (sense_data[12]);
|
|
|
+ ascq = (sense_data[13]);
|
|
|
|
|
|
- curr_device = -1;
|
|
|
- for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; ++i) {
|
|
|
- int led = (IDE_BUS(i) == 0) ? LED_IDE1 : LED_IDE2;
|
|
|
- ide_dev_desc[i].type = DEV_TYPE_UNKNOWN;
|
|
|
- ide_dev_desc[i].if_type = IF_TYPE_IDE;
|
|
|
- ide_dev_desc[i].devnum = i;
|
|
|
- ide_dev_desc[i].part_type = PART_TYPE_UNKNOWN;
|
|
|
- ide_dev_desc[i].blksz = 0;
|
|
|
- ide_dev_desc[i].log2blksz =
|
|
|
- LOG2_INVALID(typeof(ide_dev_desc[i].log2blksz));
|
|
|
- ide_dev_desc[i].lba = 0;
|
|
|
- ide_dev_desc[i].block_read = ide_read;
|
|
|
- ide_dev_desc[i].block_write = ide_write;
|
|
|
- if (!ide_bus_ok[IDE_BUS(i)])
|
|
|
- continue;
|
|
|
- ide_led(led, 1); /* LED on */
|
|
|
- ide_ident(&ide_dev_desc[i]);
|
|
|
- ide_led(led, 0); /* LED off */
|
|
|
- dev_print(&ide_dev_desc[i]);
|
|
|
+ debug("ATAPI_CMD_REQ_SENSE returned %x\n", res);
|
|
|
+ debug(" Sense page: %02X key %02X ASC %02X ASCQ %02X\n",
|
|
|
+ sense_data[0], key, asc, ascq);
|
|
|
|
|
|
- if ((ide_dev_desc[i].lba > 0) && (ide_dev_desc[i].blksz > 0)) {
|
|
|
- /* initialize partition type */
|
|
|
- part_init(&ide_dev_desc[i]);
|
|
|
- if (curr_device < 0)
|
|
|
- curr_device = i;
|
|
|
+ if ((key == 0))
|
|
|
+ return 0; /* ok device ready */
|
|
|
+
|
|
|
+ if ((key == 6) || (asc == 0x29) || (asc == 0x28)) { /* Unit Attention */
|
|
|
+ if (unitattn-- > 0) {
|
|
|
+ udelay(200 * 1000);
|
|
|
+ goto retry;
|
|
|
}
|
|
|
+ printf("Unit Attention, tried %d\n", ATAPI_UNIT_ATTN);
|
|
|
+ goto error;
|
|
|
}
|
|
|
- WATCHDOG_RESET();
|
|
|
+ if ((asc == 0x4) && (ascq == 0x1)) {
|
|
|
+ /* not ready, but will be ready soon */
|
|
|
+ if (notready-- > 0) {
|
|
|
+ udelay(200 * 1000);
|
|
|
+ goto retry;
|
|
|
+ }
|
|
|
+ printf("Drive not ready, tried %d times\n",
|
|
|
+ ATAPI_DRIVE_NOT_READY);
|
|
|
+ goto error;
|
|
|
+ }
|
|
|
+ if (asc == 0x3a) {
|
|
|
+ debug("Media not present\n");
|
|
|
+ goto error;
|
|
|
+ }
|
|
|
+
|
|
|
+ printf("ERROR: Unknown Sense key %02X ASC %02X ASCQ %02X\n", key, asc,
|
|
|
+ ascq);
|
|
|
+error:
|
|
|
+ debug("ERROR Sense key %02X ASC %02X ASCQ %02X\n", key, asc, ascq);
|
|
|
+ return 0xFF;
|
|
|
}
|
|
|
|
|
|
-/* ------------------------------------------------------------------------- */
|
|
|
+/*
|
|
|
+ * atapi_read:
|
|
|
+ * we transfer only one block per command, since the multiple DRQ per
|
|
|
+ * command is not yet implemented
|
|
|
+ */
|
|
|
+#define ATAPI_READ_MAX_BYTES 2048 /* we read max 2kbytes */
|
|
|
+#define ATAPI_READ_BLOCK_SIZE 2048 /* assuming CD part */
|
|
|
+#define ATAPI_READ_MAX_BLOCK (ATAPI_READ_MAX_BYTES/ATAPI_READ_BLOCK_SIZE)
|
|
|
|
|
|
-#ifdef CONFIG_PARTITIONS
|
|
|
-struct blk_desc *ide_get_dev(int dev)
|
|
|
+ulong atapi_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
|
|
|
+ void *buffer)
|
|
|
{
|
|
|
- return (dev < CONFIG_SYS_IDE_MAXDEVICE) ? &ide_dev_desc[dev] : NULL;
|
|
|
-}
|
|
|
-#endif
|
|
|
+ int device = block_dev->devnum;
|
|
|
+ ulong n = 0;
|
|
|
+ unsigned char ccb[12]; /* Command descriptor block */
|
|
|
+ ulong cnt;
|
|
|
|
|
|
-/* ------------------------------------------------------------------------- */
|
|
|
+ debug("atapi_read dev %d start " LBAF " blocks " LBAF
|
|
|
+ " buffer at %lX\n", device, blknr, blkcnt, (ulong) buffer);
|
|
|
|
|
|
-/* We only need to swap data if we are running on a big endian cpu. */
|
|
|
-#if defined(__LITTLE_ENDIAN)
|
|
|
-__weak void ide_input_swap_data(int dev, ulong *sect_buf, int words)
|
|
|
-{
|
|
|
- ide_input_data(dev, sect_buf, words);
|
|
|
+ do {
|
|
|
+ if (blkcnt > ATAPI_READ_MAX_BLOCK)
|
|
|
+ cnt = ATAPI_READ_MAX_BLOCK;
|
|
|
+ else
|
|
|
+ cnt = blkcnt;
|
|
|
+
|
|
|
+ ccb[0] = ATAPI_CMD_READ_12;
|
|
|
+ ccb[1] = 0; /* reserved */
|
|
|
+ ccb[2] = (unsigned char) (blknr >> 24) & 0xFF; /* MSB Block */
|
|
|
+ ccb[3] = (unsigned char) (blknr >> 16) & 0xFF; /* */
|
|
|
+ ccb[4] = (unsigned char) (blknr >> 8) & 0xFF;
|
|
|
+ ccb[5] = (unsigned char) blknr & 0xFF; /* LSB Block */
|
|
|
+ ccb[6] = (unsigned char) (cnt >> 24) & 0xFF; /* MSB Block cnt */
|
|
|
+ ccb[7] = (unsigned char) (cnt >> 16) & 0xFF;
|
|
|
+ ccb[8] = (unsigned char) (cnt >> 8) & 0xFF;
|
|
|
+ ccb[9] = (unsigned char) cnt & 0xFF; /* LSB Block */
|
|
|
+ ccb[10] = 0; /* reserved */
|
|
|
+ ccb[11] = 0; /* reserved */
|
|
|
+
|
|
|
+ if (atapi_issue_autoreq(device, ccb, 12,
|
|
|
+ (unsigned char *)buffer,
|
|
|
+ cnt * ATAPI_READ_BLOCK_SIZE)
|
|
|
+ == 0xFF) {
|
|
|
+ return n;
|
|
|
+ }
|
|
|
+ n += cnt;
|
|
|
+ blkcnt -= cnt;
|
|
|
+ blknr += cnt;
|
|
|
+ buffer += (cnt * ATAPI_READ_BLOCK_SIZE);
|
|
|
+ } while (blkcnt > 0);
|
|
|
+ return n;
|
|
|
}
|
|
|
-#else
|
|
|
-__weak void ide_input_swap_data(int dev, ulong *sect_buf, int words)
|
|
|
+
|
|
|
+static void atapi_inquiry(struct blk_desc *dev_desc)
|
|
|
{
|
|
|
- volatile ushort *pbuf =
|
|
|
- (ushort *) (ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
- ushort *dbuf = (ushort *) sect_buf;
|
|
|
+ unsigned char ccb[12]; /* Command descriptor block */
|
|
|
+ unsigned char iobuf[64]; /* temp buf */
|
|
|
+ unsigned char c;
|
|
|
+ int device;
|
|
|
|
|
|
- debug("in input swap data base for read is %lx\n",
|
|
|
- (unsigned long) pbuf);
|
|
|
+ device = dev_desc->devnum;
|
|
|
+ dev_desc->type = DEV_TYPE_UNKNOWN; /* not yet valid */
|
|
|
+ dev_desc->block_read = atapi_read;
|
|
|
|
|
|
- while (words--) {
|
|
|
-#ifdef __MIPS__
|
|
|
- *dbuf++ = swab16p((u16 *) pbuf);
|
|
|
- *dbuf++ = swab16p((u16 *) pbuf);
|
|
|
-#else
|
|
|
- *dbuf++ = ld_le16(pbuf);
|
|
|
- *dbuf++ = ld_le16(pbuf);
|
|
|
-#endif /* !MIPS */
|
|
|
- }
|
|
|
-}
|
|
|
-#endif /* __LITTLE_ENDIAN */
|
|
|
+ memset(ccb, 0, sizeof(ccb));
|
|
|
+ memset(iobuf, 0, sizeof(iobuf));
|
|
|
|
|
|
+ ccb[0] = ATAPI_CMD_INQUIRY;
|
|
|
+ ccb[4] = 40; /* allocation Legnth */
|
|
|
+ c = atapi_issue_autoreq(device, ccb, 12, (unsigned char *)iobuf, 40);
|
|
|
|
|
|
-#if defined(CONFIG_IDE_SWAP_IO)
|
|
|
-__weak void ide_output_data(int dev, const ulong *sect_buf, int words)
|
|
|
-{
|
|
|
- ushort *dbuf;
|
|
|
- volatile ushort *pbuf;
|
|
|
+ debug("ATAPI_CMD_INQUIRY returned %x\n", c);
|
|
|
+ if (c != 0)
|
|
|
+ return;
|
|
|
|
|
|
- pbuf = (ushort *) (ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
- dbuf = (ushort *) sect_buf;
|
|
|
- while (words--) {
|
|
|
- EIEIO;
|
|
|
- *pbuf = *dbuf++;
|
|
|
- EIEIO;
|
|
|
- *pbuf = *dbuf++;
|
|
|
- }
|
|
|
-}
|
|
|
-#else /* ! CONFIG_IDE_SWAP_IO */
|
|
|
-__weak void ide_output_data(int dev, const ulong *sect_buf, int words)
|
|
|
-{
|
|
|
-#if defined(CONFIG_IDE_AHB)
|
|
|
- ide_write_data(dev, sect_buf, words);
|
|
|
-#else
|
|
|
- outsw(ATA_CURR_BASE(dev) + ATA_DATA_REG, sect_buf, words << 1);
|
|
|
-#endif
|
|
|
-}
|
|
|
-#endif /* CONFIG_IDE_SWAP_IO */
|
|
|
+ /* copy device ident strings */
|
|
|
+ ident_cpy((unsigned char *)dev_desc->vendor, &iobuf[8], 8);
|
|
|
+ ident_cpy((unsigned char *)dev_desc->product, &iobuf[16], 16);
|
|
|
+ ident_cpy((unsigned char *)dev_desc->revision, &iobuf[32], 5);
|
|
|
|
|
|
-#if defined(CONFIG_IDE_SWAP_IO)
|
|
|
-__weak void ide_input_data(int dev, ulong *sect_buf, int words)
|
|
|
-{
|
|
|
- ushort *dbuf;
|
|
|
- volatile ushort *pbuf;
|
|
|
+ dev_desc->lun = 0;
|
|
|
+ dev_desc->lba = 0;
|
|
|
+ dev_desc->blksz = 0;
|
|
|
+ dev_desc->log2blksz = LOG2_INVALID(typeof(dev_desc->log2blksz));
|
|
|
+ dev_desc->type = iobuf[0] & 0x1f;
|
|
|
|
|
|
- pbuf = (ushort *) (ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
- dbuf = (ushort *) sect_buf;
|
|
|
+ if ((iobuf[1] & 0x80) == 0x80)
|
|
|
+ dev_desc->removable = 1;
|
|
|
+ else
|
|
|
+ dev_desc->removable = 0;
|
|
|
|
|
|
- debug("in input data base for read is %lx\n", (unsigned long) pbuf);
|
|
|
+ memset(ccb, 0, sizeof(ccb));
|
|
|
+ memset(iobuf, 0, sizeof(iobuf));
|
|
|
+ ccb[0] = ATAPI_CMD_START_STOP;
|
|
|
+ ccb[4] = 0x03; /* start */
|
|
|
|
|
|
- while (words--) {
|
|
|
- EIEIO;
|
|
|
- *dbuf++ = *pbuf;
|
|
|
- EIEIO;
|
|
|
- *dbuf++ = *pbuf;
|
|
|
- }
|
|
|
-}
|
|
|
-#else /* ! CONFIG_IDE_SWAP_IO */
|
|
|
-__weak void ide_input_data(int dev, ulong *sect_buf, int words)
|
|
|
-{
|
|
|
-#if defined(CONFIG_IDE_AHB)
|
|
|
- ide_read_data(dev, sect_buf, words);
|
|
|
-#else
|
|
|
- insw(ATA_CURR_BASE(dev) + ATA_DATA_REG, sect_buf, words << 1);
|
|
|
+ c = atapi_issue_autoreq(device, ccb, 12, (unsigned char *)iobuf, 0);
|
|
|
+
|
|
|
+ debug("ATAPI_CMD_START_STOP returned %x\n", c);
|
|
|
+ if (c != 0)
|
|
|
+ return;
|
|
|
+
|
|
|
+ memset(ccb, 0, sizeof(ccb));
|
|
|
+ memset(iobuf, 0, sizeof(iobuf));
|
|
|
+ c = atapi_issue_autoreq(device, ccb, 12, (unsigned char *)iobuf, 0);
|
|
|
+
|
|
|
+ debug("ATAPI_CMD_UNIT_TEST_READY returned %x\n", c);
|
|
|
+ if (c != 0)
|
|
|
+ return;
|
|
|
+
|
|
|
+ memset(ccb, 0, sizeof(ccb));
|
|
|
+ memset(iobuf, 0, sizeof(iobuf));
|
|
|
+ ccb[0] = ATAPI_CMD_READ_CAP;
|
|
|
+ c = atapi_issue_autoreq(device, ccb, 12, (unsigned char *)iobuf, 8);
|
|
|
+ debug("ATAPI_CMD_READ_CAP returned %x\n", c);
|
|
|
+ if (c != 0)
|
|
|
+ return;
|
|
|
+
|
|
|
+ debug("Read Cap: LBA %02X%02X%02X%02X blksize %02X%02X%02X%02X\n",
|
|
|
+ iobuf[0], iobuf[1], iobuf[2], iobuf[3],
|
|
|
+ iobuf[4], iobuf[5], iobuf[6], iobuf[7]);
|
|
|
+
|
|
|
+ dev_desc->lba = ((unsigned long) iobuf[0] << 24) +
|
|
|
+ ((unsigned long) iobuf[1] << 16) +
|
|
|
+ ((unsigned long) iobuf[2] << 8) + ((unsigned long) iobuf[3]);
|
|
|
+ dev_desc->blksz = ((unsigned long) iobuf[4] << 24) +
|
|
|
+ ((unsigned long) iobuf[5] << 16) +
|
|
|
+ ((unsigned long) iobuf[6] << 8) + ((unsigned long) iobuf[7]);
|
|
|
+ dev_desc->log2blksz = LOG2(dev_desc->blksz);
|
|
|
+#ifdef CONFIG_LBA48
|
|
|
+ /* ATAPI devices cannot use 48bit addressing (ATA/ATAPI v7) */
|
|
|
+ dev_desc->lba48 = 0;
|
|
|
#endif
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
-#endif /* CONFIG_IDE_SWAP_IO */
|
|
|
+#endif /* CONFIG_ATAPI */
|
|
|
|
|
|
-/* -------------------------------------------------------------------------
|
|
|
- */
|
|
|
static void ide_ident(struct blk_desc *dev_desc)
|
|
|
{
|
|
|
unsigned char c;
|
|
@@ -633,11 +660,11 @@ static void ide_ident(struct blk_desc *dev_desc)
|
|
|
|
|
|
ide_input_swap_data(device, (ulong *)&iop, ATA_SECTORWORDS);
|
|
|
|
|
|
- ident_cpy((unsigned char *) dev_desc->revision, iop.fw_rev,
|
|
|
+ ident_cpy((unsigned char *)dev_desc->revision, iop.fw_rev,
|
|
|
sizeof(dev_desc->revision));
|
|
|
- ident_cpy((unsigned char *) dev_desc->vendor, iop.model,
|
|
|
+ ident_cpy((unsigned char *)dev_desc->vendor, iop.model,
|
|
|
sizeof(dev_desc->vendor));
|
|
|
- ident_cpy((unsigned char *) dev_desc->product, iop.serial_no,
|
|
|
+ ident_cpy((unsigned char *)dev_desc->product, iop.serial_no,
|
|
|
sizeof(dev_desc->product));
|
|
|
#ifdef __LITTLE_ENDIAN
|
|
|
/*
|
|
@@ -711,737 +738,678 @@ static void ide_ident(struct blk_desc *dev_desc)
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
+/* ------------------------------------------------------------------------- */
|
|
|
+
|
|
|
+int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
|
|
|
+{
|
|
|
+ int rcode = 0;
|
|
|
+
|
|
|
+ switch (argc) {
|
|
|
+ case 0:
|
|
|
+ case 1:
|
|
|
+ return CMD_RET_USAGE;
|
|
|
+ case 2:
|
|
|
+ if (strncmp(argv[1], "res", 3) == 0) {
|
|
|
+ puts("\nReset IDE"
|
|
|
+#ifdef CONFIG_IDE_8xx_DIRECT
|
|
|
+ " on PCMCIA " PCMCIA_SLOT_MSG
|
|
|
+#endif
|
|
|
+ ": ");
|
|
|
+
|
|
|
+ ide_init();
|
|
|
+ return 0;
|
|
|
+ } else if (strncmp(argv[1], "inf", 3) == 0) {
|
|
|
+ int i;
|
|
|
+
|
|
|
+ putc('\n');
|
|
|
+
|
|
|
+ for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; ++i) {
|
|
|
+ if (ide_dev_desc[i].type == DEV_TYPE_UNKNOWN)
|
|
|
+ continue; /* list only known devices */
|
|
|
+ printf("IDE device %d: ", i);
|
|
|
+ dev_print(&ide_dev_desc[i]);
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ } else if (strncmp(argv[1], "dev", 3) == 0) {
|
|
|
+ if (curr_device < 0 ||
|
|
|
+ curr_device >= CONFIG_SYS_IDE_MAXDEVICE) {
|
|
|
+ puts("\nno IDE devices available\n");
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ printf("\nIDE device %d: ", curr_device);
|
|
|
+ dev_print(&ide_dev_desc[curr_device]);
|
|
|
+ return 0;
|
|
|
+ } else if (strncmp(argv[1], "part", 4) == 0) {
|
|
|
+ int dev, ok;
|
|
|
+
|
|
|
+ for (ok = 0, dev = 0;
|
|
|
+ dev < CONFIG_SYS_IDE_MAXDEVICE;
|
|
|
+ ++dev) {
|
|
|
+ if (ide_dev_desc[dev].part_type !=
|
|
|
+ PART_TYPE_UNKNOWN) {
|
|
|
+ ++ok;
|
|
|
+ if (dev)
|
|
|
+ putc('\n');
|
|
|
+ part_print(&ide_dev_desc[dev]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!ok) {
|
|
|
+ puts("\nno IDE devices available\n");
|
|
|
+ rcode++;
|
|
|
+ }
|
|
|
+ return rcode;
|
|
|
+ }
|
|
|
+ return CMD_RET_USAGE;
|
|
|
+ case 3:
|
|
|
+ if (strncmp(argv[1], "dev", 3) == 0) {
|
|
|
+ int dev = (int)simple_strtoul(argv[2], NULL, 10);
|
|
|
|
|
|
-/* ------------------------------------------------------------------------- */
|
|
|
+ printf("\nIDE device %d: ", dev);
|
|
|
+ if (dev >= CONFIG_SYS_IDE_MAXDEVICE) {
|
|
|
+ puts("unknown device\n");
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+ dev_print(&ide_dev_desc[dev]);
|
|
|
+ /*ide_print (dev); */
|
|
|
|
|
|
-ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
|
|
|
- void *buffer)
|
|
|
-{
|
|
|
- int device = block_dev->devnum;
|
|
|
- ulong n = 0;
|
|
|
- unsigned char c;
|
|
|
- unsigned char pwrsave = 0; /* power save */
|
|
|
+ if (ide_dev_desc[dev].type == DEV_TYPE_UNKNOWN)
|
|
|
+ return 1;
|
|
|
|
|
|
-#ifdef CONFIG_LBA48
|
|
|
- unsigned char lba48 = 0;
|
|
|
+ curr_device = dev;
|
|
|
|
|
|
- if (blknr & 0x0000fffff0000000ULL) {
|
|
|
- /* more than 28 bits used, use 48bit mode */
|
|
|
- lba48 = 1;
|
|
|
- }
|
|
|
-#endif
|
|
|
- debug("ide_read dev %d start " LBAF ", blocks " LBAF " buffer at %lX\n",
|
|
|
- device, blknr, blkcnt, (ulong) buffer);
|
|
|
+ puts("... is now current device\n");
|
|
|
|
|
|
- ide_led(DEVICE_LED(device), 1); /* LED on */
|
|
|
+ return 0;
|
|
|
+ } else if (strncmp(argv[1], "part", 4) == 0) {
|
|
|
+ int dev = (int)simple_strtoul(argv[2], NULL, 10);
|
|
|
|
|
|
- /* Select device
|
|
|
- */
|
|
|
- ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
|
|
|
- c = ide_wait(device, IDE_TIME_OUT);
|
|
|
+ if (ide_dev_desc[dev].part_type != PART_TYPE_UNKNOWN) {
|
|
|
+ part_print(&ide_dev_desc[dev]);
|
|
|
+ } else {
|
|
|
+ printf("\nIDE device %d not available\n",
|
|
|
+ dev);
|
|
|
+ rcode = 1;
|
|
|
+ }
|
|
|
+ return rcode;
|
|
|
+ }
|
|
|
|
|
|
- if (c & ATA_STAT_BUSY) {
|
|
|
- printf("IDE read: device %d not ready\n", device);
|
|
|
- goto IDE_READ_E;
|
|
|
- }
|
|
|
+ return CMD_RET_USAGE;
|
|
|
+ default:
|
|
|
+ /* at least 4 args */
|
|
|
|
|
|
- /* first check if the drive is in Powersaving mode, if yes,
|
|
|
- * increase the timeout value */
|
|
|
- ide_outb(device, ATA_COMMAND, ATA_CMD_CHK_PWR);
|
|
|
- udelay(50);
|
|
|
+ if (strcmp(argv[1], "read") == 0) {
|
|
|
+ ulong addr = simple_strtoul(argv[2], NULL, 16);
|
|
|
+ ulong cnt = simple_strtoul(argv[4], NULL, 16);
|
|
|
+ struct blk_desc *dev_desc;
|
|
|
+ ulong n;
|
|
|
|
|
|
- c = ide_wait(device, IDE_TIME_OUT); /* can't take over 500 ms */
|
|
|
+#ifdef CONFIG_SYS_64BIT_LBA
|
|
|
+ lbaint_t blk = simple_strtoull(argv[3], NULL, 16);
|
|
|
|
|
|
- if (c & ATA_STAT_BUSY) {
|
|
|
- printf("IDE read: device %d not ready\n", device);
|
|
|
- goto IDE_READ_E;
|
|
|
- }
|
|
|
- if ((c & ATA_STAT_ERR) == ATA_STAT_ERR) {
|
|
|
- printf("No Powersaving mode %X\n", c);
|
|
|
- } else {
|
|
|
- c = ide_inb(device, ATA_SECT_CNT);
|
|
|
- debug("Powersaving %02X\n", c);
|
|
|
- if (c == 0)
|
|
|
- pwrsave = 1;
|
|
|
- }
|
|
|
+ printf("\nIDE read: device %d block # %lld, count %ld...",
|
|
|
+ curr_device, blk, cnt);
|
|
|
+#else
|
|
|
+ lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
|
|
|
|
|
|
+ printf("\nIDE read: device %d block # %ld, count %ld...",
|
|
|
+ curr_device, blk, cnt);
|
|
|
+#endif
|
|
|
|
|
|
- while (blkcnt-- > 0) {
|
|
|
+ dev_desc = &ide_dev_desc[curr_device];
|
|
|
+ n = blk_dread(dev_desc, blk, cnt, (ulong *)addr);
|
|
|
+ /* flush cache after read */
|
|
|
+ flush_cache(addr,
|
|
|
+ cnt * ide_dev_desc[curr_device].blksz);
|
|
|
|
|
|
- c = ide_wait(device, IDE_TIME_OUT);
|
|
|
+ printf("%ld blocks read: %s\n",
|
|
|
+ n, (n == cnt) ? "OK" : "ERROR");
|
|
|
+ if (n == cnt)
|
|
|
+ return 0;
|
|
|
+ else
|
|
|
+ return 1;
|
|
|
+ } else if (strcmp(argv[1], "write") == 0) {
|
|
|
+ ulong addr = simple_strtoul(argv[2], NULL, 16);
|
|
|
+ ulong cnt = simple_strtoul(argv[4], NULL, 16);
|
|
|
+ ulong n;
|
|
|
|
|
|
- if (c & ATA_STAT_BUSY) {
|
|
|
- printf("IDE read: device %d not ready\n", device);
|
|
|
- break;
|
|
|
- }
|
|
|
-#ifdef CONFIG_LBA48
|
|
|
- if (lba48) {
|
|
|
- /* write high bits */
|
|
|
- ide_outb(device, ATA_SECT_CNT, 0);
|
|
|
- ide_outb(device, ATA_LBA_LOW, (blknr >> 24) & 0xFF);
|
|
|
#ifdef CONFIG_SYS_64BIT_LBA
|
|
|
- ide_outb(device, ATA_LBA_MID, (blknr >> 32) & 0xFF);
|
|
|
- ide_outb(device, ATA_LBA_HIGH, (blknr >> 40) & 0xFF);
|
|
|
+ lbaint_t blk = simple_strtoull(argv[3], NULL, 16);
|
|
|
+
|
|
|
+ printf("\nIDE write: device %d block # %lld, count %ld...",
|
|
|
+ curr_device, blk, cnt);
|
|
|
#else
|
|
|
- ide_outb(device, ATA_LBA_MID, 0);
|
|
|
- ide_outb(device, ATA_LBA_HIGH, 0);
|
|
|
+ lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
|
|
|
+
|
|
|
+ printf("\nIDE write: device %d block # %ld, count %ld...",
|
|
|
+ curr_device, blk, cnt);
|
|
|
#endif
|
|
|
+ n = ide_write(&ide_dev_desc[curr_device], blk, cnt,
|
|
|
+ (ulong *)addr);
|
|
|
+
|
|
|
+ printf("%ld blocks written: %s\n", n,
|
|
|
+ n == cnt ? "OK" : "ERROR");
|
|
|
+ if (n == cnt)
|
|
|
+ return 0;
|
|
|
+ else
|
|
|
+ return 1;
|
|
|
+ } else {
|
|
|
+ return CMD_RET_USAGE;
|
|
|
}
|
|
|
-#endif
|
|
|
- ide_outb(device, ATA_SECT_CNT, 1);
|
|
|
- ide_outb(device, ATA_LBA_LOW, (blknr >> 0) & 0xFF);
|
|
|
- ide_outb(device, ATA_LBA_MID, (blknr >> 8) & 0xFF);
|
|
|
- ide_outb(device, ATA_LBA_HIGH, (blknr >> 16) & 0xFF);
|
|
|
|
|
|
-#ifdef CONFIG_LBA48
|
|
|
- if (lba48) {
|
|
|
- ide_outb(device, ATA_DEV_HD,
|
|
|
- ATA_LBA | ATA_DEVICE(device));
|
|
|
- ide_outb(device, ATA_COMMAND, ATA_CMD_READ_EXT);
|
|
|
+ return rcode;
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
- } else
|
|
|
-#endif
|
|
|
- {
|
|
|
- ide_outb(device, ATA_DEV_HD, ATA_LBA |
|
|
|
- ATA_DEVICE(device) | ((blknr >> 24) & 0xF));
|
|
|
- ide_outb(device, ATA_COMMAND, ATA_CMD_READ);
|
|
|
- }
|
|
|
+int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
|
|
|
+{
|
|
|
+ return common_diskboot(cmdtp, "ide", argc, argv);
|
|
|
+}
|
|
|
|
|
|
- udelay(50);
|
|
|
+/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
- if (pwrsave) {
|
|
|
- /* may take up to 4 sec */
|
|
|
- c = ide_wait(device, IDE_SPIN_UP_TIME_OUT);
|
|
|
- pwrsave = 0;
|
|
|
- } else {
|
|
|
- /* can't take over 500 ms */
|
|
|
- c = ide_wait(device, IDE_TIME_OUT);
|
|
|
- }
|
|
|
+__weak void ide_led(uchar led, uchar status)
|
|
|
+{
|
|
|
+#if defined(CONFIG_IDE_LED) && defined(PER8_BASE) /* required by LED_PORT */
|
|
|
+ static uchar led_buffer; /* Buffer for current LED status */
|
|
|
|
|
|
- if ((c & (ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR)) !=
|
|
|
- ATA_STAT_DRQ) {
|
|
|
- printf("Error (no IRQ) dev %d blk " LBAF ": status "
|
|
|
- "%#02x\n", device, blknr, c);
|
|
|
- break;
|
|
|
- }
|
|
|
+ uchar *led_port = LED_PORT;
|
|
|
|
|
|
- ide_input_data(device, buffer, ATA_SECTORWORDS);
|
|
|
- (void) ide_inb(device, ATA_STATUS); /* clear IRQ */
|
|
|
+ if (status) /* switch LED on */
|
|
|
+ led_buffer |= led;
|
|
|
+ else /* switch LED off */
|
|
|
+ led_buffer &= ~led;
|
|
|
|
|
|
- ++n;
|
|
|
- ++blknr;
|
|
|
- buffer += ATA_BLOCKSIZE;
|
|
|
- }
|
|
|
-IDE_READ_E:
|
|
|
- ide_led(DEVICE_LED(device), 0); /* LED off */
|
|
|
- return n;
|
|
|
+ *led_port = led_buffer;
|
|
|
+#endif
|
|
|
}
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
+__weak void ide_outb(int dev, int port, unsigned char val)
|
|
|
+{
|
|
|
+ debug("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n",
|
|
|
+ dev, port, val,
|
|
|
+ (ATA_CURR_BASE(dev) + CONFIG_SYS_ATA_PORT_ADDR(port)));
|
|
|
|
|
|
-ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
|
|
|
- const void *buffer)
|
|
|
+#if defined(CONFIG_IDE_AHB)
|
|
|
+ if (port) {
|
|
|
+ /* write command */
|
|
|
+ ide_write_register(dev, port, val);
|
|
|
+ } else {
|
|
|
+ /* write data */
|
|
|
+ outb(val, (ATA_CURR_BASE(dev)));
|
|
|
+ }
|
|
|
+#else
|
|
|
+ outb(val, (ATA_CURR_BASE(dev) + CONFIG_SYS_ATA_PORT_ADDR(port)));
|
|
|
+#endif
|
|
|
+}
|
|
|
+
|
|
|
+__weak unsigned char ide_inb(int dev, int port)
|
|
|
+{
|
|
|
+ uchar val;
|
|
|
+
|
|
|
+#if defined(CONFIG_IDE_AHB)
|
|
|
+ val = ide_read_register(dev, port);
|
|
|
+#else
|
|
|
+ val = inb((ATA_CURR_BASE(dev) + CONFIG_SYS_ATA_PORT_ADDR(port)));
|
|
|
+#endif
|
|
|
+
|
|
|
+ debug("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n",
|
|
|
+ dev, port,
|
|
|
+ (ATA_CURR_BASE(dev) + CONFIG_SYS_ATA_PORT_ADDR(port)), val);
|
|
|
+ return val;
|
|
|
+}
|
|
|
+
|
|
|
+void ide_init(void)
|
|
|
{
|
|
|
- int device = block_dev->devnum;
|
|
|
- ulong n = 0;
|
|
|
unsigned char c;
|
|
|
+ int i, bus;
|
|
|
|
|
|
-#ifdef CONFIG_LBA48
|
|
|
- unsigned char lba48 = 0;
|
|
|
+#ifdef CONFIG_IDE_8xx_PCCARD
|
|
|
+ extern int ide_devices_found; /* Initialized in check_ide_device() */
|
|
|
+#endif /* CONFIG_IDE_8xx_PCCARD */
|
|
|
|
|
|
- if (blknr & 0x0000fffff0000000ULL) {
|
|
|
- /* more than 28 bits used, use 48bit mode */
|
|
|
- lba48 = 1;
|
|
|
+#ifdef CONFIG_IDE_PREINIT
|
|
|
+ WATCHDOG_RESET();
|
|
|
+
|
|
|
+ if (ide_preinit()) {
|
|
|
+ puts("ide_preinit failed\n");
|
|
|
+ return;
|
|
|
}
|
|
|
-#endif
|
|
|
+#endif /* CONFIG_IDE_PREINIT */
|
|
|
|
|
|
- ide_led(DEVICE_LED(device), 1); /* LED on */
|
|
|
+ WATCHDOG_RESET();
|
|
|
|
|
|
- /* Select device
|
|
|
+ /*
|
|
|
+ * Reset the IDE just to be sure.
|
|
|
+ * Light LED's to show
|
|
|
*/
|
|
|
- ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
|
|
|
+ ide_led((LED_IDE1 | LED_IDE2), 1); /* LED's on */
|
|
|
|
|
|
- while (blkcnt-- > 0) {
|
|
|
+ /* ATAPI Drives seems to need a proper IDE Reset */
|
|
|
+ ide_reset();
|
|
|
|
|
|
- c = ide_wait(device, IDE_TIME_OUT);
|
|
|
+#ifdef CONFIG_IDE_INIT_POSTRESET
|
|
|
+ WATCHDOG_RESET();
|
|
|
|
|
|
- if (c & ATA_STAT_BUSY) {
|
|
|
- printf("IDE read: device %d not ready\n", device);
|
|
|
- goto WR_OUT;
|
|
|
- }
|
|
|
-#ifdef CONFIG_LBA48
|
|
|
- if (lba48) {
|
|
|
- /* write high bits */
|
|
|
- ide_outb(device, ATA_SECT_CNT, 0);
|
|
|
- ide_outb(device, ATA_LBA_LOW, (blknr >> 24) & 0xFF);
|
|
|
-#ifdef CONFIG_SYS_64BIT_LBA
|
|
|
- ide_outb(device, ATA_LBA_MID, (blknr >> 32) & 0xFF);
|
|
|
- ide_outb(device, ATA_LBA_HIGH, (blknr >> 40) & 0xFF);
|
|
|
-#else
|
|
|
- ide_outb(device, ATA_LBA_MID, 0);
|
|
|
- ide_outb(device, ATA_LBA_HIGH, 0);
|
|
|
-#endif
|
|
|
+ if (ide_init_postreset()) {
|
|
|
+ puts("ide_preinit_postreset failed\n");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+#endif /* CONFIG_IDE_INIT_POSTRESET */
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Wait for IDE to get ready.
|
|
|
+ * According to spec, this can take up to 31 seconds!
|
|
|
+ */
|
|
|
+ for (bus = 0; bus < CONFIG_SYS_IDE_MAXBUS; ++bus) {
|
|
|
+ int dev =
|
|
|
+ bus * (CONFIG_SYS_IDE_MAXDEVICE /
|
|
|
+ CONFIG_SYS_IDE_MAXBUS);
|
|
|
+
|
|
|
+#ifdef CONFIG_IDE_8xx_PCCARD
|
|
|
+ /* Skip non-ide devices from probing */
|
|
|
+ if ((ide_devices_found & (1 << bus)) == 0) {
|
|
|
+ ide_led((LED_IDE1 | LED_IDE2), 0); /* LED's off */
|
|
|
+ continue;
|
|
|
}
|
|
|
#endif
|
|
|
- ide_outb(device, ATA_SECT_CNT, 1);
|
|
|
- ide_outb(device, ATA_LBA_LOW, (blknr >> 0) & 0xFF);
|
|
|
- ide_outb(device, ATA_LBA_MID, (blknr >> 8) & 0xFF);
|
|
|
- ide_outb(device, ATA_LBA_HIGH, (blknr >> 16) & 0xFF);
|
|
|
+ printf("Bus %d: ", bus);
|
|
|
|
|
|
-#ifdef CONFIG_LBA48
|
|
|
- if (lba48) {
|
|
|
- ide_outb(device, ATA_DEV_HD,
|
|
|
- ATA_LBA | ATA_DEVICE(device));
|
|
|
- ide_outb(device, ATA_COMMAND, ATA_CMD_WRITE_EXT);
|
|
|
+ ide_bus_ok[bus] = 0;
|
|
|
|
|
|
- } else
|
|
|
-#endif
|
|
|
- {
|
|
|
- ide_outb(device, ATA_DEV_HD, ATA_LBA |
|
|
|
- ATA_DEVICE(device) | ((blknr >> 24) & 0xF));
|
|
|
- ide_outb(device, ATA_COMMAND, ATA_CMD_WRITE);
|
|
|
- }
|
|
|
+ /* Select device
|
|
|
+ */
|
|
|
+ udelay(100000); /* 100 ms */
|
|
|
+ ide_outb(dev, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(dev));
|
|
|
+ udelay(100000); /* 100 ms */
|
|
|
+ i = 0;
|
|
|
+ do {
|
|
|
+ udelay(10000); /* 10 ms */
|
|
|
|
|
|
- udelay(50);
|
|
|
+ c = ide_inb(dev, ATA_STATUS);
|
|
|
+ i++;
|
|
|
+ if (i > (ATA_RESET_TIME * 100)) {
|
|
|
+ puts("** Timeout **\n");
|
|
|
+ /* LED's off */
|
|
|
+ ide_led((LED_IDE1 | LED_IDE2), 0);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if ((i >= 100) && ((i % 100) == 0))
|
|
|
+ putc('.');
|
|
|
|
|
|
- /* can't take over 500 ms */
|
|
|
- c = ide_wait(device, IDE_TIME_OUT);
|
|
|
+ } while (c & ATA_STAT_BUSY);
|
|
|
|
|
|
- if ((c & (ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR)) !=
|
|
|
- ATA_STAT_DRQ) {
|
|
|
- printf("Error (no IRQ) dev %d blk " LBAF ": status "
|
|
|
- "%#02x\n", device, blknr, c);
|
|
|
- goto WR_OUT;
|
|
|
+ if (c & (ATA_STAT_BUSY | ATA_STAT_FAULT)) {
|
|
|
+ puts("not available ");
|
|
|
+ debug("Status = 0x%02X ", c);
|
|
|
+#ifndef CONFIG_ATAPI /* ATAPI Devices do not set DRDY */
|
|
|
+ } else if ((c & ATA_STAT_READY) == 0) {
|
|
|
+ puts("not available ");
|
|
|
+ debug("Status = 0x%02X ", c);
|
|
|
+#endif
|
|
|
+ } else {
|
|
|
+ puts("OK ");
|
|
|
+ ide_bus_ok[bus] = 1;
|
|
|
}
|
|
|
-
|
|
|
- ide_output_data(device, buffer, ATA_SECTORWORDS);
|
|
|
- c = ide_inb(device, ATA_STATUS); /* clear IRQ */
|
|
|
- ++n;
|
|
|
- ++blknr;
|
|
|
- buffer += ATA_BLOCKSIZE;
|
|
|
+ WATCHDOG_RESET();
|
|
|
}
|
|
|
-WR_OUT:
|
|
|
- ide_led(DEVICE_LED(device), 0); /* LED off */
|
|
|
- return n;
|
|
|
-}
|
|
|
-
|
|
|
-/* ------------------------------------------------------------------------- */
|
|
|
-
|
|
|
-/*
|
|
|
- * copy src to dest, skipping leading and trailing blanks and null
|
|
|
- * terminate the string
|
|
|
- * "len" is the size of available memory including the terminating '\0'
|
|
|
- */
|
|
|
-static void ident_cpy(unsigned char *dst, unsigned char *src,
|
|
|
- unsigned int len)
|
|
|
-{
|
|
|
- unsigned char *end, *last;
|
|
|
|
|
|
- last = dst;
|
|
|
- end = src + len - 1;
|
|
|
+ putc('\n');
|
|
|
|
|
|
- /* reserve space for '\0' */
|
|
|
- if (len < 2)
|
|
|
- goto OUT;
|
|
|
+ ide_led((LED_IDE1 | LED_IDE2), 0); /* LED's off */
|
|
|
|
|
|
- /* skip leading white space */
|
|
|
- while ((*src) && (src < end) && (*src == ' '))
|
|
|
- ++src;
|
|
|
+ curr_device = -1;
|
|
|
+ for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; ++i) {
|
|
|
+ int led = (IDE_BUS(i) == 0) ? LED_IDE1 : LED_IDE2;
|
|
|
+ ide_dev_desc[i].type = DEV_TYPE_UNKNOWN;
|
|
|
+ ide_dev_desc[i].if_type = IF_TYPE_IDE;
|
|
|
+ ide_dev_desc[i].devnum = i;
|
|
|
+ ide_dev_desc[i].part_type = PART_TYPE_UNKNOWN;
|
|
|
+ ide_dev_desc[i].blksz = 0;
|
|
|
+ ide_dev_desc[i].log2blksz =
|
|
|
+ LOG2_INVALID(typeof(ide_dev_desc[i].log2blksz));
|
|
|
+ ide_dev_desc[i].lba = 0;
|
|
|
+ ide_dev_desc[i].block_read = ide_read;
|
|
|
+ ide_dev_desc[i].block_write = ide_write;
|
|
|
+ if (!ide_bus_ok[IDE_BUS(i)])
|
|
|
+ continue;
|
|
|
+ ide_led(led, 1); /* LED on */
|
|
|
+ ide_ident(&ide_dev_desc[i]);
|
|
|
+ ide_led(led, 0); /* LED off */
|
|
|
+ dev_print(&ide_dev_desc[i]);
|
|
|
|
|
|
- /* copy string, omitting trailing white space */
|
|
|
- while ((*src) && (src < end)) {
|
|
|
- *dst++ = *src;
|
|
|
- if (*src++ != ' ')
|
|
|
- last = dst;
|
|
|
+ if ((ide_dev_desc[i].lba > 0) && (ide_dev_desc[i].blksz > 0)) {
|
|
|
+ /* initialize partition type */
|
|
|
+ part_init(&ide_dev_desc[i]);
|
|
|
+ if (curr_device < 0)
|
|
|
+ curr_device = i;
|
|
|
+ }
|
|
|
}
|
|
|
-OUT:
|
|
|
- *last = '\0';
|
|
|
+ WATCHDOG_RESET();
|
|
|
}
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
-/*
|
|
|
- * Wait until Busy bit is off, or timeout (in ms)
|
|
|
- * Return last status
|
|
|
- */
|
|
|
-static uchar ide_wait(int dev, ulong t)
|
|
|
+#ifdef CONFIG_PARTITIONS
|
|
|
+struct blk_desc *ide_get_dev(int dev)
|
|
|
{
|
|
|
- ulong delay = 10 * t; /* poll every 100 us */
|
|
|
- uchar c;
|
|
|
-
|
|
|
- while ((c = ide_inb(dev, ATA_STATUS)) & ATA_STAT_BUSY) {
|
|
|
- udelay(100);
|
|
|
- if (delay-- == 0)
|
|
|
- break;
|
|
|
- }
|
|
|
- return c;
|
|
|
+ return (dev < CONFIG_SYS_IDE_MAXDEVICE) ? &ide_dev_desc[dev] : NULL;
|
|
|
}
|
|
|
+#endif
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
-#ifdef CONFIG_IDE_RESET
|
|
|
-extern void ide_set_reset(int idereset);
|
|
|
-
|
|
|
-static void ide_reset(void)
|
|
|
+/* We only need to swap data if we are running on a big endian cpu. */
|
|
|
+#if defined(__LITTLE_ENDIAN)
|
|
|
+__weak void ide_input_swap_data(int dev, ulong *sect_buf, int words)
|
|
|
{
|
|
|
- int i;
|
|
|
-
|
|
|
- curr_device = -1;
|
|
|
- for (i = 0; i < CONFIG_SYS_IDE_MAXBUS; ++i)
|
|
|
- ide_bus_ok[i] = 0;
|
|
|
- for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; ++i)
|
|
|
- ide_dev_desc[i].type = DEV_TYPE_UNKNOWN;
|
|
|
-
|
|
|
- ide_set_reset(1); /* assert reset */
|
|
|
-
|
|
|
- /* the reset signal shall be asserted for et least 25 us */
|
|
|
- udelay(25);
|
|
|
-
|
|
|
- WATCHDOG_RESET();
|
|
|
-
|
|
|
- /* de-assert RESET signal */
|
|
|
- ide_set_reset(0);
|
|
|
-
|
|
|
- /* wait 250 ms */
|
|
|
- for (i = 0; i < 250; ++i)
|
|
|
- udelay(1000);
|
|
|
+ ide_input_data(dev, sect_buf, words);
|
|
|
}
|
|
|
+#else
|
|
|
+__weak void ide_input_swap_data(int dev, ulong *sect_buf, int words)
|
|
|
+{
|
|
|
+ volatile ushort *pbuf =
|
|
|
+ (ushort *)(ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
+ ushort *dbuf = (ushort *)sect_buf;
|
|
|
|
|
|
-#endif /* CONFIG_IDE_RESET */
|
|
|
-
|
|
|
-/* ------------------------------------------------------------------------- */
|
|
|
+ debug("in input swap data base for read is %lx\n",
|
|
|
+ (unsigned long) pbuf);
|
|
|
|
|
|
-#if defined(CONFIG_OF_IDE_FIXUP)
|
|
|
-int ide_device_present(int dev)
|
|
|
-{
|
|
|
- if (dev >= CONFIG_SYS_IDE_MAXBUS)
|
|
|
- return 0;
|
|
|
- return (ide_dev_desc[dev].type == DEV_TYPE_UNKNOWN ? 0 : 1);
|
|
|
+ while (words--) {
|
|
|
+#ifdef __MIPS__
|
|
|
+ *dbuf++ = swab16p((u16 *)pbuf);
|
|
|
+ *dbuf++ = swab16p((u16 *)pbuf);
|
|
|
+#else
|
|
|
+ *dbuf++ = ld_le16(pbuf);
|
|
|
+ *dbuf++ = ld_le16(pbuf);
|
|
|
+#endif /* !MIPS */
|
|
|
+ }
|
|
|
}
|
|
|
-#endif
|
|
|
-/* ------------------------------------------------------------------------- */
|
|
|
+#endif /* __LITTLE_ENDIAN */
|
|
|
|
|
|
-#ifdef CONFIG_ATAPI
|
|
|
-/****************************************************************************
|
|
|
- * ATAPI Support
|
|
|
- */
|
|
|
|
|
|
#if defined(CONFIG_IDE_SWAP_IO)
|
|
|
-/* since ATAPI may use commands with not 4 bytes alligned length
|
|
|
- * we have our own transfer functions, 2 bytes alligned */
|
|
|
-__weak void ide_output_data_shorts(int dev, ushort *sect_buf, int shorts)
|
|
|
+__weak void ide_output_data(int dev, const ulong *sect_buf, int words)
|
|
|
{
|
|
|
ushort *dbuf;
|
|
|
volatile ushort *pbuf;
|
|
|
|
|
|
- pbuf = (ushort *) (ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
- dbuf = (ushort *) sect_buf;
|
|
|
-
|
|
|
- debug("in output data shorts base for read is %lx\n",
|
|
|
- (unsigned long) pbuf);
|
|
|
-
|
|
|
- while (shorts--) {
|
|
|
+ pbuf = (ushort *)(ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
+ dbuf = (ushort *)sect_buf;
|
|
|
+ while (words--) {
|
|
|
+ EIEIO;
|
|
|
+ *pbuf = *dbuf++;
|
|
|
EIEIO;
|
|
|
*pbuf = *dbuf++;
|
|
|
}
|
|
|
}
|
|
|
+#else /* ! CONFIG_IDE_SWAP_IO */
|
|
|
+__weak void ide_output_data(int dev, const ulong *sect_buf, int words)
|
|
|
+{
|
|
|
+#if defined(CONFIG_IDE_AHB)
|
|
|
+ ide_write_data(dev, sect_buf, words);
|
|
|
+#else
|
|
|
+ outsw(ATA_CURR_BASE(dev) + ATA_DATA_REG, sect_buf, words << 1);
|
|
|
+#endif
|
|
|
+}
|
|
|
+#endif /* CONFIG_IDE_SWAP_IO */
|
|
|
|
|
|
-__weak void ide_input_data_shorts(int dev, ushort *sect_buf, int shorts)
|
|
|
+#if defined(CONFIG_IDE_SWAP_IO)
|
|
|
+__weak void ide_input_data(int dev, ulong *sect_buf, int words)
|
|
|
{
|
|
|
ushort *dbuf;
|
|
|
volatile ushort *pbuf;
|
|
|
|
|
|
- pbuf = (ushort *) (ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
- dbuf = (ushort *) sect_buf;
|
|
|
+ pbuf = (ushort *)(ATA_CURR_BASE(dev) + ATA_DATA_REG);
|
|
|
+ dbuf = (ushort *)sect_buf;
|
|
|
|
|
|
- debug("in input data shorts base for read is %lx\n",
|
|
|
- (unsigned long) pbuf);
|
|
|
+ debug("in input data base for read is %lx\n", (unsigned long) pbuf);
|
|
|
|
|
|
- while (shorts--) {
|
|
|
+ while (words--) {
|
|
|
+ EIEIO;
|
|
|
+ *dbuf++ = *pbuf;
|
|
|
EIEIO;
|
|
|
*dbuf++ = *pbuf;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
#else /* ! CONFIG_IDE_SWAP_IO */
|
|
|
-__weak void ide_output_data_shorts(int dev, ushort *sect_buf, int shorts)
|
|
|
-{
|
|
|
- outsw(ATA_CURR_BASE(dev) + ATA_DATA_REG, sect_buf, shorts);
|
|
|
-}
|
|
|
-
|
|
|
-__weak void ide_input_data_shorts(int dev, ushort *sect_buf, int shorts)
|
|
|
+__weak void ide_input_data(int dev, ulong *sect_buf, int words)
|
|
|
{
|
|
|
- insw(ATA_CURR_BASE(dev) + ATA_DATA_REG, sect_buf, shorts);
|
|
|
+#if defined(CONFIG_IDE_AHB)
|
|
|
+ ide_read_data(dev, sect_buf, words);
|
|
|
+#else
|
|
|
+ insw(ATA_CURR_BASE(dev) + ATA_DATA_REG, sect_buf, words << 1);
|
|
|
+#endif
|
|
|
}
|
|
|
|
|
|
#endif /* CONFIG_IDE_SWAP_IO */
|
|
|
|
|
|
-/*
|
|
|
- * Wait until (Status & mask) == res, or timeout (in ms)
|
|
|
- * Return last status
|
|
|
- * This is used since some ATAPI CD ROMs clears their Busy Bit first
|
|
|
- * and then they set their DRQ Bit
|
|
|
- */
|
|
|
-static uchar atapi_wait_mask(int dev, ulong t, uchar mask, uchar res)
|
|
|
+/* ------------------------------------------------------------------------- */
|
|
|
+
|
|
|
+ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
|
|
|
+ void *buffer)
|
|
|
{
|
|
|
- ulong delay = 10 * t; /* poll every 100 us */
|
|
|
- uchar c;
|
|
|
+ int device = block_dev->devnum;
|
|
|
+ ulong n = 0;
|
|
|
+ unsigned char c;
|
|
|
+ unsigned char pwrsave = 0; /* power save */
|
|
|
|
|
|
- /* prevents to read the status before valid */
|
|
|
- c = ide_inb(dev, ATA_DEV_CTL);
|
|
|
+#ifdef CONFIG_LBA48
|
|
|
+ unsigned char lba48 = 0;
|
|
|
|
|
|
- while (((c = ide_inb(dev, ATA_STATUS)) & mask) != res) {
|
|
|
- /* break if error occurs (doesn't make sense to wait more) */
|
|
|
- if ((c & ATA_STAT_ERR) == ATA_STAT_ERR)
|
|
|
- break;
|
|
|
- udelay(100);
|
|
|
- if (delay-- == 0)
|
|
|
- break;
|
|
|
+ if (blknr & 0x0000fffff0000000ULL) {
|
|
|
+ /* more than 28 bits used, use 48bit mode */
|
|
|
+ lba48 = 1;
|
|
|
}
|
|
|
- return c;
|
|
|
-}
|
|
|
-
|
|
|
-/*
|
|
|
- * issue an atapi command
|
|
|
- */
|
|
|
-unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen,
|
|
|
- unsigned char *buffer, int buflen)
|
|
|
-{
|
|
|
- unsigned char c, err, mask, res;
|
|
|
- int n;
|
|
|
+#endif
|
|
|
+ debug("ide_read dev %d start " LBAF ", blocks " LBAF " buffer at %lX\n",
|
|
|
+ device, blknr, blkcnt, (ulong) buffer);
|
|
|
|
|
|
ide_led(DEVICE_LED(device), 1); /* LED on */
|
|
|
|
|
|
/* Select device
|
|
|
*/
|
|
|
- mask = ATA_STAT_BUSY | ATA_STAT_DRQ;
|
|
|
- res = 0;
|
|
|
- ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
|
|
|
- c = atapi_wait_mask(device, ATAPI_TIME_OUT, mask, res);
|
|
|
- if ((c & mask) != res) {
|
|
|
- printf("ATAPI_ISSUE: device %d not ready status %X\n", device,
|
|
|
- c);
|
|
|
- err = 0xFF;
|
|
|
- goto AI_OUT;
|
|
|
- }
|
|
|
- /* write taskfile */
|
|
|
- ide_outb(device, ATA_ERROR_REG, 0); /* no DMA, no overlaped */
|
|
|
- ide_outb(device, ATA_SECT_CNT, 0);
|
|
|
- ide_outb(device, ATA_SECT_NUM, 0);
|
|
|
- ide_outb(device, ATA_CYL_LOW, (unsigned char) (buflen & 0xFF));
|
|
|
- ide_outb(device, ATA_CYL_HIGH,
|
|
|
- (unsigned char) ((buflen >> 8) & 0xFF));
|
|
|
ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
|
|
|
+ c = ide_wait(device, IDE_TIME_OUT);
|
|
|
|
|
|
- ide_outb(device, ATA_COMMAND, ATAPI_CMD_PACKET);
|
|
|
- udelay(50);
|
|
|
-
|
|
|
- mask = ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR;
|
|
|
- res = ATA_STAT_DRQ;
|
|
|
- c = atapi_wait_mask(device, ATAPI_TIME_OUT, mask, res);
|
|
|
-
|
|
|
- if ((c & mask) != res) { /* DRQ must be 1, BSY 0 */
|
|
|
- printf("ATAPI_ISSUE: Error (no IRQ) before sending ccb dev %d status 0x%02x\n",
|
|
|
- device, c);
|
|
|
- err = 0xFF;
|
|
|
- goto AI_OUT;
|
|
|
- }
|
|
|
-
|
|
|
- /* write command block */
|
|
|
- ide_output_data_shorts(device, (unsigned short *) ccb, ccblen / 2);
|
|
|
-
|
|
|
- /* ATAPI Command written wait for completition */
|
|
|
- udelay(5000); /* device must set bsy */
|
|
|
-
|
|
|
- mask = ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR;
|
|
|
- /*
|
|
|
- * if no data wait for DRQ = 0 BSY = 0
|
|
|
- * if data wait for DRQ = 1 BSY = 0
|
|
|
- */
|
|
|
- res = 0;
|
|
|
- if (buflen)
|
|
|
- res = ATA_STAT_DRQ;
|
|
|
- c = atapi_wait_mask(device, ATAPI_TIME_OUT, mask, res);
|
|
|
- if ((c & mask) != res) {
|
|
|
- if (c & ATA_STAT_ERR) {
|
|
|
- err = (ide_inb(device, ATA_ERROR_REG)) >> 4;
|
|
|
- debug("atapi_issue 1 returned sense key %X status %02X\n",
|
|
|
- err, c);
|
|
|
- } else {
|
|
|
- printf("ATAPI_ISSUE: (no DRQ) after sending ccb (%x) status 0x%02x\n",
|
|
|
- ccb[0], c);
|
|
|
- err = 0xFF;
|
|
|
- }
|
|
|
- goto AI_OUT;
|
|
|
- }
|
|
|
- n = ide_inb(device, ATA_CYL_HIGH);
|
|
|
- n <<= 8;
|
|
|
- n += ide_inb(device, ATA_CYL_LOW);
|
|
|
- if (n > buflen) {
|
|
|
- printf("ERROR, transfer bytes %d requested only %d\n", n,
|
|
|
- buflen);
|
|
|
- err = 0xff;
|
|
|
- goto AI_OUT;
|
|
|
- }
|
|
|
- if ((n == 0) && (buflen < 0)) {
|
|
|
- printf("ERROR, transfer bytes %d requested %d\n", n, buflen);
|
|
|
- err = 0xff;
|
|
|
- goto AI_OUT;
|
|
|
- }
|
|
|
- if (n != buflen) {
|
|
|
- debug("WARNING, transfer bytes %d not equal with requested %d\n",
|
|
|
- n, buflen);
|
|
|
- }
|
|
|
- if (n != 0) { /* data transfer */
|
|
|
- debug("ATAPI_ISSUE: %d Bytes to transfer\n", n);
|
|
|
- /* we transfer shorts */
|
|
|
- n >>= 1;
|
|
|
- /* ok now decide if it is an in or output */
|
|
|
- if ((ide_inb(device, ATA_SECT_CNT) & 0x02) == 0) {
|
|
|
- debug("Write to device\n");
|
|
|
- ide_output_data_shorts(device,
|
|
|
- (unsigned short *) buffer, n);
|
|
|
- } else {
|
|
|
- debug("Read from device @ %p shorts %d\n", buffer, n);
|
|
|
- ide_input_data_shorts(device,
|
|
|
- (unsigned short *) buffer, n);
|
|
|
- }
|
|
|
- }
|
|
|
- udelay(5000); /* seems that some CD ROMs need this... */
|
|
|
- mask = ATA_STAT_BUSY | ATA_STAT_ERR;
|
|
|
- res = 0;
|
|
|
- c = atapi_wait_mask(device, ATAPI_TIME_OUT, mask, res);
|
|
|
- if ((c & ATA_STAT_ERR) == ATA_STAT_ERR) {
|
|
|
- err = (ide_inb(device, ATA_ERROR_REG) >> 4);
|
|
|
- debug("atapi_issue 2 returned sense key %X status %X\n", err,
|
|
|
- c);
|
|
|
- } else {
|
|
|
- err = 0;
|
|
|
+ if (c & ATA_STAT_BUSY) {
|
|
|
+ printf("IDE read: device %d not ready\n", device);
|
|
|
+ goto IDE_READ_E;
|
|
|
}
|
|
|
-AI_OUT:
|
|
|
- ide_led(DEVICE_LED(device), 0); /* LED off */
|
|
|
- return err;
|
|
|
-}
|
|
|
-
|
|
|
-/*
|
|
|
- * sending the command to atapi_issue. If an status other than good
|
|
|
- * returns, an request_sense will be issued
|
|
|
- */
|
|
|
-
|
|
|
-#define ATAPI_DRIVE_NOT_READY 100
|
|
|
-#define ATAPI_UNIT_ATTN 10
|
|
|
-
|
|
|
-unsigned char atapi_issue_autoreq(int device,
|
|
|
- unsigned char *ccb,
|
|
|
- int ccblen,
|
|
|
- unsigned char *buffer, int buflen)
|
|
|
-{
|
|
|
- unsigned char sense_data[18], sense_ccb[12];
|
|
|
- unsigned char res, key, asc, ascq;
|
|
|
- int notready, unitattn;
|
|
|
-
|
|
|
- unitattn = ATAPI_UNIT_ATTN;
|
|
|
- notready = ATAPI_DRIVE_NOT_READY;
|
|
|
-
|
|
|
-retry:
|
|
|
- res = atapi_issue(device, ccb, ccblen, buffer, buflen);
|
|
|
- if (res == 0)
|
|
|
- return 0; /* Ok */
|
|
|
-
|
|
|
- if (res == 0xFF)
|
|
|
- return 0xFF; /* error */
|
|
|
-
|
|
|
- debug("(auto_req)atapi_issue returned sense key %X\n", res);
|
|
|
-
|
|
|
- memset(sense_ccb, 0, sizeof(sense_ccb));
|
|
|
- memset(sense_data, 0, sizeof(sense_data));
|
|
|
- sense_ccb[0] = ATAPI_CMD_REQ_SENSE;
|
|
|
- sense_ccb[4] = 18; /* allocation Length */
|
|
|
-
|
|
|
- res = atapi_issue(device, sense_ccb, 12, sense_data, 18);
|
|
|
- key = (sense_data[2] & 0xF);
|
|
|
- asc = (sense_data[12]);
|
|
|
- ascq = (sense_data[13]);
|
|
|
|
|
|
- debug("ATAPI_CMD_REQ_SENSE returned %x\n", res);
|
|
|
- debug(" Sense page: %02X key %02X ASC %02X ASCQ %02X\n",
|
|
|
- sense_data[0], key, asc, ascq);
|
|
|
+ /* first check if the drive is in Powersaving mode, if yes,
|
|
|
+ * increase the timeout value */
|
|
|
+ ide_outb(device, ATA_COMMAND, ATA_CMD_CHK_PWR);
|
|
|
+ udelay(50);
|
|
|
|
|
|
- if ((key == 0))
|
|
|
- return 0; /* ok device ready */
|
|
|
+ c = ide_wait(device, IDE_TIME_OUT); /* can't take over 500 ms */
|
|
|
|
|
|
- if ((key == 6) || (asc == 0x29) || (asc == 0x28)) { /* Unit Attention */
|
|
|
- if (unitattn-- > 0) {
|
|
|
- udelay(200 * 1000);
|
|
|
- goto retry;
|
|
|
- }
|
|
|
- printf("Unit Attention, tried %d\n", ATAPI_UNIT_ATTN);
|
|
|
- goto error;
|
|
|
- }
|
|
|
- if ((asc == 0x4) && (ascq == 0x1)) {
|
|
|
- /* not ready, but will be ready soon */
|
|
|
- if (notready-- > 0) {
|
|
|
- udelay(200 * 1000);
|
|
|
- goto retry;
|
|
|
- }
|
|
|
- printf("Drive not ready, tried %d times\n",
|
|
|
- ATAPI_DRIVE_NOT_READY);
|
|
|
- goto error;
|
|
|
+ if (c & ATA_STAT_BUSY) {
|
|
|
+ printf("IDE read: device %d not ready\n", device);
|
|
|
+ goto IDE_READ_E;
|
|
|
}
|
|
|
- if (asc == 0x3a) {
|
|
|
- debug("Media not present\n");
|
|
|
- goto error;
|
|
|
+ if ((c & ATA_STAT_ERR) == ATA_STAT_ERR) {
|
|
|
+ printf("No Powersaving mode %X\n", c);
|
|
|
+ } else {
|
|
|
+ c = ide_inb(device, ATA_SECT_CNT);
|
|
|
+ debug("Powersaving %02X\n", c);
|
|
|
+ if (c == 0)
|
|
|
+ pwrsave = 1;
|
|
|
}
|
|
|
|
|
|
- printf("ERROR: Unknown Sense key %02X ASC %02X ASCQ %02X\n", key, asc,
|
|
|
- ascq);
|
|
|
-error:
|
|
|
- debug("ERROR Sense key %02X ASC %02X ASCQ %02X\n", key, asc, ascq);
|
|
|
- return 0xFF;
|
|
|
-}
|
|
|
|
|
|
+ while (blkcnt-- > 0) {
|
|
|
|
|
|
-static void atapi_inquiry(struct blk_desc *dev_desc)
|
|
|
-{
|
|
|
- unsigned char ccb[12]; /* Command descriptor block */
|
|
|
- unsigned char iobuf[64]; /* temp buf */
|
|
|
- unsigned char c;
|
|
|
- int device;
|
|
|
+ c = ide_wait(device, IDE_TIME_OUT);
|
|
|
|
|
|
- device = dev_desc->devnum;
|
|
|
- dev_desc->type = DEV_TYPE_UNKNOWN; /* not yet valid */
|
|
|
- dev_desc->block_read = atapi_read;
|
|
|
+ if (c & ATA_STAT_BUSY) {
|
|
|
+ printf("IDE read: device %d not ready\n", device);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+#ifdef CONFIG_LBA48
|
|
|
+ if (lba48) {
|
|
|
+ /* write high bits */
|
|
|
+ ide_outb(device, ATA_SECT_CNT, 0);
|
|
|
+ ide_outb(device, ATA_LBA_LOW, (blknr >> 24) & 0xFF);
|
|
|
+#ifdef CONFIG_SYS_64BIT_LBA
|
|
|
+ ide_outb(device, ATA_LBA_MID, (blknr >> 32) & 0xFF);
|
|
|
+ ide_outb(device, ATA_LBA_HIGH, (blknr >> 40) & 0xFF);
|
|
|
+#else
|
|
|
+ ide_outb(device, ATA_LBA_MID, 0);
|
|
|
+ ide_outb(device, ATA_LBA_HIGH, 0);
|
|
|
+#endif
|
|
|
+ }
|
|
|
+#endif
|
|
|
+ ide_outb(device, ATA_SECT_CNT, 1);
|
|
|
+ ide_outb(device, ATA_LBA_LOW, (blknr >> 0) & 0xFF);
|
|
|
+ ide_outb(device, ATA_LBA_MID, (blknr >> 8) & 0xFF);
|
|
|
+ ide_outb(device, ATA_LBA_HIGH, (blknr >> 16) & 0xFF);
|
|
|
|
|
|
- memset(ccb, 0, sizeof(ccb));
|
|
|
- memset(iobuf, 0, sizeof(iobuf));
|
|
|
+#ifdef CONFIG_LBA48
|
|
|
+ if (lba48) {
|
|
|
+ ide_outb(device, ATA_DEV_HD,
|
|
|
+ ATA_LBA | ATA_DEVICE(device));
|
|
|
+ ide_outb(device, ATA_COMMAND, ATA_CMD_READ_EXT);
|
|
|
|
|
|
- ccb[0] = ATAPI_CMD_INQUIRY;
|
|
|
- ccb[4] = 40; /* allocation Legnth */
|
|
|
- c = atapi_issue_autoreq(device, ccb, 12, (unsigned char *) iobuf, 40);
|
|
|
+ } else
|
|
|
+#endif
|
|
|
+ {
|
|
|
+ ide_outb(device, ATA_DEV_HD, ATA_LBA |
|
|
|
+ ATA_DEVICE(device) | ((blknr >> 24) & 0xF));
|
|
|
+ ide_outb(device, ATA_COMMAND, ATA_CMD_READ);
|
|
|
+ }
|
|
|
|
|
|
- debug("ATAPI_CMD_INQUIRY returned %x\n", c);
|
|
|
- if (c != 0)
|
|
|
- return;
|
|
|
+ udelay(50);
|
|
|
|
|
|
- /* copy device ident strings */
|
|
|
- ident_cpy((unsigned char *) dev_desc->vendor, &iobuf[8], 8);
|
|
|
- ident_cpy((unsigned char *) dev_desc->product, &iobuf[16], 16);
|
|
|
- ident_cpy((unsigned char *) dev_desc->revision, &iobuf[32], 5);
|
|
|
+ if (pwrsave) {
|
|
|
+ /* may take up to 4 sec */
|
|
|
+ c = ide_wait(device, IDE_SPIN_UP_TIME_OUT);
|
|
|
+ pwrsave = 0;
|
|
|
+ } else {
|
|
|
+ /* can't take over 500 ms */
|
|
|
+ c = ide_wait(device, IDE_TIME_OUT);
|
|
|
+ }
|
|
|
|
|
|
- dev_desc->lun = 0;
|
|
|
- dev_desc->lba = 0;
|
|
|
- dev_desc->blksz = 0;
|
|
|
- dev_desc->log2blksz = LOG2_INVALID(typeof(dev_desc->log2blksz));
|
|
|
- dev_desc->type = iobuf[0] & 0x1f;
|
|
|
+ if ((c & (ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR)) !=
|
|
|
+ ATA_STAT_DRQ) {
|
|
|
+ printf("Error (no IRQ) dev %d blk " LBAF
|
|
|
+ ": status %#02x\n", device, blknr, c);
|
|
|
+ break;
|
|
|
+ }
|
|
|
|
|
|
- if ((iobuf[1] & 0x80) == 0x80)
|
|
|
- dev_desc->removable = 1;
|
|
|
- else
|
|
|
- dev_desc->removable = 0;
|
|
|
+ ide_input_data(device, buffer, ATA_SECTORWORDS);
|
|
|
+ (void) ide_inb(device, ATA_STATUS); /* clear IRQ */
|
|
|
|
|
|
- memset(ccb, 0, sizeof(ccb));
|
|
|
- memset(iobuf, 0, sizeof(iobuf));
|
|
|
- ccb[0] = ATAPI_CMD_START_STOP;
|
|
|
- ccb[4] = 0x03; /* start */
|
|
|
+ ++n;
|
|
|
+ ++blknr;
|
|
|
+ buffer += ATA_BLOCKSIZE;
|
|
|
+ }
|
|
|
+IDE_READ_E:
|
|
|
+ ide_led(DEVICE_LED(device), 0); /* LED off */
|
|
|
+ return n;
|
|
|
+}
|
|
|
|
|
|
- c = atapi_issue_autoreq(device, ccb, 12, (unsigned char *) iobuf, 0);
|
|
|
+/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
- debug("ATAPI_CMD_START_STOP returned %x\n", c);
|
|
|
- if (c != 0)
|
|
|
- return;
|
|
|
|
|
|
- memset(ccb, 0, sizeof(ccb));
|
|
|
- memset(iobuf, 0, sizeof(iobuf));
|
|
|
- c = atapi_issue_autoreq(device, ccb, 12, (unsigned char *) iobuf, 0);
|
|
|
+ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
|
|
|
+ const void *buffer)
|
|
|
+{
|
|
|
+ int device = block_dev->devnum;
|
|
|
+ ulong n = 0;
|
|
|
+ unsigned char c;
|
|
|
|
|
|
- debug("ATAPI_CMD_UNIT_TEST_READY returned %x\n", c);
|
|
|
- if (c != 0)
|
|
|
- return;
|
|
|
+#ifdef CONFIG_LBA48
|
|
|
+ unsigned char lba48 = 0;
|
|
|
|
|
|
- memset(ccb, 0, sizeof(ccb));
|
|
|
- memset(iobuf, 0, sizeof(iobuf));
|
|
|
- ccb[0] = ATAPI_CMD_READ_CAP;
|
|
|
- c = atapi_issue_autoreq(device, ccb, 12, (unsigned char *) iobuf, 8);
|
|
|
- debug("ATAPI_CMD_READ_CAP returned %x\n", c);
|
|
|
- if (c != 0)
|
|
|
- return;
|
|
|
+ if (blknr & 0x0000fffff0000000ULL) {
|
|
|
+ /* more than 28 bits used, use 48bit mode */
|
|
|
+ lba48 = 1;
|
|
|
+ }
|
|
|
+#endif
|
|
|
|
|
|
- debug("Read Cap: LBA %02X%02X%02X%02X blksize %02X%02X%02X%02X\n",
|
|
|
- iobuf[0], iobuf[1], iobuf[2], iobuf[3],
|
|
|
- iobuf[4], iobuf[5], iobuf[6], iobuf[7]);
|
|
|
+ ide_led(DEVICE_LED(device), 1); /* LED on */
|
|
|
|
|
|
- dev_desc->lba = ((unsigned long) iobuf[0] << 24) +
|
|
|
- ((unsigned long) iobuf[1] << 16) +
|
|
|
- ((unsigned long) iobuf[2] << 8) + ((unsigned long) iobuf[3]);
|
|
|
- dev_desc->blksz = ((unsigned long) iobuf[4] << 24) +
|
|
|
- ((unsigned long) iobuf[5] << 16) +
|
|
|
- ((unsigned long) iobuf[6] << 8) + ((unsigned long) iobuf[7]);
|
|
|
- dev_desc->log2blksz = LOG2(dev_desc->blksz);
|
|
|
-#ifdef CONFIG_LBA48
|
|
|
- /* ATAPI devices cannot use 48bit addressing (ATA/ATAPI v7) */
|
|
|
- dev_desc->lba48 = 0;
|
|
|
-#endif
|
|
|
- return;
|
|
|
-}
|
|
|
+ /* Select device
|
|
|
+ */
|
|
|
+ ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
|
|
|
|
|
|
+ while (blkcnt-- > 0) {
|
|
|
+ c = ide_wait(device, IDE_TIME_OUT);
|
|
|
|
|
|
-/*
|
|
|
- * atapi_read:
|
|
|
- * we transfer only one block per command, since the multiple DRQ per
|
|
|
- * command is not yet implemented
|
|
|
- */
|
|
|
-#define ATAPI_READ_MAX_BYTES 2048 /* we read max 2kbytes */
|
|
|
-#define ATAPI_READ_BLOCK_SIZE 2048 /* assuming CD part */
|
|
|
-#define ATAPI_READ_MAX_BLOCK (ATAPI_READ_MAX_BYTES/ATAPI_READ_BLOCK_SIZE)
|
|
|
+ if (c & ATA_STAT_BUSY) {
|
|
|
+ printf("IDE read: device %d not ready\n", device);
|
|
|
+ goto WR_OUT;
|
|
|
+ }
|
|
|
+#ifdef CONFIG_LBA48
|
|
|
+ if (lba48) {
|
|
|
+ /* write high bits */
|
|
|
+ ide_outb(device, ATA_SECT_CNT, 0);
|
|
|
+ ide_outb(device, ATA_LBA_LOW, (blknr >> 24) & 0xFF);
|
|
|
+#ifdef CONFIG_SYS_64BIT_LBA
|
|
|
+ ide_outb(device, ATA_LBA_MID, (blknr >> 32) & 0xFF);
|
|
|
+ ide_outb(device, ATA_LBA_HIGH, (blknr >> 40) & 0xFF);
|
|
|
+#else
|
|
|
+ ide_outb(device, ATA_LBA_MID, 0);
|
|
|
+ ide_outb(device, ATA_LBA_HIGH, 0);
|
|
|
+#endif
|
|
|
+ }
|
|
|
+#endif
|
|
|
+ ide_outb(device, ATA_SECT_CNT, 1);
|
|
|
+ ide_outb(device, ATA_LBA_LOW, (blknr >> 0) & 0xFF);
|
|
|
+ ide_outb(device, ATA_LBA_MID, (blknr >> 8) & 0xFF);
|
|
|
+ ide_outb(device, ATA_LBA_HIGH, (blknr >> 16) & 0xFF);
|
|
|
|
|
|
-ulong atapi_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
|
|
|
- void *buffer)
|
|
|
-{
|
|
|
- int device = block_dev->devnum;
|
|
|
- ulong n = 0;
|
|
|
- unsigned char ccb[12]; /* Command descriptor block */
|
|
|
- ulong cnt;
|
|
|
+#ifdef CONFIG_LBA48
|
|
|
+ if (lba48) {
|
|
|
+ ide_outb(device, ATA_DEV_HD,
|
|
|
+ ATA_LBA | ATA_DEVICE(device));
|
|
|
+ ide_outb(device, ATA_COMMAND, ATA_CMD_WRITE_EXT);
|
|
|
|
|
|
- debug("atapi_read dev %d start " LBAF " blocks " LBAF
|
|
|
- " buffer at %lX\n", device, blknr, blkcnt, (ulong) buffer);
|
|
|
+ } else
|
|
|
+#endif
|
|
|
+ {
|
|
|
+ ide_outb(device, ATA_DEV_HD, ATA_LBA |
|
|
|
+ ATA_DEVICE(device) | ((blknr >> 24) & 0xF));
|
|
|
+ ide_outb(device, ATA_COMMAND, ATA_CMD_WRITE);
|
|
|
+ }
|
|
|
|
|
|
- do {
|
|
|
- if (blkcnt > ATAPI_READ_MAX_BLOCK)
|
|
|
- cnt = ATAPI_READ_MAX_BLOCK;
|
|
|
- else
|
|
|
- cnt = blkcnt;
|
|
|
+ udelay(50);
|
|
|
|
|
|
- ccb[0] = ATAPI_CMD_READ_12;
|
|
|
- ccb[1] = 0; /* reserved */
|
|
|
- ccb[2] = (unsigned char) (blknr >> 24) & 0xFF; /* MSB Block */
|
|
|
- ccb[3] = (unsigned char) (blknr >> 16) & 0xFF; /* */
|
|
|
- ccb[4] = (unsigned char) (blknr >> 8) & 0xFF;
|
|
|
- ccb[5] = (unsigned char) blknr & 0xFF; /* LSB Block */
|
|
|
- ccb[6] = (unsigned char) (cnt >> 24) & 0xFF; /* MSB Block cnt */
|
|
|
- ccb[7] = (unsigned char) (cnt >> 16) & 0xFF;
|
|
|
- ccb[8] = (unsigned char) (cnt >> 8) & 0xFF;
|
|
|
- ccb[9] = (unsigned char) cnt & 0xFF; /* LSB Block */
|
|
|
- ccb[10] = 0; /* reserved */
|
|
|
- ccb[11] = 0; /* reserved */
|
|
|
+ /* can't take over 500 ms */
|
|
|
+ c = ide_wait(device, IDE_TIME_OUT);
|
|
|
|
|
|
- if (atapi_issue_autoreq(device, ccb, 12,
|
|
|
- (unsigned char *) buffer,
|
|
|
- cnt * ATAPI_READ_BLOCK_SIZE)
|
|
|
- == 0xFF) {
|
|
|
- return n;
|
|
|
+ if ((c & (ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR)) !=
|
|
|
+ ATA_STAT_DRQ) {
|
|
|
+ printf("Error (no IRQ) dev %d blk " LBAF
|
|
|
+ ": status %#02x\n", device, blknr, c);
|
|
|
+ goto WR_OUT;
|
|
|
}
|
|
|
- n += cnt;
|
|
|
- blkcnt -= cnt;
|
|
|
- blknr += cnt;
|
|
|
- buffer += (cnt * ATAPI_READ_BLOCK_SIZE);
|
|
|
- } while (blkcnt > 0);
|
|
|
+
|
|
|
+ ide_output_data(device, buffer, ATA_SECTORWORDS);
|
|
|
+ c = ide_inb(device, ATA_STATUS); /* clear IRQ */
|
|
|
+ ++n;
|
|
|
+ ++blknr;
|
|
|
+ buffer += ATA_BLOCKSIZE;
|
|
|
+ }
|
|
|
+WR_OUT:
|
|
|
+ ide_led(DEVICE_LED(device), 0); /* LED off */
|
|
|
return n;
|
|
|
}
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
-#endif /* CONFIG_ATAPI */
|
|
|
+#if defined(CONFIG_OF_IDE_FIXUP)
|
|
|
+int ide_device_present(int dev)
|
|
|
+{
|
|
|
+ if (dev >= CONFIG_SYS_IDE_MAXBUS)
|
|
|
+ return 0;
|
|
|
+ return ide_dev_desc[dev].type == DEV_TYPE_UNKNOWN ? 0 : 1;
|
|
|
+}
|
|
|
+#endif
|
|
|
+/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
U_BOOT_CMD(ide, 5, 1, do_ide,
|
|
|
"IDE sub-system",
|