Commit 56a7bb12 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2023-10-16' of... 

Merge tag 'wireless-next-2023-10-16' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Kalle Valo says:

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

The second pull request for v6.7, with only driver changes this time.
We have now support for mt7925 PCIe and USB variants, few new features
and of course some fixes.

Major changes:

mt76
 - mt7925 support

ath12k
 - read board data variant name from SMBIOS

wfx
 - Remain-On-Channel (ROC) support

* tag 'wireless-next-2023-10-16' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (109 commits)
  wifi: rtw89: mac: do bf_monitor only if WiFi 6 chips
  wifi: rtw89: mac: set bf_assoc capabilities according to chip gen
  wifi: rtw89: mac: set bfee_ctrl() according to chip gen
  wifi: rtw89: mac: add registers of MU-EDCA parameters for WiFi 7 chips
  wifi: rtw89: mac: generalize register of MU-EDCA switch according to chip gen
  wifi: rtw89: mac: update RTS threshold according to chip gen
  wifi: rtlwifi: simplify TX command fill callbacks
  wifi: hostap: remove unused ioctl function
  wifi: atmel: remove unused ioctl function
  wifi: rtw89: coex: add annotation __counted_by() to struct rtw89_btc_btf_set_mon_reg
  wifi: rtw89: coex: add annotation __counted_by() for struct rtw89_btc_btf_set_slot_table
  wifi: rtw89: add EHT radiotap in monitor mode
  wifi: rtw89: show EHT rate in debugfs
  wifi: rtw89: parse TX EHT rate selected by firmware from RA C2H report
  wifi: rtw89: Add EHT rate mask as parameters of RA H2C command
  wifi: rtw89: parse EHT information from RX descriptor and PPDU status packet
  wifi: radiotap: add bandwidth definition of EHT U-SIG
  wifi: rtlwifi: use convenient list_count_nodes()
  wifi: p54: Annotate struct p54_cal_database with __counted_by
  wifi: brcmfmac: fweh: Add __counted_by for struct brcmf_fweh_queue_item and use struct_size()
  ...
====================

Link: https://lore.kernel.org/r/20231016143822.880D8C433C8@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7713ec84 b6509815

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

+14 −33
Original line number Diff line number Diff line
@@ -1964,20 +1964,13 @@ static ssize_t ath10k_write_btcoex(struct file *file, 
				   size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	char buf[32];

	size_t buf_size;

	int ret;

	ssize_t ret;

	bool val;

	u32 pdev_param;



	buf_size = min(count, (sizeof(buf) - 1));

	if (copy_from_user(buf, ubuf, buf_size))

		return -EFAULT;



	buf[buf_size] = '\0';



	if (kstrtobool(buf, &val) != 0)

		return -EINVAL;

	ret = kstrtobool_from_user(ubuf, count, &val);

	if (ret)

		return ret;



	if (!ar->coex_support)

		return -EOPNOTSUPP;
@@ -2000,7 +1993,7 @@ static ssize_t ath10k_write_btcoex(struct file *file, 
		     ar->running_fw->fw_file.fw_features)) {

		ret = ath10k_wmi_pdev_set_param(ar, pdev_param, val);

		if (ret) {

			ath10k_warn(ar, "failed to enable btcoex: %d\n", ret);

			ath10k_warn(ar, "failed to enable btcoex: %zd\n", ret);

			ret = count;

			goto exit;

		}
@@ -2103,19 +2096,12 @@ static ssize_t ath10k_write_peer_stats(struct file *file, 
				       size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	char buf[32];

	size_t buf_size;

	int ret;

	ssize_t ret;

	bool val;



	buf_size = min(count, (sizeof(buf) - 1));

	if (copy_from_user(buf, ubuf, buf_size))

		return -EFAULT;



	buf[buf_size] = '\0';



	if (kstrtobool(buf, &val) != 0)

		return -EINVAL;

	ret = kstrtobool_from_user(ubuf, count, &val);

	if (ret)

		return ret;



	mutex_lock(&ar->conf_mutex);
@@ -2239,21 +2225,16 @@ static ssize_t ath10k_sta_tid_stats_mask_write(struct file *file, 
					       size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	char buf[32];

	ssize_t len;

	ssize_t ret;

	u32 mask;



	len = min(count, sizeof(buf) - 1);

	if (copy_from_user(buf, user_buf, len))

		return -EFAULT;



	buf[len] = '\0';

	if (kstrtoint(buf, 0, &mask))

		return -EINVAL;

	ret = kstrtoint_from_user(user_buf, count, 0, &mask);

	if (ret)

		return ret;



	ar->sta_tid_stats_mask = mask;



	return len;

	return count;

}



static const struct file_operations fops_sta_tid_stats_mask = {

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

+11 −15
Original line number Diff line number Diff line
@@ -728,20 +728,13 @@ static int ath10k_peer_create(struct ath10k *ar, 
			      const u8 *addr,

			      enum wmi_peer_type peer_type)

{

	struct ath10k_vif *arvif;

	struct ath10k_peer *peer;

	int num_peers = 0;

	int ret;



	lockdep_assert_held(&ar->conf_mutex);



	num_peers = ar->num_peers;



	/* Each vdev consumes a peer entry as well */

	list_for_each_entry(arvif, &ar->arvifs, list)

		num_peers++;



	if (num_peers >= ar->max_num_peers)

	/* Each vdev consumes a peer entry as well. */

	if (ar->num_peers + list_count_nodes(&ar->arvifs) >= ar->max_num_peers)

		return -ENOBUFS;



	ret = ath10k_wmi_peer_create(ar, vdev_id, addr, peer_type);
@@ -4503,18 +4496,21 @@ void __ath10k_scan_finish(struct ath10k *ar) 
		break;

	case ATH10K_SCAN_RUNNING:

	case ATH10K_SCAN_ABORTING:

		if (ar->scan.is_roc && ar->scan.roc_notify)

			ieee80211_remain_on_channel_expired(ar->hw);

		fallthrough;

	case ATH10K_SCAN_STARTING:

		if (!ar->scan.is_roc) {

			struct cfg80211_scan_info info = {

				.aborted = (ar->scan.state ==

					    ATH10K_SCAN_ABORTING),

				.aborted = ((ar->scan.state ==

					    ATH10K_SCAN_ABORTING) ||

					    (ar->scan.state ==

					    ATH10K_SCAN_STARTING)),

			};



			ieee80211_scan_completed(ar->hw, &info);

		} else if (ar->scan.roc_notify) {

			ieee80211_remain_on_channel_expired(ar->hw);

		}

		fallthrough;

	case ATH10K_SCAN_STARTING:



		ar->scan.state = ATH10K_SCAN_IDLE;

		ar->scan_channel = NULL;

		ar->scan.roc_freq = 0;

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

+14 −4
Original line number Diff line number Diff line
@@ -828,12 +828,20 @@ static void ath10k_snoc_hif_get_default_pipe(struct ath10k *ar, 


static inline void ath10k_snoc_irq_disable(struct ath10k *ar)

{

	ath10k_ce_disable_interrupts(ar);

	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);

	int id;



	for (id = 0; id < CE_COUNT_MAX; id++)

		disable_irq(ar_snoc->ce_irqs[id].irq_line);

}



static inline void ath10k_snoc_irq_enable(struct ath10k *ar)

{

	ath10k_ce_enable_interrupts(ar);

	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);

	int id;



	for (id = 0; id < CE_COUNT_MAX; id++)

		enable_irq(ar_snoc->ce_irqs[id].irq_line);

}



static void ath10k_snoc_rx_pipe_cleanup(struct ath10k_snoc_pipe *snoc_pipe)
@@ -1090,6 +1098,8 @@ static int ath10k_snoc_hif_power_up(struct ath10k *ar, 
		goto err_free_rri;

	}



	ath10k_ce_enable_interrupts(ar);



	return 0;



err_free_rri:
@@ -1253,8 +1263,8 @@ static int ath10k_snoc_request_irq(struct ath10k *ar) 


	for (id = 0; id < CE_COUNT_MAX; id++) {

		ret = request_irq(ar_snoc->ce_irqs[id].irq_line,

				  ath10k_snoc_per_engine_handler, 0,

				  ce_name[id], ar);

				  ath10k_snoc_per_engine_handler,

				  IRQF_NO_AUTOEN, ce_name[id], ar);

		if (ret) {

			ath10k_err(ar,

				   "failed to register IRQ handler for CE %d: %d\n",

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

+8 −18
Original line number Diff line number Diff line
@@ -384,16 +384,11 @@ static ssize_t write_file_spectral_count(struct file *file, 
{

	struct ath10k *ar = file->private_data;

	unsigned long val;

	char buf[32];

	ssize_t len;



	len = min(count, sizeof(buf) - 1);

	if (copy_from_user(buf, user_buf, len))

		return -EFAULT;

	ssize_t ret;



	buf[len] = '\0';

	if (kstrtoul(buf, 0, &val))

		return -EINVAL;

	ret = kstrtoul_from_user(user_buf, count, 0, &val);

	if (ret)

		return ret;



	if (val > 255)

		return -EINVAL;
@@ -440,16 +435,11 @@ static ssize_t write_file_spectral_bins(struct file *file, 
{

	struct ath10k *ar = file->private_data;

	unsigned long val;

	char buf[32];

	ssize_t len;



	len = min(count, sizeof(buf) - 1);

	if (copy_from_user(buf, user_buf, len))

		return -EFAULT;

	ssize_t ret;



	buf[len] = '\0';

	if (kstrtoul(buf, 0, &val))

		return -EINVAL;

	ret = kstrtoul_from_user(user_buf, count, 0, &val);

	if (ret)

		return ret;



	if (val < 64 || val > SPECTRAL_ATH10K_MAX_NUM_BINS)

		return -EINVAL;

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

+19 −8
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 */



#include <net/mac80211.h>

#include <net/cfg80211.h>

#include <linux/etherdevice.h>

#include <linux/bitfield.h>

#include <linux/inetdevice.h>
@@ -7196,6 +7197,7 @@ ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif, 
	struct wmi_vdev_start_req_arg arg = {};

	const struct cfg80211_chan_def *chandef = &ctx->def;

	int ret = 0;

	unsigned int dfs_cac_time;



	lockdep_assert_held(&ar->conf_mutex);
@@ -7275,20 +7277,21 @@ ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif, 
	ath11k_dbg(ab, ATH11K_DBG_MAC,  "vdev %pM started, vdev_id %d\n",

		   arvif->vif->addr, arvif->vdev_id);



	/* Enable CAC Flag in the driver by checking the channel DFS cac time,

	 * i.e dfs_cac_ms value which will be valid only for radar channels

	 * and state as NL80211_DFS_USABLE which indicates CAC needs to be

	/* Enable CAC Flag in the driver by checking the all sub-channel's DFS

	 * state as NL80211_DFS_USABLE which indicates CAC needs to be

	 * done before channel usage. This flags is used to drop rx packets.

	 * during CAC.

	 */

	/* TODO Set the flag for other interface types as required */

	if (arvif->vdev_type == WMI_VDEV_TYPE_AP &&

	    chandef->chan->dfs_cac_ms &&

	    chandef->chan->dfs_state == NL80211_DFS_USABLE) {

	if (arvif->vdev_type == WMI_VDEV_TYPE_AP && ctx->radar_enabled &&

	    cfg80211_chandef_dfs_usable(ar->hw->wiphy, chandef)) {

		set_bit(ATH11K_CAC_RUNNING, &ar->dev_flags);

		dfs_cac_time = cfg80211_chandef_dfs_cac_time(ar->hw->wiphy,

							     chandef);

		ath11k_dbg(ab, ATH11K_DBG_MAC,

			   "CAC Started in chan_freq %d for vdev %d\n",

			   arg.channel.freq, arg.vdev_id);

			   "cac started dfs_cac_time %u center_freq %d center_freq1 %d for vdev %d\n",

			   dfs_cac_time, arg.channel.freq, chandef->center_freq1,

			   arg.vdev_id);

	}



	ret = ath11k_mac_set_txbf_conf(arvif);
@@ -9057,6 +9060,14 @@ static int ath11k_mac_op_get_txpower(struct ieee80211_hw *hw, 
	if (ar->state != ATH11K_STATE_ON)

		goto err_fallback;



	/* Firmware doesn't provide Tx power during CAC hence no need to fetch

	 * the stats.

	 */

	if (test_bit(ATH11K_CAC_RUNNING, &ar->dev_flags)) {

		mutex_unlock(&ar->conf_mutex);

		return -EAGAIN;

	}



	req_param.pdev_id = ar->pdev->pdev_id;

	req_param.stats_id = WMI_REQUEST_PDEV_STAT;