This patch adds info about optional DT properties iommu-map-drop-mask and msi-map-drop-mask.
A drop mask represents the bits which will be removed/dropped by system from Requester ID before mapping it to msi ID or stream ID. Signed-off-by: Anup Patel <[email protected]> Signed-off-by: Oza Pawandeep <[email protected]> Signed-off-by: Srinath Mannam <[email protected]> Reviewed-by: Ray Jui <[email protected]> Reviewed-by: Scott Branden <[email protected]> --- .../devicetree/bindings/pci/pci-iommu.txt | 31 ++++++++++++++++++++ Documentation/devicetree/bindings/pci/pci-msi.txt | 33 ++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/Documentation/devicetree/bindings/pci/pci-iommu.txt b/Documentation/devicetree/bindings/pci/pci-iommu.txt index 0def586..499cb27 100644 --- a/Documentation/devicetree/bindings/pci/pci-iommu.txt +++ b/Documentation/devicetree/bindings/pci/pci-iommu.txt @@ -44,6 +44,9 @@ Optional properties - 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. +- iommu-map-drop-mask: A drop mask represents the bits which will be + removed/dropped by system from Requester ID before mapping it to + stream ID. Example (1) =========== @@ -169,3 +172,31 @@ Example (4) <0x8000 &iommu_b 0x0000 0x8000>; }; }; + +Example (5) +=========== + +/ { + #address-cells = <1>; + #size-cells = <1>; + + iommu: iommu@a { + reg = <0xa 0x1>; + compatible = "vendor,some-iommu"; + #iommu-cells = <1>; + }; + + pci: pci@f { + reg = <0xf 0x1>; + compatible = "vendor,pcie-root-complex"; + device_type = "pci"; + + /* + * The sideband data provided to the IOMMU is a 10bit + * data derived from the RID by dropping 4 MSBs + * of device number and 2 MSBs of function number. + */ + iommu-map = <0x0 &iommu 0x0 0x1024>; + iommu-map-drop-mask = <0xff09>; + }; +}; diff --git a/Documentation/devicetree/bindings/pci/pci-msi.txt b/Documentation/devicetree/bindings/pci/pci-msi.txt index 9b3cc81..1de3f39 100644 --- a/Documentation/devicetree/bindings/pci/pci-msi.txt +++ b/Documentation/devicetree/bindings/pci/pci-msi.txt @@ -49,6 +49,10 @@ Optional properties - msi-map-mask: A mask to be applied to each Requester ID prior to being mapped to an msi-specifier per the msi-map property. +- msi-map-drop-mask: A drop mask represents the bits which will be + removed/dropped by system from Requester ID before mapping it to + msi ID. + - msi-parent: Describes the MSI parent of the root complex itself. Where the root complex and MSI controller do not pass sideband data with MSI writes, this property may be used to describe the MSI controller(s) @@ -218,3 +222,32 @@ Example (5) <0x0000 &msi_b 0x0000 0x10000>; }; }; + +Example (6) +=========== + +/ { + #address-cells = <1>; + #size-cells = <1>; + + msi: msi-controller@a { + reg = <0xa 0x1>; + compatible = "vendor,some-controller"; + msi-controller; + #msi-cells = <1>; + }; + + pci: pci@f { + reg = <0xf 0x1>; + compatible = "vendor,pcie-root-complex"; + device_type = "pci"; + + /* + * The sideband data provided to the MSI controller is + * a 10bit data derived from the RID by dropping + * 4 MSBs of device number and 2 MSBs of function number. + */ + msi-map = <0x0 &msi_a 0x0 0x100>, + msi-map-drop-mask = <0xff09> + }; +}; -- 2.7.4 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
