wifi: ath12k: support calibration-variant from device tree
PATCH v2 1/2 wifi: ath12k: support calibration-variant from device tree
ath10k and ath11k support reading calibration variants from the device tree to locate the correct Board Description File (BDF). The ath12k-wsi binding already describes using qcom,calibration-variant but it is not implemented in the driver.
Many ath12k designs expose all the radios under a single phy, each of which typically require a separate BDF. Without this, the radios may not come up or will not be calibrated correctly.
Fix this by parsing the device tree for the generation-agnostic qcom,calibration-variant. This allows the driver to properly select, read and apply the correct BDF.
---
Changes in v2:
- Drop ath12k-specific binding qcom,ath12k-calibration-variant in favor
of generation agnostic qcom,calibration-variant.
- Link to v1: https://lore.kernel.org/all/[email protected]
--- drivers/net/wireless/ath/ath12k/core.c | 22 ++++++++++++++++++++++ drivers/net/wireless/ath/ath12k/qmi.c | 4 ++++ 2 files changed, 26 insertions(+)
drivers/net/wireless/ath/ath12k/core.c +22 -0
@@ -812,6 +812,28 @@ int ath12k_core_check_smbios(struct ath12k_base *ab)return 0 ; } +int ath12k_core_check_dt (struct ath12k_base *ab) +{ +size_t max_len =sizeof (ab->qmi.target.bdf_ext); +const char *variant =NULL ; +struct device_node *node; + + node = ab->dev->of_node; +if (!node) +return -ENOENT ; + +of_property_read_string (node,"qcom,calibration-variant" , + &variant); +if (!variant) +return -ENODATA ; + +if (strscpy (ab->qmi.target.bdf_ext, variant, max_len) <0 ) +ath12k_dbg (ab,ATH12K_DBG_BOOT , +"bdf variant string is longer than the buffer can accommodate (variant: %s)\n" , variant); + +return 0 ; +} +static int ath12k_core_soc_create (struct ath12k_base *ab) {int ret;
drivers/net/wireless/ath/ath12k/qmi.c +4 -0
@@ -2945,6 +2945,10 @@ int ath12k_qmi_request_target_cap(struct ath12k_base *ab)if (r)ath12k_dbg (ab,ATH12K_DBG_QMI ,"SMBIOS bdf variant name not set.\n" ); + r =ath12k_core_check_dt (ab); +if (r) +ath12k_dbg (ab,ATH12K_DBG_QMI ,"DT bdf variant name not set.\n" ); + r =ath12k_acpi_start (ab);if (r)/* ACPI is optional so continue in case of an error */
Signature · 1 line
2.43.0
PATCH v2 2/2 dt-bindings: wireless: ath12k: drop qcom,ath12k-calibration-variant
The ath12k-wsi binding documentation describes using the generation-specific qcom,ath12k-calibration-variant binding as well as the generation-agnostic qcom,calibration-variant binding to load board-specific calibration data from the device tree. However, the driver never implemented either of these.
Given that no devices currently supported use qcom,ath12k-calibration-variant and the previous patch implements qcom,calibration-variant, drop the generation-specific version from the binding to prevent future confusion.
--- .../devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml | 7 ------- 1 file changed, 7 deletions(-)
Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml +0 -7
@@ -58,13 +58,6 @@ properties: String to uniquely identify variant of the calibration data for designs with colliding bus and device ids - qcom,ath12k-calibration-variant: - $ref: /schemas/types.yaml#/definitions/string - deprecated: true - description: - String to uniquely identify variant of the calibration data for designs - with colliding bus and device ids - qcom,wsi-controller: $ref: /schemas/types.yaml#/definitions/flag description:
Signature · 1 line
2.43.0
Re: [PATCH v2 2/2] dt-bindings: wireless: ath12k: drop qcom,ath12k-calibration-variant
Quoted 5 lines · Andrew LaMarche
The ath12k-wsi binding documentation describes using the generation-specific qcom,ath12k-calibration-variant binding as well as the generation-agnostic qcom,calibration-variant binding to load board-specific calibration data from the device tree. However, the driver never implemented either of these.
But DTS did, which I removed. Probably this could be mentioned if it is relevant.
Anyway:
Please use scripts/get_maintainers.pl to get a list of necessary people and lists to CC. It might happen, that command when run on an older kernel, gives you outdated entries. Therefore please be sure you base your patches on recent Linux kernel.
Tools like b4 or scripts/get_maintainer.pl provide you proper list of people, so fix your workflow. Tools might also fail if you work on some ancient tree (don't, instead use mainline) or work on fork of kernel (don't, instead use mainline). Just use b4 and everything should be fine, although remember about b4 prep --auto-to-cc if you added new patches to the patchset.
You missed at least devicetree list (maybe more), so this won't be tested by automated tooling. Performing review on untested code might be a waste of time.
Please kindly resend and include all necessary To/Cc entries.
Best regards,
Krzysztof