From patchwork Tue May 5 13:50:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 6338331 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 DCA279F1C2 for ; Tue, 5 May 2015 13:54:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18EF4202FF for ; Tue, 5 May 2015 13:54:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F0F120259 for ; Tue, 5 May 2015 13:54:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992805AbbEENxy (ORCPT ); Tue, 5 May 2015 09:53:54 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:35701 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992786AbbEENxR (ORCPT ); Tue, 5 May 2015 09:53:17 -0400 Received: by pabtp1 with SMTP id tp1so193973377pab.2 for ; Tue, 05 May 2015 06:53:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qGgi1WwgQRv0p5ypG3jaV1YO9pFxAqbH5/oXwCh7JUw=; b=iOX1PM/DpZfd/abk6YBY1AqjVr43ddv8uWvmwPX2EIF4SVfjqI+JQ6orYwRM3cOnhm ryCnycttxF7Ba7Y4JO3SiZ7UeJ3jtUwhUwqHXF0pSOaJKEAHhd+eyvlwT3VZWoiG5QRw 6hTgYcpfgj38ZxGqS65RX7GwLucLgrLZpNW43cHfz1wrqHZQJUhsrWrLdQuP6loz76XQ F0gfVpviqrzMOMJ9qsqJfWmiUUrJ3YLjU4/gk/Bmsk/vpFe5wPjByd96ksksmYzqh6TW B4AF6Fjdpb5WEg/MTpee6Xxf03B77TpTU3geKxkMnK6r7f26R0byWpVUvfGhLso085yq r6zg== X-Gm-Message-State: ALoCoQkMEvMG7mE37+msB1AG3JWoaOWMzI62ur5AwvuEBBihOkbtYU0DAVctiFZdIwPNH2vdhema X-Received: by 10.66.248.195 with SMTP id yo3mr17223194pac.123.1430833997271; Tue, 05 May 2015 06:53:17 -0700 (PDT) Received: from localhost ([180.150.157.4]) by mx.google.com with ESMTPSA id fu7sm16189211pac.26.2015.05.05.06.53.14 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 May 2015 06:53:15 -0700 (PDT) From: Hanjun Guo To: Marc Zyngier , Jason Cooper , Will Deacon , Catalin Marinas , "Rafael J. Wysocki" Cc: Jiang Liu , Lorenzo Pieralisi , Arnd Bergmann , Tomasz Nowicki , Grant Likely , Thomas Gleixner , Olof Johansson , linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Hanjun Guo Subject: [RFC PATCH 9/9] irqchip / GICv3: Add stacked irqdomain support for ACPI based init Date: Tue, 5 May 2015 21:50:57 +0800 Message-Id: <1430833857-30736-10-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430833857-30736-1-git-send-email-hanjun.guo@linaro.org> References: <1430833857-30736-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Similar as stacked domain support for ACPI based GICv2 init, let acpi_irq_domain point to the core domain of GICv3 and pass the gsi as the arg to support stacked irqdomain. Signed-off-by: Hanjun Guo --- drivers/irqchip/irq-gic-v3.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 11946a6..e7f134e 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -733,15 +733,21 @@ static int gic_irq_domain_xlate(struct irq_domain *d, static int gic_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs, void *arg) { - int i, ret; + int i; irq_hw_number_t hwirq; - unsigned int type = IRQ_TYPE_NONE; - struct of_phandle_args *irq_data = arg; - ret = gic_irq_domain_xlate(domain, irq_data->np, irq_data->args, - irq_data->args_count, &hwirq, &type); - if (ret) - return ret; + if (domain->of_node) { /* DT case */ + int ret; + unsigned int type = IRQ_TYPE_NONE; + struct of_phandle_args *irq_data = arg; + + ret = gic_irq_domain_xlate(domain, irq_data->np, irq_data->args, + irq_data->args_count, &hwirq, &type); + if (ret) + return ret; + } else { /* ACPI case */ + hwirq = (irq_hw_number_t)*(u32 *)arg; + } for (i = 0; i < nr_irqs; i++) gic_irq_domain_map(domain, virq + i, hwirq + i); @@ -1012,7 +1018,7 @@ gic_v3_acpi_init(struct acpi_table_header *table) if (err) goto out_redist_unmap; - irq_set_default_host(gic_data.domain); + acpi_irq_domain = gic_data.domain; return 0; out_redist_unmap: