[RESEND ath-next 0/2] wifi: ath12k: support usercase-specific firmware overrides

[RESEND ath-next 0/2] wifi: ath12k: support usercase-specific firmware overrides

[Miaoqing Pan]

Introduce 'firmware-name' property to allow end-users and/or integrators to
decide which usecase-specific firmware to run on the WCN7850 platform.

Miaoqing Pan (2):
  dt-bindings: net: wireless: ath12k: describe firmware-name property
  wifi: ath12k: support usercase-specific firmware overrides

 .../bindings/net/wireless/qcom,ath12k.yaml          |  6 ++++++
 drivers/net/wireless/ath/ath12k/core.h              | 13 +++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)


base-commit: d33705bb41ff786b537f8ed50a187a474db111c1
-- 
2.25.1

[RESEND ath-next 1/2] dt-bindings: net: wireless: ath12k: describe firmware-name property

[Miaoqing Pan]

Introduce 'firmware-name' property to allow end-users and/or integrators
to decide which usecase-specific firmware to run on the WCN7850 platform.
This is necessary due to resource limitations such as memory capacity and
CPU capability, or performance and power optimization for different
application scenarios.

Two firmwares are supported: 'WCN7850/hw2.0' and 'WCN7850/hw2.0/ncm825'.
The former is the default firmware, suitable for most WiFi 7 STA
functions. The latter adds support for commercial-quality SAP and
optimizes power consumption for IoT applications.

Signed-off-by: Miaoqing Pan <quic_miaoqing@quicinc.com>
---
 .../devicetree/bindings/net/wireless/qcom,ath12k.yaml       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath12k.yaml b/Documentation/devicetree/bindings/net/wireless/qcom,ath12k.yaml
index 9e557cb838c7..dc68dd59988f 100644
--- a/Documentation/devicetree/bindings/net/wireless/qcom,ath12k.yaml
+++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath12k.yaml
@@ -21,6 +21,12 @@ properties:
   reg:
     maxItems: 1
 
+  firmware-name:
+    maxItems: 1
+    description:
+      If present, a board or platform specific string used to lookup
+      usecase-specific firmware files for the device.
+
   vddaon-supply:
     description: VDD_AON supply regulator handle
 
-- 
2.25.1

[RESEND ath-next 2/2] wifi: ath12k: support usercase-specific firmware overrides

[Miaoqing Pan]

Introduce 'firmware-name' property to allow end-users and/or integrators to
decide which usecase-specific firmware to run on the WCN7850 platform. This
is necessary due to resource limitations such as memory capacity and CPU
capability, or performance and power optimization for different application
scenarios.

Currently, there are two firmwares, both files can be executed
interchangeably.
For example:

- ath12k/WCN7850/hw2.0/amss.bin,
  ath12k/WCN7850/hw2.0/m3.bin
  ath12k/WCN7850/hw2.0/board-2.bin

- ath12k/WCN7850/hw2.0/ncm825/amss.bin,
  ath12k/WCN7850/hw2.0/ncm825/m3.bin
  ath12k/WCN7850/hw2.0/board-2.bin

The former is the default firmware, suitable for most WiFi 7 STA functions.
The latter adds support for commercial-quality SAP and optimizes power
consumption for IoT applications. And both use the same BDF/regdb data
within the main board-2.bin.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Miaoqing Pan <quic_miaoqing@quicinc.com>
---
 drivers/net/wireless/ath/ath12k/core.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index 4b8f434e3e9a..cfe1ef156c34 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -17,6 +17,7 @@
 #include <linux/of_reserved_mem.h>
 #include <linux/panic_notifier.h>
 #include <linux/average.h>
+#include <linux/of.h>
 #include "qmi.h"
 #include "htc.h"
 #include "wmi.h"
@@ -1342,8 +1343,16 @@ static inline void ath12k_core_create_firmware_path(struct ath12k_base *ab,
 						    const char *filename,
 						    void *buf, size_t buf_len)
 {
-	snprintf(buf, buf_len, "%s/%s/%s", ATH12K_FW_DIR,
-		 ab->hw_params->fw.dir, filename);
+	const char *fw_name = NULL;
+
+	of_property_read_string(ab->dev->of_node, "firmware-name", &fw_name);
+
+	if (fw_name && strncmp(filename, "board", 5))
+		snprintf(buf, buf_len, "%s/%s/%s/%s", ATH12K_FW_DIR,
+			 ab->hw_params->fw.dir, fw_name, filename);
+	else
+		snprintf(buf, buf_len, "%s/%s/%s", ATH12K_FW_DIR,
+			 ab->hw_params->fw.dir, filename);
 }
 
 static inline const char *ath12k_bus_str(enum ath12k_bus bus)
-- 
2.25.1

Re: [RESEND ath-next 1/2] dt-bindings: net: wireless: ath12k: describe firmware-name property

[Krzysztof Kozlowski]

On Thu, Apr 24, 2025 at 08:57:02AM GMT, Miaoqing Pan wrote:
> Introduce 'firmware-name' property to allow end-users and/or integrators
> to decide which usecase-specific firmware to run on the WCN7850 platform.
> This is necessary due to resource limitations such as memory capacity and
> CPU capability, or performance and power optimization for different
> application scenarios.
> 
> Two firmwares are supported: 'WCN7850/hw2.0' and 'WCN7850/hw2.0/ncm825'.
> The former is the default firmware, suitable for most WiFi 7 STA
> functions. The latter adds support for commercial-quality SAP and
> optimizes power consumption for IoT applications.
> 
> Signed-off-by: Miaoqing Pan <quic_miaoqing@quicinc.com>
> ---
>  .../devicetree/bindings/net/wireless/qcom,ath12k.yaml       | 6 ++++++
>  1 file changed, 6 insertions(+)

<form letter>
This is a friendly reminder during the review process.

It looks like you received a tag and forgot to add it.

If you do not know the process, here is a short explanation:
Please add Acked-by/Reviewed-by/Tested-by tags when posting new
versions of patchset, under or above your Signed-off-by tag, unless
patch changed significantly (e.g. new properties added to the DT
bindings). Tag is "received", when provided in a message replied to you
on the mailing list. Tools like b4 can help here. However, there's no
need to repost patches *only* to add the tags. The upstream maintainer
will do that for tags received on the version they apply.

Please read:
https://elixir.bootlin.com/linux/v6.12-rc3/source/Documentation/process/submitting-patches.rst#L577

If a tag was not added on purpose, please state why and what changed.
</form letter>

Best regards,
Krzysztof

Re: [RESEND ath-next 1/2] dt-bindings: net: wireless: ath12k: describe firmware-name property

[Miaoqing Pan]

On 4/28/2025 4:25 PM, Krzysztof Kozlowski wrote:
> On Thu, Apr 24, 2025 at 08:57:02AM GMT, Miaoqing Pan wrote:
>> Introduce 'firmware-name' property to allow end-users and/or integrators
>> to decide which usecase-specific firmware to run on the WCN7850 platform.
>> This is necessary due to resource limitations such as memory capacity and
>> CPU capability, or performance and power optimization for different
>> application scenarios.
>>
>> Two firmwares are supported: 'WCN7850/hw2.0' and 'WCN7850/hw2.0/ncm825'.
>> The former is the default firmware, suitable for most WiFi 7 STA
>> functions. The latter adds support for commercial-quality SAP and
>> optimizes power consumption for IoT applications.
>>
>> Signed-off-by: Miaoqing Pan <quic_miaoqing@quicinc.com>
>> ---
>>   .../devicetree/bindings/net/wireless/qcom,ath12k.yaml       | 6 ++++++
>>   1 file changed, 6 insertions(+)
> 
> <form letter>
> This is a friendly reminder during the review process.
> 
> It looks like you received a tag and forgot to add it.
> 

I don't find any tags on previous version: 
https://patchwork.kernel.org/project/linux-wireless/patch/20250423054152.2471568-2-quic_miaoqing@quicinc.com/.

Do you mean I should add 'Reviewed-by: Krzysztof Kozlowski 
<krzk@kernel.org>' ?


> If you do not know the process, here is a short explanation:
> Please add Acked-by/Reviewed-by/Tested-by tags when posting new
> versions of patchset, under or above your Signed-off-by tag, unless
> patch changed significantly (e.g. new properties added to the DT
> bindings). Tag is "received", when provided in a message replied to you
> on the mailing list. Tools like b4 can help here. However, there's no
> need to repost patches *only* to add the tags. The upstream maintainer
> will do that for tags received on the version they apply.
> 
> Please read:
> https://elixir.bootlin.com/linux/v6.12-rc3/source/Documentation/process/submitting-patches.rst#L577
> 
> If a tag was not added on purpose, please state why and what changed.
> </form letter>
> 
> Best regards,
> Krzysztof
> 

Re: [RESEND ath-next 1/2] dt-bindings: net: wireless: ath12k: describe firmware-name property

[Krzysztof Kozlowski]

On 28/04/2025 11:48, Miaoqing Pan wrote:
> 
> 
> On 4/28/2025 4:25 PM, Krzysztof Kozlowski wrote:
>> On Thu, Apr 24, 2025 at 08:57:02AM GMT, Miaoqing Pan wrote:
>>> Introduce 'firmware-name' property to allow end-users and/or integrators
>>> to decide which usecase-specific firmware to run on the WCN7850 platform.
>>> This is necessary due to resource limitations such as memory capacity and
>>> CPU capability, or performance and power optimization for different
>>> application scenarios.
>>>
>>> Two firmwares are supported: 'WCN7850/hw2.0' and 'WCN7850/hw2.0/ncm825'.
>>> The former is the default firmware, suitable for most WiFi 7 STA
>>> functions. The latter adds support for commercial-quality SAP and
>>> optimizes power consumption for IoT applications.
>>>
>>> Signed-off-by: Miaoqing Pan <quic_miaoqing@quicinc.com>
>>> ---
>>>   .../devicetree/bindings/net/wireless/qcom,ath12k.yaml       | 6 ++++++
>>>   1 file changed, 6 insertions(+)
>>
>> <form letter>
>> This is a friendly reminder during the review process.
>>
>> It looks like you received a tag and forgot to add it.
>>
> 
> I don't find any tags on previous version: 
> https://patchwork.kernel.org/project/linux-wireless/patch/20250423054152.2471568-2-quic_miaoqing@quicinc.com/.
> 
> Do you mean I should add 'Reviewed-by: Krzysztof Kozlowski 
> <krzk@kernel.org>' ?

No, probably I mixed up the patches.

Best regards,
Krzysztof

Re: [RESEND ath-next 1/2] dt-bindings: net: wireless: ath12k: describe firmware-name property

[Krzysztof Kozlowski]

On 24/04/2025 02:57, Miaoqing Pan wrote:
> Introduce 'firmware-name' property to allow end-users and/or integrators
> to decide which usecase-specific firmware to run on the WCN7850 platform.
> This is necessary due to resource limitations such as memory capacity and
> CPU capability, or performance and power optimization for different
> application scenarios.
> 
> Two firmwares are supported: 'WCN7850/hw2.0' and 'WCN7850/hw2.0/ncm825'.
> The former is the default firmware, suitable for most WiFi 7 STA
> functions. The latter adds support for commercial-quality SAP and
> optimizes power consumption for IoT applications.
> 

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [RESEND ath-next 2/2] wifi: ath12k: support usercase-specific firmware overrides

[Vasanthakumar Thiagarajan]

On 4/24/2025 6:27 AM, Miaoqing Pan wrote:
> Introduce 'firmware-name' property to allow end-users and/or integrators to
> decide which usecase-specific firmware to run on the WCN7850 platform. This
> is necessary due to resource limitations such as memory capacity and CPU
> capability, or performance and power optimization for different application
> scenarios.
> 
> Currently, there are two firmwares, both files can be executed
> interchangeably.
> For example:
> 
> - ath12k/WCN7850/hw2.0/amss.bin,
>    ath12k/WCN7850/hw2.0/m3.bin
>    ath12k/WCN7850/hw2.0/board-2.bin
> 
> - ath12k/WCN7850/hw2.0/ncm825/amss.bin,
>    ath12k/WCN7850/hw2.0/ncm825/m3.bin
>    ath12k/WCN7850/hw2.0/board-2.bin
> 
> The former is the default firmware, suitable for most WiFi 7 STA functions.
> The latter adds support for commercial-quality SAP and optimizes power
> consumption for IoT applications. And both use the same BDF/regdb data
> within the main board-2.bin.
> 
> Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
> 
> Signed-off-by: Miaoqing Pan <quic_miaoqing@quicinc.com>

Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>

Re: [RESEND ath-next 0/2] wifi: ath12k: support usercase-specific firmware overrides

[Jeff Johnson]

On Thu, 24 Apr 2025 08:57:01 +0800, Miaoqing Pan wrote:
> Introduce 'firmware-name' property to allow end-users and/or integrators to
> decide which usecase-specific firmware to run on the WCN7850 platform.
> 
> Miaoqing Pan (2):
>   dt-bindings: net: wireless: ath12k: describe firmware-name property
>   wifi: ath12k: support usercase-specific firmware overrides
> 
> [...]

Applied, thanks!

[1/2] dt-bindings: net: wireless: ath12k: describe firmware-name property
      commit: 607d6e49dae5336bd9f7356b0e227d8571450bd1
[2/2] wifi: ath12k: support usercase-specific firmware overrides
      commit: a9610bc482ef9c77ee0f3b7c077e0b49732769b8

Best regards,
-- 
Jeff Johnson <jeff.johnson@oss.qualcomm.com>