From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966524AbcAZPGC (ORCPT ); Tue, 26 Jan 2016 10:06:02 -0500 Received: from terminus.zytor.com ([198.137.202.10]:50179 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966302AbcAZPF6 (ORCPT ); Tue, 26 Jan 2016 10:05:58 -0500 Date: Tue, 26 Jan 2016 07:05:31 -0800 From: tip-bot for Marc Zyngier Message-ID: Cc: marc.zyngier@arm.com, majun258@huawei.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jason@lakedaemon.net, hpa@zytor.com, tglx@linutronix.de Reply-To: majun258@huawei.com, marc.zyngier@arm.com, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, jason@lakedaemon.net, linux-kernel@vger.kernel.org In-Reply-To: <1453818255-1289-1-git-send-email-marc.zyngier@arm.com> References: <1453818255-1289-1-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/gic-v3-its: Recompute the number of pages on page size change Git-Commit-ID: 16abc9b7b7ca58bae0753644d3342a05ef21fbd8 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: 16abc9b7b7ca58bae0753644d3342a05ef21fbd8 Gitweb: http://git.kernel.org/tip/16abc9b7b7ca58bae0753644d3342a05ef21fbd8 Author: Marc Zyngier AuthorDate: Tue, 26 Jan 2016 14:24:15 +0000 Committer: Thomas Gleixner CommitDate: Tue, 26 Jan 2016 16:00:15 +0100 irqchip/gic-v3-its: Recompute the number of pages on page size change When the programming of a GITS_BASERn register fails because of an unsupported ITS page size, we retry it with a smaller page size. Unfortunately, we don't recompute the number of allocated ITS pages, indicating the wrong value computed in the original allocation. A convenient fix is to free the pages we allocated, update the page size, and restart the allocation. This will ensure that we always allocate the right amount in the case of a device table, specially if we have to reduce the allocation order to stay within the boundaries of the ITS maximum allocation. Reported-and-tested-by: Ma Jun Signed-off-by: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org Cc: Jason Cooper Link: http://lkml.kernel.org/r/1453818255-1289-1-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-gic-v3-its.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index e23d1d1..3447549 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -875,6 +875,7 @@ static int its_alloc_tables(const char *node_name, struct its_node *its) } alloc_size = (1 << order) * PAGE_SIZE; +retry_alloc_baser: alloc_pages = (alloc_size / psz); if (alloc_pages > GITS_BASER_PAGES_MAX) { alloc_pages = GITS_BASER_PAGES_MAX; @@ -938,13 +939,16 @@ retry_baser: * size and retry. If we reach 4K, then * something is horribly wrong... */ + free_pages((unsigned long)base, order); + its->tables[i] = NULL; + switch (psz) { case SZ_16K: psz = SZ_4K; - goto retry_baser; + goto retry_alloc_baser; case SZ_64K: psz = SZ_16K; - goto retry_baser; + goto retry_alloc_baser; } }