[xen master] Revert "xen/arm: domain_builder: irq sanity check logic fix"

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen master] Revert "xen/arm: domain_builder: irq sanity check logic fix"

patchbot
commit 6da091d95dfcbe00daf91308d044ee5151b1ac9e
Author:     Andrew Cooper <[hidden email]>
AuthorDate: Wed Nov 29 11:45:02 2017 +0000
Commit:     Andrew Cooper <[hidden email]>
CommitDate: Wed Nov 29 11:45:02 2017 +0000

    Revert "xen/arm: domain_builder: irq sanity check logic fix"
   
    This reverts commit 11e7dd958de73a45645bd40d82280660bd2c9ee8.
   
    It breaks boot on ARM.
   
    Reported-by: Julien Grall <[hidden email]>
    Signed-off-by: Andrew Cooper <[hidden email]>
---
 xen/arch/arm/domain_build.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index f50f8b9..c74f4dd 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);
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog