[PATCH] dt-bindings: virtio: pci-iommu: Add ref to pci-device.yaml

Rob Herring (Arm) posted 1 patch 10 months ago
.../devicetree/bindings/virtio/pci-iommu.yaml          | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
[PATCH] dt-bindings: virtio: pci-iommu: Add ref to pci-device.yaml
Posted by Rob Herring (Arm) 10 months ago
The virtio pci-iommu is a PCI device, so it should have a reference to
the pci-device.yaml schema. The pci-device.yaml schema defines the 'reg'
format as a schema, so the text description for 'reg' can be dropped.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
 .../devicetree/bindings/virtio/pci-iommu.yaml          | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/virtio/pci-iommu.yaml b/Documentation/devicetree/bindings/virtio/pci-iommu.yaml
index 972a785a42de..8bd6ad72ac7a 100644
--- a/Documentation/devicetree/bindings/virtio/pci-iommu.yaml
+++ b/Documentation/devicetree/bindings/virtio/pci-iommu.yaml
@@ -20,6 +20,9 @@ description: |
   virtio-iommu node doesn't have an "iommus" property, and is omitted from
   the iommu-map property of the root complex.
 
+allOf:
+  - $ref: /schemas/pci/pci-device.yaml#
+
 properties:
   # If compatible is present, it should contain the vendor and device ID
   # according to the PCI Bus Binding specification. Since PCI provides
@@ -33,12 +36,7 @@ properties:
           - const: pci1af4,1057
 
   reg:
-    description: |
-      PCI address of the IOMMU. As defined in the PCI Bus Binding
-      reference, the reg property is a five-cell address encoded as (phys.hi
-      phys.mid phys.lo size.hi size.lo). phys.hi should contain the device's
-      BDF as 0b00000000 bbbbbbbb dddddfff 00000000. The other cells should be
-      zero. See Documentation/devicetree/bindings/pci/pci.txt
+    maxItems: 1
 
   '#iommu-cells':
     const: 1
-- 
2.47.2
Re: [PATCH] dt-bindings: virtio: pci-iommu: Add ref to pci-device.yaml
Posted by Rob Herring (Arm) 9 months, 3 weeks ago
On Mon, 07 Apr 2025 11:53:40 -0500, Rob Herring (Arm) wrote:
> The virtio pci-iommu is a PCI device, so it should have a reference to
> the pci-device.yaml schema. The pci-device.yaml schema defines the 'reg'
> format as a schema, so the text description for 'reg' can be dropped.
> 
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---
>  .../devicetree/bindings/virtio/pci-iommu.yaml          | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 

Applied, thanks!
Re: [PATCH] dt-bindings: virtio: pci-iommu: Add ref to pci-device.yaml
Posted by Jean-Philippe Brucker 10 months ago
On Mon, Apr 07, 2025 at 11:53:40AM -0500, Rob Herring (Arm) wrote:
> The virtio pci-iommu is a PCI device, so it should have a reference to
> the pci-device.yaml schema. The pci-device.yaml schema defines the 'reg'
> format as a schema, so the text description for 'reg' can be dropped.
> 
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>

Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>

> ---
>  .../devicetree/bindings/virtio/pci-iommu.yaml          | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/virtio/pci-iommu.yaml b/Documentation/devicetree/bindings/virtio/pci-iommu.yaml
> index 972a785a42de..8bd6ad72ac7a 100644
> --- a/Documentation/devicetree/bindings/virtio/pci-iommu.yaml
> +++ b/Documentation/devicetree/bindings/virtio/pci-iommu.yaml
> @@ -20,6 +20,9 @@ description: |
>    virtio-iommu node doesn't have an "iommus" property, and is omitted from
>    the iommu-map property of the root complex.
>  
> +allOf:
> +  - $ref: /schemas/pci/pci-device.yaml#
> +
>  properties:
>    # If compatible is present, it should contain the vendor and device ID
>    # according to the PCI Bus Binding specification. Since PCI provides
> @@ -33,12 +36,7 @@ properties:
>            - const: pci1af4,1057
>  
>    reg:
> -    description: |
> -      PCI address of the IOMMU. As defined in the PCI Bus Binding
> -      reference, the reg property is a five-cell address encoded as (phys.hi
> -      phys.mid phys.lo size.hi size.lo). phys.hi should contain the device's
> -      BDF as 0b00000000 bbbbbbbb dddddfff 00000000. The other cells should be
> -      zero. See Documentation/devicetree/bindings/pci/pci.txt
> +    maxItems: 1
>  
>    '#iommu-cells':
>      const: 1
> -- 
> 2.47.2
>