diff options
| author | mav <mav@FreeBSD.org> | 2010-01-10 16:05:05 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2010-01-10 16:05:05 +0000 |
| commit | 97f4d6d3f0bb5ceddd1ecd5b51609b7da4c3cf82 (patch) | |
| tree | 739838350155c2c5ec6aac06bf220d00cb36e558 /sys | |
| parent | c37dda0cc99c6603b01a83fee6dfa1e77209a7ee (diff) | |
| download | FreeBSD-src-97f4d6d3f0bb5ceddd1ecd5b51609b7da4c3cf82.zip FreeBSD-src-97f4d6d3f0bb5ceddd1ecd5b51609b7da4c3cf82.tar.gz | |
While AHCI specification tells that multi-vector MSI doesn't use global IS
register, nVidia chipsets have different oppinion, requiring every interrupt
to be acknowledged there.
While there, add interrupt descriptions in multi-vector MSI mode.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ahci/ahci.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index cfbe43b..ca7b057 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -570,6 +570,12 @@ ahci_setup_interrupt(device_t dev) device_printf(dev, "unable to setup interrupt\n"); return ENXIO; } + if (ctlr->numirqs > 1) { + bus_describe_intr(dev, ctlr->irqs[i].r_irq, + ctlr->irqs[i].handle, + ctlr->irqs[i].mode == AHCI_IRQ_MODE_ONE ? + "ch%d" : "%d", i); + } } return (0); } @@ -622,8 +628,14 @@ ahci_intr_one(void *data) int unit; unit = irq->r_irq_rid - 1; + /* Some controllers have edge triggered IS. */ + if (ctlr->quirks & AHCI_Q_EDGEIS) + ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); if ((arg = ctlr->interrupt[unit].argument)) ctlr->interrupt[unit].function(arg); + /* AHCI declares level triggered IS. */ + if (!(ctlr->quirks & AHCI_Q_EDGEIS)) + ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); } static struct resource * |
