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

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

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



John W. Linville says:

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

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

For the mac80211 bits, Johannes says:

"Not that much content this time. Some RCU cleanups, crypto
performance improvements, and various patches all over,
rather than listing them one might as well look into the
git log instead."

For the Bluetooth bits, Gustavo says:

"The changes consists of:

        - Coding style fixes to HCI drivers
        - Corrupted ack value fix for the H5 HCI driver
        - A couple of Enhanced L2CAP fixes
        - Conversion of SMP code to use common L2CAP channel API
        - Page scan optimizations when using the kernel-side whitelist
        - Various mac802154 and and ieee802154 6lowpan cleanups
        - One new Atheros USB ID"

For the iwlwifi bits, Emmanuel says:

"We have a new big thing coming up which is called Dynamic Queue
Allocation (or DQA).  This is a completely new way to work with the
Tx queues and it requires major refactoring.  This is being done by
Johannes and Avri.  Besides this, Johannes disables U-APSD by default
because of APs that would disable A-MPDU if the association supports
U-ASPD.  Luca contributed to the power area which he was cleaning
up on the way while working on CSA.  A few more random things here
and there."

For the Atheros bits, Kalle says:

"For ath6kl we had two small fixes and a new SDIO device id.

For ath10k the bigger changes are:

 * support for new firmware version 10.2 (Michal)

 * spectral scan support (Simon, Sven & Mathias)

 * export a firmware crash dump file (Ben & me)

 * cleaning up of pci.c (Michal)

 * print pci id in all messages, which causes most of the churn (Michal)"

Beyond that, we have the usual collection of various updates to ath9k,
b43, mwifiex, and wil6210, as well as a few other bits here and there.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a7f26b7e 61a3d4f9

MAINTAINERS

+6 −5
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ F: drivers/scsi/53c700* 


6LOWPAN GENERIC (BTLE/IEEE 802.15.4)

M:	Alexander Aring <alex.aring@gmail.com>

L:	linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)

L:	linux-bluetooth@vger.kernel.org

L:	linux-wpan@vger.kernel.org

S:	Maintained

F:	net/6lowpan/

F:	include/net/6lowpan.h
@@ -4597,13 +4597,14 @@ F: drivers/idle/i7300_idle.c 


IEEE 802.15.4 SUBSYSTEM

M:	Alexander Aring <alex.aring@gmail.com>

L:	linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)

W:	http://apps.sourceforge.net/trac/linux-zigbee

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git

L:	linux-wpan@vger.kernel.org

W:	https://github.com/linux-wpan

T:	git git://github.com/linux-wpan/linux-wpan-next.git

S:	Maintained

F:	net/ieee802154/

F:	net/mac802154/

F:	drivers/net/ieee802154/

F:	Documentation/networking/ieee802154.txt



IGUANAWORKS USB IR TRANSCEIVER

M:	Sean Young <sean@mess.org>
@@ -6373,7 +6374,7 @@ M: Lauro Ramos Venancio <lauro.venancio@openbossa.org> 
M:	Aloisio Almeida Jr <aloisio.almeida@openbossa.org>

M:	Samuel Ortiz <sameo@linux.intel.com>

L:	linux-wireless@vger.kernel.org

L:	linux-nfc@lists.01.org (moderated for non-subscribers)

L:	linux-nfc@lists.01.org (subscribers-only)

S:	Supported

F:	net/nfc/

F:	include/net/nfc/

drivers/bcma/driver_mips.c

+62 −0
Original line number Diff line number Diff line
@@ -21,6 +21,14 @@ 
#include <linux/serial_reg.h>

#include <linux/time.h>



enum bcma_boot_dev {

	BCMA_BOOT_DEV_UNK = 0,

	BCMA_BOOT_DEV_ROM,

	BCMA_BOOT_DEV_PARALLEL,

	BCMA_BOOT_DEV_SERIAL,

	BCMA_BOOT_DEV_NAND,

};



static const char * const part_probes[] = { "bcm47xxpart", NULL };



static struct physmap_flash_data bcma_pflash_data = {
@@ -229,11 +237,51 @@ u32 bcma_cpu_clock(struct bcma_drv_mips *mcore) 
}

EXPORT_SYMBOL(bcma_cpu_clock);



static enum bcma_boot_dev bcma_boot_dev(struct bcma_bus *bus)

{

	struct bcma_drv_cc *cc = &bus->drv_cc;

	u8 cc_rev = cc->core->id.rev;



	if (cc_rev == 42) {

		struct bcma_device *core;



		core = bcma_find_core(bus, BCMA_CORE_NS_ROM);

		if (core) {

			switch (bcma_aread32(core, BCMA_IOST) &

				BCMA_NS_ROM_IOST_BOOT_DEV_MASK) {

			case BCMA_NS_ROM_IOST_BOOT_DEV_NOR:

				return BCMA_BOOT_DEV_SERIAL;

			case BCMA_NS_ROM_IOST_BOOT_DEV_NAND:

				return BCMA_BOOT_DEV_NAND;

			case BCMA_NS_ROM_IOST_BOOT_DEV_ROM:

			default:

				return BCMA_BOOT_DEV_ROM;

			}

		}

	} else {

		if (cc_rev == 38) {

			if (cc->status & BCMA_CC_CHIPST_5357_NAND_BOOT)

				return BCMA_BOOT_DEV_NAND;

			else if (cc->status & BIT(5))

				return BCMA_BOOT_DEV_ROM;

		}



		if ((cc->capabilities & BCMA_CC_CAP_FLASHT) ==

		    BCMA_CC_FLASHT_PARA)

			return BCMA_BOOT_DEV_PARALLEL;

		else

			return BCMA_BOOT_DEV_SERIAL;

	}



	return BCMA_BOOT_DEV_SERIAL;

}



static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)

{

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

	struct bcma_drv_cc *cc = &bus->drv_cc;

	struct bcma_pflash *pflash = &cc->pflash;

	enum bcma_boot_dev boot_dev;



	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {

	case BCMA_CC_FLASHT_STSER:
@@ -269,6 +317,20 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore) 
			bcma_nflash_init(cc);

		}

	}



	/* Determine flash type this SoC boots from */

	boot_dev = bcma_boot_dev(bus);

	switch (boot_dev) {

	case BCMA_BOOT_DEV_PARALLEL:

	case BCMA_BOOT_DEV_SERIAL:

		/* TODO: Init NVRAM using BCMA_SOC_FLASH2 window */

		break;

	case BCMA_BOOT_DEV_NAND:

		/* TODO: Init NVRAM using BCMA_SOC_FLASH1 window */

		break;

	default:

		break;

	}

}



void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)

drivers/bcma/host_soc.c

+4 −0
Original line number Diff line number Diff line
@@ -134,12 +134,16 @@ static void bcma_host_soc_block_write(struct bcma_device *core, 


static u32 bcma_host_soc_aread32(struct bcma_device *core, u16 offset)

{

	if (WARN_ONCE(!core->io_wrap, "Accessed core has no wrapper/agent\n"))

		return ~0;

	return readl(core->io_wrap + offset);

}



static void bcma_host_soc_awrite32(struct bcma_device *core, u16 offset,

				  u32 value)

{

	if (WARN_ONCE(!core->io_wrap, "Accessed core has no wrapper/agent\n"))

		return;

	writel(value, core->io_wrap + offset);

}

drivers/bcma/scan.c

+7 −4
Original line number Diff line number Diff line
@@ -421,12 +421,15 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr, 
		core->io_addr = ioremap_nocache(core->addr, BCMA_CORE_SIZE);

		if (!core->io_addr)

			return -ENOMEM;

		core->io_wrap = ioremap_nocache(core->wrap, BCMA_CORE_SIZE);

		if (core->wrap) {

			core->io_wrap = ioremap_nocache(core->wrap,

							BCMA_CORE_SIZE);

			if (!core->io_wrap) {

				iounmap(core->io_addr);

				return -ENOMEM;

			}

		}

	}

	return 0;

}

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x04CA, 0x300b) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0930, 0x0220) },

	{ USB_DEVICE(0x0930, 0x0227) },

	{ USB_DEVICE(0x0b05, 0x17d0) },

	{ USB_DEVICE(0x0CF3, 0x0036) },

	{ USB_DEVICE(0x0CF3, 0x3004) },
@@ -138,6 +139,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

CRA Git | Maintained and supported by SUSTech CRA and CCSE