From patchwork Tue Nov 29 22:57:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Agustin Vega-Frias X-Patchwork-Id: 9453209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 421CD6071E for ; Tue, 29 Nov 2016 23:00:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 321AD2837F for ; Tue, 29 Nov 2016 23:00:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22B682838D; Tue, 29 Nov 2016 23:00:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 818842837F for ; Tue, 29 Nov 2016 23:00:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cBrMI-0000KU-Uh; Tue, 29 Nov 2016 22:58:42 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cBrLq-00005U-MY for linux-arm-kernel@lists.infradead.org; Tue, 29 Nov 2016 22:58:16 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id C699F61569; Tue, 29 Nov 2016 22:57:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1480460278; bh=DNiwvbv15NAc62XhyvzAPh4/kHvcnjZ6DDkopRB3v2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZOfUpnM4wMPOAq3V6rc4X08d1J56vXm6aFdz15uiBTNvK3aM/gW15moObqeuMhc4z 7AAJgB/J2Uk+K+eRrlQEFo3mJyWY1zyDGUl+w4PPQdN0Z4IuoPWl3WI1WrU6dxviGd wkTzWHTjVQtdlpWzYtbES81Ijo3k1f7pzeeVsmg8= Received: from azshara.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: agustinv@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 21ED9614FC; Tue, 29 Nov 2016 22:57:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1480460277; bh=DNiwvbv15NAc62XhyvzAPh4/kHvcnjZ6DDkopRB3v2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J/rlE34aaZxPK+VuJPaNSce0CxWQHpl5VXQRQXy9oh6cIjPSG3vSZtgdotgxsyqH4 gcvVt0U13kVOU7ZCrhKJkh6uvkP87wnZAuUMDrTLJl36VdGOpMZ7shaiue7+D4/tcW 3TECph1orofj8Ov5k6pb9M08bGqdURw2etgTV3nc= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org 21ED9614FC Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=pass smtp.mailfrom=agustinv@codeaurora.org From: Agustin Vega-Frias To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, rjw@rjwysocki.net, lenb@kernel.org, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com Subject: [PATCH V8 2/3] ACPI: Retry IRQ conversion if it failed previously Date: Tue, 29 Nov 2016 17:57:38 -0500 Message-Id: <1480460259-8585-3-git-send-email-agustinv@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1480460259-8585-1-git-send-email-agustinv@codeaurora.org> References: <1480460259-8585-1-git-send-email-agustinv@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161129_145814_870992_F720BE77 X-CRM114-Status: GOOD ( 21.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: harba@codeaurora.org, mlangsdo@redhat.com, graeme.gregory@linaro.org, jcm@redhat.com, timur@codeaurora.org, agross@codeaurora.org, guohanjun@huawei.com, astone@redhat.com, cov@codeaurora.org, msalter@redhat.com, Agustin Vega-Frias , ahs3@redhat.com, charles.garcia-tobin@arm.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This allows probe deferral to work properly when a dependent device fails to get a valid IRQ because the IRQ domain was not registered at the time the resources were added to the platform_device. Signed-off-by: Agustin Vega-Frias --- drivers/acpi/irq.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++ drivers/base/platform.c | 9 ++- include/linux/acpi.h | 9 +++ 3 files changed, 161 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c index e82eb6e..9279168 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c @@ -158,6 +158,150 @@ void acpi_unregister_gsi(u32 gsi) EXPORT_SYMBOL_GPL(acpi_unregister_gsi); /** + * Context for the resource walk used to lookup IRQ resources. + */ +struct acpi_irq_parse_one_ctx { + int rc; + unsigned int index; + unsigned long *res_flags; + struct irq_fwspec *fwspec; +}; + +/** + * acpi_irq_parse_one_match - Handle a matching IRQ resource + */ +static inline void acpi_irq_parse_one_match(struct fwnode_handle *fwnode, + u32 hwirq, u8 triggering, + u8 polarity, u8 shareable, + struct acpi_irq_parse_one_ctx *ctx) +{ + ctx->rc = 0; + *ctx->res_flags = acpi_dev_irq_flags(triggering, polarity, shareable); + ctx->fwspec->fwnode = fwnode; + ctx->fwspec->param[0] = hwirq; + ctx->fwspec->param[1] = acpi_dev_get_irq_type(triggering, polarity); + ctx->fwspec->param_count = 2; +} + +/** + * acpi_irq_parse_one_cb - Handle the given resource + * @ares: resource to handle + * @context: context for the walk, contains the lookup index and references + * to the flags and fwspec where the result is returned + * + * This is called by acpi_walk_resources passing each resource returned by + * the _CRS method. We only inspect IRQ resources. Since IRQ resources + * might contain multiple interrupts we check if the index is within this + * one's interrupt array, otherwise we subtract the current resource IRQ + * count from the lookup index to prepare for the next resource. + * Once a match is found we call acpi_irq_parse_one_match to populate + * the result and end the walk by returning AE_CTRL_TERMINATE. + * + * Return AE_OK if the walk should continue, AE_CTRL_TERMINATE if a matching + * IRQ resource was found. + */ +static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, + void *context) +{ + struct acpi_irq_parse_one_ctx *ctx = context; + struct acpi_resource_irq *irq; + struct acpi_resource_extended_irq *eirq; + struct fwnode_handle *fwnode; + + switch (ares->type) { + case ACPI_RESOURCE_TYPE_IRQ: + irq = &ares->data.irq; + if (ctx->index >= irq->interrupt_count) { + ctx->index -= irq->interrupt_count; + return AE_OK; + } + fwnode = acpi_gsi_domain_id; + acpi_irq_parse_one_match(fwnode, irq->interrupts[ctx->index], + irq->triggering, irq->polarity, + irq->sharable, ctx); + return AE_CTRL_TERMINATE; + case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: + eirq = &ares->data.extended_irq; + if (ctx->index >= eirq->interrupt_count) { + ctx->index -= eirq->interrupt_count; + return AE_OK; + } + fwnode = acpi_get_irq_source_fwhandle(&eirq->resource_source); + acpi_irq_parse_one_match(fwnode, eirq->interrupts[ctx->index], + eirq->triggering, eirq->polarity, + eirq->sharable, ctx); + return AE_CTRL_TERMINATE; + } + + return AE_OK; +} + +/** + * acpi_irq_parse_one - Resolve an interrupt for a device + * @handle: the device whose interrupt is to be resolved + * @index: index of the interrupt to resolve + * @fwspec: structure irq_fwspec filled by this function + * @flags: resource flags filled by this function + * + * This function resolves an interrupt for a device by walking its CRS resources + * to find the appropriate ACPI IRQ resource and populating the given structure + * which can be used to retrieve a Linux IRQ number. + * + * Returns the result stored in ctx.rc by the callback, or -EINVAL if the given + * index is out of range. + */ +static int acpi_irq_parse_one(acpi_handle handle, unsigned int index, + struct irq_fwspec *fwspec, unsigned long *flags) +{ + struct acpi_irq_parse_one_ctx ctx = { -EINVAL, index, flags, fwspec }; + acpi_status status; + + status = acpi_walk_resources(handle, METHOD_NAME__CRS, + acpi_irq_parse_one_cb, &ctx); + if (ACPI_FAILURE(status)) + return -EINVAL; + return ctx.rc; +} + +/** + * acpi_irq_get - Look for the ACPI IRQ resource with the given index and + * use it to initialize the given Linux IRQ resource. + * @handle ACPI device handle + * @index ACPI IRQ resource index to lookup + * @res Linux IRQ resource to initialize + * + * Return: 0 on success + * -EINVAL if an error occurs + * -EPROBE_DEFER if the IRQ lookup/conversion failed + */ +int acpi_irq_get(acpi_handle handle, unsigned int index, struct resource *res) +{ + int rc; + struct irq_fwspec fwspec; + struct irq_domain *domain; + unsigned long flags; + + rc = acpi_irq_parse_one(handle, index, &fwspec, &flags); + if (rc) + return rc; + + domain = irq_find_matching_fwnode(fwspec.fwnode, DOMAIN_BUS_ANY); + if (!domain) + return -EPROBE_DEFER; + + rc = irq_create_fwspec_mapping(&fwspec); + if (rc <= 0) + return -EINVAL; + + res->start = rc; + res->end = rc; + res->flags = flags; + + return 0; +} +EXPORT_SYMBOL_GPL(acpi_irq_get); + +/** * acpi_set_irq_model - Setup the GSI irqdomain information * @model: the value assigned to acpi_irq_model * @fwnode: the irq_domain identifier for mapping and looking up diff --git a/drivers/base/platform.c b/drivers/base/platform.c index c4af003..61423d2 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -102,6 +102,14 @@ int platform_get_irq(struct platform_device *dev, unsigned int num) } r = platform_get_resource(dev, IORESOURCE_IRQ, num); + if (r && r->flags & IORESOURCE_DISABLED && ACPI_COMPANION(&dev->dev)) { + int ret; + + ret = acpi_irq_get(ACPI_HANDLE(&dev->dev), num, r); + if (ret) + return ret; + } + /* * The resources may pass trigger flags to the irqs that need * to be set up. It so happens that the trigger flags for @@ -1450,4 +1458,3 @@ void __init early_platform_cleanup(void) memset(&pd->dev.devres_head, 0, sizeof(pd->dev.devres_head)); } } - diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 154e576..6919bfd 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -327,6 +327,7 @@ struct fwnode_handle * int acpi_register_irq(struct fwnode_handle *source, u32 hwirq, int trigger, int polarity); void acpi_unregister_irq(struct fwnode_handle *source, u32 hwirq); +int acpi_irq_get(acpi_handle handle, unsigned int index, struct resource *res); #else #define acpi_get_irq_source_fwhandle(source) (NULL) static inline int acpi_register_irq(struct fwnode_handle *source, u32 hwirq, @@ -785,6 +786,14 @@ static inline int acpi_reconfig_notifier_unregister(struct notifier_block *nb) #endif /* !CONFIG_ACPI */ +#ifndef CONFIG_ACPI_GENERIC_GSI +static inline int acpi_irq_get(acpi_handle handle, unsigned int index, + struct resource *res) +{ + return -EINVAL; +} +#endif /* CONFIG_ACPI_GENERIC_GSI */ + #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC int acpi_ioapic_add(acpi_handle root); #else