From patchwork Wed Jul 29 10:08:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 6891731 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 28C4C9F358 for ; Wed, 29 Jul 2015 10:11:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A669207A9 for ; Wed, 29 Jul 2015 10:10:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A968D207A2 for ; Wed, 29 Jul 2015 10:10:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752541AbbG2KKv (ORCPT ); Wed, 29 Jul 2015 06:10:51 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:35792 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752540AbbG2KKt (ORCPT ); Wed, 29 Jul 2015 06:10:49 -0400 Received: by pdrg1 with SMTP id g1so3511478pdr.2 for ; Wed, 29 Jul 2015 03:10:48 -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=m1VUyt1tn17W3EvGHNF6lsSIbYAYAZaPMjp+Su4CCfk=; b=Z9kHGmCRFpbxy0g8SB6LZwFEwbw00pAHmWbIDKV/soKhWeZXzLdlfto0UhMWcOiCjp LdgurA4wTfCRt3W91w5gfFzBGNR8bNB+Hr6QgViG7S0uXLzi22Pdfi7TV28m9+twb2bl 6PGulLvBHjsGYImF9G+SF3YbnNva9tpwGJW5vgUBMoggPcNrgGxJupc4QL9D975L+HY2 +APPwsD/sf5WqEi/du24Ts4iKgVmtDJFnmSJk2ZO0FDWdBiQDLcXZAq1M0VVdGT0/U68 FRJpsdSlK1TXhPk681JxiUCFy+poxCD0IhKOJpltfzNvrP8gpfLUjeiGXEcGwzbLg0yQ DIBg== X-Gm-Message-State: ALoCoQnmFrP5kySBZUIPo3Nascf1iMgXzOQOqFlS0BVsKzM0B5taBu1Wbc+OJAkID6m0pY2hkKps X-Received: by 10.70.103.145 with SMTP id fw17mr93037464pdb.1.1438164648694; Wed, 29 Jul 2015 03:10:48 -0700 (PDT) Received: from localhost ([180.150.157.4]) by smtp.googlemail.com with ESMTPSA id br14sm35253868pdb.47.2015.07.29.03.10.46 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 29 Jul 2015 03:10:47 -0700 (PDT) From: Hanjun Guo To: Marc Zyngier , Jason Cooper , Will Deacon , Catalin Marinas , "Rafael J. Wysocki" Cc: Thomas Gleixner , Jiang Liu , Bjorn Helgaas , Lorenzo Pieralisi , Suravee Suthikulpanit , Timur Tabi , Tomasz Nowicki , Grant Likely , Mark Brown , Wei Huang , linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Hanjun Guo Subject: [PATCH v4 09/10] PCI: ACPI: Bind GIC MSI frame to PCI host bridge Date: Wed, 29 Jul 2015 18:08:58 +0800 Message-Id: <1438164539-29256-10-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438164539-29256-1-git-send-email-hanjun.guo@linaro.org> References: <1438164539-29256-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=-8.3 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 From: Suravee Suthikulpanit This patch introduces pci_host_bridge_acpi_msi_domain(), which queries a GIC MSI irq-domain token and use it to retrieve an irq_domain with DOMAIN_BUS_PCI_MSI bus type, and bind it to PCI host-bridge. Signed-off-by: Suravee Suthikulpanit Signed-off-by: Hanjun Guo --- drivers/pci/pci-acpi.c | 18 ++++++++++++++++++ drivers/pci/probe.c | 3 +++ include/linux/pci-acpi.h | 4 ++++ 3 files changed, 25 insertions(+) diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 314a625..5f11653 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -16,6 +17,7 @@ #include #include #include +#include #include "pci.h" /* @@ -681,6 +683,22 @@ static bool pci_acpi_bus_match(struct device *dev) return dev_is_pci(dev); } +#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN +struct irq_domain *pci_host_bridge_acpi_msi_domain(struct pci_bus *bus) +{ + struct irq_domain *d = NULL; + void *token = acpi_gic_get_msi_token(&bus->dev); + + if (token) + d = irq_find_matching_host(token, DOMAIN_BUS_PCI_MSI); + + if (!d) + pr_debug("Fail to find domain for MSI\n"); + + return d; +} +#endif /*CONFIG_GENERIC_MSI_IRQ_DOMAIN*/ + static struct acpi_bus_type acpi_pci_bus = { .name = "PCI", .match = pci_acpi_bus_match, diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index a7afeac..8c1204c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include "pci.h" @@ -670,6 +671,8 @@ static struct irq_domain *pci_host_bridge_msi_domain(struct pci_bus *bus) * should be called from here. */ d = pci_host_bridge_of_msi_domain(bus); + if (!d) + d = pci_host_bridge_acpi_msi_domain(bus); return d; } diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index a965efa..766d045 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h @@ -77,6 +77,8 @@ static inline void acpiphp_remove_slots(struct pci_bus *bus) { } static inline void acpiphp_check_host_bridge(struct acpi_device *adev) { } #endif +struct irq_domain *pci_host_bridge_acpi_msi_domain(struct pci_bus *bus); + extern const u8 pci_acpi_dsm_uuid[]; #define DEVICE_LABEL_DSM 0x07 #define RESET_DELAY_DSM 0x08 @@ -85,6 +87,8 @@ extern const u8 pci_acpi_dsm_uuid[]; #else /* CONFIG_ACPI */ static inline void acpi_pci_add_bus(struct pci_bus *bus) { } static inline void acpi_pci_remove_bus(struct pci_bus *bus) { } +static inline struct irq_domain * +pci_host_bridge_acpi_msi_domain(struct pci_bus *bus) { return NULL; } #endif /* CONFIG_ACPI */ #ifdef CONFIG_ACPI_APEI