drop a lot of dead code, including an old winbond southbridge from our removed

ppc port, some ambiguous use of CONFIG_IDE and an unused ide driver (we dropped
the filesystems already to be used with it) (somewhat trivial)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4828 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 0 insertions, 960 deletions

diff --git a/src/pc80/ide/Config.lb b/src/pc80/ide/Config.lb
deleted file mode 100644
index 4f70fbcd4e..0000000000
--- a/src/pc80/ide/Config.lb
+++ /dev/null
@@ -1 +0,0 @@
-object ide.o
diff --git a/src/pc80/ide/ide.c b/src/pc80/ide/ide.c
deleted file mode 100644
index 3ca60ad09d..0000000000
--- a/src/pc80/ide/ide.c
+++ /dev/null
@@ -1,959 +0,0 @@
-/* Derived from Etherboot 5.1 */
-
-#include <stdlib.h>
-#include <string.h>
-#include <console/console.h>
-#include <arch/io.h>
-#include <pc80/ide.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <delay.h>
-#include <arch/byteorder.h>
-
-#define BSY_SET_DURING_SPINUP 1
-
-static unsigned short ide_base[] = {
-	IDE_BASE0,
-	IDE_BASE1, 
-	IDE_BASE2, 
-	IDE_BASE3, 
-	0
-};
-
-static struct controller controllers[IDE_MAX_CONTROLLERS];
-static struct harddisk_info harddisk_info[IDE_MAX_DRIVES];
-
-static unsigned char ide_buffer[IDE_SECTOR_SIZE];
-
-static int await_ide(int (*done)(struct controller *ctrl), 
-	struct controller *ctrl, unsigned long timeout)
-{
-	int result;
-	timeout *= 100; /* timeout was ms; finer granularity => reacts faster */
-	for(;;) {
-		result = done(ctrl);
-		if (result) {
-			return 0;
-		}
-		//poll_interruptions();
-                if (timeout-- <= 0) {
-			break;
-		}
-		udelay(10); /* Added to avoid spinning GRW */
-	}
-	printk_info("IDE time out\n");
-	return -1;
-}
-
-/* The maximum time any IDE command can last 31 seconds,
- * So if any IDE commands takes this long we know we have problems.
- */
-#define IDE_TIMEOUT (32*1000)
-
-static int not_bsy(struct controller *ctrl)
-{
-	return !(inb(IDE_REG_STATUS(ctrl)) & IDE_STATUS_BSY);
-}
-
-/* IDE drives assert BSY bit within 400 nsec when SRST is set.
- * Use 2 msec since our tick is 1 msec */
-#define IDE_RESET_PULSE 2
-
-static int bsy(struct controller *ctrl)
-{
-	return inb(IDE_REG_STATUS(ctrl)) & IDE_STATUS_BSY;
-}
-
-#if  !BSY_SET_DURING_SPINUP
-static int timeout(struct controller *ctrl)
-{
-	return 0;
-}
-#endif
-
-static void print_status(struct controller *ctrl)
-{
-	printk_debug("IDE: status=%#x, err=%#x\n",
-			inb(IDE_REG_STATUS(ctrl)), inb(IDE_REG_ERROR(ctrl)));
-}
-
-static int ide_software_reset(struct controller *ctrl)
-{
-	/* Wait a little bit in case this is immediately after
-	 * hardware reset.
-	 */
-	mdelay(2);
-	/* A software reset should not be delivered while the bsy bit
-	 * is set.  If the bsy bit does not clear in a reasonable
-	 * amount of time give up.
-	 */
-	printk_debug("Waiting for ide%d to become ready for reset... ",
-			ctrl - controllers);
-	if (await_ide(not_bsy, ctrl, IDE_TIMEOUT) < 0) {
-		printk_debug("failed\n");
-		return -1;
-	}
-	printk_debug("ok\n");
-
-	/* Disable Interrupts and reset the ide bus */
-	outb(IDE_CTRL_HD15 | IDE_CTRL_SRST | IDE_CTRL_NIEN, 
-		IDE_REG_DEVICE_CONTROL(ctrl));
-	/* If BSY bit is not asserted within 400ns, no device there */
-	if (await_ide(bsy, ctrl, IDE_RESET_PULSE) < 0) {
-		return -1;
-	}
-	outb(IDE_CTRL_HD15 | IDE_CTRL_NIEN, IDE_REG_DEVICE_CONTROL(ctrl));
-	mdelay(2);
-	if (await_ide(not_bsy, ctrl, IDE_TIMEOUT) < 0) {
-		return -1;
-	}
-	return 0;
-}
-
-static void pio_set_registers(
-	struct controller *ctrl, const struct ide_pio_command *cmd)
-{
-	uint8_t device;
-	/* Disable Interrupts */
-	outb(IDE_CTRL_HD15 | IDE_CTRL_NIEN, IDE_REG_DEVICE_CONTROL(ctrl));
-
-	/* Possibly switch selected device */
-	device = inb(IDE_REG_DEVICE(ctrl));
-	outb(cmd->device,          IDE_REG_DEVICE(ctrl));
-	if ((device & (1UL << 4)) != (cmd->device & (1UL << 4))) {
-		/* Allow time for the selected drive to switch,
-		 * The linux ide code suggests 50ms is the right
-		 * amount of time to use here.
-		 */
-		mdelay(50); 
-	}
-	outb(cmd->feature,         IDE_REG_FEATURE(ctrl));
-	if (cmd->command == IDE_CMD_READ_SECTORS_EXT) {
-		outb(cmd->sector_count2,   IDE_REG_SECTOR_COUNT(ctrl));
-		outb(cmd->lba_low2,        IDE_REG_LBA_LOW(ctrl));
-		outb(cmd->lba_mid2,        IDE_REG_LBA_MID(ctrl));
-		outb(cmd->lba_high2,       IDE_REG_LBA_HIGH(ctrl));
-	}
-	outb(cmd->sector_count,    IDE_REG_SECTOR_COUNT(ctrl));
-	outb(cmd->lba_low,         IDE_REG_LBA_LOW(ctrl));
-	outb(cmd->lba_mid,         IDE_REG_LBA_MID(ctrl));
-	outb(cmd->lba_high,        IDE_REG_LBA_HIGH(ctrl));
-	outb(cmd->command,         IDE_REG_COMMAND(ctrl));
-}
-
-
-static int pio_non_data(struct controller *ctrl, const struct ide_pio_command *cmd)
-{
-	/* Wait until the busy bit is clear */
-	if (await_ide(not_bsy, ctrl, IDE_TIMEOUT) < 0) {
-		return -1;
-	}
-
-	pio_set_registers(ctrl, cmd);
-	udelay(1);
-	if (await_ide(not_bsy, ctrl, IDE_TIMEOUT) < 0) {
-		return -1;
-	}
-	/* FIXME is there more error checking I could do here? */
-	return 0;
-}
-
-static int pio_data_in(struct controller *ctrl, 
-	const struct ide_pio_command *cmd,
-	void *buffer, size_t bytes)
-{
-	unsigned int status;
-
-	/* FIXME handle commands with multiple blocks */
-	/* Wait until the busy bit is clear */
-	if (await_ide(not_bsy, ctrl, IDE_TIMEOUT) < 0) {
-		return -1;
-	}
-
-	/* How do I tell if INTRQ is asserted? */
-	pio_set_registers(ctrl, cmd);
-	udelay(1);
-	if (await_ide(not_bsy, ctrl, IDE_TIMEOUT) < 0) {
-		return -1;
-	}
-	status = inb(IDE_REG_STATUS(ctrl));
-	if (!(status & IDE_STATUS_DRQ)) {
-		print_status(ctrl);
-		return -1;
-	}
-	insw(IDE_REG_DATA(ctrl), buffer, bytes/2);
-	status = inb(IDE_REG_STATUS(ctrl));
-	if (status & IDE_STATUS_DRQ) {
-		print_status(ctrl);
-		return -1;
-	}
-	return 0;
-}
-
-#ifdef __BIG_ENDIAN
-static int pio_data_in_sw(struct controller *ctrl, 
-	const struct ide_pio_command *cmd,
-	void *buffer, size_t bytes)
-{
-	unsigned int status;
-
-	/* FIXME handle commands with multiple blocks */
-	/* Wait until the busy bit is clear */
-	if (await_ide(not_bsy, ctrl, IDE_TIMEOUT) < 0) {
-		return -1;
-	}
-
-	/* How do I tell if INTRQ is asserted? */
-	pio_set_registers(ctrl, cmd);
-	udelay(1);
-	if (await_ide(not_bsy, ctrl, IDE_TIMEOUT) < 0) {
-		return -1;
-	}
-	status = inb(IDE_REG_STATUS(ctrl));
-	if (!(status & IDE_STATUS_DRQ)) {
-		print_status(ctrl);
-		return -1;
-	}
-	insw_ns(IDE_REG_DATA(ctrl), buffer, bytes/2);
-	status = inb(IDE_REG_STATUS(ctrl));
-	if (status & IDE_STATUS_DRQ) {
-		print_status(ctrl);
-		return -1;
-	}
-	return 0;
-}
-#endif /* __BIG_ENDIAN */
-
-static int pio_packet(struct harddisk_info *info, int in,
-	const void *packet, int packet_len,
-	void *buffer, int buffer_len)
-{
-	unsigned int status;
-	struct ide_pio_command cmd;
-
-	memset(&cmd, 0, sizeof(cmd));
-
-	/* Wait until the busy bit is clear */
-	if (await_ide(not_bsy, info->ctrl, IDE_TIMEOUT) < 0) {
-		return -1;
-	}
-
-	/* Issue a PACKET command */
-	cmd.lba_mid = (uint8_t) buffer_len;
-	cmd.lba_high = (uint8_t) (buffer_len >> 8);
-	cmd.device = IDE_DH_DEFAULT | info->slave;
-	cmd.command = IDE_CMD_PACKET;
-	pio_set_registers(info->ctrl, &cmd);
-	udelay(1);
-	if (await_ide(not_bsy, info->ctrl, IDE_TIMEOUT) < 0) {
-		return -1;
-	}
-	status = inb(IDE_REG_STATUS(info->ctrl));
-	if (!(status & IDE_STATUS_DRQ)) {
-		printk_debug("no drq after PACKET\n");
-		print_status(info->ctrl);
-		return -1;
-	}
-
-	/* Send the packet */
-#ifdef __BIG_ENDIAN
-	outsw_ns(IDE_REG_DATA(info->ctrl), packet, packet_len/2);
-#else /* __BIG_ENDIAN */
-	outsw(IDE_REG_DATA(info->ctrl), packet, packet_len/2);
-#endif /* __BIG_ENDIAN */
-
-	if (await_ide(not_bsy, info->ctrl, IDE_TIMEOUT) < 0) {
-		return -1;
-	}
-	status = inb(IDE_REG_STATUS(info->ctrl));
-	if (buffer_len == 0) {
-		if (status & IDE_STATUS_DRQ) {
-			printk_debug("drq after non-data command\n");
-			print_status(info->ctrl);
-			return -1;
-		}
-		return 0;
-	}
-
-	if (!(status & IDE_STATUS_DRQ)) {
-		printk_debug("no drq after sending packet\n");
-		print_status(info->ctrl);
-		return -1;
-	}
-
-#ifdef __BIG_ENDIAN
-	insw_ns(IDE_REG_DATA(info->ctrl), buffer, buffer_len/2);
-#else /* __BIG_ENDIAN */
-	insw(IDE_REG_DATA(info->ctrl), buffer, buffer_len/2);
-#endif /* __BIG_ENDIAN */
-
-	status = inb(IDE_REG_STATUS(info->ctrl));
-	if (status & IDE_STATUS_DRQ) {
-		printk_debug("drq after insw\n");
-		print_status(info->ctrl);
-		return -1;
-	}
-	return 0;
-}
-
-static inline int ide_read_sector_chs(
-	struct harddisk_info *info, void *buffer, unsigned long sector)
-{
-	struct ide_pio_command cmd;
-	unsigned int track;
-	unsigned int offset;
-	unsigned int cylinder;
-		
-	memset(&cmd, 0, sizeof(cmd));
-	cmd.sector_count = 1;
-
-	//printk_debug("ide_read_sector_chs: sector= %ld.\n",sector);
-
-	track = sector / info->sectors_per_track;
-	/* Sector number */
-	offset = 1 + (sector % info->sectors_per_track);
-	cylinder = track / info->heads;
-	cmd.lba_low = offset;
-	cmd.lba_mid = cylinder & 0xff;
-	cmd.lba_high = (cylinder >> 8) & 0xff;
-	cmd.device = IDE_DH_DEFAULT |
-		IDE_DH_HEAD(track % info->heads) |
-		info->slave |
-		IDE_DH_CHS;
-	cmd.command = IDE_CMD_READ_SECTORS;
-#ifdef __BIG_ENDIAN
-	return pio_data_in_sw(info->ctrl, &cmd, buffer, IDE_SECTOR_SIZE);
-#else /* __BIG_ENDIAN */
-	return pio_data_in(info->ctrl, &cmd, buffer, IDE_SECTOR_SIZE);
-#endif /* __BIG_ENDIAN */
-}
-
-static inline int ide_read_sector_lba(
-	struct harddisk_info *info, void *buffer, unsigned long sector)
-{
-	struct ide_pio_command cmd;
-	memset(&cmd, 0, sizeof(cmd));
-
-	cmd.sector_count = 1;
-	cmd.lba_low = sector & 0xff;
-	cmd.lba_mid = (sector >> 8) & 0xff;
-	cmd.lba_high = (sector >> 16) & 0xff;
-	cmd.device = IDE_DH_DEFAULT |
-		((sector >> 24) & 0x0f) |
-		info->slave | 
-		IDE_DH_LBA;
-	cmd.command = IDE_CMD_READ_SECTORS;
-	//printk_debug("%s: sector= %ld, device command= 0x%x.\n",__func__,(unsigned long) sector, cmd.device);
-#ifdef __BIG_ENDIAN
-	return pio_data_in_sw(info->ctrl, &cmd, buffer, IDE_SECTOR_SIZE);
-#else /* __BIG_ENDIAN */
-	return pio_data_in(info->ctrl, &cmd, buffer, IDE_SECTOR_SIZE);
-#endif /* __BIG_ENDIAN */
-}
-
-static inline int ide_read_sector_lba48(
-	struct harddisk_info *info, void *buffer, sector_t sector)
-{
-	struct ide_pio_command cmd;
-	memset(&cmd, 0, sizeof(cmd));
-	//printk_debug("ide_read_sector_lba48: sector= %ld.\n",(unsigned long) sector);
-
-	cmd.sector_count = 1;
-	cmd.lba_low = sector & 0xff;
-	cmd.lba_mid = (sector >> 8) & 0xff;
-	cmd.lba_high = (sector >> 16) & 0xff;
-	cmd.lba_low2 = (sector >> 24) & 0xff;
-	cmd.lba_mid2 = (sector >> 32) & 0xff;
-	cmd.lba_high2 = (sector >> 40) & 0xff;
-	cmd.device =  info->slave | IDE_DH_LBA;
-	cmd.command = IDE_CMD_READ_SECTORS_EXT;
-#ifdef __BIG_ENDIAN
-	return pio_data_in_sw(info->ctrl, &cmd, buffer, IDE_SECTOR_SIZE);
-#else /* __BIG_ENDIAN */
-	return pio_data_in(info->ctrl, &cmd, buffer, IDE_SECTOR_SIZE);
-#endif /* __BIG_ENDIAN */
-}
-
-static inline int ide_read_sector_packet(
-	struct harddisk_info *info, void *buffer, sector_t sector)
-{
-	char packet[12];
-	static uint8_t cdbuffer[CDROM_SECTOR_SIZE];
-	static struct harddisk_info *last_disk = 0;
-	static sector_t last_sector = (sector_t) -1;
-	uint8_t *buf;
-	uint32_t hw_sector;
-
-	//printk_debug("sector=%Ld\n", sector);
-
-	if (info->hw_sector_size == CDROM_SECTOR_SIZE) {
-		buf = cdbuffer;
-		hw_sector = sector >> 2;
-	} else {
-		buf = buffer;
-		hw_sector = sector;
-	}
-
-	if (buf==buffer || info != last_disk || hw_sector != last_sector) {
-		//printk_debug("hw_sector=%u\n", hw_sector);
-		memset(packet, 0, sizeof packet);
-		packet[0] = 0x28; /* READ */
-		packet[2] = hw_sector >> 24;
-		packet[3] = hw_sector >> 16;
-		packet[4] = hw_sector >> 8;
-		packet[5] = hw_sector >> 0;
-		packet[7] = 0;
-		packet[8] = 1; /* length */
-
-		if (pio_packet(info, 1, packet, sizeof packet,
-					buf, info->hw_sector_size) != 0) {
-			printk_debug("read error\n");
-			return -1;
-		}
-		last_disk = info;
-		last_sector = hw_sector;
-	}
-
-	if (buf != buffer)
-		memcpy(buffer, &cdbuffer[(sector & 3) << 9], IDE_SECTOR_SIZE);
-	return 0;
-}
-
-int ide_read(int drive, sector_t sector, void *buffer)
-{
-	struct harddisk_info *info = &harddisk_info[drive];
-	int result;
-
-	//printk_debug("drive=%d, sector=%ld\n",drive,(unsigned long) sector);
-	/* Report the buffer is empty */
-	if (sector > info->sectors) {
-		return -1;
-	}
-	if (info->address_mode == ADDRESS_MODE_CHS) {
-		result = ide_read_sector_chs(info, buffer, sector);
-	}
-	else if (info->address_mode == ADDRESS_MODE_LBA) {
-		result = ide_read_sector_lba(info, buffer, sector);
-	}
-	else if (info->address_mode == ADDRESS_MODE_LBA48) {
-		result = ide_read_sector_lba48(info, buffer, sector);
-	}
-	else if (info->address_mode == ADDRESS_MODE_PACKET) {
-		result = ide_read_sector_packet(info, buffer, sector);
-	}
-	else {
-		result = -1;
-	}
-	return result;
-}
-
-static int init_drive(struct harddisk_info *info, struct controller *ctrl,
-		int slave, int drive, unsigned char *buffer, int ident_command)
-{
-	uint16_t* drive_info;
-	struct ide_pio_command cmd;
-	int i;
-
-	info->ctrl = ctrl;
-	info->heads = 0u;
-	info->cylinders = 0u;
-	info->sectors_per_track = 0u;
-	info->address_mode = IDE_DH_CHS;
-	info->sectors = 0ul;
-	info->drive_exists = 0;
-	info->slave_absent = 0;
-	info->removable = 0;
-	info->hw_sector_size = IDE_SECTOR_SIZE;
-	info->slave = slave?IDE_DH_SLAVE: IDE_DH_MASTER;
-
-	printk_debug("Testing for hd%c\n", 'a'+drive);
-
-	/* Select the drive that we are testing */
-	outb(IDE_DH_DEFAULT | IDE_DH_HEAD(0) | IDE_DH_CHS | info->slave, 
-		IDE_REG_DEVICE(ctrl));
-	mdelay(50);
-
-	/* Test to see if the drive registers exist,
-	 * In many cases this quickly rules out a missing drive.
-	 */
-	for(i = 0; i < 4; i++) {
-		outb(0xaa + i, (ctrl->cmd_base) + 2 + i);
-	}
-	for(i = 0; i < 4; i++) {
-		if (inb((ctrl->cmd_base) + 2 + i) != 0xaa + i) {
-			return 1;
-		}
-	}
-	for(i = 0; i < 4; i++) {
-		outb(0x55 + i, (ctrl->cmd_base) + 2 + i);
-	}
-	for(i = 0; i < 4; i++) {
-		if (inb((ctrl->cmd_base) + 2 + i) != 0x55 + i) {
-			return 1;
-		}
-	}
-	printk_debug("Probing for hd%c\n", 'a'+drive);
-	
-	memset(&cmd, 0, sizeof(cmd));
-	cmd.device = IDE_DH_DEFAULT | IDE_DH_HEAD(0) | IDE_DH_CHS | info->slave;
-	cmd.command = ident_command;
-
-	if (pio_data_in(ctrl, &cmd, buffer, IDE_SECTOR_SIZE) < 0) {
-		/* Well, if that command didn't work, we probably don't have drive. */
-		return 1;
-	}
-
-	/* Now suck the data out */
-	drive_info = (uint16_t *)buffer;
-	if (drive_info[2] == 0x37C8) {
-		/* If the response is incomplete spin up the drive... */
-		memset(&cmd, 0, sizeof(cmd));
-		cmd.device = IDE_DH_DEFAULT | IDE_DH_HEAD(0) | IDE_DH_CHS |
-			info->slave;
-		cmd.feature = IDE_FEATURE_STANDBY_SPINUP_DRIVE;
-		if (pio_non_data(ctrl, &cmd) < 0) {
-			/* If the command doesn't work give up on the drive */
-			return 1;
-		}
-		
-	}
-	if ((drive_info[2] == 0x37C8) || (drive_info[2] == 0x8C73)) {
-		/* The response is incomplete retry the drive info command */
-		memset(&cmd, 0, sizeof(cmd));
-		cmd.device = IDE_DH_DEFAULT | IDE_DH_HEAD(0) | IDE_DH_CHS |
-			info->slave;
-		cmd.command = ident_command;
-		if (pio_data_in(ctrl, &cmd, buffer, IDE_SECTOR_SIZE) < 0) {
-			/* If the command didn't work give up on the drive. */
-			return 1;
-		}
-	}
-	if ((drive_info[2] != 0x37C8) &&
-		(drive_info[2] != 0x738C) &&
-		(drive_info[2] != 0x8C73) &&
-		(drive_info[2] != 0xC837) &&
-		(drive_info[2] != 0x0000)) {
-		printk_info("Invalid IDE Configuration: %hx\n", drive_info[2]);
-		return 1;
-	}
-	for(i = 27; i < 47; i++) {
-		info->model_number[((i-27)<< 1)] = (drive_info[i] >> 8) & 0xff;
-		info->model_number[((i-27)<< 1)+1] = drive_info[i] & 0xff;
-	}
-	info->model_number[40] = '\0';
-	info->drive_exists = 1;
-
-	/* See if LBA is supported */
-	if (ident_command == IDE_CMD_IDENTIFY_PACKET_DEVICE) {
-		info->address_mode = ADDRESS_MODE_PACKET;
-		info->removable = 1; /* XXX */
-	} else if (drive_info[49] & (1 << 9)) {
-		info->address_mode = ADDRESS_MODE_LBA;
-		info->sectors = (drive_info[61] << 16) | (drive_info[60]);
-		printk_debug("LBA mode, sectors=%Ld\n", info->sectors);
-		/* Enable LBA48 mode if it is present */
-		if (drive_info[83] & (1 <<10)) {
-			/* Should LBA48 depend on LBA? */
-			info->address_mode = ADDRESS_MODE_LBA48;
-			info->sectors = 
-				(((sector_t)drive_info[103]) << 48) |
-				(((sector_t)drive_info[102]) << 32) |
-				(((sector_t)drive_info[101]) << 16) |
-				(((sector_t)drive_info[100]) <<  0);
-			printk_debug("LBA48 mode, sectors=%Ld\n", info->sectors);
-		}
-	} else {
-		info->address_mode = ADDRESS_MODE_CHS;
-		info->heads = drive_info[3];
-		info->cylinders = drive_info[1];
-		info->sectors_per_track = drive_info[6];
-		info->sectors = 
-			info->sectors_per_track *
-			info->heads *
-			info->cylinders;
-		printk_debug("CHS mode, sectors_per_track=[%d], heads=[%d], cylinders=[%d]\n",
-			info->sectors_per_track,
-			info->heads,
-			info->cylinders);
-		printk_debug("sectors=%Ld\n", info->sectors);
-	}
-	/* See if we have a slave */
-	if (!info->slave && (((drive_info[93] >> 14) & 3) == 1)) {
-		info->slave_absent = !(drive_info[93] & (1 << 5));
-	}
-
-	/* See if we need to put the device in CFA power mode 1 */
-	if ((drive_info[160] & ((1 << 15) | (1 << 13)| (1 << 12))) ==
-		((1 << 15) | (1 << 13)| (1 << 12))) {
-		memset(&cmd, 0, sizeof(cmd));
-		cmd.device = IDE_DH_DEFAULT | IDE_DH_HEAD(0) | IDE_DH_CHS | info->slave;
-		cmd.feature = IDE_FEATURE_CFA_ENABLE_POWER_MODE1;
-		if (pio_non_data(ctrl, &cmd) < 0) {
-			/* If I need to power up the drive, and I can't
-			 * give up.
-			 */
-			printk_info("Cannot power up CFA device\n");
-			return 1;
-		}
-	}
-
-	/* Some extra steps for older drives.. */
-	if (info->address_mode != ADDRESS_MODE_PACKET) {
-		/* Initialize drive parameters
-		 * This is an obsolete command (disappeared as of ATA-6)
-		 * but old drives need it before accessing media. */
-		memset(&cmd, 0, sizeof(cmd));
-		cmd.device = IDE_DH_DEFAULT | IDE_DH_HEAD(drive_info[3] - 1)
-		    | info->slave;
-		cmd.sector_count = drive_info[6];
-		cmd.command = IDE_CMD_INITIALIZE_DRIVE_PARAMETERS;
-		printk_debug("Init device params... ");
-		if (pio_non_data(ctrl, &cmd) < 0)
-			printk_debug("failed (ok for newer drives)\n");
-		else
-			printk_debug("ok\n");
-	}
-
-	printk_info("hd%c: %s",
-		'a'+drive,
-		(info->address_mode==ADDRESS_MODE_CHS) ? "CHS" :
-		(info->address_mode==ADDRESS_MODE_LBA) ? "LBA" :
-		(info->address_mode==ADDRESS_MODE_LBA48) ? "LBA48" :
-		(info->address_mode==ADDRESS_MODE_PACKET) ? "ATAPI" : "???");
-
-	if (info->sectors > (10LL*1000*1000*1000/512))
-		printk_info(" %uGB", (unsigned) (info->sectors / (1000*1000*1000/512)));
-	else if (info->sectors > (10*1000*1000/512))
-		printk_info(" %uMB", (unsigned) (info->sectors / (1000*1000/512)));
-	else if (info->sectors > 0)
-		printk_info(" %uKB", (unsigned) (info->sectors / 2));
-	printk_info(": %s\n", info->model_number);
-
-	return 0;
-}
-
-/* Experimental floating bus detection
- * As Eric mentions, we get stuck when the bus has no drive
- * and floating high. To avoid this, try some heuristics.
- * This is based on a paper on Phoenix website. --ts1 */
-static int ide_bus_floating(struct controller *ctrl)
-{
-	unsigned long timeout;
-	unsigned char status;
-
-	/* Test 1: if status reads 0xff, probably no device is present
-	 * on the bus. Repeat this for 20msec. */
-	timeout = 20;
-	status = 0;
-	do {
-		/* Take logical OR to avoid chattering */
-		status |= inb(IDE_REG_STATUS(ctrl));
-		/* If it makes 0xff, it's possible to be floating, 
-		 * do test2 to ensure. */
-		if (status == 0xff)
-			goto test2;
-		/* If BSY bit is not set, it's harmless to continue probing. */
-		if ((status & IDE_STATUS_BSY) == 0)
-			return 0;
-		udelay(1000);
-	} while (timeout > 0);
-	/* Timed out. Logical ORed status didn't make 0xFF.
-	 * We have something there. */
-	return 0;
-
-test2:
-	/* Test 2: write something to registers, then read back and 
-	 * compare. Note that ATA spec inhibits this while BSY is set,
-	 * but for many drives this works. This is a confirmation step anyway.
-	 */
-	outb(0xaa, ctrl->cmd_base + 2);
-	outb(0x55, ctrl->cmd_base + 3);
-	outb(0xff, ctrl->cmd_base + 4);
-	if (inb(ctrl->cmd_base+2) == 0xaa
-			&& inb(ctrl->cmd_base+3) == 0x55
-			&& inb(ctrl->cmd_base+4) == 0xff) {
-		/* We have some registers there. 
-		 * Though this does not mean it is not a NIC or something... */
-		return 0;
-	}
-
-	/* Status port is 0xFF, and other registers are not there.
-	 * Most certainly this bus is floating. */
-	printk_info("Detected floating bus\n");
-	return 1;
-}
-
-static int init_controller(struct controller *ctrl, int drive, unsigned char *buffer) 
-{
-	struct harddisk_info *info;
-
-	/* Put the drives ide channel in a know state and wait
-	 * for the drives to spinup.  
-	 *
-	 * In practice IDE disks tend not to respond to commands until
-	 * they have spun up.  This makes IDE hard to deal with
-	 * immediately after power up, as the delays can be quite
-	 * long, so we must be very careful here.
-	 *
-	 * There are two pathological cases that must be dealt with:
-	 *
-	 * - The BSY bit not being set while the IDE drives spin up.
-	 *   In this cases only a hard coded delay will work.  As
-	 *   I have not reproduced it, and this is out of spec for
-	 *   IDE drives the work around can be enabled by setting
-	 *   BSY_SET_DURING_SPINUP to 0.
-	 *
-	 * - The BSY bit floats high when no drives are plugged in.
-	 *   This case will not be detected except by timing out but
-	 *   we avoid the problems by only probing devices we are
-	 *   supposed to boot from.  If we don't do the probe we
-	 *   will not experience the problem.
-	 *
-	 * So speed wise I am only slow if the BSY bit is not set
-	 * or not reported by the IDE controller during spinup, which
-	 * is quite rare.
-	 * 
-	 */
-#if !BSY_SET_DURING_SPINUP
-	if (await_ide(timeout, ctrl, IDE_TIMEOUT) < 0) {
-		return -1;
-	}
-#endif
-	/* ts1: Try some heuristics to avoid waiting for floating bus */
-	if (ide_bus_floating(ctrl))
-		return -1;
-
-	if (ide_software_reset(ctrl) < 0) {
-		return -1;
-	}
-
-	/* Note: I have just done a software reset.  It may be
-	 * reasonable to just read the boot time signatures 
-	 * off of the drives to see if they are present.
-	 *
-	 * For now I will go with just sending commands to the drives
-	 * and assuming filtering out missing drives by detecting registers
-	 * that won't set and commands that fail to execute properly.
-	 */
-
-	/* Now initialize the individual drives */
-	info = &harddisk_info[drive];
-	init_drive(info, ctrl, 0, drive, buffer, IDE_CMD_IDENTIFY_DEVICE);
-	if (!info->drive_exists)
-		init_drive(info, ctrl, 0, drive, buffer,
-				IDE_CMD_IDENTIFY_PACKET_DEVICE);
-#ifdef CHECK_FOR_SLAVES
-	if (info->drive_exists && !info->slave_absent) {
-		drive++;
-		info++;
-		init_drive(info, ctrl, 1, drive, buffer,
-				IDE_CMD_IDENTIFY_DEVICE);
-		if (!info->drive_exists)
-			init_drive(info, ctrl, 1, drive, buffer,
-					IDE_CMD_IDENTIFY_PACKET_DEVICE);
-	}
-#endif
-
-	return 0;
-}
-
-static int
-atapi_request_sense(struct harddisk_info *info, uint8_t *asc, uint8_t *ascq)
-{
-	uint8_t packet[12];
-	uint8_t buf[18];
-
-	memset(packet, 0, sizeof packet);
-	packet[0] = 0x03; /* REQUEST SENSE */
-	packet[4] = sizeof buf;
-	if (pio_packet(info, 1, packet, sizeof packet, buf, sizeof buf) != 0)
-		return -1;
-
-	if (asc)
-		*asc = buf[12];
-	if (ascq)
-		*ascq = buf[13];
-	return 0;
-}
-
-static int atapi_detect_medium(struct harddisk_info *info)
-{
-	uint8_t packet[12];
-	uint8_t buf[8];
-	uint32_t block_len, sectors;
-	unsigned long timeout;
-	uint8_t asc, ascq;
-	int in_progress;
-
-	memset(packet, 0, sizeof packet);
-	packet[0] = 0x25; /* READ CAPACITY */
-
-	/* Retry READ CAPACITY for 5 seconds unless MEDIUM NOT PRESENT
-	 * is reported by the drive. If the drive reports "IN PROGRESS",
-	 * 30 seconds is added. */
-	timeout =  5000;
-	in_progress = 0;
-	while (timeout > 0) {
-		if (pio_packet(info, 1, packet, sizeof packet, buf, sizeof buf)
-				== 0)
-			goto ok;
-
-		if (atapi_request_sense(info, &asc, &ascq) == 0) {
-			if (asc == 0x3a) { /* MEDIUM NOT PRESENT */
-				printk_debug("Device reports MEDIUM NOT PRESENT\n");
-				return -1;
-			}
-
-			if (asc == 0x04 && ascq == 0x01 && !in_progress) {
-					/* IN PROGRESS OF BECOMING READY */
-				printk_info("Waiting for drive to detect "
-						"the medium... ");
-				/* Allow 30 seconds more */
-				timeout =  30000;
-				in_progress = 1;
-			}
-		}
-
-		udelay(1000);
-	}
-	printk_debug("read capacity failed\n");
-	return -1;
-ok:
-
-	block_len = (uint32_t) buf[4] << 24
-		| (uint32_t) buf[5] << 16
-		| (uint32_t) buf[6] << 8
-		| (uint32_t) buf[7] << 0;
-	if (block_len != IDE_SECTOR_SIZE && block_len != CDROM_SECTOR_SIZE) {
-		printk_info("Unsupported sector size %u\n", block_len);
-		return -1;
-	}
-	info->hw_sector_size = block_len;
-
-	sectors = (uint32_t) buf[0] << 24
-		| (uint32_t) buf[1] << 16
-		| (uint32_t) buf[2] << 8
-		| (uint32_t) buf[3] << 0;
-
-	if (info->hw_sector_size == CDROM_SECTOR_SIZE)
-		sectors <<= 2; /* # of sectors in 512-byte "soft" sector */
-	if (sectors != info->sectors)
-		printk_info("%uMB medium detected\n", sectors>>(20-9));
-	info->sectors = sectors;
-	return 0;
-}
-
-static int detect_medium(struct harddisk_info *info)
-{
-	if (info->address_mode == ADDRESS_MODE_PACKET) {
-		if (atapi_detect_medium(info) != 0)
-			return -1;
-	} else {
-		printk_debug("not implemented for non-ATAPI device\n");
-		return -1;
-	}
-	return 0;
-}
-
-static int find_ide_controller_compat(struct controller *ctrl, int index)
-{
-	if (index >= IDE_MAX_CONTROLLERS)
-		return -1;
-	ctrl->cmd_base  = ide_base[index];
-	ctrl->ctrl_base = ide_base[index] + IDE_REG_EXTENDED_OFFSET;
-	return 0;
-}
-
-static int find_ide_controller(struct controller *ctrl, int ctrl_index)
-{
-	int pci_index;
-	struct device *dev = 0;
-	unsigned int mask;
-	unsigned int prog_if;
-
-	/* A PCI IDE controller has two channels (pri, sec) */
-	pci_index = ctrl_index >> 1;
-
-	for (;;) {
-		/* Find a IDE storage class device */
-		dev = dev_find_class(0x010100, dev);
-		if (!dev) {
-			printk_debug("PCI IDE #%d not found\n", pci_index);
-			return -1;
-		}
-
-		if (pci_index-- == 0)
-			break;
-	}
-
-	prog_if = dev->class & 0xff;
-	printk_debug("found PCI IDE controller %04x:%04x prog_if=%#x\n",
-			dev->vendor, dev->device, prog_if);
-
-	/* See how this controller is configured */
-	mask = (ctrl_index & 1) ? 4 : 1;
-	printk_debug("%s channel: ", (ctrl_index & 1) ? "secondary" : "primary");
-	if (prog_if & mask) {
-		printk_debug("native PCI mode\n");
-		if ((ctrl_index & 1) == 0) {
-			/* Primary channel */
-			ctrl->cmd_base = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
-			ctrl->ctrl_base = pci_read_config32(dev, PCI_BASE_ADDRESS_1);
-		} else {
-			/* Secondary channel */
-			ctrl->cmd_base = pci_read_config32(dev, PCI_BASE_ADDRESS_2);
-			ctrl->ctrl_base = pci_read_config32(dev, PCI_BASE_ADDRESS_3);
-		}
-		ctrl->cmd_base &= ~3;
-		ctrl->ctrl_base &= ~3;
-	} else {
-		printk_debug("compatibility mode\n");
-		if (find_ide_controller_compat(ctrl, ctrl_index) != 0)
-			return -1;
-	}
-	return 0;
-}
-
-int ide_probe(int drive)
-{
-	struct controller *ctrl;
-	int ctrl_index;
-	struct harddisk_info *info;
-
-	if (drive >= IDE_MAX_DRIVES) {
-		printk_info("Unsupported drive number\n");
-		return -1;
-	}
-
-	/* A controller has two drives (master, slave) */
-	ctrl_index = drive >> 1;
-
-	ctrl = &controllers[ctrl_index];
-	if (ctrl->cmd_base == 0) {
-		if (find_ide_controller(ctrl, ctrl_index) != 0) {
-			printk_info("IDE channel %d not found\n", ctrl_index);
-			return -1;
-		}
-		if (init_controller(ctrl, drive & ~1, ide_buffer) != 0) {
-			printk_info("No drive detected on IDE channel %d\n",
-					ctrl_index);
-			return -1;
-		}
-	}
-	info = &harddisk_info[drive];
-	if (!info->drive_exists) {
-		printk_info("Drive %d does not exist\n", drive);
-		return -1;
-	}
-
-	if (info->removable) {
-		if (detect_medium(info) != 0) {
-			printk_info("Media detection failed\n");
-			return -1;
-		}
-	}
-
-	return 0;
-}
-
-/* vim:set sts=8 sw=8: */