Page MenuHomeFreeBSD
Files F153716801

D41322.id.diff
No OneTemporary
Actions

D41322.id.diff
View Options

diff --git a/sys/arm/arm/gic.h b/sys/arm/arm/gic.h
--- a/sys/arm/arm/gic.h
+++ b/sys/arm/arm/gic.h
@@ -39,6 +39,13 @@
#ifndef _ARM_GIC_H_
#define _ARM_GIC_H_
+/* The GICv1/2 only supports 8 CPUs */
+#if MAXCPU > 8
+#define GIC_MAXCPU 8
+#else
+#define GIC_MAXCPU MAXCPU
+#endif
+
struct arm_gic_softc {
device_t gic_dev;
void * gic_intrhand;
@@ -50,7 +57,7 @@
struct mtx mutex;
uint32_t nirqs;
uint32_t typer;
- uint32_t last_irq[MAXCPU];
+ uint32_t last_irq[GIC_MAXCPU];
uint32_t gic_iidr;
u_int gic_bus;
diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
--- a/sys/arm/arm/gic.c
+++ b/sys/arm/arm/gic.c
@@ -146,7 +146,7 @@
#endif
TUNABLE_INT("hw.gic.debug_spurious", &gic_debug_spurious);
-static u_int arm_gic_map[MAXCPU];
+static u_int arm_gic_map[GIC_MAXCPU];
static struct arm_gic_softc *gic_sc = NULL;
@@ -209,6 +209,7 @@
/* Set the mask so we can find this CPU to send it IPIs */
cpu = PCPU_GET(cpuid);
+ MPASS(cpu < GIC_MAXCPU);
arm_gic_map[cpu] = gic_cpu_mask(sc);
for (irq = 0; irq < sc->nirqs; irq += 4)
@@ -317,6 +318,12 @@
if (gic_sc)
return (ENXIO);
+ if (mp_ncpus > GIC_MAXCPU) {
+ device_printf(dev, "Too many CPUs for IPIs to work (%d > %d)\n",
+ mp_ncpus, GIC_MAXCPU);
+ return (ENXIO);
+ }
+
sc = device_get_softc(dev);
if (bus_alloc_resources(dev, arm_gic_spec, sc->gic_res)) {
@@ -362,6 +369,7 @@
/* Find the current cpu mask */
mask = gic_cpu_mask(sc);
/* Set the mask so we can find this CPU to send it IPIs */
+ MPASS(PCPU_GET(cpuid) < GIC_MAXCPU);
arm_gic_map[PCPU_GET(cpuid)] = mask;
/* Set all four targets to this cpu */
mask |= mask << 8;
@@ -649,7 +657,7 @@
{
uint32_t cpu, end, mask;
- end = min(mp_ncpus, 8);
+ end = min(mp_ncpus, GIC_MAXCPU);
for (cpu = end; cpu < MAXCPU; cpu++)
if (CPU_ISSET(cpu, cpus))
return (EINVAL);
@@ -988,9 +996,12 @@
struct gic_irqsrc *gi = (struct gic_irqsrc *)isrc;
uint32_t val = 0, i;
- for (i = 0; i < MAXCPU; i++)
- if (CPU_ISSET(i, &cpus))
+ for (i = 0; i < MAXCPU; i++) {
+ if (CPU_ISSET(i, &cpus)) {
+ MPASS(i < GIC_MAXCPU);
val |= arm_gic_map[i] << GICD_SGI_TARGET_SHIFT;
+ }
+ }
gic_d_write_4(sc, GICD_SGIR, val | gi->gi_irq);
}

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 24, 4:24 AM (13 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32040517
Default Alt Text
D41322.id.diff (2 KB)

Event Timeline