Commit 46a29dd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq_urgent_for_v6.7_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fix from Borislav Petkov:

 - Flush the translation service tables to prevent unpredictable
   behavior on non-coherent GIC devices

* tag 'irq_urgent_for_v6.7_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/gic-v3-its: Flush ITS tables correctly in non-coherent GIC designs
parents cd557bc0 d3badb15

drivers/irqchip/irq-gic-v3-its.c

+10 −6
Original line number Diff line number Diff line
@@ -2379,12 +2379,12 @@ static int its_setup_baser(struct its_node *its, struct its_baser *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 @@ static int its_setup_baser(struct its_node *its, struct its_baser *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);