Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bd4459a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irqchip fix from Thomas Gleixner:
 "A fix for a GIC-V3 irqchip regression which prevents some systems from
  booting"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/gicv3-its: ITS table size should not be smaller than PSZ
parents 086e8ddb 3ad2a5f5

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

+8 −1
Original line number Diff line number Diff line
@@ -828,7 +828,14 @@ static int its_alloc_tables(struct its_node *its) 
			u64 typer = readq_relaxed(its->base + GITS_TYPER);

			u32 ids = GITS_TYPER_DEVBITS(typer);



			order = get_order((1UL << ids) * entry_size);

			/*

			 * 'order' was initialized earlier to the default page

			 * granule of the the ITS.  We can't have an allocation

			 * smaller than that.  If the requested allocation

			 * is smaller, round up to the default page granule.

			 */

			order = max(get_order((1UL << ids) * entry_size),

				    order);

			if (order >= MAX_ORDER) {

				order = MAX_ORDER - 1;

				pr_warn("%s: Device Table too large, reduce its page order to %u\n",