mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-21 15:45:02 +00:00
Code Issues Releases Activity

Explicitly acknowledge MSI completion, as required by SiI3124 datasheet.

Browse Source 
It makes MSI working there. Later (and cheaper) PCIe chips (3132/3531)
still randomly crashing system in few seconds of high MSI rates, generating
something inaporopriate, like NMI or "Fatal trap 30".
This commit is contained in:
Alexander Motin 2009-12-07 18:37:50 +00:00
parent f1a6fd5d07
commit 3005368137
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=200223
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/siis/siis.c
View File

@ -143,6 +143,7 @@ siis_attach(device_t dev)
if (!(ctlr->r_gmem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
&ctlr->r_grid, RF_ACTIVE)))
return (ENXIO);
ctlr->gctl = ATA_INL(ctlr->r_gmem, SIIS_GCTL);
/* Channels memory */
ctlr->r_rid = PCIR_BAR(2);
if (!(ctlr->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
@ -221,7 +222,8 @@ siis_suspend(device_t dev)
bus_generic_suspend(dev);
/* Put controller into reset state. */
ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, SIIS_GCTL_GRESET);
ctlr->gctl |= SIIS_GCTL_GRESET;
ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl);
return 0;
}
@ -231,10 +233,13 @@ siis_resume(device_t dev)
struct siis_controller *ctlr = device_get_softc(dev);
/* Put controller into reset state. */
ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, SIIS_GCTL_GRESET);
ctlr->gctl |= SIIS_GCTL_GRESET;
ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl);
DELAY(10000);
/* Get controller out of reset state and enable port interrupts. */
ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, 0x0000000f);
ctlr->gctl &= ~(SIIS_GCTL_GRESET | SIIS_GCTL_I2C_IE);
ctlr->gctl |= 0x0000000f;
ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl);
return (bus_generic_resume(dev));
}
@ -288,6 +293,11 @@ siis_intr(void *data)
ctlr->interrupt[unit].function(arg);
}
}
/* Acknowledge interrupt, if MSI enabled. */
if (ctlr->irq.r_irq_rid) {
ATA_OUTL(ctlr->r_gmem, SIIS_GCTL,
ctlr->gctl | SIIS_GCTL_MSIACK);
}
}
static struct resource *

1
sys/dev/siis/siis.h
View File

@ -403,6 +403,7 @@ struct siis_controller {
} irq;
int quirks;
int channels;
uint32_t gctl;
struct {
void (*function)(void *);
void *argument;