From patchwork Fri Jan 3 00:08:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 3428321 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DB2E3C02DC for ; Fri, 3 Jan 2014 00:12:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DB68F2017E for ; Fri, 3 Jan 2014 00:12:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A30EF2017D for ; Fri, 3 Jan 2014 00:12:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753849AbaACAH5 (ORCPT ); Thu, 2 Jan 2014 19:07:57 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:22003 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754097AbaACAHx (ORCPT ); Thu, 2 Jan 2014 19:07:53 -0500 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id s0307jnl012062 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 3 Jan 2014 00:07:46 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s0307irv025861 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 3 Jan 2014 00:07:45 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s0307ibf008554; Fri, 3 Jan 2014 00:07:44 GMT Received: from linux-siqj.site (/10.132.126.191) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 02 Jan 2014 16:07:43 -0800 From: Yinghai Lu To: "H. Peter Anvin" , Tony Luck , Bjorn Helgaas , "Rafael J. Wysocki" , x86 Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Yinghai Lu , Len Brown , Joerg Roedel , Donald Dutile Subject: [PATCH v2 10/10] IOMMU: Add intel iommu irq-remapping and dmar hotplug support Date: Thu, 2 Jan 2014 16:08:17 -0800 Message-Id: <1388707697-16800-11-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1388707697-16800-1-git-send-email-yinghai@kernel.org> References: <1388707697-16800-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.4 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 during hostbridge hotadd/hotremove, we call acpi_pci_iommu_add/remove in acpi_pci_root_add/remove. For add, need to after ioapic add. Run dsm in acpi root device to get iommu entries, and init dmar/irq_remapping Signed-off-by: Yinghai Lu Cc: Len Brown Cc: "Rafael J. Wysocki" Cc: Bjorn Helgaas Cc: Joerg Roedel Cc: Donald Dutile Cc: linux-acpi@vger.kernel.org Cc: linux-pci@vger.kernel.org --- drivers/acpi/pci_root.c | 2 + drivers/iommu/dmar.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/pci-acpi.h | 8 ++ 3 files changed, 211 insertions(+) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index e666be3..dd82d8b 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -600,6 +600,7 @@ static int acpi_pci_root_add(struct acpi_device *device, } acpi_pci_ioapic_add(root); + acpi_pci_iommu_add(root); pci_bus_add_devices(root->bus); return 1; @@ -615,6 +616,7 @@ static void acpi_pci_root_remove(struct acpi_device *device) pci_stop_root_bus(root->bus); + acpi_pci_iommu_remove(root); acpi_pci_ioapic_remove(root); device_set_run_wake(root->bus->bridge, false); diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 31d7942..c74f112 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -1548,3 +1549,203 @@ int __init dmar_ir_support(void) return dmar->flags & 0x1; } IOMMU_INIT_POST(detect_intel_iommu); + +static u8 dmar_uuid_str[] = "D8C1A3A6-BE9B-4C9B-91BF-C3CB81FC5DAF"; + +static int acpi_dmar_dsm_support(acpi_handle handle) +{ + int support = 0; + struct acpi_dsm_context context = { + .uuid_str = dmar_uuid_str, + .rev = 1, + .func_idx = 0, + }; + + if (ACPI_SUCCESS(acpi_run_dsm(handle, &context))) { + u32 *ret = context.ret.pointer; + support = ret[0]; + kfree(context.ret.pointer); + } + + if (support & 1) + return support & 0x0e; + + return 0; +} + +static void *acpi_dmar_dsm_run(acpi_handle handle, int idx) +{ + struct acpi_dsm_context context = { + .uuid_str = dmar_uuid_str, + .rev = 1, + .func_idx = idx, + }; + + if (ACPI_SUCCESS(acpi_run_dsm(handle, &context))) + return context.ret.pointer; + + return NULL; +} + +static void handle_iommu_add(acpi_handle handle, void **d, void **a) +{ + int support; + struct acpi_dmar_header *header; + struct dmar_drhd_unit *dmaru = NULL; + struct dmar_atsr_unit *atsru = NULL; + + *d = NULL; + *a = NULL; + + support = acpi_dmar_dsm_support(handle); + + if (!support) + return; + + /* DRHD */ + if (support & (1<<1)) { + header = acpi_dmar_dsm_run(handle, 1); + dmar_table_print_dmar_entry(header); + __dmar_parse_one_drhd(header, &dmaru); + } + + if (!dmaru) + return; + + /* ATSR */ + if (support & (1<<2)) { + header = acpi_dmar_dsm_run(handle, 2); + dmar_table_print_dmar_entry(header); + __dmar_parse_one_atsr(header, &atsru); + } + + /* RHSA */ + if (support & (1<<3)) { + header = acpi_dmar_dsm_run(handle, 3); + dmar_table_print_dmar_entry(header); + dmar_parse_one_rhsa(header); + kfree(header); + } + + /* + * only need to init intr_remap and dmar for hot-add ones + * after enable_IR() or pci_iommu_init + */ + /* + * TODO: handle parsing failure for pre-installed hotplug one + * Could make every parse_one duplicate the entry table? + */ + if (irq_remapping_enabled == 1) + intel_enable_irq_remapping_one(dmaru); + if (irq_remapping_enabled == 1 || intel_iommu_enabled == 1) + dmar_parse_dev(dmaru); + if (intel_iommu_enabled == 1) { + init_dmar_one(dmaru); + if (atsru) { + header = atsru->hdr; + if (atsr_parse_dev(atsru)) { + kfree(header); + atsru = NULL; + } + *a = atsru; + } + } + *d = dmaru; +} + +static void handle_iommu_remove(void *drhd, void *atsr) +{ + struct dmar_drhd_unit *dmaru = drhd; + struct dmar_atsr_unit *atsru = atsr; + + if (!dmaru) + return; + + if (irq_remapping_enabled == 1) + disable_irq_remapping_one(dmaru); + if (intel_iommu_enabled == 1) { + free_dmar_iommu(dmaru->iommu); + if (atsru) { + kfree(atsru->devices); + remove_atsru_from_saved_dev_atsru_list(atsru); + } + } + if (irq_remapping_enabled == 1 || intel_iommu_enabled == 1) { + kfree(dmaru->devices); + remove_dmaru_from_saved_dev_drhd_list(dmaru); + } + if (atsru) { + kfree(atsru->hdr); + list_del(&atsru->list); + kfree(atsru); + } + free_iommu(dmaru->iommu); + kfree(dmaru->hdr); + list_del(&dmaru->list); + kfree(dmaru); +} + +struct acpi_pci_iommu { + acpi_handle root_handle; + void *dmaru; + void *atsru; + struct list_head list; +}; + +static LIST_HEAD(iommu_list); +static DEFINE_MUTEX(iommu_list_lock); + +static acpi_status register_iommu(acpi_handle handle, u32 lvl, + void *context, void **rv) +{ + acpi_handle root_handle = context; + void *dmaru, *atsru; + struct acpi_pci_iommu *iommu; + + handle_iommu_add(handle, &dmaru, &atsru); + if (!dmaru) + return AE_OK; + + iommu = kzalloc(sizeof(*iommu), GFP_KERNEL); + if (!iommu) { + pr_err("%s: cannot allocate memory\n", __func__); + handle_iommu_remove(dmaru, atsru); + return AE_OK; + } + iommu->root_handle = root_handle; + iommu->dmaru = dmaru; + iommu->atsru = atsru; + + mutex_lock(&iommu_list_lock); + list_add(&iommu->list, &iommu_list); + mutex_unlock(&iommu_list_lock); + + return AE_OK; +} + +void acpi_pci_iommu_add(struct acpi_pci_root *root) +{ + acpi_status status; + + status = acpi_walk_namespace(ACPI_TYPE_DEVICE, root->device->handle, + (u32)1, register_iommu, NULL, + root->device->handle, + NULL); + if (ACPI_FAILURE(status)) + pr_err("%s: register_iommu failure - %d", __func__, status); +} + +void acpi_pci_iommu_remove(struct acpi_pci_root *root) +{ + struct acpi_pci_iommu *iommu, *tmp; + + mutex_lock(&iommu_list_lock); + list_for_each_entry_safe(iommu, tmp, &iommu_list, list) { + if (root->device->handle != iommu->root_handle) + continue; + list_del(&iommu->list); + handle_iommu_remove(iommu->dmaru, iommu->atsru); + kfree(iommu); + } + mutex_unlock(&iommu_list_lock); +} diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index d2a976a..f00a89f 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h @@ -86,4 +86,12 @@ extern bool aer_acpi_firmware_first(void); static inline bool aer_acpi_firmware_first(void) { return false; } #endif +#ifdef CONFIG_DMAR_TABLE +void acpi_pci_iommu_add(struct acpi_pci_root *root); +void acpi_pci_iommu_remove(struct acpi_pci_root *root); +#else +static inline void acpi_pci_iommu_add(struct acpi_pci_root *root) { } +static inline void acpi_pci_iommu_remove(struct acpi_pci_root *root) { } +#endif + #endif /* _PCI_ACPI_H_ */