Commit a571f73d authored Sep 26, 2016 by Patrick Daly

iommu/arm-smmu: add support for dynamic stream IDs to DT parsing



Currently we program all stream IDs based on the configuration specified
by clients in their device tree nodes, so we've always required any
`iommus' entries to have *exactly* 1 stream ID per list element.
However, there are some devices that might not have statically-defined
SIDs that can be placed in the device tree (devices behind PCI-e, for
example).  Add support for this by accepting stream-ID-less `iommus'
entries in the device tree.

Change-Id: I62745dc4159114181fa51b22c732935cb47f60bc
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>

parent 4c77560b

drivers/iommu/arm-smmu.c

+13 −4

Original line number	Diff line number	Diff line
		@@ -718,13 +718,22 @@ static int arm_smmu_parse_iommus_properties(struct arm_smmu_device *smmu,
		entry->node = master;
		list_add(&entry->list, &iommus);
		}
		if (iommuspec.args_count != 1) {
		dev_err(smmu->dev, "iommus property has wrong #iommu-cells");
		return -EINVAL;
		}
		switch (iommuspec.args_count) {
		case 0:
		/*
		* For pci-e devices the SIDs are provided
		* at device attach time.
		*/
		break;
		case 1:
		entry->num_sids++;
		entry->streamids[entry->num_sids - 1]
		= iommuspec.args[0];
		break;
		default:
		dev_err(smmu->dev, "iommus property has wrong #iommu-cells");
		return -EINVAL;
		}
		arg_ind++;
		}