/*
- * (C) Copyright 2000-2002
+ * (C) Copyright 2000-2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
#ifdef CONFIG_8xx
# include <mpc8xx.h>
#endif
+#ifdef CONFIG_MPC5xxx
+#include <mpc5xxx.h>
+#endif
#include <ide.h>
#include <ata.h>
-#include <cmd_ide.h>
-#include <cmd_disk.h>
#ifdef CONFIG_STATUS_LED
# include <status_led.h>
#endif
+#ifndef __PPC__
+#include <asm/io.h>
+#ifdef __MIPS__
+/* Macros depend on this variable */
+static unsigned long mips_io_port_base = 0;
+#endif
+#endif
#ifdef CONFIG_SHOW_BOOT_PROGRESS
# include <status_led.h>
# define SHOW_BOOT_PROGRESS(arg)
#endif
+#ifdef __PPC__
+# define EIEIO __asm__ volatile ("eieio")
+#else
+# define EIEIO /* nothing */
+#endif
#undef IDE_DEBUG
+
#ifdef IDE_DEBUG
#define PRINTF(fmt,args...) printf (fmt ,##args)
#else
#if (CONFIG_COMMANDS & CFG_CMD_IDE)
+#ifdef CONFIG_IDE_8xx_DIRECT
/* Timings for IDE Interface
*
* SETUP / LENGTH / HOLD - cycles valid for 50 MHz clk
#define PCMCIA_MK_CLKS( t, T ) (( (t) * (T) + 999U ) / 1000U )
+#endif /* CONFIG_IDE_8xx_DIRECT */
+
/* ------------------------------------------------------------------------- */
/* Current I/O Device */
#endif
};
+
#define ATA_CURR_BASE(dev) (CFG_ATA_BASE_ADDR+ide_bus_offset[IDE_BUS(dev)])
+#ifndef CONFIG_AMIGAONEG3SE
static int ide_bus_ok[CFG_IDE_MAXBUS];
+#else
+static int ide_bus_ok[CFG_IDE_MAXBUS] = {0,};
+#endif
-static block_dev_desc_t ide_dev_desc[CFG_IDE_MAXDEVICE];
+block_dev_desc_t ide_dev_desc[CFG_IDE_MAXDEVICE];
/* ------------------------------------------------------------------------- */
#ifdef CONFIG_IDE_LED
+#if !defined(CONFIG_KUP4K) && !defined(CONFIG_KUP4X) &&!defined(CONFIG_BMS2003) &&!defined(CONFIG_CPC45)
static void ide_led (uchar led, uchar status);
#else
+extern void ide_led (uchar led, uchar status);
+#endif
+#else
+#ifndef CONFIG_AMIGAONEG3SE
#define ide_led(a,b) /* dummy */
+#else
+extern void ide_led(uchar led, uchar status);
+#define LED_IDE1 1
+#define LED_IDE2 2
+#define CONFIG_IDE_LED 1
+#define DEVICE_LED(x) 1
+#endif
#endif
#ifdef CONFIG_IDE_RESET
#define IDE_SPIN_UP_TIME_OUT 5000 /* 5 sec spin-up timeout */
-static void __inline__ outb(int dev, int port, unsigned char val);
-static unsigned char __inline__ inb(int dev, int port);
-static void input_swap_data(int dev, ulong *sect_buf, int words);
+static void __inline__ ide_outb(int dev, int port, unsigned char val);
+static unsigned char __inline__ ide_inb(int dev, int port);
static void input_data(int dev, ulong *sect_buf, int words);
static void output_data(int dev, ulong *sect_buf, int words);
static void ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len);
#ifdef CONFIG_ATAPI
static void atapi_inquiry(block_dev_desc_t *dev_desc);
-ulong atapi_read (int device, ulong blknr, ulong blkcnt, ulong *buffer);
+ulong atapi_read (int device, lbaint_t blknr, ulong blkcnt, ulong *buffer);
#endif
#ifdef CONFIG_IDE_8xx_DIRECT
static void set_pcmcia_timing (int pmode);
-#else
-#define set_pcmcia_timing(a) /* dummy */
#endif
/* ------------------------------------------------------------------------- */
if (strcmp(argv[1],"read") == 0) {
ulong addr = simple_strtoul(argv[2], NULL, 16);
- ulong blk = simple_strtoul(argv[3], NULL, 16);
ulong cnt = simple_strtoul(argv[4], NULL, 16);
ulong n;
+#ifdef CFG_64BIT_STRTOUL
+ lbaint_t blk = simple_strtoull(argv[3], NULL, 16);
+
+ printf ("\nIDE read: device %d block # %qd, 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
n = ide_dev_desc[curr_device].block_read (curr_device,
blk, cnt,
}
} else if (strcmp(argv[1],"write") == 0) {
ulong addr = simple_strtoul(argv[2], NULL, 16);
- ulong blk = simple_strtoul(argv[3], NULL, 16);
ulong cnt = simple_strtoul(argv[4], NULL, 16);
ulong n;
+#ifdef CFG_64BIT_STRTOUL
+ lbaint_t blk = simple_strtoull(argv[3], NULL, 16);
+
+ printf ("\nIDE write: device %d block # %qd, count %ld ... ",
+ curr_device, blk, cnt);
+#else
+ 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 (curr_device, blk, cnt, (ulong *)addr);
SHOW_BOOT_PROGRESS (-1);
return 1;
}
- if (strncmp(info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) {
+ if ((strncmp(info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) &&
+ (strncmp(info.type, BOOT_PART_COMP, sizeof(info.type)) != 0)) {
printf ("\n** Invalid partition type \"%.32s\""
" (expect \"" BOOT_PART_TYPE "\")\n",
info.type);
void ide_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_IDE_8xx_DIRECT
+ DECLARE_GLOBAL_DATA_PTR;
volatile immap_t *immr = (immap_t *)CFG_IMMR;
volatile pcmconf8xx_t *pcmp = &(immr->im_pcmcia);
#endif
unsigned char c;
int i, bus;
+#ifdef CONFIG_AMIGAONEG3SE
+ unsigned int max_bus_scan;
+ unsigned int ata_reset_time;
+ char *s;
+#endif
+#ifdef CONFIG_IDE_8xx_PCCARD
+ extern int pcmcia_on (void);
+ extern int ide_devices_found; /* Initialized in check_ide_device() */
+#endif /* CONFIG_IDE_8xx_PCCARD */
+
+#ifdef CONFIG_IDE_PREINIT
+ extern int ide_preinit (void);
+ WATCHDOG_RESET();
+
+ if (ide_preinit ()) {
+ puts ("ide_preinit failed\n");
+ return;
+ }
+#endif /* CONFIG_IDE_PREINIT */
#ifdef CONFIG_IDE_8xx_PCCARD
extern int pcmcia_on (void);
+ extern int ide_devices_found; /* Initialized in check_ide_device() */
WATCHDOG_RESET();
+ ide_devices_found = 0;
/* initialize the PCMCIA IDE adapter card */
- if (pcmcia_on())
+ pcmcia_on();
+ if (!ide_devices_found)
return;
udelay (1000000); /* 1 s */
#endif /* CONFIG_IDE_8xx_PCCARD */
WATCHDOG_RESET();
+#ifdef CONFIG_IDE_8xx_DIRECT
/* Initialize PIO timing tables */
for (i=0; i <= IDE_MAX_PIO_MODE; ++i) {
pio_config_clk[i].t_setup = PCMCIA_MK_CLKS(pio_config_ns[i].t_setup,
pio_config_ns[i].t_length, pio_config_clk[i].t_length,
pio_config_ns[i].t_hold, pio_config_clk[i].t_hold);
}
+#endif /* CONFIG_IDE_8xx_DIRECT */
/* Reset the IDE just to be sure.
* Light LED's to show
#ifdef CONFIG_IDE_8xx_DIRECT
/* PCMCIA / IDE initialization for common mem space */
pcmp->pcmc_pgcrb = 0;
-#endif
/* start in PIO mode 0 - most relaxed timings */
pio_mode = 0;
set_pcmcia_timing (pio_mode);
+#endif /* CONFIG_IDE_8xx_DIRECT */
/*
* Wait for IDE to get ready.
* According to spec, this can take up to 31 seconds!
*/
+#ifndef CONFIG_AMIGAONEG3SE
for (bus=0; bus<CFG_IDE_MAXBUS; ++bus) {
int dev = bus * (CFG_IDE_MAXDEVICE / CFG_IDE_MAXBUS);
+#else
+ s = getenv("ide_maxbus");
+ if (s)
+ max_bus_scan = simple_strtol(s, NULL, 10);
+ else
+ max_bus_scan = CFG_IDE_MAXBUS;
+
+ for (bus=0; bus<max_bus_scan; ++bus) {
+ int dev = bus * (CFG_IDE_MAXDEVICE / max_bus_scan);
+#endif
+#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);
ide_bus_ok[bus] = 0;
/* Select device
*/
udelay (100000); /* 100 ms */
- outb (dev, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(dev));
+ ide_outb (dev, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(dev));
udelay (100000); /* 100 ms */
-
+#ifdef CONFIG_AMIGAONEG3SE
+ ata_reset_time = ATA_RESET_TIME;
+ s = getenv("ide_reset_timeout");
+ if (s) ata_reset_time = 2*simple_strtol(s, NULL, 10);
+#endif
i = 0;
do {
udelay (10000); /* 10 ms */
- c = inb (dev, ATA_STATUS);
+ c = ide_inb (dev, ATA_STATUS);
i++;
+#ifdef CONFIG_AMIGAONEG3SE
+ if (i > (ata_reset_time * 100)) {
+#else
if (i > (ATA_RESET_TIME * 100)) {
+#endif
puts ("** Timeout **\n");
ide_led ((LED_IDE1 | LED_IDE2), 0); /* LED's off */
+#ifdef CONFIG_AMIGAONEG3SE
+ /* If this is the second bus, the first one was OK */
+ if (bus != 0) {
+ ide_bus_ok[bus] = 0;
+ goto skip_bus;
+ }
+#endif
return;
}
if ((i >= 100) && ((i%100)==0)) {
}
WATCHDOG_RESET();
}
+
+#ifdef CONFIG_AMIGAONEG3SE
+ skip_bus:
+#endif
putc ('\n');
ide_led ((LED_IDE1 | LED_IDE2), 0); /* LED's off */
#ifdef CONFIG_IDE_LED
int led = (IDE_BUS(i) == 0) ? LED_IDE1 : LED_IDE2;
#endif
+ ide_dev_desc[i].type=DEV_TYPE_UNKNOWN;
ide_dev_desc[i].if_type=IF_TYPE_IDE;
ide_dev_desc[i].dev=i;
ide_dev_desc[i].part_type=PART_TYPE_UNKNOWN;
/* ------------------------------------------------------------------------- */
+#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
static void __inline__
-outb(int dev, int port, unsigned char val)
+ide_outb(int dev, int port, unsigned char val)
{
+ PRINTF ("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n",
+ dev, port, val, (ATA_CURR_BASE(dev)+port));
+
/* Ensure I/O operations complete */
- __asm__ volatile("eieio");
+ EIEIO;
*((uchar *)(ATA_CURR_BASE(dev)+port)) = val;
-#if 0
- printf ("OUTB: 0x%08lx <== 0x%02x\n", ATA_CURR_BASE(dev)+port, val);
-#endif
}
+#else /* ! __PPC__ */
+static void __inline__
+ide_outb(int dev, int port, unsigned char val)
+{
+ outb(val, ATA_CURR_BASE(dev)+port);
+}
+#endif /* __PPC__ */
+
+#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
static unsigned char __inline__
-inb(int dev, int port)
+ide_inb(int dev, int port)
{
uchar val;
/* Ensure I/O operations complete */
- __asm__ volatile("eieio");
+ EIEIO;
val = *((uchar *)(ATA_CURR_BASE(dev)+port));
-#if 0
- printf ("INB: 0x%08lx ==> 0x%02x\n", ATA_CURR_BASE(dev)+port, val);
-#endif
+ PRINTF ("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n",
+ dev, port, (ATA_CURR_BASE(dev)+port), val);
return (val);
}
+#else /* ! __PPC__ */
+static unsigned char __inline__
+ide_inb(int dev, int port)
+{
+ return inb(ATA_CURR_BASE(dev)+port);
+}
+#endif /* __PPC__ */
-__inline__ unsigned ld_le16(const volatile unsigned short *addr)
+#ifdef __PPC__
+# ifdef CONFIG_AMIGAONEG3SE
+static void
+output_data_short(int dev, ulong *sect_buf, int words)
{
- unsigned val;
+ ushort *dbuf;
+ volatile ushort *pbuf;
- __asm__ __volatile__ ("lhbrx %0,0,%1" : "=r"(val) : "r"(addr), "m"(*addr));
- return val;
+ pbuf = (ushort *)(ATA_CURR_BASE(dev)+ATA_DATA_REG);
+ dbuf = (ushort *)sect_buf;
+ while (words--) {
+ EIEIO;
+ *pbuf = *dbuf++;
+ EIEIO;
+ }
+
+ if (words&1)
+ *pbuf = 0;
}
+# endif /* CONFIG_AMIGAONEG3SE */
+#endif /* __PPC_ */
+/* We only need to swap data if we are running on a big endian cpu. */
+/* But Au1x00 cpu:s already swaps data in big endian mode! */
+#if defined(__LITTLE_ENDIAN) || defined(CONFIG_AU1X00)
+#define input_swap_data(x,y,z) input_data(x,y,z)
+#else
static void
input_swap_data(int dev, ulong *sect_buf, int words)
{
+#ifndef CONFIG_HMI10
volatile ushort *pbuf = (ushort *)(ATA_CURR_BASE(dev)+ATA_DATA_REG);
ushort *dbuf = (ushort *)sect_buf;
+ PRINTF("in input swap data base for read is %lx\n", (unsigned long) pbuf);
+
while (words--) {
*dbuf++ = ld_le16(pbuf);
*dbuf++ = ld_le16(pbuf);
}
+#else /* CONFIG_HMI10 */
+ uchar i;
+ volatile uchar *pbuf_even = (uchar *)(ATA_CURR_BASE(dev)+ATA_DATA_EVEN);
+ volatile uchar *pbuf_odd = (uchar *)(ATA_CURR_BASE(dev)+ATA_DATA_ODD);
+ ushort *dbuf = (ushort *)sect_buf;
+
+ while (words--) {
+ for (i=0; i<2; i++) {
+ *(((uchar *)(dbuf)) + 1) = *pbuf_even;
+ *(uchar *)dbuf = *pbuf_odd;
+ dbuf+=1;
+ }
+ }
+#endif /* CONFIG_HMI10 */
}
+#endif /* __LITTLE_ENDIAN || CONFIG_AU1X00 */
+
+#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
static void
output_data(int dev, ulong *sect_buf, int words)
{
+#ifndef CONFIG_HMI10
ushort *dbuf;
volatile ushort *pbuf;
pbuf = (ushort *)(ATA_CURR_BASE(dev)+ATA_DATA_REG);
dbuf = (ushort *)sect_buf;
while (words--) {
- __asm__ volatile ("eieio");
+ EIEIO;
*pbuf = *dbuf++;
- __asm__ volatile ("eieio");
+ EIEIO;
*pbuf = *dbuf++;
}
+#else /* CONFIG_HMI10 */
+ uchar *dbuf;
+ volatile uchar *pbuf_even;
+ volatile uchar *pbuf_odd;
+
+ pbuf_even = (uchar *)(ATA_CURR_BASE(dev)+ATA_DATA_EVEN);
+ pbuf_odd = (uchar *)(ATA_CURR_BASE(dev)+ATA_DATA_ODD);
+ dbuf = (uchar *)sect_buf;
+ while (words--) {
+ EIEIO;
+ *pbuf_even = *dbuf++;
+ EIEIO;
+ *pbuf_odd = *dbuf++;
+ EIEIO;
+ *pbuf_even = *dbuf++;
+ EIEIO;
+ *pbuf_odd = *dbuf++;
+ }
+#endif /* CONFIG_HMI10 */
}
+#else /* ! __PPC__ */
+static void
+output_data(int dev, ulong *sect_buf, int words)
+{
+ outsw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, words<<1);
+}
+#endif /* __PPC__ */
+#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
static void
input_data(int dev, ulong *sect_buf, int words)
{
+#ifndef CONFIG_HMI10
ushort *dbuf;
volatile ushort *pbuf;
pbuf = (ushort *)(ATA_CURR_BASE(dev)+ATA_DATA_REG);
dbuf = (ushort *)sect_buf;
+
+ PRINTF("in input data base for read is %lx\n", (unsigned long) pbuf);
+
while (words--) {
- __asm__ volatile ("eieio");
+ EIEIO;
*dbuf++ = *pbuf;
- __asm__ volatile ("eieio");
+ EIEIO;
*dbuf++ = *pbuf;
}
+#else /* CONFIG_HMI10 */
+ uchar *dbuf;
+ volatile uchar *pbuf_even;
+ volatile uchar *pbuf_odd;
+
+ pbuf_even = (uchar *)(ATA_CURR_BASE(dev)+ATA_DATA_EVEN);
+ pbuf_odd = (uchar *)(ATA_CURR_BASE(dev)+ATA_DATA_ODD);
+ dbuf = (uchar *)sect_buf;
+ while (words--) {
+ EIEIO;
+ EIEIO;
+ *dbuf++ = *pbuf_even;
+ EIEIO;
+ EIEIO;
+ *dbuf++ = *pbuf_odd;
+ EIEIO;
+ EIEIO;
+ *dbuf++ = *pbuf_even;
+ EIEIO;
+ EIEIO;
+ *dbuf++ = *pbuf_odd;
+ }
+#endif /* CONFIG_HMI10 */
+}
+#else /* ! __PPC__ */
+static void
+input_data(int dev, ulong *sect_buf, int words)
+{
+ insw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, words << 1);
+}
+
+#endif /* __PPC__ */
+
+#ifdef CONFIG_AMIGAONEG3SE
+static void
+input_data_short(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;
+ while (words--) {
+ EIEIO;
+ *dbuf++ = *pbuf;
+ EIEIO;
+ }
+
+ if (words&1) {
+ ushort dummy;
+ dummy = *pbuf;
+ }
}
+#endif
/* -------------------------------------------------------------------------
*/
unsigned char c;
hd_driveid_t *iop = (hd_driveid_t *)iobuf;
+#ifdef CONFIG_AMIGAONEG3SE
+ int max_bus_scan;
+ char *s;
+#endif
+#ifdef CONFIG_ATAPI
+ int retries = 0;
+ int do_retry = 0;
+#endif
+
#if 0
int mode, cycle_time;
#endif
device=dev_desc->dev;
printf (" Device %d: ", device);
+#ifdef CONFIG_AMIGAONEG3SE
+ s = getenv("ide_maxbus");
+ if (s) {
+ max_bus_scan = simple_strtol(s, NULL, 10);
+ } else {
+ max_bus_scan = CFG_IDE_MAXBUS;
+ }
+ if (device >= max_bus_scan*2) {
+ dev_desc->type=DEV_TYPE_UNKNOWN;
+ return;
+ }
+#endif
+
ide_led (DEVICE_LED(device), 1); /* LED on */
/* Select device
*/
- outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
+ ide_outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
dev_desc->if_type=IF_TYPE_IDE;
#ifdef CONFIG_ATAPI
+
+ do_retry = 0;
+ retries = 0;
+
+ /* Warning: This will be tricky to read */
+ while (retries <= 1) {
/* check signature */
- if ((inb(device,ATA_SECT_CNT)==0x01) &&
- (inb(device,ATA_SECT_NUM)==0x01) &&
- (inb(device,ATA_CYL_LOW)==0x14) &&
- (inb(device,ATA_CYL_HIGH)==0xEB)) {
+ if ((ide_inb(device,ATA_SECT_CNT) == 0x01) &&
+ (ide_inb(device,ATA_SECT_NUM) == 0x01) &&
+ (ide_inb(device,ATA_CYL_LOW) == 0x14) &&
+ (ide_inb(device,ATA_CYL_HIGH) == 0xEB)) {
/* ATAPI Signature found */
dev_desc->if_type=IF_TYPE_ATAPI;
/* Start Ident Command
*/
- outb (device, ATA_COMMAND, ATAPI_CMD_IDENT);
+ ide_outb (device, ATA_COMMAND, ATAPI_CMD_IDENT);
/*
* Wait for completion - ATAPI devices need more time
* to become ready
*/
c = ide_wait (device, ATAPI_TIME_OUT);
- }
- else
+ } else
#endif
{
/* Start Ident Command
*/
- outb (device, ATA_COMMAND, ATA_CMD_IDENT);
+ ide_outb (device, ATA_COMMAND, ATA_CMD_IDENT);
/* Wait for completion
*/
if (((c & ATA_STAT_DRQ) == 0) ||
((c & (ATA_STAT_FAULT|ATA_STAT_ERR)) != 0) ) {
- dev_desc->type=DEV_TYPE_UNKNOWN;
+#ifdef CONFIG_ATAPI
+#ifdef CONFIG_AMIGAONEG3SE
+ s = getenv("ide_doreset");
+ if (s && strcmp(s, "on") == 0)
+#endif
+ {
+ /* Need to soft reset the device in case it's an ATAPI... */
+ PRINTF("Retrying...\n");
+ ide_outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
+ udelay(100000);
+ ide_outb (device, ATA_COMMAND, 0x08);
+ udelay (500000); /* 500 ms */
+ }
+ /* Select device
+ */
+ ide_outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
+ retries++;
+#else
return;
+#endif
}
+#ifdef CONFIG_ATAPI
+ else
+ break;
+ } /* see above - ugly to read */
+
+ if (retries == 2) /* Not found */
+ return;
+#endif
input_swap_data (device, iobuf, ATA_SECTORWORDS);
ident_cpy (dev_desc->revision, iop->fw_rev, sizeof(dev_desc->revision));
ident_cpy (dev_desc->vendor, iop->model, sizeof(dev_desc->vendor));
ident_cpy (dev_desc->product, iop->serial_no, sizeof(dev_desc->product));
+#ifdef __LITTLE_ENDIAN
+ /*
+ * firmware revision and model number have Big Endian Byte
+ * order in Word. Convert both to little endian.
+ *
+ * See CF+ and CompactFlash Specification Revision 2.0:
+ * 6.2.1.6: Identfy Drive, Table 39 for more details
+ */
+
+ strswab (dev_desc->revision);
+ strswab (dev_desc->vendor);
+#endif /* __LITTLE_ENDIAN */
if ((iop->config & 0x0080)==0x0080)
dev_desc->removable = 1;
}
#endif /* CONFIG_ATAPI */
+#ifdef __BIG_ENDIAN
/* swap shorts */
dev_desc->lba = (iop->lba_capacity << 16) | (iop->lba_capacity >> 16);
+#else /* ! __BIG_ENDIAN */
+ /*
+ * do not swap shorts on little endian
+ *
+ * See CF+ and CompactFlash Specification Revision 2.0:
+ * 6.2.1.6: Identfy Drive, Table 39, Word Address 57-58 for details.
+ */
+ dev_desc->lba = iop->lba_capacity;
+#endif /* __BIG_ENDIAN */
+
+#ifdef CONFIG_LBA48
+ if (iop->command_set_2 & 0x0400) { /* LBA 48 support */
+ dev_desc->lba48 = 1;
+ dev_desc->lba = (unsigned long long)iop->lba48_capacity[0] |
+ ((unsigned long long)iop->lba48_capacity[1] << 16) |
+ ((unsigned long long)iop->lba48_capacity[2] << 32) |
+ ((unsigned long long)iop->lba48_capacity[3] << 48);
+ } else {
+ dev_desc->lba48 = 0;
+ }
+#endif /* CONFIG_LBA48 */
/* assuming HD */
dev_desc->type=DEV_TYPE_HARDDISK;
dev_desc->blksz=ATA_BLOCKSIZE;
#if 0 /* only used to test the powersaving mode,
* if enabled, the drive goes after 5 sec
* in standby mode */
- outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
+ ide_outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
c = ide_wait (device, IDE_TIME_OUT);
- outb (device, ATA_SECT_CNT, 1);
- outb (device, ATA_LBA_LOW, 0);
- outb (device, ATA_LBA_MID, 0);
- outb (device, ATA_LBA_HIGH, 0);
- outb (device, ATA_DEV_HD, ATA_LBA |
+ ide_outb (device, ATA_SECT_CNT, 1);
+ ide_outb (device, ATA_LBA_LOW, 0);
+ ide_outb (device, ATA_LBA_MID, 0);
+ ide_outb (device, ATA_LBA_HIGH, 0);
+ ide_outb (device, ATA_DEV_HD, ATA_LBA |
ATA_DEVICE(device));
- outb (device, ATA_COMMAND, 0xe3);
+ ide_outb (device, ATA_COMMAND, 0xe3);
udelay (50);
c = ide_wait (device, IDE_TIME_OUT); /* can't take over 500 ms */
#endif
/* ------------------------------------------------------------------------- */
-ulong ide_read (int device, ulong blknr, ulong blkcnt, ulong *buffer)
+ulong ide_read (int device, lbaint_t blknr, ulong blkcnt, ulong *buffer)
{
ulong n = 0;
unsigned char c;
unsigned char pwrsave=0; /* power save */
+#ifdef CONFIG_LBA48
+ unsigned char lba48 = 0;
- PRINTF ("ide_read dev %d start %lX, blocks %lX buffer at %lX\n",
+ if (blknr & 0x0000fffff0000000) {
+ /* more than 28 bits used, use 48bit mode */
+ lba48 = 1;
+ }
+#endif
+ PRINTF ("ide_read dev %d start %qX, blocks %lX buffer at %lX\n",
device, blknr, blkcnt, (ulong)buffer);
ide_led (DEVICE_LED(device), 1); /* LED on */
/* Select device
*/
- outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
+ ide_outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
c = ide_wait (device, IDE_TIME_OUT);
if (c & ATA_STAT_BUSY) {
/* first check if the drive is in Powersaving mode, if yes,
* increase the timeout value */
- outb (device, ATA_COMMAND, ATA_CMD_CHK_PWR);
+ ide_outb (device, ATA_COMMAND, ATA_CMD_CHK_PWR);
udelay (50);
c = ide_wait (device, IDE_TIME_OUT); /* can't take over 500 ms */
if ((c & ATA_STAT_ERR) == ATA_STAT_ERR) {
printf ("No Powersaving mode %X\n", c);
} else {
- c = inb(device,ATA_SECT_CNT);
+ c = ide_inb(device,ATA_SECT_CNT);
PRINTF("Powersaving %02X\n",c);
if(c==0)
pwrsave=1;
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);
+ ide_outb (device, ATA_LBA_MID, (blknr >> 32) & 0xFF);
+ ide_outb (device, ATA_LBA_HIGH, (blknr >> 40) & 0xFF);
+ }
+#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);
- outb (device, ATA_SECT_CNT, 1);
- outb (device, ATA_LBA_LOW, (blknr >> 0) & 0xFF);
- outb (device, ATA_LBA_MID, (blknr >> 8) & 0xFF);
- outb (device, ATA_LBA_HIGH, (blknr >> 16) & 0xFF);
- outb (device, ATA_DEV_HD, ATA_LBA |
- ATA_DEVICE(device) |
- ((blknr >> 24) & 0xF) );
- outb (device, ATA_COMMAND, ATA_CMD_READ);
+ } else
+#endif
+ {
+ ide_outb (device, ATA_DEV_HD, ATA_LBA |
+ ATA_DEVICE(device) |
+ ((blknr >> 24) & 0xF) );
+ ide_outb (device, ATA_COMMAND, ATA_CMD_READ);
+ }
udelay (50);
}
if ((c&(ATA_STAT_DRQ|ATA_STAT_BUSY|ATA_STAT_ERR)) != ATA_STAT_DRQ) {
- printf ("Error (no IRQ) dev %d blk %ld: status 0x%02x\n",
+#if defined(CFG_64BIT_LBA) && defined(CFG_64BIT_VSPRINTF)
+ printf ("Error (no IRQ) dev %d blk %qd: status 0x%02x\n",
device, blknr, c);
+#else
+ printf ("Error (no IRQ) dev %d blk %ld: status 0x%02x\n",
+ device, (ulong)blknr, c);
+#endif
break;
}
input_data (device, buffer, ATA_SECTORWORDS);
- (void) inb (device, ATA_STATUS); /* clear IRQ */
+ (void) ide_inb (device, ATA_STATUS); /* clear IRQ */
++n;
++blknr;
/* ------------------------------------------------------------------------- */
-ulong ide_write (int device, ulong blknr, ulong blkcnt, ulong *buffer)
+ulong ide_write (int device, lbaint_t blknr, ulong blkcnt, ulong *buffer)
{
ulong n = 0;
unsigned char c;
+#ifdef CONFIG_LBA48
+ unsigned char lba48 = 0;
+
+ if (blknr & 0x0000fffff0000000) {
+ /* more than 28 bits used, use 48bit mode */
+ lba48 = 1;
+ }
+#endif
ide_led (DEVICE_LED(device), 1); /* LED on */
/* Select device
*/
- outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
+ ide_outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
while (blkcnt-- > 0) {
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);
+ ide_outb (device, ATA_LBA_MID, (blknr >> 32) & 0xFF);
+ ide_outb (device, ATA_LBA_HIGH, (blknr >> 40) & 0xFF);
+ }
+#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);
- outb (device, ATA_SECT_CNT, 1);
- outb (device, ATA_LBA_LOW, (blknr >> 0) & 0xFF);
- outb (device, ATA_LBA_MID, (blknr >> 8) & 0xFF);
- outb (device, ATA_LBA_HIGH, (blknr >> 16) & 0xFF);
- outb (device, ATA_DEV_HD, ATA_LBA |
- ATA_DEVICE(device) |
- ((blknr >> 24) & 0xF) );
- outb (device, ATA_COMMAND, ATA_CMD_WRITE);
+#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);
+
+ } else
+#endif
+ {
+ ide_outb (device, ATA_DEV_HD, ATA_LBA |
+ ATA_DEVICE(device) |
+ ((blknr >> 24) & 0xF) );
+ ide_outb (device, ATA_COMMAND, ATA_CMD_WRITE);
+ }
udelay (50);
c = ide_wait (device, IDE_TIME_OUT); /* can't take over 500 ms */
if ((c&(ATA_STAT_DRQ|ATA_STAT_BUSY|ATA_STAT_ERR)) != ATA_STAT_DRQ) {
- printf ("Error (no IRQ) dev %d blk %ld: status 0x%02x\n",
+#if defined(CFG_64BIT_LBA) && defined(CFG_64BIT_VSPRINTF)
+ printf ("Error (no IRQ) dev %d blk %qd: status 0x%02x\n",
device, blknr, c);
+#else
+ printf ("Error (no IRQ) dev %d blk %ld: status 0x%02x\n",
+ device, (ulong)blknr, c);
+#endif
goto WR_OUT;
}
output_data (device, buffer, ATA_SECTORWORDS);
- c = inb (device, ATA_STATUS); /* clear IRQ */
+ c = ide_inb (device, ATA_STATUS); /* clear IRQ */
++n;
++blknr;
buffer += ATA_SECTORWORDS;
/*
* 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 *dest, unsigned char *src, unsigned int len)
+static void ident_cpy (unsigned char *dst, unsigned char *src, unsigned int len)
{
- int start,end;
+ unsigned char *end, *last;
- start=0;
- while (start<len) {
- if (src[start]!=' ')
- break;
- start++;
- }
- end=len-1;
- while (end>start) {
- if (src[end]!=' ')
- break;
- end--;
- }
- for ( ; start<=end; start++) {
- *dest++=src[start];
+ last = dst;
+ end = src + len - 1;
+
+ /* reserve space for '\0' */
+ if (len < 2)
+ goto OUT;
+
+ /* skip leading white space */
+ while ((*src) && (src<end) && (*src==' '))
+ ++src;
+
+ /* copy string, omitting trailing white space */
+ while ((*src) && (src<end)) {
+ *dst++ = *src;
+ if (*src++ != ' ')
+ last = dst;
}
- *dest='\0';
+OUT:
+ *last = '\0';
}
/* ------------------------------------------------------------------------- */
ulong delay = 10 * t; /* poll every 100 us */
uchar c;
- while ((c = inb(dev, ATA_STATUS)) & ATA_STAT_BUSY) {
+ while ((c = ide_inb(dev, ATA_STATUS)) & ATA_STAT_BUSY) {
udelay (100);
if (delay-- == 0) {
break;
/* ------------------------------------------------------------------------- */
-#ifdef CONFIG_IDE_LED
+#if defined(CONFIG_IDE_LED) && \
+ !defined(CONFIG_AMIGAONEG3SE)&& \
+ !defined(CONFIG_CPC45) && \
+ !defined(CONFIG_HMI10) && \
+ !defined(CONFIG_KUP4K) && \
+ !defined(CONFIG_KUP4X)
static uchar led_buffer = 0; /* Buffer for current LED status */
* ATAPI Support
*/
-
-
#undef ATAPI_DEBUG
#ifdef ATAPI_DEBUG
#define AT_PRINTF(fmt,args...)
#endif
+#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
/* since ATAPI may use commands with not 4 bytes alligned length
* we have our own transfer functions, 2 bytes alligned */
static void
output_data_shorts(int dev, ushort *sect_buf, int shorts)
{
+#ifndef CONFIG_HMI10
ushort *dbuf;
volatile ushort *pbuf;
pbuf = (ushort *)(ATA_CURR_BASE(dev)+ATA_DATA_REG);
dbuf = (ushort *)sect_buf;
+
+ PRINTF("in output data shorts base for read is %lx\n", (unsigned long) pbuf);
+
while (shorts--) {
- __asm__ volatile ("eieio");
+ EIEIO;
*pbuf = *dbuf++;
}
+#else /* CONFIG_HMI10 */
+ uchar *dbuf;
+ volatile uchar *pbuf_even;
+ volatile uchar *pbuf_odd;
+
+ pbuf_even = (uchar *)(ATA_CURR_BASE(dev)+ATA_DATA_EVEN);
+ pbuf_odd = (uchar *)(ATA_CURR_BASE(dev)+ATA_DATA_ODD);
+ while (shorts--) {
+ EIEIO;
+ *pbuf_even = *dbuf++;
+ EIEIO;
+ *pbuf_odd = *dbuf++;
+ }
+#endif /* CONFIG_HMI10 */
}
static void
input_data_shorts(int dev, ushort *sect_buf, int shorts)
{
+#ifndef CONFIG_HMI10
ushort *dbuf;
volatile ushort *pbuf;
pbuf = (ushort *)(ATA_CURR_BASE(dev)+ATA_DATA_REG);
dbuf = (ushort *)sect_buf;
+
+ PRINTF("in input data shorts base for read is %lx\n", (unsigned long) pbuf);
+
while (shorts--) {
- __asm__ volatile ("eieio");
+ EIEIO;
*dbuf++ = *pbuf;
}
+#else /* CONFIG_HMI10 */
+ uchar *dbuf;
+ volatile uchar *pbuf_even;
+ volatile uchar *pbuf_odd;
+
+ pbuf_even = (uchar *)(ATA_CURR_BASE(dev)+ATA_DATA_EVEN);
+ pbuf_odd = (uchar *)(ATA_CURR_BASE(dev)+ATA_DATA_ODD);
+ while (shorts--) {
+ EIEIO;
+ *dbuf++ = *pbuf_even;
+ EIEIO;
+ *dbuf++ = *pbuf_odd;
+ }
+#endif /* CONFIG_HMI10 */
}
+#else /* ! __PPC__ */
+static void
+output_data_shorts(int dev, ushort *sect_buf, int shorts)
+{
+ outsw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, shorts);
+}
+
+static void
+input_data_shorts(int dev, ushort *sect_buf, int shorts)
+{
+ insw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, shorts);
+}
+
+#endif /* __PPC__ */
+
/*
* Wait until (Status & mask) == res, or timeout (in ms)
* Return last status
ulong delay = 10 * t; /* poll every 100 us */
uchar c;
- c = inb(dev,ATA_DEV_CTL); /* prevents to read the status before valid */
- while (((c = inb(dev, ATA_STATUS)) & mask)
- != res) {
+ c = ide_inb(dev,ATA_DEV_CTL); /* prevents to read the status before valid */
+ 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;
*/
mask = ATA_STAT_BUSY|ATA_STAT_DRQ;
res = 0;
- outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
+#ifdef CONFIG_AMIGAONEG3SE
+# warning THF: Removed LBA mode ???
+#endif
+ 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);
goto AI_OUT;
}
/* write taskfile */
- outb (device, ATA_ERROR_REG, 0); /* no DMA, no overlaped */
- outb (device, ATA_CYL_LOW, (unsigned char)(buflen & 0xFF));
- outb (device, ATA_CYL_HIGH, (unsigned char)((buflen<<8) & 0xFF));
- outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
+ 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));
+#ifdef CONFIG_AMIGAONEG3SE
+# warning THF: Removed LBA mode ???
+#endif
+ ide_outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
- outb (device, ATA_COMMAND, ATAPI_CMD_PACKET);
+ ide_outb (device, ATA_COMMAND, ATAPI_CMD_PACKET);
udelay (50);
mask = ATA_STAT_DRQ|ATA_STAT_BUSY|ATA_STAT_ERR;
c = atapi_wait_mask(device,ATAPI_TIME_OUT,mask,res);
if ((c & mask) != res ) {
if (c & ATA_STAT_ERR) {
- err=(inb(device,ATA_ERROR_REG))>>4;
+ err=(ide_inb(device,ATA_ERROR_REG))>>4;
AT_PRINTF("atapi_issue 1 returned sense key %X status %02X\n",err,c);
} else {
printf ("ATTAPI_ISSUE: (no DRQ) after sending ccb (%x) status 0x%02x\n", ccb[0],c);
}
goto AI_OUT;
}
- n=inb(device, ATA_CYL_HIGH);
+ n=ide_inb(device, ATA_CYL_HIGH);
n<<=8;
- n+=inb(device, ATA_CYL_LOW);
+ n+=ide_inb(device, ATA_CYL_LOW);
if(n>buflen) {
printf("ERROR, transfer bytes %d requested only %d\n",n,buflen);
err=0xff;
/* we transfer shorts */
n>>=1;
/* ok now decide if it is an in or output */
- if ((inb(device, ATA_SECT_CNT)&0x02)==0) {
+ if ((ide_inb(device, ATA_SECT_CNT)&0x02)==0) {
AT_PRINTF("Write to device\n");
output_data_shorts(device,(unsigned short *)buffer,n);
} else {
res=0;
c = atapi_wait_mask(device,ATAPI_TIME_OUT,mask,res);
if ((c & ATA_STAT_ERR) == ATA_STAT_ERR) {
- err=(inb(device,ATA_ERROR_REG) >> 4);
+ err=(ide_inb(device,ATA_ERROR_REG) >> 4);
AT_PRINTF("atapi_issue 2 returned sense key %X status %X\n",err,c);
} else {
err = 0;
unsigned char res,key,asc,ascq;
int notready,unitattn;
+#ifdef CONFIG_AMIGAONEG3SE
+ char *s;
+ unsigned int timeout, retrycnt;
+
+ s = getenv("ide_cd_timeout");
+ timeout = s ? (simple_strtol(s, NULL, 10)*1000000)/5 : 0;
+
+ retrycnt = 0;
+#endif
+
unitattn=ATAPI_UNIT_ATTN;
notready=ATAPI_DRIVE_NOT_READY;
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 Legnth */
+ sense_ccb[4]=18; /* allocation Length */
res=atapi_issue(device,sense_ccb,12,sense_data,18);
key=(sense_data[2]&0xF);
AT_PRINTF("Media not present\n");
goto error;
}
+
+#ifdef CONFIG_AMIGAONEG3SE
+ if ((sense_data[2]&0xF)==0x0B) {
+ AT_PRINTF("ABORTED COMMAND...retry\n");
+ if (retrycnt++ < 4)
+ goto retry;
+ return (0xFF);
+ }
+
+ if ((sense_data[2]&0xf) == 0x02 &&
+ sense_data[12] == 0x04 &&
+ sense_data[13] == 0x01 ) {
+ AT_PRINTF("Waiting for unit to become active\n");
+ udelay(timeout);
+ if (retrycnt++ < 4)
+ goto retry;
+ return 0xFF;
+ }
+#endif /* CONFIG_AMIGAONEG3SE */
+
printf ("ERROR: Unknown Sense key %02X ASC %02X ASCQ %02X\n",key,asc,ascq);
error:
AT_PRINTF ("ERROR Sense key %02X ASC %02X ASCQ %02X\n",key,asc,ascq);
}
-
static void atapi_inquiry(block_dev_desc_t * dev_desc)
{
unsigned char ccb[12]; /* Command descriptor block */
((unsigned long)iobuf[5]<<16) +
((unsigned long)iobuf[6]<< 8) +
((unsigned long)iobuf[7]);
+#ifdef CONFIG_LBA48
+ dev_desc->lba48 = 0; /* ATAPI devices cannot use 48bit addressing (ATA/ATAPI v7) */
+#endif
return;
}
#define ATAPI_READ_BLOCK_SIZE 2048 /* assuming CD part */
#define ATAPI_READ_MAX_BLOCK ATAPI_READ_MAX_BYTES/ATAPI_READ_BLOCK_SIZE /* max blocks */
-ulong atapi_read (int device, ulong blknr, ulong blkcnt, ulong *buffer)
+ulong atapi_read (int device, lbaint_t blknr, ulong blkcnt, ulong *buffer)
{
ulong n = 0;
unsigned char ccb[12]; /* Command descriptor block */
#endif /* CONFIG_ATAPI */
+U_BOOT_CMD(
+ ide, 5, 1, do_ide,
+ "ide - IDE sub-system\n",
+ "reset - reset IDE controller\n"
+ "ide info - show available IDE devices\n"
+ "ide device [dev] - show or set current device\n"
+ "ide part [dev] - print partition table of one or all IDE devices\n"
+ "ide read addr blk# cnt\n"
+ "ide write addr blk# cnt - read/write `cnt'"
+ " blocks starting at block `blk#'\n"
+ " to/from memory address `addr'\n"
+);
+
+U_BOOT_CMD(
+ diskboot, 3, 1, do_diskboot,
+ "diskboot- boot from IDE device\n",
+ "loadAddr dev:part\n"
+);
+
#endif /* CONFIG_COMMANDS & CFG_CMD_IDE */