diff options
-rw-r--r-- | drivers/irqchip/irq-gic-v3-its.c | 2 | ||||
-rw-r--r-- | include/linux/irqchip/arm-gic-v3.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index ec20d4a942e0..826da706be4b 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c | |||
@@ -1388,7 +1388,7 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) | |||
1388 | writeq_relaxed(baser, its->base + GITS_CBASER); | 1388 | writeq_relaxed(baser, its->base + GITS_CBASER); |
1389 | tmp = readq_relaxed(its->base + GITS_CBASER); | 1389 | tmp = readq_relaxed(its->base + GITS_CBASER); |
1390 | writeq_relaxed(0, its->base + GITS_CWRITER); | 1390 | writeq_relaxed(0, its->base + GITS_CWRITER); |
1391 | writel_relaxed(1, its->base + GITS_CTLR); | 1391 | writel_relaxed(GITS_CTLR_ENABLE, its->base + GITS_CTLR); |
1392 | 1392 | ||
1393 | if ((tmp ^ baser) & GITS_BASER_SHAREABILITY_MASK) { | 1393 | if ((tmp ^ baser) & GITS_BASER_SHAREABILITY_MASK) { |
1394 | pr_info("ITS: using cache flushing for cmd queue\n"); | 1394 | pr_info("ITS: using cache flushing for cmd queue\n"); |
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index cbdd440d486d..781974afff9f 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h | |||
@@ -166,6 +166,9 @@ | |||
166 | 166 | ||
167 | #define GITS_TRANSLATER 0x10040 | 167 | #define GITS_TRANSLATER 0x10040 |
168 | 168 | ||
169 | #define GITS_CTLR_ENABLE (1U << 0) | ||
170 | #define GITS_CTLR_QUIESCENT (1U << 31) | ||
171 | |||
169 | #define GITS_TYPER_DEVBITS_SHIFT 13 | 172 | #define GITS_TYPER_DEVBITS_SHIFT 13 |
170 | #define GITS_TYPER_DEVBITS(r) ((((r) >> GITS_TYPER_DEVBITS_SHIFT) & 0x1f) + 1) | 173 | #define GITS_TYPER_DEVBITS(r) ((((r) >> GITS_TYPER_DEVBITS_SHIFT) & 0x1f) + 1) |
171 | #define GITS_TYPER_PTA (1UL << 19) | 174 | #define GITS_TYPER_PTA (1UL << 19) |