Marcelo, please apply [PATCH] AHA152x driver hangs on PCMCIA card eject, kernel2.4.22-pre6

Marcelo, please apply [PATCH] AHA152x driver hangs on PCMCIA card eject, kernel2.4.22-pre6

[Bhavesh P. Davda]

[-- Attachment #1: Type: text/plain, Size: 3181 bytes --]

Marcelo,

David Hinds approves of this patch (Thanks, Dave!). Please apply to 2.4.22

Thanks!

- Bhavesh
--
Bhavesh P. Davda     E-mail    : bhavesh@avaya.com
Avaya Inc.           Phone/Fax : (303) 538-4438
Room B3-B03, 1300 West 120th Avenue
Westminster, CO 80234

-------David Hind's reply------------
From: David Hinds [dhinds@sonic.net]
Sent: Saturday, July 19, 2003 3:32 PM
To: Bhavesh P. Davda
Subject: Re: [PATCH] AHA152x driver hangs on PCMCIA card eject,
kernel2.4.22-pre6

On Thu, Jul 17, 2003 at 02:29:05PM -0600, Bhavesh P. Davda wrote:
>
> Attached is a patch that takes into account comments I have received in
> response to the original patch I posted. Please peruse it, and if it looks
> okay, please recommend that Marcelo pick it up for 2.4.22.

It looks ok to me.  You can go ahead and send to Marcelo.

-- Dave
-------------------------------------

> -----Original Message-----
> From: Bhavesh P. Davda
> Sent: Thursday, July 17, 2003 2:29 PM
> To: David Hinds
> Cc: Alan Cox; Linux Kernel Mailing List; fischer@norbit.de;
> dahinds@users.sourceforge.net; Marcelo Tosatti
> Subject: RE: [PATCH] AHA152x driver hangs on PCMCIA card eject,
> kernel2.4.22-pre6
>
>
> > -----Original Message-----
> > From: David Hinds [mailto:dhinds@sonic.net]
> > Sent: Thursday, July 17, 2003 11:56 AM
> > To: Bhavesh P. Davda
> > Cc: Alan Cox; Linux Kernel Mailing List; fischer@norbit.de;
> > dahinds@users.sourceforge.net; Marcelo Tosatti
> > Subject: Re: [PATCH] AHA152x driver hangs on PCMCIA card eject,
> > kernel2.4.22-pre6
> >
> >
> > On Thu, Jul 17, 2003 at 08:15:39AM -0600, Bhavesh P. Davda wrote:
> >
> > > > Right - scsi_unregister should not be called on a timer
> event, instead
> > > > it needs to kick off a task queue
> >
> > The removal timers need to be taken out from most *_cs drivers; they
> > are a holdover from when card removal events were delivered in
> > interrupt context, and when that was changed to an event handler
> > thread, drivers were not changed accordingly.  The removal routine
> > should now just be called in-line instead of firing up a timer.
> >
> > > 2. What happens if there is no physical device hanging off an I/O port
> > > address? I am guessing, that on an i386 host, the inb returns
> > 0xFF, but am
> > > not sure what happens on other architectures. I have a question
> > outstanding
> > > to Intel for this.
> >
> > On most but not all x86 systems floating ports return 0xff.  Checking
> > for that or other "impossible" register values should be at least
> > harmless on other architectures.
> >
> > -- Dave
>
> Thank you, Dave!
>
> Attached is a patch that takes into account comments I have
> received in response to the original patch I posted. Please
> peruse it, and if it looks okay, please recommend that Marcelo
> pick it up for 2.4.22.
>
> FYI, I have tested this patch on a PIII/440BX with a TI1225 based
> PCMCIA card reader and Adaptec SlimSCSI 1460D SCSI adapter card
> connected to a Fujitsu SCSI MO drive.
>
> Thanks!
>
> - Bhavesh
> --
> Bhavesh P. Davda     E-mail    : bhavesh@avaya.com
> Avaya Inc.           Phone/Fax : (303) 538-4438
> Room B3-B03, 1300 West 120th Avenue
> Westminster, CO 80234
>

[-- Attachment #2: linux-2.4.22-aha152x.patch --]
[-- Type: application/octet-stream, Size: 6645 bytes --]

diff -Naur linux-2.4.22-pre6/drivers/scsi/aha152x.c linux-2.4.22-bpd/drivers/scsi/aha152x.c
--- linux-2.4.22-pre6/drivers/scsi/aha152x.c	2003-06-13 08:51:36.000000000 -0600
+++ linux-2.4.22-bpd/drivers/scsi/aha152x.c	2003-07-15 16:05:09.000000000 -0600
@@ -1930,12 +1930,30 @@
 static void intr(int irqno, void *dev_id, struct pt_regs *regs)
 {
 	struct Scsi_Host *shpnt = lookup_irq(irqno);
+	unsigned char rev, dmacntrl0;
 
 	if (!shpnt) {
 		printk(KERN_ERR "aha152x: catched interrupt %d for unknown controller.\n", irqno);
 		return;
 	}
 
+	/*
+	 * Read a couple of registers that are known to not be all 1's. If
+	 * we read all 1's (-1), that means that either:
+	 * a. The host adapter chip has gone bad, and we cannot control it,
+	 * OR
+	 * b. The host adapter is a PCMCIA card that has been ejected
+	 * In either case, we cannot do anything with the host adapter at
+	 * this point in time. So just ignore the interrupt and return.
+	 * In the latter case, the interrupt might actually be meant for
+	 * someone else sharing this IRQ, and that driver will handle it
+	 */
+	rev = GETPORT(REV);
+	dmacntrl0 = GETPORT(DMACNTRL0);
+	if ((rev == 0xFF) && (dmacntrl0 == 0xFF)) {
+		return;
+	}
+
 	/* no more interrupts from the controller, while we're busy.
 	   INTEN is restored by the BH handler */
 	CLRBITS(DMACNTRL0, INTEN);
diff -Naur linux-2.4.22-pre6/drivers/scsi/pcmcia/aha152x_stub.c linux-2.4.22-bpd/drivers/scsi/pcmcia/aha152x_stub.c
--- linux-2.4.22-pre6/drivers/scsi/pcmcia/aha152x_stub.c	2001-12-21 10:41:55.000000000 -0700
+++ linux-2.4.22-bpd/drivers/scsi/pcmcia/aha152x_stub.c	2003-07-17 14:03:03.000000000 -0600
@@ -40,7 +40,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/timer.h>
 #include <linux/ioport.h>
 #include <scsi/scsi.h>
 #include <linux/major.h>
@@ -139,8 +138,6 @@
     if (!info) return NULL;
     memset(info, 0, sizeof(*info));
     link = &info->link; link->priv = info;
-    link->release.function = &aha152x_release_cs;
-    link->release.data = (u_long)link;
 
     link->io.NumPorts1 = 0x20;
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
@@ -193,7 +190,6 @@
     if (*linkp == NULL)
 	return;
 
-    del_timer(&link->release);
     if (link->state & DEV_CONFIG) {
 	aha152x_release_cs((u_long)link);
 	if (link->state & DEV_STALE_CONFIG) {
@@ -383,7 +379,7 @@
     case CS_EVENT_CARD_REMOVAL:
 	link->state &= ~DEV_PRESENT;
 	if (link->state & DEV_CONFIG)
-	    mod_timer(&link->release, jiffies + HZ/20);
+	    aha152x_release_cs((u_long)link);
 	break;
     case CS_EVENT_CARD_INSERTION:
 	link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
diff -Naur linux-2.4.22-pre6/drivers/scsi/pcmcia/fdomain_stub.c linux-2.4.22-bpd/drivers/scsi/pcmcia/fdomain_stub.c
--- linux-2.4.22-pre6/drivers/scsi/pcmcia/fdomain_stub.c	2001-12-21 10:41:55.000000000 -0700
+++ linux-2.4.22-bpd/drivers/scsi/pcmcia/fdomain_stub.c	2003-07-17 14:04:36.000000000 -0600
@@ -37,7 +37,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/timer.h>
 #include <linux/ioport.h>
 #include <scsi/scsi.h>
 #include <linux/major.h>
@@ -125,8 +124,6 @@
     if (!info) return NULL;
     memset(info, 0, sizeof(*info));
     link = &info->link; link->priv = info;
-    link->release.function = &fdomain_release;
-    link->release.data = (u_long)link;
 
     link->io.NumPorts1 = 0x10;
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
@@ -179,7 +176,6 @@
     if (*linkp == NULL)
 	return;
 
-    del_timer(&link->release);
     if (link->state & DEV_CONFIG) {
 	fdomain_release((u_long)link);
 	if (link->state & DEV_STALE_CONFIG) {
@@ -350,7 +346,7 @@
     case CS_EVENT_CARD_REMOVAL:
 	link->state &= ~DEV_PRESENT;
 	if (link->state & DEV_CONFIG)
-	    mod_timer(&link->release, jiffies + HZ/20);
+	    fdomain_release((u_long)link);
 	break;
     case CS_EVENT_CARD_INSERTION:
 	link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
diff -Naur linux-2.4.22-pre6/drivers/scsi/pcmcia/nsp_cs.c linux-2.4.22-bpd/drivers/scsi/pcmcia/nsp_cs.c
--- linux-2.4.22-pre6/drivers/scsi/pcmcia/nsp_cs.c	2003-06-13 08:51:36.000000000 -0600
+++ linux-2.4.22-bpd/drivers/scsi/pcmcia/nsp_cs.c	2003-07-17 14:07:43.000000000 -0600
@@ -36,7 +36,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/timer.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/tqueue.h>
@@ -1341,10 +1340,6 @@
 	link = &info->link;
 	link->priv = info;
 
-	/* Initialize the dev_link_t structure */
-	link->release.function	 = &nsp_cs_release;
-	link->release.data	 = (u_long)link;
-
 	/* The io structure describes IO port mapping */
 	link->io.NumPorts1	 = 0x10;
 	link->io.Attributes1	 = IO_DATA_PATH_WIDTH_AUTO;
@@ -1415,7 +1410,6 @@
 		return;
 	}
 
-	del_timer(&link->release);
 	if (link->state & DEV_CONFIG) {
 		nsp_cs_release((u_long)link);
 		if (link->state & DEV_STALE_CONFIG) {
@@ -1660,7 +1654,7 @@
 		link->state &= ~DEV_PRESENT;
 		if (link->state & DEV_CONFIG) {
 			((scsi_info_t *)link->priv)->stop = 1;
-			mod_timer(&link->release, jiffies + HZ/20);
+			nsp_cs_release((u_long)link);
 		}
 		break;
 
diff -Naur linux-2.4.22-pre6/drivers/scsi/pcmcia/qlogic_stub.c linux-2.4.22-bpd/drivers/scsi/pcmcia/qlogic_stub.c
--- linux-2.4.22-pre6/drivers/scsi/pcmcia/qlogic_stub.c	2001-12-21 10:41:55.000000000 -0700
+++ linux-2.4.22-bpd/drivers/scsi/pcmcia/qlogic_stub.c	2003-07-17 14:05:36.000000000 -0600
@@ -37,7 +37,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/timer.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
@@ -132,8 +131,6 @@
     if (!info) return NULL;
     memset(info, 0, sizeof(*info));
     link = &info->link; link->priv = info;
-    link->release.function = &qlogic_release;
-    link->release.data = (u_long)link;
 
     link->io.NumPorts1 = 16;
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
@@ -186,7 +183,6 @@
     if (*linkp == NULL)
 	return;
 
-    del_timer(&link->release);
     if (link->state & DEV_CONFIG) {
 	qlogic_release((u_long)link);
 	if (link->state & DEV_STALE_CONFIG) {
@@ -371,7 +367,7 @@
     case CS_EVENT_CARD_REMOVAL:
 	link->state &= ~DEV_PRESENT;
 	if (link->state & DEV_CONFIG)
-	    mod_timer(&link->release, jiffies + HZ/20);
+	    qlogic_release((u_long)link);
 	break;
     case CS_EVENT_CARD_INSERTION:
 	link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;

Re: Marcelo, please apply [PATCH] AHA152x driver hangs on PCMCIA card eject, kernel2.4.22-pre6

[Marcelo Tosatti]

On Mon, 21 Jul 2003, Bhavesh P. Davda wrote:

> Marcelo,
>
> David Hinds approves of this patch (Thanks, Dave!). Please apply to 2.4.22

Applied,

Thanks.