Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Docs: dt: Be explicit and consistent in reference to IOMMU specifiers

The generic IOMMU binding says that the meaning of an 'IOMMU specifier'
is defined by the binding of a specific SMMU. The ARM SMMU binding
never explicitly uses the term 'specifier' at all. Update implicit
references to use the explicit term.

In the iommu-map binding change references to iommu-specifier to
"IOMMU specifier" so we are 100% consistent everywhere with terminology
and capitalization.

Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>

authored by

Stuart Yoder and committed by
Rob Herring
5bb61d14 33ec2240

+8 -8
+5 -5
Documentation/devicetree/bindings/iommu/arm,smmu.txt
··· 36 36 combined interrupt, it must be listed multiple times. 37 37 38 38 - #iommu-cells : See Documentation/devicetree/bindings/iommu/iommu.txt 39 - for details. With a value of 1, each "iommus" entry 39 + for details. With a value of 1, each IOMMU specifier 40 40 represents a distinct stream ID emitted by that device 41 41 into the relevant SMMU. 42 42 43 43 SMMUs with stream matching support and complex masters 44 - may use a value of 2, where the second cell represents 45 - an SMR mask to combine with the ID in the first cell. 46 - Care must be taken to ensure the set of matched IDs 47 - does not result in conflicts. 44 + may use a value of 2, where the second cell of the 45 + IOMMU specifier represents an SMR mask to combine with 46 + the ID in the first cell. Care must be taken to ensure 47 + the set of matched IDs does not result in conflicts. 48 48 49 49 ** System MMU optional properties: 50 50
+3 -3
Documentation/devicetree/bindings/pci/pci-iommu.txt
··· 32 32 Optional properties 33 33 ------------------- 34 34 35 - - iommu-map: Maps a Requester ID to an IOMMU and associated iommu-specifier 35 + - iommu-map: Maps a Requester ID to an IOMMU and associated IOMMU specifier 36 36 data. 37 37 38 38 The property is an arbitrary number of tuples of 39 39 (rid-base,iommu,iommu-base,length). 40 40 41 41 Any RID r in the interval [rid-base, rid-base + length) is associated with 42 - the listed IOMMU, with the iommu-specifier (r - rid-base + iommu-base). 42 + the listed IOMMU, with the IOMMU specifier (r - rid-base + iommu-base). 43 43 44 44 - iommu-map-mask: A mask to be applied to each Requester ID prior to being 45 - mapped to an iommu-specifier per the iommu-map property. 45 + mapped to an IOMMU specifier per the iommu-map property. 46 46 47 47 48 48 Example (1)