From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A382C43381 for ; Sun, 31 Mar 2019 12:36:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 191ED20830 for ; Sun, 31 Mar 2019 12:36:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="NJDPQrfO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731297AbfCaMgS (ORCPT ); Sun, 31 Mar 2019 08:36:18 -0400 Received: from smtp-fw-9101.amazon.com ([207.171.184.25]:36923 "EHLO smtp-fw-9101.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726975AbfCaMgS (ORCPT ); Sun, 31 Mar 2019 08:36:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1554035776; x=1585571776; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=Xxf/XCRLhaUzHncFkuCeHY/pyfBo0qcyLkgrrUxQFzg=; b=NJDPQrfOeHudUiXbEEcd9ZczhlFZ6t/+RICtfT70CcbLIAoQilJ4nHy8 sh/GXicqglI/OWtHbSFPUM6bQx8UQumHgguW1aBJlH3PvpyopKBO6io+f qvj+6ddRPr5O80C1mUU5AUhtR1sOXMNtj0DHuMfMKlvWwEhN4dhvv+sYh w=; X-IronPort-AV: E=Sophos;i="5.60,292,1549929600"; d="scan'208";a="796653391" Received: from sea3-co-svc-lb6-vlan3.sea.amazon.com (HELO email-inbound-relay-2a-119b4f96.us-west-2.amazon.com) ([10.47.22.38]) by smtp-border-fw-out-9101.sea19.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 31 Mar 2019 12:36:16 +0000 Received: from EX13MTAUEA001.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan3.pdx.amazon.com [10.236.137.198]) by email-inbound-relay-2a-119b4f96.us-west-2.amazon.com (8.14.7/8.14.7) with ESMTP id x2VCaCrb130523 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL); Sun, 31 Mar 2019 12:36:15 GMT Received: from EX13D19EUB003.ant.amazon.com (10.43.166.69) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sun, 31 Mar 2019 12:36:14 +0000 Received: from ub6d44c9ce3e25c.ant.amazon.com (10.43.161.164) by EX13D19EUB003.ant.amazon.com (10.43.166.69) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sun, 31 Mar 2019 12:36:04 +0000 From: Hanna Hawa To: , , , , , , , , , CC: , , , , , , , , , , , , Subject: [PATCH 7/7] irqchip/al-msi: Add ACPI support Date: Sun, 31 Mar 2019 15:35:33 +0300 Message-ID: <1554035733-11827-3-git-send-email-hhhawa@amazon.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554035733-11827-1-git-send-email-hhhawa@amazon.com> References: <1554035733-11827-1-git-send-email-hhhawa@amazon.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.43.161.164] X-ClientProxiedBy: EX13D20UWC002.ant.amazon.com (10.43.162.163) To EX13D19EUB003.ant.amazon.com (10.43.166.69) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds ACPI support for AL-MSIx driver. The AL-MSIx controller is not standard, is not included in the UEFI specification, and will not be added. The driver ACPI binding is performed when the following conditions are true: - OEM ID is AMAZON - MADT table type is 0x80 (part of the OEM reserved range). Signed-off-by: Hanna Hawa Co-developed-by: Vladimir Aerov Signed-off-by: Vladimir Aerov --- drivers/irqchip/irq-al-msi.c | 118 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 111 insertions(+), 7 deletions(-) diff --git a/drivers/irqchip/irq-al-msi.c b/drivers/irqchip/irq-al-msi.c index ec27455..cb80c1e 100644 --- a/drivers/irqchip/irq-al-msi.c +++ b/drivers/irqchip/irq-al-msi.c @@ -9,6 +9,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include #include #include #include @@ -126,14 +127,20 @@ static int al_msix_gic_domain_alloc(struct irq_domain *domain, struct irq_data *d; int ret; - if (!is_of_node(domain->parent->fwnode)) + if (is_of_node(domain->parent->fwnode)) { + fwspec.fwnode = domain->parent->fwnode; + fwspec.param_count = 3; + fwspec.param[0] = 0; + fwspec.param[1] = spi; + fwspec.param[2] = IRQ_TYPE_EDGE_RISING; + } else if (is_fwnode_irqchip(domain->parent->fwnode)) { + fwspec.fwnode = domain->parent->fwnode; + fwspec.param_count = 2; + fwspec.param[0] = spi + 32; + fwspec.param[1] = IRQ_TYPE_EDGE_RISING; + } else { return -EINVAL; - - fwspec.fwnode = domain->parent->fwnode; - fwspec.param_count = 3; - fwspec.param[0] = 0; - fwspec.param[1] = spi; - fwspec.param[2] = IRQ_TYPE_EDGE_RISING; + } ret = irq_domain_alloc_irqs_parent(domain, virq, 1, &fwspec); if (ret) @@ -304,3 +311,100 @@ static int al_msix_init(struct device_node *node, struct device_node *parent) } IRQCHIP_DECLARE(alpine_msix, "al,alpine-msix", al_msix_init); IRQCHIP_DECLARE(al_msix, "amazon,al-msix", al_msix_init); + +#ifdef CONFIG_ACPI +static struct al_msix_data *priv; + +#define ACPI_AMZN_MADT_OEM_TYPE 0x80 +#define ACPI_AMZN_OEM_ID "AMAZON" + +struct acpi_madt_msix_oem_frame { + struct acpi_subtable_header header; + u64 base_address; + u32 base_address_len; + u16 spi_count; + u16 spi_base; +}; + +static struct fwnode_handle *al_msi_get_fwnode(struct device *dev) +{ + return priv->msi_domain_handle; +} + +static int __init al_msix_acpi_probe(struct acpi_subtable_header *header, + const unsigned long end) +{ + struct irq_domain *gic_domain; + struct fwnode_handle *gic_domain_handle; + struct acpi_madt_msix_oem_frame *m; + int ret; + + m = container_of(header, struct acpi_madt_msix_oem_frame, header); + if (BAD_MADT_ENTRY(m, end)) + return -EINVAL; + + gic_domain_handle = acpi_get_gsi_domain_id(); + if (!gic_domain_handle) { + pr_err("Failed to find the GIC domain handle\n"); + return -ENXIO; + } + + gic_domain = irq_find_matching_fwnode(gic_domain_handle, + DOMAIN_BUS_ANY); + if (!gic_domain) { + pr_err("Failed to find the GIC domain\n"); + return -ENXIO; + } + + priv = kzalloc(sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->spi_first = m->spi_base; + priv->num_spis = m->spi_count; + + priv->msi_domain_handle = irq_domain_alloc_fwnode((void *) + m->base_address); + if (!priv->msi_domain_handle) { + pr_err("Unable to allocate msi domain token\n"); + ret = -EINVAL; + goto err_acpi_priv; + } + + ret = al_msix_init_common(priv, m->base_address); + if (ret) + goto err_acpi_priv; + + ret = al_msix_init_domains(priv, gic_domain); + if (ret) + goto err_acpi_map; + + pci_msi_register_fwnode_provider(&al_msi_get_fwnode); + + return 0; + +err_acpi_map: + kfree(priv->msi_map); +err_acpi_priv: + kfree(priv); + return ret; +} + +static int __init al_msix_acpi_init(void) +{ + static struct acpi_table_madt *madt; + acpi_status status; + + /* if ACPI MADT table is not Amazon defined return */ + status = acpi_get_table(ACPI_SIG_MADT, 0, + (struct acpi_table_header **)&madt); + if (ACPI_FAILURE(status) || (madt && memcmp(madt->header.oem_id, + ACPI_AMZN_OEM_ID, + ACPI_OEM_ID_SIZE))) + return -ENODEV; + + return acpi_table_parse_madt(ACPI_AMZN_MADT_OEM_TYPE, + al_msix_acpi_probe, 0); +} +early_initcall(al_msix_acpi_init); +#endif /* CONFIG_ACPI */ -- 2.7.4