[Xen-changelog] [xen stable-4.9] xen/arm: gic-v3: Bail out if gicv3_cpu_init fail

[patchbot@xxxxxxx]

commit 389df4fcf958645f7eb70d2f2b25417de2d492bd
Author:     Julien Grall <julien.grall@xxxxxxx>
AuthorDate: Wed Dec 6 14:51:37 2017 +0000
Commit:     Stefano Stabellini <sstabellini@xxxxxxxxxx>
CommitDate: Thu Jan 11 12:20:58 2018 -0800

    xen/arm: gic-v3: Bail out if gicv3_cpu_init fail
    
    When system registers are not enabled, all the access to them will trap
    in EL2. In Xen, system registers will be enabled by gicv3_cpu_init only
    on success. As the rest of the code (e.g gicv3_hyp_init) relies on
    system register, it is better to bail out directly.
    
    This will save time on debugging early boot issue on GICv3 platform.
    
    Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
    Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
    (cherry picked from commit 9630c5ae363b4cbf8eb61366530f40c80680af4d)
---
 xen/arch/arm/gic-v3.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index a559e5e..d0a6178 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -811,8 +811,12 @@ static int gicv3_secondary_cpu_init(void)
     spin_lock(&gicv3.lock);
 
     res = gicv3_cpu_init();
+    if ( res )
+        goto out;
+
     gicv3_hyp_init();
 
+out:
     spin_unlock(&gicv3.lock);
 
     return res;
@@ -1637,8 +1641,12 @@ static int __init gicv3_init(void)
         panic("GICv3: ITS: initialization failed: %d\n", res);
 
     res = gicv3_cpu_init();
+    if ( res )
+        goto out;
+
     gicv3_hyp_init();
 
+out:
     spin_unlock(&gicv3.lock);
 
     return res;
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.9

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog