| Message ID | 20210312003318.3273536-6-bjorn.andersson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] dt-bindings: soc: qcom: wcnss: Add firmware-name property | expand |
On 12/03/2021 00:33, Bjorn Andersson wrote:
> firmware-name = "qcom/msm8916/WCNSS_qcom_wlan_nv.bin";
On the Linaro debian build I have to do this
+ firmware-name = "wlan/prima/WCNSS_qcom_wlan_nv.bin";
---
bod
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@linaro.org> > --- > 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. --- bod
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@linaro.org> > > --- > > 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@linaro.org/ (Which makes it possible to specify firmware name per platform/board) Regards, Bjorn
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"; }; &sdhc_1 { @@ -394,6 +402,10 @@ &wcd_codec { qcom,mbhc-vthreshold-high = <75 150 237 450 500>; }; +&wcnss_ctrl { + firmware-name = "qcom/msm8916/WCNSS_qcom_wlan_nv.bin"; +}; + /* Enable CoreSight */ &cti0 { status = "okay"; }; &cti1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 5353da521974..1118836c15dd 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1738,7 +1738,7 @@ smd-edge { label = "pronto"; - wcnss { + wcnss_ctrl: wcnss { compatible = "qcom,wcnss"; qcom,smd-channels = "WCNSS_CTRL";
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@linaro.org> --- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 12 ++++++++++++ arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) -- 2.29.2