From: Andrew Cooper Date: Wed, 29 Nov 2017 11:45:02 +0000 (+0000) Subject: Revert "xen/arm: domain_builder: irq sanity check logic fix" X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6da091d95dfcbe00daf91308d044ee5151b1ac9e;p=people%2Fiwj%2Fxen.git Revert "xen/arm: domain_builder: irq sanity check logic fix" This reverts commit 11e7dd958de73a45645bd40d82280660bd2c9ee8. It breaks boot on ARM. Reported-by: Julien Grall Signed-off-by: Andrew Cooper --- diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f50f8b9a26..c74f4dd69d 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -501,10 +501,9 @@ static void set_interrupt_ppi(gic_interrupt_t interrupt, unsigned int irq, { __be32 *cells = interrupt; - BUG_ON(irq < 16); - BUG_ON(irq >= 32); + BUG_ON(irq < 16 && irq >= 32); - /* See linux Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt */ + /* See linux Documentation/devictree/bindings/arm/gic.txt */ dt_set_cell(&cells, 1, 1); /* is a PPI */ dt_set_cell(&cells, 1, irq - 16); /* PPIs start at 16 */ dt_set_cell(&cells, 1, (cpumask << 8) | level);