Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753849AbcLSXGR (ORCPT ); Mon, 19 Dec 2016 18:06:17 -0500 Received: from mail-it0-f68.google.com ([209.85.214.68]:35384 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751008AbcLSXGQ (ORCPT ); Mon, 19 Dec 2016 18:06:16 -0500 Date: Mon, 19 Dec 2016 17:06:12 -0600 From: Rob Herring To: Stuart Yoder Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, joro@8bytes.org, iommu@lists.linux-foundation.org, will.deacon@arm.com Subject: Re: [PATCH] Docs: dt: Be explicit and consistent in reference to IOMMU specifiers Message-ID: <20161219230612.6msig5uctfp3zrkc@rob-hp-laptop> References: <1481847373-2602-1-git-send-email-stuart.yoder@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1481847373-2602-1-git-send-email-stuart.yoder@nxp.com> User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3310 Lines: 74 On Thu, Dec 15, 2016 at 06:16:13PM -0600, Stuart Yoder wrote: > 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 > --- > Documentation/devicetree/bindings/iommu/arm,smmu.txt | 10 +++++----- > Documentation/devicetree/bindings/pci/pci-iommu.txt | 6 +++--- > 2 files changed, 8 insertions(+), 8 deletions(-) Applied, thanks. Rob > > diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt > index e862d148..6cdf32d 100644 > --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt > +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt > @@ -36,15 +36,15 @@ conditions. > combined interrupt, it must be listed multiple times. > > - #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 > into the relevant SMMU. > > SMMUs with stream matching support and complex masters > - may use a value of 2, where the second cell represents > - an SMR mask to combine with the ID in the first cell. > - Care must be taken to ensure the set of matched IDs > - does not result in conflicts. > + may use a value of 2, where the second cell of the > + IOMMU specifier represents an SMR mask to combine with > + the ID in the first cell. Care must be taken to ensure > + the set of matched IDs does not result in conflicts. > > ** System MMU optional properties: > > diff --git a/Documentation/devicetree/bindings/pci/pci-iommu.txt b/Documentation/devicetree/bindings/pci/pci-iommu.txt > index 56c8296..0def586 100644 > --- a/Documentation/devicetree/bindings/pci/pci-iommu.txt > +++ b/Documentation/devicetree/bindings/pci/pci-iommu.txt > @@ -32,17 +32,17 @@ PCI root complex > 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. > > The property is an arbitrary number of tuples of > (rid-base,iommu,iommu-base,length). > > 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 > - mapped to an iommu-specifier per the iommu-map property. > + mapped to an IOMMU specifier per the iommu-map property. > > > Example (1) > -- > 1.9.0 >