| Message ID | 20160229143309.28517.77269.sendpatchset@little-apple (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On Mon, Feb 29, 2016 at 11:33:09PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm+renesas@opensource.se> > > Update the IPMMU DT binding documentation to include the r8a7795 compat > string as well as the "renesas,ipmmu-main" property that on r8a7795 will > be used to describe the topology and the relationship between the various > cache IPMMU instances and the main IPMMU. > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Hi Magnus, On Mon, Feb 29, 2016 at 3:33 PM, Magnus Damm <magnus.damm@gmail.com> wrote: > From: Magnus Damm <damm+renesas@opensource.se> > > Update the IPMMU DT binding documentation to include the r8a7795 compat > string as well as the "renesas,ipmmu-main" property that on r8a7795 will > be used to describe the topology and the relationship between the various > cache IPMMU instances and the main IPMMU. > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Thanks for your patch! > --- > > Written against linux-next tag next-20160229 > > Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt | 15 ++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > --- 0001/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt > +++ work/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt 2016-02-29 23:25:15.540513000 +0900 > @@ -7,23 +7,34 @@ connected to the IPMMU through a port ca > > Required Properties: > > - - compatible: Must contain SoC-specific and generic entries from below. > + - compatible: Must contain SoC-specific and generic entry below in case > + the device is compatible with the R-Car Gen2 VMSA-compatible IPMMU. > > - "renesas,ipmmu-r8a73a4" for the R8A73A4 (R-Mobile APE6) IPMMU. > - "renesas,ipmmu-r8a7790" for the R8A7790 (R-Car H2) IPMMU. > - "renesas,ipmmu-r8a7791" for the R8A7791 (R-Car M2-W) IPMMU. > - "renesas,ipmmu-r8a7793" for the R8A7793 (R-Car M2-N) IPMMU. > - "renesas,ipmmu-r8a7794" for the R8A7794 (R-Car E2) IPMMU. > + - "renesas,ipmmu-r8a7795" for the R8A7795 (R-Car H3) IPMMU. > - "renesas,ipmmu-vmsa" for generic R-Car Gen2 VMSA-compatible IPMMU. > > - reg: Base address and size of the IPMMU registers. > - interrupts: Specifiers for the MMU fault interrupts. For instances that > support secure mode two interrupts must be specified, for non-secure and > secure mode, in that order. For instances that don't support secure mode a > - single interrupt must be specified. > + single interrupt must be specified. Not required for cache IPMMUs. > > - #iommu-cells: Must be 1. > > +Optional properties: > + > + - renesas,ipmmu-main: reference to the main IPMMU instance in two cells. > + The first cell is a phandle to the main IPMMU and the second cell is > + the interrupt bit number associated with the particular cache IPMMU device. > + The interrupt bit number needs to match the main IPMMU IMSSTR register. > + Only used by cache IPMMU instances. > + > + I think it would be good to include an example of how the optional properties should be used. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Mon, Feb 29, 2016 at 11:33:09PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm+renesas@opensource.se> > > Update the IPMMU DT binding documentation to include the r8a7795 compat > string as well as the "renesas,ipmmu-main" property that on r8a7795 will > be used to describe the topology and the relationship between the various > cache IPMMU instances and the main IPMMU. > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> > --- > > Written against linux-next tag next-20160229 > > Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt | 15 ++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) Through which tree should this go?
On Wed, Mar 2, 2016 at 11:55 PM, Joerg Roedel <joro@8bytes.org> wrote: > On Mon, Feb 29, 2016 at 11:33:09PM +0900, Magnus Damm wrote: >> From: Magnus Damm <damm+renesas@opensource.se> >> >> Update the IPMMU DT binding documentation to include the r8a7795 compat >> string as well as the "renesas,ipmmu-main" property that on r8a7795 will >> be used to describe the topology and the relationship between the various >> cache IPMMU instances and the main IPMMU. >> >> Signed-off-by: Magnus Damm <damm+renesas@opensource.se> >> --- >> >> Written against linux-next tag next-20160229 >> >> Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt | 15 ++++++++-- >> 1 file changed, 13 insertions(+), 2 deletions(-) > > Through which tree should this go? Unless anyone objects may I suggest going through your tree please! / magnus
On Thu, Mar 03, 2016 at 12:46:30AM +0900, Magnus Damm wrote: > On Wed, Mar 2, 2016 at 11:55 PM, Joerg Roedel <joro@8bytes.org> wrote: > > On Mon, Feb 29, 2016 at 11:33:09PM +0900, Magnus Damm wrote: > >> From: Magnus Damm <damm+renesas@opensource.se> > >> > >> Update the IPMMU DT binding documentation to include the r8a7795 compat > >> string as well as the "renesas,ipmmu-main" property that on r8a7795 will > >> be used to describe the topology and the relationship between the various > >> cache IPMMU instances and the main IPMMU. > >> > >> Signed-off-by: Magnus Damm <damm+renesas@opensource.se> > >> --- > >> > >> Written against linux-next tag next-20160229 > >> > >> Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt | 15 ++++++++-- > >> 1 file changed, 13 insertions(+), 2 deletions(-) > > > > Through which tree should this go? > > Unless anyone objects may I suggest going through your tree please! FWIW that would be my preferred option.
On Thu, Mar 03, 2016 at 09:05:39AM +0900, Simon Horman wrote: > On Thu, Mar 03, 2016 at 12:46:30AM +0900, Magnus Damm wrote: > > On Wed, Mar 2, 2016 at 11:55 PM, Joerg Roedel <joro@8bytes.org> wrote: > > > On Mon, Feb 29, 2016 at 11:33:09PM +0900, Magnus Damm wrote: > > >> From: Magnus Damm <damm+renesas@opensource.se> > > >> > > >> Update the IPMMU DT binding documentation to include the r8a7795 compat > > >> string as well as the "renesas,ipmmu-main" property that on r8a7795 will > > >> be used to describe the topology and the relationship between the various > > >> cache IPMMU instances and the main IPMMU. > > >> > > >> Signed-off-by: Magnus Damm <damm+renesas@opensource.se> > > >> --- > > >> > > >> Written against linux-next tag next-20160229 > > >> > > >> Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt | 15 ++++++++-- > > >> 1 file changed, 13 insertions(+), 2 deletions(-) > > > > > > Through which tree should this go? > > > > Unless anyone objects may I suggest going through your tree please! > > FWIW that would be my preferred option. Okay, applied.
Hi Rob, On Monday 29 Feb 2016 23:33:09 Magnus Damm wrote: > From: Magnus Damm <damm+renesas@opensource.se> > > Update the IPMMU DT binding documentation to include the r8a7795 compat > string as well as the "renesas,ipmmu-main" property that on r8a7795 will > be used to describe the topology and the relationship between the various > cache IPMMU instances and the main IPMMU. > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> This DT binding has been merged already, but isn't used upstream (nor in the dts nor in the drivers). We plan to start using it, and I'd like to seize this last opportunity to change it if needed and ask you for a review. > --- > > Written against linux-next tag next-20160229 > > Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt | 15 ++++- > 1 file changed, 13 insertions(+), 2 deletions(-) > > --- 0001/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt > +++ > work/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt 2016-02 > -29 23:25:15.540513000 +0900 @@ -7,23 +7,34 @@ connected to the IPMMU > through a port ca > > Required Properties: > > - - compatible: Must contain SoC-specific and generic entries from below. > + - compatible: Must contain SoC-specific and generic entry below in case > + the device is compatible with the R-Car Gen2 VMSA-compatible IPMMU. > > - "renesas,ipmmu-r8a73a4" for the R8A73A4 (R-Mobile APE6) IPMMU. > - "renesas,ipmmu-r8a7790" for the R8A7790 (R-Car H2) IPMMU. > - "renesas,ipmmu-r8a7791" for the R8A7791 (R-Car M2-W) IPMMU. > - "renesas,ipmmu-r8a7793" for the R8A7793 (R-Car M2-N) IPMMU. > - "renesas,ipmmu-r8a7794" for the R8A7794 (R-Car E2) IPMMU. > + - "renesas,ipmmu-r8a7795" for the R8A7795 (R-Car H3) IPMMU. > - "renesas,ipmmu-vmsa" for generic R-Car Gen2 VMSA-compatible IPMMU. > > - reg: Base address and size of the IPMMU registers. > - interrupts: Specifiers for the MMU fault interrupts. For instances that > support secure mode two interrupts must be specified, for non-secure and > secure mode, in that order. For instances that don't support secure mode a > - single interrupt must be specified. > + single interrupt must be specified. Not required for cache IPMMUs. > > - #iommu-cells: Must be 1. > > +Optional properties: > + > + - renesas,ipmmu-main: reference to the main IPMMU instance in two cells. > + The first cell is a phandle to the main IPMMU and the second cell is > + the interrupt bit number associated with the particular cache IPMMU > device. > + The interrupt bit number needs to match the main IPMMU IMSSTR register. > + Only used by cache IPMMU instances. > + > + > Each bus master connected to an IPMMU must reference the IPMMU in its > device node with the following property:
On Fri, Feb 03, 2017 at 04:10:30PM +0200, Laurent Pinchart wrote: > Hi Rob, > > On Monday 29 Feb 2016 23:33:09 Magnus Damm wrote: > > From: Magnus Damm <damm+renesas@opensource.se> > > > > Update the IPMMU DT binding documentation to include the r8a7795 compat > > string as well as the "renesas,ipmmu-main" property that on r8a7795 will > > be used to describe the topology and the relationship between the various > > cache IPMMU instances and the main IPMMU. > > > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> > > This DT binding has been merged already, but isn't used upstream (nor in the > dts nor in the drivers). We plan to start using it, and I'd like to seize this > last opportunity to change it if needed and ask you for a review. Looks pretty standard. Rob
--- 0001/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt +++ work/Documentation/devicetree/bindings/iommu/renesas,ipmmu-vmsa.txt 2016-02-29 23:25:15.540513000 +0900 @@ -7,23 +7,34 @@ connected to the IPMMU through a port ca Required Properties: - - compatible: Must contain SoC-specific and generic entries from below. + - compatible: Must contain SoC-specific and generic entry below in case + the device is compatible with the R-Car Gen2 VMSA-compatible IPMMU. - "renesas,ipmmu-r8a73a4" for the R8A73A4 (R-Mobile APE6) IPMMU. - "renesas,ipmmu-r8a7790" for the R8A7790 (R-Car H2) IPMMU. - "renesas,ipmmu-r8a7791" for the R8A7791 (R-Car M2-W) IPMMU. - "renesas,ipmmu-r8a7793" for the R8A7793 (R-Car M2-N) IPMMU. - "renesas,ipmmu-r8a7794" for the R8A7794 (R-Car E2) IPMMU. + - "renesas,ipmmu-r8a7795" for the R8A7795 (R-Car H3) IPMMU. - "renesas,ipmmu-vmsa" for generic R-Car Gen2 VMSA-compatible IPMMU. - reg: Base address and size of the IPMMU registers. - interrupts: Specifiers for the MMU fault interrupts. For instances that support secure mode two interrupts must be specified, for non-secure and secure mode, in that order. For instances that don't support secure mode a - single interrupt must be specified. + single interrupt must be specified. Not required for cache IPMMUs. - #iommu-cells: Must be 1. +Optional properties: + + - renesas,ipmmu-main: reference to the main IPMMU instance in two cells. + The first cell is a phandle to the main IPMMU and the second cell is + the interrupt bit number associated with the particular cache IPMMU device. + The interrupt bit number needs to match the main IPMMU IMSSTR register. + Only used by cache IPMMU instances. + + Each bus master connected to an IPMMU must reference the IPMMU in its device node with the following property: