From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> To: iommu@lists.linux-foundation.org Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Will Deacon <will.deacon@arm.com>, Robin Murphy <robin.murphy@arm.com>, Joerg Roedel <joro@8bytes.org>, Marc Zyngier <marc.zyngier@arm.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Tomasz Nowicki <tn@semihalf.com>, Hanjun Guo <hanjun.guo@linaro.org>, Jon Masters <jcm@redhat.com>, Sinan Kaya <okaya@codeaurora.org>, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 15/15] drivers: iommu: arm-smmu-v3: allow ACPI based streamid translation Date: Tue, 7 Jun 2016 14:31:10 +0100 [thread overview] Message-ID: <1465306270-27076-16-git-send-email-lorenzo.pieralisi@arm.com> (raw) In-Reply-To: <1465306270-27076-1-git-send-email-lorenzo.pieralisi@arm.com> The ACPI IORT table provides data to ARM SMMU drivers to carry out streamid mappings and the kernel has the infrastructure to implement it through the iommu_xlate() IORT SMMU operation hook. By reusing the infrastructure implemented for of_xlate(), this patch adds the ARM SMMU v3 iommu_xlate() hook to carry out streamid translation for ARM SMMU v3 on ACPI based systems. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Joerg Roedel <joro@8bytes.org> --- drivers/iommu/arm-smmu-v3.c | 60 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 7acb6b5..96d0504 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -634,8 +634,23 @@ struct arm_smmu_domain { struct iommu_domain domain; }; +enum arm_smmu_fw_type { + ARM_SMMU_FW_INVALID = 0, + ARM_SMMU_FW_OF, + ARM_SMMU_FW_IORT, +}; + +struct arm_smmu_fw_handle { + enum arm_smmu_fw_type type; + union { + struct device_node *np; + struct acpi_iort_node *iort_node; + }; +}; + /* SMMU private data for each master */ struct arm_smmu_master_data { + struct arm_smmu_fw_handle handle; struct arm_smmu_device *smmu; struct arm_smmu_strtab_ent ste; @@ -1721,9 +1736,17 @@ arm_smmu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) return ret; } -static struct arm_smmu_device *arm_smmu_get_by_node(struct device_node *np) +static struct arm_smmu_device * +arm_smmu_get_dev(struct arm_smmu_fw_handle *handle) { - struct platform_device *smmu_pdev = of_find_device_by_node(np); + struct platform_device *smmu_pdev = NULL; + + if (handle->type == ARM_SMMU_FW_OF) { + smmu_pdev = of_find_device_by_node(handle->np); + of_node_put(handle->np); + } else if (handle->type == ARM_SMMU_FW_IORT) { + smmu_pdev = iort_find_iommu_device(handle->iort_node); + } if (!smmu_pdev) return NULL; @@ -1743,16 +1766,14 @@ static bool arm_smmu_sid_in_range(struct arm_smmu_device *smmu, u32 sid) static int arm_smmu_add_device(struct device *dev) { - struct device_node *np; struct arm_smmu_device *smmu; struct arm_smmu_master_data *data = dev->archdata.iommu; if (!data) return -ENODEV; - np = (struct device_node *)data->smmu; - smmu = data->smmu = arm_smmu_get_by_node(np); - of_node_put(np); + smmu = data->smmu = arm_smmu_get_dev(&data->handle); + if (!smmu) return -ENODEV; @@ -1854,7 +1875,8 @@ static int arm_smmu_of_xlate(struct device *dev, struct of_phandle_args *args) * By the time we see this again in an add_device callback, we'll * be in a position to fix it up with the real thing. */ - data->smmu = (struct arm_smmu_device *)args->np; + data->handle.type = ARM_SMMU_FW_OF; + data->handle.np = args->np; data->sid = args->args[0]; dev->archdata.iommu = data; @@ -2688,9 +2710,31 @@ static int __init arm_smmu_of_init(struct device_node *np) IOMMU_OF_DECLARE(arm_smmuv3, "arm,smmu-v3", arm_smmu_of_init); #ifdef CONFIG_ACPI +static int arm_smmu_iort_xlate(struct device *dev, u32 streamid, + struct acpi_iort_node *node) +{ + struct arm_smmu_master_data *data; + + if (!node || (node->type != ACPI_IORT_NODE_SMMU_V3)) + return -ENODEV; + + if (dev->archdata.iommu) + return -EEXIST; + + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->handle.type = ARM_SMMU_FW_IORT; + data->handle.iort_node = node; + data->sid = streamid; + dev->archdata.iommu = data; + return 0; +} + static int acpi_smmu_init(struct acpi_iort_node *node) { - iort_smmu_set_ops(node, &arm_smmu_ops, NULL); + iort_smmu_set_ops(node, &arm_smmu_ops, arm_smmu_iort_xlate); return 0; } -- 2.6.4
WARNING: multiple messages have this Message-ID (diff)
From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi) To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 15/15] drivers: iommu: arm-smmu-v3: allow ACPI based streamid translation Date: Tue, 7 Jun 2016 14:31:10 +0100 [thread overview] Message-ID: <1465306270-27076-16-git-send-email-lorenzo.pieralisi@arm.com> (raw) In-Reply-To: <1465306270-27076-1-git-send-email-lorenzo.pieralisi@arm.com> The ACPI IORT table provides data to ARM SMMU drivers to carry out streamid mappings and the kernel has the infrastructure to implement it through the iommu_xlate() IORT SMMU operation hook. By reusing the infrastructure implemented for of_xlate(), this patch adds the ARM SMMU v3 iommu_xlate() hook to carry out streamid translation for ARM SMMU v3 on ACPI based systems. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Joerg Roedel <joro@8bytes.org> --- drivers/iommu/arm-smmu-v3.c | 60 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 7acb6b5..96d0504 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -634,8 +634,23 @@ struct arm_smmu_domain { struct iommu_domain domain; }; +enum arm_smmu_fw_type { + ARM_SMMU_FW_INVALID = 0, + ARM_SMMU_FW_OF, + ARM_SMMU_FW_IORT, +}; + +struct arm_smmu_fw_handle { + enum arm_smmu_fw_type type; + union { + struct device_node *np; + struct acpi_iort_node *iort_node; + }; +}; + /* SMMU private data for each master */ struct arm_smmu_master_data { + struct arm_smmu_fw_handle handle; struct arm_smmu_device *smmu; struct arm_smmu_strtab_ent ste; @@ -1721,9 +1736,17 @@ arm_smmu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) return ret; } -static struct arm_smmu_device *arm_smmu_get_by_node(struct device_node *np) +static struct arm_smmu_device * +arm_smmu_get_dev(struct arm_smmu_fw_handle *handle) { - struct platform_device *smmu_pdev = of_find_device_by_node(np); + struct platform_device *smmu_pdev = NULL; + + if (handle->type == ARM_SMMU_FW_OF) { + smmu_pdev = of_find_device_by_node(handle->np); + of_node_put(handle->np); + } else if (handle->type == ARM_SMMU_FW_IORT) { + smmu_pdev = iort_find_iommu_device(handle->iort_node); + } if (!smmu_pdev) return NULL; @@ -1743,16 +1766,14 @@ static bool arm_smmu_sid_in_range(struct arm_smmu_device *smmu, u32 sid) static int arm_smmu_add_device(struct device *dev) { - struct device_node *np; struct arm_smmu_device *smmu; struct arm_smmu_master_data *data = dev->archdata.iommu; if (!data) return -ENODEV; - np = (struct device_node *)data->smmu; - smmu = data->smmu = arm_smmu_get_by_node(np); - of_node_put(np); + smmu = data->smmu = arm_smmu_get_dev(&data->handle); + if (!smmu) return -ENODEV; @@ -1854,7 +1875,8 @@ static int arm_smmu_of_xlate(struct device *dev, struct of_phandle_args *args) * By the time we see this again in an add_device callback, we'll * be in a position to fix it up with the real thing. */ - data->smmu = (struct arm_smmu_device *)args->np; + data->handle.type = ARM_SMMU_FW_OF; + data->handle.np = args->np; data->sid = args->args[0]; dev->archdata.iommu = data; @@ -2688,9 +2710,31 @@ static int __init arm_smmu_of_init(struct device_node *np) IOMMU_OF_DECLARE(arm_smmuv3, "arm,smmu-v3", arm_smmu_of_init); #ifdef CONFIG_ACPI +static int arm_smmu_iort_xlate(struct device *dev, u32 streamid, + struct acpi_iort_node *node) +{ + struct arm_smmu_master_data *data; + + if (!node || (node->type != ACPI_IORT_NODE_SMMU_V3)) + return -ENODEV; + + if (dev->archdata.iommu) + return -EEXIST; + + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->handle.type = ARM_SMMU_FW_IORT; + data->handle.iort_node = node; + data->sid = streamid; + dev->archdata.iommu = data; + return 0; +} + static int acpi_smmu_init(struct acpi_iort_node *node) { - iort_smmu_set_ops(node, &arm_smmu_ops, NULL); + iort_smmu_set_ops(node, &arm_smmu_ops, arm_smmu_iort_xlate); return 0; } -- 2.6.4
next prev parent reply other threads:[~2016-06-07 13:31 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-07 13:30 [RFC PATCH v2 00/15] ACPI IORT ARM SMMU v3 support Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi [not found] ` <1465306270-27076-1-git-send-email-lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org> 2016-06-07 13:30 ` [RFC PATCH v2 01/15] drivers: acpi: iort: fix struct pci_dev compiler warnings Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi 2016-06-07 13:30 ` [RFC PATCH v2 02/15] drivers: irqchip: its: fix its_acpi_probe() prototype Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi 2016-06-07 13:30 ` [RFC PATCH v2 03/15] arm64: mm: change IOMMU notifier action to attach DMA ops Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi 2016-06-17 9:27 ` Robin Murphy 2016-06-17 9:27 ` Robin Murphy [not found] ` <5763C27A.9030306-5wv7dgnIgG8@public.gmane.org> 2016-06-17 14:15 ` Lorenzo Pieralisi 2016-06-17 14:15 ` Lorenzo Pieralisi 2016-06-17 14:15 ` Lorenzo Pieralisi 2016-06-23 11:32 ` Robin Murphy 2016-06-23 11:32 ` Robin Murphy 2016-06-21 7:53 ` Marek Szyprowski 2016-06-21 7:53 ` Marek Szyprowski 2016-06-21 7:53 ` Marek Szyprowski 2016-06-21 7:53 ` Marek Szyprowski [not found] ` <03c537e7-0acf-edca-d0e0-369490c828df-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> 2016-06-21 16:06 ` Lorenzo Pieralisi 2016-06-21 16:06 ` Lorenzo Pieralisi 2016-06-21 16:06 ` Lorenzo Pieralisi 2016-06-21 16:06 ` Lorenzo Pieralisi 2016-06-23 6:13 ` Marek Szyprowski 2016-06-23 6:13 ` Marek Szyprowski 2016-06-07 13:30 ` [RFC PATCH v2 04/15] drivers: acpi: iort: add support for IOMMU registration Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi 2016-06-07 13:30 ` Lorenzo Pieralisi 2016-06-07 13:31 ` [RFC PATCH v2 05/15] drivers: acpi: iort: add support for named component look-up Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` [RFC PATCH v2 06/15] drivers: acpi: iort: enhance device identifiers mappings Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` [RFC PATCH v2 08/15] drivers: acpi: iort: add support for ARM SMMU platform devices creation Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` [RFC PATCH v2 09/15] drivers: iommu: arm-smmu-v3: split probe functions into DT/generic portions Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-14 18:09 ` Will Deacon 2016-06-14 18:09 ` Will Deacon 2016-06-07 13:31 ` [RFC PATCH v2 10/15] drivers: iommu: arm-smmu-v3: enable ACPI driver initialization Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-14 18:12 ` Will Deacon 2016-06-14 18:12 ` Will Deacon 2016-06-07 13:31 ` [RFC PATCH v2 13/15] drivers: acpi: iort: introduce iort_iommu_configure Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-10 12:46 ` Tomasz Nowicki 2016-06-10 12:46 ` Tomasz Nowicki 2016-06-10 12:46 ` Tomasz Nowicki 2016-06-07 13:31 ` [RFC PATCH v2 07/15] drivers: acpi: iort: add node match function Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` [RFC PATCH v2 11/15] drivers: iommu: arm-smmu-v3: add IORT iommu configuration Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-14 18:39 ` Will Deacon 2016-06-14 18:39 ` Will Deacon [not found] ` <20160614183939.GL16531-5wv7dgnIgG8@public.gmane.org> 2016-06-15 8:52 ` Lorenzo Pieralisi 2016-06-15 8:52 ` Lorenzo Pieralisi 2016-06-15 8:52 ` Lorenzo Pieralisi 2016-06-07 13:31 ` [RFC PATCH v2 12/15] drivers: acpi: implement acpi_dma_configure Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi [not found] ` <1465306270-27076-13-git-send-email-lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org> 2016-06-10 16:25 ` Bjorn Helgaas 2016-06-10 16:25 ` Bjorn Helgaas 2016-06-10 16:25 ` Bjorn Helgaas 2016-06-07 13:31 ` [RFC PATCH v2 14/15] drivers: acpi: iort: add function to retrieve IOMMU platform devices Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi 2016-06-07 13:31 ` Lorenzo Pieralisi [this message] 2016-06-07 13:31 ` [RFC PATCH v2 15/15] drivers: iommu: arm-smmu-v3: allow ACPI based streamid translation Lorenzo Pieralisi 2016-06-21 10:37 ` [RFC PATCH v2 00/15] ACPI IORT ARM SMMU v3 support Hanjun Guo 2016-06-21 10:37 ` Hanjun Guo 2016-06-21 10:37 ` Hanjun Guo [not found] ` <b00f33ad-be24-21a9-b03b-611756bbc8e9-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-06-21 14:27 ` Lorenzo Pieralisi 2016-06-21 14:27 ` Lorenzo Pieralisi 2016-06-21 14:27 ` Lorenzo Pieralisi 2016-06-21 14:27 ` Lorenzo Pieralisi 2016-06-22 2:45 ` Hanjun Guo 2016-06-22 2:45 ` Hanjun Guo 2016-06-22 2:45 ` Hanjun Guo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1465306270-27076-16-git-send-email-lorenzo.pieralisi@arm.com \ --to=lorenzo.pieralisi@arm.com \ --cc=hanjun.guo@linaro.org \ --cc=iommu@lists.linux-foundation.org \ --cc=jcm@redhat.com \ --cc=joro@8bytes.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=okaya@codeaurora.org \ --cc=rjw@rjwysocki.net \ --cc=robin.murphy@arm.com \ --cc=tn@semihalf.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.