Skip to contentSkip to conversation

dt-bindings: net: wireless: ath11k: add new DT entry for board ID

PATCH In review Robert Marko 3 participants 8 messages Jun 21, 2022 – Jun 27, 2022

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dt-bindings: net: wireless: ath11k: add new DT entry for board ID

bus + qmi-chip-id + qmi-board-id and optionally the variant are currently used for identifying the correct board data file.

This however is sometimes not enough as all of the IPQ8074 boards that I have access to dont have the qmi-board-id properly fused and simply return the default value of 0xFF.

So, to provide the correct qmi-board-id add a new DT property that allows the qmi-board-id to be overridden from DTS in cases where its not set. This is what vendors have been doing in the stock firmwares that were shipped on boards I have.

---
 .../devicetree/bindings/net/wireless/qcom,ath11k.yaml     | 8 ++++++++
 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml +8 -0
index a677b056f112..fe6aafdab9d4 100644
@@ -41,6 +41,14 @@ properties:
         * reg
         * reg-names
 
+  qcom,ath11k-board-id:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      Board ID to override the one returned by the firmware or the default
+      0xff if it was not set by the vendor at all.
+      It is used along the ath11k-calibration-variant to mach the correct
+      calibration data from board-2.bin.
+
   qcom,ath11k-calibration-variant:
     $ref: /schemas/types.yaml#/definitions/string
     description:
Signature · 7 lines
2.36.1


-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#1 lore raw

PATCH 2/2 ath11k: search DT for qcom,ath11k-board-id

bus + qmi-chip-id + qmi-board-id and optionally the variant are currently used for identifying the correct board data file.

This however is sometimes not enough as all of the IPQ8074 boards that I have access to dont have the qmi-board-id properly fused and simply return the default value of 0xFF.

So, to provide the correct qmi-board-id look for the qcom,ath11k-board-id property and use that.
This is what vendors have been doing in the stock firmwares that were shipped on boards I have.

It should be added to DTS like:

	wifi@c000000 {
        status = "okay";

        qcom,ath11k-board-id = <658>;
        qcom,ath11k-calibration-variant = "Edgecore-EAP102";
    };
---
 drivers/net/wireless/ath/ath11k/qmi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/qmi.c +5 -1
index 00136601cb7d..9d27b4968d10 100644
@@ -2172,12 +2172,14 @@ static int ath11k_qmi_request_device_info(struct ath11k_base *ab)
 
 static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)
 {
+	struct device *dev = ab->dev;
 	struct qmi_wlanfw_cap_req_msg_v01 req;
 	struct qmi_wlanfw_cap_resp_msg_v01 resp;
 	struct qmi_txn txn;
 	int ret = 0;
 	int r;
 	char *fw_build_id;
+	unsigned int board_id;
 	int fw_build_id_mask_len;
 
 	memset(&req, 0, sizeof(req));
@@ -2219,7 +2221,9 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)
 		ab->qmi.target.chip_family = resp.chip_info.chip_family;
 	}
 
-	if (resp.board_info_valid)
+	if (!of_property_read_u32(dev->of_node, "qcom,ath11k-board-id", &board_id))
+		ab->qmi.target.board_id = board_id;
+	else if (resp.board_info_valid)
 		ab->qmi.target.board_id = resp.board_info.board_id;
 	else
 		ab->qmi.target.board_id = 0xFF;
Signature · 1 line
2.36.1
#2 lore raw
In reply to Robert Marko
Quoted 7 lines · Robert Marko

bus + qmi-chip-id + qmi-board-id and optionally the variant are currently used for identifying the correct board data file.

This however is sometimes not enough as all of the IPQ8074 boards that I have access to dont have the qmi-board-id properly fused and simply return the default value of 0xFF.

Quoted 6 lines

So, to provide the correct qmi-board-id add a new DT property that allows the qmi-board-id to be overridden from DTS in cases where its not set. This is what vendors have been doing in the stock firmwares that were shipped on boards I have.

Thank you for your patch. There is something to discuss/improve.

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml properties: · line 44

Quoted 13 lines
---
 .../devicetree/bindings/net/wireless/qcom,ath11k.yaml     | 8 ++++++++
 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml +1 -0
index a677b056f112..fe6aafdab9d4 100644
@@ -41,6 +41,14 @@ properties:
         * reg
         * reg-names
 
+  qcom,ath11k-board-id:

The "board" a bit confuses me because in the context of entire system it means the entire hardware running Qualcomm SoC. This is sometimes encoded as qcom,board-id property.

Is your property exactly the same?

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml properties: · line 54

Quoted 10 lines
Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml +7 -0
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      Board ID to override the one returned by the firmware or the default
+      0xff if it was not set by the vendor at all.
+      It is used along the ath11k-calibration-variant to mach the correct
+      calibration data from board-2.bin.
+
   qcom,ath11k-calibration-variant:
     $ref: /schemas/types.yaml#/definitions/string
     description:

Best regards,
Krzysztof

Signature · 3 lines
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#3 lore raw
Quoted 30 lines · Krzysztof Kozlowski
Quoted 7 lines · Robert Marko

bus + qmi-chip-id + qmi-board-id and optionally the variant are currently used for identifying the correct board data file.

This however is sometimes not enough as all of the IPQ8074 boards that I have access to dont have the qmi-board-id properly fused and simply return the default value of 0xFF.

Quoted 6 lines

So, to provide the correct qmi-board-id add a new DT property that allows the qmi-board-id to be overridden from DTS in cases where its not set. This is what vendors have been doing in the stock firmwares that were shipped on boards I have.

Thank you for your patch. There is something to discuss/improve.

Quoted 12 lines
---
 .../devicetree/bindings/net/wireless/qcom,ath11k.yaml     | 8 ++++++++
 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml +0 -0
index a677b056f112..fe6aafdab9d4 100644
@@ -41,6 +41,14 @@ properties:
         * reg
         * reg-names
 
Quoted 5 lines

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml properties: · line 44

Quoted 1 line
Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml +1 -0
+  qcom,ath11k-board-id:

The "board" a bit confuses me because in the context of entire system it means the entire hardware running Qualcomm SoC. This is sometimes encoded as qcom,board-id property.

Hi Krzysztof,
I agree that the name is a bit confusing, it's not the same as qcom,board-id AFAIK
and QCA as well as vendors are using a similar property in the wifi node to override
the default qmi-board-id to the correct one as its rarely properly fused.

I assume it would be better-called qcom,ath11k-qmi-board-id as you dont even have
to be using a Qualcomm SoC as the same is used by PCI ath11k cards as well.

Regards,
Robert

Quoted 17 lines

Is your property exactly the same?

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml properties: · line 54

Quoted 10 lines
Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml +7 -0
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      Board ID to override the one returned by the firmware or the default
+      0xff if it was not set by the vendor at all.
+      It is used along the ath11k-calibration-variant to mach the correct
+      calibration data from board-2.bin.
+
   qcom,ath11k-calibration-variant:
     $ref: /schemas/types.yaml#/definitions/string
     description:

Best regards,
Krzysztof

#4 lore raw
Quoted 45 lines · Robert Marko
Quoted 30 lines · Krzysztof Kozlowski
Quoted 7 lines · Robert Marko

bus + qmi-chip-id + qmi-board-id and optionally the variant are currently used for identifying the correct board data file.

This however is sometimes not enough as all of the IPQ8074 boards that I have access to dont have the qmi-board-id properly fused and simply return the default value of 0xFF.

Quoted 6 lines

So, to provide the correct qmi-board-id add a new DT property that allows the qmi-board-id to be overridden from DTS in cases where its not set. This is what vendors have been doing in the stock firmwares that were shipped on boards I have.

Thank you for your patch. There is something to discuss/improve.

Quoted 12 lines
---
 .../devicetree/bindings/net/wireless/qcom,ath11k.yaml     | 8 ++++++++
 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml +0 -0
index a677b056f112..fe6aafdab9d4 100644
@@ -41,6 +41,14 @@ properties:
         * reg
         * reg-names
 
Quoted 5 lines

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml properties: · line 44

Quoted 1 line
Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml +1 -0
+  qcom,ath11k-board-id:

The "board" a bit confuses me because in the context of entire system it means the entire hardware running Qualcomm SoC. This is sometimes encoded as qcom,board-id property.

Hi Krzysztof,
I agree that the name is a bit confusing, it's not the same as qcom,board-id AFAIK
and QCA as well as vendors are using a similar property in the wifi node to override
the default qmi-board-id to the correct one as its rarely properly fused.

Quoted 4 lines

I assume it would be better-called qcom,ath11k-qmi-board-id as you dont even have
to be using a Qualcomm SoC as the same is used by PCI ath11k cards as well.

Thanks for the explanation. What is the "board" in that context? The card/hardware with ath11k? Then maybe qcom,ath11k-qmi-id or qcom,ath11k-qmi-hw-id?

Best regards,
Krzysztof

#5 lore raw
Quoted 47 lines · Krzysztof Kozlowski
Quoted 45 lines · Robert Marko
Quoted 30 lines · Krzysztof Kozlowski
Quoted 7 lines · Robert Marko

bus + qmi-chip-id + qmi-board-id and optionally the variant are currently used for identifying the correct board data file.

This however is sometimes not enough as all of the IPQ8074 boards that I have access to dont have the qmi-board-id properly fused and simply return the default value of 0xFF.

Quoted 6 lines

So, to provide the correct qmi-board-id add a new DT property that allows the qmi-board-id to be overridden from DTS in cases where its not set. This is what vendors have been doing in the stock firmwares that were shipped on boards I have.

Thank you for your patch. There is something to discuss/improve.

Quoted 12 lines
---
 .../devicetree/bindings/net/wireless/qcom,ath11k.yaml     | 8 ++++++++
 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml +0 -0
index a677b056f112..fe6aafdab9d4 100644
@@ -41,6 +41,14 @@ properties:
         * reg
         * reg-names
 
Quoted 5 lines

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml properties: · line 44

Quoted 1 line
Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml +1 -0
+  qcom,ath11k-board-id:

The "board" a bit confuses me because in the context of entire system it means the entire hardware running Qualcomm SoC. This is sometimes encoded as qcom,board-id property.

Hi Krzysztof,
I agree that the name is a bit confusing, it's not the same as qcom,board-id AFAIK
and QCA as well as vendors are using a similar property in the wifi node to override
the default qmi-board-id to the correct one as its rarely properly fused.

Quoted 8 lines
Quoted 4 lines

I assume it would be better-called qcom,ath11k-qmi-board-id as you dont even have
to be using a Qualcomm SoC as the same is used by PCI ath11k cards as well.

Thanks for the explanation. What is the "board" in that context? The card/hardware with ath11k? Then maybe qcom,ath11k-qmi-id or qcom,ath11k-qmi-hw-id?

Hi,

I assume it started off as a numerical value to match the board design and was then simply carried off to the PCI cards as well.

qcom,ath11k-qmi-hw-id is fine by me, will just expand the description to make it clear.

Regards,
Robert

Quoted 3 lines

Best regards,
Krzysztof

#6 lore raw
In reply to Robert Marko
Quoted 11 lines · Robert Marko

bus + qmi-chip-id + qmi-board-id and optionally the variant are currently used for identifying the correct board data file.

This however is sometimes not enough as all of the IPQ8074 boards that I have access to dont have the qmi-board-id properly fused and simply return the default value of 0xFF.

So, to provide the correct qmi-board-id add a new DT property that allows the qmi-board-id to be overridden from DTS in cases where its not set. This is what vendors have been doing in the stock firmwares that were shipped on boards I have.

What's wrong with using 0xff? Ie. something like this:

bus=ahb,qmi-chip-id=0,qmi-board-id=255,variant=foo

Or maybe even just skip qmi-board-id entirely if it's not supported? So that the board file string would be something like:

bus=ahb,qmi-chip-id=0,variant=foo

I really would like to avoid adding more DT properties unless it's absolutely critical.

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#7 lore raw
Quoted 19 lines · Kalle Valo
Quoted 11 lines · Robert Marko

bus + qmi-chip-id + qmi-board-id and optionally the variant are currently used for identifying the correct board data file.

This however is sometimes not enough as all of the IPQ8074 boards that I have access to dont have the qmi-board-id properly fused and simply return the default value of 0xFF.

So, to provide the correct qmi-board-id add a new DT property that allows the qmi-board-id to be overridden from DTS in cases where its not set. This is what vendors have been doing in the stock firmwares that were shipped on boards I have.

What's wrong with using 0xff? Ie. something like this:

bus=ahb,qmi-chip-id=0,qmi-board-id=255,variant=foo

Quoted 7 lines

Or maybe even just skip qmi-board-id entirely if it's not supported? So that the board file string would be something like:

bus=ahb,qmi-chip-id=0,variant=foo

I really would like to avoid adding more DT properties unless it's absolutely critical.

Well, I suppose that due to the variant property we can avoid "correcting" the qmi-board-id

Regards,
Robert

Quoted 5 lines

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Signature · 3 lines
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k