From patchwork Mon Jul 13 09:14:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suravee Suthikulpanit X-Patchwork-Id: 6776431 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7973C9F2F0 for ; Mon, 13 Jul 2015 09:15:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B6282067A for ; Mon, 13 Jul 2015 09:15:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ACC462063C for ; Mon, 13 Jul 2015 09:15:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751425AbbGMJPe (ORCPT ); Mon, 13 Jul 2015 05:15:34 -0400 Received: from mail-bl2on0120.outbound.protection.outlook.com ([65.55.169.120]:10176 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751892AbbGMJPa (ORCPT ); Mon, 13 Jul 2015 05:15:30 -0400 Received: from BY2PR02CA0098.namprd02.prod.outlook.com (10.163.44.152) by BY2PR0201MB1495.namprd02.prod.outlook.com (10.163.153.156) with Microsoft SMTP Server (TLS) id 15.1.213.14; Mon, 13 Jul 2015 09:15:26 +0000 Received: from BL2FFO11FD047.protection.gbl (2a01:111:f400:7c09::133) by BY2PR02CA0098.outlook.office365.com (2a01:111:e400:5261::24) with Microsoft SMTP Server (TLS) id 15.1.213.14 via Frontend Transport; Mon, 13 Jul 2015 09:15:02 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; arm.com; dkim=none (message not signed) header.d=none; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from atltwp01.amd.com (165.204.84.221) by BL2FFO11FD047.mail.protection.outlook.com (10.173.161.209) with Microsoft SMTP Server id 15.1.213.8 via Frontend Transport; Mon, 13 Jul 2015 09:15:02 +0000 X-WSS-ID: 0NRF5P1-07-ABH-02 X-M-MSG: Received: from satlvexedge02.amd.com (satlvexedge02.amd.com [10.177.96.29]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by atltwp01.amd.com (Axway MailGate 5.3.1) with ESMTPS id 20B5ACAE682; Mon, 13 Jul 2015 05:15:00 -0400 (EDT) Received: from SATLEXDAG02.amd.com (10.181.40.5) by SATLVEXEDGE02.amd.com (10.177.96.29) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 13 Jul 2015 04:15:05 -0500 Received: from ssuthiku-fedora-lt.amd.com (10.180.168.240) by SATLEXDAG02.amd.com (10.181.40.5) with Microsoft SMTP Server id 14.3.195.1; Mon, 13 Jul 2015 05:14:59 -0400 From: Suravee Suthikulpanit To: , , , , CC: , , , , , , , , , , , Suravee Suthikulpanit Subject: [RFCv2 PATCH 3/8] gicv2m: Convert to use GIC irq_domain_ops.init_alloc_info Date: Mon, 13 Jul 2015 16:14:19 +0700 Message-ID: <1436778864-17645-4-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1436778864-17645-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1436778864-17645-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD047; 1:EdBhbhtehGfuCx4mw9S/jmFiYvmFjj0qmwf8EA6ZQu5HfngyPEU/aSU6F1/7BT0Sd9c3fTrwqCnNMjt9UZX8xSaGezpSsaeXdTXdQPzf87hMvqI/zcpEqFagFCSkkA1ugxZepGLoUR5QLQfhk6O6TOYG21krBKqex5TrOyDy8mqfpuSueEpA8yiEDBQWW3SYnYY/E/N/yej30qlhz4LBPuezo1n4A5zrKPyVtvYH26dWbvSzoBxVF7xF2wlI6JyTaf6x/B71JYL7j6CF+RoV3QFJFcmj0BhBWwjS9wSoX+tqRkIQbVuZZKDeSCsmOyGLurTh5gsv/NqvJm4Z3q3uxV8AhDRWS0y3bbis1RPHnLG4TVQFDCmaUbNe86fXMMXSPXOksNgNXVPTCdq3LgmxEMVtPyw5X5LnMTY4Ghjn0R0= X-Forefront-Antispam-Report: CIP:165.204.84.221; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(428002)(189002)(199003)(5003600100002)(48376002)(62966003)(50466002)(86362001)(53416004)(77156002)(92566002)(189998001)(46102003)(36756003)(50226001)(5001920100001)(5003940100001)(5001770100001)(229853001)(101416001)(47776003)(50986999)(77096005)(76176999)(87936001)(19580395003)(105586002)(2201001)(2950100001)(19580405001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR0201MB1495; H:atltwp01.amd.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1495; 2:uyZ+bck1UaR8d8vX+vhAXCRp606FXg3OkXgYFIlZCPQlvZnlNCFX+bC4MytpYs6I; 3:YTp6Sm+FomY+PJwUi3i3hEkoygRIq7H54TmLfVpBJR8RqglGb+DQ94vMD4l1JhyCvRBo+AgGLoYSOU1KimJ7fbsTJnMfQjI6IerpC4mWgUklFVHgdaosJmEzz4TNdWsBsrXLOBm798LPnEzWSe1hp4iBQN+Bo9EnL0Bo+9h/aAB2ujNZY7nFOjf6C51J/hOVNm4bnEYjtcDuKoy+A037MGDpV4zf9r7KSia3XbGKAXIqn6CJqjJtvYxzKgPWA8hZ; 25:XQiqbsyavAhP+tXKYPwQhaitq/+nFzObTdWmaWexyJbhKs/oDmiu+5MXvpen9571A9q8hqKlQTq8o9WbOcLMmB3mZuoMEzAmdQBfe8kIk9Sk9mz5Db90mF6b6CXoHULptPG7uWC2BWaag7l8wr7Uc/D7DSNUmpgChQZbBsIB4GI53JQLd+ODTGI/kc7wOtit+JtU3PS2CVwMG33swKq8mqgNXMIKiuNoEhG6Axj/jIcdwcF7oTyPFg2g3/Ge4NBX X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0201MB1495; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1495; 20:hXhJSIl2UqHX8vcgqbK3jG0I3a4bhsj/VuJF9vNkAyJf1FkwEA9n9S5UlUrL/CHoqWLdCfAnqO2B2cPG+rRzfRnpEbh0MWfqGDkLM9Vz6WCzCfoQbCID+K75bTmTYDNpfZHiTHQwXMcsRJJ7pFppjvu3mwzGRR7+6HrVjmxUnmiyxTK6mrEnWn8m6QxPwaU4ByI3DouW9awT9sP9m4DcF+McbI306Yzl3zJglx/an9XRnbb0mI2fubcBUb3cjENH3Rttt6nat5eCgSafbDcxiDrWC0sh141XAGicckEmWAlfyhDjChoiDHIQFgSr7MRbxjfJNKCsBeaCBSr/EJZRUkYSTO0vcn4HrkR1UKV9PRX1g42+MRdrKlq1BVT/Q1Rg+iY9jzaZ9r774KgWWTBTZnmLJddq2OLU+1vvtDbBjHlyvpZ9eAvseeMjpdCs+mUep/2bGRuNwsmI/VBGaEGcXvmZfLWxKLRlqw7McyMtFAtEHat8XbB71ZqDDpN6i4tQ; 4:DgAkm0L52JxmyZnFRqbxJfZYDocqyaWC/Y8CBQQzZ1avpLKDWL3KroCua9u0xy3cQlKXvmw/gMxih+ojH4k1nT4DqOxVshlN1aViET/eRUGC2XEmmwBtgbiZoS8I/yWqkLLtelMPZNNJteSozq85fcva/EKLsAuy70BMKm6xMJWHNXI9Vxop9s31AzD5T+nBO2lh3qkp2A6SzJuq53iKbujqC4+/FePp91HNcN9minVIi+ms3A9/qg4AbU2AR2wNbW+bGgu/vIcSWyECy1qbnIWxnFjVpSikJP7rMCk/000= BY2PR0201MB1495: X-MS-Exchange-Organization-RulesExecuted 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:BY2PR0201MB1495; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0201MB1495; X-Forefront-PRVS: 0636271852 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1495; 23:9aiXuQpVWB7VepMDJZLwpEQdVA26SqhJC1j9cgF0rXA+S8Y8HaOtVCWpC2vctCB3QFonwF/kmzQtqeWKs7kOLm/bZ6Yvo+/QJ/jvrsUlx4NIa9YZh37MqckqjzBdYi7MxXvu3aTiNvlA0rGa2Jv66sjVdNSQ81I5Vb6sy3ylK2p8guDe/ZC/gvaWq2a8efKMsQZwrKayV4ABMhVAaDKwTTPwJ+h8jVdFkQS8K1amV7c0z4gpAKGRhQjzQMHnbGKvDjeL41dqpwTX3WxHFrcR+DeX3nZjwHntY6Aie8ggfVHdohCwuvl3mVpjtCpPqaAzKS5V4UjxRpAwxdO9VLs4u0g1Jg9wpMbiYXfaAmkVzRMbya0qOytsCX1JzmKxFYQgPptLAfsYmyBF7PRgFjZm7zqOkrTa32q5if6N8oKcqe5laOfuWv7dHjI1FZY5SypcZoFHuD+urdlsKJRI8dxeBJuh4zxRah1x/DsR+vie5et0t2Er2nsWPlJL2IsNnlFaDAQWHSjpYMd/PC+wwGceiHha7naFJZgTbByVoJtcxjG3BIXzc9swXot8ZVA+FhTAfaEVSmT9WHRhmkY3hTlexsHYGglV5pG9AkadoIWuvRFy6t3fmd8vBU1c+YQ5fFOmD/U85RHnTUXx/v7Gpr4dHBknwJeW2ej3hebs8CGBIYyPoluw1KCLMYO9ONgLaNKVZ6QKjZVh9tFjRaDjgWkwE1v6Tz8faoSctk6Z84tXmjGbrZ9t6P/S6eKxj8NLmI4QqedU5+SfoquJYZJbm0jj0/l4a2Y6FfCZp4rM2hiOPOVkmUU7cd7hRaKDHUgVJKguLXIrKwfRacnVL4YGDS0AHB54fQqGiw4t8nGX5d3r/pwBHBEnEYp7KFZ+eDUuGXQI X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1495; 5:a6VUlA4xaDlxeNk4zRj8t+ezGE73NgpXT7lai1DrvJFDNvG5QryBv+ckjySUClGPhz8AOZsH4yul4PnSzc9W2ZEHg9ncSFL0TRyUGDBRDh2QJUp4ai7KyXEjEONlO0uw+hyXeZ1t8mYvkQq2NhDgeA==; 24:XOm3Xj2kksAtiXbk/1Vr9aeVmBTiIFBFrpQNJVdNFYx/6plZDXxT7NtzXdiRr4+8FWCncvQLcRTzFjMlZEhc0Sfh0j5LuzK0jjL9jko4r8Y=; 20:KxsXpTL+BNcN/ohZcqSm4GnLrl9Xr/kHAP3NYbP7FV5tvI0PW/NO2flxEZ9rmb09V3D1LTdBhlG3xJd9FITl7g== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2015 09:15:02.2571 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96; Ip=[165.204.84.221]; Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0201MB1495 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 This patch converts the current call to irq_domain_alloc_irqs_parent() to use structure initilized by irq_domain_ops.init_alloc_info() instead of of_phandle_args. Signed-off-by: Suravee Suthikulpanit --- drivers/irqchip/irq-gic-v2m.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c index bf5082d..e4e2a92 100644 --- a/drivers/irqchip/irq-gic-v2m.c +++ b/drivers/irqchip/irq-gic-v2m.c @@ -22,6 +22,10 @@ #include #include #include +#include +#ifdef CONFIG_ARM_GIC_ACPI +#include +#endif /* * MSI_TYPER: @@ -114,17 +118,20 @@ static int gicv2m_irq_gic_domain_alloc(struct irq_domain *domain, unsigned int virq, irq_hw_number_t hwirq) { - struct of_phandle_args args; struct irq_data *d; int err; + void *info; + struct irq_domain *parent = domain->parent; + uint32_t data[3] = {GIC_INT_TYPE_GSI, hwirq, IRQ_TYPE_EDGE_RISING}; + + if (parent->ops->init_alloc_info) { + err = parent->ops->init_alloc_info(data, 3, parent->of_node, + &info); + if (err) + return err; + } - args.np = domain->parent->of_node; - args.args_count = 3; - args.args[0] = 0; - args.args[1] = hwirq - 32; - args.args[2] = IRQ_TYPE_EDGE_RISING; - - err = irq_domain_alloc_irqs_parent(domain, virq, 1, &args); + err = irq_domain_alloc_irqs_parent(domain, virq, 1, info); if (err) return err;