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

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 9687f8afebff..1b7e155869f6 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -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",