leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Stuart Yoder
2016-12-15 18:16:13 -06:00
committed by Rob Herring
parent 33ec224045
commit 5bb61d14b9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/devicetree/bindings/iommu/arm,smmu.txt
View File

@@ -36,15 +36,15 @@ conditions.
combined interrupt, it must be listed multiple times. combined interrupt, it must be listed multiple times.
- #iommu-cells : See Documentation/devicetree/bindings/iommu/iommu.txt - #iommu-cells : See Documentation/devicetree/bindings/iommu/iommu.txt
for details. With a value of 1, each "iommus" entry for details. With a value of 1, each IOMMU specifier
represents a distinct stream ID emitted by that device represents a distinct stream ID emitted by that device
into the relevant SMMU. into the relevant SMMU.
SMMUs with stream matching support and complex masters SMMUs with stream matching support and complex masters
may use a value of 2, where the second cell represents may use a value of 2, where the second cell of the
an SMR mask to combine with the ID in the first cell. IOMMU specifier represents an SMR mask to combine with
Care must be taken to ensure the set of matched IDs the ID in the first cell. Care must be taken to ensure
does not result in conflicts. the set of matched IDs does not result in conflicts.
** System MMU optional properties: ** System MMU optional properties:

6
Documentation/devicetree/bindings/pci/pci-iommu.txt
View File

@@ -32,17 +32,17 @@ PCI root complex
Optional properties Optional properties
------------------- -------------------
- iommu-map: Maps a Requester ID to an IOMMU and associated iommu-specifier - iommu-map: Maps a Requester ID to an IOMMU and associated IOMMU specifier
data. data.
The property is an arbitrary number of tuples of The property is an arbitrary number of tuples of
(rid-base,iommu,iommu-base,length). (rid-base,iommu,iommu-base,length).
Any RID r in the interval [rid-base, rid-base + length) is associated with Any RID r in the interval [rid-base, rid-base + length) is associated with
the listed IOMMU, with the iommu-specifier (r - rid-base + iommu-base). the listed IOMMU, with the IOMMU specifier (r - rid-base + iommu-base).
- iommu-map-mask: A mask to be applied to each Requester ID prior to being - iommu-map-mask: A mask to be applied to each Requester ID prior to being
mapped to an iommu-specifier per the iommu-map property. mapped to an IOMMU specifier per the iommu-map property.
Example (1) Example (1)