Merge with Linux 2.1.67.

1 files changed, 416 insertions, 120 deletions

diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 472959603..f4ba2f26e 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -20,6 +20,13 @@
  *
  * Modularized: 04/10/96 by Todd Fries, tfries@umr.edu
  *
+ * Revised: 13/09/97 by Andrzej Krzysztofowicz, ankry@mif.pg.gda.pl
+ *   Fixed some problems with disk initialization and module initiation.
+ *   Added support for manual geometry setting (except Seagate controllers)
+ *   in form:
+ *      xd_geo=<cyl_xda>,<head_xda>,<sec_xda>[,<cyl_xdb>,<head_xdb>,<sec_xdb>]
+ *   Recovered DMA access. Abridged messages. Added support for DTC5051CX &
+ *   WD1002-27X controllers. Added alternate jumper geometry setting.
  */
 
 #include <linux/module.h>
@@ -28,6 +35,7 @@
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
+#include <linux/timer.h>
 #include <linux/genhd.h>
 #include <linux/hdreg.h>
 #include <linux/init.h>
@@ -42,6 +50,13 @@
 
 #include "xd.h"
 
+#define XD_DONT_USE_DMA		0  /* Initial value. may be overriden using
+				      "nodma" module option */
+#define XD_INIT_DISK_DELAY	3  /* 30 ms delay during disk initialization */
+
+/* Above may need to be increased if a problem with the 2nd drive detection
+   (ST11M controller) or resetting a controler (WD) appears */
+
 XD_INFO xd_info[XD_MAXDRIVES];
 
 /* If you try this driver and find that your card is not detected by the driver at bootup, you need to add your BIOS
@@ -68,27 +83,47 @@ XD_INFO xd_info[XD_MAXDRIVES];
    NOTE: You can now specify your XT controller's parameters from the command line in the form xd=TYPE,IRQ,IO,DMA. The driver
    should be able to detect your drive's geometry from this info. (eg: xd=0,5,0x320,3 is the "standard"). */
 
-static XD_SIGNATURE xd_sigs[] = {
+#include <asm/page.h>
+/* coppied from floppy.c */
+static inline int __get_order(unsigned long size)
+{
+	int order;
+
+	size = (size-1) >> (PAGE_SHIFT-1);
+	order = -1;
+	do {
+		size >>= 1;
+		order++;
+	} while (size);
+	return order;
+}
+#define xd_dma_mem_alloc(size) __get_dma_pages(GFP_KERNEL,__get_order(size))
+#define xd_dma_mem_free(addr, size) free_pages(addr, __get_order(size))
+static char *xd_dma_buffer = 0;
+
+static XD_SIGNATURE xd_sigs[] __initdata = {
 	{ 0x0000,"Override geometry handler",NULL,xd_override_init_drive,"n unknown" }, /* Pat Mackinlay, pat@it.com.au */
+	{ 0x0008,"[BXD06 (C) DTC 17-MAY-1985]",xd_dtc_init_controller,xd_dtc5150cx_init_drive," DTC 5150CX" }, /* Andrzej Krzysztofowicz, ankry@mif.pg.gda.pl */
 	{ 0x000B,"CRD18A   Not an IBM rom. (C) Copyright Data Technology Corp. 05/31/88",xd_dtc_init_controller,xd_dtc_init_drive," DTC 5150X" }, /* Todd Fries, tfries@umr.edu */
 	{ 0x000B,"CXD23A Not an IBM ROM (C)Copyright Data Technology Corp 12/03/88",xd_dtc_init_controller,xd_dtc_init_drive," DTC 5150X" }, /* Pat Mackinlay, pat@it.com.au */
-	{ 0x0008,"07/15/86 (C) Copyright 1986 Western Digital Corp",xd_wd_init_controller,xd_wd_init_drive," Western Digital 1002AWX1" }, /* Ian Justman, citrus!ianj@csusac.ecs.csus.edu */
-	{ 0x0008,"06/24/88 (C) Copyright 1988 Western Digital Corp",xd_wd_init_controller,xd_wd_init_drive," Western Digital 1004A27X" }, /* Dave Thaler, thalerd@engin.umich.edu */
-	{ 0x0008,"06/24/88(C) Copyright 1988 Western Digital Corp.",xd_wd_init_controller,xd_wd_init_drive," Western Digital WDXT-GEN2" }, /* Dan Newcombe, newcombe@aa.csc.peachnet.edu */
+	{ 0x0008,"07/15/86 (C) Copyright 1986 Western Digital Corp",xd_wd_init_controller,xd_wd_init_drive," Western Dig. 1002AWX1" }, /* Ian Justman, citrus!ianj@csusac.ecs.csus.edu */
+	{ 0x0008,"07/15/86(C) Copyright 1986 Western Digital Corp.",xd_wd_init_controller,xd_wd_init_drive," Western Dig. 1002-27X" }, /* Andrzej Krzysztofowicz, ankry@mif.pg.gda.pl */
+	{ 0x0008,"06/24/88 (C) Copyright 1988 Western Digital Corp",xd_wd_init_controller,xd_wd_init_drive," Western Dig. 1004A27X" }, /* Dave Thaler, thalerd@engin.umich.edu */
+	{ 0x0008,"06/24/88(C) Copyright 1988 Western Digital Corp.",xd_wd_init_controller,xd_wd_init_drive," Western Dig. WDXT-GEN2" }, /* Dan Newcombe, newcombe@aa.csc.peachnet.edu */
 	{ 0x0015,"SEAGATE ST11 BIOS REVISION",xd_seagate_init_controller,xd_seagate_init_drive," Seagate ST11M/R" }, /* Salvador Abreu, spa@fct.unl.pt */
 	{ 0x0010,"ST11R BIOS",xd_seagate_init_controller,xd_seagate_init_drive," Seagate ST11M/R" }, /* Risto Kankkunen, risto.kankkunen@cs.helsinki.fi */
 	{ 0x0010,"ST11 BIOS v1.7",xd_seagate_init_controller,xd_seagate_init_drive," Seagate ST11R" }, /* Alan Hourihane, alanh@fairlite.demon.co.uk */
 	{ 0x1000,"(c)Copyright 1987 SMS",xd_omti_init_controller,xd_omti_init_drive,"n OMTI 5520" }, /* Dirk Melchers, dirk@merlin.nbg.sub.org */
 };
 
-static unsigned int xd_bases[] =
+static unsigned int xd_bases[] __initdata =
 {
 	0xC8000, 0xCA000, 0xCC000,
 	0xCE000, 0xD0000, 0xD8000,
 	0xE0000
 };
 
-static struct hd_struct xd[XD_MAXDRIVES << 6];
+static struct hd_struct xd_struct[XD_MAXDRIVES << 6];
 static int xd_sizes[XD_MAXDRIVES << 6], xd_access[XD_MAXDRIVES] = { 0, 0 };
 static int xd_blocksizes[XD_MAXDRIVES << 6];
 static struct gendisk xd_gendisk = {
@@ -102,7 +137,7 @@ static struct gendisk xd_gendisk = {
 #else
         xd_geninit,     /* init function */
 #endif
-	xd,		/* hd struct */
+	xd_struct,	/* hd struct */
 	xd_sizes,	/* block sizes */
 	0,		/* number */
 	(void *) xd_info,	/* internal */
@@ -122,15 +157,26 @@ static struct file_operations xd_fops = {
 };
 static struct wait_queue *xd_wait_int = NULL, *xd_wait_open = NULL;
 static u_char xd_valid[XD_MAXDRIVES] = { 0,0 };
-static u_char xd_drives = 0, xd_irq = 0, xd_dma = 0, xd_maxsectors;
-static u_char xd_override = 0, xd_type = 0;
-static u_short xd_iobase = 0;
+static u_char xd_drives = 0, xd_irq = 5, xd_dma = 3, xd_maxsectors;
+static u_char xd_override __initdata = 0, xd_type = 0;
+static u_short xd_iobase = 0x320;
+static int xd_geo[XD_MAXDRIVES*3] __initdata = { 0,0,0,0,0,0 };
+
+static volatile int xdc_busy = 0;
+static struct wait_queue *xdc_wait = NULL;
+
+typedef void (*timeout_fn)(unsigned long);
+static struct timer_list xd_timer = { NULL, NULL, 0, 0, (timeout_fn) xd_wakeup },
+			 xd_watchdog_int = { NULL, NULL, 0, 0, (timeout_fn) xd_watchdog };
+
+static volatile u_char xd_error;
+static int nodma = XD_DONT_USE_DMA;
 
 /* xd_init: register the block device number and set up pointer tables */
 __initfunc(int xd_init (void))
 {
 	if (register_blkdev(MAJOR_NR,"xd",&xd_fops)) {
-		printk("xd_init: unable to get major number %d\n",MAJOR_NR);
+		printk("xd: Unable to get major number %d\n",MAJOR_NR);
 		return -1;
 	}
 	blk_dev[MAJOR_NR].request_fn = DEVICE_REQUEST;
@@ -172,27 +218,29 @@ __initfunc(static void xd_geninit (struct gendisk *ignored))
 
 	if (xd_detect(&controller,&address)) {
 
-		printk("xd_geninit: detected a%s controller (type %d) at address %06x\n",xd_sigs[controller].name,controller,address);
+		printk("Detected a%s controller (type %d) at address %06x\n",xd_sigs[controller].name,controller,address);
 		if (controller)
 			xd_sigs[controller].init_controller(address);
 		xd_drives = xd_initdrives(xd_sigs[controller].init_drive);
 		
-		printk("xd_geninit: detected %d hard drive%s (using IRQ%d & DMA%d)\n",xd_drives,xd_drives == 1 ? "" : "s",xd_irq,xd_dma);
+		printk("Detected %d hard drive%s (using IRQ%d & DMA%d)\n",xd_drives,xd_drives == 1 ? "" : "s",xd_irq,xd_dma);
 		for (i = 0; i < xd_drives; i++)
-			printk("xd_geninit: drive %d geometry - heads = %d, cylinders = %d, sectors = %d\n",i,xd_info[i].heads,xd_info[i].cylinders,xd_info[i].sectors);
+			printk(" xd%c: CHS=%d/%d/%d\n",'a'+i,xd_info[i].cylinders,xd_info[i].heads,xd_info[i].sectors);
 
+	}
+	if (xd_drives) {
 		if (!request_irq(xd_irq,xd_interrupt_handler, 0, "XT harddisk", NULL)) {
 			if (request_dma(xd_dma,"xd")) {
-				printk("xd_geninit: unable to get DMA%d\n",xd_dma);
+				printk("xd: unable to get DMA%d\n",xd_dma);
 				free_irq(xd_irq, NULL);
 			}
 		}
 		else
-			printk("xd_geninit: unable to get IRQ%d\n",xd_irq);
+			printk("xd: unable to get IRQ%d\n",xd_irq);
 	}
 
 	for (i = 0; i < xd_drives; i++) {
-		xd[i << 6].nr_sects = xd_info[i].heads * xd_info[i].cylinders * xd_info[i].sectors;
+		xd_struct[i << 6].nr_sects = xd_info[i].heads * xd_info[i].cylinders * xd_info[i].sectors;
 		xd_valid[i] = 1;
 	}
 
@@ -211,6 +259,10 @@ static int xd_open (struct inode *inode,struct file *file)
 		while (!xd_valid[dev])
 			sleep_on(&xd_wait_open);
 
+#ifdef MODULE
+		MOD_INC_USE_COUNT;
+#endif /* MODULE */
+
 		xd_access[dev]++;
 
 		return (0);
@@ -226,13 +278,15 @@ static void do_xd_request (void)
 	int code;
 
 	sti();
+	if (xdc_busy)
+		return;
 	while (code = 0, CURRENT) {
 		INIT_REQUEST;	/* do some checking on the request structure */
 
 		if (CURRENT_DEV < xd_drives
 		    && CURRENT->sector + CURRENT->nr_sectors
-		         <= xd[MINOR(CURRENT->rq_dev)].nr_sects) {
-			block = CURRENT->sector + xd[MINOR(CURRENT->rq_dev)].start_sect;
+		         <= xd_struct[MINOR(CURRENT->rq_dev)].nr_sects) {
+			block = CURRENT->sector + xd_struct[MINOR(CURRENT->rq_dev)].start_sect;
 			count = CURRENT->nr_sectors;
 
 			switch (CURRENT->cmd) {
@@ -242,7 +296,8 @@ static void do_xd_request (void)
 						code = xd_readwrite(CURRENT->cmd,CURRENT_DEV,CURRENT->buffer,block,count);
 					break;
 				default:
-					printk("do_xd_request: unknown request\n"); break;
+					printk("do_xd_request: unknown request\n");
+					break;
 			}
 		}
 		end_request(code);	/* wrap up, 0 = fail, 1 = success */
@@ -262,15 +317,14 @@ static int xd_ioctl (struct inode *inode,struct file *file,u_int cmd,u_long arg)
 	switch (cmd) {
 		case HDIO_GETGEO:
 		{
+			struct hd_geometry g;
 			struct hd_geometry *geometry = (struct hd_geometry *) arg;
 			if (!geometry) return -EINVAL;
-			if(put_user(xd_info[dev].heads, (char *) &geometry->heads)
-		 	|| put_user(xd_info[dev].sectors, (char *) &geometry->sectors)
-			|| put_user(xd_info[dev].cylinders, (short *) &geometry->cylinders)
-			|| put_user(xd[MINOR(inode->i_rdev)].start_sect,
-				(unsigned long *) &geometry->start))
-				return -EFAULT;
-			return 0;
+			g.heads = xd_info[dev].heads;
+			g.sectors = xd_info[dev].sectors;
+			g.cylinders = xd_info[dev].cylinders;
+			g.start = xd_struct[MINOR(inode->i_rdev)].start_sect;
+			return copy_to_user(geometry, &g, sizeof g) ? -EFAULT : 0;
 		}
 		case BLKRASET:
 			if(!suser()) return -EACCES;
@@ -279,8 +333,7 @@ static int xd_ioctl (struct inode *inode,struct file *file,u_int cmd,u_long arg)
 			return 0;
 		case BLKGETSIZE:
 			if (!arg) return -EINVAL;
-			put_user(xd[MINOR(inode->i_rdev)].nr_sects,(long *) arg);
-			return 0;
+			return put_user(xd_struct[MINOR(inode->i_rdev)].nr_sects,(long *) arg);
 		case BLKFLSBUF:   /* Return devices size */
 			if(!suser())  return -EACCES;
 			fsync_dev(inode->i_rdev);
@@ -303,6 +356,11 @@ static int xd_release (struct inode *inode, struct file *file)
 	if (target < xd_drives) {
 		sync_dev(inode->i_rdev);
 		xd_access[target]--;
+
+#ifdef MODULE
+		MOD_DEC_USE_COUNT;
+#endif /* MODULE */
+
 	}
 	return 0;
 }
@@ -326,8 +384,11 @@ static int xd_reread_partitions(kdev_t dev)
 	for (partition = xd_gendisk.max_p - 1; partition >= 0; partition--) {
 		int minor = (start | partition);
 		kdev_t devp = MKDEV(MAJOR_NR, minor);
+		struct super_block * sb = get_super(devp);
+		
 		sync_dev(devp);
-		invalidate_inodes(devp);
+		if (sb)
+			invalidate_inodes(sb);
 		invalidate_buffers(devp);
 		xd_gendisk.part[minor].start_sect = 0;
 		xd_gendisk.part[minor].nr_sects = 0;
@@ -347,13 +408,17 @@ static int xd_readwrite (u_char operation,u_char drive,char *buffer,u_int block,
 {
 	u_char cmdblk[6],sense[4];
 	u_short track,cylinder;
-	u_char head,sector,control,mode,temp;
+	u_char head,sector,control,mode = PIO_MODE,temp;
+	char **real_buffer;
+	register int i;
 	
 #ifdef DEBUG_READWRITE
 	printk("xd_readwrite: operation = %s, drive = %d, buffer = 0x%X, block = %d, count = %d\n",operation == READ ? "read" : "write",drive,buffer,block,count);
 #endif /* DEBUG_READWRITE */
 
 	control = xd_info[drive].control;
+	if (!xd_dma_buffer)
+		xd_dma_buffer = (char *)xd_dma_mem_alloc(xd_maxsectors * 0x200);
 	while (count) {
 		temp = count < xd_maxsectors ? count : xd_maxsectors;
 
@@ -366,27 +431,47 @@ static int xd_readwrite (u_char operation,u_char drive,char *buffer,u_int block,
 		printk("xd_readwrite: drive = %d, head = %d, cylinder = %d, sector = %d, count = %d\n",drive,head,cylinder,sector,temp);
 #endif /* DEBUG_READWRITE */
 
-		mode = xd_setup_dma(operation == READ ? DMA_MODE_READ : DMA_MODE_WRITE,(u_char *)buffer,temp * 0x200);
+		if (xd_dma_buffer) {
+			mode = xd_setup_dma(operation == READ ? DMA_MODE_READ : DMA_MODE_WRITE,(u_char *)(xd_dma_buffer),temp * 0x200);
+			real_buffer = &xd_dma_buffer;
+			for (i=0; i < (temp * 0x200); i++)
+				xd_dma_buffer[i] = buffer[i];
+		}
+		else
+			real_buffer = &buffer;
+
 		xd_build(cmdblk,operation == READ ? CMD_READ : CMD_WRITE,drive,head,cylinder,sector,temp & 0xFF,control);
 
-		switch (xd_command(cmdblk,mode,(u_char *) buffer,(u_char *) buffer,sense,XD_TIMEOUT)) {
+		switch (xd_command(cmdblk,mode,(u_char *)(*real_buffer),(u_char *)(*real_buffer),sense,XD_TIMEOUT)) {
 			case 1:
-				printk("xd_readwrite: timeout, recalibrating drive\n");
+				printk("xd%c: %s timeout, recalibrating drive\n",'a'+drive,(operation == READ ? "read" : "write"));
 				xd_recalibrate(drive);
 				return (0);
 			case 2:
-				switch ((sense[0] & 0x30) >> 4) {
-					case 0: printk("xd_readwrite: drive error, code = 0x%X",sense[0] & 0x0F); break;
-					case 1: printk("xd_readwrite: controller error, code = 0x%X",sense[0] & 0x0F); break;
-					case 2: printk("xd_readwrite: command error, code = 0x%X",sense[0] & 0x0F); break;
-					case 3: printk("xd_readwrite: miscellaneous error, code = 0x%X",sense[0] & 0x0F); break;
+				if (sense[0] & 0x30) {
+					printk("xd%c: %s - ",'a'+drive,(operation == READ ? "reading" : "writing"));
+					switch ((sense[0] & 0x30) >> 4) {
+					case 0: printk("drive error, code = 0x%X",sense[0] & 0x0F);
+						break;
+					case 1: printk("controller error, code = 0x%X",sense[0] & 0x0F);
+						break;
+					case 2: printk("command error, code = 0x%X",sense[0] & 0x0F);
+						break;
+					case 3: printk("miscellaneous error, code = 0x%X",sense[0] & 0x0F);
+						break;
+					}
 				}
 				if (sense[0] & 0x80)
-					printk(" - drive = %d, head = %d, cylinder = %d, sector = %d\n",sense[1] & 0xE0,sense[1] & 0x1F,((sense[2] & 0xC0) << 2) | sense[3],sense[2] & 0x3F);
+					printk(" - CHS = %d/%d/%d\n",((sense[2] & 0xC0) << 2) | sense[3],sense[1] & 0x1F,sense[2] & 0x3F);
+				/*	reported drive number = (sense[1] & 0xE0) >> 5 */
 				else
 					printk(" - no valid disk address\n");
 				return (0);
 		}
+		if (xd_dma_buffer)
+			for (i=0; i < (temp * 0x200); i++)
+				buffer[i] = xd_dma_buffer[i];
+
 		count -= temp, buffer += temp * 0x200, block += temp;
 	}
 	return (1);
@@ -399,7 +484,7 @@ static void xd_recalibrate (u_char drive)
 	
 	xd_build(cmdblk,CMD_RECALIBRATE,drive,0,0,0,0,0);
 	if (xd_command(cmdblk,PIO_MODE,0,0,0,XD_TIMEOUT * 8))
-		printk("xd_recalibrate: warning! error recalibrating, controller may be unstable\n");
+		printk("xd%c: warning! error recalibrating, controller may be unstable\n", 'a'+drive);
 }
 
 /* xd_interrupt_handler: interrupt service routine */
@@ -413,31 +498,27 @@ static void xd_interrupt_handler(int irq, void *dev_id, struct pt_regs * regs)
 		wake_up(&xd_wait_int);								/* and wake up sleeping processes */
 	}
 	else
-		printk("xd_interrupt_handler: unexpected interrupt\n");
+		printk("xd: unexpected interrupt\n");
 }
 
-/* xd_dma: set up the DMA controller for a data transfer */
+/* xd_setup_dma: set up the DMA controller for a data transfer */
 static u_char xd_setup_dma (u_char mode,u_char *buffer,u_int count)
 {
-	if (buffer < ((u_char *) 0x1000000 - count)) {		/* transfer to address < 16M? */
-		if (((u_int) buffer & 0xFFFF0000) != (((u_int) buffer + count) & 0xFFFF0000)) {
+	if (nodma)
+		return (PIO_MODE);
+	if (((u_int) buffer & 0xFFFF0000) != (((u_int) buffer + count) & 0xFFFF0000)) {
 #ifdef DEBUG_OTHER
-			printk("xd_setup_dma: using PIO, transfer overlaps 64k boundary\n");
+		printk("xd_setup_dma: using PIO, transfer overlaps 64k boundary\n");
 #endif /* DEBUG_OTHER */
-			return (PIO_MODE);
-		}
-		disable_dma(xd_dma);
-		clear_dma_ff(xd_dma);
-		set_dma_mode(xd_dma,mode);
-		set_dma_addr(xd_dma,(u_int) buffer);
-		set_dma_count(xd_dma,count);
-
-		return (DMA_MODE);			/* use DMA and INT */
+		return (PIO_MODE);
 	}
-#ifdef DEBUG_OTHER
-	printk("xd_setup_dma: using PIO, cannot DMA above 16 meg\n");
-#endif /* DEBUG_OTHER */
-	return (PIO_MODE);
+	disable_dma(xd_dma);
+	clear_dma_ff(xd_dma);
+	set_dma_mode(xd_dma,mode);
+	set_dma_addr(xd_dma,(u_int) buffer);
+	set_dma_count(xd_dma,count);
+
+	return (DMA_MODE);			/* use DMA and INT */
 }
 
 /* xd_build: put stuff into an array in a format suitable for the controller */
@@ -453,15 +534,53 @@ static u_char *xd_build (u_char *cmdblk,u_char command,u_char drive,u_char head,
 	return (cmdblk);
 }
 
+/* xd_wakeup is called from timer interrupt */
+static void xd_wakeup (void)
+{
+	wake_up(&xdc_wait);
+}
+
+/* xd_wakeup is called from timer interrupt */
+static void xd_watchdog (void)
+{
+	xd_error = 1;
+	wake_up(&xd_wait_int);
+}
+
 /* xd_waitport: waits until port & mask == flags or a timeout occurs. return 1 for a timeout */
 static inline u_char xd_waitport (u_short port,u_char flags,u_char mask,u_long timeout)
 {
 	u_long expiry = jiffies + timeout;
+	int success;
+
+	xdc_busy = 1;
+	while ((success = ((inb(port) & mask) != flags)) && (jiffies < expiry)) {
+		xd_timer.expires = jiffies;
+		cli();
+		add_timer(&xd_timer);
+		sleep_on(&xdc_wait);
+		del_timer(&xd_timer);
+		sti();
+	}
+	xdc_busy = 0;
+	return (success);
+}
 
-	while (((inb(port) & mask) != flags) && (jiffies < expiry))
-		;
-
-	return (jiffies >= expiry);
+static inline u_int xd_wait_for_IRQ (void)
+{
+	xd_watchdog_int.expires = jiffies + 8 * HZ;
+	add_timer(&xd_watchdog_int);
+	enable_dma(xd_dma);
+	sleep_on(&xd_wait_int);
+	del_timer(&xd_watchdog_int);
+	xdc_busy = 0;
+	disable_dma(xd_dma);
+	if (xd_error) {
+		printk("xd: missed IRQ - command aborted\n");
+		xd_error = 0;
+		return (1);
+	}
+	return (0);
 }
 
 /* xd_command: handle all data transfers necessary for a single command */
@@ -478,24 +597,23 @@ static u_int xd_command (u_char *command,u_char mode,u_char *indata,u_char *outd
 
 	if (xd_waitport(XD_STATUS,STAT_SELECT,STAT_SELECT,timeout))
 		return (1);
-	
+
 	while (!complete) {
 		if (xd_waitport(XD_STATUS,STAT_READY,STAT_READY,timeout))
 			return (1);
+
 		switch (inb(XD_STATUS) & (STAT_COMMAND | STAT_INPUT)) {
 			case 0:
 				if (mode == DMA_MODE) {
-					enable_dma(xd_dma);
-					sleep_on(&xd_wait_int);
-					disable_dma(xd_dma);
+					if (xd_wait_for_IRQ())
+						return (1);
 				} else
 					outb(outdata ? *outdata++ : 0,XD_DATA);
 				break;
 			case STAT_INPUT:
 				if (mode == DMA_MODE) {
-					enable_dma(xd_dma);
-					sleep_on(&xd_wait_int);
-					disable_dma(xd_dma);
+					if (xd_wait_for_IRQ())
+						return (1);
 				} else
 					if (indata)
 						*indata++ = inb(XD_DATA);
@@ -518,7 +636,7 @@ static u_int xd_command (u_char *command,u_char mode,u_char *indata,u_char *outd
 	if (csb & CSB_ERROR) {									/* read sense data if error */
 		xd_build(cmdblk,CMD_SENSE,(csb & CSB_LUN) >> 5,0,0,0,0,0);
 		if (xd_command(cmdblk,0,sense,0,0,XD_TIMEOUT))
-			printk("xd_command: warning! sense command failed!\n");
+			printk("xd: warning! sense command failed!\n");
 	}
 
 #ifdef DEBUG_COMMAND
@@ -535,28 +653,92 @@ __initfunc(static u_char xd_initdrives (void (*init_drive)(u_char drive)))
 	for (i = 0; i < XD_MAXDRIVES; i++) {
 		xd_build(cmdblk,CMD_TESTREADY,i,0,0,0,0,0);
 		if (!xd_command(cmdblk,PIO_MODE,0,0,0,XD_TIMEOUT * 8)) {
+	 		xd_timer.expires = jiffies + XD_INIT_DISK_DELAY;
+			add_timer(&xd_timer);
+			sleep_on(&xdc_wait);
+
 			init_drive(count);
 			count++;
+
+	 		xd_timer.expires = jiffies + XD_INIT_DISK_DELAY;
+			add_timer(&xd_timer);
+			sleep_on(&xdc_wait);
 		}
 	}
 	return (count);
 }
 
+__initfunc(static void xd_manual_geo_set (u_char drive))
+{
+	xd_info[drive].heads = (u_char)(xd_geo[3 * drive + 1]);
+	xd_info[drive].cylinders = (u_short)(xd_geo[3 * drive]);
+	xd_info[drive].sectors = (u_char)(xd_geo[3 * drive + 2]);
+}
+
 __initfunc(static void xd_dtc_init_controller (unsigned int address))
 {
 	switch (address) {
-		case 0xC8000:	xd_iobase = 0x320; break;
+		case 0x00000:
+		case 0xC8000:	break;			/*initial: 0x320 */
 		case 0xCA000:	xd_iobase = 0x324; break;
+		case 0xD0000:				/*5150CX*/
+		case 0xD8000:	break;			/*5150CX*/
 		default:        printk("xd_dtc_init_controller: unsupported BIOS address %06x\n",address);
-				xd_iobase = 0x320; break;
+				break;
 	}
-	xd_irq = 5;			/* the IRQ _can_ be changed on this card, but requires a hardware mod */
-	xd_dma = 3;
 	xd_maxsectors = 0x01;		/* my card seems to have trouble doing multi-block transfers? */
 
 	outb(0,XD_RESET);		/* reset the controller */
 }
 
+
+__initfunc(static void xd_dtc5150cx_init_drive (u_char drive))
+{
+	/* values from controller's BIOS - BIOS chip may be removed */
+	static u_short geometry_table[][4] = {
+		{0x200,8,0x200,0x100},
+		{0x267,2,0x267,0x267},
+		{0x264,4,0x264,0x80},
+		{0x132,4,0x132,0x0},
+		{0x132,2,0x80, 0x132},
+		{0x177,8,0x177,0x0},
+		{0x132,8,0x84, 0x0},
+		{},  /* not used */
+		{0x132,6,0x80, 0x100},
+		{0x200,6,0x100,0x100},
+		{0x264,2,0x264,0x80},
+		{0x280,4,0x280,0x100},
+		{0x2B9,3,0x2B9,0x2B9},
+		{0x2B9,5,0x2B9,0x2B9},
+		{0x280,6,0x280,0x100},
+		{0x132,4,0x132,0x0}};
+	u_char n;
+
+	n = inb(XD_JUMPER);
+	n = (drive ? n : (n >> 2)) & 0x33;
+	n = (n | (n >> 2)) & 0x0F;
+	if (xd_geo[3*drive])
+		xd_manual_geo_set(drive);
+	else
+		if (n != 7) {	
+			xd_info[drive].heads = (u_char)(geometry_table[n][1]);			/* heads */
+			xd_info[drive].cylinders = geometry_table[n][0];	/* cylinders */
+			xd_info[drive].sectors = 17;				/* sectors */
+#if 0
+			xd_info[drive].rwrite = geometry_table[n][2];	/* reduced write */
+			xd_info[drive].precomp = geometry_table[n][3]		/* write precomp */
+			xd_info[drive].ecc = 0x0B;				/* ecc length */
+#endif /* 0 */
+		}
+		else {
+			printk("xd%c: undetermined drive geometry\n",'a'+drive);
+			return;
+		}
+	xd_info[drive].control = 5;				/* control byte */
+	xd_setparam(CMD_DTCSETPARAM,drive,xd_info[drive].heads,xd_info[drive].cylinders,geometry_table[n][2],geometry_table[n][3],0x0B);
+	xd_recalibrate(drive);
+}
+
 __initfunc(static void xd_dtc_init_drive (u_char drive))
 {
 	u_char cmdblk[6],buf[64];
@@ -566,6 +748,8 @@ __initfunc(static void xd_dtc_init_drive (u_char drive))
 		xd_info[drive].heads = buf[0x0A];			/* heads */
 		xd_info[drive].cylinders = ((u_short *) (buf))[0x04];	/* cylinders */
 		xd_info[drive].sectors = 17;				/* sectors */
+		if (xd_geo[3*drive])
+			xd_manual_geo_set(drive);
 #if 0
 		xd_info[drive].rwrite = ((u_short *) (buf + 1))[0x05];	/* reduced write */
 		xd_info[drive].precomp = ((u_short *) (buf + 1))[0x06];	/* write precomp */
@@ -576,65 +760,128 @@ __initfunc(static void xd_dtc_init_drive (u_char drive))
 		xd_setparam(CMD_DTCSETPARAM,drive,xd_info[drive].heads,xd_info[drive].cylinders,((u_short *) (buf + 1))[0x05],((u_short *) (buf + 1))[0x06],buf[0x0F]);
 		xd_build(cmdblk,CMD_DTCSETSTEP,drive,0,0,0,0,7);
 		if (xd_command(cmdblk,PIO_MODE,0,0,0,XD_TIMEOUT * 2))
-			printk("xd_dtc_init_drive: error setting step rate for drive %d\n",drive);
+			printk("xd_dtc_init_drive: error setting step rate for xd%c\n", 'a'+drive);
 	}
 	else
-		printk("xd_dtc_init_drive: error reading geometry for drive %d\n",drive);
+		printk("xd_dtc_init_drive: error reading geometry for xd%c\n", 'a'+drive);
 }
 
 __initfunc(static void xd_wd_init_controller (unsigned int address))
 {
 	switch (address) {
-		case 0xC8000:	xd_iobase = 0x320; break;
+		case 0x00000:
+		case 0xC8000:	break;			/*initial: 0x320 */
 		case 0xCA000:	xd_iobase = 0x324; break;
 		case 0xCC000:   xd_iobase = 0x328; break;
 		case 0xCE000:   xd_iobase = 0x32C; break;
-		case 0xD0000:	xd_iobase = 0x328; break;
-		case 0xD8000:	xd_iobase = 0x32C; break;
+		case 0xD0000:	xd_iobase = 0x328; break; /* ? */
+		case 0xD8000:	xd_iobase = 0x32C; break; /* ? */
 		default:        printk("xd_wd_init_controller: unsupported BIOS address %06x\n",address);
-				xd_iobase = 0x320; break;
+				break;
 	}
-	xd_irq = 5;			/* don't know how to auto-detect this yet */
-	xd_dma = 3;
 	xd_maxsectors = 0x01;		/* this one doesn't wrap properly either... */
 
-	/* outb(0,XD_RESET); */		/* reset the controller */
+	outb(0,XD_RESET);		/* reset the controller */
+
+	xd_timer.expires = jiffies + XD_INIT_DISK_DELAY;
+	add_timer(&xd_timer);
+	sleep_on(&xdc_wait);
 }
 
 __initfunc(static void xd_wd_init_drive (u_char drive))
 {
-	u_char cmdblk[6],buf[0x200];
+	/* values from controller's BIOS - BIOS may be disabled */
+	static u_short geometry_table[][4] = {
+		{0x264,4,0x1C2,0x1C2},   /* common part */
+		{0x132,4,0x099,0x0},
+		{0x267,2,0x1C2,0x1C2},
+		{0x267,4,0x1C2,0x1C2},
+
+		{0x334,6,0x335,0x335},   /* 1004 series RLL */
+		{0x30E,4,0x30F,0x3DC},
+		{0x30E,2,0x30F,0x30F},
+		{0x267,4,0x268,0x268},
+
+		{0x3D5,5,0x3D6,0x3D6},   /* 1002 series RLL */
+		{0x3DB,7,0x3DC,0x3DC},
+		{0x264,4,0x265,0x265},
+		{0x267,4,0x268,0x268}};
 
+	u_char cmdblk[6],buf[0x200];
+	u_char n = 0,rll,jumper_state,use_jumper_geo;
+	u_char wd_1002 = (xd_sigs[xd_type].string[7] == '6');
+	
+	jumper_state = ~(inb(0x322));
+	if (jumper_state & 0x40)
+		xd_irq = 9;
+	rll = (jumper_state & 0x30) ? (0x04 << wd_1002) : 0;
 	xd_build(cmdblk,CMD_READ,drive,0,0,0,1,0);
 	if (!xd_command(cmdblk,PIO_MODE,buf,0,0,XD_TIMEOUT * 2)) {
 		xd_info[drive].heads = buf[0x1AF];				/* heads */
 		xd_info[drive].cylinders = ((u_short *) (buf + 1))[0xD6];	/* cylinders */
 		xd_info[drive].sectors = 17;					/* sectors */
+		if (xd_geo[3*drive])
+			xd_manual_geo_set(drive);
 #if 0
 		xd_info[drive].rwrite = ((u_short *) (buf))[0xD8];		/* reduced write */
 		xd_info[drive].wprecomp = ((u_short *) (buf))[0xDA];		/* write precomp */
 		xd_info[drive].ecc = buf[0x1B4];				/* ecc length */
 #endif /* 0 */
 		xd_info[drive].control = buf[0x1B5];				/* control byte */
-
-		xd_setparam(CMD_WDSETPARAM,drive,xd_info[drive].heads,xd_info[drive].cylinders,((u_short *) (buf))[0xD8],((u_short *) (buf))[0xDA],buf[0x1B4]);
+		use_jumper_geo = !(xd_info[drive].heads) || !(xd_info[drive].cylinders);
+		if (xd_geo[3*drive]) {
+			xd_manual_geo_set(drive);
+			xd_info[drive].control = rll ? 7 : 5;
+		}
+		else if (use_jumper_geo) {
+			n = (((jumper_state & 0x0F) >> (drive << 1)) & 0x03) | rll;
+			xd_info[drive].cylinders = geometry_table[n][0];
+			xd_info[drive].heads = (u_char)(geometry_table[n][1]);
+			xd_info[drive].control = rll ? 7 : 5;
+#if 0
+			xd_info[drive].rwrite = geometry_table[n][2];
+			xd_info[drive].wprecomp = geometry_table[n][3];
+			xd_info[drive].ecc = 0x0B;
+#endif /* 0 */
+		}
+		if (!wd_1002)
+			if (use_jumper_geo)
+				xd_setparam(CMD_WDSETPARAM,drive,xd_info[drive].heads,xd_info[drive].cylinders,
+					geometry_table[n][2],geometry_table[n][3],0x0B);
+			else
+				xd_setparam(CMD_WDSETPARAM,drive,xd_info[drive].heads,xd_info[drive].cylinders,
+					((u_short *) (buf))[0xD8],((u_short *) (buf))[0xDA],buf[0x1B4]);
+	/* 1002 based RLL controler requests converted adressing, but reports physical 
+	   (physical 26 sec., logical 17 sec.) 
+	   1004 based ???? */
+		if (rll & wd_1002) {
+			if ((xd_info[drive].cylinders *= 26,
+			     xd_info[drive].cylinders /= 17) > 1023)
+				xd_info[drive].cylinders = 1023;  /* 1024 ? */
+#if 0
+			xd_info[drive].rwrite *= 26; 
+			xd_info[drive].rwrite /= 17;
+			xd_info[drive].wprecomp *= 26
+			xd_info[drive].wprecomp /= 17;
+#endif /* 0 */
+		}
 	}
 	else
-		printk("xd_wd_init_drive: error reading geometry for drive %d\n",drive);	
+		printk("xd_wd_init_drive: error reading geometry for xd%c\n",'a'+drive);	
+
 }
 
 __initfunc(static void xd_seagate_init_controller (unsigned int address))
 {
 	switch (address) {
-		case 0xC8000:	xd_iobase = 0x320; break;
+		case 0x00000:
+		case 0xC8000:	break;			/*initial: 0x320 */
 		case 0xD0000:	xd_iobase = 0x324; break;
 		case 0xD8000:	xd_iobase = 0x328; break;
 		case 0xE0000:	xd_iobase = 0x32C; break;
 		default:	printk("xd_seagate_init_controller: unsupported BIOS address %06x\n",address);
-				xd_iobase = 0x320; break;
+				break;
 	}
-	xd_irq = 5;			/* the IRQ and DMA channel are fixed on the Seagate controllers */
-	xd_dma = 3;
 	xd_maxsectors = 0x40;
 
 	outb(0,XD_RESET);		/* reset the controller */
@@ -652,23 +899,22 @@ __initfunc(static void xd_seagate_init_drive (u_char drive))
 		xd_info[drive].control = 0;					/* control byte */
 	}
 	else
-		printk("xd_seagate_init_drive: error reading geometry from drive %d\n",drive);
+		printk("xd_seagate_init_drive: error reading geometry from xd%c\n", 'a'+drive);
 }
 
 /* Omti support courtesy Dirk Melchers */
 __initfunc(static void xd_omti_init_controller (unsigned int address))
 {
 	switch (address) {
-		case 0xC8000:	xd_iobase = 0x320; break;
+		case 0x00000:
+		case 0xC8000:	break;			/*initial: 0x320 */
 		case 0xD0000:	xd_iobase = 0x324; break;
 		case 0xD8000:	xd_iobase = 0x328; break;
 		case 0xE0000:	xd_iobase = 0x32C; break;
 		default:	printk("xd_omti_init_controller: unsupported BIOS address %06x\n",address);
-				xd_iobase = 0x320; break;
+				break;
 	}
 	
-	xd_irq = 5;			/* the IRQ and DMA channel are fixed on the Omti controllers */
-	xd_dma = 3;
 	xd_maxsectors = 0x40;
 
 	outb(0,XD_RESET);		/* reset the controller */
@@ -690,36 +936,63 @@ __initfunc(static void xd_override_init_drive (u_char drive))
 	u_short min[] = { 0,0,0 },max[] = { 16,1024,64 },test[] = { 0,0,0 };
 	u_char cmdblk[6],i;
 
-	for (i = 0; i < 3; i++) {
-		while (min[i] != max[i] - 1) {
-			test[i] = (min[i] + max[i]) / 2;
-			xd_build(cmdblk,CMD_SEEK,drive,(u_char) test[0],(u_short) test[1],(u_char) test[2],0,0);
-			if (!xd_command(cmdblk,PIO_MODE,0,0,0,XD_TIMEOUT * 2))
-				min[i] = test[i];
-			else
-				max[i] = test[i];
+	if (xd_geo[3*drive])
+		xd_manual_geo_set(drive);
+	else {
+		for (i = 0; i < 3; i++) {
+			while (min[i] != max[i] - 1) {
+				test[i] = (min[i] + max[i]) / 2;
+				xd_build(cmdblk,CMD_SEEK,drive,(u_char) test[0],(u_short) test[1],(u_char) test[2],0,0);
+				if (!xd_command(cmdblk,PIO_MODE,0,0,0,XD_TIMEOUT * 2))
+					min[i] = test[i];
+				else
+					max[i] = test[i];
+			}
+			test[i] = min[i];
 		}
-		test[i] = min[i];
+		xd_info[drive].heads = (u_char) min[0] + 1;
+		xd_info[drive].cylinders = (u_short) min[1] + 1;
+		xd_info[drive].sectors = (u_char) min[2] + 1;
 	}
-	xd_info[drive].heads = (u_char) min[0] + 1;
-	xd_info[drive].cylinders = (u_short) min[1] + 1;
-	xd_info[drive].sectors = (u_char) min[2] + 1;
 	xd_info[drive].control = 0;
 }
 
-/* xd_setup: initialise from command line parameters */
+/* xd_setup: initialise controler from command line parameters */
 __initfunc(void xd_setup (char *command,int *integers))
 {
-	xd_override = 1;
-
-	xd_type = integers[1];
-	xd_irq = integers[2];
-	xd_iobase = integers[3];
-	xd_dma = integers[4];
-
+	switch (integers[0]) {
+		case 4: if (integers[4] < 0)
+				nodma = 1;
+			else if (integers[4] < 8)
+				xd_dma = integers[4];
+		case 3: if ((integers[3] > 0) && (integers[3] <= 0x3FC))
+				xd_iobase = integers[3];
+		case 2: if ((integers[2] > 0) && (integers[2] < 16))
+				xd_irq = integers[2];
+		case 1: xd_override = 1;
+			if ((integers[1] >= 0) && (integers[1] < (sizeof(xd_sigs) / sizeof(xd_sigs[0]))))
+				xd_type = integers[1];
+		case 0: break;
+		default:printk("xd: too many parameters for xd\n");
+	}
 	xd_maxsectors = 0x01;
 }
 
+#ifndef MODULE
+/* xd_manual_geo_init: initialise drive geometry from command line parameters
+   (used only for WD drives) */
+__initfunc(void xd_manual_geo_init (char *command,int *integers))
+{
+	int i;
+	if (integers[0]%3 != 0) {
+		printk("xd: incorrect number of parameters for xd_geo\n");
+		return;
+	}
+	for (i = 0; (i < integers[0]) && (i < 3*XD_MAXDRIVES); i++)
+		xd_geo[i] = integers[i+1];
+}
+#endif /* MODULE */
+
 /* xd_setparam: set the drive characteristics */
 __initfunc(static void xd_setparam (u_char command,u_char drive,u_char heads,u_short cylinders,u_short rwrite,u_short wprecomp,u_char ecc))
 {
@@ -736,18 +1009,37 @@ __initfunc(static void xd_setparam (u_char command,u_char drive,u_char heads,u_s
 	cmdblk[13] = ecc;
 
 	if (xd_command(cmdblk,PIO_MODE,0,0,0,XD_TIMEOUT * 2))
-		printk("xd_setparam: error setting characteristics for drive %d\n",drive);
+		printk("xd: error setting characteristics for xd%c\n", 'a'+drive);
 }
 
 
 #ifdef MODULE
+static int xd[5] = { -1,-1,-1,-1, };
+
+MODULE_PARM(xd, "1-4i");
+MODULE_PARM(xd_geo, "3-6i");
+MODULE_PARM(nodma, "i");
+
 int init_module(void)
 {
+	int i,count = 0;
 	int error = xd_init();
 	if (!error)
 	{
 		printk(KERN_INFO "XD: Loaded as a module.\n");
+		for (i = 4; i > 0; i--)
+			if(((xd[i] = xd[i-1]) >= 0) && !count)
+				count = i;
+		if((xd[0] = count));
+			xd_setup(NULL, xd);
 		xd_geninit(&(struct gendisk) { 0,0,0,0,0,0,0,0,0,0,0 });
+		if (!xd_drives) {
+					/* no drives detected - unload module */
+			unregister_blkdev(MAJOR_NR, "xd");
+			return (-1);
+		}
+		for (i = 0; i < xd_drives; i++)
+			resetup_one_dev(&xd_gendisk, i);
 	}
         
 	return error;
@@ -756,8 +1048,12 @@ int init_module(void)
 void cleanup_module(void)
 {
 	unregister_blkdev(MAJOR_NR, "xd");
-	free_irq(xd_irq, NULL);
-	free_dma(xd_dma);
+	if (xd_drives) {
+		free_irq(xd_irq, NULL);
+		free_dma(xd_dma);
+		if (xd_dma_buffer)
+			xd_dma_mem_free((unsigned long)xd_dma_buffer, xd_maxsectors * 0x200);
+	}
 }
 #endif /* MODULE */