From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755871AbbJUStD (ORCPT ); Wed, 21 Oct 2015 14:49:03 -0400 Received: from mail-by2on0089.outbound.protection.outlook.com ([207.46.100.89]:24800 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755406AbbJUSrw (ORCPT ); Wed, 21 Oct 2015 14:47:52 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; apm.com; dkim=none (message not signed) header.d=none;apm.com; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0NWL2VK-08-3RX-02 X-M-MSG: From: Suravee Suthikulpanit To: , , , CC: Lorenzo Pieralisi , Will Deacon , Catalin Marinas , , , , , , , , Suravee Suthikulpanit Subject: [PATCH V3 2/6] acpi: pci: Setup MSI domain for ACPI based pci devices Date: Wed, 21 Oct 2015 11:47:25 -0700 Message-ID: <1445453249-32557-3-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1445453249-32557-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1445453249-32557-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(199003)(189002)(105586002)(77096005)(2950100001)(5001770100001)(2201001)(189998001)(97736004)(5003600100002)(86362001)(5007970100001)(19580405001)(50466002)(106466001)(5003940100001)(50226001)(48376002)(64706001)(19580395003)(101416001)(87936001)(229853001)(53416004)(92566002)(5008740100001)(46102003)(50986999)(36756003)(76176999)(47776003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM3PR12MB0860;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0860;2:q0lriIJByOo37trxVhJvUK4wj/ode6QxGvjHeqp/cJ1DKadZxFRT/QM+7/rCQ/X1fpMA9Y9J1LQMkbWEsw7rI8CgZKEYrEUlxxsbMoW+sPALBVTX6O+gMRS3JEpjifKvs1rT7OMTSJCkFJbj0NflySGU9zMZ4tYTqNXXCubbhIo=;3:biUqtveJkpw7WDUsiPSrK+xEWwuMpRIR2/VfyzTMHeL7zJC/T0XdD/R75QdDtr2o5MA/Yt9+OpG0q5m+Ncqa9uRP6+XnVUibQ/mxjN7sPlm0VrAJZqsXdrc1ok91IMdfbPDvLO434c5loO+Kj5PqHMa2p1VkwShaOa3IeT72REKsfrwekRI/6rUam1bn+xRYCSz/OPipHVIktkyomQp2Jrct8OkAaKEd6nx8bZEQtCD4IDfY8VY5QCipFWVGehUi;25:6G1TQImYD9291qegDHxTO2b7xnHKfksE/WwoPGx9z1bWf6U75zrQcYqJBCRr1Z4gKOb4lYKP8gRJBfkKEEdR9bBBTxD/xtlu0NAlyUudwww8wyi9PvULQ8eDEIgSmoe5Zw0qcUtHwwGtPCU2Iktfhz1s0YPEtQmx+Sv3ogh7CHPOAQr7S7Pkqc00TJotEC9jDNy89LZjaRhpLEK6btc6xD7ECePxMF/KxGTko4KxDnqOZMK+HoxDaE1QF5YGxGZNyOeGM/n+e3R0nMRZo77zyQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM3PR12MB0860; X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0860;20:wVRC8pfeuO4fwAk5P7HDtGYdQMoNe8XF6DuZWrhq+xNQOfaZJYGV+oGt9jsMHOWSkFd6Rehlv+o+4yLrEXhTST7CB+e8CrvO8FAkhaHCmLokPUgwrEbPuO2rOPDLOvIht9TLXhJozLHUx7AXODI0cR4FmAZdxKo5cECZbIL/gFghYjob/9RX2VnAn85QmtlQ5L+E3NWoXo/72bt8DOl4JhG/89caKfmIxIKPdDzYdIJ12GhSOieNEFNi8n0Ulf9YsDuXFTjUaNb18FhqxXD5TrPrD5ADw0ZbQqeyHtrqxdbLZRwbTpnIsZwliBEvTdVdoqyzIpPHTg1TnGB5qLBDZbb4FTrrBJOzfNcEGJ4cn/VtEpkCa1skQHQqkCf689Vh17R4++6hQNOkpsDUilrUi9qH3EK4phpdh/xQ4acNpW+JVV/3ToouKRQt/G7yNa9nPDTML1CTFoan3exQsNCNjhZOW02SFK0YTS40QWXOqlq8OTEzK8Xjc+gYP6NgisuW;4:lmzhvBEwk5h626C1KNOxVn9lRK8TmzCEG8qQB9wuLGuJr3BEfUq4N16eK1h45rf13JazjKBnvDATt0Hh0g1BobWIQU/aKi8d6rKXN5cCvJal1BBa0LraqTAg3l+J0pCvh0i+HZ4lP3CGfQBnczQtuSSbmeIiHr1S35oO3qjqofpZSQYY/sVwlp/O72pGQXTZvWZKa1FwbSmbn33SLhIadR+bqtcZZfR73F4pjpIIaJ3FssAEgJEWiqHL6c1UDtVdptaH1iUhPCIWzNq4EGMFxmeeA3wOJ9nZ2mE9V8Hq05FPKIhmvFAAoOYWkWUftObG5HXqkkt4BWEXmjcKtKNwHHJeJ/dEodyKWr/l4n+9wZwDqwb5gOoWTjdmyo2ltxm/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001)(102115026);SRVR:DM3PR12MB0860;BCL:0;PCL:0;RULEID:;SRVR:DM3PR12MB0860; X-Forefront-PRVS: 073631BD3D X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0860;23:zr8RELgNoxU7XKeksboCLE7XUWhdakn7WTkO2HBxSmxnPRY5aGvvX+uGpcMbysIMYgRZWrS/Gg81ApzwcVHpiQMizanra7xt2ttfqxhLYp+Dui4D+8c30ZeEe8BVS3qsnM1AuQnnwKG9BVLUoBrEf8fMSilEi4V3KS/uUzqTg6EI3m9iCP+nAzLoiESUBKzTnN1eXu7x0og5Ea6MVWQ10Eh0hiys9VHP/0sM2Iwogrn50aaPPf+nsDRv/T496toASrTow8Zf7k5eha0BKiq2X0fThdzoXGGWkyuNJ+g7ofBI2B1+BtDw1AXtZ1lkZpinY8CwlK8f6WLIiD29Gw86nBaI3SAAr0BrFkPQE5v1mWnE5cIlqHe0oDWTSJpXo0MSceSTwpd5tc7GAJMdpv3aIYek7M7dX7wAw9UYwgg9pkwWu9KVp+AFKun8zEQvmUU+PQEEhnDxWKI7SLpgGsFTeRtU6yro7ycu8mxpan+K/beW/8spZfp3JdW3zmJJfMG7akGUAlzMOuARVjIJd0wpfJ+YzWI8CaOytckHJWYvj4Qvj+byQMPFrnJwP3vkZ3bXLgunu3CKoodjdTVSz93HUYe9u6/deVC6+eS2vcLz4Q/HWyG4FALXWiQdzI+eMvMAyT0ypWZvDI3U8g/48VeI9xfLSp1lrEL9K/MU5hEx09zPNzPaB/LsX8I8+TLD2xohY9oND13GmBsOb2UxHmBCosrn6KusFyawlaP7Te0K7AQFsqL52GOmT5qJbBTdcbjiNY89aJOBC3mXnS84BELoYPl2iBI94M9919jAkj+tWVm4LuYDSZmG5ETh/f/tER8UY9jHrLVNmd2DnOdBO5VYgnvlj++wYcUZXh1+RCGy1zElh3jyXJ+Dxp9pmOMhdRl8v6HK1Ig6i0qng3V0CW0TLFYoes3iXM5qEcHE1MgF8vrBmxtjrrKenCwx8/z01MbE X-Microsoft-Exchange-Diagnostics: 1;DM3PR12MB0860;5:QlQHiqhdR4YrrVKXtF0I1ZM06fZBNmKoqm1k5W92BQYehi1fojR7L5N8vFNHxsmvUGQ5hhDVOAHhuXcEs0ZELDhDRbbQIMf15tFs98hn/n47adESQVB1jRWCSGF7+uoMHSSVk+uc0J+z1L37NjA1Ew==;24:JNxUjhgJ41eU5TjhhN05FLWUIKti2zMc7XG6pVgG3JcjIAwlN/z9GSDefx1M7bgqTM0NLUEBlEYPgX9F1HCKgEPQP+3SqPaVutySdbWc5dM=;20:Weg5SQ2UMy3P4yQL+zBqVFsJA9ogL2NsxMcl7eTgQmV0cg32NLwz3Vz8PJDlhQSMrTqET45FH5M2NLtdLgQCCASQxh80q3wWBoCsmOZ12fxOVVgSfk4bBtJuSwdDncEsCHbO5ElTK+DF/jzNrZGdlhsH7F+p3OgeFUFwGxjK7xuIXnQz+4cd2tq3Wp8aoPjLfCCewcvGMWpZZxOJakyZdezYfIRCzq9swGJShAUhG+0LGalE1CA17bE8xd8mo8Pc SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2015 18:47:47.7457 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB0860 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch introduces pci_host_bridge_acpi_msi_domain(), which returns the MSI domain of the specified PCI host bridge with DOMAIN_BUS_PCI_MSI bus token. Then, it is assigned to pci device. Signed-off-by: Suravee Suthikulpanit --- drivers/pci/pci-acpi.c | 13 +++++++++++++ drivers/pci/probe.c | 2 ++ include/linux/pci.h | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index a32ba75..0e21ef4 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -9,7 +9,9 @@ #include #include +#include #include +#include #include #include #include @@ -689,6 +691,17 @@ static struct acpi_bus_type acpi_pci_bus = { .cleanup = pci_acpi_cleanup, }; +struct irq_domain *pci_host_bridge_acpi_msi_domain(struct pci_bus *bus) +{ + struct irq_domain *dom = NULL; + struct fwnode_handle *fwnode = pci_msi_get_fwnode(&bus->dev); + + if (fwnode) + dom = irq_find_matching_fwnode(fwnode, + DOMAIN_BUS_PCI_MSI); + return dom; +} + static int __init acpi_pci_init(void) { int ret; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 0dbc7fb..bea1840 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -671,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.h b/include/linux/pci.h index e90eb22..4a7f6a9 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1925,6 +1925,13 @@ static inline struct irq_domain * pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; } #endif /* CONFIG_OF */ +#ifdef CONFIG_ACPI +struct irq_domain *pci_host_bridge_acpi_msi_domain(struct pci_bus *bus); +#else +static inline struct irq_domain * +pci_host_bridge_acpi_msi_domain(struct pci_bus *bus) { return NULL; } +#endif + #ifdef CONFIG_EEH static inline struct eeh_dev *pci_dev_to_eeh_dev(struct pci_dev *pdev) { -- 2.1.0