From patchwork Thu Jul 23 13:05:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 6853521 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 A2EBA9F1D4 for ; Thu, 23 Jul 2015 13:06:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9200320651 for ; Thu, 23 Jul 2015 13:06:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C67A20782 for ; Thu, 23 Jul 2015 13:06:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753301AbbGWNFn (ORCPT ); Thu, 23 Jul 2015 09:05:43 -0400 Received: from foss.arm.com ([217.140.101.70]:40314 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753242AbbGWNFc (ORCPT ); Thu, 23 Jul 2015 09:05:32 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4B18F5E4; Thu, 23 Jul 2015 06:05:45 -0700 (PDT) Received: from approximate.cambridge.arm.com (approximate.cambridge.arm.com [10.1.209.148]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CDFE83F23A; Thu, 23 Jul 2015 06:05:29 -0700 (PDT) From: Marc Zyngier To: Thomas Gleixner , Jiang Liu , Jason Cooper Cc: , , , Lorenzo Pieralisi , Tomasz Nowicki , Hanjun Guo , "Rafael J. Wysocki" , Suravee Suthikulpanit , Graeme Gregory Subject: [PATCH v2 5/7] acpi: gsi: Add acpi_set_irq_model to initialize the GSI layer Date: Thu, 23 Jul 2015 14:05:11 +0100 Message-Id: <1437656713-9677-6-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437656713-9677-1-git-send-email-marc.zyngier@arm.com> References: <1437656713-9677-1-git-send-email-marc.zyngier@arm.com> 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.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 In order to start embrassing irqdomains at the GSI level, introduce a new initializer: void acpi_set_irq_model(enum acpi_irq_model_id model, unsigned long domain_token, int (*populate)(struct acpi_gsi_descriptor *, u32, unsigned int)); where: - model is the value assigned to acpi_irq_model - domain_token is the identifier for the irqdomain mapping GSI interrupts - populate is a function provided by the interrupt controller, populating a struct acpi_gsi_descriptor based on a GSI and the interrupt trigger information As nobody calls this code yet, the current code is left in place. Signed-off-by: Marc Zyngier Reviewed-by: Lorenzo Pieralisi Reviewed-by: Hanjun Guo --- drivers/acpi/gsi.c | 32 ++++++++++++++++++++++++++++++++ include/linux/acpi.h | 5 +++++ 2 files changed, 37 insertions(+) diff --git a/drivers/acpi/gsi.c b/drivers/acpi/gsi.c index a745880..e6f4a0c 100644 --- a/drivers/acpi/gsi.c +++ b/drivers/acpi/gsi.c @@ -16,6 +16,9 @@ enum acpi_irq_model_id acpi_irq_model; static void *acpi_gsi_domain_token; +static int (*acpi_gsi_descriptor_populate)(struct acpi_gsi_descriptor *data, + u32 gsi, unsigned int irq_type); + static unsigned int acpi_gsi_get_irq_type(int trigger, int polarity) { switch (polarity) { @@ -71,10 +74,20 @@ EXPORT_SYMBOL_GPL(acpi_gsi_to_irq); int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) { + int err; unsigned int irq; unsigned int irq_type = acpi_gsi_get_irq_type(trigger, polarity); struct irq_domain *d = irq_find_host(acpi_gsi_domain_token); + if (acpi_gsi_descriptor_populate) { + struct acpi_gsi_descriptor data; + err = acpi_gsi_descriptor_populate(&data, gsi, irq_type); + if (err) + return err; + + return irq_create_acpi_mapping(d, &data); + } + irq = irq_create_mapping(d, gsi); if (!irq) return -EINVAL; @@ -99,3 +112,22 @@ void acpi_unregister_gsi(u32 gsi) irq_dispose_mapping(irq); } EXPORT_SYMBOL_GPL(acpi_unregister_gsi); + +/** + * acpi_set_irq_model - Setup the GSI irqdomain information + * @model: the value assigned to acpi_irq_model + * @domain_token: the irq_domain identifier for mapping and looking up + * GSI interrupts + * @populate: provided by the interrupt controller, populating a + * struct acpi_gsi_descriptor based on a GSI and + * the interrupt trigger information + */ +void acpi_set_irq_model(enum acpi_irq_model_id model, + unsigned long domain_token, + int (*populate)(struct acpi_gsi_descriptor *, + u32, unsigned int)) +{ + acpi_irq_model = model; + acpi_gsi_domain_token = (void *)domain_token; + acpi_gsi_descriptor_populate = populate; +} diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 2f23ab0..0820cb1 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -214,6 +214,11 @@ struct acpi_gsi_descriptor { unsigned int irq_create_acpi_mapping(struct irq_domain *d, struct acpi_gsi_descriptor *irq_data); +void acpi_set_irq_model(enum acpi_irq_model_id model, + unsigned long domain_token, + int (*populate)(struct acpi_gsi_descriptor *, + u32, unsigned int)); + #ifdef CONFIG_X86_IO_APIC extern int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity); #else