From patchwork Fri Jan 30 07:46:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Wu X-Patchwork-Id: 5747441 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C6C4DBF440 for ; Fri, 30 Jan 2015 07:51:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 03CE620225 for ; Fri, 30 Jan 2015 07:51:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 16827200DB for ; Fri, 30 Jan 2015 07:51:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YH6KW-00011k-Cz; Fri, 30 Jan 2015 07:49:28 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YH6Jm-0000Ds-LA for linux-arm-kernel@lists.infradead.org; Fri, 30 Jan 2015 07:48:45 +0000 Received: from 172.24.2.119 (EHLO szxeml431-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CGO02216; Fri, 30 Jan 2015 15:47:52 +0800 (CST) Received: from localhost (10.177.24.136) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.158.1; Fri, 30 Jan 2015 15:47:10 +0800 From: Yun Wu To: , , Subject: [PATCH 1/5] irqchip: gicv3-its: allocate proper size for DT Date: Fri, 30 Jan 2015 15:46:45 +0800 Message-ID: <1422604009-9248-2-git-send-email-wuyun.wu@huawei.com> X-Mailer: git-send-email 1.9.4.msysgit.1 In-Reply-To: <1422604009-9248-1-git-send-email-wuyun.wu@huawei.com> References: <1422604009-9248-1-git-send-email-wuyun.wu@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.24.136] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150129_234843_108816_50F9F872 X-CRM114-Status: GOOD ( 11.92 ) X-Spam-Score: -0.7 (/) Cc: Yun Wu , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A hardware implementation may be designed to search the device table (DT) using a direct mapping between device ID and memory address, and in this scenario a single page, currently allocated for DT in ITS driver, will be probably not enough. This patch will try best to get this addressed by enlarging DT size with a limitation of MAX_ORDER pages. Signed-off-by: Yun Wu --- drivers/irqchip/irq-gic-v3-its.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) -- 1.8.0 diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index d8996bd..a391417 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -70,6 +70,7 @@ struct its_node { struct its_collection *collections; struct list_head its_device_list; u64 flags; + u32 dev_id_bits; u32 ite_size; }; @@ -799,6 +800,7 @@ static int its_alloc_tables(struct its_node *its) { int err; int i; + int size; int psz = PAGE_SIZE; u64 shr = GITS_BASER_InnerShareable; @@ -812,8 +814,13 @@ static int its_alloc_tables(struct its_node *its) if (type == GITS_BASER_TYPE_NONE) continue; - /* We're lazy and only allocate a single page for now */ - base = (void *)get_zeroed_page(GFP_KERNEL); + if (type == GITS_BASER_TYPE_DEVICE) + size = 1 << its->dev_id_bits; + else + size = PAGE_SIZE; + + base = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, + get_order(size / PAGE_SIZE)); if (!base) { err = -ENOMEM; goto out_free; @@ -841,7 +848,7 @@ retry_baser: break; } - val |= (PAGE_SIZE / psz) - 1; + val |= (size / psz) - 1; writeq_relaxed(val, its->base + GITS_BASER + i * 8); tmp = readq_relaxed(its->base + GITS_BASER + i * 8); @@ -1261,7 +1268,7 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) struct its_node *its; void __iomem *its_base; u32 val; - u64 baser, tmp; + u64 baser, typer, tmp; int err; err = of_address_to_resource(node, 0, &res); @@ -1297,7 +1304,15 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) its->base = its_base; its->phys_base = res.start; its->msi_chip.of_node = node; - its->ite_size = ((readl_relaxed(its_base + GITS_TYPER) >> 4) & 0xf) + 1; + + typer = readq_relaxed(its_base + GITS_TYPER); + its->ite_size = ((typer >> 4) & 0xf) + 1; + its->dev_id_bits = ((typer >> 13) & 0x1f) + 1; + if (its->dev_id_bits > KMALLOC_SHIFT_MAX) { + pr_warn("%s: DT size too large (%ubits -> %ubits)\n", + node->full_name, its->dev_id_bits, KMALLOC_SHIFT_MAX); + its->dev_id_bits = KMALLOC_SHIFT_MAX; + } its->cmd_base = kzalloc(ITS_CMD_QUEUE_SZ, GFP_KERNEL); if (!its->cmd_base) {