d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add initial single-vector MSI support into atapci driver.

Browse Source 
Works fine with AHCI and theoretically other MSI capable devices.

At this moment support disabled by default. To enable it, set
"hint.atapci.X.msi=1" device hint.
This commit is contained in:
Alexander Motin 2009-02-15 20:37:55 +00:00
parent 719085d9d1
commit a3b7c762ba
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/ata/ata-pci.c
View File

@ -150,7 +150,9 @@ ata_pci_detach(device_t dev)
if (ctlr->r_irq) { if (ctlr->r_irq) {
bus_teardown_intr(dev, ctlr->r_irq, ctlr->handle); bus_teardown_intr(dev, ctlr->r_irq, ctlr->handle);
bus_release_resource(dev, SYS_RES_IRQ, ATA_IRQ_RID, ctlr->r_irq); bus_release_resource(dev, SYS_RES_IRQ, ctlr->r_irq_rid, ctlr->r_irq);
if (ctlr->r_irq_rid != ATA_IRQ_RID)
pci_release_msi(dev);
} }
if (ctlr->r_res2) if (ctlr->r_res2)
bus_release_resource(dev, ctlr->r_type2, ctlr->r_rid2, ctlr->r_res2); bus_release_resource(dev, ctlr->r_type2, ctlr->r_rid2, ctlr->r_res2);
@ -653,11 +655,19 @@ int
ata_setup_interrupt(device_t dev, void *intr_func) ata_setup_interrupt(device_t dev, void *intr_func)
{ {
struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_pci_controller *ctlr = device_get_softc(dev);
int rid = ATA_IRQ_RID; int i, msi = 0;
if (!ctlr->legacy) { if (!ctlr->legacy) {
if (!(ctlr->r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, if (resource_int_value(device_get_name(dev),
RF_SHAREABLE | RF_ACTIVE))) { device_get_unit(dev), "msi", &i) == 0 && i != 0)
msi = 1;
if (msi && pci_msi_count(dev) > 0 && pci_alloc_msi(dev, &msi) == 0) {
ctlr->r_irq_rid = 0x1;
} else {
ctlr->r_irq_rid = ATA_IRQ_RID;
}
if (!(ctlr->r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
&ctlr->r_irq_rid, RF_SHAREABLE | RF_ACTIVE))) {
device_printf(dev, "unable to map interrupt\n"); device_printf(dev, "unable to map interrupt\n");
return ENXIO; return ENXIO;
} }

1
sys/dev/ata/ata-pci.h
View File

@ -45,6 +45,7 @@ struct ata_pci_controller {
int r_type2; int r_type2;
int r_rid2; int r_rid2;
struct resource *r_res2; struct resource *r_res2;
int r_irq_rid;
struct resource *r_irq; struct resource *r_irq;
void *handle; void *handle;
struct ata_chip_id *chip; struct ata_chip_id *chip;