2023-03-21 09:39:16

by Johan Hovold

[permalink] [raw]
Subject: [PATCH v2 0/2] arm64: dts: qcom: sc8280xp-x13s: add wifi calibration variant

This series adds the missing calibration variant devicetree property
which is needed to load the (just released) calibration data and use the
ath11k wifi on the Lenovo Thinkpad X13s.

Kalle, can you take the binding through your tree and then Bjorn can
take the devicetree update through the qcom tree?

Johan


Changes in v2
- rename DT schema file
- fix model name typo in binding comment
- amend calibration variant description
- drop the corresponding change for the sc8280xp-crd which will need
its own set of calibration data


Johan Hovold (2):
dt-bindings: wireless: add ath11k pcie bindings
arm64: dts: qcom: sc8280xp-x13s: add wifi calibration variant

.../net/wireless/qcom,ath11k-pci.yaml | 58 +++++++++++++++++++
.../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 17 ++++++
2 files changed, 75 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml

--
2.39.2



2023-03-21 09:39:17

by Johan Hovold

[permalink] [raw]
Subject: [PATCH v2 2/2] arm64: dts: qcom: sc8280xp-x13s: add wifi calibration variant

Describe the bus topology for PCIe domain 6 and add the ath11k
calibration variant so that the board file (calibration data) can be
loaded.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=216246
Reviewed-by: Konrad Dybcio <[email protected]>
Tested-by: Steev Klimaszewski <[email protected]>
Signed-off-by: Johan Hovold <[email protected]>
---
.../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 17 +++++++++++++++++
1 file changed, 17 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 150f51f1db37..0051025e0aa8 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -711,6 +711,23 @@ &pcie4 {
pinctrl-0 = <&pcie4_default>;

status = "okay";
+
+ pcie@0 {
+ device_type = "pci";
+ reg = <0x0 0x0 0x0 0x0 0x0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ ranges;
+
+ bus-range = <0x01 0xff>;
+
+ wifi@0 {
+ compatible = "pci17cb,1103";
+ reg = <0x10000 0x0 0x0 0x0 0x0>;
+
+ qcom,ath11k-calibration-variant = "LE_X13S";
+ };
+ };
};

&pcie4_phy {
--
2.39.2


2023-03-21 09:39:23

by Johan Hovold

[permalink] [raw]
Subject: [PATCH v2 1/2] dt-bindings: wireless: add ath11k pcie bindings

Add devicetree bindings for Qualcomm ath11k PCIe devices such as WCN6855
for which the calibration data variant may need to be described.

Signed-off-by: Johan Hovold <[email protected]>
---
.../net/wireless/qcom,ath11k-pci.yaml | 58 +++++++++++++++++++
1 file changed, 58 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml

diff --git a/Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml b/Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml
new file mode 100644
index 000000000000..817f02a8b481
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml
@@ -0,0 +1,58 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+# Copyright (c) 2023 Linaro Limited
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/wireless/qcom,ath11k-pci.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm Technologies ath11k wireless devices (PCIe)
+
+maintainers:
+ - Kalle Valo <[email protected]>
+
+description: |
+ Qualcomm Technologies IEEE 802.11ax PCIe devices
+
+properties:
+ compatible:
+ enum:
+ - pci17cb,1103 # WCN6855
+
+ reg:
+ maxItems: 1
+
+ qcom,ath11k-calibration-variant:
+ $ref: /schemas/types.yaml#/definitions/string
+ description: |
+ string to uniquely identify variant of the calibration data for designs
+ with colliding bus and device ids
+
+required:
+ - compatible
+ - reg
+
+additionalProperties: false
+
+examples:
+ - |
+ pcie {
+ #address-cells = <3>;
+ #size-cells = <2>;
+
+ pcie@0 {
+ device_type = "pci";
+ reg = <0x0 0x0 0x0 0x0 0x0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ ranges;
+
+ bus-range = <0x01 0xff>;
+
+ wifi@0 {
+ compatible = "pci17cb,1103";
+ reg = <0x10000 0x0 0x0 0x0 0x0>;
+
+ qcom,ath11k-calibration-variant = "LE_X13S";
+ };
+ };
+ };
--
2.39.2


2023-03-21 10:12:55

by Krzysztof Kozlowski

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] dt-bindings: wireless: add ath11k pcie bindings

On 21/03/2023 10:40, Johan Hovold wrote:
> Add devicetree bindings for Qualcomm ath11k PCIe devices such as WCN6855
> for which the calibration data variant may need to be described.
>
> Signed-off-by: Johan Hovold <[email protected]>
> ---
> .../net/wireless/qcom,ath11k-pci.yaml | 58 +++++++++++++++++++
> 1 file changed, 58 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml
>

Reviewed-by: Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof


2023-03-22 06:01:59

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] dt-bindings: wireless: add ath11k pcie bindings

Johan Hovold <[email protected]> writes:

> Add devicetree bindings for Qualcomm ath11k PCIe devices such as WCN6855
> for which the calibration data variant may need to be described.
>
> Signed-off-by: Johan Hovold <[email protected]>
> ---
> .../net/wireless/qcom,ath11k-pci.yaml | 58 +++++++++++++++++++

I talked with Bjorn, our plan is that I take patch 1 to ath-next and he
takes patch 2. I just rename this patch to:

dt-bindings: net: wireless: add ath11k pcie bindings

Everyone ok with the plan?

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

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

2023-03-24 14:53:30

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH v2 1/2] dt-bindings: wireless: add ath11k pcie bindings

Johan Hovold <[email protected]> wrote:

> Add devicetree bindings for Qualcomm ath11k PCIe devices such as WCN6855
> for which the calibration data variant may need to be described.
>
> Signed-off-by: Johan Hovold <[email protected]>
> Reviewed-by: Krzysztof Kozlowski <[email protected]>
> Signed-off-by: Kalle Valo <[email protected]>

Patch applied to ath-next branch of ath.git, thanks.

b6b88111c0db dt-bindings: net: wireless: add ath11k pcie bindings

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

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

2023-03-24 18:32:43

by Bjorn Andersson

[permalink] [raw]
Subject: Re: (subset) [PATCH v2 0/2] arm64: dts: qcom: sc8280xp-x13s: add wifi calibration variant

On Tue, 21 Mar 2023 10:40:09 +0100, Johan Hovold wrote:
> This series adds the missing calibration variant devicetree property
> which is needed to load the (just released) calibration data and use the
> ath11k wifi on the Lenovo Thinkpad X13s.
>
> Kalle, can you take the binding through your tree and then Bjorn can
> take the devicetree update through the qcom tree?
>
> [...]

Applied, thanks!

[2/2] arm64: dts: qcom: sc8280xp-x13s: add wifi calibration variant
commit: 2702f54f400ad3979632cdb76553772414f4c5e3

Best regards,
--
Bjorn Andersson <[email protected]>