From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754067AbbETUQM (ORCPT ); Wed, 20 May 2015 16:16:12 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39361 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753727AbbETUQJ (ORCPT ); Wed, 20 May 2015 16:16:09 -0400 Date: Wed, 20 May 2015 13:15:29 -0700 From: tip-bot for Minghuan Lian Message-ID: Cc: jason@lakedaemon.net, Minghuan.Lian@freescale.com, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, stuart.yoder@freescale.com, linux-arm-kernel@lists.infradead.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de Reply-To: marc.zyngier@arm.com, linux-kernel@vger.kernel.org, Minghuan.Lian@freescale.com, jason@lakedaemon.net, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, linux-arm-kernel@lists.infradead.org, stuart.yoder@freescale.com In-Reply-To: <1432134795-661-1-git-send-email-stuart.yoder@freescale.com> References: <1432134795-661-1-git-send-email-stuart.yoder@freescale.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/gicv3-its: ITS table size should not be smaller than PSZ Git-Commit-ID: 3ad2a5f57656a14d964b673a5a0e4ab0e583c870 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3ad2a5f57656a14d964b673a5a0e4ab0e583c870 Gitweb: http://git.kernel.org/tip/3ad2a5f57656a14d964b673a5a0e4ab0e583c870 Author: Minghuan Lian AuthorDate: Wed, 20 May 2015 10:13:15 -0500 Committer: Thomas Gleixner CommitDate: Wed, 20 May 2015 22:13:37 +0200 irqchip/gicv3-its: ITS table size should not be smaller than PSZ When allocating a device table, if the requested allocation is smaller than the default granule size of the ITS then, we need to round up to the default size. Signed-off-by: Minghuan Lian [ stuart: Added comments and massaged changelog ] Signed-off-by: Stuart Yoder Reviewed-by: Marc Zygnier Cc: Cc: Link: http://lkml.kernel.org/r/1432134795-661-1-git-send-email-stuart.yoder@freescale.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-gic-v3-its.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 9687f8a..1b7e155 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",