Commit eaf2aaec authored by David S. Miller's avatar David S. Miller
Browse files

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

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



Kalle Valo says:

====================
pull-request: wireless-drivers-next-2021-08-29

here's a pull request to net-next tree, more info below. Please let me know if
there are any problems.

wireless-drivers-next patches for v5.15

Second, and most likely last, set of patches for v5.15. Lots of
iwlwifi patches this time, but smaller changes to other drivers as
well. Nothing special standing out.

Major changes:

rtw88

* add quirk to disable pci caps on HP Pavilion 14-ce0xxx

brcmfmac

* Add WPA3 Personal with FT to supported cipher suites

wcn36xx

* allow firmware name to be overridden by DT

iwlwifi

* support scanning hidden 6GHz networks

* support for a new hardware family (Bz)

* support for new firmware API versions

mwifiex

* add reset_d3cold quirk for Surface gen4+ devices
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3dcc1edc 8d4be124

drivers/bcma/main.c

+3 −3
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ EXPORT_SYMBOL(bcma_core_irq); 


void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)

{

	device_initialize(&core->dev);

	core->dev.release = bcma_release_core_dev;

	core->dev.bus = &bcma_bus_type;

	dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
@@ -277,11 +278,10 @@ static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core) 
{

	int err;



	err = device_register(&core->dev);

	err = device_add(&core->dev);

	if (err) {

		bcma_err(bus, "Could not register dev for core 0x%03X\n",

			 core->id.id);

		put_device(&core->dev);

		return;

	}

	core->dev_registered = true;
@@ -372,7 +372,7 @@ void bcma_unregister_cores(struct bcma_bus *bus) 
	/* Now noone uses internally-handled cores, we can free them */

	list_for_each_entry_safe(core, tmp, &bus->cores, list) {

		list_del(&core->list);

		kfree(core);

		put_device(&core->dev);

	}

}

drivers/bcma/scan.c

+3 −4
Original line number Diff line number Diff line
@@ -141,8 +141,7 @@ static const char *bcma_device_name(const struct bcma_device_id *id) 
	return "UNKNOWN";

}



static u32 bcma_scan_read32(struct bcma_bus *bus, u8 current_coreidx,

		       u16 offset)

static u32 bcma_scan_read32(struct bcma_bus *bus, u16 offset)

{

	return readl(bus->mmio + offset);

}
@@ -443,7 +442,7 @@ void bcma_detect_chip(struct bcma_bus *bus) 


	bcma_scan_switch_core(bus, BCMA_ADDR_BASE);



	tmp = bcma_scan_read32(bus, 0, BCMA_CC_ID);

	tmp = bcma_scan_read32(bus, BCMA_CC_ID);

	chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;

	chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;

	chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
@@ -465,7 +464,7 @@ int bcma_bus_scan(struct bcma_bus *bus) 
	if (bus->nr_cores)

		return 0;



	erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);

	erombase = bcma_scan_read32(bus, BCMA_CC_EROM);

	if (bus->hosttype == BCMA_HOSTTYPE_SOC) {

		eromptr = ioremap(erombase, BCMA_CORE_SIZE);

		if (!eromptr)

drivers/net/wireless/ath/ath6kl/wmi.c

+3 −1
Original line number Diff line number Diff line
@@ -2504,8 +2504,10 @@ static int ath6kl_wmi_sync_point(struct wmi *wmi, u8 if_idx) 
		goto free_data_skb;



	for (index = 0; index < num_pri_streams; index++) {

		if (WARN_ON(!data_sync_bufs[index].skb))

		if (WARN_ON(!data_sync_bufs[index].skb)) {

			ret = -ENOMEM;

			goto free_data_skb;

		}



		ep_id = ath6kl_ac2_endpoint_id(wmi->parent_dev,

					       data_sync_bufs[index].

drivers/net/wireless/ath/ath9k/ar9003_eeprom.c

+2 −1
Original line number Diff line number Diff line
@@ -3351,7 +3351,8 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah, 
			"Found block at %x: code=%d ref=%d length=%d major=%d minor=%d\n",

			cptr, code, reference, length, major, minor);

		if ((!AR_SREV_9485(ah) && length >= 1024) ||

		    (AR_SREV_9485(ah) && length > EEPROM_DATA_LEN_9485)) {

		    (AR_SREV_9485(ah) && length > EEPROM_DATA_LEN_9485) ||

		    (length > cptr)) {

			ath_dbg(common, EEPROM, "Skipping bad header\n");

			cptr -= COMP_HDR_LEN;

			continue;

drivers/net/wireless/ath/ath9k/hw.c

+7 −5
Original line number Diff line number Diff line
@@ -1621,7 +1621,6 @@ static void ath9k_hw_apply_gpio_override(struct ath_hw *ah) 
		ath9k_hw_gpio_request_out(ah, i, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_OUTPUT);

		ath9k_hw_set_gpio(ah, i, !!(ah->gpio_val & BIT(i)));

		ath9k_hw_gpio_free(ah, i);

	}

}
@@ -2728,14 +2727,17 @@ static void ath9k_hw_gpio_cfg_output_mux(struct ath_hw *ah, u32 gpio, u32 type) 
static void ath9k_hw_gpio_cfg_soc(struct ath_hw *ah, u32 gpio, bool out,

				  const char *label)

{

	int err;



	if (ah->caps.gpio_requested & BIT(gpio))

		return;



	/* may be requested by BSP, free anyway */

	gpio_free(gpio);



	if (gpio_request_one(gpio, out ? GPIOF_OUT_INIT_LOW : GPIOF_IN, label))

	err = gpio_request_one(gpio, out ? GPIOF_OUT_INIT_LOW : GPIOF_IN, label);

	if (err) {

		ath_err(ath9k_hw_common(ah), "request GPIO%d failed:%d\n",

			gpio, err);

		return;

	}



	ah->caps.gpio_requested |= BIT(gpio);

}