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

Merge tag 'wireless-drivers-next-for-davem-2015-02-07' of... 

Merge tag 'wireless-drivers-next-for-davem-2015-02-07' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Major changes:

iwlwifi:

* more work for new devices (4165 / 8260)
* cleanups / improvemnts in rate control
* fixes for TDLS
* major statistics work from Johannes - more to come
* improvements for the fw error dump infrastructure
* usual amount of small fixes here and there (scan, D0i3 etc...)
* add support for beamforming
* enable stuck queue detection for iwlmvm
* a few fixes for EBS scan
* fixes for various failure paths
* improvements for TDLS Offchannel

wil6210:

* performance tuning
* some AP features

brcm80211:

* rework some code in SDIO part of the brcmfmac driver related to
  suspend/resume that were found doing stress testing
* in PCIe part scheduling of worker thread needed to be relaxed
* minor fixes and exposing firmware revision information to
  user-space, ie. ethtool.

mwifiex:

* enhancements for change virtual interface handling
* remove coupling between netdev and FW supported interface
  combination, now conversion from any type of supported interface
  types to any other type is possible
* DFS support in AP mode

ath9k:

* fix calibration issues on some boards
* Wake-on-WLAN improvements

ath10k:

* add support for qca6174 hardware
* enable RX batching to reduce CPU load

Conflicts:
	drivers/net/wireless/rtlwifi/pci.c

Conflict resolution is to get rid of the 'end' label and keep
the rest.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 93c1af6c d5307114

drivers/bcma/bcma_private.h

+8 −0
Original line number Diff line number Diff line
@@ -107,6 +107,14 @@ extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc); 
#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE

bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc);

void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);

#else

static inline bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)

{

	return false;

}

static inline void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)

{

}

#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */



#ifdef CONFIG_BCMA_DRIVER_GPIO

drivers/bcma/driver_chipcommon.c

+7 −3
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc) 
u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks)

{

	u32 maxt;

	enum bcma_clkmode clkmode;



	maxt = bcma_chipco_watchdog_get_max_timer(cc);

	if (cc->capabilities & BCMA_CC_CAP_PMU) {
@@ -188,8 +187,13 @@ u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks) 
			ticks = maxt;

		bcma_cc_write32(cc, BCMA_CC_PMU_WATCHDOG, ticks);

	} else {

		clkmode = ticks ? BCMA_CLKMODE_FAST : BCMA_CLKMODE_DYNAMIC;

		bcma_core_set_clockmode(cc->core, clkmode);

		struct bcma_bus *bus = cc->core->bus;



		if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4707 &&

		    bus->chipinfo.id != BCMA_CHIP_ID_BCM53018)

			bcma_core_set_clockmode(cc->core,

						ticks ? BCMA_CLKMODE_FAST : BCMA_CLKMODE_DYNAMIC);



		if (ticks > maxt)

			ticks = maxt;

		/* instant NMI */

drivers/bcma/driver_pci.c

+44 −24
Original line number Diff line number Diff line
@@ -144,6 +144,47 @@ static u16 bcma_pcie_mdio_writeread(struct bcma_drv_pci *pc, u16 device, 
	return bcma_pcie_mdio_read(pc, device, address);

}



/**************************************************

 * Early init.

 **************************************************/



static void bcma_core_pci_fixcfg(struct bcma_drv_pci *pc)

{

	struct bcma_device *core = pc->core;

	u16 val16, core_index;

	uint regoff;



	regoff = BCMA_CORE_PCI_SPROM(BCMA_CORE_PCI_SPROM_PI_OFFSET);

	core_index = (u16)core->core_index;



	val16 = pcicore_read16(pc, regoff);

	if (((val16 & BCMA_CORE_PCI_SPROM_PI_MASK) >> BCMA_CORE_PCI_SPROM_PI_SHIFT)

	     != core_index) {

		val16 = (core_index << BCMA_CORE_PCI_SPROM_PI_SHIFT) |

			(val16 & ~BCMA_CORE_PCI_SPROM_PI_MASK);

		pcicore_write16(pc, regoff, val16);

	}

}



/*

 * Apply some early fixes required before accessing SPROM.

 * See also si_pci_fixcfg.

 */

void bcma_core_pci_early_init(struct bcma_drv_pci *pc)

{

	if (pc->early_setup_done)

		return;



	pc->hostmode = bcma_core_pci_is_in_hostmode(pc);

	if (pc->hostmode)

		goto out;



	bcma_core_pci_fixcfg(pc);



out:

	pc->early_setup_done = true;

}



/**************************************************

 * Workarounds.

 **************************************************/
@@ -175,24 +216,6 @@ static void bcma_pcicore_serdes_workaround(struct bcma_drv_pci *pc) 
		                     tmp & ~BCMA_CORE_PCI_PLL_CTRL_FREQDET_EN);

}



static void bcma_core_pci_fixcfg(struct bcma_drv_pci *pc)

{

	struct bcma_device *core = pc->core;

	u16 val16, core_index;

	uint regoff;



	regoff = BCMA_CORE_PCI_SPROM(BCMA_CORE_PCI_SPROM_PI_OFFSET);

	core_index = (u16)core->core_index;



	val16 = pcicore_read16(pc, regoff);

	if (((val16 & BCMA_CORE_PCI_SPROM_PI_MASK) >> BCMA_CORE_PCI_SPROM_PI_SHIFT)

	     != core_index) {

		val16 = (core_index << BCMA_CORE_PCI_SPROM_PI_SHIFT) |

			(val16 & ~BCMA_CORE_PCI_SPROM_PI_MASK);

		pcicore_write16(pc, regoff, val16);

	}

}



/* Fix MISC config to allow coming out of L2/L3-Ready state w/o PRST */

/* Needs to happen when coming out of 'standby'/'hibernate' */

static void bcma_core_pci_config_fixup(struct bcma_drv_pci *pc)
@@ -216,7 +239,6 @@ static void bcma_core_pci_config_fixup(struct bcma_drv_pci *pc) 


static void bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)

{

	bcma_core_pci_fixcfg(pc);

	bcma_pcicore_serdes_workaround(pc);

	bcma_core_pci_config_fixup(pc);

}
@@ -226,13 +248,11 @@ void bcma_core_pci_init(struct bcma_drv_pci *pc) 
	if (pc->setup_done)

		return;



#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE

	pc->hostmode = bcma_core_pci_is_in_hostmode(pc);

	bcma_core_pci_early_init(pc);



	if (pc->hostmode)

		bcma_core_pci_hostmode_init(pc);

#endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */



	if (!pc->hostmode)

	else

		bcma_core_pci_clientmode_init(pc);

}

drivers/bcma/host_pci.c

+4 −2
Original line number Diff line number Diff line
@@ -13,10 +13,12 @@ 


static void bcma_host_pci_switch_core(struct bcma_device *core)

{

	int win2 = core->bus->host_is_pcie2 ?

		BCMA_PCIE2_BAR0_WIN2 : BCMA_PCI_BAR0_WIN2;



	pci_write_config_dword(core->bus->host_pci, BCMA_PCI_BAR0_WIN,

			       core->addr);

	pci_write_config_dword(core->bus->host_pci, BCMA_PCI_BAR0_WIN2,

			       core->wrap);

	pci_write_config_dword(core->bus->host_pci, win2, core->wrap);

	core->bus->mapped_core = core;

	bcma_debug(core->bus, "Switched to core: 0x%X\n", core->id.id);

}

drivers/bcma/main.c

+16 −11
Original line number Diff line number Diff line
@@ -368,12 +368,19 @@ static void bcma_unregister_cores(struct bcma_bus *bus) 
	struct bcma_device *core, *tmp;



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

		if (!core->dev_registered)

			continue;

		list_del(&core->list);

		if (core->dev_registered)

		device_unregister(&core->dev);

	}

	if (bus->hosttype == BCMA_HOSTTYPE_SOC)

		platform_device_unregister(bus->drv_cc.watchdog);



	/* 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);

	}

}



int bcma_bus_register(struct bcma_bus *bus)
@@ -395,6 +402,13 @@ int bcma_bus_register(struct bcma_bus *bus) 
		bcma_core_chipcommon_early_init(&bus->drv_cc);

	}



	/* Early init PCIE core */

	core = bcma_find_core(bus, BCMA_CORE_PCIE);

	if (core) {

		bus->drv_pci[0].core = core;

		bcma_core_pci_early_init(&bus->drv_pci[0]);

	}



	/* Cores providing flash access go before SPROM init */

	list_for_each_entry(core, &bus->cores, list) {

		if (bcma_is_core_needed_early(core->id.id))
@@ -467,7 +481,6 @@ int bcma_bus_register(struct bcma_bus *bus) 


void bcma_bus_unregister(struct bcma_bus *bus)

{

	struct bcma_device *cores[3];

	int err;



	err = bcma_gpio_unregister(&bus->drv_cc);
@@ -478,15 +491,7 @@ void bcma_bus_unregister(struct bcma_bus *bus) 


	bcma_core_chipcommon_b_free(&bus->drv_cc_b);



	cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K);

	cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE);

	cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);



	bcma_unregister_cores(bus);



	kfree(cores[2]);

	kfree(cores[1]);

	kfree(cores[0]);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE