| Message ID | 20220622113733.1710471-2-cyndis@kapsi.fi (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Host1x support on Tegra234 | expand |
On 22/06/2022 13:37, Mikko Perttunen wrote: > From: Mikko Perttunen <mperttunen@nvidia.com> > > Update VIC and Host1x bindings for changes in Tegra234. > > Namely, > - New compatible strings > - Sharded syncpoint interrupts > - Optional reset. > > Also, fix the order of descriptions for VM/hypervisor > register apertures -- while the reg-names specification > was correct, the descriptions for these were switched. > > Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> > --- > v2: > * Add back 'required' for resets/reset-names on older SoCs > * Simplified reg descriptions > * Updated commit message > --- > .../display/tegra/nvidia,tegra124-vic.yaml | 1 + > .../display/tegra/nvidia,tegra20-host1x.yaml | 110 +++++++++++++++--- > 2 files changed, 95 insertions(+), 16 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-vic.yaml b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-vic.yaml > index 37bb5ddc1963..7200095ef19e 100644 > --- a/Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-vic.yaml > +++ b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-vic.yaml > @@ -21,6 +21,7 @@ properties: > - nvidia,tegra210-vic > - nvidia,tegra186-vic > - nvidia,tegra194-vic > + - nvidia,tegra234-vic > > - items: > - const: nvidia,tegra132-vic > diff --git a/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml > index 0adeb03b9e3a..5fe25e0a8d48 100644 > --- a/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml > +++ b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml > @@ -24,6 +24,7 @@ properties: > - nvidia,tegra210-host1x > - nvidia,tegra186-host1x > - nvidia,tegra194-host1x > + - nvidia,tegra234-host1x > > - items: > - const: nvidia,tegra132-host1x > @@ -31,23 +32,19 @@ properties: > > reg: > minItems: 1 > - maxItems: 2 > + maxItems: 3 > > reg-names: > minItems: 1 > - maxItems: 2 > + maxItems: 3 > > interrupts: > - items: > - - description: host1x syncpoint interrupt > - - description: host1x general interrupt > minItems: 1 > + maxItems: 9 > > interrupt-names: > - items: > - - const: syncpt > - - const: host1x > minItems: 1 > + maxItems: 9 > > '#address-cells': > description: The number of cells used to represent physical base addresses > @@ -110,13 +107,35 @@ required: > - reg > - clocks > - clock-names > - - resets > - - reset-names > > additionalProperties: > type: object > > allOf: > + - if: > + properties: > + compatible: > + contains: > + enum: > + - nvidia,tegra20-host1x > + - nvidia,tegra30-host1x > + - nvidia,tegra114-host1x > + - nvidia,tegra124-host1x > + - nvidia,tegra210-host1x > + then: > + properties: > + interrupts: > + items: > + - description: host1x syncpoint interrupt > + - description: host1x general interrupt > + > + interrupt-names: > + items: > + - const: syncpt > + - const: host1x > + required: > + - resets > + - reset-names > - if: > properties: > compatible: > @@ -133,10 +152,8 @@ allOf: > > reg: > items: > - - description: physical base address and length of the register > - region assigned to the VM > - - description: physical base address and length of the register > - region used by the hypervisor > + - description: region used by the hypervisor > + - description: region assigned to the virtual machine > > resets: > maxItems: 1 > @@ -144,6 +161,67 @@ allOf: > reset-names: > maxItems: 1 > > + interrupts: > + items: > + - description: host1x syncpoint interrupt > + - description: host1x general interrupt > + > + interrupt-names: > + items: > + - const: syncpt > + - const: host1x > + > + iommu-map: > + description: Specification of stream IDs available for memory context device > + use. Should be a mapping of IDs 0..n to IOMMU entries corresponding to > + usable stream IDs. > + > + required: > + - reg-names > + - if: > + properties: > + compatible: > + contains: > + enum: > + - nvidia,tegra234-host1x > + then: > + properties: > + reg-names: > + items: > + - const: common > + - const: hypervisor > + - const: vm > + > + reg: > + items: > + - description: region used by host1x server > + - description: region used by the hypervisor > + - description: region assigned to the virtual machine > + > + interrupts: > + items: > + - description: host1x syncpoint interrupt 0 > + - description: host1x syncpoint interrupt 1 > + - description: host1x syncpoint interrupt 2 > + - description: host1x syncpoint interrupt 3 > + - description: host1x syncpoint interrupt 4 > + - description: host1x syncpoint interrupt 5 > + - description: host1x syncpoint interrupt 6 > + - description: host1x syncpoint interrupt 7 > + - description: host1x general interrupt > + > + interrupt-names: > + items: > + - const: syncpt0 > + - const: syncpt1 > + - const: syncpt2 > + - const: syncpt3 > + - const: syncpt4 > + - const: syncpt5 > + - const: syncpt6 > + - const: syncpt7 > + - const: host1x > + > iommu-map: > description: Specification of stream IDs available for memory context device > use. Should be a mapping of IDs 0..n to IOMMU entries corresponding to > @@ -160,8 +238,8 @@ examples: > host1x@50000000 { > compatible = "nvidia,tegra20-host1x"; > reg = <0x50000000 0x00024000>; > - interrupts = <0 65 0x04 /* mpcore syncpt */ > - 0 67 0x04>; /* mpcore general */ > + interrupts = <0 65 0x04>, /* mpcore syncpt */ > + <0 67 0x04>; /* mpcore general */ Split this part to separate patch. Rest looks good but because of dependency cannot be tested by automation. > interrupt-names = "syncpt", "host1x"; > clocks = <&tegra_car TEGRA20_CLK_HOST1X>; > clock-names = "host1x"; Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-vic.yaml b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-vic.yaml index 37bb5ddc1963..7200095ef19e 100644 --- a/Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-vic.yaml +++ b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra124-vic.yaml @@ -21,6 +21,7 @@ properties: - nvidia,tegra210-vic - nvidia,tegra186-vic - nvidia,tegra194-vic + - nvidia,tegra234-vic - items: - const: nvidia,tegra132-vic diff --git a/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml index 0adeb03b9e3a..5fe25e0a8d48 100644 --- a/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml +++ b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml @@ -24,6 +24,7 @@ properties: - nvidia,tegra210-host1x - nvidia,tegra186-host1x - nvidia,tegra194-host1x + - nvidia,tegra234-host1x - items: - const: nvidia,tegra132-host1x @@ -31,23 +32,19 @@ properties: reg: minItems: 1 - maxItems: 2 + maxItems: 3 reg-names: minItems: 1 - maxItems: 2 + maxItems: 3 interrupts: - items: - - description: host1x syncpoint interrupt - - description: host1x general interrupt minItems: 1 + maxItems: 9 interrupt-names: - items: - - const: syncpt - - const: host1x minItems: 1 + maxItems: 9 '#address-cells': description: The number of cells used to represent physical base addresses @@ -110,13 +107,35 @@ required: - reg - clocks - clock-names - - resets - - reset-names additionalProperties: type: object allOf: + - if: + properties: + compatible: + contains: + enum: + - nvidia,tegra20-host1x + - nvidia,tegra30-host1x + - nvidia,tegra114-host1x + - nvidia,tegra124-host1x + - nvidia,tegra210-host1x + then: + properties: + interrupts: + items: + - description: host1x syncpoint interrupt + - description: host1x general interrupt + + interrupt-names: + items: + - const: syncpt + - const: host1x + required: + - resets + - reset-names - if: properties: compatible: @@ -133,10 +152,8 @@ allOf: reg: items: - - description: physical base address and length of the register - region assigned to the VM - - description: physical base address and length of the register - region used by the hypervisor + - description: region used by the hypervisor + - description: region assigned to the virtual machine resets: maxItems: 1 @@ -144,6 +161,67 @@ allOf: reset-names: maxItems: 1 + interrupts: + items: + - description: host1x syncpoint interrupt + - description: host1x general interrupt + + interrupt-names: + items: + - const: syncpt + - const: host1x + + iommu-map: + description: Specification of stream IDs available for memory context device + use. Should be a mapping of IDs 0..n to IOMMU entries corresponding to + usable stream IDs. + + required: + - reg-names + - if: + properties: + compatible: + contains: + enum: + - nvidia,tegra234-host1x + then: + properties: + reg-names: + items: + - const: common + - const: hypervisor + - const: vm + + reg: + items: + - description: region used by host1x server + - description: region used by the hypervisor + - description: region assigned to the virtual machine + + interrupts: + items: + - description: host1x syncpoint interrupt 0 + - description: host1x syncpoint interrupt 1 + - description: host1x syncpoint interrupt 2 + - description: host1x syncpoint interrupt 3 + - description: host1x syncpoint interrupt 4 + - description: host1x syncpoint interrupt 5 + - description: host1x syncpoint interrupt 6 + - description: host1x syncpoint interrupt 7 + - description: host1x general interrupt + + interrupt-names: + items: + - const: syncpt0 + - const: syncpt1 + - const: syncpt2 + - const: syncpt3 + - const: syncpt4 + - const: syncpt5 + - const: syncpt6 + - const: syncpt7 + - const: host1x + iommu-map: description: Specification of stream IDs available for memory context device use. Should be a mapping of IDs 0..n to IOMMU entries corresponding to @@ -160,8 +238,8 @@ examples: host1x@50000000 { compatible = "nvidia,tegra20-host1x"; reg = <0x50000000 0x00024000>; - interrupts = <0 65 0x04 /* mpcore syncpt */ - 0 67 0x04>; /* mpcore general */ + interrupts = <0 65 0x04>, /* mpcore syncpt */ + <0 67 0x04>; /* mpcore general */ interrupt-names = "syncpt", "host1x"; clocks = <&tegra_car TEGRA20_CLK_HOST1X>; clock-names = "host1x";