diff options
| author | skra <skra@FreeBSD.org> | 2015-11-06 17:12:33 +0000 |
|---|---|---|
| committer | skra <skra@FreeBSD.org> | 2015-11-06 17:12:33 +0000 |
| commit | e38c1c2c8250f9f922da2776b0a2102b30f94d5a (patch) | |
| tree | ad05eedad5379a1383447731f5e7f3ef534b3ff9 /sys/arm | |
| parent | 31835e2e2bef15459f3018af39a88847733cfd9c (diff) | |
| download | FreeBSD-src-e38c1c2c8250f9f922da2776b0a2102b30f94d5a.zip FreeBSD-src-e38c1c2c8250f9f922da2776b0a2102b30f94d5a.tar.gz | |
Make interrupt dispatching MP safe. Use GPU interrupt bit in per-core
interrupt status register to process shared interrupts only if the bit
is active and only on core to which they are routed.
Reviewed by: imp, loos
Approved by: kib (mentor)
Differential Revision: https://reviews.freebsd.org/D3723
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_intr.c | 4 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2836.c | 2 | ||||
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2836.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c index 45c2e97..d8574e6 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_intr.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_intr.c @@ -163,7 +163,9 @@ arm_get_next_irq(int last_irq) irq = 0; #ifdef SOC_BCM2836 - if ((ret = bcm2836_get_next_irq(irq)) >= 0) + if ((ret = bcm2836_get_next_irq(irq)) < 0) + return (-1); + if (ret != BCM2836_GPU_IRQ) return (ret + BANK3_START); #endif diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c index 58ad8e4..c6f8cb0 100644 --- a/sys/arm/broadcom/bcm2835/bcm2836.c +++ b/sys/arm/broadcom/bcm2835/bcm2836.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #define ARM_LOCAL_INT_TIMER(n) (0x40 + (n) * 4) #define ARM_LOCAL_INT_MAILBOX(n) (0x50 + (n) * 4) #define ARM_LOCAL_INT_PENDING(n) (0x60 + (n) * 4) -#define INT_PENDING_MASK 0x01f +#define INT_PENDING_MASK 0x011f #define MAILBOX0_IRQ 4 #define MAILBOX0_IRQEN (1 << 0) diff --git a/sys/arm/broadcom/bcm2835/bcm2836.h b/sys/arm/broadcom/bcm2835/bcm2836.h index 217dae1..7acd41b 100644 --- a/sys/arm/broadcom/bcm2835/bcm2836.h +++ b/sys/arm/broadcom/bcm2835/bcm2836.h @@ -30,6 +30,8 @@ #ifndef _BCM2815_BCM2836_H #define _BCM2815_BCM2836_H +#define BCM2836_GPU_IRQ 8 + int bcm2836_get_next_irq(int); void bcm2836_mask_irq(uintptr_t); void bcm2836_unmask_irq(uintptr_t); |
