Commit 1952e19c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2025-03-20' of... 

Merge tag 'wireless-next-2025-03-20' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Johannes Berg says:

====================
More features for 6.15, major changes:
 * cfg80211/mac80211: fix and enable link reconfiguration
 * rtw88: support RTL8814AE/RTL8814AU
 * mt7996: preparations for MLO
 * ath12k: continued work on MLO
 * iwlwifi: add new iwlmld sub-driver/op-mode for
   some current and future devices
 * wfx: wowlan support

* tag 'wireless-next-2025-03-20' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (311 commits)
  wifi: mt76: mt7996: fix locking in mt7996_mac_sta_rc_work()
  wifi: mt76: mt76x2u: add TP-Link TL-WDN6200 ID to device table
  wifi: mt76: mt792x: re-register CHANCTX_STA_CSA only for the mt7921 series
  wifi: mt76: mt7996: Update mt7996_tx to MLO support
  wifi: mt76: mt7996: rework mt7996_ampdu_action to support MLO
  wifi: mt76: mt7996: rework set/get_tsf callabcks to support MLO
  wifi: mt76: mt7996: set vif default link_id adding/removing vif links
  wifi: mt76: mt7996: rework mt7996_mcu_beacon_inband_discov to support MLO
  wifi: mt76: mt7996: rework mt7996_mcu_add_obss_spr to support MLO
  wifi: mt76: mt7996: rework mt7996_net_fill_forward_path to support MLO
  wifi: mt76: mt7996: rework mt7996_update_mu_group to support MLO
  wifi: mt76: mt7996: rework mt7996_mac_sta_poll to support MLO
  wifi: mt76: mt7996: rework mt7996_mac_sta_rc_work to support MLO
  wifi: mt76: mt7996: remove mt7996_mac_enable_rtscts()
  wifi: mt76: mt7996: rework mt7996_sta_hw_queue_read to support MLO
  wifi: mt76: mt7996: rework mt7996_set_hw_key to support MLO
  wifi: mt76: mt7996: Add mt7996_sta_link to mt7996_mcu_add_bss_info signature
  wifi: mt76: mt7996: rework mt7996_sta_set_4addr and mt7996_sta_set_decap_offload to support MLO
  wifi: mt76: mt7996: rework mt7996_rx_get_wcid to support MLO
  wifi: mt76: mt7996: Rely on wcid_to_sta in mt7996_mac_add_txs_skb()
  ...
====================

Link: https://patch.msgid.link/20250320131106.33266-3-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 28d47bca 1794d7ab

Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml

+21 −0
Original line number Diff line number Diff line
@@ -92,20 +92,41 @@ properties: 


  ieee80211-freq-limit: true



  qcom,calibration-data:

    $ref: /schemas/types.yaml#/definitions/uint8-array

    description:

      Calibration data + board-specific data as a byte array. The length

      can vary between hardware versions.



  qcom,ath10k-calibration-data:

    $ref: /schemas/types.yaml#/definitions/uint8-array

    deprecated: true

    description:

      Calibration data + board-specific data as a byte array. The length

      can vary between hardware versions.



  qcom,calibration-variant:

    $ref: /schemas/types.yaml#/definitions/string

    description:

      Unique variant identifier of the calibration data in board-2.bin

      for designs with colliding bus and device specific ids



  qcom,ath10k-calibration-variant:

    $ref: /schemas/types.yaml#/definitions/string

    deprecated: true

    description:

      Unique variant identifier of the calibration data in board-2.bin

      for designs with colliding bus and device specific ids



  qcom,pre-calibration-data:

    $ref: /schemas/types.yaml#/definitions/uint8-array

    description:

      Pre-calibration data as a byte array. The length can vary between

      hardware versions.



  qcom,ath10k-pre-calibration-data:

    $ref: /schemas/types.yaml#/definitions/uint8-array

    deprecated: true

    description:

      Pre-calibration data as a byte array. The length can vary between

      hardware versions.

Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml

+8 −1
Original line number Diff line number Diff line
@@ -22,8 +22,15 @@ properties: 
  reg:

    maxItems: 1



  qcom,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



  qcom,ath11k-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
@@ -127,7 +134,7 @@ examples: 
                vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;

                vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;



                qcom,ath11k-calibration-variant = "LE_X13S";

                qcom,calibration-variant = "LE_X13S";

            };

        };

    };

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

+7 −0
Original line number Diff line number Diff line
@@ -41,8 +41,15 @@ properties: 
        * reg

        * reg-names



  qcom,calibration-variant:

    $ref: /schemas/types.yaml#/definitions/string

    description:

      string to uniquely identify variant of the calibration data in the

      board-2.bin for designs with colliding bus and device specific ids



  qcom,ath11k-calibration-variant:

    $ref: /schemas/types.yaml#/definitions/string

    deprecated: true

    description:

      string to uniquely identify variant of the calibration data in the

      board-2.bin for designs with colliding bus and device specific ids

Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml

+10 −3
Original line number Diff line number Diff line
@@ -52,8 +52,15 @@ properties: 
  reg:

    maxItems: 1



  qcom,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



  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
@@ -103,7 +110,7 @@ examples: 
                compatible = "pci17cb,1109";

                reg = <0x0 0x0 0x0 0x0 0x0>;



                qcom,ath12k-calibration-variant = "RDP433_1";

                qcom,calibration-variant = "RDP433_1";



                ports {

                    #address-cells = <1>;
@@ -139,7 +146,7 @@ examples: 
                compatible = "pci17cb,1109";

                reg = <0x0 0x0 0x0 0x0 0x0>;



                qcom,ath12k-calibration-variant = "RDP433_2";

                qcom,calibration-variant = "RDP433_2";

                qcom,wsi-controller;



                ports {
@@ -176,7 +183,7 @@ examples: 
                compatible = "pci17cb,1109";

                reg = <0x0 0x0 0x0 0x0 0x0>;



                qcom,ath12k-calibration-variant = "RDP433_3";

                qcom,calibration-variant = "RDP433_3";



                ports {

                    #address-cells = <1>;

drivers/net/wireless/ath/ath10k/core.c

+10 −3
Original line number Diff line number Diff line
@@ -1163,6 +1163,9 @@ int ath10k_core_check_dt(struct ath10k *ar) 
	if (!node)

		return -ENOENT;



	of_property_read_string(node, "qcom,calibration-variant",

				&variant);

	if (!variant)

		of_property_read_string(node, "qcom,ath10k-calibration-variant",

					&variant);

	if (!variant)
@@ -2259,6 +2262,8 @@ static int ath10k_core_pre_cal_download(struct ath10k *ar) 
		   "boot did not find a pre calibration file, try DT next: %d\n",

		   ret);



	ret = ath10k_download_cal_dt(ar, "qcom,pre-calibration-data");

	if (ret == -ENOENT)

		ret = ath10k_download_cal_dt(ar, "qcom,ath10k-pre-calibration-data");

	if (ret) {

		ath10k_dbg(ar, ATH10K_DBG_BOOT,
@@ -2337,6 +2342,8 @@ static int ath10k_download_cal_data(struct ath10k *ar) 
		   "boot did not find a calibration file, try DT next: %d\n",

		   ret);



	ret = ath10k_download_cal_dt(ar, "qcom,calibration-data");

	if (ret == -ENOENT)

		ret = ath10k_download_cal_dt(ar, "qcom,ath10k-calibration-data");

	if (ret == 0) {

		ar->cal_mode = ATH10K_CAL_MODE_DT;