Commit 56d40f64 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] cciss: IRQ sharing fix

From: mikem@beardog.cca.cpqcorp.net

This patch fixes a bug when sharing IRQs with another controller that
receives a lot of interrupts.  Without this check we will panic the system
when unloading and reloading the driver.  This is in 2.4.
parent a05d0264
...@@ -1983,7 +1983,7 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1983,7 +1983,7 @@ static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs)
/* Is this interrupt for us? */ /* Is this interrupt for us? */
if ( h->access.intr_pending(h) == 0) if (( h->access.intr_pending(h) == 0) || (h->interrupts_enabled == 0))
return IRQ_NONE; return IRQ_NONE;
/* /*
......
...@@ -48,7 +48,7 @@ struct ctlr_info ...@@ -48,7 +48,7 @@ struct ctlr_info
unsigned long io_mem_length; unsigned long io_mem_length;
CfgTable_struct *cfgtable; CfgTable_struct *cfgtable;
int intr; int intr;
int interrupts_enabled;
int max_commands; int max_commands;
int commands_outstanding; int commands_outstanding;
int max_outstanding; /* Debug */ int max_outstanding; /* Debug */
...@@ -134,9 +134,11 @@ static void SA5_intr_mask(ctlr_info_t *h, unsigned long val) ...@@ -134,9 +134,11 @@ static void SA5_intr_mask(ctlr_info_t *h, unsigned long val)
{ {
if (val) if (val)
{ /* Turn interrupts on */ { /* Turn interrupts on */
h->interrupts_enabled = 1;
writel(0, h->vaddr + SA5_REPLY_INTR_MASK_OFFSET); writel(0, h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
} else /* Turn them off */ } else /* Turn them off */
{ {
h->interrupts_enabled = 0;
writel( SA5_INTR_OFF, writel( SA5_INTR_OFF,
h->vaddr + SA5_REPLY_INTR_MASK_OFFSET); h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
} }
...@@ -150,9 +152,11 @@ static void SA5B_intr_mask(ctlr_info_t *h, unsigned long val) ...@@ -150,9 +152,11 @@ static void SA5B_intr_mask(ctlr_info_t *h, unsigned long val)
{ {
if (val) if (val)
{ /* Turn interrupts on */ { /* Turn interrupts on */
h->interrupts_enabled = 1;
writel(0, h->vaddr + SA5_REPLY_INTR_MASK_OFFSET); writel(0, h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
} else /* Turn them off */ } else /* Turn them off */
{ {
h->interrupts_enabled = 0;
writel( SA5B_INTR_OFF, writel( SA5B_INTR_OFF,
h->vaddr + SA5_REPLY_INTR_MASK_OFFSET); h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment