Commit 28131d89 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-drivers-next-2021-10-29' of... 

Merge tag 'wireless-drivers-next-2021-10-29' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for v5.16

Fourth set of patches for v5.16. Mostly fixes this time, wcn36xx and
iwlwifi have some new features but nothing really out of ordinary.
We have one conflict with kspp tree.

Major changes:

ath11k
 * fix QCA6390 A-MSDU handling (CVE-2020-24588)

wcn36xx
 * enable hardware scan offload for 5Ghz band
 * add missing 5GHz channels 136 and 144

iwlwifi
 * support a new ACPI table revision
 * improvements in the device selection code
 * new hardware support
 * support for WiFi 6E enablement via BIOS
 * support firmware API version 67
 * support for 160MHz in ranging measurements

====================

Link: https://lore.kernel.org/r/20211029134707.DE2B0C4360D@smtp.codeaurora.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7444d706 2619f904

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

+9 −2
Original line number Diff line number Diff line
@@ -2690,9 +2690,16 @@ static int ath10k_core_copy_target_iram(struct ath10k *ar) 
	int i, ret;

	u32 len, remaining_len;



	hw_mem = ath10k_coredump_get_mem_layout(ar);

	/* copy target iram feature must work also when

	 * ATH10K_FW_CRASH_DUMP_RAM_DATA is disabled, so

	 * _ath10k_coredump_get_mem_layout() to accomplist that

	 */

	hw_mem = _ath10k_coredump_get_mem_layout(ar);

	if (!hw_mem)

		return -ENOMEM;

		/* if CONFIG_DEV_COREDUMP is disabled we get NULL, then

		 * just silently disable the feature by doing nothing

		 */

		return 0;



	for (i = 0; i < hw_mem->region_table.size; i++) {

		tmp = &hw_mem->region_table.regions[i];

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

+8 −3
Original line number Diff line number Diff line
@@ -1447,11 +1447,17 @@ static u32 ath10k_coredump_get_ramdump_size(struct ath10k *ar) 


const struct ath10k_hw_mem_layout *ath10k_coredump_get_mem_layout(struct ath10k *ar)

{

	int i;



	if (!test_bit(ATH10K_FW_CRASH_DUMP_RAM_DATA, &ath10k_coredump_mask))

		return NULL;



	return _ath10k_coredump_get_mem_layout(ar);

}

EXPORT_SYMBOL(ath10k_coredump_get_mem_layout);



const struct ath10k_hw_mem_layout *_ath10k_coredump_get_mem_layout(struct ath10k *ar)

{

	int i;



	if (WARN_ON(ar->target_version == 0))

		return NULL;
@@ -1464,7 +1470,6 @@ const struct ath10k_hw_mem_layout *ath10k_coredump_get_mem_layout(struct ath10k 


	return NULL;

}

EXPORT_SYMBOL(ath10k_coredump_get_mem_layout);



struct ath10k_fw_crash_data *ath10k_coredump_new(struct ath10k *ar)

{

drivers/net/wireless/ath/ath10k/coredump.h

+7 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ int ath10k_coredump_register(struct ath10k *ar); 
void ath10k_coredump_unregister(struct ath10k *ar);

void ath10k_coredump_destroy(struct ath10k *ar);



const struct ath10k_hw_mem_layout *_ath10k_coredump_get_mem_layout(struct ath10k *ar);

const struct ath10k_hw_mem_layout *ath10k_coredump_get_mem_layout(struct ath10k *ar);



#else /* CONFIG_DEV_COREDUMP */
@@ -214,6 +215,12 @@ ath10k_coredump_get_mem_layout(struct ath10k *ar) 
	return NULL;

}



static inline const struct ath10k_hw_mem_layout *

_ath10k_coredump_get_mem_layout(struct ath10k *ar)

{

	return NULL;

}



#endif /* CONFIG_DEV_COREDUMP */



#endif /* _COREDUMP_H_ */

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

+9 −1
Original line number Diff line number Diff line
@@ -5583,7 +5583,15 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 
		if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL) {

			arvif->beacon_buf = kmalloc(IEEE80211_MAX_FRAME_LEN,

						    GFP_KERNEL);

			arvif->beacon_paddr = (dma_addr_t)arvif->beacon_buf;



			/* Using a kernel pointer in place of a dma_addr_t

			 * token can lead to undefined behavior if that

			 * makes it into cache management functions. Use a

			 * known-invalid address token instead, which

			 * avoids the warning and makes it easier to catch

			 * bugs if it does end up getting used.

			 */

			arvif->beacon_paddr = DMA_MAPPING_ERROR;

		} else {

			arvif->beacon_buf =

				dma_alloc_coherent(ar->dev,

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

+6 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int ath10k_usb_submit_ctrl_in(struct ath10k *ar, 
			      req,

			      USB_DIR_IN | USB_TYPE_VENDOR |

			      USB_RECIP_DEVICE, value, index, buf,

			      size, 2 * HZ);

			      size, 2000);



	if (ret < 0) {

		ath10k_warn(ar, "Failed to read usb control message: %d\n",
@@ -853,6 +853,11 @@ static int ath10k_usb_setup_pipe_resources(struct ath10k *ar, 
				   le16_to_cpu(endpoint->wMaxPacketSize),

				   endpoint->bInterval);

		}



		/* Ignore broken descriptors. */

		if (usb_endpoint_maxp(endpoint) == 0)

			continue;



		urbcount = 0;



		pipe_num =