From patchwork Thu Apr 14 17:25:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 610548 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qm6z11c3vz9t3t for ; Fri, 15 Apr 2016 03:26:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756256AbcDNR0A (ORCPT ); Thu, 14 Apr 2016 13:26:00 -0400 Received: from foss.arm.com ([217.140.101.70]:44794 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755555AbcDNRXK (ORCPT ); Thu, 14 Apr 2016 13:23:10 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E266342B; Thu, 14 Apr 2016 10:21:55 -0700 (PDT) Received: from red-moon.cambridge.arm.com (red-moon.cambridge.arm.com [10.1.203.137]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BDDCB3F25F; Thu, 14 Apr 2016 10:23:07 -0700 (PDT) From: Lorenzo Pieralisi To: iommu@lists.linux-foundation.org Cc: Lorenzo Pieralisi , Hanjun Guo , Tomasz Nowicki , Joerg Roedel , "Rafael J. Wysocki" , Will Deacon , Marc Zyngier , Robin Murphy , Jon Masters , Sinan Kaya , linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 02/11] drivers: acpi: iort: add support for IOMMU registration Date: Thu, 14 Apr 2016 18:25:34 +0100 Message-Id: <1460654743-7896-3-git-send-email-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1460654743-7896-1-git-send-email-lorenzo.pieralisi@arm.com> References: <1460654743-7896-1-git-send-email-lorenzo.pieralisi@arm.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The ACPI IORT table provide entries for IOMMU (aka SMMU in ARM world) components that allow creating the kernel data structures required to probe and initialize the IOMMU devices. This patch provides support in the IORT kernel code to register IOMMU components. Signed-off-by: Lorenzo Pieralisi Cc: Hanjun Guo Cc: Tomasz Nowicki Cc: Joerg Roedel Cc: "Rafael J. Wysocki" --- drivers/acpi/iort.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/linux/iort.h | 2 ++ 2 files changed, 44 insertions(+) diff --git a/drivers/acpi/iort.c b/drivers/acpi/iort.c index 3119683..98db580 100644 --- a/drivers/acpi/iort.c +++ b/drivers/acpi/iort.c @@ -19,10 +19,13 @@ #define pr_fmt(fmt) "ACPI: IORT: " fmt #include +#include #include #include #include +#include #include +#include struct iort_its_msi_chip { struct list_head list; @@ -30,6 +33,45 @@ struct iort_its_msi_chip { u32 translation_id; }; +struct iort_iommu_node { + struct list_head list; + struct iommu_ops *ops; + struct acpi_iort_node *node; + struct fwnode_handle *fwnode; +}; +static LIST_HEAD(iort_iommu_list); +static DEFINE_SPINLOCK(iort_iommu_lock); + +/** + * iort_iommu_set_node - Create iort_mmu_node and use it to register + * iommu structures on iort_iommu_list. + * + * @ops: IOMMU operations + * @node: IORT table node associated with the IOMMU + * @fwnode: fwnode_handle associated with the IOMMU + * + * Returns: 0 on success + * -ENOMEM on failure + */ +int iort_iommu_set_node(struct iommu_ops *ops, struct acpi_iort_node *node, + struct fwnode_handle *fwnode) +{ + struct iort_iommu_node *iommu = kzalloc(sizeof(*iommu), GFP_KERNEL); + + if (WARN_ON(!iommu)) + return -ENOMEM; + + INIT_LIST_HEAD(&iommu->list); + iommu->ops = ops; + iommu->node = node; + iommu->fwnode = fwnode; + spin_lock(&iort_iommu_lock); + list_add_tail(&iommu->list, &iort_iommu_list); + spin_unlock(&iort_iommu_lock); + + return 0; +} + typedef acpi_status (*iort_find_node_callback) (struct acpi_iort_node *node, void *context); diff --git a/include/linux/iort.h b/include/linux/iort.h index b15fe1a..148d9a1 100644 --- a/include/linux/iort.h +++ b/include/linux/iort.h @@ -28,5 +28,7 @@ void iort_deregister_domain_token(int trans_id); struct fwnode_handle *iort_its_find_domain_token(int trans_id); u32 iort_pci_get_msi_rid(struct pci_dev *pdev, u32 req_id); struct fwnode_handle *iort_pci_get_domain(struct pci_dev *pdev, u32 req_id); +int iort_iommu_set_node(struct iommu_ops *ops, struct acpi_iort_node *node, + struct fwnode_handle *fwnode); #endif /* __IORT_H__ */