[xen master] xen/arm: gic-v3: Bail out if gicv3_cpu_init fail

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

[xen master] xen/arm: gic-v3: Bail out if gicv3_cpu_init fail

patchbot
commit 9630c5ae363b4cbf8eb61366530f40c80680af4d
Author:     Julien Grall <[hidden email]>
AuthorDate: Wed Dec 6 14:51:37 2017 +0000
Commit:     Stefano Stabellini <[hidden email]>
CommitDate: Fri Dec 8 13:17:38 2017 -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 <[hidden email]>
    Reviewed-by: Stefano Stabellini <[hidden email]>
---
 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 473e261..a0d290b 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -847,8 +847,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;
@@ -1705,8 +1709,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#master

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