arm64: dts: qcom: thinkpad-x13s: Update firmware location

[PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location

Posted by Manivannan Sadhasivam 3 years, 6 months ago

The firmware location in linux-firmware has been changed to include the
SoC name. So use the updated location in Thinkpad devicetree.

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
 arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index c379650e52b1..3b7943d6e164 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -554,13 +554,13 @@ keyboard@68 {
 };
 
 &remoteproc_adsp {
-	firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
+	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
 
 	status = "okay";
 };
 
 &remoteproc_nsp0 {
-	firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
+	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";
 
 	status = "okay";
 };
-- 
2.30.2

Re: [PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location

Posted by Johan Hovold 3 years, 6 months ago

On Tue, Sep 13, 2022 at 11:10:30AM +0530, Manivannan Sadhasivam wrote:
> The firmware location in linux-firmware has been changed to include the
> SoC name. So use the updated location in Thinkpad devicetree.
> 
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

I guess we should pick a commit prefix that we stick to for changes to
this driver.

	arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s:

is arguably unnecessarily long even if it follows the pattern of some
other qcom dts.

Shall we just use

	arm64: dts: qcom: sc8280xp-x13s:

which matches sc8280xp-crd? Or stick "lenovo" in there as well? Or just
keep the whole thing unchanged?

> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> index c379650e52b1..3b7943d6e164 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> @@ -554,13 +554,13 @@ keyboard@68 {
>  };
>  
>  &remoteproc_adsp {
> -	firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
> +	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
>  
>  	status = "okay";
>  };
>  
>  &remoteproc_nsp0 {
> -	firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
> +	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";
>  
>  	status = "okay";
>  };

Change itself looks good otherwise:

Reviewed-by: Johan Hovold <johan+linaro@kernel.org>

Johan

Re: [PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location

Posted by Johan Hovold 3 years, 6 months ago

[ Resend with Bjorn's address updated as the Linaro one now bounces. ]

On Tue, Sep 13, 2022 at 11:10:30AM +0530, Manivannan Sadhasivam wrote:
> The firmware location in linux-firmware has been changed to include the
> SoC name. So use the updated location in Thinkpad devicetree.
> 
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

I guess we should pick a commit prefix that we stick to for changes to
this driver.

	arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s:

is arguably unnecessarily long even if it follows the pattern of some
other qcom dts.

Shall we just use

	arm64: dts: qcom: sc8280xp-x13s:

which matches sc8280xp-crd? Or stick "lenovo" in there as well? Or just
keep the whole thing unchanged?

> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> index c379650e52b1..3b7943d6e164 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> @@ -554,13 +554,13 @@ keyboard@68 {
>  };
>  
>  &remoteproc_adsp {
> -	firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
> +	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
>  
>  	status = "okay";
>  };
>  
>  &remoteproc_nsp0 {
> -	firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
> +	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";
>  
>  	status = "okay";
>  };

Change itself looks good otherwise:

Reviewed-by: Johan Hovold <johan+linaro@kernel.org>

Johan

Re: [PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location

Posted by Manivannan Sadhasivam 3 years, 6 months ago

On Tue, Sep 13, 2022 at 12:07:32PM +0200, Johan Hovold wrote:
> [ Resend with Bjorn's address updated as the Linaro one now bounces. ]
> 
> On Tue, Sep 13, 2022 at 11:10:30AM +0530, Manivannan Sadhasivam wrote:
> > The firmware location in linux-firmware has been changed to include the
> > SoC name. So use the updated location in Thinkpad devicetree.
> > 
> > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> > ---
> >  arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> I guess we should pick a commit prefix that we stick to for changes to
> this driver.
> 
> 	arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s:
> 
> is arguably unnecessarily long even if it follows the pattern of some
> other qcom dts.
> 
> Shall we just use
> 
> 	arm64: dts: qcom: sc8280xp-x13s:

This looks looks better. I did look into the earlier commits but I found
the prefix to be too long, so went with the last commit prefix.

> 
> which matches sc8280xp-crd? Or stick "lenovo" in there as well? Or just
> keep the whole thing unchanged?
> 
> > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > index c379650e52b1..3b7943d6e164 100644
> > --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > @@ -554,13 +554,13 @@ keyboard@68 {
> >  };
> >  
> >  &remoteproc_adsp {
> > -	firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
> > +	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
> >  
> >  	status = "okay";
> >  };
> >  
> >  &remoteproc_nsp0 {
> > -	firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
> > +	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";
> >  
> >  	status = "okay";
> >  };
> 
> Change itself looks good otherwise:
> 
> Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
> 

Thanks! I will respin with the agreed prefix.

Regards,
Mani

> Johan

Re: [PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location

Posted by Bjorn Andersson 3 years, 6 months ago

On Tue, Sep 13, 2022 at 04:27:34PM +0530, Manivannan Sadhasivam wrote:
> On Tue, Sep 13, 2022 at 12:07:32PM +0200, Johan Hovold wrote:
> > [ Resend with Bjorn's address updated as the Linaro one now bounces. ]
> > 
> > On Tue, Sep 13, 2022 at 11:10:30AM +0530, Manivannan Sadhasivam wrote:
> > > The firmware location in linux-firmware has been changed to include the
> > > SoC name. So use the updated location in Thinkpad devicetree.
> > > 
> > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> > > ---
> > >  arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > I guess we should pick a commit prefix that we stick to for changes to
> > this driver.
> > 
> > 	arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s:
> > 
> > is arguably unnecessarily long even if it follows the pattern of some
> > other qcom dts.
> > 
> > Shall we just use
> > 
> > 	arm64: dts: qcom: sc8280xp-x13s:
> 
> This looks looks better. I did look into the earlier commits but I found
> the prefix to be too long, so went with the last commit prefix.
> 

+1

> > 
> > which matches sc8280xp-crd? Or stick "lenovo" in there as well? Or just
> > keep the whole thing unchanged?
> > 
> > > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > > index c379650e52b1..3b7943d6e164 100644
> > > --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > > +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> > > @@ -554,13 +554,13 @@ keyboard@68 {
> > >  };
> > >  
> > >  &remoteproc_adsp {
> > > -	firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
> > > +	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
> > >  
> > >  	status = "okay";
> > >  };
> > >  
> > >  &remoteproc_nsp0 {
> > > -	firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
> > > +	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";
> > >  
> > >  	status = "okay";
> > >  };
> > 
> > Change itself looks good otherwise:
> > 
> > Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
> > 
> 
> Thanks! I will respin with the agreed prefix.
> 
> Regards,
> Mani
> 
> > Johan

Re: [PATCH] arm64: dts: qcom: thinkpad-x13s: Update firmware location

Posted by Steev Klimaszewski 3 years, 6 months ago

On 9/13/22 12:40 AM, Manivannan Sadhasivam wrote:
> The firmware location in linux-firmware has been changed to include the
> SoC name. So use the updated location in Thinkpad devicetree.
>
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> ---
>   arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> index c379650e52b1..3b7943d6e164 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> @@ -554,13 +554,13 @@ keyboard@68 {
>   };
>   
>   &remoteproc_adsp {
> -	firmware-name = "qcom/LENOVO/21BX/qcadsp8280.mbn";
> +	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn";
>   
>   	status = "okay";
>   };
>   
>   &remoteproc_nsp0 {
> -	firmware-name = "qcom/LENOVO/21BX/qccdsp8280.mbn";
> +	firmware-name = "qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn";
>   
>   	status = "okay";
>   };

Tested-by: Steev Klimaszewski <steev@kali.org>