Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08d4ca2a authored by Robin Murphy's avatar Robin Murphy Committed by Will Deacon
Browse files

iommu/arm-smmu: Support non-PCI devices with SMMUv3 



With the device <-> stream ID relationship suitably abstracted and
of_xlate() hooked up, the PCI dependency now looks, and is, entirely
arbitrary. Any bus using the of_dma_configure() mechanism will work,
so extend support to the platform and AMBA buses which do just that.

Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Tested-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 8f785154

drivers/iommu/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ config ARM_SMMU 


config ARM_SMMU_V3

	bool "ARM Ltd. System MMU Version 3 (SMMUv3) Support"

	depends on ARM64 && PCI

	depends on ARM64

	select IOMMU_API

	select IOMMU_IO_PGTABLE_LPAE

	select GENERIC_MSI_IRQ_DOMAIN

drivers/iommu/arm-smmu-v3.c

+31 −6
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
#include <linux/pci.h>

#include <linux/platform_device.h>



#include <linux/amba/bus.h>



#include "io-pgtable.h"



/* MMIO registers */
@@ -1805,6 +1807,23 @@ static void arm_smmu_remove_device(struct device *dev) 
	iommu_fwspec_free(dev);

}



static struct iommu_group *arm_smmu_device_group(struct device *dev)

{

	struct iommu_group *group;



	/*

	 * We don't support devices sharing stream IDs other than PCI RID

	 * aliases, since the necessary ID-to-device lookup becomes rather

	 * impractical given a potential sparse 32-bit stream ID space.

	 */

	if (dev_is_pci(dev))

		group = pci_device_group(dev);

	else

		group = generic_device_group(dev);



	return group;

}



static int arm_smmu_domain_get_attr(struct iommu_domain *domain,

				    enum iommu_attr attr, void *data)

{
@@ -1851,10 +1870,6 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain, 


static int arm_smmu_of_xlate(struct device *dev, struct of_phandle_args *args)

{

	/* We only support PCI, for now */

	if (!dev_is_pci(dev))

		return -ENODEV;



	return iommu_fwspec_add_ids(dev, args->args, 1);

}
@@ -1869,7 +1884,7 @@ static struct iommu_ops arm_smmu_ops = { 
	.iova_to_phys		= arm_smmu_iova_to_phys,

	.add_device		= arm_smmu_add_device,

	.remove_device		= arm_smmu_remove_device,

	.device_group		= pci_device_group,

	.device_group		= arm_smmu_device_group,

	.domain_get_attr	= arm_smmu_domain_get_attr,

	.domain_set_attr	= arm_smmu_domain_set_attr,

	.of_xlate		= arm_smmu_of_xlate,
@@ -2613,8 +2628,18 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) 


	/* And we're up. Go go go! */

	of_iommu_set_ops(dev->of_node, &arm_smmu_ops);

#ifdef CONFIG_PCI

	pci_request_acs();

	return bus_set_iommu(&pci_bus_type, &arm_smmu_ops);

	ret = bus_set_iommu(&pci_bus_type, &arm_smmu_ops);

	if (ret)

		return ret;

#endif

#ifdef CONFIG_ARM_AMBA

	ret = bus_set_iommu(&amba_bustype, &arm_smmu_ops);

	if (ret)

		return ret;

#endif

	return bus_set_iommu(&platform_bus_type, &arm_smmu_ops);

}



static int arm_smmu_device_remove(struct platform_device *pdev)