Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'master-2014-09-16' of... 

Merge tag 'master-2014-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next



John W. Linville says:

====================
pull request: wireless-next 2014-09-22

Please pull this batch of updates intended for the 3.18 stream...

For the mac80211 bits, Johannes says:

"This time, I have some rate minstrel improvements, support for a very
small feature from CCX that Steinar reverse-engineered, dynamic ACK
timeout support, a number of changes for TDLS, early support for radio
resource measurement and many fixes. Also, I'm changing a number of
places to clear key memory when it's freed and Intel claims copyright
for code they developed."

For the bluetooth bits, Johan says:

"Here are some more patches intended for 3.18. Most of them are cleanups
or fixes for SMP. The only exception is a fix for BR/EDR L2CAP fixed
channels which should now work better together with the L2CAP
information request procedure."

For the iwlwifi bits, Emmanuel says:

"I fix here dvm which was broken by my last pull request. Arik
continues to work on TDLS and Luca solved a few issues in CT-Kill. Eyal
keeps digging into rate scaling code, more to come soon. Besides this,
nothing really special here."

Beyond that, there are the usual big batches of updates to ath9k, b43,
mwifiex, and wil6210 as well as a handful of other bits here and there.
Also, rtlwifi gets some btcoexist attention from Larry.

Please let me know if there are problems!
====================

Had to adjust the wil6210 code to comply with Joe Perches's recent
change in net-next to make the netdev_*() routines return void instead
of 'int'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6ea754eb 7a0a260a

arch/mips/bcm47xx/setup.c

+4 −0
Original line number Diff line number Diff line
@@ -210,6 +210,10 @@ static void __init bcm47xx_register_bcma(void) 
		pr_warn("bcm47xx: someone else already registered a bcma SPROM callback handler (err %d)\n", err);



	err = bcma_host_soc_register(&bcm47xx_bus.bcma);

	if (err)

		panic("Failed to register BCMA bus (err %d)", err);



	err = bcma_host_soc_init(&bcm47xx_bus.bcma);

	if (err)

		panic("Failed to initialize BCMA bus (err %d)", err);

drivers/bcma/Makefile

+1 −0
Original line number Diff line number Diff line 
bcma-y					+= main.o scan.o core.o sprom.o

bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o

bcma-y					+= driver_chipcommon_b.o

bcma-$(CONFIG_BCMA_SFLASH)		+= driver_chipcommon_sflash.o

bcma-$(CONFIG_BCMA_NFLASH)		+= driver_chipcommon_nflash.o

bcma-y					+= driver_pci.o

drivers/bcma/bcma_private.h

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc); 
extern struct platform_device bcma_pflash_dev;

#endif /* CONFIG_BCMA_DRIVER_MIPS */



/* driver_chipcommon_b.c */

int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);

void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb);



/* driver_chipcommon_pmu.c */

u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);

u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);

drivers/bcma/driver_chipcommon_b.c

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 * Broadcom specific AMBA

 * ChipCommon B Unit driver

 *

 * Copyright 2014, Hauke Mehrtens <hauke@hauke-m.de>

 *

 * Licensed under the GNU/GPL. See COPYING for details.

 */



#include "bcma_private.h"

#include <linux/export.h>

#include <linux/bcma/bcma.h>



static bool bcma_wait_reg(struct bcma_bus *bus, void __iomem *addr, u32 mask,

			  u32 value, int timeout)

{

	unsigned long deadline = jiffies + timeout;

	u32 val;



	do {

		val = readl(addr);

		if ((val & mask) == value)

			return true;

		cpu_relax();

		udelay(10);

	} while (!time_after_eq(jiffies, deadline));



	bcma_err(bus, "Timeout waiting for register %p\n", addr);



	return false;

}



void bcma_chipco_b_mii_write(struct bcma_drv_cc_b *ccb, u32 offset, u32 value)

{

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



	writel(offset, ccb->mii + 0x00);

	bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100);

	writel(value, ccb->mii + 0x04);

	bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100);

}

EXPORT_SYMBOL_GPL(bcma_chipco_b_mii_write);



int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb)

{

	if (ccb->setup_done)

		return 0;



	ccb->setup_done = 1;

	ccb->mii = ioremap_nocache(ccb->core->addr_s[1], BCMA_CORE_SIZE);

	if (!ccb->mii)

		return -ENOMEM;



	return 0;

}



void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb)

{

	if (ccb->mii)

		iounmap(ccb->mii);

}

drivers/bcma/host_pci.c

+3 −0
Original line number Diff line number Diff line
@@ -208,6 +208,9 @@ static int bcma_host_pci_probe(struct pci_dev *dev, 
	bus->boardinfo.vendor = bus->host_pci->subsystem_vendor;

	bus->boardinfo.type = bus->host_pci->subsystem_device;



	/* Initialize struct, detect chip */

	bcma_init_bus(bus);



	/* Register */

	err = bcma_bus_register(bus);

	if (err)