Re: [PATCH v2] arm64: dts: qcom: apq8016-sbc: Update modem and WiFi firmware path

[Stephan Gerhold]

On Mon, May 31, 2021 at 03:44:53PM -0700, Bjorn Andersson wrote:
> The firmware for the modem and WiFi subsystems platform specific and is
> signed with a OEM specific key (or a test key). In order to support more
> than a single device it is therefor not possible to rely on the default
> path and stash these files directly in the firmware directory.
> 
> This has already been addressed for other platforms, but the APQ8016 SBC
> (aka db410c) was never finished upstream.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>

As far as I can tell,
"[PATCH 2/5] wcn36xx: Allow firmware name to be overridden by DT"
was never applied so with this patch DB410c fails to request the
"qcom/msm8916/WCNSS_qcom_wlan_nv.bin" firmware. Perhaps you need to
resend that one or poke whoever is responsible to apply that.

Once the wcn36xx patch was applied somewhere:
Reviewed-by: Stephan Gerhold <stephan@xxxxxxxxxxx>
Tested-by: Stephan Gerhold <stephan@xxxxxxxxxxx>

Thanks,
Stephan

> ---
>  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";
>  };
>  
>  &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 4f06c0a9c425..6abe0f8edb55 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";
>  
> -- 
> 2.29.2
>