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

powerpc: Fix opaque irq data initialization

Browse Source 
The powerpc_intr structure is not zero-initialized, so on an invariants
build would panic in the xics driver with an invalid pointer.  Also fix the
xics driver to share the private data setup code between xics_enable() and
xics_bind().

Reported by:	Leonardo Bianconi
This commit is contained in:
Justin Hibbits 2019-01-19 04:47:19 +00:00
parent d0c7cde53e
commit 15fba9d3be
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/powerpc/powerpc/intr_machdep.c
View File

@ -209,6 +209,7 @@ intr_lookup(u_int irq)
i->event = NULL;
i->cntp = NULL;
i->priv = NULL;
i->trig = INTR_TRIGGER_CONFORM;
i->pol = INTR_POLARITY_CONFORM;
i->irq = irq;

28
sys/powerpc/pseries/xics.c
View File

@ -295,6 +295,20 @@ xics_attach(device_t dev)
return (0);
}
static __inline struct xicp_intvec *
xicp_setup_priv(struct xicp_softc *sc, u_int irq, void **priv)
{
if (*priv == NULL) {
KASSERT(sc->nintvecs + 1 < nitems(sc->intvecs),
("Too many XICP interrupts"));
mtx_lock(&sc->sc_mtx);
*priv = &sc->intvecs[sc->nintvecs++];
mtx_unlock(&sc->sc_mtx);
}
return (*priv);
}
/*
* PIC I/F methods.
*/
@ -311,10 +325,7 @@ xicp_bind(device_t dev, u_int irq, cpuset_t cpumask, void **priv)
if (irq == MAX_XICP_IRQS)
return;
if (*priv == NULL)
*priv = &sc->intvecs[sc->nintvecs++];
iv = *priv;
iv = xicp_setup_priv(sc, irq, priv);
/*
* This doesn't appear to actually support affinity groups, so pick a
@ -426,14 +437,7 @@ xicp_enable(device_t dev, u_int irq, u_int vector, void **priv)
/* Bind to this CPU to start: distrib. ID is last entry in gserver# */
cpu = PCPU_GET(hwref);
if (*priv == NULL) {
KASSERT(sc->nintvecs + 1 < nitems(sc->intvecs),
("Too many XICP interrupts"));
mtx_lock(&sc->sc_mtx);
*priv = &sc->intvecs[sc->nintvecs++];
mtx_unlock(&sc->sc_mtx);
}
intr = *priv;
intr = xicp_setup_priv(sc, irq, priv);
intr->irq = irq;
intr->vector = vector;