From patchwork Thu May 14 23:02:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stuart Yoder X-Patchwork-Id: 6410431 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 5665CC0432 for ; Thu, 14 May 2015 23:14:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6FA28204A0 for ; Thu, 14 May 2015 23:14:17 +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 A5BE620499 for ; Thu, 14 May 2015 23:14:16 +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 1Yt2I4-0005po-AP; Thu, 14 May 2015 23:11:44 +0000 Received: from mail-by2on0135.outbound.protection.outlook.com ([207.46.100.135] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yt2Hj-0005Ty-B3 for linux-arm-kernel@lists.infradead.org; Thu, 14 May 2015 23:11:24 +0000 Received: from BY2PR03CA047.namprd03.prod.outlook.com (10.141.249.20) by BY2PR0301MB0744.namprd03.prod.outlook.com (10.160.63.22) with Microsoft SMTP Server (TLS) id 15.1.154.19; Thu, 14 May 2015 23:11:00 +0000 Received: from BL2FFO11OLC005.protection.gbl (2a01:111:f400:7c09::199) by BY2PR03CA047.outlook.office365.com (2a01:111:e400:2c5d::20) with Microsoft SMTP Server (TLS) id 15.1.166.22 via Frontend Transport; Thu, 14 May 2015 23:10:59 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11OLC005.mail.protection.outlook.com (10.173.160.91) with Microsoft SMTP Server (TLS) id 15.1.160.8 via Frontend Transport; Thu, 14 May 2015 23:10:59 +0000 Received: from right.am.freescale.net (right.am.freescale.net [10.81.116.70]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t4ENAudi014789; Thu, 14 May 2015 16:10:57 -0700 From: Stuart Yoder To: , Subject: [PATCH] irqchip: GICv3: ITS: don't assume 64K page size in its_alloc_tables Date: Thu, 14 May 2015 18:02:25 -0500 Message-ID: <1431644545-31904-1-git-send-email-stuart.yoder@freescale.com> X-Mailer: git-send-email 2.3.3 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC005; 1:qbgecZh6O34ok6nc9DdKbFrmXbMp0cXD0Ck23XXyEN1iAUuxVkTfqztkxNu0BtFpz6+RpOaHFoUUNlyZdHinvyOg2R+SYZvYp5AcsGUvDe5ZwQo5+Ajbe5Je7EnyNsWw9W26fpxlUAJl3jhWwOVk14lyr3XVmsWvV+8iN+BXjGCTDjxorMzeOJfhrYMS8xatJjD16gKFGisdRg0Tm3yoHgJ0Q1DQBzn49zMemIDZw3nirAkNbGQT0O+C3XGD0nN183NQ3k2HOtucE43s9LG3li2RTY/DRYDskBo/aO4iH58NoBZEg1L+1oI7iYZjA+HBvT/oYSZoKvUSrp0NEYSs1g== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(339900001)(189002)(199003)(36756003)(85426001)(86362001)(50466002)(33646002)(104016003)(19580405001)(19580395003)(50986999)(48376002)(77156002)(62966003)(77096005)(5001960100002)(107886002)(189998001)(5001770100001)(6806004)(50226001)(87936001)(106466001)(46102003)(47776003)(92566002)(105606002)(229853001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR0301MB0744; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0744; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BY2PR0301MB0744; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB0744; X-Forefront-PRVS: 0576145E86 X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2015 23:10:59.4716 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0744 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150514_161123_388095_BCFCDCD8 X-CRM114-Status: UNSURE ( 6.82 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Stuart Yoder , 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 its_alloc_tables() needs to account for page sizes other than 64KB. Without this change, when PAGE_SIZE=4KB its_alloc_tables() gets stuck in an infinite loop. Signed-off-by: Stuart Yoder --- think this should go into 4.1 if at all possible...without it I am unable to boot a 4.1 kernel on the LS2085 SoC drivers/irqchip/irq-gic-v3-its.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 9687f8a..58a6612 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -800,7 +800,7 @@ static int its_alloc_tables(struct its_node *its) { int err; int i; - int psz = SZ_64K; + int psz = PAGE_SIZE; u64 shr = GITS_BASER_InnerShareable; u64 cache = GITS_BASER_WaWb;