diff mbox series

arm64: dts: qcom: add Venus firmware node on Cheza

Message ID 20200107143402.122455-1-acourbot@chromium.org (mailing list archive)
State Superseded
Headers show
Series arm64: dts: qcom: add Venus firmware node on Cheza | expand

Commit Message

Alexandre Courbot Jan. 7, 2020, 2:34 p.m. UTC
Cheza boards require this node to probe, so add it.

Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
---
 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 6 ++++++
 arch/arm64/boot/dts/qcom/sdm845.dtsi       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

Comments

Stanimir Varbanov Jan. 7, 2020, 2:50 p.m. UTC | #1
Hi Alex,

On 1/7/20 4:34 PM, Alexandre Courbot wrote:
> Cheza boards require this node to probe, so add it.
> 
> Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
> ---
>  arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 6 ++++++
>  arch/arm64/boot/dts/qcom/sdm845.dtsi       | 2 +-
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> index 9a4ff57fc877..35ba65cd9822 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> @@ -1279,3 +1279,9 @@ config {
>  		};
>  	};
>  };
> +
> +&venus_codec {

We have similar patch for sc7180 and call it just "venus". Do you think
we should shorten it here too?

> +	video-firmware {
> +		iommus = <&apps_smmu 0x10b2 0x0>;
> +	};
> +};
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index ddb1f23c936f..7b913688cc6d 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -2567,7 +2567,7 @@ usb_2_dwc3: dwc3@a800000 {
>  			};
>  		};
>  
> -		video-codec@aa00000 {
> +		venus_codec: video-codec@aa00000 {
>  			compatible = "qcom,sdm845-venus";
>  			reg = <0 0x0aa00000 0 0xff000>;
>  			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
>
Rob Clark Jan. 7, 2020, 5:42 p.m. UTC | #2
On Tue, Jan 7, 2020 at 6:51 AM Stanimir Varbanov
<stanimir.varbanov@linaro.org> wrote:
>
> Hi Alex,
>
> On 1/7/20 4:34 PM, Alexandre Courbot wrote:
> > Cheza boards require this node to probe, so add it.
> >
> > Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
> > ---
> >  arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 6 ++++++
> >  arch/arm64/boot/dts/qcom/sdm845.dtsi       | 2 +-
> >  2 files changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> > index 9a4ff57fc877..35ba65cd9822 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> > @@ -1279,3 +1279,9 @@ config {
> >               };
> >       };
> >  };
> > +
> > +&venus_codec {
>
> We have similar patch for sc7180 and call it just "venus". Do you think
> we should shorten it here too?
>
> > +     video-firmware {
> > +             iommus = <&apps_smmu 0x10b2 0x0>;
> > +     };


btw Stan, not sure if you noticed, but Bjorn started adding
firmware-name properties so we can have different device specific
subdirectories for signed fw (ie. so one /lib/firmware can work on
multiple different devices).  I'm just looking at doing the same thing
for gpu zap fw.  Afaiu the venus fw is also signed, so I guess it
could benefit from the same treatment?  Not sure if that is something
you've already talked with Bjorn about?

BR,
-R

> > +};
> > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > index ddb1f23c936f..7b913688cc6d 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > @@ -2567,7 +2567,7 @@ usb_2_dwc3: dwc3@a800000 {
> >                       };
> >               };
> >
> > -             video-codec@aa00000 {
> > +             venus_codec: video-codec@aa00000 {
> >                       compatible = "qcom,sdm845-venus";
> >                       reg = <0 0x0aa00000 0 0xff000>;
> >                       interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
> >
>
> --
> regards,
> Stan
Alexandre Courbot Jan. 8, 2020, 3:27 a.m. UTC | #3
On Tue, Jan 7, 2020 at 11:50 PM Stanimir Varbanov
<stanimir.varbanov@linaro.org> wrote:
>
> Hi Alex,
>
> On 1/7/20 4:34 PM, Alexandre Courbot wrote:
> > Cheza boards require this node to probe, so add it.
> >
> > Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
> > ---
> >  arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 6 ++++++
> >  arch/arm64/boot/dts/qcom/sdm845.dtsi       | 2 +-
> >  2 files changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> > index 9a4ff57fc877..35ba65cd9822 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
> > @@ -1279,3 +1279,9 @@ config {
> >               };
> >       };
> >  };
> > +
> > +&venus_codec {
>
> We have similar patch for sc7180 and call it just "venus". Do you think
> we should shorten it here too?

Sure - sent a v2 with that change.
Stanimir Varbanov Jan. 8, 2020, 8:31 a.m. UTC | #4
On 1/7/20 7:42 PM, Rob Clark wrote:
> On Tue, Jan 7, 2020 at 6:51 AM Stanimir Varbanov
> <stanimir.varbanov@linaro.org> wrote:
>>
>> Hi Alex,
>>
>> On 1/7/20 4:34 PM, Alexandre Courbot wrote:
>>> Cheza boards require this node to probe, so add it.
>>>
>>> Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
>>> ---
>>>  arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 6 ++++++
>>>  arch/arm64/boot/dts/qcom/sdm845.dtsi       | 2 +-
>>>  2 files changed, 7 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
>>> index 9a4ff57fc877..35ba65cd9822 100644
>>> --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
>>> +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
>>> @@ -1279,3 +1279,9 @@ config {
>>>               };
>>>       };
>>>  };
>>> +
>>> +&venus_codec {
>>
>> We have similar patch for sc7180 and call it just "venus". Do you think
>> we should shorten it here too?
>>
>>> +     video-firmware {
>>> +             iommus = <&apps_smmu 0x10b2 0x0>;
>>> +     };
> 
> 
> btw Stan, not sure if you noticed, but Bjorn started adding
> firmware-name properties so we can have different device specific
> subdirectories for signed fw (ie. so one /lib/firmware can work on
> multiple different devices).  I'm just looking at doing the same thing
> for gpu zap fw.  Afaiu the venus fw is also signed, so I guess it
> could benefit from the same treatment?  Not sure if that is something
> you've already talked with Bjorn about?

I have to check does Venus fw is signed with device specific keys or
with something else (like HMAC).

Cc: Vikash for opinion

> 
> BR,
> -R
> 
>>> +};
>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
>>> index ddb1f23c936f..7b913688cc6d 100644
>>> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
>>> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
>>> @@ -2567,7 +2567,7 @@ usb_2_dwc3: dwc3@a800000 {
>>>                       };
>>>               };
>>>
>>> -             video-codec@aa00000 {
>>> +             venus_codec: video-codec@aa00000 {
>>>                       compatible = "qcom,sdm845-venus";
>>>                       reg = <0 0x0aa00000 0 0xff000>;
>>>                       interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
>>>
>>
>> --
>> regards,
>> Stan
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index 9a4ff57fc877..35ba65cd9822 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -1279,3 +1279,9 @@  config {
 		};
 	};
 };
+
+&venus_codec {
+	video-firmware {
+		iommus = <&apps_smmu 0x10b2 0x0>;
+	};
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index ddb1f23c936f..7b913688cc6d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -2567,7 +2567,7 @@  usb_2_dwc3: dwc3@a800000 {
 			};
 		};
 
-		video-codec@aa00000 {
+		venus_codec: video-codec@aa00000 {
 			compatible = "qcom,sdm845-venus";
 			reg = <0 0x0aa00000 0 0xff000>;
 			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;