| Message ID | 20200108055735.660475-1-bjorn.andersson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: qcom: db410c: Update firmware-name for wcnss and mpss | expand |
On 17-02-21, 16:34, Aníbal Limón wrote: > From: Bjorn Andersson <bjorn.andersson@linaro.org> > > Enable the mpss remoteproc node and specify the firmware-name for this > and the wcnss remoteproc on the Dragonboard 410c. > > Link: https://lore.kernel.org/r/20200108055735.660475-1-bjorn.andersson@linaro.org > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > [rebased and moved to use pronto label] > Signed-off-by: Vinod Koul <vkoul@kernel.org> > Tested-by: Aníbal Limón <anibal.limon@linaro.org> > --- > arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > index 3c7f97539390..8f1ada75d3ed 100644 > --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > @@ -301,6 +301,11 @@ &lpass { > status = "okay"; > }; > > +&mpss { > + status = "okay"; > + firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mdt"; Shouldn't this one be mba.mdt? > +}; > + > &pm8916_resin { > status = "okay"; > linux,code = <KEY_VOLUMEDOWN>; > @@ -308,6 +313,7 @@ &pm8916_resin { > > &pronto { > status = "okay"; > + firmware-name = "qcom/msm8916/wcnss.mdt"; > }; > > &sdhc_1 { > -- > 2.30.0 -- ~Vinod
On Thu, 18 Feb 2021 at 07:20, Vinod Koul <vkoul@kernel.org> wrote: > > On 17-02-21, 16:34, Aníbal Limón wrote: > > From: Bjorn Andersson <bjorn.andersson@linaro.org> > > > > Enable the mpss remoteproc node and specify the firmware-name for this > > and the wcnss remoteproc on the Dragonboard 410c. > > > > Link: https://lore.kernel.org/r/20200108055735.660475-1-bjorn.andersson@linaro.org > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > [rebased and moved to use pronto label] > > Signed-off-by: Vinod Koul <vkoul@kernel.org> > > Tested-by: Aníbal Limón <anibal.limon@linaro.org> > > --- > > arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > > index 3c7f97539390..8f1ada75d3ed 100644 > > --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > > +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > > @@ -301,6 +301,11 @@ &lpass { > > status = "okay"; > > }; > > > > +&mpss { > > + status = "okay"; > > + firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mdt"; > > Shouldn't this one be mba.mdt? No, firmware-qcom-db410c provides mba.mbn rather than mba.mdt > > > +}; > > + > > &pm8916_resin { > > status = "okay"; > > linux,code = <KEY_VOLUMEDOWN>; > > @@ -308,6 +313,7 @@ &pm8916_resin { > > > > &pronto { > > status = "okay"; > > + firmware-name = "qcom/msm8916/wcnss.mdt"; > > }; > > > > &sdhc_1 { > > -- > > 2.30.0 > > -- > ~Vinod
On Tue 24 Aug 05:39 PDT 2021, Dmitry Baryshkov wrote: > On Thu, 18 Feb 2021 at 01:38, Aníbal Limón <anibal.limon@linaro.org> wrote: > > > > From: Bjorn Andersson <bjorn.andersson@linaro.org> > > > > Enable the mpss remoteproc node and specify the firmware-name for this > > and the wcnss remoteproc on the Dragonboard 410c. > > > > Link: https://lore.kernel.org/r/20200108055735.660475-1-bjorn.andersson@linaro.org > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > [rebased and moved to use pronto label] > > Signed-off-by: Vinod Koul <vkoul@kernel.org> > > Tested-by: Aníbal Limón <anibal.limon@linaro.org> > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Thanks Dmitry, not sure why this hasn't been merged yet. Taking a further look at this I noticed that we never pushed the firmware to linux-firmware either, which I think was because we where uncertain of the directory structure at the time - a discussion which has been settled since. > > --- > > arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > > index 3c7f97539390..8f1ada75d3ed 100644 > > --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > > +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > > @@ -301,6 +301,11 @@ &lpass { > > status = "okay"; > > }; > > > > +&mpss { > > + status = "okay"; > > + firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mdt"; But if we're pushing things to linux-firmware, does anyone object against following the existing style and squashing the mdt+bNN files into .mbn (and thereby making this modem.mbn and below wcnss.mbn)? Regards, Bjorn > > +}; > > + > > &pm8916_resin { > > status = "okay"; > > linux,code = <KEY_VOLUMEDOWN>; > > @@ -308,6 +313,7 @@ &pm8916_resin { > > > > &pronto { > > status = "okay"; > > + firmware-name = "qcom/msm8916/wcnss.mdt"; > > }; > > > > &sdhc_1 { > > -- > > 2.30.0 > > > > > -- > With best wishes > Dmitry
On Tue, Aug 24, 2021 at 07:46:04AM -0700, Bjorn Andersson wrote: > On Tue 24 Aug 05:39 PDT 2021, Dmitry Baryshkov wrote: > > > On Thu, 18 Feb 2021 at 01:38, Aníbal Limón <anibal.limon@linaro.org> wrote: > > > > > > From: Bjorn Andersson <bjorn.andersson@linaro.org> > > > > > > Enable the mpss remoteproc node and specify the firmware-name for this > > > and the wcnss remoteproc on the Dragonboard 410c. > > > > > > Link: https://lore.kernel.org/r/20200108055735.660475-1-bjorn.andersson@linaro.org > > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > > [rebased and moved to use pronto label] > > > Signed-off-by: Vinod Koul <vkoul@kernel.org> > > > Tested-by: Aníbal Limón <anibal.limon@linaro.org> > > > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > > > Thanks Dmitry, not sure why this hasn't been merged yet. > This patch keeps getting stuck for some reason. It was sent several times already but always forgotten. :) > Taking a further look at this I noticed that we never pushed the > firmware to linux-firmware either, which I think was because we where > uncertain of the directory structure at the time - a discussion which > has been settled since. > > > > --- > > > arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 6 ++++++ > > > 1 file changed, 6 insertions(+) > > > > > > diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > > > index 3c7f97539390..8f1ada75d3ed 100644 > > > --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > > > +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi > > > @@ -301,6 +301,11 @@ &lpass { > > > status = "okay"; > > > }; > > > > > > +&mpss { > > > + status = "okay"; > > > + firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mdt"; > > But if we're pushing things to linux-firmware, does anyone object > against following the existing style and squashing the mdt+bNN files > into .mbn (and thereby making this modem.mbn and below wcnss.mbn)? > You made this change in some version already :) https://lore.kernel.org/linux-arm-msm/20210312003318.3273536-6-bjorn.andersson@linaro.org/ I think there was no real objection back then but more confusion about how to get the squashed .mbn variant. Having it in linux-firmware would certainly make it a lot easier overall if you can make that happen. :) The latest version of this patch that I am aware of is the following one: https://lore.kernel.org/linux-arm-msm/20210531224453.783218-1-bjorn.andersson@linaro.org/ As I wrote there it's mainly stuck on getting the related wcn36xx patch [1] merged. Can you resend that one maybe? Thanks, Stephan [1]: https://lore.kernel.org/linux-arm-msm/20210312003318.3273536-3-bjorn.andersson@linaro.org/
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index 037e26b3f8d5..298684c62cc1 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -494,6 +494,7 @@ wcnss@a21b000 { status = "okay"; + firmware-name = "qcom/msm8916/wcnss.mdt"; }; }; @@ -538,6 +539,11 @@ }; }; +&mpss { + status = "okay"; + firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mdt"; +}; + &spmi_bus { pm8916_0: pm8916@0 { pon@800 { diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 9c4d89319e7c..1ced09a61531 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1054,7 +1054,7 @@ }; - hexagon@4080000 { + mpss: remoteproc@4080000 { compatible = "qcom,q6v5-pil"; reg = <0x04080000 0x100>, <0x04020000 0x040>;
Enable the mpss remoteproc node and specify the firmware-name for this and the wcnss remoteproc on the Dragonboard 410c. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 6 ++++++ arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)