Commit 5c466385 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2024-11-13' of... 

Merge tag 'wireless-next-2024-11-13' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Kalle Valo says:

====================
wireless-next patches for v6.13

Most likely the last -next pull request for v6.13. Most changes are in
Realtek and Qualcomm drivers, otherwise not really anything
noteworthy.

Major changes:

mac80211
 * EHT 1024 aggregation size for transmissions

ath12k
 * switch to using wiphy_lock() and remove ar->conf_mutex
 * firmware coredump collection support
 * add debugfs support for a multitude of statistics

ath11k
 * dt: document WCN6855 hardware inputs

ath9k
 * remove include/linux/ath9k_platform.h

ath5k
 * Arcadyan ARV45XX AR2417 & Gigaset SX76[23] AR241[34]A support

rtw88:
 * 8821au and 8812au USB adapters support

rtw89
 * thermal protection
 * firmware secure boot for WiFi 6 chip

* tag 'wireless-next-2024-11-13' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (154 commits)
  Revert "wifi: iwlegacy: do not skip frames with bad FCS"
  wifi: mac80211: pass MBSSID config by reference
  wifi: mac80211: Support EHT 1024 aggregation size in TX
  net: rfkill: gpio: Add check for clk_enable()
  wifi: brcmfmac: Fix oops due to NULL pointer dereference in brcmf_sdiod_sglist_rw()
  wifi: Switch back to struct platform_driver::remove()
  wifi: ipw2x00: libipw_rx_any(): fix bad alignment
  wifi: brcmfmac: release 'root' node in all execution paths
  wifi: iwlwifi: mvm: don't call power_update_mac in fast suspend
  wifi: iwlwifi: s/IWL_MVM_INVALID_STA/IWL_INVALID_STA
  wifi: iwlwifi: bump minimum API version in BZ/SC to 92
  wifi: iwlwifi: move IWL_LMAC_*_INDEX to fw/api/context.h
  wifi: iwlwifi: be less noisy if the NIC is dead in S3
  wifi: iwlwifi: mvm: tell iwlmei when we finished suspending
  wifi: iwlwifi: allow fast resume on ax200
  wifi: iwlwifi: mvm: support new initiator and responder command version
  wifi: iwlwifi: mvm: use wiphy locked debugfs for low-latency
  wifi: iwlwifi: mvm: MLO scan upon channel condition degradation
  wifi: iwlwifi: mvm: support new versions of the wowlan APIs
  wifi: iwlwifi: mvm: allow always calling iwl_mvm_get_bss_vif()
  ...
====================

Link: https://patch.msgid.link/20241113172918.A8A11C4CEC3@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 31a1f875 11597043

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

+29 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ properties: 
  vddrfa1p7-supply:

    description: VDD_RFA_1P7 supply regulator handle



  vddrfa1p8-supply:

    description: VDD_RFA_1P8 supply regulator handle



  vddpcie0p9-supply:

    description: VDD_PCIE_0P9 supply regulator handle
@@ -77,6 +80,22 @@ allOf: 
        - vddrfa1p7-supply

        - vddpcie0p9-supply

        - vddpcie1p8-supply

  - if:

      properties:

        compatible:

          contains:

            const: pci17cb,1103

    then:

      required:

        - vddrfacmn-supply

        - vddaon-supply

        - vddwlcx-supply

        - vddwlmx-supply

        - vddrfa0p8-supply

        - vddrfa1p2-supply

        - vddrfa1p8-supply

        - vddpcie0p9-supply

        - vddpcie1p8-supply



additionalProperties: false
@@ -99,6 +118,16 @@ examples: 
                compatible = "pci17cb,1103";

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



                vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>;

                vddaon-supply = <&vreg_pmu_aon_0p8>;

                vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;

                vddwlmx-supply = <&vreg_pmu_wlmx_0p8>;

                vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;

                vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;

                vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;

                vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;

                vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;



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

            };

        };

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

+4 −4
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static struct platform_driver ath10k_ahb_driver = { 
		.of_match_table = ath10k_ahb_of_match,

	},

	.probe = ath10k_ahb_probe,

	.remove_new = ath10k_ahb_remove,

	.remove = ath10k_ahb_remove,

};



int ath10k_ahb_init(void)

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

+57 −43
Original line number Diff line number Diff line
@@ -6369,7 +6369,7 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw, 
	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct cfg80211_scan_request *req = &hw_req->req;

	struct wmi_start_scan_arg arg;

	struct wmi_start_scan_arg *arg = NULL;

	int ret = 0;

	int i;

	u32 scan_timeout;
@@ -6402,56 +6402,61 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw, 
	if (ret)

		goto exit;



	memset(&arg, 0, sizeof(arg));

	ath10k_wmi_start_scan_init(ar, &arg);

	arg.vdev_id = arvif->vdev_id;

	arg.scan_id = ATH10K_SCAN_ID;

	arg = kzalloc(sizeof(*arg), GFP_KERNEL);

	if (!arg) {

		ret = -ENOMEM;

		goto exit;

	}



	ath10k_wmi_start_scan_init(ar, arg);

	arg->vdev_id = arvif->vdev_id;

	arg->scan_id = ATH10K_SCAN_ID;



	if (req->ie_len) {

		arg.ie_len = req->ie_len;

		memcpy(arg.ie, req->ie, arg.ie_len);

		arg->ie_len = req->ie_len;

		memcpy(arg->ie, req->ie, arg->ie_len);

	}



	if (req->n_ssids) {

		arg.n_ssids = req->n_ssids;

		for (i = 0; i < arg.n_ssids; i++) {

			arg.ssids[i].len  = req->ssids[i].ssid_len;

			arg.ssids[i].ssid = req->ssids[i].ssid;

		arg->n_ssids = req->n_ssids;

		for (i = 0; i < arg->n_ssids; i++) {

			arg->ssids[i].len  = req->ssids[i].ssid_len;

			arg->ssids[i].ssid = req->ssids[i].ssid;

		}

	} else {

		arg.scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;

		arg->scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;

	}



	if (req->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) {

		arg.scan_ctrl_flags |=  WMI_SCAN_ADD_SPOOFED_MAC_IN_PROBE_REQ;

		ether_addr_copy(arg.mac_addr.addr, req->mac_addr);

		ether_addr_copy(arg.mac_mask.addr, req->mac_addr_mask);

		arg->scan_ctrl_flags |=  WMI_SCAN_ADD_SPOOFED_MAC_IN_PROBE_REQ;

		ether_addr_copy(arg->mac_addr.addr, req->mac_addr);

		ether_addr_copy(arg->mac_mask.addr, req->mac_addr_mask);

	}



	if (req->n_channels) {

		arg.n_channels = req->n_channels;

		for (i = 0; i < arg.n_channels; i++)

			arg.channels[i] = req->channels[i]->center_freq;

		arg->n_channels = req->n_channels;

		for (i = 0; i < arg->n_channels; i++)

			arg->channels[i] = req->channels[i]->center_freq;

	}



	/* if duration is set, default dwell times will be overwritten */

	if (req->duration) {

		arg.dwell_time_active = req->duration;

		arg.dwell_time_passive = req->duration;

		arg.burst_duration_ms = req->duration;

		arg->dwell_time_active = req->duration;

		arg->dwell_time_passive = req->duration;

		arg->burst_duration_ms = req->duration;



		scan_timeout = min_t(u32, arg.max_rest_time *

				(arg.n_channels - 1) + (req->duration +

		scan_timeout = min_t(u32, arg->max_rest_time *

				(arg->n_channels - 1) + (req->duration +

				ATH10K_SCAN_CHANNEL_SWITCH_WMI_EVT_OVERHEAD) *

				arg.n_channels, arg.max_scan_time);

				arg->n_channels, arg->max_scan_time);

	} else {

		scan_timeout = arg.max_scan_time;

		scan_timeout = arg->max_scan_time;

	}



	/* Add a 200ms margin to account for event/command processing */

	scan_timeout += 200;



	ret = ath10k_start_scan(ar, &arg);

	ret = ath10k_start_scan(ar, arg);

	if (ret) {

		ath10k_warn(ar, "failed to start hw scan: %d\n", ret);

		spin_lock_bh(&ar->data_lock);
@@ -6463,6 +6468,8 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw, 
				     msecs_to_jiffies(scan_timeout));



exit:

	kfree(arg);



	mutex_unlock(&ar->conf_mutex);

	return ret;

}
@@ -7899,7 +7906,7 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw, 
{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct wmi_start_scan_arg arg;

	struct wmi_start_scan_arg *arg = NULL;

	int ret = 0;

	u32 scan_time_msec;
@@ -7936,20 +7943,25 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw, 


	scan_time_msec = ar->hw->wiphy->max_remain_on_channel_duration * 2;



	memset(&arg, 0, sizeof(arg));

	ath10k_wmi_start_scan_init(ar, &arg);

	arg.vdev_id = arvif->vdev_id;

	arg.scan_id = ATH10K_SCAN_ID;

	arg.n_channels = 1;

	arg.channels[0] = chan->center_freq;

	arg.dwell_time_active = scan_time_msec;

	arg.dwell_time_passive = scan_time_msec;

	arg.max_scan_time = scan_time_msec;

	arg.scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;

	arg.scan_ctrl_flags |= WMI_SCAN_FILTER_PROBE_REQ;

	arg.burst_duration_ms = duration;



	ret = ath10k_start_scan(ar, &arg);

	arg = kzalloc(sizeof(*arg), GFP_KERNEL);

	if (!arg) {

		ret = -ENOMEM;

		goto exit;

	}



	ath10k_wmi_start_scan_init(ar, arg);

	arg->vdev_id = arvif->vdev_id;

	arg->scan_id = ATH10K_SCAN_ID;

	arg->n_channels = 1;

	arg->channels[0] = chan->center_freq;

	arg->dwell_time_active = scan_time_msec;

	arg->dwell_time_passive = scan_time_msec;

	arg->max_scan_time = scan_time_msec;

	arg->scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;

	arg->scan_ctrl_flags |= WMI_SCAN_FILTER_PROBE_REQ;

	arg->burst_duration_ms = duration;



	ret = ath10k_start_scan(ar, arg);

	if (ret) {

		ath10k_warn(ar, "failed to start roc scan: %d\n", ret);

		spin_lock_bh(&ar->data_lock);
@@ -7975,6 +7987,8 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw, 


	ret = 0;

exit:

	kfree(arg);



	mutex_unlock(&ar->conf_mutex);

	return ret;

}
@@ -9122,7 +9136,7 @@ static const struct ath10k_index_vht_data_rate_type supported_vht_mcs_rate_nss1[ 
	{6,  {2633, 2925}, {1215, 1350}, {585,  650} },

	{7,  {2925, 3250}, {1350, 1500}, {650,  722} },

	{8,  {3510, 3900}, {1620, 1800}, {780,  867} },

	{9,  {3900, 4333}, {1800, 2000}, {780,  867} }

	{9,  {3900, 4333}, {1800, 2000}, {865,  960} }

};



/*MCS parameters with Nss = 2 */
@@ -9137,7 +9151,7 @@ static const struct ath10k_index_vht_data_rate_type supported_vht_mcs_rate_nss2[ 
	{6,  {5265, 5850}, {2430, 2700}, {1170, 1300} },

	{7,  {5850, 6500}, {2700, 3000}, {1300, 1444} },

	{8,  {7020, 7800}, {3240, 3600}, {1560, 1733} },

	{9,  {7800, 8667}, {3600, 4000}, {1560, 1733} }

	{9,  {7800, 8667}, {3600, 4000}, {1730, 1920} }

};



static void ath10k_mac_get_rate_flags_ht(struct ath10k *ar, u32 rate, u8 nss, u8 mcs,

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

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright (c) 2004-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2012,2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2016-2017 Erik Stromdahl <erik.stromdahl@gmail.com>

 * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include <linux/module.h>
@@ -2648,9 +2648,9 @@ static void ath10k_sdio_remove(struct sdio_func *func) 


	netif_napi_del(&ar->napi);



	ath10k_core_destroy(ar);



	destroy_workqueue(ar_sdio->workqueue);



	ath10k_core_destroy(ar);

}



static const struct sdio_device_id ath10k_sdio_devices[] = {

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

+3 −3
Original line number Diff line number Diff line
@@ -1886,7 +1886,7 @@ static void ath10k_snoc_shutdown(struct platform_device *pdev) 


static struct platform_driver ath10k_snoc_driver = {

	.probe = ath10k_snoc_probe,

	.remove_new = ath10k_snoc_remove,

	.remove = ath10k_snoc_remove,

	.shutdown = ath10k_snoc_shutdown,

	.driver = {

		.name = "ath10k_snoc",