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

Merge tag 'wireless-drivers-next-2020-08-04' of... 

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



Kalle Valo says:

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

Second set of patches for v5.9. mt76 has most of patches this time.
Otherwise it's just smaller fixes and cleanups to other drivers.

There was a major conflict in mt76 driver between wireless-drivers and
wireless-drivers-next. I solved that by merging the former to the
latter.

Major changes:

rtw88

* add support for ieee80211_ops::change_interface

* add support for enabling and disabling beacon

* add debugfs file for testing h2c

mt76

* ARP filter offload for 7663

* runtime power management for 7663

* testmode support for mfg calibration

* support for more channels
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 93f4ddd6 2cfd71f1

Documentation/networking/device_drivers/wifi/intel/ipw2100.rst

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ such, if you are interested in deploying or shipping a driver as part of 
solution intended to be used for purposes other than development, please

obtain a tested driver from Intel Customer Support at:



http://www.intel.com/support/wireless/sb/CS-006408.htm

https://www.intel.com/support/wireless/sb/CS-006408.htm



1. Introduction

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

drivers/bcma/driver_gpio.c

+11 −12
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id) 
static int bcma_gpio_irq_init(struct bcma_drv_cc *cc)

{

	struct gpio_chip *chip = &cc->gpio;

	struct gpio_irq_chip *girq = &chip->irq;

	int hwirq, err;



	if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC)
@@ -136,15 +137,13 @@ static int bcma_gpio_irq_init(struct bcma_drv_cc *cc) 
	bcma_chipco_gpio_intmask(cc, ~0, 0);

	bcma_cc_set32(cc, BCMA_CC_IRQMASK, BCMA_CC_IRQ_GPIO);



	err =  gpiochip_irqchip_add(chip,

				    &bcma_gpio_irq_chip,

				    0,

				    handle_simple_irq,

				    IRQ_TYPE_NONE);

	if (err) {

		free_irq(hwirq, cc);

		return err;

	}

	girq->chip = &bcma_gpio_irq_chip;

	/* This will let us handle the parent IRQ in the driver */

	girq->parent_handler = NULL;

	girq->num_parents = 0;

	girq->parents = NULL;

	girq->default_type = IRQ_TYPE_NONE;

	girq->handler = handle_simple_irq;



	return 0;

}
@@ -212,13 +211,13 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 
	else

		chip->base		= -1;



	err = gpiochip_add_data(chip, cc);

	err = bcma_gpio_irq_init(cc);

	if (err)

		return err;



	err = bcma_gpio_irq_init(cc);

	err = gpiochip_add_data(chip, cc);

	if (err) {

		gpiochip_remove(chip);

		bcma_gpio_irq_exit(cc);

		return err;

	}

drivers/bcma/scan.c

+3 −5
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 __iomem **eromptr) 
static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,

				  u32 type, u8 port)

{

	u32 addrl, addrh, sizeh = 0;

	u32 addrl;

	u32 size;



	u32 ent = bcma_erom_get_ent(bus, eromptr);
@@ -233,14 +233,12 @@ static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr, 


	addrl = ent & SCAN_ADDR_ADDR;

	if (ent & SCAN_ADDR_AG32)

		addrh = bcma_erom_get_ent(bus, eromptr);

	else

		addrh = 0;

		bcma_erom_get_ent(bus, eromptr);



	if ((ent & SCAN_ADDR_SZ) == SCAN_ADDR_SZ_SZD) {

		size = bcma_erom_get_ent(bus, eromptr);

		if (size & SCAN_SIZE_SG32)

			sizeh = bcma_erom_get_ent(bus, eromptr);

			bcma_erom_get_ent(bus, eromptr);

	}



	return addrl;

drivers/net/wireless/broadcom/b43/main.c

+7 −7
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ static void b43_short_slot_timing_disable(struct b43_wldev *dev) 
}



/* DummyTransmission function, as documented on

 * http://bcm-v4.sipsolutions.net/802.11/DummyTransmission

 * https://bcm-v4.sipsolutions.net/802.11/DummyTransmission

 */

void b43_dummy_transmission(struct b43_wldev *dev, bool ofdm, bool pa_on)

{
@@ -1198,7 +1198,7 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags) 
	}

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/BmacCorePllReset */

/* https://bcm-v4.sipsolutions.net/802.11/PHY/BmacCorePllReset */

void b43_wireless_core_phy_pll_reset(struct b43_wldev *dev)

{

	struct bcma_drv_cc *bcma_cc __maybe_unused;
@@ -2290,7 +2290,7 @@ err_format: 
	return -EPROTO;

}



/* http://bcm-v4.sipsolutions.net/802.11/Init/Firmware */

/* https://bcm-v4.sipsolutions.net/802.11/Init/Firmware */

static int b43_try_request_fw(struct b43_request_fw_context *ctx)

{

	struct b43_wldev *dev = ctx->dev;
@@ -2843,7 +2843,7 @@ static int b43_upload_initvals_band(struct b43_wldev *dev) 
}



/* Initialize the GPIOs

 * http://bcm-specs.sipsolutions.net/GPIO

 * https://bcm-specs.sipsolutions.net/GPIO

 */



#ifdef CONFIG_B43_SSB
@@ -2971,7 +2971,7 @@ void b43_mac_enable(struct b43_wldev *dev) 
	}

}



/* http://bcm-specs.sipsolutions.net/SuspendMAC */

/* https://bcm-specs.sipsolutions.net/SuspendMAC */

void b43_mac_suspend(struct b43_wldev *dev)

{

	int i;
@@ -3004,7 +3004,7 @@ out: 
	dev->mac_suspended++;

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MacPhyClkSet */

/* https://bcm-v4.sipsolutions.net/802.11/PHY/N/MacPhyClkSet */

void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on)

{

	u32 tmp;
@@ -3231,7 +3231,7 @@ static void b43_chip_exit(struct b43_wldev *dev) 
}



/* Initialize the chip

 * http://bcm-specs.sipsolutions.net/ChipInit

 * https://bcm-specs.sipsolutions.net/ChipInit

 */

static int b43_chip_init(struct b43_wldev *dev)

{

drivers/net/wireless/broadcom/b43/phy_common.c

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ bool b43_is_40mhz(struct b43_wldev *dev) 
	return dev->phy.chandef->width == NL80211_CHAN_WIDTH_40;

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/BmacPhyClkFgc */

/* https://bcm-v4.sipsolutions.net/802.11/PHY/N/BmacPhyClkFgc */

void b43_phy_force_clock(struct b43_wldev *dev, bool force)

{

	u32 tmp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE