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

Commit ad9df1f9 authored by Mitchel Humpherys's avatar Mitchel Humpherys Committed by Patrick Daly
Browse files

arm64: dma-mapping: Attach IOMMUs as groups 



Some devices behind IOMMUs might end up in IOMMU groups due to DMA
aliasing.  The iommu_attach_device API expects a single device in a
group all by its lonesome, so it fails when a device is passed in that's
part of a group.  Use iommu_attach_group to accommodate these types of
devices.

Change-Id: I9601efd300c7f428c4576e6ecf6d31791d0b47bd
Signed-off-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
parent d49371a3

arch/arm64/mm/dma-mapping.c

+23 −4
Original line number Diff line number Diff line
@@ -1953,20 +1953,32 @@ EXPORT_SYMBOL(arm_iommu_release_mapping); 
 *

 * Attaches specified io address space mapping to the provided device,

 * this replaces the dma operations (dma_map_ops pointer) with the

 * IOMMU aware version. More than one client might be attached to

 * the same io address space mapping.

 * IOMMU aware version. Only one device in an iommu_group may use this

 * function.

 */

int arm_iommu_attach_device(struct device *dev,

			    struct dma_iommu_mapping *mapping)

{

	int err;

	int s1_bypass = 0, is_fast = 0;

	struct iommu_group *group;



	group = dev->iommu_group;

	if (!group) {

		dev_err(dev, "No iommu associated with device\n");

		return -ENODEV;

	}



	if (iommu_get_domain_for_dev(dev)) {

		dev_err(dev, "Device already attached to other iommu_domain\n");

		return -EINVAL;

	}



	iommu_domain_get_attr(mapping->domain, DOMAIN_ATTR_FAST, &is_fast);

	if (is_fast)

		return fast_smmu_attach_device(dev, mapping);



	err = iommu_attach_device(mapping->domain, dev);

	err = iommu_attach_group(mapping->domain, group);

	if (err)

		return err;
@@ -1994,6 +2006,7 @@ void arm_iommu_detach_device(struct device *dev) 
{

	struct dma_iommu_mapping *mapping;

	int is_fast, s1_bypass = 0;

	struct iommu_group *group;



	mapping = to_dma_iommu_mapping(dev);

	if (!mapping) {
@@ -2013,7 +2026,13 @@ void arm_iommu_detach_device(struct device *dev) 
	if (msm_dma_unmap_all_for_dev(dev))

		dev_warn(dev, "IOMMU detach with outstanding mappings\n");



	iommu_detach_device(mapping->domain, dev);

	group = dev->iommu_group;

	if (!group) {

		dev_err(dev, "No iommu associated with device\n");

		return;

	}



	iommu_detach_group(mapping->domain, group);

	kref_put(&mapping->kref, release_iommu_mapping);

	dev->archdata.mapping = NULL;

	if (!s1_bypass)

drivers/iommu/dma-mapping-fast.c

+14 −2
Original line number Diff line number Diff line
@@ -730,6 +730,7 @@ int fast_smmu_attach_device(struct device *dev, 
{

	int atomic_domain = 1;

	struct iommu_domain *domain = mapping->domain;

	struct iommu_group *group;

	struct iommu_pgtbl_info info;

	u64 size = (u64)mapping->bits << PAGE_SHIFT;
@@ -746,7 +747,18 @@ int fast_smmu_attach_device(struct device *dev, 
	mapping->fast->domain = domain;

	mapping->fast->dev = dev;



	if (iommu_attach_device(domain, dev))

	group = dev->iommu_group;

	if (!group) {

		dev_err(dev, "No iommu associated with device\n");

		return -ENODEV;

	}



	if (iommu_get_domain_for_dev(dev)) {

		dev_err(dev, "Device already attached to other iommu_domain\n");

		return -EINVAL;

	}



	if (iommu_attach_group(mapping->domain, group))

		return -EINVAL;



	if (iommu_domain_get_attr(domain, DOMAIN_ATTR_PGTBL_INFO,
@@ -781,7 +793,7 @@ EXPORT_SYMBOL(fast_smmu_attach_device); 
void fast_smmu_detach_device(struct device *dev,

			     struct dma_iommu_mapping *mapping)

{

	iommu_detach_device(mapping->domain, dev);

	iommu_detach_group(mapping->domain, dev->iommu_group);

	dev->archdata.mapping = NULL;

	set_dma_ops(dev, NULL);