diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-28 11:18:35 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-28 11:18:35 -0500 |
| commit | 7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c (patch) | |
| tree | 4cd7aae38012dfc1ff6c62be20ef8840e56d8383 /drivers/scsi/aacraid/rkt.c | |
| parent | 392160335c798bbe94ab3aae6ea0c85d32b81bbc (diff) | |
| parent | 8224bfa84d510630b40ea460b2bb380c91acb8ae (diff) | |
| download | talos-obmc-linux-7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c.tar.gz talos-obmc-linux-7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c.zip | |
Merge HEAD from ../scsi-misc-2.6-tmp
Diffstat (limited to 'drivers/scsi/aacraid/rkt.c')
| -rw-r--r-- | drivers/scsi/aacraid/rkt.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c index 7d68b7825137..557287a0b80b 100644 --- a/drivers/scsi/aacraid/rkt.c +++ b/drivers/scsi/aacraid/rkt.c @@ -88,6 +88,16 @@ static irqreturn_t aac_rkt_intr(int irq, void *dev_id, struct pt_regs *regs) } /** + * aac_rkt_disable_interrupt - Disable interrupts + * @dev: Adapter + */ + +static void aac_rkt_disable_interrupt(struct aac_dev *dev) +{ + rkt_writeb(dev, MUnit.OIMR, dev->OIMR = 0xff); +} + +/** * rkt_sync_cmd - send a command and wait * @dev: Adapter * @command: Command to execute @@ -412,10 +422,19 @@ int aac_rkt_init(struct aac_dev *dev) * Fill in the function dispatch table. */ dev->a_ops.adapter_interrupt = aac_rkt_interrupt_adapter; + dev->a_ops.adapter_disable_int = aac_rkt_disable_interrupt; dev->a_ops.adapter_notify = aac_rkt_notify_adapter; dev->a_ops.adapter_sync_cmd = rkt_sync_cmd; dev->a_ops.adapter_check_health = aac_rkt_check_health; + /* + * First clear out all interrupts. Then enable the one's that we + * can handle. + */ + rkt_writeb(dev, MUnit.OIMR, 0xff); + rkt_writel(dev, MUnit.ODR, 0xffffffff); + rkt_writeb(dev, MUnit.OIMR, dev->OIMR = 0xfb); + if (aac_init_adapter(dev) == NULL) goto error_irq; /* @@ -438,6 +457,7 @@ error_kfree: kfree(dev->queues); error_irq: + rkt_writeb(dev, MUnit.OIMR, dev->OIMR = 0xff); free_irq(dev->scsi_host_ptr->irq, (void *)dev); error_iounmap: |
