[PATCH/RESEND] irqchip: gic: Don't complain in gic_get_cpumask() if UP system

Stephen Boyd sboyd at codeaurora.org
Wed Mar 11 23:21:31 PDT 2015

In a uniprocessor implementation the interrupt processor targets
registers are read-as-zero/write-ignored (RAZ/WI). Unfortunately
gic_get_cpumask() will print a critical message saying

 GIC CPU mask not found - kernel will fail to boot.

if these registers all read as zero, but there won't actually be
a problem on uniprocessor systems and the kernel will boot just
fine. Skip this check if we're running a UP kernel or if we
detect that the hardware only supports a single processor.

Acked-by: Nicolas Pitre <nico at linaro.org>
Acked-by: Felipe Balbi <balbi at ti.com>
Acked-by: Nishanth Menon <nm at ti.com>
Acked-by: Stefan Agner <stefan at agner.ch>
Cc: Russell King <rmk+kernel at arm.linux.org.uk>
Signed-off-by: Stephen Boyd <sboyd at codeaurora.org>

Picked up acks from the list

 drivers/irqchip/irq-gic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 4634cf7d0ec3..50e70a8c7ec4 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -349,7 +349,7 @@ static u8 gic_get_cpumask(struct gic_chip_data *gic)
-	if (!mask)
+	if (!mask && num_possible_cpus() > 1)
 		pr_crit("GIC CPU mask not found - kernel will fail to boot.\n");
 	return mask;
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

More information about the linux-arm-kernel mailing list