From: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: will.deacon-5wv7dgnIgG8@public.gmane.org, Suravee.Suthikulpanit-5C7GfCeVMHo@public.gmane.org, Thomas.Lendacky-5C7GfCeVMHo@public.gmane.org, stuart.yoder-3arQi8VN3Tc@public.gmane.org, tchalamarla-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org, anup.patel-dY08KVG/lbpWk0Htik3J/w@public.gmane.org, thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org Subject: [PATCH 10/12] Docs: dt: document ARM SMMU generic binding usage Date: Mon, 29 Feb 2016 13:46:19 +0000 [thread overview] Message-ID: <af1ce6d7d69e340ac839c69b475728f7aa50ff23.1456514380.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> Document how the generic "iommus" binding should be used to describe ARM SMMU stream IDs instead of the old "mmu-masters" binding. Signed-off-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> --- .../devicetree/bindings/iommu/arm,smmu.txt | 40 ++++++++++++++-------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt index 7180745..a213f74 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt @@ -34,12 +34,11 @@ conditions. interrupt per context bank. In the case of a single, combined interrupt, it must be listed multiple times. -- mmu-masters : A list of phandles to device nodes representing bus - masters for which the SMMU can provide a translation - and their corresponding StreamIDs (see example below). - Each device node linked from this list must have a - "#stream-id-cells" property, indicating the number of - StreamIDs associated with it. +- #iommu-cells : See Documentation/devicetree/bindings/iommu/iommu.txt + for details. Should be 1, where each "iommus" entry on + the device represents a distinct stream ID emitted by + that device into the relevant SMMU. Cells beyond 1 are + reserved for future use. ** System MMU optional properties: @@ -55,9 +54,19 @@ conditions. aliases of secure registers have to be used during SMMU configuration. -Example: +** Deprecated properties: - smmu { +- mmu-masters (deprecated in favour of the generic "iommus" binding) : + A list of phandles to device nodes representing bus + masters for which the SMMU can provide a translation + and their corresponding StreamIDs (see example below). + Each device node linked from this list must have a + "#stream-id-cells" property, indicating the number of + StreamIDs associated with it. + +** Example: + + smmu1: iommu { compatible = "arm,smmu-v1"; reg = <0xba5e0000 0x10000>; #global-interrupts = <2>; @@ -67,11 +76,12 @@ Example: <0 35 4>, <0 36 4>, <0 37 4>; - - /* - * Two DMA controllers, the first with two StreamIDs (0xd01d - * and 0xd01e) and the second with only one (0xd11c). - */ - mmu-masters = <&dma0 0xd01d 0xd01e>, - <&dma1 0xd11c>; + #iommu-cells = <1>; }; + + /* device with two stream IDs, 0 and 7 */ + master { + iommus = <&smmu1 0>, + <&smmu1 7>; + }; + -- 2.7.2.333.g70bd996.dirty -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: robin.murphy@arm.com (Robin Murphy) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 10/12] Docs: dt: document ARM SMMU generic binding usage Date: Mon, 29 Feb 2016 13:46:19 +0000 [thread overview] Message-ID: <af1ce6d7d69e340ac839c69b475728f7aa50ff23.1456514380.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1456514380.git.robin.murphy@arm.com> Document how the generic "iommus" binding should be used to describe ARM SMMU stream IDs instead of the old "mmu-masters" binding. Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- .../devicetree/bindings/iommu/arm,smmu.txt | 40 ++++++++++++++-------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt index 7180745..a213f74 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt @@ -34,12 +34,11 @@ conditions. interrupt per context bank. In the case of a single, combined interrupt, it must be listed multiple times. -- mmu-masters : A list of phandles to device nodes representing bus - masters for which the SMMU can provide a translation - and their corresponding StreamIDs (see example below). - Each device node linked from this list must have a - "#stream-id-cells" property, indicating the number of - StreamIDs associated with it. +- #iommu-cells : See Documentation/devicetree/bindings/iommu/iommu.txt + for details. Should be 1, where each "iommus" entry on + the device represents a distinct stream ID emitted by + that device into the relevant SMMU. Cells beyond 1 are + reserved for future use. ** System MMU optional properties: @@ -55,9 +54,19 @@ conditions. aliases of secure registers have to be used during SMMU configuration. -Example: +** Deprecated properties: - smmu { +- mmu-masters (deprecated in favour of the generic "iommus" binding) : + A list of phandles to device nodes representing bus + masters for which the SMMU can provide a translation + and their corresponding StreamIDs (see example below). + Each device node linked from this list must have a + "#stream-id-cells" property, indicating the number of + StreamIDs associated with it. + +** Example: + + smmu1: iommu { compatible = "arm,smmu-v1"; reg = <0xba5e0000 0x10000>; #global-interrupts = <2>; @@ -67,11 +76,12 @@ Example: <0 35 4>, <0 36 4>, <0 37 4>; - - /* - * Two DMA controllers, the first with two StreamIDs (0xd01d - * and 0xd01e) and the second with only one (0xd11c). - */ - mmu-masters = <&dma0 0xd01d 0xd01e>, - <&dma1 0xd11c>; + #iommu-cells = <1>; }; + + /* device with two stream IDs, 0 and 7 */ + master { + iommus = <&smmu1 0>, + <&smmu1 7>; + }; + -- 2.7.2.333.g70bd996.dirty
next prev parent reply other threads:[~2016-02-29 13:46 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-29 13:46 [PATCH 00/12] Generic DT bindings for PCI and ARM SMMU Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <cover.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 13:46 ` [PATCH 01/12] Docs: dt: add PCI IOMMU map bindings Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <5bcbc7c0c8825cb0a2ac216bac0ab99722a84618.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-03-03 22:27 ` Rob Herring 2016-03-03 22:27 ` Rob Herring 2016-02-29 13:46 ` [PATCH 02/12] of/irq: Break out msi-map lookup (again) Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 03/12] iommu/of: Handle iommu-map property for PCI Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 04/12] arm64/dma-mapping: Extend DMA ops workaround to PCI devices Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <ffcca878210c916962c562d3d1341aae93d593d0.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 16:47 ` Catalin Marinas 2016-02-29 16:47 ` Catalin Marinas 2016-02-29 13:46 ` [PATCH 05/12] arm64/dma-mapping: Remove default domain workaround Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <698ecf1450da8b56a8f297b83815d2fe866ca0e1.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 16:51 ` Catalin Marinas 2016-02-29 16:51 ` Catalin Marinas 2016-02-29 13:46 ` [PATCH 06/12] iommu/arm-smmu: Streamline SMMU data lookup Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 07/12] iommu/arm-smmu: Factor out mmu-masters handling Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 08/12] iommu/arm-smmu: Refactor master/group config handling Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 09/12] iommu/arm-smmu: Simplify mmu-masters handling Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` Robin Murphy [this message] 2016-02-29 13:46 ` [PATCH 10/12] Docs: dt: document ARM SMMU generic binding usage Robin Murphy [not found] ` <af1ce6d7d69e340ac839c69b475728f7aa50ff23.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-03-03 22:29 ` Rob Herring 2016-03-03 22:29 ` Rob Herring 2016-02-29 13:46 ` [PATCH 11/12] iommu/arm-smmu: Generic IOMMU DT bindings support Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <a3edd4225fe8b39440fb9b6a70a70883d3cb103b.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 18:09 ` Sricharan 2016-02-29 18:09 ` Sricharan 2016-03-02 13:30 ` Robin Murphy 2016-03-02 13:30 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 12/12] iommu/arm-smmu: Group platform devices appropriately Robin Murphy 2016-02-29 13:46 ` Robin Murphy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=af1ce6d7d69e340ac839c69b475728f7aa50ff23.1456514380.git.robin.murphy@arm.com \ --to=robin.murphy-5wv7dgnigg8@public.gmane.org \ --cc=Suravee.Suthikulpanit-5C7GfCeVMHo@public.gmane.org \ --cc=Thomas.Lendacky-5C7GfCeVMHo@public.gmane.org \ --cc=anup.patel-dY08KVG/lbpWk0Htik3J/w@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=stuart.yoder-3arQi8VN3Tc@public.gmane.org \ --cc=tchalamarla-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org \ --cc=thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org \ --cc=will.deacon-5wv7dgnIgG8@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.