Merge tag 'hisi-arm64-dt-for-6.8' of https://github.com/hisilicon/linux-hisi into...

[linux-2.6-microblaze.git] / drivers / irqchip / irq-gic-v3-its.c

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index a8c89df..9a7a742 100644 (file)
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -2379,12 +2379,12 @@ retry_baser:
                break;
        }
 
+       if (!shr)
+               gic_flush_dcache_to_poc(base, PAGE_ORDER_TO_SIZE(order));
+
        its_write_baser(its, baser, val);
        tmp = baser->val;
 
-       if (its->flags & ITS_FLAGS_FORCE_NON_SHAREABLE)
-               tmp &= ~GITS_BASER_SHAREABILITY_MASK;
-
        if ((val ^ tmp) & GITS_BASER_SHAREABILITY_MASK) {
                /*
                 * Shareability didn't stick. Just use
@@ -2394,10 +2394,9 @@ retry_baser:
                 * non-cacheable as well.
                 */
                shr = tmp & GITS_BASER_SHAREABILITY_MASK;
-               if (!shr) {
+               if (!shr)
                        cache = GITS_BASER_nC;
-                       gic_flush_dcache_to_poc(base, PAGE_ORDER_TO_SIZE(order));
-               }
+
                goto retry_baser;
        }
 
@@ -2609,6 +2608,11 @@ static int its_alloc_tables(struct its_node *its)
                /* erratum 24313: ignore memory access type */
                cache = GITS_BASER_nCnB;
 
+       if (its->flags & ITS_FLAGS_FORCE_NON_SHAREABLE) {
+               cache = GITS_BASER_nC;
+               shr = 0;
+       }
+
        for (i = 0; i < GITS_BASER_NR_REGS; i++) {
                struct its_baser *baser = its->tables + i;
                u64 val = its_read_baser(its, baser);