Re: [PATCH 5/5] arm64: dts: qcom: msm8916: Enable modem and WiFi

[Bryan O'Donoghue]

On 18/03/2021 14:50, Bjorn Andersson wrote:
> On Mon 15 Mar 07:01 CDT 2021, Bryan O'Donoghue wrote:
>
> > On 12/03/2021 00:33, Bjorn Andersson wrote:
> > > Enable the modem and WiFi subsystems and specify msm8916 specific
> > > firmware path for these and the WCNSS control service.
> > >
> > > Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> > > ---
> > >    arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 12 ++++++++++++
> > >    arch/arm64/boot/dts/qcom/msm8916.dtsi     |  2 +-
> > >    2 files changed, 13 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
> > > index 6aef0c2e4f0a..448e3561ef63 100644
> > > --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
> > > +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
> > > @@ -305,6 +305,12 @@ &mdss {
> > >    	status = "okay";
> > >    };
> > > +&mpss {
> > > +	status = "okay";
> > > +
> > > +	firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mbn";
> > > +};
> > > +
> > >    &pm8916_resin {
> > >    	status = "okay";
> > >    	linux,code = <KEY_VOLUMEDOWN>;
> > > @@ -312,6 +318,8 @@ &pm8916_resin {
> > >    &pronto {
> > >    	status = "okay";
> > > +
> > > +	firmware-name = "qcom/msm8916/wcnss.mbn";
> > >    };
> >
> > On Debian I have to do this
> >
> >
> > index 2a6a23cb14ca..597cdc8f51cc 100644
> > --- a/drivers/remoteproc/qcom_wcnss.c
> > +++ b/drivers/remoteproc/qcom_wcnss.c
> > @@ -33,7 +33,7 @@
> >   #include "qcom_wcnss.h"
> >
> >   #define WCNSS_CRASH_REASON_SMEM                422
> > -#define WCNSS_FIRMWARE_NAME            "wcnss.mdt"
> > +#define WCNSS_FIRMWARE_NAME            "qcom/msm8916/wcnss.mdt"
> >
> > so I guess wcnss_probe() -> rproc_alloc() wants this fix too.
>
> Can you confirm that you're saying that you want below patch, which I
> just merged?
>
> https://lore.kernel.org/linux-remoteproc/20210312002441.3273183-1-bjorn.andersson@xxxxxxxxxx/
>
> (Which makes it possible to specify firmware name per platform/board)
>
> Regards,
> Bjorn

yep

Tested-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>