[xen stable-4.16] arm/its: enable LPIs before mapping the collection table

[patchbot@xxxxxxx]

commit 271e9e860b7b5ee5fc01a8fd539aa7e1bcb096c6
Author:     Rahul Singh <rahul.singh@xxxxxxx>
AuthorDate: Wed May 4 18:15:12 2022 +0100
Commit:     Stefano Stabellini <stefano.stabellini@xxxxxxx>
CommitDate: Wed Aug 3 14:57:31 2022 -0700

    arm/its: enable LPIs before mapping the collection table
    
    When Xen boots on the platform that implements the GIC 600, ITS
    MAPC_LPI_OFF uncorrectable command error issue is observed.
    
    As per the GIC-600 TRM (Revision: r1p6) MAPC_LPI_OFF command error can
    be reported if the MAPC command has tried to map a collection to a core
    that does not have LPIs enabled. The definition of GICR.EnableLPIs
    also suggests enabling the LPIs before sending any ITS command that
    involves LPIs
    
    0b0 LPI support is disabled. Any doorbell interrupt generated as a
        result of a write to a virtual LPI register must be discarded,
        and any ITS translation requests or commands involving LPIs in
        this Redistributor are ignored.
    
    0b1 LPI support is enabled.
    
    To fix the MAPC command error issue, enable the LPIs using
    GICR_CTLR.EnableLPIs before mapping the collection table.
    
    gicv3_enable_lpis() is using writel_relaxed(), write to the GICR_CTLR
    register may not be visible before gicv3_its_setup_collection() send the
    MAPC command. Use wmb() after writel_relaxed() to make sure register
    write to enable LPIs is visible.
    
    Signed-off-by: Rahul Singh <rahul.singh@xxxxxxx>
    Acked-by: Julien Grall <jgrall@xxxxxxxxxx>
    Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
    (cherry picked from commit 95604873ccf56eb81e96ed0dc8b4dec3278f40ca)
---
 xen/arch/arm/gic-v3.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index 9a3a175ad7..9fbaaa44b4 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -701,6 +701,9 @@ static bool gicv3_enable_lpis(void)
     val = readl_relaxed(GICD_RDIST_BASE + GICR_CTLR);
     writel_relaxed(val | GICR_CTLR_ENABLE_LPIS, GICD_RDIST_BASE + GICR_CTLR);
 
+    /* Make sure the GIC has seen the above */
+    wmb();
+
     return true;
 }
 
@@ -818,11 +821,11 @@ static int gicv3_cpu_init(void)
     /* If the host has any ITSes, enable LPIs now. */
     if ( gicv3_its_host_has_its() )
     {
+        if ( !gicv3_enable_lpis() )
+            return -EBUSY;
         ret = gicv3_its_setup_collection(smp_processor_id());
         if ( ret )
             return ret;
-        if ( !gicv3_enable_lpis() )
-            return -EBUSY;
     }
 
     /* Set priority on PPI and SGI interrupts */
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.16