Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull more networking updates from David Miller: "Ok, everything from here on out will be bug fixes." 1) One final sync of wireless and bluetooth stuff from John Linville. These changes have all been in his tree for more than a week, and therefore have had the necessary -next exposure. John was just away on a trip and didn't have a change to send the pull request until a day or two ago. 2) Put back some defines in user exposed header file areas that were removed during the tokenring purge. From Stephen Hemminger and Paul Gortmaker. 3) A bug fix for UDP hash table allocation got lost in the pile due to one of those "you got it.. no I've got it.." situations. :-) From Tim Bird. 4) SKB coalescing in TCP needs to have stricter checks, otherwise we'll try to coalesce overlapping frags and crash. Fix from Eric Dumazet. 5) RCU routing table lookups can race with free_fib_info(), causing crashes when we deref the device pointers in the route. Fix by releasing the net device in the RCU callback. From Yanmin Zhang. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (293 commits) tcp: take care of overlaps in tcp_try_coalesce() ipv4: fix the rcu race between free_fib_info and ip_route_output_slow mm: add a low limit to alloc_large_system_hash ipx: restore token ring define to include/linux/ipx.h if: restore token ring ARP type to header xen: do not disable netfront in dom0 phy/micrel: Fix ID of KSZ9021 mISDN: Add X-Tensions USB ISDN TA XC-525 gianfar:don't add FCB length to hard_header_len Bluetooth: Report proper error number in disconnection Bluetooth: Create flags for bt_sk() Bluetooth: report the right security level in getsockopt Bluetooth: Lock the L2CAP channel when sending Bluetooth: Restore locking semantics when looking up L2CAP channels Bluetooth: Fix a redundant and problematic incoming MTU check Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C Bluetooth: Fix EIR data generation for mgmt_device_found Bluetooth: Fix Inquiry with RSSI event mask Bluetooth: improve readability of l2cap_seq_list code Bluetooth: Fix skb length calculation ...

Linus Torvalds committed 14 years ago

Commit 28f3d712 parents 654443e 1ca7ee3189 files · +6665 −5539Browse files

Unified · Split

189 files

Documentation/feature-removal-schedule.txt +12 −0
Documentation/nfc/nfc-hci.txt +35 −10
arch/mips/bcm47xx/setup.c +7 −8
arch/mips/bcm47xx/sprom.c +26 −2
arch/mips/include/asm/mach-bcm47xx/bcm47xx.h +9 −0
drivers/bcma/core.c +2 −1
drivers/bcma/driver_pci.c +51 −2
drivers/bcma/driver_pci_host.c +5 −5
drivers/bcma/host_pci.c +5 −2
drivers/bcma/scan.c +40 −14
drivers/bcma/sprom.c +148 −1
drivers/bluetooth/ath3k.c +6 −0
drivers/bluetooth/btmrvl_drv.h +3 −0
drivers/bluetooth/btmrvl_main.c +33 −23
drivers/bluetooth/btmrvl_sdio.c +105 −7
drivers/bluetooth/btusb.c +14 −2
drivers/bluetooth/hci_ldisc.c +1 −1
drivers/bluetooth/hci_vhci.c +2 −1
drivers/isdn/hardware/mISDN/hfcsusb.h +6 −0
drivers/net/ethernet/freescale/gianfar.c +1 −1
drivers/net/wireless/ath/ath6kl/cfg80211.c +167 −71
drivers/net/wireless/ath/ath6kl/cfg80211.h +2 −0
drivers/net/wireless/ath/ath6kl/core.h +24 −9
drivers/net/wireless/ath/ath6kl/debug.c +11 −1
drivers/net/wireless/ath/ath6kl/htc_mbox.c +28 −17
drivers/net/wireless/ath/ath6kl/htc_pipe.c +3 −8
drivers/net/wireless/ath/ath6kl/init.c +24 −5
drivers/net/wireless/ath/ath6kl/main.c +88 −16
drivers/net/wireless/ath/ath6kl/sdio.c +11 −6
drivers/net/wireless/ath/ath6kl/txrx.c +4 −8
drivers/net/wireless/ath/ath6kl/usb.c +12 −0
drivers/net/wireless/ath/ath6kl/wmi.c +57 −37
drivers/net/wireless/ath/ath6kl/wmi.h +24 −0
drivers/net/wireless/ath/ath9k/ar9003_calib.c +10 −40
drivers/net/wireless/ath/ath9k/ar9003_mci.c +1 −1
drivers/net/wireless/ath/ath9k/ar9003_rtt.c +69 −15
drivers/net/wireless/ath/ath9k/ar9003_rtt.h +3 −2
drivers/net/wireless/ath/ath9k/hw.c +4 −5
drivers/net/wireless/ath/ath9k/hw.h +2 −7
drivers/net/wireless/b43/bus.c +2 −4
drivers/net/wireless/b43/dma.c +1 −1
drivers/net/wireless/b43/main.c +2 −2
drivers/net/wireless/b43legacy/main.c +1 −3
drivers/net/wireless/b43legacy/phy.c +2 −2
drivers/net/wireless/b43legacy/radio.c +5 −5
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +117 −127
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +3 −29
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +147 −203
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c +138 −127
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h +11 −26
drivers/net/wireless/brcm80211/brcmsmac/Makefile +0 −3
drivers/net/wireless/brcm80211/brcmsmac/aiutils.c +39 −440
drivers/net/wireless/brcm80211/brcmsmac/aiutils.h +0 −24
drivers/net/wireless/brcm80211/brcmsmac/antsel.c +8 −8
drivers/net/wireless/brcm80211/brcmsmac/channel.c +3 −4
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +5 −6
drivers/net/wireless/brcm80211/brcmsmac/main.c +60 −82
drivers/net/wireless/brcm80211/brcmsmac/nicpci.c +0 −826
drivers/net/wireless/brcm80211/brcmsmac/nicpci.h +0 −77
drivers/net/wireless/brcm80211/brcmsmac/otp.c +0 −410
drivers/net/wireless/brcm80211/brcmsmac/otp.h +0 −36
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c +25 −42
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c +108 −225
drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c +0 −9
drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h +0 −3
drivers/net/wireless/brcm80211/brcmsmac/pub.h +0 −228
drivers/net/wireless/brcm80211/brcmsmac/srom.c +0 −980
drivers/net/wireless/brcm80211/brcmsmac/srom.h +0 −29
drivers/net/wireless/brcm80211/brcmsmac/stf.c +4 −2
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +33 −2
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +4 −0
drivers/net/wireless/iwlwifi/iwl-agn-tx.c +12 −7
drivers/net/wireless/iwlwifi/iwl-agn.c +1 −1
drivers/net/wireless/iwlwifi/iwl-commands.h +6 −1
drivers/net/wireless/iwlwifi/iwl-mac80211.c +3 −2
drivers/net/wireless/iwlwifi/iwl-power.c +6 −2
drivers/net/wireless/iwlwifi/iwl-scan.c +38 −14
drivers/net/wireless/mac80211_hwsim.c +5 −0
drivers/net/wireless/mwifiex/Makefile +2 −0
drivers/net/wireless/mwifiex/cfg80211.c +351 −147
drivers/net/wireless/mwifiex/cfg80211.h +1 −1
drivers/net/wireless/mwifiex/cmdevt.c +19 −2
drivers/net/wireless/mwifiex/decl.h +12 −1
drivers/net/wireless/mwifiex/fw.h +158 −1
drivers/net/wireless/mwifiex/ie.c +396 −0
drivers/net/wireless/mwifiex/init.c +1 −0
drivers/net/wireless/mwifiex/ioctl.h +32 −0
drivers/net/wireless/mwifiex/join.c +16 −10
drivers/net/wireless/mwifiex/main.c +36 −21
drivers/net/wireless/mwifiex/main.h +24 −2
drivers/net/wireless/mwifiex/sta_cmd.c +47 −22
drivers/net/wireless/mwifiex/sta_cmdresp.c +8 −0
drivers/net/wireless/mwifiex/sta_event.c +50 −1
drivers/net/wireless/mwifiex/sta_ioctl.c +7 −2
drivers/net/wireless/mwifiex/uap_cmd.c +432 −0
drivers/net/wireless/mwifiex/wmm.c +4 −0
drivers/net/wireless/rndis_wlan.c +0 −14
drivers/net/wireless/rt2x00/rt2800pci.c +1 −0
drivers/net/wireless/ti/wl12xx/Kconfig +1 −0
drivers/net/wireless/ti/wlcore/Kconfig +1 −1
drivers/net/wireless/ti/wlcore/acx.c +80 −0
drivers/net/wireless/ti/wlcore/acx.h +30 −0
drivers/net/wireless/ti/wlcore/boot.c +2 −1
drivers/net/wireless/ti/wlcore/cmd.c +5 −3
drivers/net/wireless/ti/wlcore/event.c +12 −17
drivers/net/wireless/ti/wlcore/main.c +315 −8
drivers/net/wireless/ti/wlcore/rx.c +36 −0
drivers/net/wireless/ti/wlcore/rx.h +4 −0
drivers/net/wireless/ti/wlcore/wl12xx.h +41 −0
drivers/net/wireless/ti/wlcore/wlcore.h +6 −0
drivers/net/xen-netfront.c +0 −6
drivers/nfc/Kconfig +13 −0
drivers/nfc/Makefile +1 −0
drivers/nfc/pn533.c +8 −11
drivers/nfc/pn544_hci.c +947 −0
drivers/ssb/b43_pci_bridge.c +2 −0
drivers/ssb/pci.c +82 −6
fs/dcache.c +2 −0
fs/inode.c +2 −0
include/linux/Kbuild +1 −0
include/linux/bcma/bcma.h +7 −0
include/linux/bcma/bcma_driver_pci.h +11 −0
include/linux/bootmem.h +2 −1
include/linux/if_arp.h +1 −1
include/linux/ipx.h +1 −1
include/linux/micrel_phy.h +1 −1
include/linux/nfc/pn544.h +7 −0
include/linux/nl80211.h +5 −3
include/linux/ssb/ssb.h +0 −1
include/linux/ssb/ssb_regs.h +57 −4
include/net/bluetooth/bluetooth.h +24 −8
include/net/bluetooth/hci.h +7 −1
include/net/bluetooth/hci_core.h +36 −31
include/net/bluetooth/l2cap.h +79 −14
include/net/bluetooth/mgmt.h +9 −0
include/net/bluetooth/smp.h +1 −1
include/net/cfg80211.h +3 −3
include/net/mac80211.h +11 −1
include/net/nfc/hci.h +2 −4
include/net/nfc/nfc.h +10 −9
include/net/nfc/shdlc.h +2 −0
kernel/pid.c +2 −1
mm/page_alloc.c +5 −2
net/bluetooth/af_bluetooth.c +4 −4
net/bluetooth/bnep/core.c +1 −1
net/bluetooth/hci_conn.c +11 −45
net/bluetooth/hci_core.c +107 −160
net/bluetooth/hci_event.c +54 −21
net/bluetooth/hci_sysfs.c +2 −3
net/bluetooth/l2cap_core.c +538 −224
net/bluetooth/l2cap_sock.c +46 −30
net/bluetooth/mgmt.c +172 −114
net/bluetooth/rfcomm/sock.c +10 −4
net/bluetooth/sco.c +44 −31
net/bluetooth/smp.c +1 −1
net/ipv4/fib_semantics.c +6 −6
net/ipv4/route.c +1 −0
net/ipv4/tcp.c +2 −0
net/ipv4/tcp_input.c +5 −0
net/ipv4/udp.c +10 −20
net/mac80211/agg-tx.c +8 −2
net/mac80211/debugfs_netdev.c +2 −0
net/mac80211/ibss.c +5 −0
net/mac80211/iface.c +3 −1
net/mac80211/main.c +3 −0
net/mac80211/mesh.c +4 −2
net/mac80211/mesh_hwmp.c +4 −1
net/mac80211/mesh_plink.c +33 −32
net/mac80211/rx.c +3 −3
net/mac80211/wep.c +12 −3
net/mac80211/wpa.c +9 −1
net/nfc/core.c +85 −27
net/nfc/hci/Kconfig +1 −0
net/nfc/hci/core.c +23 −55
net/nfc/hci/shdlc.c +12 −0
net/nfc/llcp/commands.c +2 −2
net/nfc/llcp/llcp.c +7 −0
net/nfc/llcp/sock.c +55 −2
net/nfc/nci/core.c +14 −13
net/nfc/nci/data.c +4 −4
net/nfc/nci/lib.c +1 −0
net/nfc/nci/ntf.c +1 −1
net/nfc/netlink.c +3 −3
net/nfc/nfc.h +1 −1
net/wireless/chan.c +1 −1
net/wireless/core.c +2 −2
net/wireless/core.h +0 −2
net/wireless/nl80211.c +37 −32
net/wireless/util.c +1 −1

Documentation/feature-removal-schedule.txt+12−0

@@ -541,6 +541,18 @@ Who: Kees Cook <keescook@chromium.org> · 540 unmodified lines
541	541
542	542	----------------------------
543	543
	544	+What: Removing the pn544 raw driver.
	545	+When: 3.6
	546	+Why: With the introduction of the NFC HCI and SHDL kernel layers, pn544.c
	547	+ is being replaced by pn544_hci.c which is accessible through the netlink
	548	+ and socket NFC APIs. Moreover, pn544.c is outdated and does not seem to
	549	+ work properly with the latest Android stacks.
	550	+ Having 2 drivers for the same hardware is confusing and as such we
	551	+ should only keep the one following the kernel NFC APIs.
	552	+Who: Samuel Ortiz <sameo@linux.intel.com>
	553	+
	554	+----------------------------
	555	+
544	556	What: setitimer accepts user NULL pointer (value)
545	557	When: 3.6
546	558	Why: setitimer is not returning -EFAULT if user pointer is NULL. This

Documentation/nfc/nfc-hci.txt+35−10

@@ -22,9 +22,9 @@ response to arrive. · 21 unmodified lines
22	22	HCI events can also be received from the host controller. They will be handled
23	23	and a translation will be forwarded to NFC Core as needed.
24	24	HCI uses 2 execution contexts:
25		−- one if for executing commands : nfc_hci_msg_tx_work(). Only one command
	25	+- one for executing commands : nfc_hci_msg_tx_work(). Only one command
26	26	can be executing at any given moment.
27		−- one if for dispatching received events and responses : nfc_hci_msg_rx_work()
	27	+- one for dispatching received events and commands : nfc_hci_msg_rx_work().
28	28
29	29	HCI Session initialization:
30	30	---------------------------
@@ -52,18 +52,42 @@ entry points: · 21 unmodified lines
52	52	struct nfc_hci_ops {
53	53	int (open)(struct nfc_hci_dev hdev);
54	54	void (close)(struct nfc_hci_dev hdev);
	55	+ int (hci_ready) (struct nfc_hci_dev hdev);
55	56	int (xmit)(struct nfc_hci_dev hdev, struct sk_buff *skb);
56	57	int (start_poll)(struct nfc_hci_dev hdev, u32 protocols);
57	58	int (target_from_gate)(struct nfc_hci_dev hdev, u8 gate,
58	59	struct nfc_target *target);
	60	+ int (complete_target_discovered) (struct nfc_hci_dev hdev, u8 gate,
	61	+ struct nfc_target *target);
	62	+ int (data_exchange) (struct nfc_hci_dev hdev,
	63	+ struct nfc_target *target,
	64	+ struct sk_buff skb, struct sk_buff *res_skb);
	65	+ int (check_presence)(struct nfc_hci_dev hdev,
	66	+ struct nfc_target *target);
59	67	};
60	68
61		−open() and close() shall turn the hardware on and off. xmit() shall simply
62		−write a frame to the chip. start_poll() is an optional entrypoint that shall
63		−set the hardware in polling mode. This must be implemented only if the hardware
64		−uses proprietary gates or a mechanism slightly different from the HCI standard.
65		−target_from_gate() is another optional entrypoint to return the protocols
	69	+- open() and close() shall turn the hardware on and off.
	70	+- hci_ready() is an optional entry point that is called right after the hci
	71	+session has been set up. The driver can use it to do additional initialization
	72	+that must be performed using HCI commands.
	73	+- xmit() shall simply write a frame to the chip.
	74	+- start_poll() is an optional entrypoint that shall set the hardware in polling
	75	+mode. This must be implemented only if the hardware uses proprietary gates or a
	76	+mechanism slightly different from the HCI standard.
	77	+- target_from_gate() is an optional entrypoint to return the nfc protocols
66	78	corresponding to a proprietary gate.
	79	+- complete_target_discovered() is an optional entry point to let the driver
	80	+perform additional proprietary processing necessary to auto activate the
	81	+discovered target.
	82	+- data_exchange() must be implemented by the driver if proprietary HCI commands
	83	+are required to send data to the tag. Some tag types will require custom
	84	+commands, others can be written to using the standard HCI commands. The driver
	85	+can check the tag type and either do proprietary processing, or return 1 to ask
	86	+for standard processing.
	87	+- check_presence() is an optional entry point that will be called regularly
	88	+by the core to check that an activated tag is still in the field. If this is
	89	+not implemented, the core will not be able to push tag_lost events to the user
	90	+space
67	91
68	92	On the rx path, the driver is responsible to push incoming HCP frames to HCI
69	93	using nfc_hci_recv_frame(). HCI will take care of re-aggregation and handling
@@ -99,7 +123,8 @@ fast, cannot sleep. stores incoming frames into an shdlc rx queue · 29 unmodified lines
99	123	handles shdlc rx & tx queues. Dispatches HCI cmd responses.
100	124
101	125	- HCI Tx Cmd worker (MSGTXWQ)
102		−Serialize execution of HCI commands. Complete execution in case of resp timeout.
	126	+Serializes execution of HCI commands. Completes execution in case of response
	127	+timeout.
103	128
104	129	- HCI Rx worker (MSGRXWQ)
105	130	Dispatches incoming HCI commands or events.
@@ -133,11 +158,11 @@ able to complete the command with a timeout error if no response arrive. · 27 unmodified lines
133	158	SMW context gets scheduled and invokes nfc_shdlc_sm_work(). This function
134	159	handles shdlc framing in and out. It uses the driver xmit to send frames and
135	160	receives incoming frames in an skb queue filled from the driver IRQ handler.
136		−SHDLC I(nformation) frames payload are HCP fragments. They are agregated to
	161	+SHDLC I(nformation) frames payload are HCP fragments. They are aggregated to
137	162	form complete HCI frames, which can be a response, command, or event.
138	163
139	164	HCI Responses are dispatched immediately from this context to unblock
140		−waiting command execution. Reponse processing involves invoking the completion
	165	+waiting command execution. Response processing involves invoking the completion
141	166	callback that was provided by nfc_hci_msg_tx_work() when it sent the command.
142	167	The completion callback will then wake the syscall context.
143	168

arch/mips/bcm47xx/setup.c+7−8

@@ -90,6 +90,7 @@ static int bcm47xx_get_sprom_ssb(struct ssb_bus bus, struct ssb_sprom out) · 89 unmodified lines
90	90	char prefix[10];
91	91
92	92	if (bus->bustype == SSB_BUSTYPE_PCI) {
	93	+ memset(out, 0, sizeof(struct ssb_sprom));
93	94	snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
94	95	bus->host_pci->bus->number + 1,
95	96	PCI_SLOT(bus->host_pci->devfn));
@@ -109,15 +110,9 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus, · 13 unmodified lines
109	110	/* Fill boardinfo structure */
110	111	memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));
111	112
112		− if (nvram_getenv("boardvendor", buf, sizeof(buf)) >= 0)
113		− iv->boardinfo.vendor = (u16)simple_strtoul(buf, NULL, 0);
114		− else
115		− iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;
116		− if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0)
117		− iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
118		− if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)
119		− iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
	113	+ bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);
120	114
	115	+ memset(&iv->sprom, 0, sizeof(struct ssb_sprom));
121	116	bcm47xx_fill_sprom(&iv->sprom, NULL);
122	117
123	118	if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
@@ -166,12 +161,14 @@ static int bcm47xx_get_sprom_bcma(struct bcma_bus bus, struct ssb_sprom out) · 42 unmodified lines
166	161
167	162	switch (bus->hosttype) {
168	163	case BCMA_HOSTTYPE_PCI:
	164	+ memset(out, 0, sizeof(struct ssb_sprom));
169	165	snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
170	166	bus->host_pci->bus->number + 1,
171	167	PCI_SLOT(bus->host_pci->devfn));
172	168	bcm47xx_fill_sprom(out, prefix);
173	169	return 0;
174	170	case BCMA_HOSTTYPE_SOC:
	171	+ memset(out, 0, sizeof(struct ssb_sprom));
175	172	bcm47xx_fill_sprom_ethernet(out, NULL);
176	173	core = bcma_find_core(bus, BCMA_CORE_80211);
177	174	if (core) {
@@ -197,6 +194,8 @@ static void __init bcm47xx_register_bcma(void) · 19 unmodified lines
197	194	err = bcma_host_soc_register(&bcm47xx_bus.bcma);
198	195	if (err)
199	196	panic("Failed to initialize BCMA bus (err %d)", err);
	197	+
	198	+ bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
200	199	}
201	200	#endif
202	201

arch/mips/bcm47xx/sprom.c+26−2

@@ -165,6 +165,8 @@ static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom, · 164 unmodified lines
165	165	const char *prefix)
166	166	{
167	167	nvram_read_u16(prefix, NULL, "boardrev", &sprom->board_rev, 0);
	168	+ if (!sprom->board_rev)
	169	+ nvram_read_u16(NULL, NULL, "boardrev", &sprom->board_rev, 0);
168	170	nvram_read_u16(prefix, NULL, "boardnum", &sprom->board_num, 0);
169	171	nvram_read_u8(prefix, NULL, "ledbh0", &sprom->gpio0, 0xff);
170	172	nvram_read_u8(prefix, NULL, "ledbh1", &sprom->gpio1, 0xff);
@@ -555,8 +557,6 @@ void bcm47xx_fill_sprom_ethernet(struct ssb_sprom sprom, const char prefix) · 384 unmodified lines
555	557
556	558	void bcm47xx_fill_sprom(struct ssb_sprom sprom, const char prefix)
557	559	{
558		− memset(sprom, 0, sizeof(struct ssb_sprom));
559		−
560	560	bcm47xx_fill_sprom_ethernet(sprom, prefix);
561	561
562	562	nvram_read_u8(prefix, NULL, "sromrev", &sprom->revision, 0);
@@ -618,3 +618,27 @@ void bcm47xx_fill_sprom(struct ssb_sprom sprom, const char prefix) · 55 unmodified lines
618	618	bcm47xx_fill_sprom_r1(sprom, prefix);
619	619	}
620	620	}
	621	+
	622	+#ifdef CONFIG_BCM47XX_SSB
	623	+void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
	624	+ const char *prefix)
	625	+{
	626	+ nvram_read_u16(prefix, NULL, "boardvendor", &boardinfo->vendor, 0);
	627	+ if (!boardinfo->vendor)
	628	+ boardinfo->vendor = SSB_BOARDVENDOR_BCM;
	629	+
	630	+ nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0);
	631	+}
	632	+#endif
	633	+
	634	+#ifdef CONFIG_BCM47XX_BCMA
	635	+void bcm47xx_fill_bcma_boardinfo(struct bcma_boardinfo *boardinfo,
	636	+ const char *prefix)
	637	+{
	638	+ nvram_read_u16(prefix, NULL, "boardvendor", &boardinfo->vendor, 0);
	639	+ if (!boardinfo->vendor)
	640	+ boardinfo->vendor = SSB_BOARDVENDOR_BCM;
	641	+
	642	+ nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0);
	643	+}
	644	+#endif

arch/mips/include/asm/mach-bcm47xx/bcm47xx.h+9−0

@@ -47,4 +47,13 @@ extern enum bcm47xx_bus_type bcm47xx_bus_type; · 46 unmodified lines
47	47	void bcm47xx_fill_sprom(struct ssb_sprom sprom, const char prefix);
48	48	void bcm47xx_fill_sprom_ethernet(struct ssb_sprom sprom, const char prefix);
49	49
	50	+#ifdef CONFIG_BCM47XX_SSB
	51	+void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
	52	+ const char *prefix);
	53	+#endif
	54	+#ifdef CONFIG_BCM47XX_BCMA
	55	+void bcm47xx_fill_bcma_boardinfo(struct bcma_boardinfo *boardinfo,
	56	+ const char *prefix);
	57	+#endif
	58	+
50	59	#endif /* __ASM_BCM47XX_H */

drivers/bcma/core.c+2−1

@@ -30,6 +30,7 @@ void bcma_core_disable(struct bcma_device *core, u32 flags) · 29 unmodified lines
30	30	udelay(10);
31	31
32	32	bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);
	33	+ bcma_aread32(core, BCMA_RESET_CTL);
33	34	udelay(1);
34	35	}
35	36	EXPORT_SYMBOL_GPL(bcma_core_disable);
@@ -77,7 +78,7 @@ void bcma_core_set_clockmode(struct bcma_device *core, · 41 unmodified lines
77	78	pr_err("HT force timeout\n");
78	79	break;
79	80	case BCMA_CLKMODE_DYNAMIC:
80		− pr_warn("Dynamic clockmode not supported yet!\n");
	81	+ bcma_set32(core, BCMA_CLKCTLST, ~BCMA_CLKCTLST_FORCEHT);
81	82	break;
82	83	}
83	84	}

drivers/bcma/driver_pci.c+51−2

@@ -24,14 +24,12 @@ u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address) · 23 unmodified lines
24	24	return pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_DATA);
25	25	}
26	26
27		−#if 0
28	27	static void bcma_pcie_write(struct bcma_drv_pci *pc, u32 address, u32 data)
29	28	{
30	29	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_ADDR, address);
31	30	pcicore_read32(pc, BCMA_CORE_PCI_PCIEIND_ADDR);
32	31	pcicore_write32(pc, BCMA_CORE_PCI_PCIEIND_DATA, data);
33	32	}
34		−#endif
35	33
36	34	static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u8 phy)
37	35	{
@@ -170,13 +168,50 @@ static void bcma_pcicore_serdes_workaround(struct bcma_drv_pci *pc) · 132 unmodified lines
170	168	tmp & ~BCMA_CORE_PCI_PLL_CTRL_FREQDET_EN);
171	169	}
172	170
	171	+static void bcma_core_pci_fixcfg(struct bcma_drv_pci *pc)
	172	+{
	173	+ struct bcma_device *core = pc->core;
	174	+ u16 val16, core_index;
	175	+ uint regoff;
	176	+
	177	+ regoff = BCMA_CORE_PCI_SPROM(BCMA_CORE_PCI_SPROM_PI_OFFSET);
	178	+ core_index = (u16)core->core_index;
	179	+
	180	+ val16 = pcicore_read16(pc, regoff);
	181	+ if (((val16 & BCMA_CORE_PCI_SPROM_PI_MASK) >> BCMA_CORE_PCI_SPROM_PI_SHIFT)
	182	+ != core_index) {
	183	+ val16 = (core_index << BCMA_CORE_PCI_SPROM_PI_SHIFT) \|
	184	+ (val16 & ~BCMA_CORE_PCI_SPROM_PI_MASK);
	185	+ pcicore_write16(pc, regoff, val16);
	186	+ }
	187	+}
	188	+
	189	+/* Fix MISC config to allow coming out of L2/L3-Ready state w/o PRST */
	190	+/* Needs to happen when coming out of 'standby'/'hibernate' */
	191	+static void bcma_core_pci_config_fixup(struct bcma_drv_pci *pc)
	192	+{
	193	+ u16 val16;
	194	+ uint regoff;
	195	+
	196	+ regoff = BCMA_CORE_PCI_SPROM(BCMA_CORE_PCI_SPROM_MISC_CONFIG);
	197	+
	198	+ val16 = pcicore_read16(pc, regoff);
	199	+
	200	+ if (!(val16 & BCMA_CORE_PCI_SPROM_L23READY_EXIT_NOPERST)) {
	201	+ val16 \|= BCMA_CORE_PCI_SPROM_L23READY_EXIT_NOPERST;
	202	+ pcicore_write16(pc, regoff, val16);
	203	+ }
	204	+}
	205	+
173	206	/**************************************************
174	207	* Init.
175	208	**************************************************/
176	209
177	210	static void __devinit bcma_core_pci_clientmode_init(struct bcma_drv_pci *pc)
178	211	{
	212	+ bcma_core_pci_fixcfg(pc);
179	213	bcma_pcicore_serdes_workaround(pc);
	214	+ bcma_core_pci_config_fixup(pc);
180	215	}
181	216
182	217	void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc)
@@ -224,3 +259,17 @@ out: · 41 unmodified lines
224	259	return err;
225	260	}
226	261	EXPORT_SYMBOL_GPL(bcma_core_pci_irq_ctl);
	262	+
	263	+void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend)
	264	+{
	265	+ u32 w;
	266	+
	267	+ w = bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG);
	268	+ if (extend)
	269	+ w \|= BCMA_CORE_PCI_ASPMTIMER_EXTEND;
	270	+ else
	271	+ w &= ~BCMA_CORE_PCI_ASPMTIMER_EXTEND;
	272	+ bcma_pcie_write(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG, w);
	273	+ bcma_pcie_read(pc, BCMA_CORE_PCI_DLLP_PMTHRESHREG);
	274	+}
	275	+EXPORT_SYMBOL_GPL(bcma_core_pci_extend_L1timer);

drivers/bcma/driver_pci_host.c+5−5

@@ -119,7 +119,7 @@ static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev, · 118 unmodified lines
119	119	if (unlikely(!addr))
120	120	goto out;
121	121	err = -ENOMEM;
122		− mmio = ioremap_nocache(addr, len);
	122	+ mmio = ioremap_nocache(addr, sizeof(val));
123	123	if (!mmio)
124	124	goto out;
125	125
@@ -171,7 +171,7 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev, · 45 unmodified lines
171	171	addr = pc->core->addr + BCMA_CORE_PCI_PCICFG0;
172	172	addr \|= (func << 8);
173	173	addr \|= (off & 0xfc);
174		− mmio = ioremap_nocache(addr, len);
	174	+ mmio = ioremap_nocache(addr, sizeof(val));
175	175	if (!mmio)
176	176	goto out;
177	177	}
@@ -180,7 +180,7 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev, · 2 unmodified lines
180	180	if (unlikely(!addr))
181	181	goto out;
182	182	err = -ENOMEM;
183		− mmio = ioremap_nocache(addr, len);
	183	+ mmio = ioremap_nocache(addr, sizeof(val));
184	184	if (!mmio)
185	185	goto out;
186	186
@@ -491,8 +491,8 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) · 304 unmodified lines
491	491	/* Ok, ready to run, register it to the system.
492	492	* The following needs change, if we want to port hostmode
493	493	* to non-MIPS platform. */
494		− io_map_base = (unsigned long)ioremap_nocache(BCMA_SOC_PCI_MEM,
495		− 0x04000000);
	494	+ io_map_base = (unsigned long)ioremap_nocache(pc_host->mem_resource.start,
	495	+ resource_size(&pc_host->mem_resource));
496	496	pc_host->pci_controller.io_map_base = io_map_base;
497	497	set_io_port_base(pc_host->pci_controller.io_map_base);
498	498	/* Give some time to the PCI controller to configure itself with the new

drivers/bcma/host_pci.c+5−2

@@ -201,6 +201,9 @@ static int __devinit bcma_host_pci_probe(struct pci_dev *dev, · 200 unmodified lines
201	201	bus->hosttype = BCMA_HOSTTYPE_PCI;
202	202	bus->ops = &bcma_host_pci_ops;
203	203
	204	+ bus->boardinfo.vendor = bus->host_pci->subsystem_vendor;
	205	+ bus->boardinfo.type = bus->host_pci->subsystem_device;
	206	+
204	207	/* Register */
205	208	err = bcma_bus_register(bus);
206	209	if (err)
@@ -222,7 +225,7 @@ err_kfree_bus: · 15 unmodified lines
222	225	return err;
223	226	}
224	227
225		−static void bcma_host_pci_remove(struct pci_dev *dev)
	228	+static void __devexit bcma_host_pci_remove(struct pci_dev *dev)
226	229	{
227	230	struct bcma_bus *bus = pci_get_drvdata(dev);
228	231
@@ -277,7 +280,7 @@ static struct pci_driver bcma_pci_bridge_driver = { · 48 unmodified lines
277	280	.name = "bcma-pci-bridge",
278	281	.id_table = bcma_pci_bridge_tbl,
279	282	.probe = bcma_host_pci_probe,
280		− .remove = bcma_host_pci_remove,
	283	+ .remove = __devexit_p(bcma_host_pci_remove),
281	284	.driver.pm = BCMA_PM_OPS,
282	285	};
283	286

drivers/bcma/scan.c+40−14

@@ -19,7 +19,14 @@ struct bcma_device_id_name { · 18 unmodified lines
19	19	u16 id;
20	20	const char *name;
21	21	};
22		−struct bcma_device_id_name bcma_device_names[] = {
	22	+
	23	+static const struct bcma_device_id_name bcma_arm_device_names[] = {
	24	+ { BCMA_CORE_ARM_1176, "ARM 1176" },
	25	+ { BCMA_CORE_ARM_7TDMI, "ARM 7TDMI" },
	26	+ { BCMA_CORE_ARM_CM3, "ARM CM3" },
	27	+};
	28	+
	29	+static const struct bcma_device_id_name bcma_bcm_device_names[] = {
23	30	{ BCMA_CORE_OOB_ROUTER, "OOB Router" },
24	31	{ BCMA_CORE_INVALID, "Invalid" },
25	32	{ BCMA_CORE_CHIPCOMMON, "ChipCommon" },
@@ -27,7 +34,6 @@ struct bcma_device_id_name bcma_device_names[] = { · 1 unmodified line
27	34	{ BCMA_CORE_SRAM, "SRAM" },
28	35	{ BCMA_CORE_SDRAM, "SDRAM" },
29	36	{ BCMA_CORE_PCI, "PCI" },
30		− { BCMA_CORE_MIPS, "MIPS" },
31	37	{ BCMA_CORE_ETHERNET, "Fast Ethernet" },
32	38	{ BCMA_CORE_V90, "V90" },
33	39	{ BCMA_CORE_USB11_HOSTDEV, "USB 1.1 Hostdev" },
@@ -44,7 +50,6 @@ struct bcma_device_id_name bcma_device_names[] = { · 10 unmodified lines
44	50	{ BCMA_CORE_PHY_A, "PHY A" },
45	51	{ BCMA_CORE_PHY_B, "PHY B" },
46	52	{ BCMA_CORE_PHY_G, "PHY G" },
47		− { BCMA_CORE_MIPS_3302, "MIPS 3302" },
48	53	{ BCMA_CORE_USB11_HOST, "USB 1.1 Host" },
49	54	{ BCMA_CORE_USB11_DEV, "USB 1.1 Device" },
50	55	{ BCMA_CORE_USB20_HOST, "USB 2.0 Host" },
@@ -58,15 +63,11 @@ struct bcma_device_id_name bcma_device_names[] = { · 7 unmodified lines
58	63	{ BCMA_CORE_PHY_N, "PHY N" },
59	64	{ BCMA_CORE_SRAM_CTL, "SRAM Controller" },
60	65	{ BCMA_CORE_MINI_MACPHY, "Mini MACPHY" },
61		− { BCMA_CORE_ARM_1176, "ARM 1176" },
62		− { BCMA_CORE_ARM_7TDMI, "ARM 7TDMI" },
63	66	{ BCMA_CORE_PHY_LP, "PHY LP" },
64	67	{ BCMA_CORE_PMU, "PMU" },
65	68	{ BCMA_CORE_PHY_SSN, "PHY SSN" },
66	69	{ BCMA_CORE_SDIO_DEV, "SDIO Device" },
67		− { BCMA_CORE_ARM_CM3, "ARM CM3" },
68	70	{ BCMA_CORE_PHY_HT, "PHY HT" },
69		− { BCMA_CORE_MIPS_74K, "MIPS 74K" },
70	71	{ BCMA_CORE_MAC_GBIT, "GBit MAC" },
71	72	{ BCMA_CORE_DDR12_MEM_CTL, "DDR1/DDR2 Memory Controller" },
72	73	{ BCMA_CORE_PCIE_RC, "PCIe Root Complex" },
@@ -79,16 +80,41 @@ struct bcma_device_id_name bcma_device_names[] = { · 6 unmodified lines
79	80	{ BCMA_CORE_SHIM, "SHIM" },
80	81	{ BCMA_CORE_DEFAULT, "Default" },
81	82	};
82		−const char bcma_device_name(struct bcma_device_id id)
	83	+
	84	+static const struct bcma_device_id_name bcma_mips_device_names[] = {
	85	+ { BCMA_CORE_MIPS, "MIPS" },
	86	+ { BCMA_CORE_MIPS_3302, "MIPS 3302" },
	87	+ { BCMA_CORE_MIPS_74K, "MIPS 74K" },
	88	+};
	89	+
	90	+static const char bcma_device_name(const struct bcma_device_id id)
83	91	{
84		− int i;
	92	+ const struct bcma_device_id_name *names;
	93	+ int size, i;
	94	+
	95	+ /* search manufacturer specific names */
	96	+ switch (id->manuf) {
	97	+ case BCMA_MANUF_ARM:
	98	+ names = bcma_arm_device_names;
	99	+ size = ARRAY_SIZE(bcma_arm_device_names);
	100	+ break;
	101	+ case BCMA_MANUF_BCM:
	102	+ names = bcma_bcm_device_names;
	103	+ size = ARRAY_SIZE(bcma_bcm_device_names);
	104	+ break;
	105	+ case BCMA_MANUF_MIPS:
	106	+ names = bcma_mips_device_names;
	107	+ size = ARRAY_SIZE(bcma_mips_device_names);
	108	+ break;
	109	+ default:
	110	+ return "UNKNOWN";
	111	+ }
85	112
86		− if (id->manuf == BCMA_MANUF_BCM) {
87		− for (i = 0; i < ARRAY_SIZE(bcma_device_names); i++) {
88		− if (bcma_device_names[i].id == id->id)
89		− return bcma_device_names[i].name;
90		− }
	113	+ for (i = 0; i < size; i++) {
	114	+ if (names[i].id == id->id)
	115	+ return names[i].name;
91	116	}
	117	+
92	118	return "UNKNOWN";
93	119	}
94	120

drivers/bcma/sprom.c+148−1

@@ -181,6 +181,22 @@ static int bcma_sprom_valid(const u16 *sprom) · 180 unmodified lines
181	181	#define SPEX(_field, _offset, _mask, _shift) \
182	182	bus->sprom._field = ((sprom[SPOFF(_offset)] & (_mask)) >> (_shift))
183	183
	184	+#define SPEX32(_field, _offset, _mask, _shift) \
	185	+ bus->sprom._field = ((((u32)sprom[SPOFF((_offset)+2)] << 16 \| \
	186	+ sprom[SPOFF(_offset)]) & (_mask)) >> (_shift))
	187	+
	188	+#define SPEX_ARRAY8(_field, _offset, _mask, _shift) \
	189	+ do { \
	190	+ SPEX(_field[0], _offset + 0, _mask, _shift); \
	191	+ SPEX(_field[1], _offset + 2, _mask, _shift); \
	192	+ SPEX(_field[2], _offset + 4, _mask, _shift); \
	193	+ SPEX(_field[3], _offset + 6, _mask, _shift); \
	194	+ SPEX(_field[4], _offset + 8, _mask, _shift); \
	195	+ SPEX(_field[5], _offset + 10, _mask, _shift); \
	196	+ SPEX(_field[6], _offset + 12, _mask, _shift); \
	197	+ SPEX(_field[7], _offset + 14, _mask, _shift); \
	198	+ } while (0)
	199	+
184	200	static void bcma_sprom_extract_r8(struct bcma_bus bus, const u16 sprom)
185	201	{
186	202	u16 v, o;
@@ -243,7 +259,8 @@ static void bcma_sprom_extract_r8(struct bcma_bus bus, const u16 sprom) · 56 unmodified lines
243	259	SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, ~0, 0);
244	260	SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, ~0, 0);
245	261
246		− SPEX(country_code, SSB_SPROM8_CCODE, ~0, 0);
	262	+ SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
	263	+ SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
247	264
248	265	/* Extract cores power info info */
249	266	for (i = 0; i < ARRAY_SIZE(pwr_info_offset); i++) {
@@ -298,6 +315,136 @@ static void bcma_sprom_extract_r8(struct bcma_bus bus, const u16 sprom) · 48 unmodified lines
298	315	SSB_SROM8_FEM_TR_ISO_SHIFT);
299	316	SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G, SSB_SROM8_FEM_ANTSWLUT,
300	317	SSB_SROM8_FEM_ANTSWLUT_SHIFT);
	318	+
	319	+ SPEX(ant_available_a, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_A,
	320	+ SSB_SPROM8_ANTAVAIL_A_SHIFT);
	321	+ SPEX(ant_available_bg, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_BG,
	322	+ SSB_SPROM8_ANTAVAIL_BG_SHIFT);
	323	+ SPEX(maxpwr_bg, SSB_SPROM8_MAXP_BG, SSB_SPROM8_MAXP_BG_MASK, 0);
	324	+ SPEX(itssi_bg, SSB_SPROM8_MAXP_BG, SSB_SPROM8_ITSSI_BG,
	325	+ SSB_SPROM8_ITSSI_BG_SHIFT);
	326	+ SPEX(maxpwr_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_MAXP_A_MASK, 0);
	327	+ SPEX(itssi_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_ITSSI_A,
	328	+ SSB_SPROM8_ITSSI_A_SHIFT);
	329	+ SPEX(maxpwr_ah, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AH_MASK, 0);
	330	+ SPEX(maxpwr_al, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AL_MASK,
	331	+ SSB_SPROM8_MAXP_AL_SHIFT);
	332	+ SPEX(gpio0, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P0, 0);
	333	+ SPEX(gpio1, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P1,
	334	+ SSB_SPROM8_GPIOA_P1_SHIFT);
	335	+ SPEX(gpio2, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P2, 0);
	336	+ SPEX(gpio3, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P3,
	337	+ SSB_SPROM8_GPIOB_P3_SHIFT);
	338	+ SPEX(tri2g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI2G, 0);
	339	+ SPEX(tri5g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI5G,
	340	+ SSB_SPROM8_TRI5G_SHIFT);
	341	+ SPEX(tri5gl, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GL, 0);
	342	+ SPEX(tri5gh, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GH,
	343	+ SSB_SPROM8_TRI5GH_SHIFT);
	344	+ SPEX(rxpo2g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO2G,
	345	+ SSB_SPROM8_RXPO2G_SHIFT);
	346	+ SPEX(rxpo5g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO5G,
	347	+ SSB_SPROM8_RXPO5G_SHIFT);
	348	+ SPEX(rssismf2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMF2G, 0);
	349	+ SPEX(rssismc2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMC2G,
	350	+ SSB_SPROM8_RSSISMC2G_SHIFT);
	351	+ SPEX(rssisav2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISAV2G,
	352	+ SSB_SPROM8_RSSISAV2G_SHIFT);
	353	+ SPEX(bxa2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_BXA2G,
	354	+ SSB_SPROM8_BXA2G_SHIFT);
	355	+ SPEX(rssismf5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMF5G, 0);
	356	+ SPEX(rssismc5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMC5G,
	357	+ SSB_SPROM8_RSSISMC5G_SHIFT);
	358	+ SPEX(rssisav5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISAV5G,
	359	+ SSB_SPROM8_RSSISAV5G_SHIFT);
	360	+ SPEX(bxa5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_BXA5G,
	361	+ SSB_SPROM8_BXA5G_SHIFT);
	362	+
	363	+ SPEX(pa0b0, SSB_SPROM8_PA0B0, ~0, 0);
	364	+ SPEX(pa0b1, SSB_SPROM8_PA0B1, ~0, 0);
	365	+ SPEX(pa0b2, SSB_SPROM8_PA0B2, ~0, 0);
	366	+ SPEX(pa1b0, SSB_SPROM8_PA1B0, ~0, 0);
	367	+ SPEX(pa1b1, SSB_SPROM8_PA1B1, ~0, 0);
	368	+ SPEX(pa1b2, SSB_SPROM8_PA1B2, ~0, 0);
	369	+ SPEX(pa1lob0, SSB_SPROM8_PA1LOB0, ~0, 0);
	370	+ SPEX(pa1lob1, SSB_SPROM8_PA1LOB1, ~0, 0);
	371	+ SPEX(pa1lob2, SSB_SPROM8_PA1LOB2, ~0, 0);
	372	+ SPEX(pa1hib0, SSB_SPROM8_PA1HIB0, ~0, 0);
	373	+ SPEX(pa1hib1, SSB_SPROM8_PA1HIB1, ~0, 0);
	374	+ SPEX(pa1hib2, SSB_SPROM8_PA1HIB2, ~0, 0);
	375	+ SPEX(cck2gpo, SSB_SPROM8_CCK2GPO, ~0, 0);
	376	+ SPEX32(ofdm2gpo, SSB_SPROM8_OFDM2GPO, ~0, 0);
	377	+ SPEX32(ofdm5glpo, SSB_SPROM8_OFDM5GLPO, ~0, 0);
	378	+ SPEX32(ofdm5gpo, SSB_SPROM8_OFDM5GPO, ~0, 0);
	379	+ SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, ~0, 0);
	380	+
	381	+ /* Extract the antenna gain values. */
	382	+ SPEX(antenna_gain.a0, SSB_SPROM8_AGAIN01,
	383	+ SSB_SPROM8_AGAIN0, SSB_SPROM8_AGAIN0_SHIFT);
	384	+ SPEX(antenna_gain.a1, SSB_SPROM8_AGAIN01,
	385	+ SSB_SPROM8_AGAIN1, SSB_SPROM8_AGAIN1_SHIFT);
	386	+ SPEX(antenna_gain.a2, SSB_SPROM8_AGAIN23,
	387	+ SSB_SPROM8_AGAIN2, SSB_SPROM8_AGAIN2_SHIFT);
	388	+ SPEX(antenna_gain.a3, SSB_SPROM8_AGAIN23,
	389	+ SSB_SPROM8_AGAIN3, SSB_SPROM8_AGAIN3_SHIFT);
	390	+
	391	+ SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON,
	392	+ SSB_SPROM8_LEDDC_ON_SHIFT);
	393	+ SPEX(leddc_off_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_OFF,
	394	+ SSB_SPROM8_LEDDC_OFF_SHIFT);
	395	+
	396	+ SPEX(txchain, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_TXCHAIN,
	397	+ SSB_SPROM8_TXRXC_TXCHAIN_SHIFT);
	398	+ SPEX(rxchain, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_RXCHAIN,
	399	+ SSB_SPROM8_TXRXC_RXCHAIN_SHIFT);
	400	+ SPEX(antswitch, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_SWITCH,
	401	+ SSB_SPROM8_TXRXC_SWITCH_SHIFT);
	402	+
	403	+ SPEX(opo, SSB_SPROM8_OFDM2GPO, 0x00ff, 0);
	404	+
	405	+ SPEX_ARRAY8(mcs2gpo, SSB_SPROM8_2G_MCSPO, ~0, 0);
	406	+ SPEX_ARRAY8(mcs5gpo, SSB_SPROM8_5G_MCSPO, ~0, 0);
	407	+ SPEX_ARRAY8(mcs5glpo, SSB_SPROM8_5GL_MCSPO, ~0, 0);
	408	+ SPEX_ARRAY8(mcs5ghpo, SSB_SPROM8_5GH_MCSPO, ~0, 0);
	409	+
	410	+ SPEX(rawtempsense, SSB_SPROM8_RAWTS, SSB_SPROM8_RAWTS_RAWTEMP,
	411	+ SSB_SPROM8_RAWTS_RAWTEMP_SHIFT);
	412	+ SPEX(measpower, SSB_SPROM8_RAWTS, SSB_SPROM8_RAWTS_MEASPOWER,
	413	+ SSB_SPROM8_RAWTS_MEASPOWER_SHIFT);
	414	+ SPEX(tempsense_slope, SSB_SPROM8_OPT_CORRX,
	415	+ SSB_SPROM8_OPT_CORRX_TEMP_SLOPE,
	416	+ SSB_SPROM8_OPT_CORRX_TEMP_SLOPE_SHIFT);
	417	+ SPEX(tempcorrx, SSB_SPROM8_OPT_CORRX, SSB_SPROM8_OPT_CORRX_TEMPCORRX,
	418	+ SSB_SPROM8_OPT_CORRX_TEMPCORRX_SHIFT);
	419	+ SPEX(tempsense_option, SSB_SPROM8_OPT_CORRX,
	420	+ SSB_SPROM8_OPT_CORRX_TEMP_OPTION,
	421	+ SSB_SPROM8_OPT_CORRX_TEMP_OPTION_SHIFT);
	422	+ SPEX(freqoffset_corr, SSB_SPROM8_HWIQ_IQSWP,
	423	+ SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR,
	424	+ SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR_SHIFT);
	425	+ SPEX(iqcal_swp_dis, SSB_SPROM8_HWIQ_IQSWP,
	426	+ SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP,
	427	+ SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP_SHIFT);
	428	+ SPEX(hw_iqcal_en, SSB_SPROM8_HWIQ_IQSWP, SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL,
	429	+ SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL_SHIFT);
	430	+
	431	+ SPEX(bw40po, SSB_SPROM8_BW40PO, ~0, 0);
	432	+ SPEX(cddpo, SSB_SPROM8_CDDPO, ~0, 0);
	433	+ SPEX(stbcpo, SSB_SPROM8_STBCPO, ~0, 0);
	434	+ SPEX(bwduppo, SSB_SPROM8_BWDUPPO, ~0, 0);
	435	+
	436	+ SPEX(tempthresh, SSB_SPROM8_THERMAL, SSB_SPROM8_THERMAL_TRESH,
	437	+ SSB_SPROM8_THERMAL_TRESH_SHIFT);
	438	+ SPEX(tempoffset, SSB_SPROM8_THERMAL, SSB_SPROM8_THERMAL_OFFSET,
	439	+ SSB_SPROM8_THERMAL_OFFSET_SHIFT);
	440	+ SPEX(phycal_tempdelta, SSB_SPROM8_TEMPDELTA,
	441	+ SSB_SPROM8_TEMPDELTA_PHYCAL,
	442	+ SSB_SPROM8_TEMPDELTA_PHYCAL_SHIFT);
	443	+ SPEX(temps_period, SSB_SPROM8_TEMPDELTA, SSB_SPROM8_TEMPDELTA_PERIOD,
	444	+ SSB_SPROM8_TEMPDELTA_PERIOD_SHIFT);
	445	+ SPEX(temps_hysteresis, SSB_SPROM8_TEMPDELTA,
	446	+ SSB_SPROM8_TEMPDELTA_HYSTERESIS,
	447	+ SSB_SPROM8_TEMPDELTA_HYSTERESIS_SHIFT);
301	448	}
302	449
303	450	/*

drivers/bluetooth/ath3k.c+6−0

@@ -81,6 +81,9 @@ static struct usb_device_id ath3k_table[] = { · 80 unmodified lines
81	81	/* Atheros AR5BBU12 with sflash firmware */
82	82	{ USB_DEVICE(0x0489, 0xE02C) },
83	83
	84	+ /* Atheros AR5BBU22 with sflash firmware */
	85	+ { USB_DEVICE(0x0489, 0xE03C) },
	86	+
84	87	{ } /* Terminating entry */
85	88	};
86	89
@@ -99,6 +102,9 @@ static struct usb_device_id ath3k_blist_tbl[] = { · 12 unmodified lines
99	102	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
100	103	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
101	104
	105	+ /* Atheros AR5BBU22 with sflash firmware */
	106	+ { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
	107	+
102	108	{ } /* Terminating entry */
103	109	};
104	110

drivers/bluetooth/btmrvl_drv.h+3−0

@@ -67,6 +67,7 @@ struct btmrvl_adapter { · 66 unmodified lines
67	67	u8 wakeup_tries;
68	68	wait_queue_head_t cmd_wait_q;
69	69	u8 cmd_complete;
	70	+ bool is_suspended;
70	71	};
71	72
72	73	struct btmrvl_private {
@@ -139,8 +140,10 @@ void btmrvl_check_evtpkt(struct btmrvl_private priv, struct sk_buff skb); · 66 unmodified lines
139	140	int btmrvl_process_event(struct btmrvl_private priv, struct sk_buff skb);
140	141
141	142	int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd);
	143	+int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv);
142	144	int btmrvl_enable_ps(struct btmrvl_private *priv);
143	145	int btmrvl_prepare_command(struct btmrvl_private *priv);
	146	+int btmrvl_enable_hs(struct btmrvl_private *priv);
144	147
145	148	#ifdef CONFIG_DEBUG_FS
146	149	void btmrvl_debugfs_init(struct hci_dev *hdev);

drivers/bluetooth/btmrvl_main.c+33−23

@@ -200,6 +200,36 @@ int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd) · 199 unmodified lines
200	200	}
201	201	EXPORT_SYMBOL_GPL(btmrvl_send_module_cfg_cmd);
202	202
	203	+int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv)
	204	+{
	205	+ struct sk_buff *skb;
	206	+ struct btmrvl_cmd *cmd;
	207	+
	208	+ skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);
	209	+ if (!skb) {
	210	+ BT_ERR("No free skb");
	211	+ return -ENOMEM;
	212	+ }
	213	+
	214	+ cmd = (struct btmrvl_cmd ) skb_put(skb, sizeof(cmd));
	215	+ cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF,
	216	+ BT_CMD_HOST_SLEEP_CONFIG));
	217	+ cmd->length = 2;
	218	+ cmd->data[0] = (priv->btmrvl_dev.gpio_gap & 0xff00) >> 8;
	219	+ cmd->data[1] = (u8) (priv->btmrvl_dev.gpio_gap & 0x00ff);
	220	+
	221	+ bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
	222	+
	223	+ skb->dev = (void *) priv->btmrvl_dev.hcidev;
	224	+ skb_queue_head(&priv->adapter->tx_queue, skb);
	225	+
	226	+ BT_DBG("Queue HSCFG Command, gpio=0x%x, gap=0x%x", cmd->data[0],
	227	+ cmd->data[1]);
	228	+
	229	+ return 0;
	230	+}
	231	+EXPORT_SYMBOL_GPL(btmrvl_send_hscfg_cmd);
	232	+
203	233	int btmrvl_enable_ps(struct btmrvl_private *priv)
204	234	{
205	235	struct sk_buff *skb;
@@ -232,7 +262,7 @@ int btmrvl_enable_ps(struct btmrvl_private *priv) · 26 unmodified lines
232	262	}
233	263	EXPORT_SYMBOL_GPL(btmrvl_enable_ps);
234	264
235		−static int btmrvl_enable_hs(struct btmrvl_private *priv)
	265	+int btmrvl_enable_hs(struct btmrvl_private *priv)
236	266	{
237	267	struct sk_buff *skb;
238	268	struct btmrvl_cmd *cmd;
@@ -268,35 +298,15 @@ static int btmrvl_enable_hs(struct btmrvl_private *priv) · 29 unmodified lines
268	298
269	299	return ret;
270	300	}
	301	+EXPORT_SYMBOL_GPL(btmrvl_enable_hs);
271	302
272	303	int btmrvl_prepare_command(struct btmrvl_private *priv)
273	304	{
274		− struct sk_buff *skb = NULL;
275		− struct btmrvl_cmd *cmd;
276	305	int ret = 0;
277	306
278	307	if (priv->btmrvl_dev.hscfgcmd) {
279	308	priv->btmrvl_dev.hscfgcmd = 0;
280		−
281		− skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);
282		− if (skb == NULL) {
283		− BT_ERR("No free skb");
284		− return -ENOMEM;
285		− }
286		−
287		− cmd = (struct btmrvl_cmd ) skb_put(skb, sizeof(cmd));
288		− cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_HOST_SLEEP_CONFIG));
289		− cmd->length = 2;
290		− cmd->data[0] = (priv->btmrvl_dev.gpio_gap & 0xff00) >> 8;
291		− cmd->data[1] = (u8) (priv->btmrvl_dev.gpio_gap & 0x00ff);
292		−
293		− bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
294		−
295		− skb->dev = (void *) priv->btmrvl_dev.hcidev;
296		− skb_queue_head(&priv->adapter->tx_queue, skb);
297		−
298		− BT_DBG("Queue HSCFG Command, gpio=0x%x, gap=0x%x",
299		− cmd->data[0], cmd->data[1]);
	309	+ btmrvl_send_hscfg_cmd(priv);
300	310	}
301	311
302	312	if (priv->btmrvl_dev.pscmd) {

drivers/bluetooth/btmrvl_sdio.c+105−7

@@ -339,9 +339,7 @@ static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card) · 338 unmodified lines
339	339
340	340	done:
341	341	kfree(tmphlprbuf);
342		− if (fw_helper)
343		− release_firmware(fw_helper);
344		−
	342	+ release_firmware(fw_helper);
345	343	return ret;
346	344	}
347	345
@@ -484,10 +482,7 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card) · 136 unmodified lines
484	482
485	483	done:
486	484	kfree(tmpfwbuf);
487		−
488		− if (fw_firmware)
489		− release_firmware(fw_firmware);
490		−
	485	+ release_firmware(fw_firmware);
491	486	return ret;
492	487	}
493	488
@@ -1013,6 +1008,9 @@ static int btmrvl_sdio_probe(struct sdio_func *func, · 519 unmodified lines
1013	1008	priv->btmrvl_dev.psmode = 1;
1014	1009	btmrvl_enable_ps(priv);
1015	1010
	1011	+ priv->btmrvl_dev.gpio_gap = 0xffff;
	1012	+ btmrvl_send_hscfg_cmd(priv);
	1013	+
1016	1014	return 0;
1017	1015
1018	1016	disable_host_int:
@@ -1048,11 +1046,111 @@ static void btmrvl_sdio_remove(struct sdio_func *func) · 29 unmodified lines
1048	1046	}
1049	1047	}
1050	1048
	1049	+static int btmrvl_sdio_suspend(struct device *dev)
	1050	+{
	1051	+ struct sdio_func *func = dev_to_sdio_func(dev);
	1052	+ struct btmrvl_sdio_card *card;
	1053	+ struct btmrvl_private *priv;
	1054	+ mmc_pm_flag_t pm_flags;
	1055	+ struct hci_dev *hcidev;
	1056	+
	1057	+ if (func) {
	1058	+ pm_flags = sdio_get_host_pm_caps(func);
	1059	+ BT_DBG("%s: suspend: PM flags = 0x%x", sdio_func_id(func),
	1060	+ pm_flags);
	1061	+ if (!(pm_flags & MMC_PM_KEEP_POWER)) {
	1062	+ BT_ERR("%s: cannot remain alive while suspended",
	1063	+ sdio_func_id(func));
	1064	+ return -ENOSYS;
	1065	+ }
	1066	+ card = sdio_get_drvdata(func);
	1067	+ if (!card \|\| !card->priv) {
	1068	+ BT_ERR("card or priv structure is not valid");
	1069	+ return 0;
	1070	+ }
	1071	+ } else {
	1072	+ BT_ERR("sdio_func is not specified");
	1073	+ return 0;
	1074	+ }
	1075	+
	1076	+ priv = card->priv;
	1077	+
	1078	+ if (priv->adapter->hs_state != HS_ACTIVATED) {
	1079	+ if (btmrvl_enable_hs(priv)) {
	1080	+ BT_ERR("HS not actived, suspend failed!");
	1081	+ return -EBUSY;
	1082	+ }
	1083	+ }
	1084	+ hcidev = priv->btmrvl_dev.hcidev;
	1085	+ BT_DBG("%s: SDIO suspend", hcidev->name);
	1086	+ hci_suspend_dev(hcidev);
	1087	+ skb_queue_purge(&priv->adapter->tx_queue);
	1088	+
	1089	+ priv->adapter->is_suspended = true;
	1090	+
	1091	+ /* We will keep the power when hs enabled successfully */
	1092	+ if (priv->adapter->hs_state == HS_ACTIVATED) {
	1093	+ BT_DBG("suspend with MMC_PM_KEEP_POWER");
	1094	+ return sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);
	1095	+ } else {
	1096	+ BT_DBG("suspend without MMC_PM_KEEP_POWER");
	1097	+ return 0;
	1098	+ }
	1099	+}
	1100	+
	1101	+static int btmrvl_sdio_resume(struct device *dev)
	1102	+{
	1103	+ struct sdio_func *func = dev_to_sdio_func(dev);
	1104	+ struct btmrvl_sdio_card *card;
	1105	+ struct btmrvl_private *priv;
	1106	+ mmc_pm_flag_t pm_flags;
	1107	+ struct hci_dev *hcidev;
	1108	+
	1109	+ if (func) {
	1110	+ pm_flags = sdio_get_host_pm_caps(func);
	1111	+ BT_DBG("%s: resume: PM flags = 0x%x", sdio_func_id(func),
	1112	+ pm_flags);
	1113	+ card = sdio_get_drvdata(func);
	1114	+ if (!card \|\| !card->priv) {
	1115	+ BT_ERR("card or priv structure is not valid");
	1116	+ return 0;
	1117	+ }
	1118	+ } else {
	1119	+ BT_ERR("sdio_func is not specified");
	1120	+ return 0;
	1121	+ }
	1122	+ priv = card->priv;
	1123	+
	1124	+ if (!priv->adapter->is_suspended) {
	1125	+ BT_DBG("device already resumed");
	1126	+ return 0;
	1127	+ }
	1128	+
	1129	+ priv->adapter->is_suspended = false;
	1130	+ hcidev = priv->btmrvl_dev.hcidev;
	1131	+ BT_DBG("%s: SDIO resume", hcidev->name);
	1132	+ hci_resume_dev(hcidev);
	1133	+ priv->hw_wakeup_firmware(priv);
	1134	+ priv->adapter->hs_state = HS_DEACTIVATED;
	1135	+ BT_DBG("%s: HS DEACTIVATED in resume!", hcidev->name);
	1136	+
	1137	+ return 0;
	1138	+}
	1139	+
	1140	+static const struct dev_pm_ops btmrvl_sdio_pm_ops = {
	1141	+ .suspend = btmrvl_sdio_suspend,
	1142	+ .resume = btmrvl_sdio_resume,
	1143	+};
	1144	+
1051	1145	static struct sdio_driver bt_mrvl_sdio = {
1052	1146	.name = "btmrvl_sdio",
1053	1147	.id_table = btmrvl_sdio_ids,
1054	1148	.probe = btmrvl_sdio_probe,
1055	1149	.remove = btmrvl_sdio_remove,
	1150	+ .drv = {
	1151	+ .owner = THIS_MODULE,
	1152	+ .pm = &btmrvl_sdio_pm_ops,
	1153	+ }
1056	1154	};
1057	1155
1058	1156	static int __init btmrvl_sdio_init_module(void)

drivers/bluetooth/btusb.c+14−2

@@ -143,6 +143,9 @@ static struct usb_device_id blacklist_table[] = { · 142 unmodified lines
143	143	/* Atheros AR5BBU12 with sflash firmware */
144	144	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
145	145
	146	+ /* Atheros AR5BBU12 with sflash firmware */
	147	+ { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },
	148	+
146	149	/* Broadcom BCM2035 */
147	150	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },
148	151	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
@@ -855,6 +858,7 @@ static void btusb_work(struct work_struct *work) · 706 unmodified lines
855	858	{
856	859	struct btusb_data *data = container_of(work, struct btusb_data, work);
857	860	struct hci_dev *hdev = data->hdev;
	861	+ int new_alts;
858	862	int err;
859	863
860	864	if (hdev->conn_hash.sco_num > 0) {
@@ -868,11 +872,19 @@ static void btusb_work(struct work_struct *work) · 7 unmodified lines
868	872
869	873	set_bit(BTUSB_DID_ISO_RESUME, &data->flags);
870	874	}
871		− if (data->isoc_altsetting != 2) {
	875	+
	876	+ if (hdev->voice_setting & 0x0020) {
	877	+ static const int alts[3] = { 2, 4, 5 };
	878	+ new_alts = alts[hdev->conn_hash.sco_num - 1];
	879	+ } else {
	880	+ new_alts = hdev->conn_hash.sco_num;
	881	+ }
	882	+
	883	+ if (data->isoc_altsetting != new_alts) {
872	884	clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
873	885	usb_kill_anchored_urbs(&data->isoc_anchor);
874	886
875		− if (__set_isoc_interface(hdev, 2) < 0)
	887	+ if (__set_isoc_interface(hdev, new_alts) < 0)
876	888	return;
877	889	}
878	890

drivers/bluetooth/hci_ldisc.c+1−1

@@ -388,7 +388,7 @@ static int hci_uart_register_dev(struct hci_uart *hu) · 387 unmodified lines
388	388	hdev->close = hci_uart_close;
389	389	hdev->flush = hci_uart_flush;
390	390	hdev->send = hci_uart_send_frame;
391		− hdev->parent = hu->tty->dev;
	391	+ SET_HCIDEV_DEV(hdev, hu->tty->dev);
392	392
393	393	if (test_bit(HCI_UART_RAW_DEVICE, &hu->hdev_flags))
394	394	set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);

drivers/bluetooth/hci_vhci.c+2−1

@@ -252,8 +252,9 @@ static int vhci_open(struct inode inode, struct file file) · 251 unmodified lines
252	252	}
253	253
254	254	file->private_data = data;
	255	+ nonseekable_open(inode, file);
255	256
256		− return nonseekable_open(inode, file);
	257	+ return 0;
257	258	}
258	259
259	260	static int vhci_release(struct inode inode, struct file file)

drivers/isdn/hardware/mISDN/hfcsusb.h+6−0

@@ -410,6 +410,12 @@ static struct usb_device_id hfcsusb_idtab[] = { · 409 unmodified lines
410	410	{LED_SCHEME1, {0x88, -64, -32, -16},
411	411	"ZyXEL OMNI.NET USB II"}),
412	412	},
	413	+ {
	414	+ USB_DEVICE(0x1ae7, 0x0525),
	415	+ .driver_info = (unsigned long) &((struct hfcsusb_vdata)
	416	+ {LED_SCHEME1, {0x88, -64, -32, -16},
	417	+ "X-Tensions USB ISDN TA XC-525"}),
	418	+ },
413	419	{ }
414	420	};
415	421

drivers/net/ethernet/freescale/gianfar.c+1−1

@@ -1082,7 +1082,7 @@ static int gfar_probe(struct platform_device *ofdev) · 1081 unmodified lines
1082	1082
1083	1083	if (dev->features & NETIF_F_IP_CSUM \|\|
1084	1084	priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)
1085		− dev->hard_header_len += GMAC_FCB_LEN;
	1085	+ dev->needed_headroom = GMAC_FCB_LEN;
1086	1086
1087	1087	/* Program the isrg regs only if number of grps > 1 */
1088	1088	if (priv->num_grps > 1) {

drivers/net/wireless/ath/ath6kl/cfg80211.c+167−71

@@ -693,8 +693,8 @@ ath6kl_add_bss_if_needed(struct ath6kl_vif *vif, · 692 unmodified lines
693	693	ie, 2 + vif->ssid_len + beacon_ie_len,
694	694	0, GFP_KERNEL);
695	695	if (bss)
696		− ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "added bss %pM to "
697		− "cfg80211\n", bssid);
	696	+ ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
	697	+ "added bss %pM to cfg80211\n", bssid);
698	698	kfree(ie);
699	699	} else
700	700	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "cfg80211 already has a bss\n");
@@ -882,6 +882,32 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason, · 181 unmodified lines
882	882	vif->sme_state = SME_DISCONNECTED;
883	883	}
884	884
	885	+static int ath6kl_set_probed_ssids(struct ath6kl *ar,
	886	+ struct ath6kl_vif *vif,
	887	+ struct cfg80211_ssid *ssids, int n_ssids)
	888	+{
	889	+ u8 i;
	890	+
	891	+ if (n_ssids > MAX_PROBED_SSID_INDEX)
	892	+ return -EINVAL;
	893	+
	894	+ for (i = 0; i < n_ssids; i++) {
	895	+ ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx, i,
	896	+ ssids[i].ssid_len ?
	897	+ SPECIFIC_SSID_FLAG : ANY_SSID_FLAG,
	898	+ ssids[i].ssid_len,
	899	+ ssids[i].ssid);
	900	+ }
	901	+
	902	+ /* Make sure no old entries are left behind */
	903	+ for (i = n_ssids; i < MAX_PROBED_SSID_INDEX; i++) {
	904	+ ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx, i,
	905	+ DISABLE_SSID_FLAG, 0, NULL);
	906	+ }
	907	+
	908	+ return 0;
	909	+}
	910	+
885	911	static int ath6kl_cfg80211_scan(struct wiphy wiphy, struct net_device ndev,
886	912	struct cfg80211_scan_request *request)
887	913	{
@@ -899,36 +925,25 @@ static int ath6kl_cfg80211_scan(struct wiphy wiphy, struct net_device ndev, · 11 unmodified lines
899	925
900	926	if (!ar->usr_bss_filter) {
901	927	clear_bit(CLEAR_BSSFILTER_ON_BEACON, &vif->flags);
902		− ret = ath6kl_wmi_bssfilter_cmd(
903		− ar->wmi, vif->fw_vif_idx,
904		− (test_bit(CONNECTED, &vif->flags) ?
905		− ALL_BUT_BSS_FILTER : ALL_BSS_FILTER), 0);
	928	+ ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
	929	+ ALL_BSS_FILTER, 0);
906	930	if (ret) {
907	931	ath6kl_err("couldn't set bss filtering\n");
908	932	return ret;
909	933	}
910	934	}
911	935
912		− if (request->n_ssids && request->ssids[0].ssid_len) {
913		− u8 i;
914		−
915		− if (request->n_ssids > (MAX_PROBED_SSID_INDEX - 1))
916		− request->n_ssids = MAX_PROBED_SSID_INDEX - 1;
917		−
918		− for (i = 0; i < request->n_ssids; i++)
919		− ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx,
920		− i + 1, SPECIFIC_SSID_FLAG,
921		− request->ssids[i].ssid_len,
922		− request->ssids[i].ssid);
923		− }
	936	+ ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
	937	+ request->n_ssids);
	938	+ if (ret < 0)
	939	+ return ret;
924	940
925	941	/* this also clears IE in fw if it's not set */
926	942	ret = ath6kl_wmi_set_appie_cmd(ar->wmi, vif->fw_vif_idx,
927	943	WMI_FRAME_PROBE_REQ,
928	944	request->ie, request->ie_len);
929	945	if (ret) {
930		− ath6kl_err("failed to set Probe Request appie for "
931		− "scan");
	946	+ ath6kl_err("failed to set Probe Request appie for scan");
932	947	return ret;
933	948	}
934	949
@@ -945,8 +960,7 @@ static int ath6kl_cfg80211_scan(struct wiphy wiphy, struct net_device ndev, · 10 unmodified lines
945	960
946	961	channels = kzalloc(n_channels * sizeof(u16), GFP_KERNEL);
947	962	if (channels == NULL) {
948		− ath6kl_warn("failed to set scan channels, "
949		− "scan all channels");
	963	+ ath6kl_warn("failed to set scan channels, scan all channels");
950	964	n_channels = 0;
951	965	}
952	966
@@ -1018,6 +1032,20 @@ out: · 65 unmodified lines
1018	1032	vif->scan_req = NULL;
1019	1033	}
1020	1034
	1035	+void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,
	1036	+ enum wmi_phy_mode mode)
	1037	+{
	1038	+ enum nl80211_channel_type type;
	1039	+
	1040	+ ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
	1041	+ "channel switch notify nw_type %d freq %d mode %d\n",
	1042	+ vif->nw_type, freq, mode);
	1043	+
	1044	+ type = (mode == WMI_11G_HT20) ? NL80211_CHAN_HT20 : NL80211_CHAN_NO_HT;
	1045	+
	1046	+ cfg80211_ch_switch_notify(vif->ndev, freq, type);
	1047	+}
	1048	+
1021	1049	static int ath6kl_cfg80211_add_key(struct wiphy wiphy, struct net_device ndev,
1022	1050	u8 key_index, bool pairwise,
1023	1051	const u8 *mac_addr,
@@ -1111,9 +1139,8 @@ static int ath6kl_cfg80211_add_key(struct wiphy wiphy, struct net_device ndev, · 87 unmodified lines
1111	1139	ar->ap_mode_bkey.key_len = key->key_len;
1112	1140	memcpy(ar->ap_mode_bkey.key, key->key, key->key_len);
1113	1141	if (!test_bit(CONNECTED, &vif->flags)) {
1114		− ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "Delay initial group "
1115		− "key configuration until AP mode has been "
1116		− "started\n");
	1142	+ ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
	1143	+ "Delay initial group key configuration until AP mode has been started\n");
1117	1144	/*
1118	1145	* The key will be set in ath6kl_connect_ap_mode() once
1119	1146	* the connected event is received from the target.
@@ -1129,8 +1156,8 @@ static int ath6kl_cfg80211_add_key(struct wiphy wiphy, struct net_device ndev, · 9 unmodified lines
1129	1156	* the AP mode has properly started
1130	1157	* (ath6kl_install_statioc_wep_keys).
1131	1158	*/
1132		− ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "Delay WEP key configuration "
1133		− "until AP mode has been started\n");
	1159	+ ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
	1160	+ "Delay WEP key configuration until AP mode has been started\n");
1134	1161	vif->wep_key_list[key_index].key_len = key->key_len;
1135	1162	memcpy(vif->wep_key_list[key_index].key, key->key,
1136	1163	key->key_len);
@@ -1962,8 +1989,7 @@ static int ath6kl_wow_sta(struct ath6kl ar, struct ath6kl_vif vif) · 825 unmodified lines
1962	1989	sizeof(discvr_pattern), discvr_offset,
1963	1990	discvr_pattern, discvr_mask);
1964	1991	if (ret) {
1965		− ath6kl_err("failed to add WOW mDNS/SSDP/LLMNR "
1966		− "pattern\n");
	1992	+ ath6kl_err("failed to add WOW mDNS/SSDP/LLMNR pattern\n");
1967	1993	return ret;
1968	1994	}
1969	1995	}
@@ -2031,6 +2057,10 @@ static int ath6kl_wow_suspend(struct ath6kl ar, struct cfg80211_wowlan wow) · 61 unmodified lines
2031	2057	u8 index = 0;
2032	2058	__be32 ips[MAX_IP_ADDRS];
2033	2059
	2060	+ /* The FW currently can't support multi-vif WoW properly. */
	2061	+ if (ar->num_vif > 1)
	2062	+ return -EIO;
	2063	+
2034	2064	vif = ath6kl_vif_first(ar);
2035	2065	if (!vif)
2036	2066	return -EIO;
@@ -2044,6 +2074,13 @@ static int ath6kl_wow_suspend(struct ath6kl ar, struct cfg80211_wowlan wow) · 7 unmodified lines
2044	2074	if (wow && (wow->n_patterns > WOW_MAX_FILTERS_PER_LIST))
2045	2075	return -EINVAL;
2046	2076
	2077	+ if (!test_bit(NETDEV_MCAST_ALL_ON, &vif->flags)) {
	2078	+ ret = ath6kl_wmi_mcast_filter_cmd(vif->ar->wmi,
	2079	+ vif->fw_vif_idx, false);
	2080	+ if (ret)
	2081	+ return ret;
	2082	+ }
	2083	+
2047	2084	/* Clear existing WOW patterns */
2048	2085	for (i = 0; i < WOW_MAX_FILTERS_PER_LIST; i++)
2049	2086	ath6kl_wmi_del_wow_pattern_cmd(ar->wmi, vif->fw_vif_idx,
@@ -2147,8 +2184,8 @@ static int ath6kl_wow_resume(struct ath6kl *ar) · 97 unmodified lines
2147	2184	ret = ath6kl_wmi_set_host_sleep_mode_cmd(ar->wmi, vif->fw_vif_idx,
2148	2185	ATH6KL_HOST_MODE_AWAKE);
2149	2186	if (ret) {
2150		− ath6kl_warn("Failed to configure host sleep mode for "
2151		− "wow resume: %d\n", ret);
	2187	+ ath6kl_warn("Failed to configure host sleep mode for wow resume: %d\n",
	2188	+ ret);
2152	2189	ar->state = ATH6KL_STATE_WOW;
2153	2190	return ret;
2154	2191	}
@@ -2172,6 +2209,13 @@ static int ath6kl_wow_resume(struct ath6kl *ar) · 17 unmodified lines
2172	2209
2173	2210	ar->state = ATH6KL_STATE_ON;
2174	2211
	2212	+ if (!test_bit(NETDEV_MCAST_ALL_OFF, &vif->flags)) {
	2213	+ ret = ath6kl_wmi_mcast_filter_cmd(vif->ar->wmi,
	2214	+ vif->fw_vif_idx, true);
	2215	+ if (ret)
	2216	+ return ret;
	2217	+ }
	2218	+
2175	2219	netif_wake_queue(vif->ndev);
2176	2220
2177	2221	return 0;
@@ -2186,8 +2230,10 @@ static int ath6kl_cfg80211_deepsleep_suspend(struct ath6kl *ar) · 8 unmodified lines
2186	2230	if (!vif)
2187	2231	return -EIO;
2188	2232
2189		− if (!ath6kl_cfg80211_ready(vif))
	2233	+ if (!test_bit(WMI_READY, &ar->flag)) {
	2234	+ ath6kl_err("deepsleep failed as wmi is not ready\n");
2190	2235	return -EIO;
	2236	+ }
2191	2237
2192	2238	ath6kl_cfg80211_stop_all(ar);
2193	2239
@@ -2447,6 +2493,24 @@ static int ath6kl_set_htcap(struct ath6kl_vif *vif, enum ieee80211_band band, · 253 unmodified lines
2447	2493	band, htcap);
2448	2494	}
2449	2495
	2496	+static int ath6kl_restore_htcap(struct ath6kl_vif *vif)
	2497	+{
	2498	+ struct wiphy *wiphy = vif->ar->wiphy;
	2499	+ int band, ret = 0;
	2500	+
	2501	+ for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
	2502	+ if (!wiphy->bands[band])
	2503	+ continue;
	2504	+
	2505	+ ret = ath6kl_set_htcap(vif, band,
	2506	+ wiphy->bands[band]->ht_cap.ht_supported);
	2507	+ if (ret)
	2508	+ return ret;
	2509	+ }
	2510	+
	2511	+ return ret;
	2512	+}
	2513	+
2450	2514	static bool ath6kl_is_p2p_ie(const u8 *pos)
2451	2515	{
2452	2516	return pos[0] == WLAN_EID_VENDOR_SPECIFIC && pos[1] >= 4 &&
@@ -2568,28 +2632,34 @@ static int ath6kl_get_rsn_capab(struct cfg80211_beacon_data *beacon, · 115 unmodified lines
2568	2632	/* skip element id and length */
2569	2633	rsn_ie += 2;
2570	2634
2571		− /* skip version, group cipher */
2572		− if (rsn_ie_len < 6)
	2635	+ /* skip version */
	2636	+ if (rsn_ie_len < 2)
2573	2637	return -EINVAL;
2574		− rsn_ie += 6;
2575		− rsn_ie_len -= 6;
	2638	+ rsn_ie += 2;
	2639	+ rsn_ie_len -= 2;
	2640	+
	2641	+ /* skip group cipher suite */
	2642	+ if (rsn_ie_len < 4)
	2643	+ return 0;
	2644	+ rsn_ie += 4;
	2645	+ rsn_ie_len -= 4;
2576	2646
2577	2647	/* skip pairwise cipher suite */
2578	2648	if (rsn_ie_len < 2)
2579		− return -EINVAL;
2580		− cnt = ((u16 ) rsn_ie);
	2649	+ return 0;
	2650	+ cnt = get_unaligned_le16(rsn_ie);
2581	2651	rsn_ie += (2 + cnt * 4);
2582	2652	rsn_ie_len -= (2 + cnt * 4);
2583	2653
2584	2654	/* skip akm suite */
2585	2655	if (rsn_ie_len < 2)
2586		− return -EINVAL;
2587		− cnt = ((u16 ) rsn_ie);
	2656	+ return 0;
	2657	+ cnt = get_unaligned_le16(rsn_ie);
2588	2658	rsn_ie += (2 + cnt * 4);
2589	2659	rsn_ie_len -= (2 + cnt * 4);
2590	2660
2591	2661	if (rsn_ie_len < 2)
2592		− return -EINVAL;
	2662	+ return 0;
2593	2663
2594	2664	memcpy(rsn_capab, rsn_ie, 2);
2595	2665
@@ -2766,6 +2836,7 @@ static int ath6kl_start_ap(struct wiphy wiphy, struct net_device dev, · 170 unmodified lines
2766	2836	return res;
2767	2837	}
2768	2838
	2839	+ memcpy(&vif->profile, &p, sizeof(p));
2769	2840	res = ath6kl_wmi_ap_profile_commit(ar->wmi, vif->fw_vif_idx, &p);
2770	2841	if (res < 0)
2771	2842	return res;
@@ -2801,13 +2872,7 @@ static int ath6kl_stop_ap(struct wiphy wiphy, struct net_device dev) · 29 unmodified lines
2801	2872	clear_bit(CONNECTED, &vif->flags);
2802	2873
2803	2874	/* Restore ht setting in firmware */
2804		− if (ath6kl_set_htcap(vif, IEEE80211_BAND_2GHZ, true))
2805		− return -EIO;
2806		−
2807		− if (ath6kl_set_htcap(vif, IEEE80211_BAND_5GHZ, true))
2808		− return -EIO;
2809		−
2810		− return 0;
	2875	+ return ath6kl_restore_htcap(vif);
2811	2876	}
2812	2877
2813	2878	static const u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -3081,7 +3146,6 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy, · 267 unmodified lines
3081	3146	struct ath6kl_vif *vif = netdev_priv(dev);
3082	3147	u16 interval;
3083	3148	int ret;
3084		− u8 i;
3085	3149
3086	3150	if (ar->state != ATH6KL_STATE_ON)
3087	3151	return -EIO;
@@ -3089,29 +3153,23 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy, · 1 unmodified line
3089	3153	if (vif->sme_state != SME_DISCONNECTED)
3090	3154	return -EBUSY;
3091	3155
	3156	+ /* The FW currently can't support multi-vif WoW properly. */
	3157	+ if (ar->num_vif > 1)
	3158	+ return -EIO;
	3159	+
3092	3160	ath6kl_cfg80211_scan_complete_event(vif, true);
3093	3161
3094		− for (i = 0; i < ar->wiphy->max_sched_scan_ssids; i++) {
3095		− ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx,
3096		− i, DISABLE_SSID_FLAG,
3097		− 0, NULL);
3098		− }
	3162	+ ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
	3163	+ request->n_ssids);
	3164	+ if (ret < 0)
	3165	+ return ret;
3099	3166
3100	3167	/* fw uses seconds, also make sure that it's >0 */
3101	3168	interval = max_t(u16, 1, request->interval / 1000);
3102	3169
3103	3170	ath6kl_wmi_scanparams_cmd(ar->wmi, vif->fw_vif_idx,
3104	3171	interval, interval,
3105		− 10, 0, 0, 0, 3, 0, 0, 0);
3106		−
3107		− if (request->n_ssids && request->ssids[0].ssid_len) {
3108		− for (i = 0; i < request->n_ssids; i++) {
3109		− ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx,
3110		− i, SPECIFIC_SSID_FLAG,
3111		− request->ssids[i].ssid_len,
3112		− request->ssids[i].ssid);
3113		− }
3114		− }
	3172	+ vif->bg_scan_period, 0, 0, 0, 3, 0, 0, 0);
3115	3173
3116	3174	ret = ath6kl_wmi_set_wow_mode_cmd(ar->wmi, vif->fw_vif_idx,
3117	3175	ATH6KL_WOW_MODE_ENABLE,
@@ -3271,8 +3329,7 @@ void ath6kl_cfg80211_stop_all(struct ath6kl *ar) · 153 unmodified lines
3271	3329	ar->wmi->saved_pwr_mode = ar->wmi->pwr_mode;
3272	3330
3273	3331	if (ath6kl_wmi_powermode_cmd(ar->wmi, 0, REC_POWER) != 0)
3274		− ath6kl_warn("ath6kl_deep_sleep_enable: "
3275		− "wmi_powermode_cmd failed\n");
	3332	+ ath6kl_warn("ath6kl_deep_sleep_enable: wmi_powermode_cmd failed\n");
3276	3333	return;
3277	3334	}
3278	3335
@@ -3352,6 +3409,7 @@ struct net_device ath6kl_interface_add(struct ath6kl ar, char *name, · 73 unmodified lines
3352	3409	vif->next_mode = nw_type;
3353	3410	vif->listen_intvl_t = ATH6KL_DEFAULT_LISTEN_INTVAL;
3354	3411	vif->bmiss_time_t = ATH6KL_DEFAULT_BMISS_TIME;
	3412	+ vif->bg_scan_period = 0;
3355	3413	vif->htcap.ht_enable = true;
3356	3414
3357	3415	memcpy(ndev->dev_addr, ar->mac_addr, ETH_ALEN);
@@ -3393,6 +3451,7 @@ err: · 35 unmodified lines
3393	3451	int ath6kl_cfg80211_init(struct ath6kl *ar)
3394	3452	{
3395	3453	struct wiphy *wiphy = ar->wiphy;
	3454	+ bool band_2gig = false, band_5gig = false, ht = false;
3396	3455	int ret;
3397	3456
3398	3457	wiphy->mgmt_stypes = ath6kl_mgmt_stypes;
@@ -3413,8 +3472,46 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) · 14 unmodified lines
3413	3472	/* max num of ssids that can be probed during scanning */
3414	3473	wiphy->max_scan_ssids = MAX_PROBED_SSID_INDEX;
3415	3474	wiphy->max_scan_ie_len = 1000; /* FIX: what is correct limit? */
3416		− wiphy->bands[IEEE80211_BAND_2GHZ] = &ath6kl_band_2ghz;
3417		− wiphy->bands[IEEE80211_BAND_5GHZ] = &ath6kl_band_5ghz;
	3475	+ switch (ar->hw.cap) {
	3476	+ case WMI_11AN_CAP:
	3477	+ ht = true;
	3478	+ case WMI_11A_CAP:
	3479	+ band_5gig = true;
	3480	+ break;
	3481	+ case WMI_11GN_CAP:
	3482	+ ht = true;
	3483	+ case WMI_11G_CAP:
	3484	+ band_2gig = true;
	3485	+ break;
	3486	+ case WMI_11AGN_CAP:
	3487	+ ht = true;
	3488	+ case WMI_11AG_CAP:
	3489	+ band_2gig = true;
	3490	+ band_5gig = true;
	3491	+ break;
	3492	+ default:
	3493	+ ath6kl_err("invalid phy capability!\n");
	3494	+ return -EINVAL;
	3495	+ }
	3496	+
	3497	+ /*
	3498	+ * Even if the fw has HT support, advertise HT cap only when
	3499	+ * the firmware has support to override RSN capability, otherwise
	3500	+ * 4-way handshake would fail.
	3501	+ */
	3502	+ if (!(ht &&
	3503	+ test_bit(ATH6KL_FW_CAPABILITY_RSN_CAP_OVERRIDE,
	3504	+ ar->fw_capabilities))) {
	3505	+ ath6kl_band_2ghz.ht_cap.cap = 0;
	3506	+ ath6kl_band_2ghz.ht_cap.ht_supported = false;
	3507	+ ath6kl_band_5ghz.ht_cap.cap = 0;
	3508	+ ath6kl_band_5ghz.ht_cap.ht_supported = false;
	3509	+ }
	3510	+ if (band_2gig)
	3511	+ wiphy->bands[IEEE80211_BAND_2GHZ] = &ath6kl_band_2ghz;
	3512	+ if (band_5gig)
	3513	+ wiphy->bands[IEEE80211_BAND_5GHZ] = &ath6kl_band_5ghz;
	3514	+
3418	3515	wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
3419	3516
3420	3517	wiphy->cipher_suites = cipher_suites;
@@ -3430,7 +3527,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) · 9 unmodified lines
3430	3527	wiphy->wowlan.pattern_min_len = 1;
3431	3528	wiphy->wowlan.pattern_max_len = WOW_PATTERN_SIZE;
3432	3529
3433		− wiphy->max_sched_scan_ssids = 10;
	3530	+ wiphy->max_sched_scan_ssids = MAX_PROBED_SSID_INDEX;
3434	3531
3435	3532	ar->wiphy->flags \|= WIPHY_FLAG_SUPPORTS_FW_ROAM \|
3436	3533	WIPHY_FLAG_HAVE_AP_SME \|
@@ -3447,8 +3544,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) · 10 unmodified lines
3447	3544	ar->wiphy->probe_resp_offload =
3448	3545	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS \|
3449	3546	NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 \|
3450		− NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P \|
3451		− NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U;
	3547	+ NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P;
3452	3548
3453	3549	ret = wiphy_register(wiphy);
3454	3550	if (ret < 0) {

drivers/net/wireless/ath/ath6kl/cfg80211.h+2−0

@@ -28,6 +28,8 @@ enum ath6kl_cfg_suspend_mode { · 27 unmodified lines
28	28	struct net_device ath6kl_interface_add(struct ath6kl ar, char *name,
29	29	enum nl80211_iftype type,
30	30	u8 fw_vif_idx, u8 nw_type);
	31	+void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,
	32	+ enum wmi_phy_mode mode);
31	33	void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted);
32	34
33	35	void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,

drivers/net/wireless/ath/ath6kl/core.h+24−9

@@ -126,9 +126,9 @@ struct ath6kl_fw_ie { · 125 unmodified lines
126	126	#define AR6003_HW_2_0_FIRMWARE_FILE "athwlan.bin.z77"
127	127	#define AR6003_HW_2_0_TCMD_FIRMWARE_FILE "athtcmd_ram.bin"
128	128	#define AR6003_HW_2_0_PATCH_FILE "data.patch.bin"
129		−#define AR6003_HW_2_0_BOARD_DATA_FILE "ath6k/AR6003/hw2.0/bdata.bin"
	129	+#define AR6003_HW_2_0_BOARD_DATA_FILE AR6003_HW_2_0_FW_DIR "/bdata.bin"
130	130	#define AR6003_HW_2_0_DEFAULT_BOARD_DATA_FILE \
131		− "ath6k/AR6003/hw2.0/bdata.SD31.bin"
	131	+ AR6003_HW_2_0_FW_DIR "/bdata.SD31.bin"
132	132
133	133	/* AR6003 3.0 definitions */
134	134	#define AR6003_HW_2_1_1_VERSION 0x30000582
@@ -139,25 +139,33 @@ struct ath6kl_fw_ie { · 4 unmodified lines
139	139	#define AR6003_HW_2_1_1_UTF_FIRMWARE_FILE "utf.bin"
140	140	#define AR6003_HW_2_1_1_TESTSCRIPT_FILE "nullTestFlow.bin"
141	141	#define AR6003_HW_2_1_1_PATCH_FILE "data.patch.bin"
142		−#define AR6003_HW_2_1_1_BOARD_DATA_FILE "ath6k/AR6003/hw2.1.1/bdata.bin"
	142	+#define AR6003_HW_2_1_1_BOARD_DATA_FILE AR6003_HW_2_1_1_FW_DIR "/bdata.bin"
143	143	#define AR6003_HW_2_1_1_DEFAULT_BOARD_DATA_FILE \
144		− "ath6k/AR6003/hw2.1.1/bdata.SD31.bin"
	144	+ AR6003_HW_2_1_1_FW_DIR "/bdata.SD31.bin"
145	145
146	146	/* AR6004 1.0 definitions */
147	147	#define AR6004_HW_1_0_VERSION 0x30000623
148	148	#define AR6004_HW_1_0_FW_DIR "ath6k/AR6004/hw1.0"
149	149	#define AR6004_HW_1_0_FIRMWARE_FILE "fw.ram.bin"
150		−#define AR6004_HW_1_0_BOARD_DATA_FILE "ath6k/AR6004/hw1.0/bdata.bin"
	150	+#define AR6004_HW_1_0_BOARD_DATA_FILE AR6004_HW_1_0_FW_DIR "/bdata.bin"
151	151	#define AR6004_HW_1_0_DEFAULT_BOARD_DATA_FILE \
152		− "ath6k/AR6004/hw1.0/bdata.DB132.bin"
	152	+ AR6004_HW_1_0_FW_DIR "/bdata.DB132.bin"
153	153
154	154	/* AR6004 1.1 definitions */
155	155	#define AR6004_HW_1_1_VERSION 0x30000001
156	156	#define AR6004_HW_1_1_FW_DIR "ath6k/AR6004/hw1.1"
157	157	#define AR6004_HW_1_1_FIRMWARE_FILE "fw.ram.bin"
158		−#define AR6004_HW_1_1_BOARD_DATA_FILE "ath6k/AR6004/hw1.1/bdata.bin"
	158	+#define AR6004_HW_1_1_BOARD_DATA_FILE AR6004_HW_1_1_FW_DIR "/bdata.bin"
159	159	#define AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE \
160		− "ath6k/AR6004/hw1.1/bdata.DB132.bin"
	160	+ AR6004_HW_1_1_FW_DIR "/bdata.DB132.bin"
	161	+
	162	+/* AR6004 1.2 definitions */
	163	+#define AR6004_HW_1_2_VERSION 0x300007e8
	164	+#define AR6004_HW_1_2_FW_DIR "ath6k/AR6004/hw1.2"
	165	+#define AR6004_HW_1_2_FIRMWARE_FILE "fw.ram.bin"
	166	+#define AR6004_HW_1_2_BOARD_DATA_FILE AR6004_HW_1_2_FW_DIR "/bdata.bin"
	167	+#define AR6004_HW_1_2_DEFAULT_BOARD_DATA_FILE \
	168	+ AR6004_HW_1_2_FW_DIR "/bdata.bin"
161	169
162	170	/* Per STA data, used in AP mode */
163	171	#define STA_PS_AWAKE BIT(0)
@@ -502,6 +510,8 @@ enum ath6kl_vif_state { · 338 unmodified lines
502	510	WLAN_ENABLED,
503	511	STATS_UPDATE_PEND,
504	512	HOST_SLEEP_MODE_CMD_PROCESSED,
	513	+ NETDEV_MCAST_ALL_ON,
	514	+ NETDEV_MCAST_ALL_OFF,
505	515	};
506	516
507	517	struct ath6kl_vif {
@@ -549,9 +559,11 @@ struct ath6kl_vif { · 41 unmodified lines
549	559	u16 assoc_bss_beacon_int;
550	560	u16 listen_intvl_t;
551	561	u16 bmiss_time_t;
	562	+ u16 bg_scan_period;
552	563	u8 assoc_bss_dtim_period;
553	564	struct net_device_stats net_stats;
554	565	struct target_stats target_stats;
	566	+ struct wmi_connect_cmd profile;
555	567
556	568	struct list_head mc_filter;
557	569	};
@@ -640,6 +652,7 @@ struct ath6kl { · 82 unmodified lines
640	652	u8 sta_list_index;
641	653	struct ath6kl_req_key ap_mode_bkey;
642	654	struct sk_buff_head mcastpsq;
	655	+ u32 want_ch_switch;
643	656
644	657	/*
645	658	* FIXME: protects access to mcastpsq but is actually useless as
@@ -672,6 +685,7 @@ struct ath6kl { · 26 unmodified lines
672	685	u32 refclk_hz;
673	686	u32 uarttx_pin;
674	687	u32 testscript_addr;
	688	+ enum wmi_phy_cap cap;
675	689
676	690	struct ath6kl_hw_fw {
677	691	const char *dir;
@@ -805,7 +819,8 @@ void aggr_reset_state(struct aggr_info_conn *aggr_conn); · 127 unmodified lines
805	819	struct ath6kl_sta ath6kl_find_sta(struct ath6kl_vif vif, u8 *node_addr);
806	820	struct ath6kl_sta ath6kl_find_sta_by_aid(struct ath6kl ar, u8 aid);
807	821
808		−void ath6kl_ready_event(void devt, u8 datap, u32 sw_ver, u32 abi_ver);
	822	+void ath6kl_ready_event(void devt, u8 datap, u32 sw_ver, u32 abi_ver,
	823	+ enum wmi_phy_cap cap);
809	824	int ath6kl_control_tx(void devt, struct sk_buff skb,
810	825	enum htc_endpoint_id eid);
811	826	void ath6kl_connect_event(struct ath6kl_vif *vif, u16 channel,

drivers/net/wireless/ath/ath6kl/debug.c+11−1

@@ -401,8 +401,10 @@ static ssize_t ath6kl_fwlog_block_read(struct file *file, · 400 unmodified lines
401	401
402	402	ret = wait_for_completion_interruptible(
403	403	&ar->debug.fwlog_completion);
404		− if (ret == -ERESTARTSYS)
	404	+ if (ret == -ERESTARTSYS) {
	405	+ vfree(buf);
405	406	return ret;
	407	+ }
406	408
407	409	spin_lock(&ar->debug.fwlog_queue.lock);
408	410	}
@@ -1570,10 +1572,15 @@ static ssize_t ath6kl_bgscan_int_write(struct file *file, · 1161 unmodified lines
1570	1572	size_t count, loff_t *ppos)
1571	1573	{
1572	1574	struct ath6kl *ar = file->private_data;
	1575	+ struct ath6kl_vif *vif;
1573	1576	u16 bgscan_int;
1574	1577	char buf[32];
1575	1578	ssize_t len;
1576	1579
	1580	+ vif = ath6kl_vif_first(ar);
	1581	+ if (!vif)
	1582	+ return -EIO;
	1583	+
1577	1584	len = min(count, sizeof(buf) - 1);
1578	1585	if (copy_from_user(buf, user_buf, len))
1579	1586	return -EFAULT;
@@ -1585,6 +1592,8 @@ static ssize_t ath6kl_bgscan_int_write(struct file *file, · 5 unmodified lines
1585	1592	if (bgscan_int == 0)
1586	1593	bgscan_int = 0xffff;
1587	1594
	1595	+ vif->bg_scan_period = bgscan_int;
	1596	+
1588	1597	ath6kl_wmi_scanparams_cmd(ar->wmi, 0, 0, 0, bgscan_int, 0, 0, 0, 3,
1589	1598	0, 0, 0);
1590	1599
@@ -1809,6 +1818,7 @@ int ath6kl_debug_init_fs(struct ath6kl *ar) · 218 unmodified lines
1809	1818	void ath6kl_debug_cleanup(struct ath6kl *ar)
1810	1819	{
1811	1820	skb_queue_purge(&ar->debug.fwlog_queue);
	1821	+ complete(&ar->debug.fwlog_completion);
1812	1822	kfree(ar->debug.roam_tbl);
1813	1823	}
1814	1824

drivers/net/wireless/ath/ath6kl/htc_mbox.c+28−17

@@ -83,10 +83,7 @@ static void ath6kl_credit_init(struct ath6kl_htc_credit_info *cred_info, · 82 unmodified lines
83	83	* never goes inactive EVER.
84	84	*/
85	85	cur_ep_dist->dist_flags \|= HTC_EP_ACTIVE;
86		− } else if (cur_ep_dist->svc_id == WMI_DATA_BK_SVC)
87		− /* this is the lowest priority data endpoint */
88		− /* FIXME: this looks fishy, check */
89		− cred_info->lowestpri_ep_dist = cur_ep_dist->list;
	86	+ }
90	87
91	88	/*
92	89	* Streams have to be created (explicit \| implicit) for all
@@ -100,6 +97,13 @@ static void ath6kl_credit_init(struct ath6kl_htc_credit_info *cred_info, · 7 unmodified lines
100	97	*/
101	98	}
102	99
	100	+ /*
	101	+ * For ath6kl_credit_seek function,
	102	+ * it use list_for_each_entry_reverse to walk around the whole ep list.
	103	+ * Therefore assign this lowestpri_ep_dist after walk around the ep_list
	104	+ */
	105	+ cred_info->lowestpri_ep_dist = cur_ep_dist->list;
	106	+
103	107	WARN_ON(cred_info->cur_free_credits <= 0);
104	108
105	109	list_for_each_entry(cur_ep_dist, ep_list, list) {
@@ -758,7 +762,7 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint, · 652 unmodified lines
758	762	u32 txb_mask;
759	763	u8 ac = WMM_NUM_AC;
760	764
761		− if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) \|\|
	765	+ if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) &&
762	766	(WMI_CONTROL_SVC != endpoint->svc_id))
763	767	ac = target->dev->ar->ep2ac_map[endpoint->eid];
764	768
@@ -793,16 +797,17 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint, · 28 unmodified lines
793	797	* itself
794	798	*/
795	799	txb_mask = ((1 << ac) - 1);
796		− /*
797		− * when the scatter request resources drop below a
798		− * certain threshold, disable Tx bundling for all
799		− * AC's with priority lower than the current requesting
800		− * AC. Otherwise re-enable Tx bundling for them
801		− */
802		− if (scat_req->scat_q_depth < ATH6KL_SCATTER_REQS)
803		− target->tx_bndl_mask &= ~txb_mask;
804		− else
805		− target->tx_bndl_mask \|= txb_mask;
	800	+
	801	+ /*
	802	+ * when the scatter request resources drop below a
	803	+ * certain threshold, disable Tx bundling for all
	804	+ * AC's with priority lower than the current requesting
	805	+ * AC. Otherwise re-enable Tx bundling for them
	806	+ */
	807	+ if (scat_req->scat_q_depth < ATH6KL_SCATTER_REQS)
	808	+ target->tx_bndl_mask &= ~txb_mask;
	809	+ else
	810	+ target->tx_bndl_mask \|= txb_mask;
806	811	}
807	812
808	813	ath6kl_dbg(ATH6KL_DBG_HTC, "htc tx pkts to scatter: %d\n",
@@ -849,6 +854,7 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target, · 40 unmodified lines
849	854	int bundle_sent;
850	855	int n_pkts_bundle;
851	856	u8 ac = WMM_NUM_AC;
	857	+ int status;
852	858
853	859	spin_lock_bh(&target->tx_lock);
854	860
@@ -866,7 +872,7 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target, · 11 unmodified lines
866	872	*/
867	873	INIT_LIST_HEAD(&txq);
868	874
869		− if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) \|\|
	875	+ if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) &&
870	876	(WMI_CONTROL_SVC != endpoint->svc_id))
871	877	ac = target->dev->ar->ep2ac_map[endpoint->eid];
872	878
@@ -910,7 +916,12 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target, · 37 unmodified lines
910	916
911	917	ath6kl_htc_tx_prep_pkt(packet, packet->info.tx.flags,
912	918	0, packet->info.tx.seqno);
913		− ath6kl_htc_tx_issue(target, packet);
	919	+ status = ath6kl_htc_tx_issue(target, packet);
	920	+
	921	+ if (status) {
	922	+ packet->status = status;
	923	+ packet->completion(packet->context, packet);
	924	+ }
914	925	}
915	926
916	927	spin_lock_bh(&target->tx_lock);

drivers/net/wireless/ath/ath6kl/htc_pipe.c+3−8

@@ -108,8 +108,6 @@ static void get_htc_packet_credit_based(struct htc_target *target, · 107 unmodified lines
108	108
109	109	/* get packet at head, but don't remove it */
110	110	packet = list_first_entry(&ep->txq, struct htc_packet, list);
111		− if (packet == NULL)
112		− break;
113	111
114	112	ath6kl_dbg(ATH6KL_DBG_HTC,
115	113	"%s: got head packet:0x%p , queue depth: %d\n",
@@ -803,8 +801,6 @@ static int htc_send_packets_multiple(struct htc_target *target, · 687 unmodified lines
803	801
804	802	/* get first packet to find out which ep the packets will go into */
805	803	packet = list_first_entry(pkt_queue, struct htc_packet, list);
806		− if (packet == NULL)
807		− return -EINVAL;
808	804
809	805	if (packet->endpoint >= ENDPOINT_MAX) {
810	806	WARN_ON_ONCE(1);
@@ -1382,6 +1378,9 @@ static int ath6kl_htc_pipe_conn_service(struct htc_target *target, · 571 unmodified lines
1382	1378	/* copy all the callbacks */
1383	1379	ep->ep_cb = conn_req->ep_cb;
1384	1380
	1381	+ /* initialize tx_drop_packet_threshold */
	1382	+ ep->tx_drop_packet_threshold = MAX_HI_COOKIE_NUM;
	1383	+
1385	1384	status = ath6kl_hif_pipe_map_service(ar, ep->svc_id,
1386	1385	&ep->pipe.pipeid_ul,
1387	1386	&ep->pipe.pipeid_dl);
@@ -1636,10 +1635,6 @@ static int ath6kl_htc_pipe_add_rxbuf_multiple(struct htc_target *target, · 248 unmodified lines
1636	1635	return -EINVAL;
1637	1636
1638	1637	first = list_first_entry(pkt_queue, struct htc_packet, list);
1639		− if (first == NULL) {
1640		− WARN_ON_ONCE(1);
1641		− return -EINVAL;
1642		− }
1643	1638
1644	1639	if (first->endpoint >= ENDPOINT_MAX) {
1645	1640	WARN_ON_ONCE(1);

drivers/net/wireless/ath/ath6kl/init.c+24−5

@@ -119,6 +119,24 @@ static const struct ath6kl_hw hw_list[] = { · 118 unmodified lines
119	119	.fw_board = AR6004_HW_1_1_BOARD_DATA_FILE,
120	120	.fw_default_board = AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE,
121	121	},
	122	+ {
	123	+ .id = AR6004_HW_1_2_VERSION,
	124	+ .name = "ar6004 hw 1.2",
	125	+ .dataset_patch_addr = 0x436ecc,
	126	+ .app_load_addr = 0x1234,
	127	+ .board_ext_data_addr = 0x437000,
	128	+ .reserved_ram_size = 9216,
	129	+ .board_addr = 0x435c00,
	130	+ .refclk_hz = 40000000,
	131	+ .uarttx_pin = 11,
	132	+
	133	+ .fw = {
	134	+ .dir = AR6004_HW_1_2_FW_DIR,
	135	+ .fw = AR6004_HW_1_2_FIRMWARE_FILE,
	136	+ },
	137	+ .fw_board = AR6004_HW_1_2_BOARD_DATA_FILE,
	138	+ .fw_default_board = AR6004_HW_1_2_DEFAULT_BOARD_DATA_FILE,
	139	+ },
122	140	};
123	141
124	142	/*
@@ -445,9 +463,9 @@ static int ath6kl_target_config_wlan_params(struct ath6kl *ar, int idx) · 320 unmodified lines
445	463	P2P_FLAG_MACADDR_REQ \|
446	464	P2P_FLAG_HMODEL_REQ);
447	465	if (ret) {
448		− ath6kl_dbg(ATH6KL_DBG_TRC, "failed to request P2P "
449		− "capabilities (%d) - assuming P2P not "
450		− "supported\n", ret);
	466	+ ath6kl_dbg(ATH6KL_DBG_TRC,
	467	+ "failed to request P2P capabilities (%d) - assuming P2P not supported\n",
	468	+ ret);
451	469	ar->p2p = false;
452	470	}
453	471	}
@@ -456,8 +474,9 @@ static int ath6kl_target_config_wlan_params(struct ath6kl *ar, int idx) · 2 unmodified lines
456	474	/* Enable Probe Request reporting for P2P */
457	475	ret = ath6kl_wmi_probe_report_req_cmd(ar->wmi, idx, true);
458	476	if (ret) {
459		− ath6kl_dbg(ATH6KL_DBG_TRC, "failed to enable Probe "
460		− "Request reporting (%d)\n", ret);
	477	+ ath6kl_dbg(ATH6KL_DBG_TRC,
	478	+ "failed to enable Probe Request reporting (%d)\n",
	479	+ ret);
461	480	}
462	481	}
463	482

drivers/net/wireless/ath/ath6kl/main.c+88−16

@@ -421,8 +421,8 @@ void ath6kl_connect_ap_mode_bss(struct ath6kl_vif *vif, u16 channel) · 420 unmodified lines
421	421	if (!ik->valid)
422	422	break;
423	423
424		− ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "Delayed addkey for "
425		− "the initial group key for AP mode\n");
	424	+ ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
	425	+ "Delayed addkey for the initial group key for AP mode\n");
426	426	memset(key_rsc, 0, sizeof(key_rsc));
427	427	res = ath6kl_wmi_addkey_cmd(
428	428	ar->wmi, vif->fw_vif_idx, ik->key_index, ik->key_type,
@@ -430,12 +430,19 @@ void ath6kl_connect_ap_mode_bss(struct ath6kl_vif *vif, u16 channel) · 1 unmodified line
430	430	ik->key,
431	431	KEY_OP_INIT_VAL, NULL, SYNC_BOTH_WMIFLAG);
432	432	if (res) {
433		− ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "Delayed "
434		− "addkey failed: %d\n", res);
	433	+ ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
	434	+ "Delayed addkey failed: %d\n", res);
435	435	}
436	436	break;
437	437	}
438	438
	439	+ if (ar->want_ch_switch & (1 << vif->fw_vif_idx)) {
	440	+ ar->want_ch_switch &= ~(1 << vif->fw_vif_idx);
	441	+ /* we actually don't know the phymode, default to HT20 */
	442	+ ath6kl_cfg80211_ch_switch_notify(vif, channel,
	443	+ WMI_11G_HT20);
	444	+ }
	445	+
439	446	ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx, NONE_BSS_FILTER, 0);
440	447	set_bit(CONNECTED, &vif->flags);
441	448	netif_carrier_on(vif->ndev);
@@ -541,7 +548,8 @@ void ath6kl_disconnect(struct ath6kl_vif *vif) · 99 unmodified lines
541	548
542	549	/* WMI Event handlers */
543	550
544		−void ath6kl_ready_event(void devt, u8 datap, u32 sw_ver, u32 abi_ver)
	551	+void ath6kl_ready_event(void devt, u8 datap, u32 sw_ver, u32 abi_ver,
	552	+ enum wmi_phy_cap cap)
545	553	{
546	554	struct ath6kl *ar = devt;
547	555
@@ -551,6 +559,7 @@ void ath6kl_ready_event(void devt, u8 datap, u32 sw_ver, u32 abi_ver) · 3 unmodified lines
551	559
552	560	ar->version.wlan_ver = sw_ver;
553	561	ar->version.abi_ver = abi_ver;
	562	+ ar->hw.cap = cap;
554	563
555	564	snprintf(ar->wiphy->fw_version,
556	565	sizeof(ar->wiphy->fw_version),
@@ -584,6 +593,45 @@ void ath6kl_scan_complete_evt(struct ath6kl_vif *vif, int status) · 27 unmodified lines
584	593	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "scan complete: %d\n", status);
585	594	}
586	595
	596	+static int ath6kl_commit_ch_switch(struct ath6kl_vif *vif, u16 channel)
	597	+{
	598	+
	599	+ struct ath6kl *ar = vif->ar;
	600	+
	601	+ vif->next_chan = channel;
	602	+ vif->profile.ch = cpu_to_le16(channel);
	603	+
	604	+ switch (vif->nw_type) {
	605	+ case AP_NETWORK:
	606	+ return ath6kl_wmi_ap_profile_commit(ar->wmi, vif->fw_vif_idx,
	607	+ &vif->profile);
	608	+ default:
	609	+ ath6kl_err("won't switch channels nw_type=%d\n", vif->nw_type);
	610	+ return -ENOTSUPP;
	611	+ }
	612	+}
	613	+
	614	+static void ath6kl_check_ch_switch(struct ath6kl *ar, u16 channel)
	615	+{
	616	+
	617	+ struct ath6kl_vif *vif;
	618	+ int res = 0;
	619	+
	620	+ if (!ar->want_ch_switch)
	621	+ return;
	622	+
	623	+ spin_lock_bh(&ar->list_lock);
	624	+ list_for_each_entry(vif, &ar->vif_list, list) {
	625	+ if (ar->want_ch_switch & (1 << vif->fw_vif_idx))
	626	+ res = ath6kl_commit_ch_switch(vif, channel);
	627	+
	628	+ if (res)
	629	+ ath6kl_err("channel switch failed nw_type %d res %d\n",
	630	+ vif->nw_type, res);
	631	+ }
	632	+ spin_unlock_bh(&ar->list_lock);
	633	+}
	634	+
587	635	void ath6kl_connect_event(struct ath6kl_vif vif, u16 channel, u8 bssid,
588	636	u16 listen_int, u16 beacon_int,
589	637	enum network_type net_type, u8 beacon_ie_len,
@@ -601,9 +649,11 @@ void ath6kl_connect_event(struct ath6kl_vif vif, u16 channel, u8 bssid, · 11 unmodified lines
601	649	memcpy(vif->bssid, bssid, sizeof(vif->bssid));
602	650	vif->bss_ch = channel;
603	651
604		− if ((vif->nw_type == INFRA_NETWORK))
	652	+ if ((vif->nw_type == INFRA_NETWORK)) {
605	653	ath6kl_wmi_listeninterval_cmd(ar->wmi, vif->fw_vif_idx,
606	654	vif->listen_intvl_t, 0);
	655	+ ath6kl_check_ch_switch(ar, channel);
	656	+ }
607	657
608	658	netif_wake_queue(vif->ndev);
609	659
@@ -926,6 +976,11 @@ void ath6kl_disconnect_event(struct ath6kl_vif vif, u8 reason, u8 bssid, · 316 unmodified lines
926	976	struct ath6kl *ar = vif->ar;
927	977
928	978	if (vif->nw_type == AP_NETWORK) {
	979	+ /* disconnect due to other STA vif switching channels */
	980	+ if (reason == BSS_DISCONNECTED &&
	981	+ prot_reason_status == WMI_AP_REASON_STA_ROAM)
	982	+ ar->want_ch_switch \|= 1 << vif->fw_vif_idx;
	983	+
929	984	if (!ath6kl_remove_sta(ar, bssid, prot_reason_status))
930	985	return;
931	986
@@ -1090,7 +1145,7 @@ static int ath6kl_set_features(struct net_device *dev, · 158 unmodified lines
1090	1145	static void ath6kl_set_multicast_list(struct net_device *ndev)
1091	1146	{
1092	1147	struct ath6kl_vif *vif = netdev_priv(ndev);
1093		− bool mc_all_on = false, mc_all_off = false;
	1148	+ bool mc_all_on = false;
1094	1149	int mc_count = netdev_mc_count(ndev);
1095	1150	struct netdev_hw_addr *ha;
1096	1151	bool found;
@@ -1102,24 +1157,41 @@ static void ath6kl_set_multicast_list(struct net_device *ndev) · 5 unmodified lines
1102	1157	!test_bit(WLAN_ENABLED, &vif->flags))
1103	1158	return;
1104	1159
	1160	+ /* Enable multicast-all filter. */
1105	1161	mc_all_on = !!(ndev->flags & IFF_PROMISC) \|\|
1106	1162	!!(ndev->flags & IFF_ALLMULTI) \|\|
1107	1163	!!(mc_count > ATH6K_MAX_MC_FILTERS_PER_LIST);
1108	1164
1109		− mc_all_off = !(ndev->flags & IFF_MULTICAST) \|\| mc_count == 0;
	1165	+ if (mc_all_on)
	1166	+ set_bit(NETDEV_MCAST_ALL_ON, &vif->flags);
	1167	+ else
	1168	+ clear_bit(NETDEV_MCAST_ALL_ON, &vif->flags);
	1169	+
	1170	+ mc_all_on = mc_all_on \|\| (vif->ar->state == ATH6KL_STATE_ON);
1110	1171
1111		− if (mc_all_on \|\| mc_all_off) {
1112		− /* Enable/disable all multicast */
1113		− ath6kl_dbg(ATH6KL_DBG_TRC, "%s multicast filter\n",
1114		− mc_all_on ? "enabling" : "disabling");
1115		− ret = ath6kl_wmi_mcast_filter_cmd(vif->ar->wmi, vif->fw_vif_idx,
	1172	+ if (!(ndev->flags & IFF_MULTICAST)) {
	1173	+ mc_all_on = false;
	1174	+ set_bit(NETDEV_MCAST_ALL_OFF, &vif->flags);
	1175	+ } else {
	1176	+ clear_bit(NETDEV_MCAST_ALL_OFF, &vif->flags);
	1177	+ }
	1178	+
	1179	+ /* Enable/disable "multicast-all" filter*/
	1180	+ ath6kl_dbg(ATH6KL_DBG_TRC, "%s multicast-all filter\n",
	1181	+ mc_all_on ? "enabling" : "disabling");
	1182	+
	1183	+ ret = ath6kl_wmi_mcast_filter_cmd(vif->ar->wmi, vif->fw_vif_idx,
1116	1184	mc_all_on);
1117		− if (ret)
1118		− ath6kl_warn("Failed to %s multicast receive\n",
1119		− mc_all_on ? "enable" : "disable");
	1185	+ if (ret) {
	1186	+ ath6kl_warn("Failed to %s multicast-all receive\n",
	1187	+ mc_all_on ? "enable" : "disable");
1120	1188	return;
1121	1189	}
1122	1190
	1191	+ if (test_bit(NETDEV_MCAST_ALL_ON, &vif->flags))
	1192	+ return;
	1193	+
	1194	+ /* Keep the driver and firmware mcast list in sync. */
1123	1195	list_for_each_entry_safe(mc_filter, tmp, &vif->mc_filter, list) {
1124	1196	found = false;
1125	1197	netdev_for_each_mc_addr(ha, ndev) {

drivers/net/wireless/ath/ath6kl/sdio.c+11−6

@@ -552,7 +552,7 @@ static int ath6kl_sdio_write_async(struct ath6kl ar, u32 address, u8 buffer, · 551 unmodified lines
552	552
553	553	bus_req = ath6kl_sdio_alloc_busreq(ar_sdio);
554	554
555		− if (!bus_req)
	555	+ if (WARN_ON_ONCE(!bus_req))
556	556	return -ENOMEM;
557	557
558	558	bus_req->address = address;
@@ -915,6 +915,9 @@ static int ath6kl_sdio_suspend(struct ath6kl ar, struct cfg80211_wowlan wow) · 356 unmodified lines
915	915	}
916	916
917	917	cut_pwr:
	918	+ if (func->card && func->card->host)
	919	+ func->card->host->pm_flags &= ~MMC_PM_KEEP_POWER;
	920	+
918	921	return ath6kl_cfg80211_suspend(ar, ATH6KL_CFG_SUSPEND_CUTPOWER, NULL);
919	922	}
920	923
@@ -985,9 +988,8 @@ static int ath6kl_set_addrwin_reg(struct ath6kl *ar, u32 reg_addr, u32 addr) · 64 unmodified lines
985	988	}
986	989
987	990	if (status) {
988		− ath6kl_err("%s: failed to write initial bytes of 0x%x "
989		− "to window reg: 0x%X\n", __func__,
990		− addr, reg_addr);
	991	+ ath6kl_err("%s: failed to write initial bytes of 0x%x to window reg: 0x%X\n",
	992	+ __func__, addr, reg_addr);
991	993	return status;
992	994	}
993	995
@@ -1076,8 +1078,8 @@ static int ath6kl_sdio_bmi_credits(struct ath6kl *ar) · 82 unmodified lines
1076	1078	(u8 *)&ar->bmi.cmd_credits, 4,
1077	1079	HIF_RD_SYNC_BYTE_INC);
1078	1080	if (ret) {
1079		− ath6kl_err("Unable to decrement the command credit "
1080		− "count register: %d\n", ret);
	1081	+ ath6kl_err("Unable to decrement the command credit count register: %d\n",
	1082	+ ret);
1081	1083	return ret;
1082	1084	}
1083	1085
@@ -1457,3 +1459,6 @@ MODULE_FIRMWARE(AR6004_HW_1_0_DEFAULT_BOARD_DATA_FILE); · 373 unmodified lines
1457	1459	MODULE_FIRMWARE(AR6004_HW_1_1_FW_DIR "/" AR6004_HW_1_1_FIRMWARE_FILE);
1458	1460	MODULE_FIRMWARE(AR6004_HW_1_1_BOARD_DATA_FILE);
1459	1461	MODULE_FIRMWARE(AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE);
	1462	+MODULE_FIRMWARE(AR6004_HW_1_2_FW_DIR "/" AR6004_HW_1_2_FIRMWARE_FILE);
	1463	+MODULE_FIRMWARE(AR6004_HW_1_2_BOARD_DATA_FILE);
	1464	+MODULE_FIRMWARE(AR6004_HW_1_2_DEFAULT_BOARD_DATA_FILE);

drivers/net/wireless/ath/ath6kl/txrx.c+4−8

@@ -362,15 +362,11 @@ int ath6kl_data_tx(struct sk_buff skb, struct net_device dev) · 361 unmodified lines
362	362	skb, skb->data, skb->len);
363	363
364	364	/* If target is not associated */
365		− if (!test_bit(CONNECTED, &vif->flags)) {
366		− dev_kfree_skb(skb);
367		− return 0;
368		− }
	365	+ if (!test_bit(CONNECTED, &vif->flags))
	366	+ goto fail_tx;
369	367
370		− if (WARN_ON_ONCE(ar->state != ATH6KL_STATE_ON)) {
371		− dev_kfree_skb(skb);
372		− return 0;
373		− }
	368	+ if (WARN_ON_ONCE(ar->state != ATH6KL_STATE_ON))
	369	+ goto fail_tx;
374	370
375	371	if (!test_bit(WMI_READY, &ar->flag))
376	372	goto fail_tx;

drivers/net/wireless/ath/ath6kl/usb.c+12−0

@@ -1037,6 +1037,14 @@ static void ath6kl_usb_stop(struct ath6kl *ar) · 1036 unmodified lines
1037	1037	hif_stop(ar);
1038	1038	}
1039	1039
	1040	+static void ath6kl_usb_cleanup_scatter(struct ath6kl *ar)
	1041	+{
	1042	+ /*
	1043	+ * USB doesn't support it. Just return.
	1044	+ */
	1045	+ return;
	1046	+}
	1047	+
1040	1048	static const struct ath6kl_hif_ops ath6kl_usb_ops = {
1041	1049	.diag_read32 = ath6kl_usb_diag_read32,
1042	1050	.diag_write32 = ath6kl_usb_diag_write32,
@@ -1049,6 +1057,7 @@ static const struct ath6kl_hif_ops ath6kl_usb_ops = { · 6 unmodified lines
1049	1057	.pipe_get_default = ath6kl_usb_get_default_pipe,
1050	1058	.pipe_map_service = ath6kl_usb_map_service_pipe,
1051	1059	.pipe_get_free_queue_number = ath6kl_usb_get_free_queue_number,
	1060	+ .cleanup_scatter = ath6kl_usb_cleanup_scatter,
1052	1061	};
1053	1062
1054	1063	/* ath6kl usb driver registered functions */
@@ -1208,3 +1217,6 @@ MODULE_FIRMWARE(AR6004_HW_1_0_DEFAULT_BOARD_DATA_FILE); · 153 unmodified lines
1208	1217	MODULE_FIRMWARE(AR6004_HW_1_1_FIRMWARE_FILE);
1209	1218	MODULE_FIRMWARE(AR6004_HW_1_1_BOARD_DATA_FILE);
1210	1219	MODULE_FIRMWARE(AR6004_HW_1_1_DEFAULT_BOARD_DATA_FILE);
	1220	+MODULE_FIRMWARE(AR6004_HW_1_2_FIRMWARE_FILE);
	1221	+MODULE_FIRMWARE(AR6004_HW_1_2_BOARD_DATA_FILE);
	1222	+MODULE_FIRMWARE(AR6004_HW_1_2_DEFAULT_BOARD_DATA_FILE);

drivers/net/wireless/ath/ath6kl/wmi.c+57−37

@@ -16,6 +16,7 @@ · 15 unmodified lines
16	16	*/
17	17
18	18	#include <linux/ip.h>
	19	+#include <linux/in.h>
19	20	#include "core.h"
20	21	#include "debug.h"
21	22	#include "testmode.h"
@@ -289,6 +290,13 @@ int ath6kl_wmi_implicit_create_pstream(struct wmi *wmi, u8 if_idx, · 267 unmodified lines
289	290	layer2_priority);
290	291	} else
291	292	usr_pri = layer2_priority & 0x7;
	293	+
	294	+ /*
	295	+ * Queue the EAPOL frames in the same WMM_AC_VO queue
	296	+ * as that of management frames.
	297	+ */
	298	+ if (skb->protocol == cpu_to_be16(ETH_P_PAE))
	299	+ usr_pri = WMI_VOICE_USER_PRIORITY;
292	300	}
293	301
294	302	/*
@@ -460,8 +468,9 @@ static int ath6kl_wmi_remain_on_chnl_event_rx(struct wmi wmi, u8 datap, · 165 unmodified lines
460	468	freq, dur);
461	469	chan = ieee80211_get_channel(ar->wiphy, freq);
462	470	if (!chan) {
463		− ath6kl_dbg(ATH6KL_DBG_WMI, "remain_on_chnl: Unknown channel "
464		− "(freq=%u)\n", freq);
	471	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	472	+ "remain_on_chnl: Unknown channel (freq=%u)\n",
	473	+ freq);
465	474	return -EINVAL;
466	475	}
467	476	id = vif->last_roc_id;
@@ -488,12 +497,14 @@ static int ath6kl_wmi_cancel_remain_on_chnl_event_rx(struct wmi *wmi, · 20 unmodified lines
488	497	ev = (struct wmi_cancel_remain_on_chnl_event *) datap;
489	498	freq = le32_to_cpu(ev->freq);
490	499	dur = le32_to_cpu(ev->duration);
491		− ath6kl_dbg(ATH6KL_DBG_WMI, "cancel_remain_on_chnl: freq=%u dur=%u "
492		− "status=%u\n", freq, dur, ev->status);
	500	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	501	+ "cancel_remain_on_chnl: freq=%u dur=%u status=%u\n",
	502	+ freq, dur, ev->status);
493	503	chan = ieee80211_get_channel(ar->wiphy, freq);
494	504	if (!chan) {
495		− ath6kl_dbg(ATH6KL_DBG_WMI, "cancel_remain_on_chnl: Unknown "
496		− "channel (freq=%u)\n", freq);
	505	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	506	+ "cancel_remain_on_chnl: Unknown channel (freq=%u)\n",
	507	+ freq);
497	508	return -EINVAL;
498	509	}
499	510	if (vif->last_cancel_roc_id &&
@@ -548,12 +559,12 @@ static int ath6kl_wmi_rx_probe_req_event_rx(struct wmi wmi, u8 datap, int len, · 48 unmodified lines
548	559	freq = le32_to_cpu(ev->freq);
549	560	dlen = le16_to_cpu(ev->len);
550	561	if (datap + len < ev->data + dlen) {
551		− ath6kl_err("invalid wmi_p2p_rx_probe_req_event: "
552		− "len=%d dlen=%u\n", len, dlen);
	562	+ ath6kl_err("invalid wmi_p2p_rx_probe_req_event: len=%d dlen=%u\n",
	563	+ len, dlen);
553	564	return -EINVAL;
554	565	}
555		− ath6kl_dbg(ATH6KL_DBG_WMI, "rx_probe_req: len=%u freq=%u "
556		− "probe_req_report=%d\n",
	566	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	567	+ "rx_probe_req: len=%u freq=%u probe_req_report=%d\n",
557	568	dlen, freq, vif->probe_req_report);
558	569
559	570	if (vif->probe_req_report \|\| vif->nw_type == AP_NETWORK)
@@ -592,8 +603,8 @@ static int ath6kl_wmi_rx_action_event_rx(struct wmi wmi, u8 datap, int len, · 32 unmodified lines
592	603	freq = le32_to_cpu(ev->freq);
593	604	dlen = le16_to_cpu(ev->len);
594	605	if (datap + len < ev->data + dlen) {
595		− ath6kl_err("invalid wmi_rx_action_event: "
596		− "len=%d dlen=%u\n", len, dlen);
	606	+ ath6kl_err("invalid wmi_rx_action_event: len=%d dlen=%u\n",
	607	+ len, dlen);
597	608	return -EINVAL;
598	609	}
599	610	ath6kl_dbg(ATH6KL_DBG_WMI, "rx_action: len=%u freq=%u\n", dlen, freq);
@@ -687,7 +698,7 @@ static int ath6kl_wmi_ready_event_rx(struct wmi wmi, u8 datap, int len) · 87 unmodified lines
687	698
688	699	ath6kl_ready_event(wmi->parent_dev, ev->mac_addr,
689	700	le32_to_cpu(ev->sw_version),
690		− le32_to_cpu(ev->abi_version));
	701	+ le32_to_cpu(ev->abi_version), ev->phy_cap);
691	702
692	703	return 0;
693	704	}
@@ -777,16 +788,15 @@ static int ath6kl_wmi_connect_event_rx(struct wmi wmi, u8 datap, int len, · 83 unmodified lines
777	788	/* AP mode start/STA connected event */
778	789	struct net_device *dev = vif->ndev;
779	790	if (memcmp(dev->dev_addr, ev->u.ap_bss.bssid, ETH_ALEN) == 0) {
780		− ath6kl_dbg(ATH6KL_DBG_WMI, "%s: freq %d bssid %pM "
781		− "(AP started)\n",
	791	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	792	+ "%s: freq %d bssid %pM (AP started)\n",
782	793	__func__, le16_to_cpu(ev->u.ap_bss.ch),
783	794	ev->u.ap_bss.bssid);
784	795	ath6kl_connect_ap_mode_bss(
785	796	vif, le16_to_cpu(ev->u.ap_bss.ch));
786	797	} else {
787		− ath6kl_dbg(ATH6KL_DBG_WMI, "%s: aid %u mac_addr %pM "
788		− "auth=%u keymgmt=%u cipher=%u apsd_info=%u "
789		− "(STA connected)\n",
	798	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	799	+ "%s: aid %u mac_addr %pM auth=%u keymgmt=%u cipher=%u apsd_info=%u (STA connected)\n",
790	800	__func__, ev->u.ap_sta.aid,
791	801	ev->u.ap_sta.mac_addr,
792	802	ev->u.ap_sta.auth,
@@ -1229,8 +1239,9 @@ static int ath6kl_wmi_neighbor_report_event_rx(struct wmi wmi, u8 datap, · 436 unmodified lines
1229	1239	ev = (struct wmi_neighbor_report_event *) datap;
1230	1240	if (sizeof(ev) + ev->num_neighbors sizeof(struct wmi_neighbor_info)
1231	1241	> len) {
1232		− ath6kl_dbg(ATH6KL_DBG_WMI, "truncated neighbor event "
1233		− "(num=%d len=%d)\n", ev->num_neighbors, len);
	1242	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	1243	+ "truncated neighbor event (num=%d len=%d)\n",
	1244	+ ev->num_neighbors, len);
1234	1245	return -EINVAL;
1235	1246	}
1236	1247	for (i = 0; i < ev->num_neighbors; i++) {
@@ -1814,12 +1825,14 @@ int ath6kl_wmi_beginscan_cmd(struct wmi *wmi, u8 if_idx, · 577 unmodified lines
1814	1825	u32 home_dwell_time, u32 force_scan_interval,
1815	1826	s8 num_chan, u16 ch_list, u32 no_cck, u32 rates)
1816	1827	{
	1828	+ struct ieee80211_supported_band *sband;
1817	1829	struct sk_buff *skb;
1818	1830	struct wmi_begin_scan_cmd *sc;
1819		− s8 size;
	1831	+ s8 size, *supp_rates;
1820	1832	int i, band, ret;
1821	1833	struct ath6kl *ar = wmi->parent_dev;
1822	1834	int num_rates;
	1835	+ u32 ratemask;
1823	1836
1824	1837	size = sizeof(struct wmi_begin_scan_cmd);
1825	1838
@@ -1846,10 +1859,13 @@ int ath6kl_wmi_beginscan_cmd(struct wmi *wmi, u8 if_idx, · 20 unmodified lines
1846	1859	sc->num_ch = num_chan;
1847	1860
1848	1861	for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
1849		− struct ieee80211_supported_band *sband =
1850		− ar->wiphy->bands[band];
1851		− u32 ratemask = rates[band];
1852		− u8 *supp_rates = sc->supp_rates[band].rates;
	1862	+ sband = ar->wiphy->bands[band];
	1863	+
	1864	+ if (!sband)
	1865	+ continue;
	1866	+
	1867	+ ratemask = rates[band];
	1868	+ supp_rates = sc->supp_rates[band].rates;
1853	1869	num_rates = 0;
1854	1870
1855	1871	for (i = 0; i < sband->n_bitrates; i++) {
@@ -2129,8 +2145,8 @@ int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index, · 273 unmodified lines
2129	2145	struct wmi_add_cipher_key_cmd *cmd;
2130	2146	int ret;
2131	2147
2132		− ath6kl_dbg(ATH6KL_DBG_WMI, "addkey cmd: key_index=%u key_type=%d "
2133		− "key_usage=%d key_len=%d key_op_ctrl=%d\n",
	2148	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	2149	+ "addkey cmd: key_index=%u key_type=%d key_usage=%d key_len=%d key_op_ctrl=%d\n",
2134	2150	key_index, key_type, key_usage, key_len, key_op_ctrl);
2135	2151
2136	2152	if ((key_index > WMI_MAX_KEY_INDEX) \|\| (key_len > WMI_MAX_KEY_LEN) \|\|
@@ -3047,8 +3063,8 @@ int ath6kl_wmi_ap_profile_commit(struct wmi *wmip, u8 if_idx, · 910 unmodified lines
3047	3063
3048	3064	res = ath6kl_wmi_cmd_send(wmip, if_idx, skb, WMI_AP_CONFIG_COMMIT_CMDID,
3049	3065	NO_SYNC_WMIFLAG);
3050		− ath6kl_dbg(ATH6KL_DBG_WMI, "%s: nw_type=%u auth_mode=%u ch=%u "
3051		− "ctrl_flags=0x%x-> res=%d\n",
	3066	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	3067	+ "%s: nw_type=%u auth_mode=%u ch=%u ctrl_flags=0x%x-> res=%d\n",
3052	3068	__func__, p->nw_type, p->auth_mode, le16_to_cpu(p->ch),
3053	3069	le32_to_cpu(p->ctrl_flags), res);
3054	3070	return res;
@@ -3208,8 +3224,9 @@ int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 if_idx, u8 mgmt_frm_type, · 153 unmodified lines
3208	3224	if (!skb)
3209	3225	return -ENOMEM;
3210	3226
3211		− ath6kl_dbg(ATH6KL_DBG_WMI, "set_appie_cmd: mgmt_frm_type=%u "
3212		− "ie_len=%u\n", mgmt_frm_type, ie_len);
	3227	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	3228	+ "set_appie_cmd: mgmt_frm_type=%u ie_len=%u\n",
	3229	+ mgmt_frm_type, ie_len);
3213	3230	p = (struct wmi_set_appie_cmd *) skb->data;
3214	3231	p->mgmt_frm_type = mgmt_frm_type;
3215	3232	p->ie_len = ie_len;
@@ -3310,8 +3327,9 @@ static int ath6kl_wmi_send_action_cmd(struct wmi *wmi, u8 if_idx, u32 id, · 94 unmodified lines
3310	3327	wmi->last_mgmt_tx_frame = buf;
3311	3328	wmi->last_mgmt_tx_frame_len = data_len;
3312	3329
3313		− ath6kl_dbg(ATH6KL_DBG_WMI, "send_action_cmd: id=%u freq=%u wait=%u "
3314		− "len=%u\n", id, freq, wait, data_len);
	3330	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	3331	+ "send_action_cmd: id=%u freq=%u wait=%u len=%u\n",
	3332	+ id, freq, wait, data_len);
3315	3333	p = (struct wmi_send_action_cmd *) skb->data;
3316	3334	p->id = cpu_to_le32(id);
3317	3335	p->freq = cpu_to_le32(freq);
@@ -3348,8 +3366,9 @@ static int __ath6kl_wmi_send_mgmt_cmd(struct wmi *wmi, u8 if_idx, u32 id, · 30 unmodified lines
3348	3366	wmi->last_mgmt_tx_frame = buf;
3349	3367	wmi->last_mgmt_tx_frame_len = data_len;
3350	3368
3351		− ath6kl_dbg(ATH6KL_DBG_WMI, "send_action_cmd: id=%u freq=%u wait=%u "
3352		− "len=%u\n", id, freq, wait, data_len);
	3369	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	3370	+ "send_action_cmd: id=%u freq=%u wait=%u len=%u\n",
	3371	+ id, freq, wait, data_len);
3353	3372	p = (struct wmi_send_mgmt_cmd *) skb->data;
3354	3373	p->id = cpu_to_le32(id);
3355	3374	p->freq = cpu_to_le32(freq);
@@ -3402,8 +3421,9 @@ int ath6kl_wmi_send_probe_response_cmd(struct wmi *wmi, u8 if_idx, u32 freq, · 46 unmodified lines
3402	3421	if (!skb)
3403	3422	return -ENOMEM;
3404	3423
3405		− ath6kl_dbg(ATH6KL_DBG_WMI, "send_probe_response_cmd: freq=%u dst=%pM "
3406		− "len=%u\n", freq, dst, data_len);
	3424	+ ath6kl_dbg(ATH6KL_DBG_WMI,
	3425	+ "send_probe_response_cmd: freq=%u dst=%pM len=%u\n",
	3426	+ freq, dst, data_len);
3407	3427	p = (struct wmi_p2p_probe_response_cmd *) skb->data;
3408	3428	p->freq = cpu_to_le32(freq);
3409	3429	memcpy(p->destination_addr, dst, ETH_ALEN);

drivers/net/wireless/ath/ath6kl/wmi.h+24−0

@@ -106,6 +106,8 @@ struct wmi_data_sync_bufs { · 105 unmodified lines
106	106	#define WMM_AC_VI 2 /* video */
107	107	#define WMM_AC_VO 3 /* voice */
108	108
	109	+#define WMI_VOICE_USER_PRIORITY 0x7
	110	+
109	111	struct wmi {
110	112	u16 stream_exist_for_ac[WMM_NUM_AC];
111	113	u8 fat_pipe_exist;
@@ -1151,6 +1153,7 @@ enum wmi_phy_mode { · 1039 unmodified lines
1151	1153	WMI_11AG_MODE = 0x3,
1152	1154	WMI_11B_MODE = 0x4,
1153	1155	WMI_11GONLY_MODE = 0x5,
	1156	+ WMI_11G_HT20 = 0x6,
1154	1157	};
1155	1158
1156	1159	#define WMI_MAX_CHANNELS 32
@@ -1416,6 +1419,16 @@ struct wmi_ready_event_2 { · 259 unmodified lines
1416	1419	u8 phy_cap;
1417	1420	} __packed;
1418	1421
	1422	+/* WMI_PHY_CAPABILITY */
	1423	+enum wmi_phy_cap {
	1424	+ WMI_11A_CAP = 0x01,
	1425	+ WMI_11G_CAP = 0x02,
	1426	+ WMI_11AG_CAP = 0x03,
	1427	+ WMI_11AN_CAP = 0x04,
	1428	+ WMI_11GN_CAP = 0x05,
	1429	+ WMI_11AGN_CAP = 0x06,
	1430	+};
	1431	+
1419	1432	/* Connect Event */
1420	1433	struct wmi_connect_event {
1421	1434	union {
@@ -1468,6 +1481,17 @@ enum wmi_disconnect_reason { · 46 unmodified lines
1468	1481	IBSS_MERGE = 0xe,
1469	1482	};
1470	1483
	1484	+/* AP mode disconnect proto_reasons */
	1485	+enum ap_disconnect_reason {
	1486	+ WMI_AP_REASON_STA_LEFT = 101,
	1487	+ WMI_AP_REASON_FROM_HOST = 102,
	1488	+ WMI_AP_REASON_COMM_TIMEOUT = 103,
	1489	+ WMI_AP_REASON_MAX_STA = 104,
	1490	+ WMI_AP_REASON_ACL = 105,
	1491	+ WMI_AP_REASON_STA_ROAM = 106,
	1492	+ WMI_AP_REASON_DFS_CHANNEL = 107,
	1493	+};
	1494	+
1471	1495	#define ATH6KL_COUNTRY_RD_SHIFT 16
1472	1496
1473	1497	struct ath6kl_wmi_regdomain {

drivers/net/wireless/ath/ath9k/ar9003_calib.c+10−40

@@ -892,34 +892,6 @@ static void ar9003_hw_tx_iq_cal_reload(struct ath_hw *ah) · 891 unmodified lines
892	892	AR_PHY_RX_IQCAL_CORR_B0_LOOPBACK_IQCORR_EN, 0x1);
893	893	}
894	894
895		−static bool ar9003_hw_rtt_restore(struct ath_hw ah, struct ath9k_channel chan)
896		−{
897		− struct ath9k_rtt_hist *hist;
898		− u32 *table;
899		− int i;
900		− bool restore;
901		−
902		− if (!ah->caldata)
903		− return false;
904		−
905		− hist = &ah->caldata->rtt_hist;
906		− if (!hist->num_readings)
907		− return false;
908		−
909		− ar9003_hw_rtt_enable(ah);
910		− ar9003_hw_rtt_set_mask(ah, 0x00);
911		− for (i = 0; i < AR9300_MAX_CHAINS; i++) {
912		− if (!(ah->rxchainmask & (1 << i)))
913		− continue;
914		− table = &hist->table[i][hist->num_readings][0];
915		− ar9003_hw_rtt_load_hist(ah, i, table);
916		− }
917		− restore = ar9003_hw_rtt_force_restore(ah);
918		− ar9003_hw_rtt_disable(ah);
919		−
920		− return restore;
921		−}
922		−
923	895	static bool ar9003_hw_init_cal(struct ath_hw *ah,
924	896	struct ath9k_channel *chan)
925	897	{
@@ -942,9 +914,10 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, · 16 unmodified lines
942	914	if (!ar9003_hw_rtt_restore(ah, chan))
943	915	run_rtt_cal = true;
944	916
945		− ath_dbg(common, CALIBRATE, "RTT restore %s\n",
946		− run_rtt_cal ? "failed" : "succeed");
	917	+ if (run_rtt_cal)
	918	+ ath_dbg(common, CALIBRATE, "RTT calibration to be done\n");
947	919	}
	920	+
948	921	run_agc_cal = run_rtt_cal;
949	922
950	923	if (run_rtt_cal) {
@@ -1069,17 +1042,14 @@ skip_tx_iqcal: · 118 unmodified lines
1069	1042	#undef CL_TAB_ENTRY
1070	1043
1071	1044	if (run_rtt_cal && caldata) {
1072		− struct ath9k_rtt_hist *hist = &caldata->rtt_hist;
1073		− if (is_reusable && (hist->num_readings < RTT_HIST_MAX)) {
1074		− u32 *table;
	1045	+ if (is_reusable) {
	1046	+ if (!ath9k_hw_rfbus_req(ah))
	1047	+ ath_err(ath9k_hw_common(ah),
	1048	+ "Could not stop baseband\n");
	1049	+ else
	1050	+ ar9003_hw_rtt_fill_hist(ah);
1075	1051
1076		− hist->num_readings++;
1077		− for (i = 0; i < AR9300_MAX_CHAINS; i++) {
1078		− if (!(ah->rxchainmask & (1 << i)))
1079		− continue;
1080		− table = &hist->table[i][hist->num_readings][0];
1081		− ar9003_hw_rtt_fill_hist(ah, i, table);
1082		− }
	1052	+ ath9k_hw_rfbus_done(ah);
1083	1053	}
1084	1054
1085	1055	ar9003_hw_rtt_disable(ah);

drivers/net/wireless/ath/ath9k/ar9003_mci.c+1−1

@@ -756,7 +756,7 @@ int ar9003_mci_end_reset(struct ath_hw ah, struct ath9k_channel chan, · 755 unmodified lines
756	756	if (caldata) {
757	757	caldata->done_txiqcal_once = false;
758	758	caldata->done_txclcal_once = false;
759		− caldata->rtt_hist.num_readings = 0;
	759	+ caldata->rtt_done = false;
760	760	}
761	761
762	762	if (!ath9k_hw_init_cal(ah, chan))

drivers/net/wireless/ath/ath9k/ar9003_rtt.c+69−15

@@ -15,6 +15,7 @@ · 14 unmodified lines
15	15	*/
16	16
17	17	#include "hw.h"
	18	+#include "hw-ops.h"
18	19	#include "ar9003_phy.h"
19	20	#include "ar9003_rtt.h"
20	21
@@ -69,7 +70,7 @@ bool ar9003_hw_rtt_force_restore(struct ath_hw *ah) · 48 unmodified lines
69	70	}
70	71
71	72	static void ar9003_hw_rtt_load_hist_entry(struct ath_hw *ah, u8 chain,
72		− u32 index, u32 data28)
	73	+ u32 index, u32 data28)
73	74	{
74	75	u32 val;
75	76
@@ -100,12 +101,21 @@ static void ar9003_hw_rtt_load_hist_entry(struct ath_hw *ah, u8 chain, · 24 unmodified lines
100	101	RTT_ACCESS_TIMEOUT);
101	102	}
102	103
103		−void ar9003_hw_rtt_load_hist(struct ath_hw ah, u8 chain, u32 table)
	104	+void ar9003_hw_rtt_load_hist(struct ath_hw *ah)
104	105	{
105		− int i;
	106	+ int chain, i;
106	107
107		− for (i = 0; i < MAX_RTT_TABLE_ENTRY; i++)
108		− ar9003_hw_rtt_load_hist_entry(ah, chain, i, table[i]);
	108	+ for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
	109	+ if (!(ah->rxchainmask & (1 << chain)))
	110	+ continue;
	111	+ for (i = 0; i < MAX_RTT_TABLE_ENTRY; i++) {
	112	+ ar9003_hw_rtt_load_hist_entry(ah, chain, i,
	113	+ ah->caldata->rtt_table[chain][i]);
	114	+ ath_dbg(ath9k_hw_common(ah), CALIBRATE,
	115	+ "Load RTT value at idx %d, chain %d: 0x%x\n",
	116	+ i, chain, ah->caldata->rtt_table[chain][i]);
	117	+ }
	118	+ }
109	119	}
110	120
111	121	static int ar9003_hw_rtt_fill_hist_entry(struct ath_hw *ah, u8 chain, u32 index)
@@ -128,27 +138,71 @@ static int ar9003_hw_rtt_fill_hist_entry(struct ath_hw *ah, u8 chain, u32 index) · 16 unmodified lines
128	138	RTT_ACCESS_TIMEOUT))
129	139	return RTT_BAD_VALUE;
130	140
131		− val = REG_READ(ah, AR_PHY_RTT_TABLE_SW_INTF_1_B(chain));
	141	+ val = MS(REG_READ(ah, AR_PHY_RTT_TABLE_SW_INTF_1_B(chain)),
	142	+ AR_PHY_RTT_SW_RTT_TABLE_DATA);
	143	+
132	144
133	145	return val;
134	146	}
135	147
136		−void ar9003_hw_rtt_fill_hist(struct ath_hw ah, u8 chain, u32 table)
	148	+void ar9003_hw_rtt_fill_hist(struct ath_hw *ah)
137	149	{
138		− int i;
	150	+ int chain, i;
	151	+
	152	+ for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
	153	+ if (!(ah->rxchainmask & (1 << chain)))
	154	+ continue;
	155	+ for (i = 0; i < MAX_RTT_TABLE_ENTRY; i++) {
	156	+ ah->caldata->rtt_table[chain][i] =
	157	+ ar9003_hw_rtt_fill_hist_entry(ah, chain, i);
	158	+ ath_dbg(ath9k_hw_common(ah), CALIBRATE,
	159	+ "RTT value at idx %d, chain %d is: 0x%x\n",
	160	+ i, chain, ah->caldata->rtt_table[chain][i]);
	161	+ }
	162	+ }
139	163
140		− for (i = 0; i < MAX_RTT_TABLE_ENTRY; i++)
141		− table[i] = ar9003_hw_rtt_fill_hist_entry(ah, chain, i);
	164	+ ah->caldata->rtt_done = true;
142	165	}
143	166
144	167	void ar9003_hw_rtt_clear_hist(struct ath_hw *ah)
145	168	{
146		− int i, j;
	169	+ int chain, i;
147	170
148		− for (i = 0; i < AR9300_MAX_CHAINS; i++) {
149		− if (!(ah->rxchainmask & (1 << i)))
	171	+ for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
	172	+ if (!(ah->rxchainmask & (1 << chain)))
150	173	continue;
151		− for (j = 0; j < MAX_RTT_TABLE_ENTRY; j++)
152		− ar9003_hw_rtt_load_hist_entry(ah, i, j, 0);
	174	+ for (i = 0; i < MAX_RTT_TABLE_ENTRY; i++)
	175	+ ar9003_hw_rtt_load_hist_entry(ah, chain, i, 0);
153	176	}
	177	+
	178	+ if (ah->caldata)
	179	+ ah->caldata->rtt_done = false;
	180	+}
	181	+
	182	+bool ar9003_hw_rtt_restore(struct ath_hw ah, struct ath9k_channel chan)
	183	+{
	184	+ bool restore;
	185	+
	186	+ if (!ah->caldata)
	187	+ return false;
	188	+
	189	+ if (!ah->caldata->rtt_done)
	190	+ return false;
	191	+
	192	+ ar9003_hw_rtt_enable(ah);
	193	+ ar9003_hw_rtt_set_mask(ah, 0x10);
	194	+
	195	+ if (!ath9k_hw_rfbus_req(ah)) {
	196	+ ath_err(ath9k_hw_common(ah), "Could not stop baseband\n");
	197	+ restore = false;
	198	+ goto fail;
	199	+ }
	200	+
	201	+ ar9003_hw_rtt_load_hist(ah);
	202	+ restore = ar9003_hw_rtt_force_restore(ah);
	203	+
	204	+fail:
	205	+ ath9k_hw_rfbus_done(ah);
	206	+ ar9003_hw_rtt_disable(ah);
	207	+ return restore;
154	208	}

drivers/net/wireless/ath/ath9k/ar9003_rtt.h+3−2

@@ -21,8 +21,9 @@ void ar9003_hw_rtt_enable(struct ath_hw *ah); · 20 unmodified lines
21	21	void ar9003_hw_rtt_disable(struct ath_hw *ah);
22	22	void ar9003_hw_rtt_set_mask(struct ath_hw *ah, u32 rtt_mask);
23	23	bool ar9003_hw_rtt_force_restore(struct ath_hw *ah);
24		−void ar9003_hw_rtt_load_hist(struct ath_hw ah, u8 chain, u32 table);
25		−void ar9003_hw_rtt_fill_hist(struct ath_hw ah, u8 chain, u32 table);
	24	+void ar9003_hw_rtt_load_hist(struct ath_hw *ah);
	25	+void ar9003_hw_rtt_fill_hist(struct ath_hw *ah);
26	26	void ar9003_hw_rtt_clear_hist(struct ath_hw *ah);
	27	+bool ar9003_hw_rtt_restore(struct ath_hw ah, struct ath9k_channel chan);
27	28
28	29	#endif

drivers/net/wireless/ath/ath9k/hw.c+4−5

@@ -1702,10 +1702,10 @@ static int ath9k_hw_do_fastcc(struct ath_hw ah, struct ath9k_channel chan) · 1701 unmodified lines
1702	1702	* For AR9462, make sure that calibration data for
1703	1703	* re-using are present.
1704	1704	*/
1705		− if (AR_SREV_9462(ah) && (!ah->caldata \|\|
1706		− !ah->caldata->done_txiqcal_once \|\|
1707		− !ah->caldata->done_txclcal_once \|\|
1708		− !ah->caldata->rtt_hist.num_readings))
	1705	+ if (AR_SREV_9462(ah) && (ah->caldata &&
	1706	+ (!ah->caldata->done_txiqcal_once \|\|
	1707	+ !ah->caldata->done_txclcal_once \|\|
	1708	+ !ah->caldata->rtt_done)))
1709	1709	goto fail;
1710	1710
1711	1711	ath_dbg(common, RESET, "FastChannelChange for %d -> %d\n",
@@ -1941,7 +1941,6 @@ int ath9k_hw_reset(struct ath_hw ah, struct ath9k_channel chan, · 229 unmodified lines
1941	1941	if (caldata) {
1942	1942	caldata->done_txiqcal_once = false;
1943	1943	caldata->done_txclcal_once = false;
1944		− caldata->rtt_hist.num_readings = 0;
1945	1944	}
1946	1945	if (!ath9k_hw_init_cal(ah, chan))
1947	1946	return -EIO;

drivers/net/wireless/ath/ath9k/hw.h+2−7

@@ -348,12 +348,6 @@ enum ath9k_int { · 347 unmodified lines
348	348	CHANNEL_HT40MINUS)
349	349
350	350	#define MAX_RTT_TABLE_ENTRY 6
351		−#define RTT_HIST_MAX 3
352		−struct ath9k_rtt_hist {
353		− u32 table[AR9300_MAX_CHAINS][RTT_HIST_MAX][MAX_RTT_TABLE_ENTRY];
354		− u8 num_readings;
355		−};
356		−
357	351	#define MAX_IQCAL_MEASUREMENT 8
358	352	#define MAX_CL_TAB_ENTRY 16
359	353
@@ -363,6 +357,7 @@ struct ath9k_hw_cal_data { · 3 unmodified lines
363	357	int32_t CalValid;
364	358	int8_t iCoff;
365	359	int8_t qCoff;
	360	+ bool rtt_done;
366	361	bool paprd_done;
367	362	bool nfcal_pending;
368	363	bool nfcal_interference;
@@ -373,8 +368,8 @@ struct ath9k_hw_cal_data { · 4 unmodified lines
373	368	u32 num_measures[AR9300_MAX_CHAINS];
374	369	int tx_corr_coeff[MAX_IQCAL_MEASUREMENT][AR9300_MAX_CHAINS];
375	370	u32 tx_clcal[AR9300_MAX_CHAINS][MAX_CL_TAB_ENTRY];
	371	+ u32 rtt_table[AR9300_MAX_CHAINS][MAX_RTT_TABLE_ENTRY];
376	372	struct ath9k_nfcal_hist nfCalHist[NUM_NF_READINGS];
377		− struct ath9k_rtt_hist rtt_hist;
378	373	};
379	374
380	375	struct ath9k_channel {

drivers/net/wireless/b43/bus.c+2−4

@@ -107,11 +107,9 @@ struct b43_bus_dev b43_bus_dev_bcma_init(struct bcma_device core) · 106 unmodified lines
107	107	dev->dma_dev = core->dma_dev;
108	108	dev->irq = core->irq;
109	109
110		− /*
111	110	dev->board_vendor = core->bus->boardinfo.vendor;
112	111	dev->board_type = core->bus->boardinfo.type;
113		− dev->board_rev = core->bus->boardinfo.rev;
114		− */
	112	+ dev->board_rev = core->bus->sprom.board_rev;
115	113
116	114	dev->chip_id = core->bus->chipinfo.id;
117	115	dev->chip_rev = core->bus->chipinfo.rev;
@@ -210,7 +208,7 @@ struct b43_bus_dev b43_bus_dev_ssb_init(struct ssb_device sdev) · 92 unmodified lines
210	208
211	209	dev->board_vendor = sdev->bus->boardinfo.vendor;
212	210	dev->board_type = sdev->bus->boardinfo.type;
213		− dev->board_rev = sdev->bus->boardinfo.rev;
	211	+ dev->board_rev = sdev->bus->sprom.board_rev;
214	212
215	213	dev->chip_id = sdev->bus->chip_id;
216	214	dev->chip_rev = sdev->bus->chip_rev;

drivers/net/wireless/b43/dma.c+1−1

@@ -1109,7 +1109,7 @@ static bool b43_dma_translation_in_low_word(struct b43_wldev *dev, · 1108 unmodified lines
1109	1109	#ifdef CONFIG_B43_SSB
1110	1110	if (dev->dev->bus_type == B43_BUS_SSB &&
1111	1111	dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
1112		− !(dev->dev->sdev->bus->host_pci->is_pcie &&
	1112	+ !(pci_is_pcie(dev->dev->sdev->bus->host_pci) &&
1113	1113	ssb_read32(dev->dev->sdev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64))
1114	1114	return 1;
1115	1115	#endif

drivers/net/wireless/b43/main.c+2−2

@@ -5243,10 +5243,10 @@ static void b43_sprom_fixup(struct ssb_bus *bus) · 5242 unmodified lines
5243	5243
5244	5244	/* boardflags workarounds */
5245	5245	if (bus->boardinfo.vendor == SSB_BOARDVENDOR_DELL &&
5246		− bus->chip_id == 0x4301 && bus->boardinfo.rev == 0x74)
	5246	+ bus->chip_id == 0x4301 && bus->sprom.board_rev == 0x74)
5247	5247	bus->sprom.boardflags_lo \|= B43_BFL_BTCOEXIST;
5248	5248	if (bus->boardinfo.vendor == PCI_VENDOR_ID_APPLE &&
5249		− bus->boardinfo.type == 0x4E && bus->boardinfo.rev > 0x40)
	5249	+ bus->boardinfo.type == 0x4E && bus->sprom.board_rev > 0x40)
5250	5250	bus->sprom.boardflags_lo \|= B43_BFL_PACTRL;
5251	5251	if (bus->bustype == SSB_BUSTYPE_PCI) {
5252	5252	pdev = bus->host_pci;

drivers/net/wireless/b43legacy/main.c+1−3

@@ -1573,8 +1573,6 @@ static void b43legacy_request_firmware(struct work_struct *work) · 1572 unmodified lines
1573	1573	const char *filename;
1574	1574	int err;
1575	1575
1576		− /* do dummy read */
1577		− ssb_read32(dev->dev, SSB_TMSHIGH);
1578	1576	if (!fw->ucode) {
1579	1577	if (rev == 2)
1580	1578	filename = "ucode2";
@@ -3781,7 +3779,7 @@ static void b43legacy_sprom_fixup(struct ssb_bus *bus) · 2200 unmodified lines
3781	3779	/* boardflags workarounds */
3782	3780	if (bus->boardinfo.vendor == PCI_VENDOR_ID_APPLE &&
3783	3781	bus->boardinfo.type == 0x4E &&
3784		− bus->boardinfo.rev > 0x40)
	3782	+ bus->sprom.board_rev > 0x40)
3785	3783	bus->sprom.boardflags_lo \|= B43legacy_BFL_PACTRL;
3786	3784	}
3787	3785

drivers/net/wireless/b43legacy/phy.c+2−2

@@ -408,7 +408,7 @@ static void b43legacy_phy_setupg(struct b43legacy_wldev *dev) · 407 unmodified lines
408	408
409	409	if (is_bcm_board_vendor(dev) &&
410	410	(dev->dev->bus->boardinfo.type == 0x0416) &&
411		− (dev->dev->bus->boardinfo.rev == 0x0017))
	411	+ (dev->dev->bus->sprom.board_rev == 0x0017))
412	412	return;
413	413
414	414	b43legacy_ilt_write(dev, 0x5001, 0x0002);
@@ -424,7 +424,7 @@ static void b43legacy_phy_setupg(struct b43legacy_wldev *dev) · 9 unmodified lines
424	424
425	425	if (is_bcm_board_vendor(dev) &&
426	426	(dev->dev->bus->boardinfo.type == 0x0416) &&
427		− (dev->dev->bus->boardinfo.rev == 0x0017))
	427	+ (dev->dev->bus->sprom.board_rev == 0x0017))
428	428	return;
429	429
430	430	b43legacy_ilt_write(dev, 0x0401, 0x0002);

drivers/net/wireless/b43legacy/radio.c+5−5

@@ -1998,7 +1998,7 @@ u16 b43legacy_default_radio_attenuation(struct b43legacy_wldev *dev) · 1997 unmodified lines
1998	1998	if (phy->type == B43legacy_PHYTYPE_G) {
1999	1999	if (is_bcm_board_vendor(dev) &&
2000	2000	dev->dev->bus->boardinfo.type == 0x421 &&
2001		− dev->dev->bus->boardinfo.rev >= 30)
	2001	+ dev->dev->bus->sprom.board_rev >= 30)
2002	2002	att = 3;
2003	2003	else if (is_bcm_board_vendor(dev) &&
2004	2004	dev->dev->bus->boardinfo.type == 0x416)
@@ -2008,7 +2008,7 @@ u16 b43legacy_default_radio_attenuation(struct b43legacy_wldev *dev) · 3 unmodified lines
2008	2008	} else {
2009	2009	if (is_bcm_board_vendor(dev) &&
2010	2010	dev->dev->bus->boardinfo.type == 0x421 &&
2011		− dev->dev->bus->boardinfo.rev >= 30)
	2011	+ dev->dev->bus->sprom.board_rev >= 30)
2012	2012	att = 7;
2013	2013	else
2014	2014	att = 6;
@@ -2018,7 +2018,7 @@ u16 b43legacy_default_radio_attenuation(struct b43legacy_wldev *dev) · 3 unmodified lines
2018	2018	if (phy->type == B43legacy_PHYTYPE_G) {
2019	2019	if (is_bcm_board_vendor(dev) &&
2020	2020	dev->dev->bus->boardinfo.type == 0x421 &&
2021		− dev->dev->bus->boardinfo.rev >= 30)
	2021	+ dev->dev->bus->sprom.board_rev >= 30)
2022	2022	att = 3;
2023	2023	else if (is_bcm_board_vendor(dev) &&
2024	2024	dev->dev->bus->boardinfo.type ==
@@ -2052,9 +2052,9 @@ u16 b43legacy_default_radio_attenuation(struct b43legacy_wldev *dev) · 27 unmodified lines
2052	2052	}
2053	2053	if (is_bcm_board_vendor(dev) &&
2054	2054	dev->dev->bus->boardinfo.type == 0x421) {
2055		− if (dev->dev->bus->boardinfo.rev < 0x43)
	2055	+ if (dev->dev->bus->sprom.board_rev < 0x43)
2056	2056	att = 2;
2057		− else if (dev->dev->bus->boardinfo.rev < 0x51)
	2057	+ else if (dev->dev->bus->sprom.board_rev < 0x51)
2058	2058	att = 3;
2059	2059	}
2060	2060	if (att == 0xFFFF)

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c+117−127

@@ -85,18 +85,15 @@ int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev) · 84 unmodified lines
85	85	sdiodev->irq_wake = true;
86	86
87	87	/* must configure SDIO_CCCR_IENx to enable irq */
88		− data = brcmf_sdcard_cfg_read(sdiodev, SDIO_FUNC_0,
89		− SDIO_CCCR_IENx, &ret);
	88	+ data = brcmf_sdio_regrb(sdiodev, SDIO_CCCR_IENx, &ret);
90	89	data \|= 1 << SDIO_FUNC_1 \| 1 << SDIO_FUNC_2 \| 1;
91		− brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_0, SDIO_CCCR_IENx,
92		− data, &ret);
	90	+ brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, data, &ret);
93	91
94	92	/* redirect, configure ane enable io for interrupt signal */
95	93	data = SDIO_SEPINT_MASK \| SDIO_SEPINT_OE;
96	94	if (sdiodev->irq_flags \| IRQF_TRIGGER_HIGH)
97	95	data \|= SDIO_SEPINT_ACT_HI;
98		− brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_0, SDIO_CCCR_BRCM_SEPINT,
99		− data, &ret);
	96	+ brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, data, &ret);
100	97
101	98	return 0;
102	99	}
@@ -105,9 +102,8 @@ int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev) · 2 unmodified lines
105	102	{
106	103	brcmf_dbg(TRACE, "Entering\n");
107	104
108		− brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_0, SDIO_CCCR_BRCM_SEPINT,
109		− 0, NULL);
110		− brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_0, SDIO_CCCR_IENx, 0, NULL);
	105	+ brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, 0, NULL);
	106	+ brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, 0, NULL);
111	107
112	108	if (sdiodev->irq_wake) {
113	109	disable_irq_wake(sdiodev->irq);
@@ -158,153 +154,147 @@ int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev) · 44 unmodified lines
158	154	}
159	155	#endif /* CONFIG_BRCMFMAC_SDIO_OOB */
160	156
161		−u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr,
162		− int *err)
163		−{
164		− int status;
165		− s32 retry = 0;
166		− u8 data = 0;
167		−
168		− do {
169		− if (retry) /* wait for 1 ms till bus get settled down */
170		− udelay(1000);
171		− status = brcmf_sdioh_request_byte(sdiodev, SDIOH_READ, fnc_num,
172		− addr, (u8 *) &data);
173		− } while (status != 0
174		− && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT));
175		− if (err)
176		− *err = status;
177		−
178		− brcmf_dbg(INFO, "fun = %d, addr = 0x%x, u8data = 0x%x\n",
179		− fnc_num, addr, data);
180		−
181		− return data;
182		−}
183		−
184		−void
185		−brcmf_sdcard_cfg_write(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr,
186		− u8 data, int *err)
187		−{
188		− int status;
189		− s32 retry = 0;
190		−
191		− do {
192		− if (retry) /* wait for 1 ms till bus get settled down */
193		− udelay(1000);
194		− status = brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE, fnc_num,
195		− addr, (u8 *) &data);
196		− } while (status != 0
197		− && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT));
198		− if (err)
199		− *err = status;
200		−
201		− brcmf_dbg(INFO, "fun = %d, addr = 0x%x, u8data = 0x%x\n",
202		− fnc_num, addr, data);
203		−}
204		−
205	157	int
206	158	brcmf_sdcard_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address)
207	159	{
208		− int err = 0;
209		− brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW,
210		− (address >> 8) & SBSDIO_SBADDRLOW_MASK, &err);
211		− if (!err)
212		− brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1,
213		− SBSDIO_FUNC1_SBADDRMID,
214		− (address >> 16) & SBSDIO_SBADDRMID_MASK,
215		− &err);
216		− if (!err)
217		− brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1,
218		− SBSDIO_FUNC1_SBADDRHIGH,
219		− (address >> 24) & SBSDIO_SBADDRHIGH_MASK,
220		− &err);
	160	+ int err = 0, i;
	161	+ u8 addr[3];
	162	+ s32 retry;
	163	+
	164	+ addr[0] = (address >> 8) & SBSDIO_SBADDRLOW_MASK;
	165	+ addr[1] = (address >> 16) & SBSDIO_SBADDRMID_MASK;
	166	+ addr[2] = (address >> 24) & SBSDIO_SBADDRHIGH_MASK;
	167	+
	168	+ for (i = 0; i < 3; i++) {
	169	+ retry = 0;
	170	+ do {
	171	+ if (retry)
	172	+ usleep_range(1000, 2000);
	173	+ err = brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE,
	174	+ SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW + i,
	175	+ &addr[i]);
	176	+ } while (err != 0 && retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);
	177	+
	178	+ if (err) {
	179	+ brcmf_dbg(ERROR, "failed at addr:0x%0x\n",
	180	+ SBSDIO_FUNC1_SBADDRLOW + i);
	181	+ break;
	182	+ }
	183	+ }
221	184
222	185	return err;
223	186	}
224	187
225		−u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size)
	188	+static int
	189	+brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,
	190	+ void *data, bool write)
226	191	{
227		− int status;
228		− u32 word = 0;
229		− uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
230		−
231		− brcmf_dbg(INFO, "fun = 1, addr = 0x%x\n", addr);
232		−
233		− if (bar0 != sdiodev->sbwad) {
234		− if (brcmf_sdcard_set_sbaddr_window(sdiodev, bar0))
235		− return 0xFFFFFFFF;
	192	+ u8 func_num, reg_size;
	193	+ u32 bar;
	194	+ s32 retry = 0;
	195	+ int ret;
236	196
237		− sdiodev->sbwad = bar0;
	197	+ /*
	198	+ * figure out how to read the register based on address range
	199	+ * 0x00 ~ 0x7FF: function 0 CCCR and FBR
	200	+ * 0x10000 ~ 0x1FFFF: function 1 miscellaneous registers
	201	+ * The rest: function 1 silicon backplane core registers
	202	+ */
	203	+ if ((addr & ~REG_F0_REG_MASK) == 0) {
	204	+ func_num = SDIO_FUNC_0;
	205	+ reg_size = 1;
	206	+ } else if ((addr & ~REG_F1_MISC_MASK) == 0) {
	207	+ func_num = SDIO_FUNC_1;
	208	+ reg_size = 1;
	209	+ } else {
	210	+ func_num = SDIO_FUNC_1;
	211	+ reg_size = 4;
	212	+
	213	+ /* Set the window for SB core register */
	214	+ bar = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
	215	+ if (bar != sdiodev->sbwad) {
	216	+ ret = brcmf_sdcard_set_sbaddr_window(sdiodev, bar);
	217	+ if (ret != 0) {
	218	+ memset(data, 0xFF, reg_size);
	219	+ return ret;
	220	+ }
	221	+ sdiodev->sbwad = bar;
	222	+ }
	223	+ addr &= SBSDIO_SB_OFT_ADDR_MASK;
	224	+ addr \|= SBSDIO_SB_ACCESS_2_4B_FLAG;
238	225	}
239	226
240		− addr &= SBSDIO_SB_OFT_ADDR_MASK;
241		− if (size == 4)
242		− addr \|= SBSDIO_SB_ACCESS_2_4B_FLAG;
	227	+ do {
	228	+ if (!write)
	229	+ memset(data, 0, reg_size);
	230	+ if (retry) /* wait for 1 ms till bus get settled down */
	231	+ usleep_range(1000, 2000);
	232	+ if (reg_size == 1)
	233	+ ret = brcmf_sdioh_request_byte(sdiodev, write,
	234	+ func_num, addr, data);
	235	+ else
	236	+ ret = brcmf_sdioh_request_word(sdiodev, write,
	237	+ func_num, addr, data, 4);
	238	+ } while (ret != 0 && retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);
243	239
244		− status = brcmf_sdioh_request_word(sdiodev, SDIOH_READ, SDIO_FUNC_1,
245		− addr, &word, size);
	240	+ if (ret != 0)
	241	+ brcmf_dbg(ERROR, "failed with %d\n", ret);
246	242
247		− sdiodev->regfail = (status != 0);
	243	+ return ret;
	244	+}
248	245
249		− brcmf_dbg(INFO, "u32data = 0x%x\n", word);
	246	+u8 brcmf_sdio_regrb(struct brcmf_sdio_dev sdiodev, u32 addr, int ret)
	247	+{
	248	+ u8 data;
	249	+ int retval;
250	250
251		− /* if ok, return appropriately masked word */
252		− if (status == 0) {
253		− switch (size) {
254		− case sizeof(u8):
255		− return word & 0xff;
256		− case sizeof(u16):
257		− return word & 0xffff;
258		− case sizeof(u32):
259		− return word;
260		− default:
261		− sdiodev->regfail = true;
	251	+ brcmf_dbg(INFO, "addr:0x%08x\n", addr);
	252	+ retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, false);
	253	+ brcmf_dbg(INFO, "data:0x%02x\n", data);
262	254
263		− }
264		− }
	255	+ if (ret)
	256	+ *ret = retval;
265	257
266		− /* otherwise, bad sdio access or invalid size */
267		− brcmf_dbg(ERROR, "error reading addr 0x%04x size %d\n", addr, size);
268		− return 0xFFFFFFFF;
	258	+ return data;
269	259	}
270	260
271		−u32 brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size,
272		− u32 data)
	261	+u32 brcmf_sdio_regrl(struct brcmf_sdio_dev sdiodev, u32 addr, int ret)
273	262	{
274		− int status;
275		− uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
276		− int err = 0;
	263	+ u32 data;
	264	+ int retval;
277	265
278		− brcmf_dbg(INFO, "fun = 1, addr = 0x%x, uint%ddata = 0x%x\n",
279		− addr, size * 8, data);
	266	+ brcmf_dbg(INFO, "addr:0x%08x\n", addr);
	267	+ retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, false);
	268	+ brcmf_dbg(INFO, "data:0x%08x\n", data);
280	269
281		− if (bar0 != sdiodev->sbwad) {
282		− err = brcmf_sdcard_set_sbaddr_window(sdiodev, bar0);
283		− if (err)
284		− return err;
	270	+ if (ret)
	271	+ *ret = retval;
285	272
286		− sdiodev->sbwad = bar0;
287		− }
	273	+ return data;
	274	+}
288	275
289		− addr &= SBSDIO_SB_OFT_ADDR_MASK;
290		− if (size == 4)
291		− addr \|= SBSDIO_SB_ACCESS_2_4B_FLAG;
292		− status =
293		− brcmf_sdioh_request_word(sdiodev, SDIOH_WRITE, SDIO_FUNC_1,
294		− addr, &data, size);
295		− sdiodev->regfail = (status != 0);
	276	+void brcmf_sdio_regwb(struct brcmf_sdio_dev *sdiodev, u32 addr,
	277	+ u8 data, int *ret)
	278	+{
	279	+ int retval;
296	280
297		− if (status == 0)
298		− return 0;
	281	+ brcmf_dbg(INFO, "addr:0x%08x, data:0x%02x\n", addr, data);
	282	+ retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, true);
299	283
300		− brcmf_dbg(ERROR, "error writing 0x%08x to addr 0x%04x size %d\n",
301		− data, addr, size);
302		− return 0xFFFFFFFF;
	284	+ if (ret)
	285	+ *ret = retval;
303	286	}
304	287
305		−bool brcmf_sdcard_regfail(struct brcmf_sdio_dev *sdiodev)
	288	+void brcmf_sdio_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr,
	289	+ u32 data, int *ret)
306	290	{
307		− return sdiodev->regfail;
	291	+ int retval;
	292	+
	293	+ brcmf_dbg(INFO, "addr:0x%08x, data:0x%08x\n", addr, data);
	294	+ retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, true);
	295	+
	296	+ if (ret)
	297	+ *ret = retval;
308	298	}
309	299
310	300	static int brcmf_sdcard_recv_prepare(struct brcmf_sdio_dev *sdiodev, uint fn,

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c+3−29

@@ -346,43 +346,17 @@ int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, · 345 unmodified lines
346	346	return status;
347	347	}
348	348
349		−/* Read client card reg */
350		−static int
351		−brcmf_sdioh_card_regread(struct brcmf_sdio_dev *sdiodev, int func, u32 regaddr,
352		− int regsize, u32 *data)
353		−{
354		−
355		− if ((func == 0) \|\| (regsize == 1)) {
356		− u8 temp = 0;
357		−
358		− brcmf_sdioh_request_byte(sdiodev, SDIOH_READ, func, regaddr,
359		− &temp);
360		− *data = temp;
361		− *data &= 0xff;
362		− brcmf_dbg(DATA, "byte read data=0x%02x\n", *data);
363		− } else {
364		− brcmf_sdioh_request_word(sdiodev, SDIOH_READ, func, regaddr,
365		− data, regsize);
366		− if (regsize == 2)
367		− *data &= 0xffff;
368		−
369		− brcmf_dbg(DATA, "word read data=0x%08x\n", *data);
370		− }
371		−
372		− return SUCCESS;
373		−}
374		−
375	349	static int brcmf_sdioh_get_cisaddr(struct brcmf_sdio_dev *sdiodev, u32 regaddr)
376	350	{
377	351	/* read 24 bits and return valid 17 bit addr */
378		− int i;
	352	+ int i, ret;
379	353	u32 scratch, regdata;
380	354	__le32 scratch_le;
381	355	u8 ptr = (u8 )&scratch_le;
382	356
383	357	for (i = 0; i < 3; i++) {
384		− if ((brcmf_sdioh_card_regread(sdiodev, 0, regaddr, 1,
385		− &regdata)) != SUCCESS)
	358	+ regdata = brcmf_sdio_regrl(sdiodev, regaddr, &ret);
	359	+ if (ret != 0)
386	360	brcmf_dbg(ERROR, "Can't read!\n");
387	361
388	362	*ptr++ = (u8) regdata;

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c+147−203

@@ -629,43 +629,29 @@ static bool data_ok(struct brcmf_sdio *bus) · 628 unmodified lines
629	629	* Reads a register in the SDIO hardware block. This block occupies a series of
630	630	* adresses on the 32 bit backplane bus.
631	631	*/
632		−static void
633		−r_sdreg32(struct brcmf_sdio bus, u32 regvar, u32 reg_offset, u32 *retryvar)
	632	+static int
	633	+r_sdreg32(struct brcmf_sdio bus, u32 regvar, u32 offset)
634	634	{
635	635	u8 idx = brcmf_sdio_chip_getinfidx(bus->ci, BCMA_CORE_SDIO_DEV);
636		− *retryvar = 0;
637		− do {
638		− *regvar = brcmf_sdcard_reg_read(bus->sdiodev,
639		− bus->ci->c_inf[idx].base + reg_offset,
640		− sizeof(u32));
641		− } while (brcmf_sdcard_regfail(bus->sdiodev) &&
642		− (++(*retryvar) <= retry_limit));
643		− if (*retryvar) {
644		− bus->regfails += (*retryvar-1);
645		− if (*retryvar > retry_limit) {
646		− brcmf_dbg(ERROR, "FAILED READ %Xh\n", reg_offset);
647		− *regvar = 0;
648		− }
649		− }
	636	+ int ret;
	637	+
	638	+ *regvar = brcmf_sdio_regrl(bus->sdiodev,
	639	+ bus->ci->c_inf[idx].base + offset, &ret);
	640	+
	641	+ return ret;
650	642	}
651	643
652		−static void
653		−w_sdreg32(struct brcmf_sdio bus, u32 regval, u32 reg_offset, u32 retryvar)
	644	+static int
	645	+w_sdreg32(struct brcmf_sdio *bus, u32 regval, u32 reg_offset)
654	646	{
655	647	u8 idx = brcmf_sdio_chip_getinfidx(bus->ci, BCMA_CORE_SDIO_DEV);
656		− *retryvar = 0;
657		− do {
658		− brcmf_sdcard_reg_write(bus->sdiodev,
659		− bus->ci->c_inf[idx].base + reg_offset,
660		− sizeof(u32), regval);
661		− } while (brcmf_sdcard_regfail(bus->sdiodev) &&
662		− (++(*retryvar) <= retry_limit));
663		− if (*retryvar) {
664		− bus->regfails += (*retryvar-1);
665		− if (*retryvar > retry_limit)
666		− brcmf_dbg(ERROR, "FAILED REGISTER WRITE %Xh\n",
667		− reg_offset);
668		− }
	648	+ int ret;
	649	+
	650	+ brcmf_sdio_regwl(bus->sdiodev,
	651	+ bus->ci->c_inf[idx].base + reg_offset,
	652	+ regval, &ret);
	653	+
	654	+ return ret;
669	655	}
670	656
671	657	#define PKT_AVAILABLE() (intstatus & I_HMB_FRAME_IND)
@@ -697,16 +683,16 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok) · 25 unmodified lines
697	683	clkreq =
698	684	bus->alp_only ? SBSDIO_ALP_AVAIL_REQ : SBSDIO_HT_AVAIL_REQ;
699	685
700		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
701		− SBSDIO_FUNC1_CHIPCLKCSR, clkreq, &err);
	686	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
	687	+ clkreq, &err);
702	688	if (err) {
703	689	brcmf_dbg(ERROR, "HT Avail request error: %d\n", err);
704	690	return -EBADE;
705	691	}
706	692
707	693	/* Check current status */
708		− clkctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
709		− SBSDIO_FUNC1_CHIPCLKCSR, &err);
	694	+ clkctl = brcmf_sdio_regrb(bus->sdiodev,
	695	+ SBSDIO_FUNC1_CHIPCLKCSR, &err);
710	696	if (err) {
711	697	brcmf_dbg(ERROR, "HT Avail read error: %d\n", err);
712	698	return -EBADE;
@@ -715,9 +701,8 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok) · 2 unmodified lines
715	701	/* Go to pending and await interrupt if appropriate */
716	702	if (!SBSDIO_CLKAV(clkctl, bus->alp_only) && pendok) {
717	703	/* Allow only clock-available interrupt */
718		− devctl = brcmf_sdcard_cfg_read(bus->sdiodev,
719		− SDIO_FUNC_1,
720		− SBSDIO_DEVICE_CTL, &err);
	704	+ devctl = brcmf_sdio_regrb(bus->sdiodev,
	705	+ SBSDIO_DEVICE_CTL, &err);
721	706	if (err) {
722	707	brcmf_dbg(ERROR, "Devctl error setting CA: %d\n",
723	708	err);
@@ -725,30 +710,28 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok) · 1 unmodified line
725	710	}
726	711
727	712	devctl \|= SBSDIO_DEVCTL_CA_INT_ONLY;
728		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
729		− SBSDIO_DEVICE_CTL, devctl, &err);
	713	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_DEVICE_CTL,
	714	+ devctl, &err);
730	715	brcmf_dbg(INFO, "CLKCTL: set PENDING\n");
731	716	bus->clkstate = CLK_PENDING;
732	717
733	718	return 0;
734	719	} else if (bus->clkstate == CLK_PENDING) {
735	720	/* Cancel CA-only interrupt filter */
736		− devctl =
737		− brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
	721	+ devctl = brcmf_sdio_regrb(bus->sdiodev,
738	722	SBSDIO_DEVICE_CTL, &err);
739	723	devctl &= ~SBSDIO_DEVCTL_CA_INT_ONLY;
740		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
741		− SBSDIO_DEVICE_CTL, devctl, &err);
	724	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_DEVICE_CTL,
	725	+ devctl, &err);
742	726	}
743	727
744	728	/* Otherwise, wait here (polling) for HT Avail */
745	729	timeout = jiffies +
746	730	msecs_to_jiffies(PMU_MAX_TRANSITION_DLY/1000);
747	731	while (!SBSDIO_CLKAV(clkctl, bus->alp_only)) {
748		− clkctl = brcmf_sdcard_cfg_read(bus->sdiodev,
749		− SDIO_FUNC_1,
750		− SBSDIO_FUNC1_CHIPCLKCSR,
751		− &err);
	732	+ clkctl = brcmf_sdio_regrb(bus->sdiodev,
	733	+ SBSDIO_FUNC1_CHIPCLKCSR,
	734	+ &err);
752	735	if (time_after(jiffies, timeout))
753	736	break;
754	737	else
@@ -781,17 +764,16 @@ static int brcmf_sdbrcm_htclk(struct brcmf_sdio *bus, bool on, bool pendok) · 26 unmodified lines
781	764
782	765	if (bus->clkstate == CLK_PENDING) {
783	766	/* Cancel CA-only interrupt filter */
784		− devctl = brcmf_sdcard_cfg_read(bus->sdiodev,
785		− SDIO_FUNC_1,
786		− SBSDIO_DEVICE_CTL, &err);
	767	+ devctl = brcmf_sdio_regrb(bus->sdiodev,
	768	+ SBSDIO_DEVICE_CTL, &err);
787	769	devctl &= ~SBSDIO_DEVCTL_CA_INT_ONLY;
788		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
789		− SBSDIO_DEVICE_CTL, devctl, &err);
	770	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_DEVICE_CTL,
	771	+ devctl, &err);
790	772	}
791	773
792	774	bus->clkstate = CLK_SDONLY;
793		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
794		− SBSDIO_FUNC1_CHIPCLKCSR, clkreq, &err);
	775	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
	776	+ clkreq, &err);
795	777	brcmf_dbg(INFO, "CLKCTL: turned OFF\n");
796	778	if (err) {
797	779	brcmf_dbg(ERROR, "Failed access turning clock off: %d\n",
@@ -874,7 +856,7 @@ static int brcmf_sdbrcm_clkctl(struct brcmf_sdio *bus, uint target, bool pendok) · 76 unmodified lines
874	856
875	857	static int brcmf_sdbrcm_bussleep(struct brcmf_sdio *bus, bool sleep)
876	858	{
877		− uint retries = 0;
	859	+ int ret;
878	860
879	861	brcmf_dbg(INFO, "request %s (currently %s)\n",
880	862	sleep ? "SLEEP" : "WAKE",
@@ -894,22 +876,20 @@ static int brcmf_sdbrcm_bussleep(struct brcmf_sdio *bus, bool sleep) · 13 unmodified lines
894	876	brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);
895	877
896	878	/* Tell device to start using OOB wakeup */
897		− w_sdreg32(bus, SMB_USE_OOB,
898		− offsetof(struct sdpcmd_regs, tosbmailbox), &retries);
899		− if (retries > retry_limit)
	879	+ ret = w_sdreg32(bus, SMB_USE_OOB,
	880	+ offsetof(struct sdpcmd_regs, tosbmailbox));
	881	+ if (ret != 0)
900	882	brcmf_dbg(ERROR, "CANNOT SIGNAL CHIP, WILL NOT WAKE UP!!\n");
901	883
902	884	/* Turn off our contribution to the HT clock request */
903	885	brcmf_sdbrcm_clkctl(bus, CLK_SDONLY, false);
904	886
905		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
906		− SBSDIO_FUNC1_CHIPCLKCSR,
907		− SBSDIO_FORCE_HW_CLKREQ_OFF, NULL);
	887	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
	888	+ SBSDIO_FORCE_HW_CLKREQ_OFF, NULL);
908	889
909	890	/* Isolate the bus */
910		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
911		− SBSDIO_DEVICE_CTL,
912		− SBSDIO_DEVCTL_PADS_ISO, NULL);
	891	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_DEVICE_CTL,
	892	+ SBSDIO_DEVCTL_PADS_ISO, NULL);
913	893
914	894	/* Change state */
915	895	bus->sleeping = true;
@@ -917,21 +897,20 @@ static int brcmf_sdbrcm_bussleep(struct brcmf_sdio *bus, bool sleep) · 1 unmodified line
917	897	} else {
918	898	/* Waking up: bus power up is ok, set local state */
919	899
920		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
921		− SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL);
	900	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
	901	+ 0, NULL);
922	902
923	903	/* Make sure the controller has the bus up */
924	904	brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);
925	905
926	906	/* Send misc interrupt to indicate OOB not needed */
927		− w_sdreg32(bus, 0, offsetof(struct sdpcmd_regs, tosbmailboxdata),
928		− &retries);
929		− if (retries <= retry_limit)
930		− w_sdreg32(bus, SMB_DEV_INT,
931		− offsetof(struct sdpcmd_regs, tosbmailbox),
932		− &retries);
933		−
934		− if (retries > retry_limit)
	907	+ ret = w_sdreg32(bus, 0,
	908	+ offsetof(struct sdpcmd_regs, tosbmailboxdata));
	909	+ if (ret == 0)
	910	+ ret = w_sdreg32(bus, SMB_DEV_INT,
	911	+ offsetof(struct sdpcmd_regs, tosbmailbox));
	912	+
	913	+ if (ret != 0)
935	914	brcmf_dbg(ERROR, "CANNOT SIGNAL CHIP TO CLEAR OOB!!\n");
936	915
937	916	/* Make sure we have SD bus access */
@@ -955,17 +934,17 @@ static u32 brcmf_sdbrcm_hostmail(struct brcmf_sdio *bus) · 17 unmodified lines
955	934	u32 intstatus = 0;
956	935	u32 hmb_data;
957	936	u8 fcbits;
958		− uint retries = 0;
	937	+ int ret;
959	938
960	939	brcmf_dbg(TRACE, "Enter\n");
961	940
962	941	/* Read mailbox data and ack that we did so */
963		− r_sdreg32(bus, &hmb_data,
964		− offsetof(struct sdpcmd_regs, tohostmailboxdata), &retries);
	942	+ ret = r_sdreg32(bus, &hmb_data,
	943	+ offsetof(struct sdpcmd_regs, tohostmailboxdata));
965	944
966		− if (retries <= retry_limit)
	945	+ if (ret == 0)
967	946	w_sdreg32(bus, SMB_INT_ACK,
968		− offsetof(struct sdpcmd_regs, tosbmailbox), &retries);
	947	+ offsetof(struct sdpcmd_regs, tosbmailbox));
969	948	bus->f1regdata += 2;
970	949
971	950	/* Dongle recomposed rx frames, accept them again */
@@ -1040,17 +1019,16 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_sdio *bus, bool abort, bool rtx) · 68 unmodified lines
1040	1019	if (abort)
1041	1020	brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2);
1042	1021
1043		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
1044		− SBSDIO_FUNC1_FRAMECTRL,
1045		− SFC_RF_TERM, &err);
	1022	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_FRAMECTRL,
	1023	+ SFC_RF_TERM, &err);
1046	1024	bus->f1regdata++;
1047	1025
1048	1026	/* Wait until the packet has been flushed (device/FIFO stable) */
1049	1027	for (lastrbc = retries = 0xffff; retries > 0; retries--) {
1050		− hi = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
1051		− SBSDIO_FUNC1_RFRAMEBCHI, NULL);
1052		− lo = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
1053		− SBSDIO_FUNC1_RFRAMEBCLO, NULL);
	1028	+ hi = brcmf_sdio_regrb(bus->sdiodev,
	1029	+ SBSDIO_FUNC1_RFRAMEBCHI, &err);
	1030	+ lo = brcmf_sdio_regrb(bus->sdiodev,
	1031	+ SBSDIO_FUNC1_RFRAMEBCLO, &err);
1054	1032	bus->f1regdata += 2;
1055	1033
1056	1034	if ((hi == 0) && (lo == 0))
@@ -1070,11 +1048,11 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_sdio *bus, bool abort, bool rtx) · 13 unmodified lines
1070	1048
1071	1049	if (rtx) {
1072	1050	bus->rxrtx++;
1073		− w_sdreg32(bus, SMB_NAK,
1074		− offsetof(struct sdpcmd_regs, tosbmailbox), &retries);
	1051	+ err = w_sdreg32(bus, SMB_NAK,
	1052	+ offsetof(struct sdpcmd_regs, tosbmailbox));
1075	1053
1076	1054	bus->f1regdata++;
1077		− if (retries <= retry_limit)
	1055	+ if (err == 0)
1078	1056	bus->rxskip = true;
1079	1057	}
1080	1058
@@ -1082,7 +1060,7 @@ static void brcmf_sdbrcm_rxfail(struct brcmf_sdio *bus, bool abort, bool rtx) · 1 unmodified line
1082	1060	bus->nextlen = 0;
1083	1061
1084	1062	/* If we can't reach the device, signal failure */
1085		− if (err \|\| brcmf_sdcard_regfail(bus->sdiodev))
	1063	+ if (err)
1086	1064	bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;
1087	1065	}
1088	1066
@@ -2178,21 +2156,16 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_sdio bus, struct sk_buff pkt, · 1089 unmodified lines
2178	2156	bus->tx_sderrs++;
2179	2157
2180	2158	brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2);
2181		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
2182		− SBSDIO_FUNC1_FRAMECTRL, SFC_WF_TERM,
2183		− NULL);
	2159	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_FRAMECTRL,
	2160	+ SFC_WF_TERM, NULL);
2184	2161	bus->f1regdata++;
2185	2162
2186	2163	for (i = 0; i < 3; i++) {
2187	2164	u8 hi, lo;
2188		− hi = brcmf_sdcard_cfg_read(bus->sdiodev,
2189		− SDIO_FUNC_1,
2190		− SBSDIO_FUNC1_WFRAMEBCHI,
2191		− NULL);
2192		− lo = brcmf_sdcard_cfg_read(bus->sdiodev,
2193		− SDIO_FUNC_1,
2194		− SBSDIO_FUNC1_WFRAMEBCLO,
2195		− NULL);
	2165	+ hi = brcmf_sdio_regrb(bus->sdiodev,
	2166	+ SBSDIO_FUNC1_WFRAMEBCHI, NULL);
	2167	+ lo = brcmf_sdio_regrb(bus->sdiodev,
	2168	+ SBSDIO_FUNC1_WFRAMEBCLO, NULL);
2196	2169	bus->f1regdata += 2;
2197	2170	if ((hi == 0) && (lo == 0))
2198	2171	break;
@@ -2219,7 +2192,6 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes) · 20 unmodified lines
2219	2192	{
2220	2193	struct sk_buff *pkt;
2221	2194	u32 intstatus = 0;
2222		− uint retries = 0;
2223	2195	int ret = 0, prec_out;
2224	2196	uint cnt = 0;
2225	2197	uint datalen;
@@ -2249,11 +2221,11 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes) · 23 unmodified lines
2249	2221	/* In poll mode, need to check for other events */
2250	2222	if (!bus->intr && cnt) {
2251	2223	/* Check device status, signal pending interrupt */
2252		− r_sdreg32(bus, &intstatus,
2253		− offsetof(struct sdpcmd_regs, intstatus),
2254		− &retries);
	2224	+ ret = r_sdreg32(bus, &intstatus,
	2225	+ offsetof(struct sdpcmd_regs,
	2226	+ intstatus));
2255	2227	bus->f2txdata++;
2256		− if (brcmf_sdcard_regfail(bus->sdiodev))
	2228	+ if (ret != 0)
2257	2229	break;
2258	2230	if (intstatus & bus->hostintmask)
2259	2231	bus->ipend = true;
@@ -2275,7 +2247,6 @@ static void brcmf_sdbrcm_bus_stop(struct device *dev) · 15 unmodified lines
2275	2247	{
2276	2248	u32 local_hostintmask;
2277	2249	u8 saveclk;
2278		− uint retries;
2279	2250	int err;
2280	2251	struct brcmf_bus *bus_if = dev_get_drvdata(dev);
2281	2252	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
@@ -2303,7 +2274,7 @@ static void brcmf_sdbrcm_bus_stop(struct device *dev) · 21 unmodified lines
2303	2274	brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);
2304	2275
2305	2276	/* Disable and clear interrupts at the chip level also */
2306		− w_sdreg32(bus, 0, offsetof(struct sdpcmd_regs, hostintmask), &retries);
	2277	+ w_sdreg32(bus, 0, offsetof(struct sdpcmd_regs, hostintmask));
2307	2278	local_hostintmask = bus->hostintmask;
2308	2279	bus->hostintmask = 0;
2309	2280
@@ -2311,24 +2282,23 @@ static void brcmf_sdbrcm_bus_stop(struct device *dev) · 1 unmodified line
2311	2282	bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;
2312	2283
2313	2284	/* Force clocks on backplane to be sure F2 interrupt propagates */
2314		− saveclk = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
2315		− SBSDIO_FUNC1_CHIPCLKCSR, &err);
	2285	+ saveclk = brcmf_sdio_regrb(bus->sdiodev,
	2286	+ SBSDIO_FUNC1_CHIPCLKCSR, &err);
2316	2287	if (!err) {
2317		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
2318		− SBSDIO_FUNC1_CHIPCLKCSR,
2319		− (saveclk \| SBSDIO_FORCE_HT), &err);
	2288	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
	2289	+ (saveclk \| SBSDIO_FORCE_HT), &err);
2320	2290	}
2321	2291	if (err)
2322	2292	brcmf_dbg(ERROR, "Failed to force clock for F2: err %d\n", err);
2323	2293
2324	2294	/* Turn off the bus (F2), free any pending packets */
2325	2295	brcmf_dbg(INTR, "disable SDIO interrupts\n");
2326		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,
2327		− SDIO_FUNC_ENABLE_1, NULL);
	2296	+ brcmf_sdio_regwb(bus->sdiodev, SDIO_CCCR_IOEx, SDIO_FUNC_ENABLE_1,
	2297	+ NULL);
2328	2298
2329	2299	/* Clear any pending interrupts now that F2 is disabled */
2330	2300	w_sdreg32(bus, local_hostintmask,
2331		− offsetof(struct sdpcmd_regs, intstatus), &retries);
	2301	+ offsetof(struct sdpcmd_regs, intstatus));
2332	2302
2333	2303	/* Turn off the backplane clock (only) */
2334	2304	brcmf_sdbrcm_clkctl(bus, CLK_SDONLY, false);
@@ -2373,12 +2343,12 @@ static inline void brcmf_sdbrcm_clrintr(struct brcmf_sdio *bus) · 38 unmodified lines
2373	2343	static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus)
2374	2344	{
2375	2345	u32 intstatus, newstatus = 0;
2376		− uint retries = 0;
2377	2346	uint rxlimit = bus->rxbound; /* Rx frames to read before resched */
2378	2347	uint txlimit = bus->txbound; /* Tx frames to send before resched */
2379	2348	uint framecnt = 0; /* Temporary counter of tx/rx frames */
2380	2349	bool rxdone = true; /* Flag for no more read data */
2381	2350	bool resched = false; /* Flag indicating resched wanted */
	2351	+ int err;
2382	2352
2383	2353	brcmf_dbg(TRACE, "Enter\n");
2384	2354
@@ -2389,13 +2359,12 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus) · 4 unmodified lines
2389	2359
2390	2360	/* If waiting for HTAVAIL, check status */
2391	2361	if (bus->clkstate == CLK_PENDING) {
2392		− int err;
2393	2362	u8 clkctl, devctl = 0;
2394	2363
2395	2364	#ifdef DEBUG
2396	2365	/* Check for inconsistent device control */
2397		− devctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
2398		− SBSDIO_DEVICE_CTL, &err);
	2366	+ devctl = brcmf_sdio_regrb(bus->sdiodev,
	2367	+ SBSDIO_DEVICE_CTL, &err);
2399	2368	if (err) {
2400	2369	brcmf_dbg(ERROR, "error reading DEVCTL: %d\n", err);
2401	2370	bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;
@@ -2403,8 +2372,8 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus) · 1 unmodified line
2403	2372	#endif /* DEBUG */
2404	2373
2405	2374	/* Read CSR, if clock on switch to AVAIL, else ignore */
2406		− clkctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
2407		− SBSDIO_FUNC1_CHIPCLKCSR, &err);
	2375	+ clkctl = brcmf_sdio_regrb(bus->sdiodev,
	2376	+ SBSDIO_FUNC1_CHIPCLKCSR, &err);
2408	2377	if (err) {
2409	2378	brcmf_dbg(ERROR, "error reading CSR: %d\n",
2410	2379	err);
@@ -2415,17 +2384,16 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus) · 4 unmodified lines
2415	2384	devctl, clkctl);
2416	2385
2417	2386	if (SBSDIO_HTAV(clkctl)) {
2418		− devctl = brcmf_sdcard_cfg_read(bus->sdiodev,
2419		− SDIO_FUNC_1,
2420		− SBSDIO_DEVICE_CTL, &err);
	2387	+ devctl = brcmf_sdio_regrb(bus->sdiodev,
	2388	+ SBSDIO_DEVICE_CTL, &err);
2421	2389	if (err) {
2422	2390	brcmf_dbg(ERROR, "error reading DEVCTL: %d\n",
2423	2391	err);
2424	2392	bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;
2425	2393	}
2426	2394	devctl &= ~SBSDIO_DEVCTL_CA_INT_ONLY;
2427		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
2428		− SBSDIO_DEVICE_CTL, devctl, &err);
	2395	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_DEVICE_CTL,
	2396	+ devctl, &err);
2429	2397	if (err) {
2430	2398	brcmf_dbg(ERROR, "error writing DEVCTL: %d\n",
2431	2399	err);
@@ -2447,17 +2415,17 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus) · 15 unmodified lines
2447	2415	/* Pending interrupt indicates new device status */
2448	2416	if (bus->ipend) {
2449	2417	bus->ipend = false;
2450		− r_sdreg32(bus, &newstatus,
2451		− offsetof(struct sdpcmd_regs, intstatus), &retries);
	2418	+ err = r_sdreg32(bus, &newstatus,
	2419	+ offsetof(struct sdpcmd_regs, intstatus));
2452	2420	bus->f1regdata++;
2453		− if (brcmf_sdcard_regfail(bus->sdiodev))
	2421	+ if (err != 0)
2454	2422	newstatus = 0;
2455	2423	newstatus &= bus->hostintmask;
2456	2424	bus->fcstate = !!(newstatus & I_HMB_FC_STATE);
2457	2425	if (newstatus) {
2458		− w_sdreg32(bus, newstatus,
2459		− offsetof(struct sdpcmd_regs, intstatus),
2460		− &retries);
	2426	+ err = w_sdreg32(bus, newstatus,
	2427	+ offsetof(struct sdpcmd_regs,
	2428	+ intstatus));
2461	2429	bus->f1regdata++;
2462	2430	}
2463	2431	}
@@ -2472,11 +2440,11 @@ static bool brcmf_sdbrcm_dpc(struct brcmf_sdio *bus) · 8 unmodified lines
2472	2440	*/
2473	2441	if (intstatus & I_HMB_FC_CHANGE) {
2474	2442	intstatus &= ~I_HMB_FC_CHANGE;
2475		− w_sdreg32(bus, I_HMB_FC_CHANGE,
2476		− offsetof(struct sdpcmd_regs, intstatus), &retries);
	2443	+ err = w_sdreg32(bus, I_HMB_FC_CHANGE,
	2444	+ offsetof(struct sdpcmd_regs, intstatus));
2477	2445
2478		− r_sdreg32(bus, &newstatus,
2479		− offsetof(struct sdpcmd_regs, intstatus), &retries);
	2446	+ err = r_sdreg32(bus, &newstatus,
	2447	+ offsetof(struct sdpcmd_regs, intstatus));
2480	2448	bus->f1regdata += 2;
2481	2449	bus->fcstate =
2482	2450	!!(newstatus & (I_HMB_FC_STATE \| I_HMB_FC_CHANGE));
@@ -2546,21 +2514,18 @@ clkwait: · 63 unmodified lines
2546	2514
2547	2515	brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2);
2548	2516
2549		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
2550		− SBSDIO_FUNC1_FRAMECTRL, SFC_WF_TERM,
2551		− NULL);
	2517	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_FRAMECTRL,
	2518	+ SFC_WF_TERM, &err);
2552	2519	bus->f1regdata++;
2553	2520
2554	2521	for (i = 0; i < 3; i++) {
2555	2522	u8 hi, lo;
2556		− hi = brcmf_sdcard_cfg_read(bus->sdiodev,
2557		− SDIO_FUNC_1,
2558		− SBSDIO_FUNC1_WFRAMEBCHI,
2559		− NULL);
2560		− lo = brcmf_sdcard_cfg_read(bus->sdiodev,
2561		− SDIO_FUNC_1,
2562		− SBSDIO_FUNC1_WFRAMEBCLO,
2563		− NULL);
	2523	+ hi = brcmf_sdio_regrb(bus->sdiodev,
	2524	+ SBSDIO_FUNC1_WFRAMEBCHI,
	2525	+ &err);
	2526	+ lo = brcmf_sdio_regrb(bus->sdiodev,
	2527	+ SBSDIO_FUNC1_WFRAMEBCLO,
	2528	+ &err);
2564	2529	bus->f1regdata += 2;
2565	2530	if ((hi == 0) && (lo == 0))
2566	2531	break;
@@ -2587,10 +2552,8 @@ clkwait: · 20 unmodified lines
2587	2552	else await next interrupt */
2588	2553	/* On failed register access, all bets are off:
2589	2554	no resched or interrupts */
2590		− if ((bus->sdiodev->bus_if->state == BRCMF_BUS_DOWN) \|\|
2591		− brcmf_sdcard_regfail(bus->sdiodev)) {
2592		− brcmf_dbg(ERROR, "failed backplane access over SDIO, halting operation %d\n",
2593		− brcmf_sdcard_regfail(bus->sdiodev));
	2555	+ if ((bus->sdiodev->bus_if->state == BRCMF_BUS_DOWN) \|\| (err != 0)) {
	2556	+ brcmf_dbg(ERROR, "failed backplane access over SDIO, halting operation\n");
2594	2557	bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;
2595	2558	bus->intstatus = 0;
2596	2559	} else if (bus->clkstate == CLK_PENDING) {
@@ -2886,19 +2849,16 @@ static int brcmf_tx_frame(struct brcmf_sdio bus, u8 frame, u16 len) · 289 unmodified lines
2886	2849
2887	2850	brcmf_sdcard_abort(bus->sdiodev, SDIO_FUNC_2);
2888	2851
2889		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
2890		− SBSDIO_FUNC1_FRAMECTRL,
2891		− SFC_WF_TERM, NULL);
	2852	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_FRAMECTRL,
	2853	+ SFC_WF_TERM, NULL);
2892	2854	bus->f1regdata++;
2893	2855
2894	2856	for (i = 0; i < 3; i++) {
2895	2857	u8 hi, lo;
2896		− hi = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
2897		− SBSDIO_FUNC1_WFRAMEBCHI,
2898		− NULL);
2899		− lo = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
2900		− SBSDIO_FUNC1_WFRAMEBCLO,
2901		− NULL);
	2858	+ hi = brcmf_sdio_regrb(bus->sdiodev,
	2859	+ SBSDIO_FUNC1_WFRAMEBCHI, NULL);
	2860	+ lo = brcmf_sdio_regrb(bus->sdiodev,
	2861	+ SBSDIO_FUNC1_WFRAMEBCLO, NULL);
2902	2862	bus->f1regdata += 2;
2903	2863	if (hi == 0 && lo == 0)
2904	2864	break;
@@ -3188,7 +3148,6 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus) · 283 unmodified lines
3188	3148
3189	3149	static int brcmf_sdbrcm_download_state(struct brcmf_sdio *bus, bool enter)
3190	3150	{
3191		− uint retries;
3192	3151	int bcmerror = 0;
3193	3152	struct chip_info *ci = bus->ci;
3194	3153
@@ -3222,7 +3181,7 @@ static int brcmf_sdbrcm_download_state(struct brcmf_sdio *bus, bool enter) · 27 unmodified lines
3222	3181	}
3223	3182
3224	3183	w_sdreg32(bus, 0xFFFFFFFF,
3225		− offsetof(struct sdpcmd_regs, intstatus), &retries);
	3184	+ offsetof(struct sdpcmd_regs, intstatus));
3226	3185
3227	3186	ci->resetcore(bus->sdiodev, ci, BCMA_CORE_ARM_CM3);
3228	3187
@@ -3444,7 +3403,6 @@ static int brcmf_sdbrcm_bus_init(struct device *dev) · 215 unmodified lines
3444	3403	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
3445	3404	struct brcmf_sdio *bus = sdiodev->bus;
3446	3405	unsigned long timeout;
3447		− uint retries = 0;
3448	3406	u8 ready, enable;
3449	3407	int err, ret = 0;
3450	3408	u8 saveclk;
@@ -3472,13 +3430,11 @@ static int brcmf_sdbrcm_bus_init(struct device *dev) · 21 unmodified lines
3472	3430	goto exit;
3473	3431
3474	3432	/* Force clocks on backplane to be sure F2 interrupt propagates */
3475		− saveclk =
3476		− brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
3477		− SBSDIO_FUNC1_CHIPCLKCSR, &err);
	3433	+ saveclk = brcmf_sdio_regrb(bus->sdiodev,
	3434	+ SBSDIO_FUNC1_CHIPCLKCSR, &err);
3478	3435	if (!err) {
3479		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
3480		− SBSDIO_FUNC1_CHIPCLKCSR,
3481		− (saveclk \| SBSDIO_FORCE_HT), &err);
	3436	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
	3437	+ (saveclk \| SBSDIO_FORCE_HT), &err);
3482	3438	}
3483	3439	if (err) {
3484	3440	brcmf_dbg(ERROR, "Failed to force clock for F2: err %d\n", err);
@@ -3487,17 +3443,16 @@ static int brcmf_sdbrcm_bus_init(struct device *dev) · 2 unmodified lines
3487	3443
3488	3444	/* Enable function 2 (frame transfers) */
3489	3445	w_sdreg32(bus, SDPCM_PROT_VERSION << SMB_DATA_VERSION_SHIFT,
3490		− offsetof(struct sdpcmd_regs, tosbmailboxdata), &retries);
	3446	+ offsetof(struct sdpcmd_regs, tosbmailboxdata));
3491	3447	enable = (SDIO_FUNC_ENABLE_1 \| SDIO_FUNC_ENABLE_2);
3492	3448
3493		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,
3494		− enable, NULL);
	3449	+ brcmf_sdio_regwb(bus->sdiodev, SDIO_CCCR_IOEx, enable, NULL);
3495	3450
3496	3451	timeout = jiffies + msecs_to_jiffies(BRCMF_WAIT_F2RDY);
3497	3452	ready = 0;
3498	3453	while (enable != ready) {
3499		− ready = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_0,
3500		− SDIO_CCCR_IORx, NULL);
	3454	+ ready = brcmf_sdio_regrb(bus->sdiodev,
	3455	+ SDIO_CCCR_IORx, NULL);
3501	3456	if (time_after(jiffies, timeout))
3502	3457	break;
3503	3458	else if (time_after(jiffies, timeout - BRCMF_WAIT_F2RDY + 50))
@@ -3512,21 +3467,18 @@ static int brcmf_sdbrcm_bus_init(struct device *dev) · 8 unmodified lines
3512	3467	/* Set up the interrupt mask and enable interrupts */
3513	3468	bus->hostintmask = HOSTINTMASK;
3514	3469	w_sdreg32(bus, bus->hostintmask,
3515		− offsetof(struct sdpcmd_regs, hostintmask), &retries);
	3470	+ offsetof(struct sdpcmd_regs, hostintmask));
3516	3471
3517		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
3518		− SBSDIO_WATERMARK, 8, &err);
	3472	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_WATERMARK, 8, &err);
3519	3473	} else {
3520	3474	/* Disable F2 again */
3521	3475	enable = SDIO_FUNC_ENABLE_1;
3522		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0,
3523		− SDIO_CCCR_IOEx, enable, NULL);
	3476	+ brcmf_sdio_regwb(bus->sdiodev, SDIO_CCCR_IOEx, enable, NULL);
3524	3477	ret = -ENODEV;
3525	3478	}
3526	3479
3527	3480	/* Restore previous clock setting */
3528		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
3529		− SBSDIO_FUNC1_CHIPCLKCSR, saveclk, &err);
	3481	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR, saveclk, &err);
3530	3482
3531	3483	if (ret == 0) {
3532	3484	ret = brcmf_sdio_intr_register(bus->sdiodev);
@@ -3606,9 +3558,9 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus) · 73 unmodified lines
3606	3558
3607	3559	if (!bus->dpc_sched) {
3608	3560	u8 devpend;
3609		− devpend = brcmf_sdcard_cfg_read(bus->sdiodev,
3610		− SDIO_FUNC_0, SDIO_CCCR_INTx,
3611		− NULL);
	3561	+ devpend = brcmf_sdio_regrb(bus->sdiodev,
	3562	+ SDIO_CCCR_INTx,
	3563	+ NULL);
3612	3564	intstatus =
3613	3565	devpend & (INTR_STATUS_FUNC1 \|
3614	3566	INTR_STATUS_FUNC2);
@@ -3732,24 +3684,18 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva) · 117 unmodified lines
3732	3684
3733	3685	bus->alp_only = true;
3734	3686
3735		− /* Return the window to backplane enumeration space for core access */
3736		− if (brcmf_sdcard_set_sbaddr_window(bus->sdiodev, SI_ENUM_BASE))
3737		− brcmf_dbg(ERROR, "FAILED to return to SI_ENUM_BASE\n");
3738		−
3739	3687	pr_debug("F1 signature read @0x18000000=0x%4x\n",
3740		− brcmf_sdcard_reg_read(bus->sdiodev, SI_ENUM_BASE, 4));
	3688	+ brcmf_sdio_regrl(bus->sdiodev, SI_ENUM_BASE, NULL));
3741	3689
3742	3690	/*
3743	3691	* Force PLL off until brcmf_sdio_chip_attach()
3744	3692	* programs PLL control regs
3745	3693	*/
3746	3694
3747		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
3748		− SBSDIO_FUNC1_CHIPCLKCSR,
3749		− BRCMF_INIT_CLKCTL1, &err);
	3695	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
	3696	+ BRCMF_INIT_CLKCTL1, &err);
3750	3697	if (!err)
3751		− clkctl =
3752		− brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,
	3698	+ clkctl = brcmf_sdio_regrb(bus->sdiodev,
3753	3699	SBSDIO_FUNC1_CHIPCLKCSR, &err);
3754	3700
3755	3701	if (err \|\| ((clkctl & ~SBSDIO_AVBITS) != BRCMF_INIT_CLKCTL1)) {
@@ -3782,9 +3728,8 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva) · 26 unmodified lines
3782	3728	idx = brcmf_sdio_chip_getinfidx(bus->ci, BCMA_CORE_SDIO_DEV);
3783	3729	reg_addr = bus->ci->c_inf[idx].base +
3784	3730	offsetof(struct sdpcmd_regs, corecontrol);
3785		− reg_val = brcmf_sdcard_reg_read(bus->sdiodev, reg_addr, sizeof(u32));
3786		− brcmf_sdcard_reg_write(bus->sdiodev, reg_addr, sizeof(u32),
3787		− reg_val \| CC_BPRESEN);
	3731	+ reg_val = brcmf_sdio_regrl(bus->sdiodev, reg_addr, NULL);
	3732	+ brcmf_sdio_regwl(bus->sdiodev, reg_addr, reg_val \| CC_BPRESEN, NULL);
3788	3733
3789	3734	brcmu_pktq_init(&bus->txq, (PRIOMASK + 1), TXQLEN);
3790	3735
@@ -3809,16 +3754,15 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_sdio *bus) · 18 unmodified lines
3809	3754	brcmf_dbg(TRACE, "Enter\n");
3810	3755
3811	3756	/* Disable F2 to clear any intermediate frame state on the dongle */
3812		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,
3813		− SDIO_FUNC_ENABLE_1, NULL);
	3757	+ brcmf_sdio_regwb(bus->sdiodev, SDIO_CCCR_IOEx,
	3758	+ SDIO_FUNC_ENABLE_1, NULL);
3814	3759
3815	3760	bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;
3816	3761	bus->sleeping = false;
3817	3762	bus->rxflow = false;
3818	3763
3819	3764	/* Done with backplane-dependent accesses, can drop clock... */
3820		− brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
3821		− SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL);
	3765	+ brcmf_sdio_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL);
3822	3766
3823	3767	/* ...and initialize clock/power states */
3824	3768	bus->clkstate = CLK_SDONLY;

drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c+138−127

@@ -93,8 +93,9 @@ brcmf_sdio_sb_corerev(struct brcmf_sdio_dev *sdiodev, · 92 unmodified lines
93	93
94	94	idx = brcmf_sdio_chip_getinfidx(ci, coreid);
95	95
96		− regdata = brcmf_sdcard_reg_read(sdiodev,
97		− CORE_SB(ci->c_inf[idx].base, sbidhigh), 4);
	96	+ regdata = brcmf_sdio_regrl(sdiodev,
	97	+ CORE_SB(ci->c_inf[idx].base, sbidhigh),
	98	+ NULL);
98	99	return SBCOREREV(regdata);
99	100	}
100	101
@@ -118,8 +119,9 @@ brcmf_sdio_sb_iscoreup(struct brcmf_sdio_dev *sdiodev, · 17 unmodified lines
118	119
119	120	idx = brcmf_sdio_chip_getinfidx(ci, coreid);
120	121
121		− regdata = brcmf_sdcard_reg_read(sdiodev,
122		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
	122	+ regdata = brcmf_sdio_regrl(sdiodev,
	123	+ CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
	124	+ NULL);
123	125	regdata &= (SSB_TMSLOW_RESET \| SSB_TMSLOW_REJECT \|
124	126	SSB_IMSTATE_REJECT \| SSB_TMSLOW_CLOCK);
125	127	return (SSB_TMSLOW_CLOCK == regdata);
@@ -135,13 +137,13 @@ brcmf_sdio_ai_iscoreup(struct brcmf_sdio_dev *sdiodev, · 9 unmodified lines
135	137
136	138	idx = brcmf_sdio_chip_getinfidx(ci, coreid);
137	139
138		− regdata = brcmf_sdcard_reg_read(sdiodev,
139		− ci->c_inf[idx].wrapbase+BCMA_IOCTL, 4);
	140	+ regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
	141	+ NULL);
140	142	ret = (regdata & (BCMA_IOCTL_FGC \| BCMA_IOCTL_CLK)) == BCMA_IOCTL_CLK;
141	143
142		− regdata = brcmf_sdcard_reg_read(sdiodev,
143		− ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
144		− 4);
	144	+ regdata = brcmf_sdio_regrl(sdiodev,
	145	+ ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
	146	+ NULL);
145	147	ret = ret && ((regdata & BCMA_RESET_CTL_RESET) == 0);
146	148
147	149	return ret;
@@ -151,84 +153,85 @@ static void · 3 unmodified lines
151	153	brcmf_sdio_sb_coredisable(struct brcmf_sdio_dev *sdiodev,
152	154	struct chip_info *ci, u16 coreid)
153	155	{
154		− u32 regdata;
	156	+ u32 regdata, base;
155	157	u8 idx;
156	158
157	159	idx = brcmf_sdio_chip_getinfidx(ci, coreid);
	160	+ base = ci->c_inf[idx].base;
158	161
159		− regdata = brcmf_sdcard_reg_read(sdiodev,
160		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
	162	+ regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbtmstatelow), NULL);
161	163	if (regdata & SSB_TMSLOW_RESET)
162	164	return;
163	165
164		− regdata = brcmf_sdcard_reg_read(sdiodev,
165		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
	166	+ regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbtmstatelow), NULL);
166	167	if ((regdata & SSB_TMSLOW_CLOCK) != 0) {
167	168	/*
168	169	* set target reject and spin until busy is clear
169	170	* (preserve core-specific bits)
170	171	*/
171		− regdata = brcmf_sdcard_reg_read(sdiodev,
172		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
173		− brcmf_sdcard_reg_write(sdiodev,
174		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
175		− 4, regdata \| SSB_TMSLOW_REJECT);
176		−
177		− regdata = brcmf_sdcard_reg_read(sdiodev,
178		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
	172	+ regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbtmstatelow),
	173	+ NULL);
	174	+ brcmf_sdio_regwl(sdiodev, CORE_SB(base, sbtmstatelow),
	175	+ regdata \| SSB_TMSLOW_REJECT, NULL);
	176	+
	177	+ regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbtmstatelow),
	178	+ NULL);
179	179	udelay(1);
180		− SPINWAIT((brcmf_sdcard_reg_read(sdiodev,
181		− CORE_SB(ci->c_inf[idx].base, sbtmstatehigh), 4) &
	180	+ SPINWAIT((brcmf_sdio_regrl(sdiodev,
	181	+ CORE_SB(base, sbtmstatehigh),
	182	+ NULL) &
182	183	SSB_TMSHIGH_BUSY), 100000);
183	184
184		− regdata = brcmf_sdcard_reg_read(sdiodev,
185		− CORE_SB(ci->c_inf[idx].base, sbtmstatehigh), 4);
	185	+ regdata = brcmf_sdio_regrl(sdiodev,
	186	+ CORE_SB(base, sbtmstatehigh),
	187	+ NULL);
186	188	if (regdata & SSB_TMSHIGH_BUSY)
187	189	brcmf_dbg(ERROR, "core state still busy\n");
188	190
189		− regdata = brcmf_sdcard_reg_read(sdiodev,
190		− CORE_SB(ci->c_inf[idx].base, sbidlow), 4);
	191	+ regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbidlow),
	192	+ NULL);
191	193	if (regdata & SSB_IDLOW_INITIATOR) {
192		− regdata = brcmf_sdcard_reg_read(sdiodev,
193		− CORE_SB(ci->c_inf[idx].base, sbimstate), 4) \|
194		− SSB_IMSTATE_REJECT;
195		− brcmf_sdcard_reg_write(sdiodev,
196		− CORE_SB(ci->c_inf[idx].base, sbimstate), 4,
197		− regdata);
198		− regdata = brcmf_sdcard_reg_read(sdiodev,
199		− CORE_SB(ci->c_inf[idx].base, sbimstate), 4);
	194	+ regdata = brcmf_sdio_regrl(sdiodev,
	195	+ CORE_SB(base, sbimstate),
	196	+ NULL);
	197	+ regdata \|= SSB_IMSTATE_REJECT;
	198	+ brcmf_sdio_regwl(sdiodev, CORE_SB(base, sbimstate),
	199	+ regdata, NULL);
	200	+ regdata = brcmf_sdio_regrl(sdiodev,
	201	+ CORE_SB(base, sbimstate),
	202	+ NULL);
200	203	udelay(1);
201		− SPINWAIT((brcmf_sdcard_reg_read(sdiodev,
202		− CORE_SB(ci->c_inf[idx].base, sbimstate), 4) &
	204	+ SPINWAIT((brcmf_sdio_regrl(sdiodev,
	205	+ CORE_SB(base, sbimstate),
	206	+ NULL) &
203	207	SSB_IMSTATE_BUSY), 100000);
204	208	}
205	209
206	210	/* set reset and reject while enabling the clocks */
207		− brcmf_sdcard_reg_write(sdiodev,
208		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4,
209		− (SSB_TMSLOW_FGC \| SSB_TMSLOW_CLOCK \|
210		− SSB_TMSLOW_REJECT \| SSB_TMSLOW_RESET));
211		− regdata = brcmf_sdcard_reg_read(sdiodev,
212		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
	211	+ regdata = SSB_TMSLOW_FGC \| SSB_TMSLOW_CLOCK \|
	212	+ SSB_TMSLOW_REJECT \| SSB_TMSLOW_RESET;
	213	+ brcmf_sdio_regwl(sdiodev, CORE_SB(base, sbtmstatelow),
	214	+ regdata, NULL);
	215	+ regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbtmstatelow),
	216	+ NULL);
213	217	udelay(10);
214	218
215	219	/* clear the initiator reject bit */
216		− regdata = brcmf_sdcard_reg_read(sdiodev,
217		− CORE_SB(ci->c_inf[idx].base, sbidlow), 4);
	220	+ regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbidlow),
	221	+ NULL);
218	222	if (regdata & SSB_IDLOW_INITIATOR) {
219		− regdata = brcmf_sdcard_reg_read(sdiodev,
220		− CORE_SB(ci->c_inf[idx].base, sbimstate), 4) &
221		− ~SSB_IMSTATE_REJECT;
222		− brcmf_sdcard_reg_write(sdiodev,
223		− CORE_SB(ci->c_inf[idx].base, sbimstate), 4,
224		− regdata);
	223	+ regdata = brcmf_sdio_regrl(sdiodev,
	224	+ CORE_SB(base, sbimstate),
	225	+ NULL);
	226	+ regdata &= ~SSB_IMSTATE_REJECT;
	227	+ brcmf_sdio_regwl(sdiodev, CORE_SB(base, sbimstate),
	228	+ regdata, NULL);
225	229	}
226	230	}
227	231
228	232	/* leave reset and reject asserted */
229		− brcmf_sdcard_reg_write(sdiodev,
230		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4,
231		− (SSB_TMSLOW_REJECT \| SSB_TMSLOW_RESET));
	233	+ brcmf_sdio_regwl(sdiodev, CORE_SB(base, sbtmstatelow),
	234	+ (SSB_TMSLOW_REJECT \| SSB_TMSLOW_RESET), NULL);
232	235	udelay(1);
233	236	}
234	237
@@ -242,20 +245,19 @@ brcmf_sdio_ai_coredisable(struct brcmf_sdio_dev *sdiodev, · 7 unmodified lines
242	245	idx = brcmf_sdio_chip_getinfidx(ci, coreid);
243	246
244	247	/* if core is already in reset, just return */
245		− regdata = brcmf_sdcard_reg_read(sdiodev,
246		− ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
247		− 4);
	248	+ regdata = brcmf_sdio_regrl(sdiodev,
	249	+ ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
	250	+ NULL);
248	251	if ((regdata & BCMA_RESET_CTL_RESET) != 0)
249	252	return;
250	253
251		− brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
252		− 4, 0);
253		− regdata = brcmf_sdcard_reg_read(sdiodev,
254		− ci->c_inf[idx].wrapbase+BCMA_IOCTL, 4);
	254	+ brcmf_sdio_regwl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL, 0, NULL);
	255	+ regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
	256	+ NULL);
255	257	udelay(10);
256	258
257		− brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
258		− 4, BCMA_RESET_CTL_RESET);
	259	+ brcmf_sdio_regwl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
	260	+ BCMA_RESET_CTL_RESET, NULL);
259	261	udelay(1);
260	262	}
261	263
@@ -279,41 +281,47 @@ brcmf_sdio_sb_resetcore(struct brcmf_sdio_dev *sdiodev, · 17 unmodified lines
279	281	* set reset while enabling the clock and
280	282	* forcing them on throughout the core
281	283	*/
282		− brcmf_sdcard_reg_write(sdiodev,
283		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4,
284		− SSB_TMSLOW_FGC \| SSB_TMSLOW_CLOCK \| SSB_TMSLOW_RESET);
285		− regdata = brcmf_sdcard_reg_read(sdiodev,
286		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
	284	+ brcmf_sdio_regwl(sdiodev,
	285	+ CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
	286	+ SSB_TMSLOW_FGC \| SSB_TMSLOW_CLOCK \| SSB_TMSLOW_RESET,
	287	+ NULL);
	288	+ regdata = brcmf_sdio_regrl(sdiodev,
	289	+ CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
	290	+ NULL);
287	291	udelay(1);
288	292
289	293	/* clear any serror */
290		− regdata = brcmf_sdcard_reg_read(sdiodev,
291		− CORE_SB(ci->c_inf[idx].base, sbtmstatehigh), 4);
	294	+ regdata = brcmf_sdio_regrl(sdiodev,
	295	+ CORE_SB(ci->c_inf[idx].base, sbtmstatehigh),
	296	+ NULL);
292	297	if (regdata & SSB_TMSHIGH_SERR)
293		− brcmf_sdcard_reg_write(sdiodev,
294		− CORE_SB(ci->c_inf[idx].base, sbtmstatehigh), 4, 0);
	298	+ brcmf_sdio_regwl(sdiodev,
	299	+ CORE_SB(ci->c_inf[idx].base, sbtmstatehigh),
	300	+ 0, NULL);
295	301
296		− regdata = brcmf_sdcard_reg_read(sdiodev,
297		− CORE_SB(ci->c_inf[idx].base, sbimstate), 4);
	302	+ regdata = brcmf_sdio_regrl(sdiodev,
	303	+ CORE_SB(ci->c_inf[idx].base, sbimstate),
	304	+ NULL);
298	305	if (regdata & (SSB_IMSTATE_IBE \| SSB_IMSTATE_TO))
299		− brcmf_sdcard_reg_write(sdiodev,
300		− CORE_SB(ci->c_inf[idx].base, sbimstate), 4,
301		− regdata & ~(SSB_IMSTATE_IBE \| SSB_IMSTATE_TO));
	306	+ brcmf_sdio_regwl(sdiodev,
	307	+ CORE_SB(ci->c_inf[idx].base, sbimstate),
	308	+ regdata & ~(SSB_IMSTATE_IBE \| SSB_IMSTATE_TO),
	309	+ NULL);
302	310
303	311	/* clear reset and allow it to propagate throughout the core */
304		− brcmf_sdcard_reg_write(sdiodev,
305		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4,
306		− SSB_TMSLOW_FGC \| SSB_TMSLOW_CLOCK);
307		− regdata = brcmf_sdcard_reg_read(sdiodev,
308		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
	312	+ brcmf_sdio_regwl(sdiodev, CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
	313	+ SSB_TMSLOW_FGC \| SSB_TMSLOW_CLOCK, NULL);
	314	+ regdata = brcmf_sdio_regrl(sdiodev,
	315	+ CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
	316	+ NULL);
309	317	udelay(1);
310	318
311	319	/* leave clock enabled */
312		− brcmf_sdcard_reg_write(sdiodev,
313		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
314		− 4, SSB_TMSLOW_CLOCK);
315		− regdata = brcmf_sdcard_reg_read(sdiodev,
316		− CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
	320	+ brcmf_sdio_regwl(sdiodev, CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
	321	+ SSB_TMSLOW_CLOCK, NULL);
	322	+ regdata = brcmf_sdio_regrl(sdiodev,
	323	+ CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
	324	+ NULL);
317	325	udelay(1);
318	326	}
319	327
@@ -330,18 +338,18 @@ brcmf_sdio_ai_resetcore(struct brcmf_sdio_dev *sdiodev, · 10 unmodified lines
330	338	brcmf_sdio_ai_coredisable(sdiodev, ci, coreid);
331	339
332	340	/* now do initialization sequence */
333		− brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
334		− 4, BCMA_IOCTL_FGC \| BCMA_IOCTL_CLK);
335		− regdata = brcmf_sdcard_reg_read(sdiodev,
336		− ci->c_inf[idx].wrapbase+BCMA_IOCTL, 4);
337		− brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
338		− 4, 0);
	341	+ brcmf_sdio_regwl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
	342	+ BCMA_IOCTL_FGC \| BCMA_IOCTL_CLK, NULL);
	343	+ regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
	344	+ NULL);
	345	+ brcmf_sdio_regwl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
	346	+ 0, NULL);
339	347	udelay(1);
340	348
341		− brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
342		− 4, BCMA_IOCTL_CLK);
343		− regdata = brcmf_sdcard_reg_read(sdiodev,
344		− ci->c_inf[idx].wrapbase+BCMA_IOCTL, 4);
	349	+ brcmf_sdio_regwl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
	350	+ BCMA_IOCTL_CLK, NULL);
	351	+ regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
	352	+ NULL);
345	353	udelay(1);
346	354	}
347	355
@@ -358,8 +366,9 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, · 10 unmodified lines
358	366	*/
359	367	ci->c_inf[0].id = BCMA_CORE_CHIPCOMMON;
360	368	ci->c_inf[0].base = regs;
361		− regdata = brcmf_sdcard_reg_read(sdiodev,
362		− CORE_CC_REG(ci->c_inf[0].base, chipid), 4);
	369	+ regdata = brcmf_sdio_regrl(sdiodev,
	370	+ CORE_CC_REG(ci->c_inf[0].base, chipid),
	371	+ NULL);
363	372	ci->chip = regdata & CID_ID_MASK;
364	373	ci->chiprev = (regdata & CID_REV_MASK) >> CID_REV_SHIFT;
365	374	ci->socitype = (regdata & CID_TYPE_MASK) >> CID_TYPE_SHIFT;
@@ -428,8 +437,7 @@ brcmf_sdio_chip_buscoreprep(struct brcmf_sdio_dev *sdiodev) · 62 unmodified lines
428	437
429	438	/* Try forcing SDIO core to do ALPAvail request only */
430	439	clkset = SBSDIO_FORCE_HW_CLKREQ_OFF \| SBSDIO_ALP_AVAIL_REQ;
431		− brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1,
432		− SBSDIO_FUNC1_CHIPCLKCSR, clkset, &err);
	440	+ brcmf_sdio_regwb(sdiodev, SBSDIO_FUNC1_CHIPCLKCSR, clkset, &err);
433	441	if (err) {
434	442	brcmf_dbg(ERROR, "error writing for HT off\n");
435	443	return err;
@@ -437,8 +445,8 @@ brcmf_sdio_chip_buscoreprep(struct brcmf_sdio_dev *sdiodev) · 1 unmodified line
437	445
438	446	/* If register supported, wait for ALPAvail and then force ALP */
439	447	/* This may take up to 15 milliseconds */
440		− clkval = brcmf_sdcard_cfg_read(sdiodev, SDIO_FUNC_1,
441		− SBSDIO_FUNC1_CHIPCLKCSR, NULL);
	448	+ clkval = brcmf_sdio_regrb(sdiodev,
	449	+ SBSDIO_FUNC1_CHIPCLKCSR, NULL);
442	450
443	451	if ((clkval & ~SBSDIO_AVBITS) != clkset) {
444	452	brcmf_dbg(ERROR, "ChipClkCSR access: wrote 0x%02x read 0x%02x\n",
@@ -446,8 +454,8 @@ brcmf_sdio_chip_buscoreprep(struct brcmf_sdio_dev *sdiodev) · 1 unmodified line
446	454	return -EACCES;
447	455	}
448	456
449		− SPINWAIT(((clkval = brcmf_sdcard_cfg_read(sdiodev, SDIO_FUNC_1,
450		− SBSDIO_FUNC1_CHIPCLKCSR, NULL)),
	457	+ SPINWAIT(((clkval = brcmf_sdio_regrb(sdiodev,
	458	+ SBSDIO_FUNC1_CHIPCLKCSR, NULL)),
451	459	!SBSDIO_ALPAV(clkval)),
452	460	PMU_MAX_TRANSITION_DLY);
453	461	if (!SBSDIO_ALPAV(clkval)) {
@@ -457,13 +465,11 @@ brcmf_sdio_chip_buscoreprep(struct brcmf_sdio_dev *sdiodev) · 3 unmodified lines
457	465	}
458	466
459	467	clkset = SBSDIO_FORCE_HW_CLKREQ_OFF \| SBSDIO_FORCE_ALP;
460		− brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1,
461		− SBSDIO_FUNC1_CHIPCLKCSR, clkset, &err);
	468	+ brcmf_sdio_regwb(sdiodev, SBSDIO_FUNC1_CHIPCLKCSR, clkset, &err);
462	469	udelay(65);
463	470
464	471	/* Also, disable the extra SDIO pull-ups */
465		− brcmf_sdcard_cfg_write(sdiodev, SDIO_FUNC_1,
466		− SBSDIO_FUNC1_SDIOPULLUP, 0, NULL);
	472	+ brcmf_sdio_regwb(sdiodev, SBSDIO_FUNC1_SDIOPULLUP, 0, NULL);
467	473
468	474	return 0;
469	475	}
@@ -472,18 +478,22 @@ static void · 2 unmodified lines
472	478	brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev,
473	479	struct chip_info *ci)
474	480	{
	481	+ u32 base = ci->c_inf[0].base;
	482	+
475	483	/* get chipcommon rev */
476	484	ci->c_inf[0].rev = ci->corerev(sdiodev, ci, ci->c_inf[0].id);
477	485
478	486	/* get chipcommon capabilites */
479		− ci->c_inf[0].caps =
480		− brcmf_sdcard_reg_read(sdiodev,
481		− CORE_CC_REG(ci->c_inf[0].base, capabilities), 4);
	487	+ ci->c_inf[0].caps = brcmf_sdio_regrl(sdiodev,
	488	+ CORE_CC_REG(base, capabilities),
	489	+ NULL);
482	490
483	491	/* get pmu caps & rev */
484	492	if (ci->c_inf[0].caps & CC_CAP_PMU) {
485		− ci->pmucaps = brcmf_sdcard_reg_read(sdiodev,
486		− CORE_CC_REG(ci->c_inf[0].base, pmucapabilities), 4);
	493	+ ci->pmucaps =
	494	+ brcmf_sdio_regrl(sdiodev,
	495	+ CORE_CC_REG(base, pmucapabilities),
	496	+ NULL);
487	497	ci->pmurev = ci->pmucaps & PCAP_REV_MASK;
488	498	}
489	499
@@ -523,10 +533,10 @@ int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev, · 33 unmodified lines
523	533
524	534	brcmf_sdio_chip_buscoresetup(sdiodev, ci);
525	535
526		− brcmf_sdcard_reg_write(sdiodev,
527		− CORE_CC_REG(ci->c_inf[0].base, gpiopullup), 4, 0);
528		− brcmf_sdcard_reg_write(sdiodev,
529		− CORE_CC_REG(ci->c_inf[0].base, gpiopulldown), 4, 0);
	536	+ brcmf_sdio_regwl(sdiodev, CORE_CC_REG(ci->c_inf[0].base, gpiopullup),
	537	+ 0, NULL);
	538	+ brcmf_sdio_regwl(sdiodev, CORE_CC_REG(ci->c_inf[0].base, gpiopulldown),
	539	+ 0, NULL);
530	540
531	541	*ci_ptr = ci;
532	542	return 0;
@@ -562,6 +572,7 @@ brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev, · 29 unmodified lines
562	572	u32 str_mask = 0;
563	573	u32 str_shift = 0;
564	574	char chn[8];
	575	+ u32 base = ci->c_inf[0].base;
565	576
566	577	if (!(ci->c_inf[0].caps & CC_CAP_PMU))
567	578	return;
@@ -591,17 +602,17 @@ brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev, · 23 unmodified lines
591	602	}
592	603	}
593	604
594		− brcmf_sdcard_reg_write(sdiodev,
595		− CORE_CC_REG(ci->c_inf[0].base, chipcontrol_addr),
596		− 4, 1);
597		− cc_data_temp = brcmf_sdcard_reg_read(sdiodev,
598		− CORE_CC_REG(ci->c_inf[0].base, chipcontrol_addr), 4);
	605	+ brcmf_sdio_regwl(sdiodev, CORE_CC_REG(base, chipcontrol_addr),
	606	+ 1, NULL);
	607	+ cc_data_temp =
	608	+ brcmf_sdio_regrl(sdiodev,
	609	+ CORE_CC_REG(base, chipcontrol_addr),
	610	+ NULL);
599	611	cc_data_temp &= ~str_mask;
600	612	drivestrength_sel <<= str_shift;
601	613	cc_data_temp \|= drivestrength_sel;
602		− brcmf_sdcard_reg_write(sdiodev,
603		− CORE_CC_REG(ci->c_inf[0].base, chipcontrol_addr),
604		− 4, cc_data_temp);
	614	+ brcmf_sdio_regwl(sdiodev, CORE_CC_REG(base, chipcontrol_addr),
	615	+ cc_data_temp, NULL);
605	616
606	617	brcmf_dbg(INFO, "SDIO: %dmA drive strength selected, set to 0x%08x\n",
607	618	drivestrength, cc_data_temp);

drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h+11−26

@@ -40,6 +40,10 @@ · 39 unmodified lines
40	40	/* Maximum number of I/O funcs */
41	41	#define SDIOD_MAX_IOFUNCS 7
42	42
	43	+/* mask of register map */
	44	+#define REG_F0_REG_MASK 0x7FF
	45	+#define REG_F1_MISC_MASK 0x1FFFF
	46	+
43	47	/* as of sdiod rev 0, supports 3 functions */
44	48	#define SBSDIO_NUM_FUNCTION 3
45	49
@@ -142,7 +146,6 @@ struct brcmf_sdio_dev { · 96 unmodified lines
142	146	u8 num_funcs; /* Supported funcs on client */
143	147	u32 func_cis_ptr[SDIOD_MAX_IOFUNCS];
144	148	u32 sbwad; /* Save backplane window address */
145		− bool regfail; /* status of last reg_r/w call */
146	149	void *bus;
147	150	atomic_t suspend; /* suspend flag */
148	151	wait_queue_head_t request_byte_wait;
@@ -164,31 +167,13 @@ struct brcmf_sdio_dev { · 15 unmodified lines
164	167	extern int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev);
165	168	extern int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev);
166	169
167		−/* Access SDIO address space (e.g. CCCR) using CMD52 (single-byte interface).
168		− * fn: function number
169		− * addr: unmodified SDIO-space address
170		− * data: data byte to write
171		− * err: pointer to error code (or NULL)
172		− */
173		−extern u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_dev *sdiodev, uint func,
174		− u32 addr, int *err);
175		−extern void brcmf_sdcard_cfg_write(struct brcmf_sdio_dev *sdiodev, uint func,
176		− u32 addr, u8 data, int *err);
177		−
178		−/* Synchronous access to device (client) core registers via CMD53 to F1.
179		− * addr: backplane address (i.e. >= regsva from attach)
180		− * size: register width in bytes (2 or 4)
181		− * data: data for register write
182		− */
183		−extern u32
184		−brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size);
185		−
186		−extern u32
187		−brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size,
188		− u32 data);
189		−
190		−/* Indicate if last reg read/write failed */
191		−extern bool brcmf_sdcard_regfail(struct brcmf_sdio_dev *sdiodev);
	170	+/* sdio device register access interface */
	171	+extern u8 brcmf_sdio_regrb(struct brcmf_sdio_dev sdiodev, u32 addr, int ret);
	172	+extern u32 brcmf_sdio_regrl(struct brcmf_sdio_dev sdiodev, u32 addr, int ret);
	173	+extern void brcmf_sdio_regwb(struct brcmf_sdio_dev *sdiodev, u32 addr,
	174	+ u8 data, int *ret);
	175	+extern void brcmf_sdio_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr,
	176	+ u32 data, int *ret);
192	177
193	178	/* Buffer transfer to/from device (client) core via cmd53.
194	179	* fn: function number

drivers/net/wireless/brcm80211/brcmsmac/Makefile+0−3

@@ -39,10 +39,7 @@ BRCMSMAC_OFILES := \ · 38 unmodified lines
39	39	phy/phytbl_lcn.o \
40	40	phy/phytbl_n.o \
41	41	phy/phy_qmath.o \
42		− otp.o \
43		− srom.o \
44	42	dma.o \
45		− nicpci.o \
46	43	brcms_trace_events.o
47	44
48	45	MODULEPFX := brcmsmac

drivers/net/wireless/brcm80211/brcmsmac/aiutils.c+39−440

@@ -19,7 +19,6 @@ · 18 unmodified lines
19	19	#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
20	20
21	21	#include <linux/delay.h>
22		−#include <linux/pci.h>
23	22
24	23	#include <defs.h>
25	24	#include <chipcommon.h>
@@ -29,8 +28,6 @@ · 3 unmodified lines
29	28	#include "types.h"
30	29	#include "pub.h"
31	30	#include "pmu.h"
32		−#include "srom.h"
33		−#include "nicpci.h"
34	31	#include "aiutils.h"
35	32
36	33	/* slow_clk_ctl */
@@ -321,7 +318,6 @@ · 284 unmodified lines
321	318	#define IS_SIM(chippkg) \
322	319	((chippkg == HDLSIM_PKG_ID) \|\| (chippkg == HWSIM_PKG_ID))
323	320
324		−#define PCI(sih) (ai_get_buscoretype(sih) == PCI_CORE_ID)
325	321	#define PCIE(sih) (ai_get_buscoretype(sih) == PCIE_CORE_ID)
326	322
327	323	#define PCI_FORCEHT(sih) (PCIE(sih) && (ai_get_chip_id(sih) == BCM4716_CHIP_ID))
@@ -454,36 +450,9 @@ struct aidmp { · 126 unmodified lines
454	450	u32 componentid3; /* 0xffc */
455	451	};
456	452
457		−/* return true if PCIE capability exists in the pci config space */
458		−static bool ai_ispcie(struct si_info *sii)
459		−{
460		− u8 cap_ptr;
461		−
462		− cap_ptr =
463		− pcicore_find_pci_capability(sii->pcibus, PCI_CAP_ID_EXP, NULL,
464		− NULL);
465		− if (!cap_ptr)
466		− return false;
467		−
468		− return true;
469		−}
470		−
471		−static bool ai_buscore_prep(struct si_info *sii)
472		−{
473		− /* kludge to enable the clock on the 4306 which lacks a slowclock */
474		− if (!ai_ispcie(sii))
475		− ai_clkctl_xtal(&sii->pub, XTAL \| PLL, ON);
476		− return true;
477		−}
478		−
479	453	static bool
480	454	ai_buscore_setup(struct si_info sii, struct bcma_device cc)
481	455	{
482		− struct bcma_device *pci = NULL;
483		− struct bcma_device *pcie = NULL;
484		− struct bcma_device *core;
485		−
486		−
487	456	/* no cores found, bail out */
488	457	if (cc->bus->nr_cores == 0)
489	458	return false;
@@ -492,8 +461,7 @@ ai_buscore_setup(struct si_info sii, struct bcma_device cc) · 2 unmodified lines
492	461	sii->pub.ccrev = cc->id.rev;
493	462
494	463	/* get chipcommon chipstatus */
495		− if (ai_get_ccrev(&sii->pub) >= 11)
496		− sii->chipst = bcma_read32(cc, CHIPCREGOFFS(chipstatus));
	464	+ sii->chipst = bcma_read32(cc, CHIPCREGOFFS(chipstatus));
497	465
498	466	/* get chipcommon capabilites */
499	467	sii->pub.cccaps = bcma_read32(cc, CHIPCREGOFFS(capabilities));
@@ -506,64 +474,18 @@ ai_buscore_setup(struct si_info sii, struct bcma_device cc) · 6 unmodified lines
506	474	}
507	475
508	476	/* figure out buscore */
509		− list_for_each_entry(core, &cc->bus->cores, list) {
510		− uint cid, crev;
511		−
512		− cid = core->id.id;
513		− crev = core->id.rev;
514		−
515		− if (cid == PCI_CORE_ID) {
516		− pci = core;
517		− } else if (cid == PCIE_CORE_ID) {
518		− pcie = core;
519		− }
520		− }
521		−
522		− if (pci && pcie) {
523		− if (ai_ispcie(sii))
524		− pci = NULL;
525		− else
526		− pcie = NULL;
527		− }
528		− if (pci) {
529		− sii->buscore = pci;
530		− } else if (pcie) {
531		− sii->buscore = pcie;
532		− }
533		−
534		− /* fixup necessary chip/core configurations */
535		− if (!sii->pch) {
536		− sii->pch = pcicore_init(&sii->pub, sii->icbus->drv_pci.core);
537		− if (sii->pch == NULL)
538		− return false;
539		− }
540		− if (ai_pci_fixcfg(&sii->pub))
541		− return false;
	477	+ sii->buscore = ai_findcore(&sii->pub, PCIE_CORE_ID, 0);
542	478
543	479	return true;
544	480	}
545	481
546		−/*
547		− * get boardtype and boardrev
548		− */
549		−static __used void ai_nvram_process(struct si_info *sii)
550		−{
551		− uint w = 0;
552		−
553		− /* do a pci config read to get subsystem id and subvendor id */
554		− pci_read_config_dword(sii->pcibus, PCI_SUBSYSTEM_VENDOR_ID, &w);
555		−
556		− sii->pub.boardvendor = w & 0xffff;
557		− sii->pub.boardtype = (w >> 16) & 0xffff;
558		−}
559		−
560	482	static struct si_info ai_doattach(struct si_info sii,
561	483	struct bcma_bus *pbus)
562	484	{
563	485	struct si_pub *sih = &sii->pub;
564	486	u32 w, savewin;
565	487	struct bcma_device *cc;
566		− uint socitype;
	488	+ struct ssb_sprom *sprom = &pbus->sprom;
567	489
568	490	savewin = 0;
569	491
@@ -573,38 +495,15 @@ static struct si_info ai_doattach(struct si_info sii, · 3 unmodified lines
573	495	/* switch to Chipcommon core */
574	496	cc = pbus->drv_cc.core;
575	497
576		− /* bus/core/clk setup for register access */
577		− if (!ai_buscore_prep(sii))
578		− return NULL;
	498	+ sih->chip = pbus->chipinfo.id;
	499	+ sih->chiprev = pbus->chipinfo.rev;
	500	+ sih->chippkg = pbus->chipinfo.pkg;
	501	+ sih->boardvendor = pbus->boardinfo.vendor;
	502	+ sih->boardtype = pbus->boardinfo.type;
579	503
580		− /*
581		− * ChipID recognition.
582		− * We assume we can read chipid at offset 0 from the regs arg.
583		− * If we add other chiptypes (or if we need to support old sdio
584		− * hosts w/o chipcommon), some way of recognizing them needs to
585		− * be added here.
586		− */
587		− w = bcma_read32(cc, CHIPCREGOFFS(chipid));
588		− socitype = (w & CID_TYPE_MASK) >> CID_TYPE_SHIFT;
589		− /* Might as wll fill in chip id rev & pkg */
590		− sih->chip = w & CID_ID_MASK;
591		− sih->chiprev = (w & CID_REV_MASK) >> CID_REV_SHIFT;
592		− sih->chippkg = (w & CID_PKG_MASK) >> CID_PKG_SHIFT;
593		−
594		− /* scan for cores */
595		− if (socitype != SOCI_AI)
596		− return NULL;
597		−
598		− SI_MSG("Found chip type AI (0x%08x)\n", w);
599	504	if (!ai_buscore_setup(sii, cc))
600	505	goto exit;
601	506
602		− /* Init nvram from sprom/otp if they exist */
603		− if (srom_var_init(&sii->pub))
604		− goto exit;
605		−
606		− ai_nvram_process(sii);
607		−
608	507	/* === NVRAM, clock is ready === */
609	508	bcma_write32(cc, CHIPCREGOFFS(gpiopullup), 0);
610	509	bcma_write32(cc, CHIPCREGOFFS(gpiopulldown), 0);
@@ -617,15 +516,13 @@ static struct si_info ai_doattach(struct si_info sii, · 6 unmodified lines
617	516	}
618	517
619	518	/* setup the GPIO based LED powersave register */
620		− w = getintvar(sih, BRCMS_SROM_LEDDC);
	519	+ w = (sprom->leddc_on_time << BCMA_CC_GPIOTIMER_ONTIME_SHIFT) \|
	520	+ (sprom->leddc_off_time << BCMA_CC_GPIOTIMER_OFFTIME_SHIFT);
621	521	if (w == 0)
622	522	w = DEFAULT_GPIOTIMERVAL;
623	523	ai_cc_reg(sih, offsetof(struct chipcregs, gpiotimerval),
624	524	~0, w);
625	525
626		− if (PCIE(sih))
627		− pcicore_attach(sii->pch, SI_DOATTACH);
628		−
629	526	if (ai_get_chip_id(sih) == BCM43224_CHIP_ID) {
630	527	/*
631	528	* enable 12 mA drive strenth for 43224 and
@@ -659,9 +556,6 @@ static struct si_info ai_doattach(struct si_info sii, · 27 unmodified lines
659	556	return sii;
660	557
661	558	exit:
662		− if (sii->pch)
663		− pcicore_deinit(sii->pch);
664		− sii->pch = NULL;
665	559
666	560	return NULL;
667	561	}
@@ -700,11 +594,6 @@ void ai_detach(struct si_pub *sih) · 32 unmodified lines
700	594	if (sii == NULL)
701	595	return;
702	596
703		− if (sii->pch)
704		− pcicore_deinit(sii->pch);
705		− sii->pch = NULL;
706		−
707		− srom_free_vars(sih);
708	597	kfree(sii);
709	598	}
710	599
@@ -755,21 +644,7 @@ uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val) · 44 unmodified lines
755	644	/* return the slow clock source - LPO, XTAL, or PCI */
756	645	static uint ai_slowclk_src(struct si_pub sih, struct bcma_device cc)
757	646	{
758		− struct si_info *sii;
759		− u32 val;
760		−
761		− sii = (struct si_info *)sih;
762		− if (ai_get_ccrev(&sii->pub) < 6) {
763		− pci_read_config_dword(sii->pcibus, PCI_GPIO_OUT,
764		− &val);
765		− if (val & PCI_CFG_GPIO_SCS)
766		− return SCC_SS_PCI;
767		− return SCC_SS_XTAL;
768		− } else if (ai_get_ccrev(&sii->pub) < 10) {
769		− return bcma_read32(cc, CHIPCREGOFFS(slow_clk_ctl)) &
770		− SCC_SS_MASK;
771		− } else /* Insta-clock */
772		− return SCC_SS_XTAL;
	647	+ return SCC_SS_XTAL;
773	648	}
774	649
775	650	/*
@@ -779,36 +654,12 @@ static uint ai_slowclk_src(struct si_pub sih, struct bcma_device cc) · 3 unmodified lines
779	654	static uint ai_slowclk_freq(struct si_pub *sih, bool max_freq,
780	655	struct bcma_device *cc)
781	656	{
782		− u32 slowclk;
783	657	uint div;
784	658
785		− slowclk = ai_slowclk_src(sih, cc);
786		− if (ai_get_ccrev(sih) < 6) {
787		− if (slowclk == SCC_SS_PCI)
788		− return max_freq ? (PCIMAXFREQ / 64)
789		− : (PCIMINFREQ / 64);
790		− else
791		− return max_freq ? (XTALMAXFREQ / 32)
792		− : (XTALMINFREQ / 32);
793		− } else if (ai_get_ccrev(sih) < 10) {
794		− div = 4 *
795		− (((bcma_read32(cc, CHIPCREGOFFS(slow_clk_ctl)) &
796		− SCC_CD_MASK) >> SCC_CD_SHIFT) + 1);
797		− if (slowclk == SCC_SS_LPO)
798		− return max_freq ? LPOMAXFREQ : LPOMINFREQ;
799		− else if (slowclk == SCC_SS_XTAL)
800		− return max_freq ? (XTALMAXFREQ / div)
801		− : (XTALMINFREQ / div);
802		− else if (slowclk == SCC_SS_PCI)
803		− return max_freq ? (PCIMAXFREQ / div)
804		− : (PCIMINFREQ / div);
805		− } else {
806		− /* Chipc rev 10 is InstaClock */
807		− div = bcma_read32(cc, CHIPCREGOFFS(system_clk_ctl));
808		− div = 4 * ((div >> SYCC_CD_SHIFT) + 1);
809		− return max_freq ? XTALMAXFREQ : (XTALMINFREQ / div);
810		− }
811		− return 0;
	659	+ /* Chipc rev 10 is InstaClock */
	660	+ div = bcma_read32(cc, CHIPCREGOFFS(system_clk_ctl));
	661	+ div = 4 * ((div >> SYCC_CD_SHIFT) + 1);
	662	+ return max_freq ? XTALMAXFREQ : (XTALMINFREQ / div);
812	663	}
813	664
814	665	static void
@@ -831,8 +682,7 @@ ai_clkctl_setdelay(struct si_pub sih, struct bcma_device cc) · 16 unmodified lines
831	682
832	683	/* Starting with 4318 it is ILP that is used for the delays */
833	684	slowmaxfreq =
834		− ai_slowclk_freq(sih,
835		− (ai_get_ccrev(sih) >= 10) ? false : true, cc);
	685	+ ai_slowclk_freq(sih, false, cc);
836	686
837	687	pll_on_delay = ((slowmaxfreq * pll_delay) + 999999) / 1000000;
838	688	fref_sel_delay = ((slowmaxfreq * FREF_DELAY) + 999999) / 1000000;
@@ -854,9 +704,8 @@ void ai_clkctl_init(struct si_pub *sih) · 15 unmodified lines
854	704	return;
855	705
856	706	/* set all Instaclk chip ILP to 1 MHz */
857		− if (ai_get_ccrev(sih) >= 10)
858		− bcma_maskset32(cc, CHIPCREGOFFS(system_clk_ctl), SYCC_CD_MASK,
859		− (ILP_DIV_1MHZ << SYCC_CD_SHIFT));
	707	+ bcma_maskset32(cc, CHIPCREGOFFS(system_clk_ctl), SYCC_CD_MASK,
	708	+ (ILP_DIV_1MHZ << SYCC_CD_SHIFT));
860	709
861	710	ai_clkctl_setdelay(sih, cc);
862	711	}
@@ -891,140 +740,6 @@ u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih) · 28 unmodified lines
891	740	return fpdelay;
892	741	}
893	742
894		−/* turn primary xtal and/or pll off/on */
895		−int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on)
896		−{
897		− struct si_info *sii;
898		− u32 in, out, outen;
899		−
900		− sii = (struct si_info *)sih;
901		−
902		− /* pcie core doesn't have any mapping to control the xtal pu */
903		− if (PCIE(sih))
904		− return -1;
905		−
906		− pci_read_config_dword(sii->pcibus, PCI_GPIO_IN, &in);
907		− pci_read_config_dword(sii->pcibus, PCI_GPIO_OUT, &out);
908		− pci_read_config_dword(sii->pcibus, PCI_GPIO_OUTEN, &outen);
909		−
910		− /*
911		− * Avoid glitching the clock if GPRS is already using it.
912		− * We can't actually read the state of the PLLPD so we infer it
913		− * by the value of XTAL_PU which is readable via gpioin.
914		− */
915		− if (on && (in & PCI_CFG_GPIO_XTAL))
916		− return 0;
917		−
918		− if (what & XTAL)
919		− outen \|= PCI_CFG_GPIO_XTAL;
920		− if (what & PLL)
921		− outen \|= PCI_CFG_GPIO_PLL;
922		−
923		− if (on) {
924		− /* turn primary xtal on */
925		− if (what & XTAL) {
926		− out \|= PCI_CFG_GPIO_XTAL;
927		− if (what & PLL)
928		− out \|= PCI_CFG_GPIO_PLL;
929		− pci_write_config_dword(sii->pcibus,
930		− PCI_GPIO_OUT, out);
931		− pci_write_config_dword(sii->pcibus,
932		− PCI_GPIO_OUTEN, outen);
933		− udelay(XTAL_ON_DELAY);
934		− }
935		−
936		− /* turn pll on */
937		− if (what & PLL) {
938		− out &= ~PCI_CFG_GPIO_PLL;
939		− pci_write_config_dword(sii->pcibus,
940		− PCI_GPIO_OUT, out);
941		− mdelay(2);
942		− }
943		− } else {
944		− if (what & XTAL)
945		− out &= ~PCI_CFG_GPIO_XTAL;
946		− if (what & PLL)
947		− out \|= PCI_CFG_GPIO_PLL;
948		− pci_write_config_dword(sii->pcibus,
949		− PCI_GPIO_OUT, out);
950		− pci_write_config_dword(sii->pcibus,
951		− PCI_GPIO_OUTEN, outen);
952		− }
953		−
954		− return 0;
955		−}
956		−
957		−/* clk control mechanism through chipcommon, no policy checking */
958		−static bool _ai_clkctl_cc(struct si_info *sii, uint mode)
959		−{
960		− struct bcma_device *cc;
961		− u32 scc;
962		−
963		− /* chipcommon cores prior to rev6 don't support dynamic clock control */
964		− if (ai_get_ccrev(&sii->pub) < 6)
965		− return false;
966		−
967		− cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
968		−
969		− if (!(ai_get_cccaps(&sii->pub) & CC_CAP_PWR_CTL) &&
970		− (ai_get_ccrev(&sii->pub) < 20))
971		− return mode == CLK_FAST;
972		−
973		− switch (mode) {
974		− case CLK_FAST: /* FORCEHT, fast (pll) clock */
975		− if (ai_get_ccrev(&sii->pub) < 10) {
976		− /*
977		− * don't forget to force xtal back
978		− * on before we clear SCC_DYN_XTAL..
979		− */
980		− ai_clkctl_xtal(&sii->pub, XTAL, ON);
981		− bcma_maskset32(cc, CHIPCREGOFFS(slow_clk_ctl),
982		− (SCC_XC \| SCC_FS \| SCC_IP), SCC_IP);
983		− } else if (ai_get_ccrev(&sii->pub) < 20) {
984		− bcma_set32(cc, CHIPCREGOFFS(system_clk_ctl), SYCC_HR);
985		− } else {
986		− bcma_set32(cc, CHIPCREGOFFS(clk_ctl_st), CCS_FORCEHT);
987		− }
988		−
989		− /* wait for the PLL */
990		− if (ai_get_cccaps(&sii->pub) & CC_CAP_PMU) {
991		− u32 htavail = CCS_HTAVAIL;
992		− SPINWAIT(((bcma_read32(cc, CHIPCREGOFFS(clk_ctl_st)) &
993		− htavail) == 0), PMU_MAX_TRANSITION_DLY);
994		− } else {
995		− udelay(PLL_DELAY);
996		− }
997		− break;
998		−
999		− case CLK_DYNAMIC: /* enable dynamic clock control */
1000		− if (ai_get_ccrev(&sii->pub) < 10) {
1001		− scc = bcma_read32(cc, CHIPCREGOFFS(slow_clk_ctl));
1002		− scc &= ~(SCC_FS \| SCC_IP \| SCC_XC);
1003		− if ((scc & SCC_SS_MASK) != SCC_SS_XTAL)
1004		− scc \|= SCC_XC;
1005		− bcma_write32(cc, CHIPCREGOFFS(slow_clk_ctl), scc);
1006		−
1007		− /*
1008		− * for dynamic control, we have to
1009		− * release our xtal_pu "force on"
1010		− */
1011		− if (scc & SCC_XC)
1012		− ai_clkctl_xtal(&sii->pub, XTAL, OFF);
1013		− } else if (ai_get_ccrev(&sii->pub) < 20) {
1014		− /* Instaclock */
1015		− bcma_mask32(cc, CHIPCREGOFFS(system_clk_ctl), ~SYCC_HR);
1016		− } else {
1017		− bcma_mask32(cc, CHIPCREGOFFS(clk_ctl_st), ~CCS_FORCEHT);
1018		− }
1019		− break;
1020		−
1021		− default:
1022		− break;
1023		− }
1024		−
1025		− return mode == CLK_FAST;
1026		−}
1027		−
1028	743	/*
1029	744	* clock control policy function throught chipcommon
1030	745	*
@@ -1033,133 +748,53 @@ static bool _ai_clkctl_cc(struct si_info *sii, uint mode) · 2 unmodified lines
1033	748	* this is a wrapper over the next internal function
1034	749	* to allow flexible policy settings for outside caller
1035	750	*/
1036		−bool ai_clkctl_cc(struct si_pub *sih, uint mode)
	751	+bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode)
1037	752	{
1038	753	struct si_info *sii;
	754	+ struct bcma_device *cc;
1039	755
1040	756	sii = (struct si_info *)sih;
1041	757
1042		− /* chipcommon cores prior to rev6 don't support dynamic clock control */
1043		− if (ai_get_ccrev(sih) < 6)
1044		− return false;
1045		−
1046	758	if (PCI_FORCEHT(sih))
1047		− return mode == CLK_FAST;
	759	+ return mode == BCMA_CLKMODE_FAST;
1048	760
1049		− return _ai_clkctl_cc(sii, mode);
	761	+ cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
	762	+ bcma_core_set_clockmode(cc, mode);
	763	+ return mode == BCMA_CLKMODE_FAST;
1050	764	}
1051	765
1052	766	void ai_pci_up(struct si_pub *sih)
1053	767	{
1054	768	struct si_info *sii;
	769	+ struct bcma_device *cc;
1055	770
1056	771	sii = (struct si_info *)sih;
1057	772
1058		− if (PCI_FORCEHT(sih))
1059		− _ai_clkctl_cc(sii, CLK_FAST);
	773	+ if (PCI_FORCEHT(sih)) {
	774	+ cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
	775	+ bcma_core_set_clockmode(cc, BCMA_CLKMODE_FAST);
	776	+ }
1060	777
1061	778	if (PCIE(sih))
1062		− pcicore_up(sii->pch, SI_PCIUP);
1063		−
1064		−}
1065		−
1066		−/* Unconfigure and/or apply various WARs when system is going to sleep mode */
1067		−void ai_pci_sleep(struct si_pub *sih)
1068		−{
1069		− struct si_info *sii;
1070		−
1071		− sii = (struct si_info *)sih;
1072		−
1073		− pcicore_sleep(sii->pch);
	779	+ bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true);
1074	780	}
1075	781
1076	782	/* Unconfigure and/or apply various WARs when going down */
1077	783	void ai_pci_down(struct si_pub *sih)
1078	784	{
1079	785	struct si_info *sii;
	786	+ struct bcma_device *cc;
1080	787
1081	788	sii = (struct si_info *)sih;
1082	789
1083	790	/* release FORCEHT since chip is going to "down" state */
1084		− if (PCI_FORCEHT(sih))
1085		− _ai_clkctl_cc(sii, CLK_DYNAMIC);
1086		−
1087		− pcicore_down(sii->pch, SI_PCIDOWN);
1088		−}
1089		−
1090		−/*
1091		− * Configure the pci core for pci client (NIC) action
1092		− * coremask is the bitvec of cores by index to be enabled.
1093		− */
1094		−void ai_pci_setup(struct si_pub *sih, uint coremask)
1095		−{
1096		− struct si_info *sii;
1097		− u32 w;
1098		−
1099		− sii = (struct si_info *)sih;
1100		−
1101		− /*
1102		− * Enable sb->pci interrupts. Assume
1103		− * PCI rev 2.3 support was added in pci core rev 6 and things changed..
1104		− */
1105		− if (PCIE(sih) \|\| (PCI(sih) && (ai_get_buscorerev(sih) >= 6))) {
1106		− /* pci config write to set this core bit in PCIIntMask */
1107		− pci_read_config_dword(sii->pcibus, PCI_INT_MASK, &w);
1108		− w \|= (coremask << PCI_SBIM_SHIFT);
1109		− pci_write_config_dword(sii->pcibus, PCI_INT_MASK, w);
1110		− }
1111		−
1112		− if (PCI(sih)) {
1113		− pcicore_pci_setup(sii->pch);
	791	+ if (PCI_FORCEHT(sih)) {
	792	+ cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
	793	+ bcma_core_set_clockmode(cc, BCMA_CLKMODE_DYNAMIC);
1114	794	}
1115		−}
1116	795
1117		−/*
1118		− * Fixup SROMless PCI device's configuration.
1119		− * The current core may be changed upon return.
1120		− */
1121		−int ai_pci_fixcfg(struct si_pub *sih)
1122		−{
1123		− struct si_info sii = (struct si_info )sih;
1124		−
1125		− /* Fixup PI in SROM shadow area to enable the correct PCI core access */
1126		− /* check 'pi' is correct and fix it if not */
1127		− pcicore_fixcfg(sii->pch);
1128		− pcicore_hwup(sii->pch);
1129		− return 0;
1130		−}
1131		−
1132		−/* mask&set gpiocontrol bits */
1133		−u32 ai_gpiocontrol(struct si_pub *sih, u32 mask, u32 val, u8 priority)
1134		−{
1135		− uint regoff;
1136		−
1137		− regoff = offsetof(struct chipcregs, gpiocontrol);
1138		− return ai_cc_reg(sih, regoff, mask, val);
1139		−}
1140		−
1141		−void ai_chipcontrl_epa4331(struct si_pub *sih, bool on)
1142		−{
1143		− struct bcma_device *cc;
1144		− u32 val;
1145		−
1146		− cc = ai_findcore(sih, CC_CORE_ID, 0);
1147		−
1148		− if (on) {
1149		− if (ai_get_chippkg(sih) == 9 \|\| ai_get_chippkg(sih) == 0xb)
1150		− /* Ext PA Controls for 4331 12x9 Package */
1151		− bcma_set32(cc, CHIPCREGOFFS(chipcontrol),
1152		− CCTRL4331_EXTPA_EN \|
1153		− CCTRL4331_EXTPA_ON_GPIO2_5);
1154		− else
1155		− /* Ext PA Controls for 4331 12x12 Package */
1156		− bcma_set32(cc, CHIPCREGOFFS(chipcontrol),
1157		− CCTRL4331_EXTPA_EN);
1158		− } else {
1159		− val &= ~(CCTRL4331_EXTPA_EN \| CCTRL4331_EXTPA_ON_GPIO2_5);
1160		− bcma_mask32(cc, CHIPCREGOFFS(chipcontrol),
1161		− ~(CCTRL4331_EXTPA_EN \| CCTRL4331_EXTPA_ON_GPIO2_5));
1162		− }
	796	+ if (PCIE(sih))
	797	+ bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);
1163	798	}
1164	799
1165	800	/* Enable BT-COEX & Ex-PA for 4313 */
@@ -1181,6 +816,9 @@ bool ai_deviceremoved(struct si_pub *sih) · 15 unmodified lines
1181	816
1182	817	sii = (struct si_info *)sih;
1183	818
	819	+ if (sii->icbus->hosttype != BCMA_HOSTTYPE_PCI)
	820	+ return false;
	821	+
1184	822	pci_read_config_dword(sii->pcibus, PCI_VENDOR_ID, &w);
1185	823	if ((w & 0xFFFF) != PCI_VENDOR_ID_BROADCOM)
1186	824	return true;
@@ -1188,45 +826,6 @@ bool ai_deviceremoved(struct si_pub *sih) · 1 unmodified line
1188	826	return false;
1189	827	}
1190	828
1191		−bool ai_is_sprom_available(struct si_pub *sih)
1192		−{
1193		− struct si_info sii = (struct si_info )sih;
1194		−
1195		− if (ai_get_ccrev(sih) >= 31) {
1196		− struct bcma_device *cc;
1197		− u32 sromctrl;
1198		−
1199		− if ((ai_get_cccaps(sih) & CC_CAP_SROM) == 0)
1200		− return false;
1201		−
1202		− cc = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
1203		− sromctrl = bcma_read32(cc, CHIPCREGOFFS(sromcontrol));
1204		− return sromctrl & SRC_PRESENT;
1205		− }
1206		−
1207		− switch (ai_get_chip_id(sih)) {
1208		− case BCM4313_CHIP_ID:
1209		− return (sii->chipst & CST4313_SPROM_PRESENT) != 0;
1210		− default:
1211		− return true;
1212		− }
1213		−}
1214		−
1215		−bool ai_is_otp_disabled(struct si_pub *sih)
1216		−{
1217		− struct si_info sii = (struct si_info )sih;
1218		−
1219		− switch (ai_get_chip_id(sih)) {
1220		− case BCM4313_CHIP_ID:
1221		− return (sii->chipst & CST4313_OTP_PRESENT) == 0;
1222		− /* These chips always have their OTP on */
1223		− case BCM43224_CHIP_ID:
1224		− case BCM43225_CHIP_ID:
1225		− default:
1226		− return false;
1227		− }
1228		−}
1229		−
1230	829	uint ai_get_buscoretype(struct si_pub *sih)
1231	830	{
1232	831	struct si_info sii = (struct si_info )sih;

drivers/net/wireless/brcm80211/brcmsmac/aiutils.h+0−24

@@ -113,10 +113,6 @@ · 112 unmodified lines
113	113	#define XTAL 0x1 /* primary crystal oscillator (2050) */
114	114	#define PLL 0x2 /* main chip pll */
115	115
116		−/* clkctl clk mode */
117		−#define CLK_FAST 0 /* force fast (pll) clock */
118		−#define CLK_DYNAMIC 2 /* enable dynamic clock control */
119		−
120	116	/* GPIO usage priorities */
121	117	#define GPIO_DRV_PRIORITY 0 /* Driver */
122	118	#define GPIO_APP_PRIORITY 1 /* Application */
@@ -172,9 +168,7 @@ struct si_info { · 49 unmodified lines
172	168	struct si_pub pub; /* back plane public state (must be first) */
173	169	struct bcma_bus icbus; / handle to soc interconnect bus */
174	170	struct pci_dev pcibus; / handle to pci bus */
175		− struct pcicore_info pch; / PCI/E core handle */
176	171	struct bcma_device *buscore;
177		− struct list_head var_list; /* list of srom variables */
178	172
179	173	u32 chipst; /* chip status */
180	174	};
@@ -197,38 +191,20 @@ extern u32 ai_core_cflags(struct bcma_device *core, u32 mask, u32 val); · 16 unmodified lines
197	191	extern struct si_pub ai_attach(struct bcma_bus pbus);
198	192	extern void ai_detach(struct si_pub *sih);
199	193	extern uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val);
200		−extern void ai_pci_setup(struct si_pub *sih, uint coremask);
201	194	extern void ai_clkctl_init(struct si_pub *sih);
202	195	extern u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih);
203	196	extern bool ai_clkctl_cc(struct si_pub *sih, uint mode);
204		−extern int ai_clkctl_xtal(struct si_pub *sih, uint what, bool on);
205	197	extern bool ai_deviceremoved(struct si_pub *sih);
206		−extern u32 ai_gpiocontrol(struct si_pub *sih, u32 mask, u32 val,
207		− u8 priority);
208		−
209		−/* OTP status */
210		−extern bool ai_is_otp_disabled(struct si_pub *sih);
211		−
212		−/* SPROM availability */
213		−extern bool ai_is_sprom_available(struct si_pub *sih);
214	198
215		−extern void ai_pci_sleep(struct si_pub *sih);
216	199	extern void ai_pci_down(struct si_pub *sih);
217	200	extern void ai_pci_up(struct si_pub *sih);
218		−extern int ai_pci_fixcfg(struct si_pub *sih);
219	201
220		−extern void ai_chipcontrl_epa4331(struct si_pub *sih, bool on);
221	202	/* Enable Ex-PA for 4313 */
222	203	extern void ai_epa_4313war(struct si_pub *sih);
223	204
224	205	extern uint ai_get_buscoretype(struct si_pub *sih);
225	206	extern uint ai_get_buscorerev(struct si_pub *sih);
226	207
227		−static inline int ai_get_ccrev(struct si_pub *sih)
228		−{
229		− return sih->ccrev;
230		−}
231		−
232	208	static inline u32 ai_get_cccaps(struct si_pub *sih)
233	209	{
234	210	return sih->cccaps;

drivers/net/wireless/brcm80211/brcmsmac/antsel.c+8−8

@@ -108,7 +108,7 @@ brcms_c_antsel_init_cfg(struct antsel_info asi, struct brcms_antselcfg antsel, · 107 unmodified lines
108	108	struct antsel_info brcms_c_antsel_attach(struct brcms_c_info wlc)
109	109	{
110	110	struct antsel_info *asi;
111		− struct si_pub *sih = wlc->hw->sih;
	111	+ struct ssb_sprom *sprom = &wlc->hw->d11core->bus->sprom;
112	112
113	113	asi = kzalloc(sizeof(struct antsel_info), GFP_ATOMIC);
114	114	if (!asi)
@@ -118,7 +118,7 @@ struct antsel_info brcms_c_antsel_attach(struct brcms_c_info wlc) · 3 unmodified lines
118	118	asi->pub = wlc->pub;
119	119	asi->antsel_type = ANTSEL_NA;
120	120	asi->antsel_avail = false;
121		− asi->antsel_antswitch = (u8) getintvar(sih, BRCMS_SROM_ANTSWITCH);
	121	+ asi->antsel_antswitch = sprom->antswitch;
122	122
123	123	if ((asi->pub->sromrev >= 4) && (asi->antsel_antswitch != 0)) {
124	124	switch (asi->antsel_antswitch) {
@@ -128,12 +128,12 @@ struct antsel_info brcms_c_antsel_attach(struct brcms_c_info wlc) · 3 unmodified lines
128	128	/* 4321/2 board with 2x3 switch logic */
129	129	asi->antsel_type = ANTSEL_2x3;
130	130	/* Antenna selection availability */
131		− if (((u16) getintvar(sih, BRCMS_SROM_AA2G) == 7) \|\|
132		− ((u16) getintvar(sih, BRCMS_SROM_AA5G) == 7)) {
	131	+ if ((sprom->ant_available_bg == 7) \|\|
	132	+ (sprom->ant_available_a == 7)) {
133	133	asi->antsel_avail = true;
134	134	} else if (
135		− (u16) getintvar(sih, BRCMS_SROM_AA2G) == 3 \|\|
136		− (u16) getintvar(sih, BRCMS_SROM_AA5G) == 3) {
	135	+ sprom->ant_available_bg == 3 \|\|
	136	+ sprom->ant_available_a == 3) {
137	137	asi->antsel_avail = false;
138	138	} else {
139	139	asi->antsel_avail = false;
@@ -146,8 +146,8 @@ struct antsel_info brcms_c_antsel_attach(struct brcms_c_info wlc) · 6 unmodified lines
146	146	break;
147	147	}
148	148	} else if ((asi->pub->sromrev == 4) &&
149		− ((u16) getintvar(sih, BRCMS_SROM_AA2G) == 7) &&
150		− ((u16) getintvar(sih, BRCMS_SROM_AA5G) == 0)) {
	149	+ (sprom->ant_available_bg == 7) &&
	150	+ (sprom->ant_available_a == 0)) {
151	151	/* hack to match old 4321CB2 cards with 2of3 antenna switch */
152	152	asi->antsel_type = ANTSEL_2x3;
153	153	asi->antsel_avail = true;

drivers/net/wireless/brcm80211/brcmsmac/channel.c+3−4

@@ -1110,7 +1110,7 @@ struct brcms_cm_info brcms_c_channel_mgr_attach(struct brcms_c_info wlc) · 1109 unmodified lines
1110	1110	char country_abbrev[BRCM_CNTRY_BUF_SZ];
1111	1111	const struct country_info *country;
1112	1112	struct brcms_pub *pub = wlc->pub;
1113		− char *ccode;
	1113	+ struct ssb_sprom *sprom = &wlc->hw->d11core->bus->sprom;
1114	1114
1115	1115	BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
1116	1116
@@ -1122,9 +1122,8 @@ struct brcms_cm_info brcms_c_channel_mgr_attach(struct brcms_c_info wlc) · 5 unmodified lines
1122	1122	wlc->cmi = wlc_cm;
1123	1123
1124	1124	/* store the country code for passing up as a regulatory hint */
1125		− ccode = getvar(wlc->hw->sih, BRCMS_SROM_CCODE);
1126		− if (ccode && brcms_c_country_valid(ccode))
1127		− strncpy(wlc->pub->srom_ccode, ccode, BRCM_CNTRY_BUF_SZ - 1);
	1125	+ if (sprom->alpha2 && brcms_c_country_valid(sprom->alpha2))
	1126	+ strncpy(wlc->pub->srom_ccode, sprom->alpha2, sizeof(sprom->alpha2));
1128	1127
1129	1128	/*
1130	1129	* internal country information which must match

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c+5−6

@@ -25,7 +25,6 @@ · 24 unmodified lines
25	25	#include <linux/bcma/bcma.h>
26	26	#include <net/mac80211.h>
27	27	#include <defs.h>
28		−#include "nicpci.h"
29	28	#include "phy/phy_int.h"
30	29	#include "d11.h"
31	30	#include "channel.h"
@@ -770,7 +769,7 @@ void brcms_dpc(unsigned long data) · 738 unmodified lines
770	769	* Precondition: Since this function is called in brcms_pci_probe() context,
771	770	* no locking is required.
772	771	*/
773		−static int brcms_request_fw(struct brcms_info wl, struct pci_dev pdev)
	772	+static int brcms_request_fw(struct brcms_info wl, struct bcma_device pdev)
774	773	{
775	774	int status;
776	775	struct device *device = &pdev->dev;
@@ -1022,7 +1021,7 @@ static struct brcms_info brcms_attach(struct bcma_device pdev) · 245 unmodified lines
1022	1021	spin_lock_init(&wl->isr_lock);
1023	1022
1024	1023	/* prepare ucode */
1025		− if (brcms_request_fw(wl, pdev->bus->host_pci) < 0) {
	1024	+ if (brcms_request_fw(wl, pdev) < 0) {
1026	1025	wiphy_err(wl->wiphy, "%s: Failed to find firmware usually in "
1027	1026	"%s\n", KBUILD_MODNAME, "/lib/firmware/brcm");
1028	1027	brcms_release_fw(wl);
@@ -1043,12 +1042,12 @@ static struct brcms_info brcms_attach(struct bcma_device pdev) · 14 unmodified lines
1043	1042	wl->pub->ieee_hw = hw;
1044	1043
1045	1044	/* register our interrupt handler */
1046		− if (request_irq(pdev->bus->host_pci->irq, brcms_isr,
	1045	+ if (request_irq(pdev->irq, brcms_isr,
1047	1046	IRQF_SHARED, KBUILD_MODNAME, wl)) {
1048	1047	wiphy_err(wl->wiphy, "wl%d: request_irq() failed\n", unit);
1049	1048	goto fail;
1050	1049	}
1051		− wl->irq = pdev->bus->host_pci->irq;
	1050	+ wl->irq = pdev->irq;
1052	1051
1053	1052	/* register module */
1054	1053	brcms_c_module_register(wl->pub, "linux", wl, NULL);
@@ -1098,7 +1097,7 @@ static int __devinit brcms_bcma_probe(struct bcma_device *pdev) · 43 unmodified lines
1098	1097
1099	1098	dev_info(&pdev->dev, "mfg %x core %x rev %d class %d irq %d\n",
1100	1099	pdev->id.manuf, pdev->id.id, pdev->id.rev, pdev->id.class,
1101		− pdev->bus->host_pci->irq);
	1100	+ pdev->irq);
1102	1101
1103	1102	if ((pdev->id.manuf != BCMA_MANUF_BCM) \|\|
1104	1103	(pdev->id.id != BCMA_CORE_80211))

drivers/net/wireless/brcm80211/brcmsmac/main.c+60−82

@@ -1219,7 +1219,7 @@ static void brcms_b_wait_for_wake(struct brcms_hardware *wlc_hw) · 1218 unmodified lines
1219	1219	}
1220	1220
1221	1221	/* control chip clock to save power, enable dynamic clock or force fast clock */
1222		−static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode)
	1222	+static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, enum bcma_clkmode mode)
1223	1223	{
1224	1224	if (ai_get_cccaps(wlc_hw->sih) & CC_CAP_PMU) {
1225	1225	/* new chips with PMU, CCS_FORCEHT will distribute the HT clock
@@ -1229,7 +1229,7 @@ static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode) · 3 unmodified lines
1229	1229	*/
1230	1230
1231	1231	if (wlc_hw->clk) {
1232		− if (mode == CLK_FAST) {
	1232	+ if (mode == BCMA_CLKMODE_FAST) {
1233	1233	bcma_set32(wlc_hw->d11core,
1234	1234	D11REGOFFS(clk_ctl_st),
1235	1235	CCS_FORCEHT);
@@ -1260,7 +1260,7 @@ static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode) · 24 unmodified lines
1260	1260	~CCS_FORCEHT);
1261	1261	}
1262	1262	}
1263		− wlc_hw->forcefastclk = (mode == CLK_FAST);
	1263	+ wlc_hw->forcefastclk = (mode == BCMA_CLKMODE_FAST);
1264	1264	} else {
1265	1265
1266	1266	/* old chips w/o PMU, force HT through cc,
@@ -1567,7 +1567,7 @@ void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw) · 300 unmodified lines
1567	1567	/* request FAST clock if not on */
1568	1568	fastclk = wlc_hw->forcefastclk;
1569	1569	if (!fastclk)
1570		− brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
	1570	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_FAST);
1571	1571
1572	1572	wlc_phy_bw_state_set(wlc_hw->band->pi, bw);
1573	1573
@@ -1576,7 +1576,7 @@ void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw) · 2 unmodified lines
1576	1576
1577	1577	/* restore the clk */
1578	1578	if (!fastclk)
1579		− brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
	1579	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_DYNAMIC);
1580	1580	}
1581	1581
1582	1582	static void brcms_b_upd_synthpu(struct brcms_hardware *wlc_hw)
@@ -1882,27 +1882,20 @@ static bool brcms_c_validboardtype(struct brcms_hardware *wlc_hw) · 299 unmodified lines
1882	1882	return true;
1883	1883	}
1884	1884
1885		−static char brcms_c_get_macaddr(struct brcms_hardware wlc_hw)
	1885	+static void brcms_c_get_macaddr(struct brcms_hardware *wlc_hw, u8 etheraddr[ETH_ALEN])
1886	1886	{
1887		− enum brcms_srom_id var_id = BRCMS_SROM_MACADDR;
1888		− char *macaddr;
	1887	+ struct ssb_sprom *sprom = &wlc_hw->d11core->bus->sprom;
1889	1888
1890	1889	/* If macaddr exists, use it (Sromrev4, CIS, ...). */
1891		− macaddr = getvar(wlc_hw->sih, var_id);
1892		− if (macaddr != NULL)
1893		− return macaddr;
	1890	+ if (!is_zero_ether_addr(sprom->il0mac)) {
	1891	+ memcpy(etheraddr, sprom->il0mac, 6);
	1892	+ return;
	1893	+ }
1894	1894
1895	1895	if (wlc_hw->_nbands > 1)
1896		− var_id = BRCMS_SROM_ET1MACADDR;
	1896	+ memcpy(etheraddr, sprom->et1mac, 6);
1897	1897	else
1898		− var_id = BRCMS_SROM_IL0MACADDR;
1899		−
1900		− macaddr = getvar(wlc_hw->sih, var_id);
1901		− if (macaddr == NULL)
1902		− wiphy_err(wlc_hw->wlc->wiphy, "wl%d: wlc_get_macaddr: macaddr "
1903		− "getvar(%d) not found\n", wlc_hw->unit, var_id);
1904		−
1905		− return macaddr;
	1898	+ memcpy(etheraddr, sprom->il0mac, 6);
1906	1899	}
1907	1900
1908	1901	/* power both the pll and external oscillator on/off */
@@ -1917,9 +1910,6 @@ static void brcms_b_xtal(struct brcms_hardware *wlc_hw, bool want) · 8 unmodified lines
1917	1910	if (!want && wlc_hw->pllreq)
1918	1911	return;
1919	1912
1920		− if (wlc_hw->sih)
1921		− ai_clkctl_xtal(wlc_hw->sih, XTAL \| PLL, want);
1922		−
1923	1913	wlc_hw->sbclk = want;
1924	1914	if (!wlc_hw->sbclk) {
1925	1915	wlc_hw->clk = false;
@@ -2004,7 +1994,7 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags) · 78 unmodified lines
2004	1994	/* request FAST clock if not on */
2005	1995	fastclk = wlc_hw->forcefastclk;
2006	1996	if (!fastclk)
2007		− brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
	1997	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_FAST);
2008	1998
2009	1999	/* reset the dma engines except first time thru */
2010	2000	if (bcma_core_is_enabled(wlc_hw->d11core)) {
@@ -2053,7 +2043,7 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags) · 42 unmodified lines
2053	2043	brcms_c_mctrl_reset(wlc_hw);
2054	2044
2055	2045	if (ai_get_cccaps(wlc_hw->sih) & CC_CAP_PMU)
2056		− brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
	2046	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_FAST);
2057	2047
2058	2048	brcms_b_phy_reset(wlc_hw);
2059	2049
@@ -2065,7 +2055,7 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags) · 5 unmodified lines
2065	2055
2066	2056	/* restore the clk setting */
2067	2057	if (!fastclk)
2068		− brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
	2058	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_DYNAMIC);
2069	2059	}
2070	2060
2071	2061	/* txfifo sizes needs to be modified(increased) since the newer cores
@@ -2218,7 +2208,7 @@ static void brcms_c_gpio_init(struct brcms_c_info *wlc) · 146 unmodified lines
2218	2208	gm \|= gc \|= BOARD_GPIO_PACTRL;
2219	2209
2220	2210	/* apply to gpiocontrol register */
2221		− ai_gpiocontrol(wlc_hw->sih, gm, gc, GPIO_DRV_PRIORITY);
	2211	+ bcma_chipco_gpio_control(&wlc_hw->d11core->bus->drv_cc, gm, gc);
2222	2212	}
2223	2213
2224	2214	static void brcms_ucode_write(struct brcms_hardware *wlc_hw,
@@ -3371,7 +3361,7 @@ static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec) { · 1146 unmodified lines
3371	3361	/* request FAST clock if not on */
3372	3362	fastclk = wlc_hw->forcefastclk;
3373	3363	if (!fastclk)
3374		− brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
	3364	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_FAST);
3375	3365
3376	3366	/* disable interrupts */
3377	3367	macintmask = brcms_intrsoff(wlc->wl);
@@ -3405,7 +3395,7 @@ static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec) { · 27 unmodified lines
3405	3395
3406	3396	/* restore the clk */
3407	3397	if (!fastclk)
3408		− brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
	3398	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_DYNAMIC);
3409	3399	}
3410	3400
3411	3401	static void brcms_c_set_phy_chanspec(struct brcms_c_info *wlc,
@@ -4436,17 +4426,22 @@ static int brcms_b_attach(struct brcms_c_info wlc, struct bcma_device core, · 1024 unmodified lines
4436	4426	uint unit, bool piomode)
4437	4427	{
4438	4428	struct brcms_hardware *wlc_hw;
4439		− char *macaddr = NULL;
4440	4429	uint err = 0;
4441	4430	uint j;
4442	4431	bool wme = false;
4443	4432	struct shared_phy_params sha_params;
4444	4433	struct wiphy *wiphy = wlc->wiphy;
4445	4434	struct pci_dev *pcidev = core->bus->host_pci;
	4435	+ struct ssb_sprom *sprom = &core->bus->sprom;
4446	4436
4447		− BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit,
4448		− pcidev->vendor,
4449		− pcidev->device);
	4437	+ if (core->bus->hosttype == BCMA_HOSTTYPE_PCI)
	4438	+ BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit,
	4439	+ pcidev->vendor,
	4440	+ pcidev->device);
	4441	+ else
	4442	+ BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit,
	4443	+ core->bus->boardinfo.vendor,
	4444	+ core->bus->boardinfo.type);
4450	4445
4451	4446	wme = true;
4452	4447
@@ -4472,7 +4467,8 @@ static int brcms_b_attach(struct brcms_c_info wlc, struct bcma_device core, · 19 unmodified lines
4472	4467	}
4473	4468
4474	4469	/* verify again the device is supported */
4475		− if (!brcms_c_chipmatch(pcidev->vendor, pcidev->device)) {
	4470	+ if (core->bus->hosttype == BCMA_HOSTTYPE_PCI &&
	4471	+ !brcms_c_chipmatch(pcidev->vendor, pcidev->device)) {
4476	4472	wiphy_err(wiphy, "wl%d: brcms_b_attach: Unsupported "
4477	4473	"vendor/device (0x%x/0x%x)\n",
4478	4474	unit, pcidev->vendor, pcidev->device);
@@ -4480,8 +4476,13 @@ static int brcms_b_attach(struct brcms_c_info wlc, struct bcma_device core, · 1 unmodified line
4480	4476	goto fail;
4481	4477	}
4482	4478
4483		− wlc_hw->vendorid = pcidev->vendor;
4484		− wlc_hw->deviceid = pcidev->device;
	4479	+ if (core->bus->hosttype == BCMA_HOSTTYPE_PCI) {
	4480	+ wlc_hw->vendorid = pcidev->vendor;
	4481	+ wlc_hw->deviceid = pcidev->device;
	4482	+ } else {
	4483	+ wlc_hw->vendorid = core->bus->boardinfo.vendor;
	4484	+ wlc_hw->deviceid = core->bus->boardinfo.type;
	4485	+ }
4485	4486
4486	4487	wlc_hw->d11core = core;
4487	4488	wlc_hw->corerev = core->id.rev;
@@ -4501,7 +4502,7 @@ static int brcms_b_attach(struct brcms_c_info wlc, struct bcma_device core, · 13 unmodified lines
4501	4502	* is still false; But it will be called again inside wlc_corereset,
4502	4503	* after d11 is out of reset.
4503	4504	*/
4504		− brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
	4505	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_FAST);
4505	4506	brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
4506	4507
4507	4508	if (!brcms_b_validate_chip_access(wlc_hw)) {
@@ -4512,7 +4513,7 @@ static int brcms_b_attach(struct brcms_c_info wlc, struct bcma_device core, · 4 unmodified lines
4512	4513	}
4513	4514
4514	4515	/* get the board rev, used just below */
4515		− j = getintvar(wlc_hw->sih, BRCMS_SROM_BOARDREV);
	4516	+ j = sprom->board_rev;
4516	4517	/* promote srom boardrev of 0xFF to 1 */
4517	4518	if (j == BOARDREV_PROMOTABLE)
4518	4519	j = BOARDREV_PROMOTED;
@@ -4525,11 +4526,9 @@ static int brcms_b_attach(struct brcms_c_info wlc, struct bcma_device core, · 6 unmodified lines
4525	4526	err = 15;
4526	4527	goto fail;
4527	4528	}
4528		− wlc_hw->sromrev = (u8) getintvar(wlc_hw->sih, BRCMS_SROM_REV);
4529		− wlc_hw->boardflags = (u32) getintvar(wlc_hw->sih,
4530		− BRCMS_SROM_BOARDFLAGS);
4531		− wlc_hw->boardflags2 = (u32) getintvar(wlc_hw->sih,
4532		− BRCMS_SROM_BOARDFLAGS2);
	4529	+ wlc_hw->sromrev = sprom->revision;
	4530	+ wlc_hw->boardflags = sprom->boardflags_lo + (sprom->boardflags_hi << 16);
	4531	+ wlc_hw->boardflags2 = sprom->boardflags2_lo + (sprom->boardflags2_hi << 16);
4533	4532
4534	4533	if (wlc_hw->boardflags & BFL_NOPLLDOWN)
4535	4534	brcms_b_pllreq(wlc_hw, true, BRCMS_PLLREQ_SHARED);
@@ -4702,25 +4701,18 @@ static int brcms_b_attach(struct brcms_c_info wlc, struct bcma_device core, · 166 unmodified lines
4702	4701	*/
4703	4702
4704	4703	/* init etheraddr state variables */
4705		− macaddr = brcms_c_get_macaddr(wlc_hw);
4706		− if (macaddr == NULL) {
4707		− wiphy_err(wiphy, "wl%d: brcms_b_attach: macaddr not found\n",
4708		− unit);
4709		− err = 21;
4710		− goto fail;
4711		− }
4712		− if (!mac_pton(macaddr, wlc_hw->etheraddr) \|\|
4713		− is_broadcast_ether_addr(wlc_hw->etheraddr) \|\|
	4704	+ brcms_c_get_macaddr(wlc_hw, wlc_hw->etheraddr);
	4705	+
	4706	+ if (is_broadcast_ether_addr(wlc_hw->etheraddr) \|\|
4714	4707	is_zero_ether_addr(wlc_hw->etheraddr)) {
4715		− wiphy_err(wiphy, "wl%d: brcms_b_attach: bad macaddr %s\n",
4716		− unit, macaddr);
	4708	+ wiphy_err(wiphy, "wl%d: brcms_b_attach: bad macaddr\n",
	4709	+ unit);
4717	4710	err = 22;
4718	4711	goto fail;
4719	4712	}
4720	4713
4721		− BCMMSG(wlc->wiphy, "deviceid 0x%x nbands %d board 0x%x macaddr: %s\n",
4722		− wlc_hw->deviceid, wlc_hw->_nbands, ai_get_boardtype(wlc_hw->sih),
4723		− macaddr);
	4714	+ BCMMSG(wlc->wiphy, "deviceid 0x%x nbands %d board 0x%x\n",
	4715	+ wlc_hw->deviceid, wlc_hw->_nbands, ai_get_boardtype(wlc_hw->sih));
4724	4716
4725	4717	return err;
4726	4718
@@ -4770,16 +4762,16 @@ static bool brcms_c_attach_stf_ant_init(struct brcms_c_info *wlc) · 43 unmodified lines
4770	4762	int aa;
4771	4763	uint unit;
4772	4764	int bandtype;
4773		− struct si_pub *sih = wlc->hw->sih;
	4765	+ struct ssb_sprom *sprom = &wlc->hw->d11core->bus->sprom;
4774	4766
4775	4767	unit = wlc->pub->unit;
4776	4768	bandtype = wlc->band->bandtype;
4777	4769
4778	4770	/* get antennas available */
4779	4771	if (bandtype == BRCM_BAND_5G)
4780		− aa = (s8) getintvar(sih, BRCMS_SROM_AA5G);
	4772	+ aa = sprom->ant_available_a;
4781	4773	else
4782		− aa = (s8) getintvar(sih, BRCMS_SROM_AA2G);
	4774	+ aa = sprom->ant_available_bg;
4783	4775
4784	4776	if ((aa < 1) \|\| (aa > 15)) {
4785	4777	wiphy_err(wlc->wiphy, "wl%d: %s: Invalid antennas available in"
@@ -4799,9 +4791,9 @@ static bool brcms_c_attach_stf_ant_init(struct brcms_c_info *wlc) · 13 unmodified lines
4799	4791
4800	4792	/* Compute Antenna Gain */
4801	4793	if (bandtype == BRCM_BAND_5G)
4802		− wlc->band->antgain = (s8) getintvar(sih, BRCMS_SROM_AG1);
	4794	+ wlc->band->antgain = sprom->antenna_gain.a1;
4803	4795	else
4804		− wlc->band->antgain = (s8) getintvar(sih, BRCMS_SROM_AG0);
	4796	+ wlc->band->antgain = sprom->antenna_gain.a0;
4805	4797
4806	4798	brcms_c_attach_antgain_init(wlc);
4807	4799
@@ -4952,15 +4944,6 @@ static int brcms_b_detach(struct brcms_c_info *wlc) · 144 unmodified lines
4952	4944
4953	4945	callbacks = 0;
4954	4946
4955		− if (wlc_hw->sih) {
4956		− /*
4957		− * detach interrupt sync mechanism since interrupt is disabled
4958		− * and per-port interrupt object may has been freed. this must
4959		− * be done before sb core switch
4960		− */
4961		− ai_pci_sleep(wlc_hw->sih);
4962		− }
4963		−
4964	4947	brcms_b_detach_dmapio(wlc_hw);
4965	4948
4966	4949	band = wlc_hw->band;
@@ -5047,9 +5030,7 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw) · 80 unmodified lines
5047	5030	*/
5048	5031	brcms_b_xtal(wlc_hw, ON);
5049	5032	ai_clkctl_init(wlc_hw->sih);
5050		− brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
5051		−
5052		− ai_pci_fixcfg(wlc_hw->sih);
	5033	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_FAST);
5053	5034
5054	5035	/*
5055	5036	* TODO: test suspend/resume
@@ -5078,8 +5059,6 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw) · 22 unmodified lines
5078	5059
5079	5060	static int brcms_b_up_prep(struct brcms_hardware *wlc_hw)
5080	5061	{
5081		− uint coremask;
5082		−
5083	5062	BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
5084	5063
5085	5064	/*
@@ -5088,15 +5067,14 @@ static int brcms_b_up_prep(struct brcms_hardware *wlc_hw) · 2 unmodified lines
5088	5067	*/
5089	5068	brcms_b_xtal(wlc_hw, ON);
5090	5069	ai_clkctl_init(wlc_hw->sih);
5091		− brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
	5070	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_FAST);
5092	5071
5093	5072	/*
5094	5073	* Configure pci/pcmcia here instead of in brcms_c_attach()
5095	5074	* to allow mfg hotswap: down, hotswap (chip power cycle), up.
5096	5075	*/
5097		− coremask = (1 << wlc_hw->wlc->core->coreidx);
5098		−
5099		− ai_pci_setup(wlc_hw->sih, coremask);
	5076	+ bcma_core_pci_irq_ctl(&wlc_hw->d11core->bus->drv_pci, wlc_hw->d11core,
	5077	+ true);
5100	5078
5101	5079	/*
5102	5080	* Need to read the hwradio status here to cover the case where the
@@ -5126,7 +5104,7 @@ static int brcms_b_up_finish(struct brcms_hardware *wlc_hw) · 23 unmodified lines
5126	5104	wlc_phy_hw_state_upd(wlc_hw->band->pi, true);
5127	5105
5128	5106	/* FULLY enable dynamic power control and d11 core interrupt */
5129		− brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
	5107	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_DYNAMIC);
5130	5108	brcms_intrson(wlc_hw->wlc->wl);
5131	5109	return 0;
5132	5110	}
@@ -5267,7 +5245,7 @@ static int brcms_b_bmac_down_prep(struct brcms_hardware *wlc_hw) · 134 unmodified lines
5267	5245	brcms_intrsoff(wlc_hw->wlc->wl);
5268	5246
5269	5247	/* ensure we're running on the pll clock again */
5270		− brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
	5248	+ brcms_b_clkctl_clk(wlc_hw, BCMA_CLKMODE_FAST);
5271	5249	}
5272	5250	/* down phy at the last of this stage */
5273	5251	callbacks += wlc_phy_down(wlc_hw->band->pi);

drivers/net/wireless/brcm80211/brcmsmac/nicpci.c+0−826

@@ -1,826 +0,0 @@
1		−/*
2		− * Copyright (c) 2010 Broadcom Corporation
3		− *
4		− * Permission to use, copy, modify, and/or distribute this software for any
5		− * purpose with or without fee is hereby granted, provided that the above
6		− * copyright notice and this permission notice appear in all copies.
7		− *
8		− * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9		− * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10		− * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
11		− * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12		− * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
13		− * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
14		− * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15		− */
16		−
17		−#include <linux/slab.h>
18		−#include <linux/delay.h>
19		−#include <linux/pci.h>
20		−
21		−#include <defs.h>
22		−#include <soc.h>
23		−#include <chipcommon.h>
24		−#include "aiutils.h"
25		−#include "pub.h"
26		−#include "nicpci.h"
27		−
28		−/* SPROM offsets */
29		−#define SRSH_ASPM_OFFSET 4 /* word 4 */
30		−#define SRSH_ASPM_ENB 0x18 /* bit 3, 4 */
31		−#define SRSH_ASPM_L1_ENB 0x10 /* bit 4 */
32		−#define SRSH_ASPM_L0s_ENB 0x8 /* bit 3 */
33		−
34		−#define SRSH_PCIE_MISC_CONFIG 5 /* word 5 */
35		−#define SRSH_L23READY_EXIT_NOPERST 0x8000 /* bit 15 */
36		−#define SRSH_CLKREQ_OFFSET_REV5 20 /* word 20 for srom rev <= 5 */
37		−#define SRSH_CLKREQ_ENB 0x0800 /* bit 11 */
38		−#define SRSH_BD_OFFSET 6 /* word 6 */
39		−
40		−/* chipcontrol */
41		−#define CHIPCTRL_4321_PLL_DOWN 0x800000/* serdes PLL down override */
42		−
43		−/* MDIO control */
44		−#define MDIOCTL_DIVISOR_MASK 0x7f /* clock to be used on MDIO */
45		−#define MDIOCTL_DIVISOR_VAL 0x2
46		−#define MDIOCTL_PREAM_EN 0x80 /* Enable preamble sequnce */
47		−#define MDIOCTL_ACCESS_DONE 0x100 /* Transaction complete */
48		−
49		−/* MDIO Data */
50		−#define MDIODATA_MASK 0x0000ffff /* data 2 bytes */
51		−#define MDIODATA_TA 0x00020000 /* Turnaround */
52		−
53		−#define MDIODATA_REGADDR_SHF 18 /* Regaddr shift */
54		−#define MDIODATA_REGADDR_MASK 0x007c0000 /* Regaddr Mask */
55		−#define MDIODATA_DEVADDR_SHF 23 /* Physmedia devaddr shift */
56		−#define MDIODATA_DEVADDR_MASK 0x0f800000
57		− /* Physmedia devaddr Mask */
58		−
59		−/* MDIO Data for older revisions < 10 */
60		−#define MDIODATA_REGADDR_SHF_OLD 18 /* Regaddr shift */
61		−#define MDIODATA_REGADDR_MASK_OLD 0x003c0000
62		− /* Regaddr Mask */
63		−#define MDIODATA_DEVADDR_SHF_OLD 22 /* Physmedia devaddr shift */
64		−#define MDIODATA_DEVADDR_MASK_OLD 0x0fc00000
65		− /* Physmedia devaddr Mask */
66		−
67		−/* Transactions flags */
68		−#define MDIODATA_WRITE 0x10000000
69		−#define MDIODATA_READ 0x20000000
70		−#define MDIODATA_START 0x40000000
71		−
72		−#define MDIODATA_DEV_ADDR 0x0 /* dev address for serdes */
73		−#define MDIODATA_BLK_ADDR 0x1F /* blk address for serdes */
74		−
75		−/* serdes regs (rev < 10) */
76		−#define MDIODATA_DEV_PLL 0x1d /* SERDES PLL Dev */
77		−#define MDIODATA_DEV_TX 0x1e /* SERDES TX Dev */
78		−#define MDIODATA_DEV_RX 0x1f /* SERDES RX Dev */
79		−
80		−/* SERDES RX registers */
81		−#define SERDES_RX_CTRL 1 /* Rx cntrl */
82		−#define SERDES_RX_TIMER1 2 /* Rx Timer1 */
83		−#define SERDES_RX_CDR 6 /* CDR */
84		−#define SERDES_RX_CDRBW 7 /* CDR BW */
85		−/* SERDES RX control register */
86		−#define SERDES_RX_CTRL_FORCE 0x80 /* rxpolarity_force */
87		−#define SERDES_RX_CTRL_POLARITY 0x40 /* rxpolarity_value */
88		−
89		−/* SERDES PLL registers */
90		−#define SERDES_PLL_CTRL 1 /* PLL control reg */
91		−#define PLL_CTRL_FREQDET_EN 0x4000 /* bit 14 is FREQDET on */
92		−
93		−/* Linkcontrol reg offset in PCIE Cap */
94		−#define PCIE_CAP_LINKCTRL_OFFSET 16 /* offset in pcie cap */
95		−#define PCIE_CAP_LCREG_ASPML0s 0x01 /* ASPM L0s in linkctrl */
96		−#define PCIE_CAP_LCREG_ASPML1 0x02 /* ASPM L1 in linkctrl */
97		−#define PCIE_CLKREQ_ENAB 0x100 /* CLKREQ Enab in linkctrl */
98		−
99		−#define PCIE_ASPM_ENAB 3 /* ASPM L0s & L1 in linkctrl */
100		−#define PCIE_ASPM_L1_ENAB 2 /* ASPM L0s & L1 in linkctrl */
101		−#define PCIE_ASPM_L0s_ENAB 1 /* ASPM L0s & L1 in linkctrl */
102		−#define PCIE_ASPM_DISAB 0 /* ASPM L0s & L1 in linkctrl */
103		−
104		−/* Power management threshold */
105		−#define PCIE_L1THRESHOLDTIME_MASK 0xFF00 /* bits 8 - 15 */
106		−#define PCIE_L1THRESHOLDTIME_SHIFT 8 /* PCIE_L1THRESHOLDTIME_SHIFT */
107		−#define PCIE_L1THRESHOLD_WARVAL 0x72 /* WAR value */
108		−#define PCIE_ASPMTIMER_EXTEND 0x01000000
109		− /* > rev7:
110		− * enable extend ASPM timer
111		− */
112		−
113		−/* different register spaces to access thru pcie indirect access */
114		−#define PCIE_CONFIGREGS 1 /* Access to config space */
115		−#define PCIE_PCIEREGS 2 /* Access to pcie registers */
116		−
117		−/* PCIE protocol PHY diagnostic registers */
118		−#define PCIE_PLP_STATUSREG 0x204 /* Status */
119		−
120		−/* Status reg PCIE_PLP_STATUSREG */
121		−#define PCIE_PLP_POLARITYINV_STAT 0x10
122		−
123		−/* PCIE protocol DLLP diagnostic registers */
124		−#define PCIE_DLLP_LCREG 0x100 /* Link Control */
125		−#define PCIE_DLLP_PMTHRESHREG 0x128 /* Power Management Threshold */
126		−
127		−/* PCIE protocol TLP diagnostic registers */
128		−#define PCIE_TLP_WORKAROUNDSREG 0x004 /* TLP Workarounds */
129		−
130		−/* Sonics to PCI translation types */
131		−#define SBTOPCI_PREF 0x4 /* prefetch enable */
132		−#define SBTOPCI_BURST 0x8 /* burst enable */
133		−#define SBTOPCI_RC_READMULTI 0x20 /* memory read multiple */
134		−
135		−#define PCI_CLKRUN_DSBL 0x8000 /* Bit 15 forceClkrun */
136		−
137		−/* PCI core index in SROM shadow area */
138		−#define SRSH_PI_OFFSET 0 /* first word */
139		−#define SRSH_PI_MASK 0xf000 /* bit 15:12 */
140		−#define SRSH_PI_SHIFT 12 /* bit 15:12 */
141		−
142		−#define PCIREGOFFS(field) offsetof(struct sbpciregs, field)
143		−#define PCIEREGOFFS(field) offsetof(struct sbpcieregs, field)
144		−
145		−/* Sonics side: PCI core and host control registers */
146		−struct sbpciregs {
147		− u32 control; /* PCI control */
148		− u32 PAD[3];
149		− u32 arbcontrol; /* PCI arbiter control */
150		− u32 clkrun; /* Clkrun Control (>=rev11) */
151		− u32 PAD[2];
152		− u32 intstatus; /* Interrupt status */
153		− u32 intmask; /* Interrupt mask */
154		− u32 sbtopcimailbox; /* Sonics to PCI mailbox */
155		− u32 PAD[9];
156		− u32 bcastaddr; /* Sonics broadcast address */
157		− u32 bcastdata; /* Sonics broadcast data */
158		− u32 PAD[2];
159		− u32 gpioin; /* ro: gpio input (>=rev2) */
160		− u32 gpioout; /* rw: gpio output (>=rev2) */
161		− u32 gpioouten; /* rw: gpio output enable (>= rev2) */
162		− u32 gpiocontrol; /* rw: gpio control (>= rev2) */
163		− u32 PAD[36];
164		− u32 sbtopci0; /* Sonics to PCI translation 0 */
165		− u32 sbtopci1; /* Sonics to PCI translation 1 */
166		− u32 sbtopci2; /* Sonics to PCI translation 2 */
167		− u32 PAD[189];
168		− u32 pcicfg[4][64]; /* 0x400 - 0x7FF, PCI Cfg Space (>=rev8) */
169		− u16 sprom[36]; /* SPROM shadow Area */
170		− u32 PAD[46];
171		−};
172		−
173		−/* SB side: PCIE core and host control registers */
174		−struct sbpcieregs {
175		− u32 control; /* host mode only */
176		− u32 PAD[2];
177		− u32 biststatus; /* bist Status: 0x00C */
178		− u32 gpiosel; /* PCIE gpio sel: 0x010 */
179		− u32 gpioouten; /* PCIE gpio outen: 0x14 */
180		− u32 PAD[2];
181		− u32 intstatus; /* Interrupt status: 0x20 */
182		− u32 intmask; /* Interrupt mask: 0x24 */
183		− u32 sbtopcimailbox; /* sb to pcie mailbox: 0x028 */
184		− u32 PAD[53];
185		− u32 sbtopcie0; /* sb to pcie translation 0: 0x100 */
186		− u32 sbtopcie1; /* sb to pcie translation 1: 0x104 */
187		− u32 sbtopcie2; /* sb to pcie translation 2: 0x108 */
188		− u32 PAD[5];
189		−
190		− /* pcie core supports in direct access to config space */
191		− u32 configaddr; /* pcie config space access: Address field: 0x120 */
192		− u32 configdata; /* pcie config space access: Data field: 0x124 */
193		−
194		− /* mdio access to serdes */
195		− u32 mdiocontrol; /* controls the mdio access: 0x128 */
196		− u32 mdiodata; /* Data to the mdio access: 0x12c */
197		−
198		− /* pcie protocol phy/dllp/tlp register indirect access mechanism */
199		− u32 pcieindaddr; /* indirect access to
200		− * the internal register: 0x130
201		− */
202		− u32 pcieinddata; /* Data to/from the internal regsiter: 0x134 */
203		−
204		− u32 clkreqenctrl; /* >= rev 6, Clkreq rdma control : 0x138 */
205		− u32 PAD[177];
206		− u32 pciecfg[4][64]; /* 0x400 - 0x7FF, PCIE Cfg Space */
207		− u16 sprom[64]; /* SPROM shadow Area */
208		−};
209		−
210		−struct pcicore_info {
211		− struct bcma_device *core;
212		− struct si_pub sih; / System interconnect handle */
213		− struct pci_dev *dev;
214		− u8 pciecap_lcreg_offset;/* PCIE capability LCreg offset
215		− * in the config space
216		− */
217		− bool pcie_pr42767;
218		− u8 pcie_polarity;
219		− u8 pcie_war_aspm_ovr; /* Override ASPM/Clkreq settings */
220		−
221		− u8 pmecap_offset; /* PM Capability offset in the config space */
222		− bool pmecap; /* Capable of generating PME */
223		−};
224		−
225		−#define PCIE_ASPM(sih) \
226		− ((ai_get_buscoretype(sih) == PCIE_CORE_ID) && \
227		− ((ai_get_buscorerev(sih) >= 3) && \
228		− (ai_get_buscorerev(sih) <= 5)))
229		−
230		−
231		−/* delay needed between the mdio control/ mdiodata register data access */
232		−static void pr28829_delay(void)
233		−{
234		− udelay(10);
235		−}
236		−
237		−/* Initialize the PCI core.
238		− * It's caller's responsibility to make sure that this is done only once
239		− */
240		−struct pcicore_info pcicore_init(struct si_pub sih, struct bcma_device *core)
241		−{
242		− struct pcicore_info *pi;
243		−
244		− /* alloc struct pcicore_info */
245		− pi = kzalloc(sizeof(struct pcicore_info), GFP_ATOMIC);
246		− if (pi == NULL)
247		− return NULL;
248		−
249		− pi->sih = sih;
250		− pi->dev = core->bus->host_pci;
251		− pi->core = core;
252		−
253		− if (core->id.id == PCIE_CORE_ID) {
254		− u8 cap_ptr;
255		− cap_ptr = pcicore_find_pci_capability(pi->dev, PCI_CAP_ID_EXP,
256		− NULL, NULL);
257		− pi->pciecap_lcreg_offset = cap_ptr + PCIE_CAP_LINKCTRL_OFFSET;
258		− }
259		− return pi;
260		−}
261		−
262		−void pcicore_deinit(struct pcicore_info *pch)
263		−{
264		− kfree(pch);
265		−}
266		−
267		−/* return cap_offset if requested capability exists in the PCI config space */
268		−/* Note that it's caller's responsibility to make sure it's a pci bus */
269		−u8
270		−pcicore_find_pci_capability(struct pci_dev *dev, u8 req_cap_id,
271		− unsigned char buf, u32 buflen)
272		−{
273		− u8 cap_id;
274		− u8 cap_ptr = 0;
275		− u32 bufsize;
276		− u8 byte_val;
277		−
278		− /* check for Header type 0 */
279		− pci_read_config_byte(dev, PCI_HEADER_TYPE, &byte_val);
280		− if ((byte_val & 0x7f) != PCI_HEADER_TYPE_NORMAL)
281		− goto end;
282		−
283		− /* check if the capability pointer field exists */
284		− pci_read_config_byte(dev, PCI_STATUS, &byte_val);
285		− if (!(byte_val & PCI_STATUS_CAP_LIST))
286		− goto end;
287		−
288		− pci_read_config_byte(dev, PCI_CAPABILITY_LIST, &cap_ptr);
289		− /* check if the capability pointer is 0x00 */
290		− if (cap_ptr == 0x00)
291		− goto end;
292		−
293		− /* loop thru the capability list
294		− * and see if the pcie capability exists
295		− */
296		−
297		− pci_read_config_byte(dev, cap_ptr, &cap_id);
298		−
299		− while (cap_id != req_cap_id) {
300		− pci_read_config_byte(dev, cap_ptr + 1, &cap_ptr);
301		− if (cap_ptr == 0x00)
302		− break;
303		− pci_read_config_byte(dev, cap_ptr, &cap_id);
304		− }
305		− if (cap_id != req_cap_id)
306		− goto end;
307		−
308		− /* found the caller requested capability */
309		− if (buf != NULL && buflen != NULL) {
310		− u8 cap_data;
311		−
312		− bufsize = *buflen;
313		− if (!bufsize)
314		− goto end;
315		− *buflen = 0;
316		− /* copy the capability data excluding cap ID and next ptr */
317		− cap_data = cap_ptr + 2;
318		− if ((bufsize + cap_data) > PCI_SZPCR)
319		− bufsize = PCI_SZPCR - cap_data;
320		− *buflen = bufsize;
321		− while (bufsize--) {
322		− pci_read_config_byte(dev, cap_data, buf);
323		− cap_data++;
324		− buf++;
325		− }
326		− }
327		−end:
328		− return cap_ptr;
329		−}
330		−
331		−/* ***** Register Access API */
332		−static uint
333		−pcie_readreg(struct bcma_device *core, uint addrtype, uint offset)
334		−{
335		− uint retval = 0xFFFFFFFF;
336		−
337		− switch (addrtype) {
338		− case PCIE_CONFIGREGS:
339		− bcma_write32(core, PCIEREGOFFS(configaddr), offset);
340		− (void)bcma_read32(core, PCIEREGOFFS(configaddr));
341		− retval = bcma_read32(core, PCIEREGOFFS(configdata));
342		− break;
343		− case PCIE_PCIEREGS:
344		− bcma_write32(core, PCIEREGOFFS(pcieindaddr), offset);
345		− (void)bcma_read32(core, PCIEREGOFFS(pcieindaddr));
346		− retval = bcma_read32(core, PCIEREGOFFS(pcieinddata));
347		− break;
348		− }
349		−
350		− return retval;
351		−}
352		−
353		−static uint pcie_writereg(struct bcma_device *core, uint addrtype,
354		− uint offset, uint val)
355		−{
356		− switch (addrtype) {
357		− case PCIE_CONFIGREGS:
358		− bcma_write32(core, PCIEREGOFFS(configaddr), offset);
359		− bcma_write32(core, PCIEREGOFFS(configdata), val);
360		− break;
361		− case PCIE_PCIEREGS:
362		− bcma_write32(core, PCIEREGOFFS(pcieindaddr), offset);
363		− bcma_write32(core, PCIEREGOFFS(pcieinddata), val);
364		− break;
365		− default:
366		− break;
367		− }
368		− return 0;
369		−}
370		−
371		−static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk)
372		−{
373		− uint mdiodata, i = 0;
374		− uint pcie_serdes_spinwait = 200;
375		−
376		− mdiodata = (MDIODATA_START \| MDIODATA_WRITE \| MDIODATA_TA \|
377		− (MDIODATA_DEV_ADDR << MDIODATA_DEVADDR_SHF) \|
378		− (MDIODATA_BLK_ADDR << MDIODATA_REGADDR_SHF) \|
379		− (blk << 4));
380		− bcma_write32(pi->core, PCIEREGOFFS(mdiodata), mdiodata);
381		−
382		− pr28829_delay();
383		− /* retry till the transaction is complete */
384		− while (i < pcie_serdes_spinwait) {
385		− if (bcma_read32(pi->core, PCIEREGOFFS(mdiocontrol)) &
386		− MDIOCTL_ACCESS_DONE)
387		− break;
388		−
389		− udelay(1000);
390		− i++;
391		− }
392		−
393		− if (i >= pcie_serdes_spinwait)
394		− return false;
395		−
396		− return true;
397		−}
398		−
399		−static int
400		−pcie_mdioop(struct pcicore_info *pi, uint physmedia, uint regaddr, bool write,
401		− uint *val)
402		−{
403		− uint mdiodata;
404		− uint i = 0;
405		− uint pcie_serdes_spinwait = 10;
406		−
407		− /* enable mdio access to SERDES */
408		− bcma_write32(pi->core, PCIEREGOFFS(mdiocontrol),
409		− MDIOCTL_PREAM_EN \| MDIOCTL_DIVISOR_VAL);
410		−
411		− if (ai_get_buscorerev(pi->sih) >= 10) {
412		− /* new serdes is slower in rw,
413		− * using two layers of reg address mapping
414		− */
415		− if (!pcie_mdiosetblock(pi, physmedia))
416		− return 1;
417		− mdiodata = ((MDIODATA_DEV_ADDR << MDIODATA_DEVADDR_SHF) \|
418		− (regaddr << MDIODATA_REGADDR_SHF));
419		− pcie_serdes_spinwait *= 20;
420		− } else {
421		− mdiodata = ((physmedia << MDIODATA_DEVADDR_SHF_OLD) \|
422		− (regaddr << MDIODATA_REGADDR_SHF_OLD));
423		− }
424		−
425		− if (!write)
426		− mdiodata \|= (MDIODATA_START \| MDIODATA_READ \| MDIODATA_TA);
427		− else
428		− mdiodata \|= (MDIODATA_START \| MDIODATA_WRITE \| MDIODATA_TA \|
429		− *val);
430		−
431		− bcma_write32(pi->core, PCIEREGOFFS(mdiodata), mdiodata);
432		−
433		− pr28829_delay();
434		−
435		− /* retry till the transaction is complete */
436		− while (i < pcie_serdes_spinwait) {
437		− if (bcma_read32(pi->core, PCIEREGOFFS(mdiocontrol)) &
438		− MDIOCTL_ACCESS_DONE) {
439		− if (!write) {
440		− pr28829_delay();
441		− *val = (bcma_read32(pi->core,
442		− PCIEREGOFFS(mdiodata)) &
443		− MDIODATA_MASK);
444		− }
445		− /* Disable mdio access to SERDES */
446		− bcma_write32(pi->core, PCIEREGOFFS(mdiocontrol), 0);
447		− return 0;
448		− }
449		− udelay(1000);
450		− i++;
451		− }
452		−
453		− /* Timed out. Disable mdio access to SERDES. */
454		− bcma_write32(pi->core, PCIEREGOFFS(mdiocontrol), 0);
455		− return 1;
456		−}
457		−
458		−/* use the mdio interface to read from mdio slaves */
459		−static int
460		−pcie_mdioread(struct pcicore_info *pi, uint physmedia, uint regaddr,
461		− uint *regval)
462		−{
463		− return pcie_mdioop(pi, physmedia, regaddr, false, regval);
464		−}
465		−
466		−/* use the mdio interface to write to mdio slaves */
467		−static int
468		−pcie_mdiowrite(struct pcicore_info *pi, uint physmedia, uint regaddr, uint val)
469		−{
470		− return pcie_mdioop(pi, physmedia, regaddr, true, &val);
471		−}
472		−
473		−/* *** Support functions *** */
474		−static u8 pcie_clkreq(struct pcicore_info *pi, u32 mask, u32 val)
475		−{
476		− u32 reg_val;
477		− u8 offset;
478		−
479		− offset = pi->pciecap_lcreg_offset;
480		− if (!offset)
481		− return 0;
482		−
483		− pci_read_config_dword(pi->dev, offset, &reg_val);
484		− /* set operation */
485		− if (mask) {
486		− if (val)
487		− reg_val \|= PCIE_CLKREQ_ENAB;
488		− else
489		− reg_val &= ~PCIE_CLKREQ_ENAB;
490		− pci_write_config_dword(pi->dev, offset, reg_val);
491		− pci_read_config_dword(pi->dev, offset, &reg_val);
492		− }
493		− if (reg_val & PCIE_CLKREQ_ENAB)
494		− return 1;
495		− else
496		− return 0;
497		−}
498		−
499		−static void pcie_extendL1timer(struct pcicore_info *pi, bool extend)
500		−{
501		− u32 w;
502		− struct si_pub *sih = pi->sih;
503		−
504		− if (ai_get_buscoretype(sih) != PCIE_CORE_ID \|\|
505		− ai_get_buscorerev(sih) < 7)
506		− return;
507		−
508		− w = pcie_readreg(pi->core, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG);
509		− if (extend)
510		− w \|= PCIE_ASPMTIMER_EXTEND;
511		− else
512		− w &= ~PCIE_ASPMTIMER_EXTEND;
513		− pcie_writereg(pi->core, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG, w);
514		− w = pcie_readreg(pi->core, PCIE_PCIEREGS, PCIE_DLLP_PMTHRESHREG);
515		−}
516		−
517		−/* centralized clkreq control policy */
518		−static void pcie_clkreq_upd(struct pcicore_info *pi, uint state)
519		−{
520		− struct si_pub *sih = pi->sih;
521		−
522		− switch (state) {
523		− case SI_DOATTACH:
524		− if (PCIE_ASPM(sih))
525		− pcie_clkreq(pi, 1, 0);
526		− break;
527		− case SI_PCIDOWN:
528		− /* turn on serdes PLL down */
529		− if (ai_get_buscorerev(sih) == 6) {
530		− ai_cc_reg(sih,
531		− offsetof(struct chipcregs, chipcontrol_addr),
532		− ~0, 0);
533		− ai_cc_reg(sih,
534		− offsetof(struct chipcregs, chipcontrol_data),
535		− ~0x40, 0);
536		− } else if (pi->pcie_pr42767) {
537		− pcie_clkreq(pi, 1, 1);
538		− }
539		− break;
540		− case SI_PCIUP:
541		− /* turn off serdes PLL down */
542		− if (ai_get_buscorerev(sih) == 6) {
543		− ai_cc_reg(sih,
544		− offsetof(struct chipcregs, chipcontrol_addr),
545		− ~0, 0);
546		− ai_cc_reg(sih,
547		− offsetof(struct chipcregs, chipcontrol_data),
548		− ~0x40, 0x40);
549		− } else if (PCIE_ASPM(sih)) { /* disable clkreq */
550		− pcie_clkreq(pi, 1, 0);
551		− }
552		− break;
553		− }
554		−}
555		−
556		−/* *** PCI core WARs *** */
557		−/* Done only once at attach time */
558		−static void pcie_war_polarity(struct pcicore_info *pi)
559		−{
560		− u32 w;
561		−
562		− if (pi->pcie_polarity != 0)
563		− return;
564		−
565		− w = pcie_readreg(pi->core, PCIE_PCIEREGS, PCIE_PLP_STATUSREG);
566		−
567		− /* Detect the current polarity at attach and force that polarity and
568		− * disable changing the polarity
569		− */
570		− if ((w & PCIE_PLP_POLARITYINV_STAT) == 0)
571		− pi->pcie_polarity = SERDES_RX_CTRL_FORCE;
572		− else
573		− pi->pcie_polarity = (SERDES_RX_CTRL_FORCE \|
574		− SERDES_RX_CTRL_POLARITY);
575		−}
576		−
577		−/* enable ASPM and CLKREQ if srom doesn't have it */
578		−/* Needs to happen when update to shadow SROM is needed
579		− * : Coming out of 'standby'/'hibernate'
580		− * : If pcie_war_aspm_ovr state changed
581		− */
582		−static void pcie_war_aspm_clkreq(struct pcicore_info *pi)
583		−{
584		− struct si_pub *sih = pi->sih;
585		− u16 val16;
586		− u32 w;
587		−
588		− if (!PCIE_ASPM(sih))
589		− return;
590		−
591		− /* bypass this on QT or VSIM */
592		− val16 = bcma_read16(pi->core, PCIEREGOFFS(sprom[SRSH_ASPM_OFFSET]));
593		−
594		− val16 &= ~SRSH_ASPM_ENB;
595		− if (pi->pcie_war_aspm_ovr == PCIE_ASPM_ENAB)
596		− val16 \|= SRSH_ASPM_ENB;
597		− else if (pi->pcie_war_aspm_ovr == PCIE_ASPM_L1_ENAB)
598		− val16 \|= SRSH_ASPM_L1_ENB;
599		− else if (pi->pcie_war_aspm_ovr == PCIE_ASPM_L0s_ENAB)
600		− val16 \|= SRSH_ASPM_L0s_ENB;
601		−
602		− bcma_write16(pi->core, PCIEREGOFFS(sprom[SRSH_ASPM_OFFSET]), val16);
603		−
604		− pci_read_config_dword(pi->dev, pi->pciecap_lcreg_offset, &w);
605		− w &= ~PCIE_ASPM_ENAB;
606		− w \|= pi->pcie_war_aspm_ovr;
607		− pci_write_config_dword(pi->dev, pi->pciecap_lcreg_offset, w);
608		−
609		− val16 = bcma_read16(pi->core,
610		− PCIEREGOFFS(sprom[SRSH_CLKREQ_OFFSET_REV5]));
611		−
612		− if (pi->pcie_war_aspm_ovr != PCIE_ASPM_DISAB) {
613		− val16 \|= SRSH_CLKREQ_ENB;
614		− pi->pcie_pr42767 = true;
615		− } else
616		− val16 &= ~SRSH_CLKREQ_ENB;
617		−
618		− bcma_write16(pi->core, PCIEREGOFFS(sprom[SRSH_CLKREQ_OFFSET_REV5]),
619		− val16);
620		−}
621		−
622		−/* Apply the polarity determined at the start */
623		−/* Needs to happen when coming out of 'standby'/'hibernate' */
624		−static void pcie_war_serdes(struct pcicore_info *pi)
625		−{
626		− u32 w = 0;
627		−
628		− if (pi->pcie_polarity != 0)
629		− pcie_mdiowrite(pi, MDIODATA_DEV_RX, SERDES_RX_CTRL,
630		− pi->pcie_polarity);
631		−
632		− pcie_mdioread(pi, MDIODATA_DEV_PLL, SERDES_PLL_CTRL, &w);
633		− if (w & PLL_CTRL_FREQDET_EN) {
634		− w &= ~PLL_CTRL_FREQDET_EN;
635		− pcie_mdiowrite(pi, MDIODATA_DEV_PLL, SERDES_PLL_CTRL, w);
636		− }
637		−}
638		−
639		−/* Fix MISC config to allow coming out of L2/L3-Ready state w/o PRST */
640		−/* Needs to happen when coming out of 'standby'/'hibernate' */
641		−static void pcie_misc_config_fixup(struct pcicore_info *pi)
642		−{
643		− u16 val16;
644		−
645		− val16 = bcma_read16(pi->core,
646		− PCIEREGOFFS(sprom[SRSH_PCIE_MISC_CONFIG]));
647		−
648		− if ((val16 & SRSH_L23READY_EXIT_NOPERST) == 0) {
649		− val16 \|= SRSH_L23READY_EXIT_NOPERST;
650		− bcma_write16(pi->core,
651		− PCIEREGOFFS(sprom[SRSH_PCIE_MISC_CONFIG]), val16);
652		− }
653		−}
654		−
655		−/* quick hack for testing */
656		−/* Needs to happen when coming out of 'standby'/'hibernate' */
657		−static void pcie_war_noplldown(struct pcicore_info *pi)
658		−{
659		− /* turn off serdes PLL down */
660		− ai_cc_reg(pi->sih, offsetof(struct chipcregs, chipcontrol),
661		− CHIPCTRL_4321_PLL_DOWN, CHIPCTRL_4321_PLL_DOWN);
662		−
663		− /* clear srom shadow backdoor */
664		− bcma_write16(pi->core, PCIEREGOFFS(sprom[SRSH_BD_OFFSET]), 0);
665		−}
666		−
667		−/* Needs to happen when coming out of 'standby'/'hibernate' */
668		−static void pcie_war_pci_setup(struct pcicore_info *pi)
669		−{
670		− struct si_pub *sih = pi->sih;
671		− u32 w;
672		−
673		− if (ai_get_buscorerev(sih) == 0 \|\| ai_get_buscorerev(sih) == 1) {
674		− w = pcie_readreg(pi->core, PCIE_PCIEREGS,
675		− PCIE_TLP_WORKAROUNDSREG);
676		− w \|= 0x8;
677		− pcie_writereg(pi->core, PCIE_PCIEREGS,
678		− PCIE_TLP_WORKAROUNDSREG, w);
679		− }
680		−
681		− if (ai_get_buscorerev(sih) == 1) {
682		− w = pcie_readreg(pi->core, PCIE_PCIEREGS, PCIE_DLLP_LCREG);
683		− w \|= 0x40;
684		− pcie_writereg(pi->core, PCIE_PCIEREGS, PCIE_DLLP_LCREG, w);
685		− }
686		−
687		− if (ai_get_buscorerev(sih) == 0) {
688		− pcie_mdiowrite(pi, MDIODATA_DEV_RX, SERDES_RX_TIMER1, 0x8128);
689		− pcie_mdiowrite(pi, MDIODATA_DEV_RX, SERDES_RX_CDR, 0x0100);
690		− pcie_mdiowrite(pi, MDIODATA_DEV_RX, SERDES_RX_CDRBW, 0x1466);
691		− } else if (PCIE_ASPM(sih)) {
692		− /* Change the L1 threshold for better performance */
693		− w = pcie_readreg(pi->core, PCIE_PCIEREGS,
694		− PCIE_DLLP_PMTHRESHREG);
695		− w &= ~PCIE_L1THRESHOLDTIME_MASK;
696		− w \|= PCIE_L1THRESHOLD_WARVAL << PCIE_L1THRESHOLDTIME_SHIFT;
697		− pcie_writereg(pi->core, PCIE_PCIEREGS,
698		− PCIE_DLLP_PMTHRESHREG, w);
699		−
700		− pcie_war_serdes(pi);
701		−
702		− pcie_war_aspm_clkreq(pi);
703		− } else if (ai_get_buscorerev(pi->sih) == 7)
704		− pcie_war_noplldown(pi);
705		−
706		− /* Note that the fix is actually in the SROM,
707		− * that's why this is open-ended
708		− */
709		− if (ai_get_buscorerev(pi->sih) >= 6)
710		− pcie_misc_config_fixup(pi);
711		−}
712		−
713		−/* *** Functions called during driver state changes *** */
714		−void pcicore_attach(struct pcicore_info *pi, int state)
715		−{
716		− struct si_pub *sih = pi->sih;
717		− u32 bfl2 = (u32)getintvar(sih, BRCMS_SROM_BOARDFLAGS2);
718		−
719		− /* Determine if this board needs override */
720		− if (PCIE_ASPM(sih)) {
721		− if (bfl2 & BFL2_PCIEWAR_OVR)
722		− pi->pcie_war_aspm_ovr = PCIE_ASPM_DISAB;
723		− else
724		− pi->pcie_war_aspm_ovr = PCIE_ASPM_ENAB;
725		− }
726		−
727		− /* These need to happen in this order only */
728		− pcie_war_polarity(pi);
729		−
730		− pcie_war_serdes(pi);
731		−
732		− pcie_war_aspm_clkreq(pi);
733		−
734		− pcie_clkreq_upd(pi, state);
735		−
736		−}
737		−
738		−void pcicore_hwup(struct pcicore_info *pi)
739		−{
740		− if (!pi \|\| ai_get_buscoretype(pi->sih) != PCIE_CORE_ID)
741		− return;
742		−
743		− pcie_war_pci_setup(pi);
744		−}
745		−
746		−void pcicore_up(struct pcicore_info *pi, int state)
747		−{
748		− if (!pi \|\| ai_get_buscoretype(pi->sih) != PCIE_CORE_ID)
749		− return;
750		−
751		− /* Restore L1 timer for better performance */
752		− pcie_extendL1timer(pi, true);
753		−
754		− pcie_clkreq_upd(pi, state);
755		−}
756		−
757		−/* When the device is going to enter D3 state
758		− * (or the system is going to enter S3/S4 states)
759		− */
760		−void pcicore_sleep(struct pcicore_info *pi)
761		−{
762		− u32 w;
763		−
764		− if (!pi \|\| !PCIE_ASPM(pi->sih))
765		− return;
766		−
767		− pci_read_config_dword(pi->dev, pi->pciecap_lcreg_offset, &w);
768		− w &= ~PCIE_CAP_LCREG_ASPML1;
769		− pci_write_config_dword(pi->dev, pi->pciecap_lcreg_offset, w);
770		−
771		− pi->pcie_pr42767 = false;
772		−}
773		−
774		−void pcicore_down(struct pcicore_info *pi, int state)
775		−{
776		− if (!pi \|\| ai_get_buscoretype(pi->sih) != PCIE_CORE_ID)
777		− return;
778		−
779		− pcie_clkreq_upd(pi, state);
780		−
781		− /* Reduce L1 timer for better power savings */
782		− pcie_extendL1timer(pi, false);
783		−}
784		−
785		−void pcicore_fixcfg(struct pcicore_info *pi)
786		−{
787		− struct bcma_device *core = pi->core;
788		− u16 val16;
789		− uint regoff;
790		−
791		− switch (pi->core->id.id) {
792		− case BCMA_CORE_PCI:
793		− regoff = PCIREGOFFS(sprom[SRSH_PI_OFFSET]);
794		− break;
795		−
796		− case BCMA_CORE_PCIE:
797		− regoff = PCIEREGOFFS(sprom[SRSH_PI_OFFSET]);
798		− break;
799		−
800		− default:
801		− return;
802		− }
803		−
804		− val16 = bcma_read16(pi->core, regoff);
805		− if (((val16 & SRSH_PI_MASK) >> SRSH_PI_SHIFT) !=
806		− (u16)core->core_index) {
807		− val16 = ((u16)core->core_index << SRSH_PI_SHIFT) \|
808		− (val16 & ~SRSH_PI_MASK);
809		− bcma_write16(pi->core, regoff, val16);
810		− }
811		−}
812		−
813		−/* precondition: current core is pci core */
814		−void
815		−pcicore_pci_setup(struct pcicore_info *pi)
816		−{
817		− bcma_set32(pi->core, PCIREGOFFS(sbtopci2),
818		− SBTOPCI_PREF \| SBTOPCI_BURST);
819		−
820		− if (pi->core->id.rev >= 11) {
821		− bcma_set32(pi->core, PCIREGOFFS(sbtopci2),
822		− SBTOPCI_RC_READMULTI);
823		− bcma_set32(pi->core, PCIREGOFFS(clkrun), PCI_CLKRUN_DSBL);
824		− (void)bcma_read32(pi->core, PCIREGOFFS(clkrun));
825		− }
826		−}

drivers/net/wireless/brcm80211/brcmsmac/nicpci.h+0−77

@@ -1,77 +0,0 @@
1		−/*
2		− * Copyright (c) 2010 Broadcom Corporation
3		− *
4		− * Permission to use, copy, modify, and/or distribute this software for any
5		− * purpose with or without fee is hereby granted, provided that the above
6		− * copyright notice and this permission notice appear in all copies.
7		− *
8		− * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9		− * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10		− * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
11		− * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12		− * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
13		− * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
14		− * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15		− */
16		−
17		−#ifndef _BRCM_NICPCI_H_
18		−#define _BRCM_NICPCI_H_
19		−
20		−#include "types.h"
21		−
22		−/* PCI configuration address space size */
23		−#define PCI_SZPCR 256
24		−
25		−/* Brcm PCI configuration registers */
26		−/* backplane address space accessed by BAR0 */
27		−#define PCI_BAR0_WIN 0x80
28		−/* sprom property control */
29		−#define PCI_SPROM_CONTROL 0x88
30		−/* mask of PCI and other cores interrupts */
31		−#define PCI_INT_MASK 0x94
32		−/* backplane core interrupt mask bits offset */
33		−#define PCI_SBIM_SHIFT 8
34		−/* backplane address space accessed by second 4KB of BAR0 */
35		−#define PCI_BAR0_WIN2 0xac
36		−/* pci config space gpio input (>=rev3) */
37		−#define PCI_GPIO_IN 0xb0
38		−/* pci config space gpio output (>=rev3) */
39		−#define PCI_GPIO_OUT 0xb4
40		−/* pci config space gpio output enable (>=rev3) */
41		−#define PCI_GPIO_OUTEN 0xb8
42		−
43		−/* bar0 + 4K accesses external sprom */
44		−#define PCI_BAR0_SPROM_OFFSET (4 * 1024)
45		−/* bar0 + 6K accesses pci core registers */
46		−#define PCI_BAR0_PCIREGS_OFFSET (6 * 1024)
47		−/*
48		− * pci core SB registers are at the end of the
49		− * 8KB window, so their address is the "regular"
50		− * address plus 4K
51		− */
52		−#define PCI_BAR0_PCISBR_OFFSET (4 * 1024)
53		−/* bar0 window size Match with corerev 13 */
54		−#define PCI_BAR0_WINSZ (16 * 1024)
55		−/* On pci corerev >= 13 and all pcie, the bar0 is now 16KB and it maps: */
56		−/* bar0 + 8K accesses pci/pcie core registers */
57		−#define PCI_16KB0_PCIREGS_OFFSET (8 * 1024)
58		−/* bar0 + 12K accesses chipc core registers */
59		−#define PCI_16KB0_CCREGS_OFFSET (12 * 1024)
60		−
61		−struct sbpciregs;
62		−struct sbpcieregs;
63		−
64		−extern struct pcicore_info pcicore_init(struct si_pub sih,
65		− struct bcma_device *core);
66		−extern void pcicore_deinit(struct pcicore_info *pch);
67		−extern void pcicore_attach(struct pcicore_info *pch, int state);
68		−extern void pcicore_hwup(struct pcicore_info *pch);
69		−extern void pcicore_up(struct pcicore_info *pch, int state);
70		−extern void pcicore_sleep(struct pcicore_info *pch);
71		−extern void pcicore_down(struct pcicore_info *pch, int state);
72		−extern u8 pcicore_find_pci_capability(struct pci_dev *dev, u8 req_cap_id,
73		− unsigned char buf, u32 buflen);
74		−extern void pcicore_fixcfg(struct pcicore_info *pch);
75		−extern void pcicore_pci_setup(struct pcicore_info *pch);
76		−
77		−#endif /* _BRCM_NICPCI_H_ */

drivers/net/wireless/brcm80211/brcmsmac/otp.c+0−410

@@ -1,410 +0,0 @@
1		−/*
2		− * Copyright (c) 2010 Broadcom Corporation
3		− *
4		− * Permission to use, copy, modify, and/or distribute this software for any
5		− * purpose with or without fee is hereby granted, provided that the above
6		− * copyright notice and this permission notice appear in all copies.
7		− *
8		− * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9		− * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10		− * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
11		− * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12		− * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
13		− * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
14		− * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15		− */
16		−
17		−#include <linux/io.h>
18		−#include <linux/errno.h>
19		−#include <linux/string.h>
20		−
21		−#include <brcm_hw_ids.h>
22		−#include <chipcommon.h>
23		−#include "aiutils.h"
24		−#include "otp.h"
25		−
26		−#define OTPS_GUP_MASK 0x00000f00
27		−#define OTPS_GUP_SHIFT 8
28		−/* h/w subregion is programmed */
29		−#define OTPS_GUP_HW 0x00000100
30		−/* s/w subregion is programmed */
31		−#define OTPS_GUP_SW 0x00000200
32		−/* chipid/pkgopt subregion is programmed */
33		−#define OTPS_GUP_CI 0x00000400
34		−/* fuse subregion is programmed */
35		−#define OTPS_GUP_FUSE 0x00000800
36		−
37		−/* Fields in otpprog in rev >= 21 */
38		−#define OTPP_COL_MASK 0x000000ff
39		−#define OTPP_COL_SHIFT 0
40		−#define OTPP_ROW_MASK 0x0000ff00
41		−#define OTPP_ROW_SHIFT 8
42		−#define OTPP_OC_MASK 0x0f000000
43		−#define OTPP_OC_SHIFT 24
44		−#define OTPP_READERR 0x10000000
45		−#define OTPP_VALUE_MASK 0x20000000
46		−#define OTPP_VALUE_SHIFT 29
47		−#define OTPP_START_BUSY 0x80000000
48		−#define OTPP_READ 0x40000000
49		−
50		−/* Opcodes for OTPP_OC field */
51		−#define OTPPOC_READ 0
52		−#define OTPPOC_BIT_PROG 1
53		−#define OTPPOC_VERIFY 3
54		−#define OTPPOC_INIT 4
55		−#define OTPPOC_SET 5
56		−#define OTPPOC_RESET 6
57		−#define OTPPOC_OCST 7
58		−#define OTPPOC_ROW_LOCK 8
59		−#define OTPPOC_PRESCN_TEST 9
60		−
61		−#define OTPTYPE_IPX(ccrev) ((ccrev) == 21 \|\| (ccrev) >= 23)
62		−
63		−#define OTPP_TRIES 10000000 /* # of tries for OTPP */
64		−
65		−#define MAXNUMRDES 9 /* Maximum OTP redundancy entries */
66		−
67		−/* Fixed size subregions sizes in words */
68		−#define OTPGU_CI_SZ 2
69		−
70		−struct otpinfo;
71		−
72		−/* OTP function struct */
73		−struct otp_fn_s {
74		− int (init)(struct si_pub sih, struct otpinfo *oi);
75		− int (read_region)(struct otpinfo oi, int region, u16 *data,
76		− uint *wlen);
77		−};
78		−
79		−struct otpinfo {
80		− struct bcma_device core; / chipc core */
81		− const struct otp_fn_s fn; / OTP functions */
82		− struct si_pub sih; / Saved sb handle */
83		−
84		− /* IPX OTP section */
85		− u16 wsize; /* Size of otp in words */
86		− u16 rows; /* Geometry */
87		− u16 cols; /* Geometry */
88		− u32 status; /* Flag bits (lock/prog/rv).
89		− * (Reflected only when OTP is power cycled)
90		− */
91		− u16 hwbase; /* hardware subregion offset */
92		− u16 hwlim; /* hardware subregion boundary */
93		− u16 swbase; /* software subregion offset */
94		− u16 swlim; /* software subregion boundary */
95		− u16 fbase; /* fuse subregion offset */
96		− u16 flim; /* fuse subregion boundary */
97		− int otpgu_base; /* offset to General Use Region */
98		−};
99		−
100		−/* OTP layout */
101		−/* CC revs 21, 24 and 27 OTP General Use Region word offset */
102		−#define REVA4_OTPGU_BASE 12
103		−
104		−/* CC revs 23, 25, 26, 28 and above OTP General Use Region word offset */
105		−#define REVB8_OTPGU_BASE 20
106		−
107		−/* CC rev 36 OTP General Use Region word offset */
108		−#define REV36_OTPGU_BASE 12
109		−
110		−/* Subregion word offsets in General Use region */
111		−#define OTPGU_HSB_OFF 0
112		−#define OTPGU_SFB_OFF 1
113		−#define OTPGU_CI_OFF 2
114		−#define OTPGU_P_OFF 3
115		−#define OTPGU_SROM_OFF 4
116		−
117		−/* Flag bit offsets in General Use region */
118		−#define OTPGU_HWP_OFF 60
119		−#define OTPGU_SWP_OFF 61
120		−#define OTPGU_CIP_OFF 62
121		−#define OTPGU_FUSEP_OFF 63
122		−#define OTPGU_CIP_MSK 0x4000
123		−#define OTPGU_P_MSK 0xf000
124		−#define OTPGU_P_SHIFT (OTPGU_HWP_OFF % 16)
125		−
126		−/* OTP Size */
127		−#define OTP_SZ_FU_324 ((roundup(324, 8))/8) /* 324 bits */
128		−#define OTP_SZ_FU_288 (288/8) /* 288 bits */
129		−#define OTP_SZ_FU_216 (216/8) /* 216 bits */
130		−#define OTP_SZ_FU_72 (72/8) /* 72 bits */
131		−#define OTP_SZ_CHECKSUM (16/8) /* 16 bits */
132		−#define OTP4315_SWREG_SZ 178 /* 178 bytes */
133		−#define OTP_SZ_FU_144 (144/8) /* 144 bits */
134		−
135		−static u16
136		−ipxotp_otpr(struct otpinfo *oi, uint wn)
137		−{
138		− return bcma_read16(oi->core,
139		− CHIPCREGOFFS(sromotp[wn]));
140		−}
141		−
142		−/*
143		− * Calculate max HW/SW region byte size by subtracting fuse region
144		− * and checksum size, osizew is oi->wsize (OTP size - GU size) in words
145		− */
146		−static int ipxotp_max_rgnsz(struct si_pub *sih, int osizew)
147		−{
148		− int ret = 0;
149		−
150		− switch (ai_get_chip_id(sih)) {
151		− case BCM43224_CHIP_ID:
152		− case BCM43225_CHIP_ID:
153		− ret = osizew * 2 - OTP_SZ_FU_72 - OTP_SZ_CHECKSUM;
154		− break;
155		− case BCM4313_CHIP_ID:
156		− ret = osizew * 2 - OTP_SZ_FU_72 - OTP_SZ_CHECKSUM;
157		− break;
158		− default:
159		− break; /* Don't know about this chip */
160		− }
161		−
162		− return ret;
163		−}
164		−
165		−static void _ipxotp_init(struct otpinfo *oi)
166		−{
167		− uint k;
168		− u32 otpp, st;
169		− int ccrev = ai_get_ccrev(oi->sih);
170		−
171		−
172		− /*
173		− * record word offset of General Use Region
174		− * for various chipcommon revs
175		− */
176		− if (ccrev == 21 \|\| ccrev == 24
177		− \|\| ccrev == 27) {
178		− oi->otpgu_base = REVA4_OTPGU_BASE;
179		− } else if (ccrev == 36) {
180		− /*
181		− * OTP size greater than equal to 2KB (128 words),
182		− * otpgu_base is similar to rev23
183		− */
184		− if (oi->wsize >= 128)
185		− oi->otpgu_base = REVB8_OTPGU_BASE;
186		− else
187		− oi->otpgu_base = REV36_OTPGU_BASE;
188		− } else if (ccrev == 23 \|\| ccrev >= 25) {
189		− oi->otpgu_base = REVB8_OTPGU_BASE;
190		− }
191		−
192		− /* First issue an init command so the status is up to date */
193		− otpp =
194		− OTPP_START_BUSY \| ((OTPPOC_INIT << OTPP_OC_SHIFT) & OTPP_OC_MASK);
195		−
196		− bcma_write32(oi->core, CHIPCREGOFFS(otpprog), otpp);
197		− st = bcma_read32(oi->core, CHIPCREGOFFS(otpprog));
198		− for (k = 0; (st & OTPP_START_BUSY) && (k < OTPP_TRIES); k++)
199		− st = bcma_read32(oi->core, CHIPCREGOFFS(otpprog));
200		− if (k >= OTPP_TRIES)
201		− return;
202		−
203		− /* Read OTP lock bits and subregion programmed indication bits */
204		− oi->status = bcma_read32(oi->core, CHIPCREGOFFS(otpstatus));
205		−
206		− if ((ai_get_chip_id(oi->sih) == BCM43224_CHIP_ID)
207		− \|\| (ai_get_chip_id(oi->sih) == BCM43225_CHIP_ID)) {
208		− u32 p_bits;
209		− p_bits = (ipxotp_otpr(oi, oi->otpgu_base + OTPGU_P_OFF) &
210		− OTPGU_P_MSK) >> OTPGU_P_SHIFT;
211		− oi->status \|= (p_bits << OTPS_GUP_SHIFT);
212		− }
213		−
214		− /*
215		− * h/w region base and fuse region limit are fixed to
216		− * the top and the bottom of the general use region.
217		− * Everything else can be flexible.
218		− */
219		− oi->hwbase = oi->otpgu_base + OTPGU_SROM_OFF;
220		− oi->hwlim = oi->wsize;
221		− if (oi->status & OTPS_GUP_HW) {
222		− oi->hwlim =
223		− ipxotp_otpr(oi, oi->otpgu_base + OTPGU_HSB_OFF) / 16;
224		− oi->swbase = oi->hwlim;
225		− } else
226		− oi->swbase = oi->hwbase;
227		−
228		− /* subtract fuse and checksum from beginning */
229		− oi->swlim = ipxotp_max_rgnsz(oi->sih, oi->wsize) / 2;
230		−
231		− if (oi->status & OTPS_GUP_SW) {
232		− oi->swlim =
233		− ipxotp_otpr(oi, oi->otpgu_base + OTPGU_SFB_OFF) / 16;
234		− oi->fbase = oi->swlim;
235		− } else
236		− oi->fbase = oi->swbase;
237		−
238		− oi->flim = oi->wsize;
239		−}
240		−
241		−static int ipxotp_init(struct si_pub sih, struct otpinfo oi)
242		−{
243		− /* Make sure we're running IPX OTP */
244		− if (!OTPTYPE_IPX(ai_get_ccrev(sih)))
245		− return -EBADE;
246		−
247		− /* Make sure OTP is not disabled */
248		− if (ai_is_otp_disabled(sih))
249		− return -EBADE;
250		−
251		− /* Check for otp size */
252		− switch ((ai_get_cccaps(sih) & CC_CAP_OTPSIZE) >> CC_CAP_OTPSIZE_SHIFT) {
253		− case 0:
254		− /* Nothing there */
255		− return -EBADE;
256		− case 1: /* 32x64 */
257		− oi->rows = 32;
258		− oi->cols = 64;
259		− oi->wsize = 128;
260		− break;
261		− case 2: /* 64x64 */
262		− oi->rows = 64;
263		− oi->cols = 64;
264		− oi->wsize = 256;
265		− break;
266		− case 5: /* 96x64 */
267		− oi->rows = 96;
268		− oi->cols = 64;
269		− oi->wsize = 384;
270		− break;
271		− case 7: /* 16x64 // 1024 bits */
272		− oi->rows = 16;
273		− oi->cols = 64;
274		− oi->wsize = 64;
275		− break;
276		− default:
277		− /* Don't know the geometry */
278		− return -EBADE;
279		− }
280		−
281		− /* Retrieve OTP region info */
282		− _ipxotp_init(oi);
283		− return 0;
284		−}
285		−
286		−static int
287		−ipxotp_read_region(struct otpinfo oi, int region, u16 data, uint *wlen)
288		−{
289		− uint base, i, sz;
290		−
291		− /* Validate region selection */
292		− switch (region) {
293		− case OTP_HW_RGN:
294		− sz = (uint) oi->hwlim - oi->hwbase;
295		− if (!(oi->status & OTPS_GUP_HW)) {
296		− *wlen = sz;
297		− return -ENODATA;
298		− }
299		− if (*wlen < sz) {
300		− *wlen = sz;
301		− return -EOVERFLOW;
302		− }
303		− base = oi->hwbase;
304		− break;
305		− case OTP_SW_RGN:
306		− sz = ((uint) oi->swlim - oi->swbase);
307		− if (!(oi->status & OTPS_GUP_SW)) {
308		− *wlen = sz;
309		− return -ENODATA;
310		− }
311		− if (*wlen < sz) {
312		− *wlen = sz;
313		− return -EOVERFLOW;
314		− }
315		− base = oi->swbase;
316		− break;
317		− case OTP_CI_RGN:
318		− sz = OTPGU_CI_SZ;
319		− if (!(oi->status & OTPS_GUP_CI)) {
320		− *wlen = sz;
321		− return -ENODATA;
322		− }
323		− if (*wlen < sz) {
324		− *wlen = sz;
325		− return -EOVERFLOW;
326		− }
327		− base = oi->otpgu_base + OTPGU_CI_OFF;
328		− break;
329		− case OTP_FUSE_RGN:
330		− sz = (uint) oi->flim - oi->fbase;
331		− if (!(oi->status & OTPS_GUP_FUSE)) {
332		− *wlen = sz;
333		− return -ENODATA;
334		− }
335		− if (*wlen < sz) {
336		− *wlen = sz;
337		− return -EOVERFLOW;
338		− }
339		− base = oi->fbase;
340		− break;
341		− case OTP_ALL_RGN:
342		− sz = ((uint) oi->flim - oi->hwbase);
343		− if (!(oi->status & (OTPS_GUP_HW \| OTPS_GUP_SW))) {
344		− *wlen = sz;
345		− return -ENODATA;
346		− }
347		− if (*wlen < sz) {
348		− *wlen = sz;
349		− return -EOVERFLOW;
350		− }
351		− base = oi->hwbase;
352		− break;
353		− default:
354		− return -EINVAL;
355		− }
356		−
357		− /* Read the data */
358		− for (i = 0; i < sz; i++)
359		− data[i] = ipxotp_otpr(oi, base + i);
360		−
361		− *wlen = sz;
362		− return 0;
363		−}
364		−
365		−static const struct otp_fn_s ipxotp_fn = {
366		− (int ()(struct si_pub , struct otpinfo *)) ipxotp_init,
367		− (int ()(struct otpinfo , int, u16 , uint )) ipxotp_read_region,
368		−};
369		−
370		−static int otp_init(struct si_pub sih, struct otpinfo oi)
371		−{
372		− int ret;
373		−
374		− memset(oi, 0, sizeof(struct otpinfo));
375		−
376		− oi->core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
377		−
378		− if (OTPTYPE_IPX(ai_get_ccrev(sih)))
379		− oi->fn = &ipxotp_fn;
380		−
381		− if (oi->fn == NULL)
382		− return -EBADE;
383		−
384		− oi->sih = sih;
385		−
386		− ret = (oi->fn->init)(sih, oi);
387		−
388		− return ret;
389		−}
390		−
391		−int
392		−otp_read_region(struct si_pub sih, int region, u16 data, uint *wlen) {
393		− struct otpinfo otpinfo;
394		− struct otpinfo *oi = &otpinfo;
395		− int err = 0;
396		−
397		− if (ai_is_otp_disabled(sih)) {
398		− err = -EPERM;
399		− goto out;
400		− }
401		−
402		− err = otp_init(sih, oi);
403		− if (err)
404		− goto out;
405		−
406		− err = ((oi)->fn->read_region)(oi, region, data, wlen);
407		−
408		− out:
409		− return err;
410		−}

drivers/net/wireless/brcm80211/brcmsmac/otp.h+0−36

@@ -1,36 +0,0 @@
1		−/*
2		− * Copyright (c) 2010 Broadcom Corporation
3		− *
4		− * Permission to use, copy, modify, and/or distribute this software for any
5		− * purpose with or without fee is hereby granted, provided that the above
6		− * copyright notice and this permission notice appear in all copies.
7		− *
8		− * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9		− * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10		− * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
11		− * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12		− * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
13		− * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
14		− * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15		− */
16		−
17		−#ifndef _BRCM_OTP_H_
18		−#define _BRCM_OTP_H_
19		−
20		−#include "types.h"
21		−
22		−/* OTP regions */
23		−#define OTP_HW_RGN 1
24		−#define OTP_SW_RGN 2
25		−#define OTP_CI_RGN 4
26		−#define OTP_FUSE_RGN 8
27		−/* From h/w region to end of OTP including checksum */
28		−#define OTP_ALL_RGN 0xf
29		−
30		−/* OTP Size */
31		−#define OTP_SZ_MAX (6144/8) /* maximum bytes in one CIS */
32		−
33		−extern int otp_read_region(struct si_pub sih, int region, u16 data,
34		− uint *wlen);
35		−
36		−#endif /* _BRCM_OTP_H_ */

drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c+25−42

@@ -4817,28 +4817,23 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi) · 4816 unmodified lines
4817	4817	s8 txpwr = 0;
4818	4818	int i;
4819	4819	struct brcms_phy_lcnphy *pi_lcn = pi->u.pi_lcnphy;
4820		− struct phy_shim_info *shim = pi->sh->physhim;
	4820	+ struct ssb_sprom *sprom = &pi->d11core->bus->sprom;
4821	4821
4822	4822	if (CHSPEC_IS2G(pi->radio_chanspec)) {
4823	4823	u16 cckpo = 0;
4824	4824	u32 offset_ofdm, offset_mcs;
4825	4825
4826		− pi_lcn->lcnphy_tr_isolation_mid =
4827		− (u8)wlapi_getintvar(shim, BRCMS_SROM_TRISO2G);
	4826	+ pi_lcn->lcnphy_tr_isolation_mid = sprom->fem.ghz2.tr_iso;
4828	4827
4829		− pi_lcn->lcnphy_rx_power_offset =
4830		− (u8)wlapi_getintvar(shim, BRCMS_SROM_RXPO2G);
	4828	+ pi_lcn->lcnphy_rx_power_offset = sprom->rxpo2g;
4831	4829
4832		− pi->txpa_2g[0] = (s16)wlapi_getintvar(shim, BRCMS_SROM_PA0B0);
4833		− pi->txpa_2g[1] = (s16)wlapi_getintvar(shim, BRCMS_SROM_PA0B1);
4834		− pi->txpa_2g[2] = (s16)wlapi_getintvar(shim, BRCMS_SROM_PA0B2);
	4830	+ pi->txpa_2g[0] = sprom->pa0b0;
	4831	+ pi->txpa_2g[1] = sprom->pa0b1;
	4832	+ pi->txpa_2g[2] = sprom->pa0b2;
4835	4833
4836		− pi_lcn->lcnphy_rssi_vf =
4837		− (u8)wlapi_getintvar(shim, BRCMS_SROM_RSSISMF2G);
4838		− pi_lcn->lcnphy_rssi_vc =
4839		− (u8)wlapi_getintvar(shim, BRCMS_SROM_RSSISMC2G);
4840		− pi_lcn->lcnphy_rssi_gs =
4841		− (u8)wlapi_getintvar(shim, BRCMS_SROM_RSSISAV2G);
	4834	+ pi_lcn->lcnphy_rssi_vf = sprom->rssismf2g;
	4835	+ pi_lcn->lcnphy_rssi_vc = sprom->rssismc2g;
	4836	+ pi_lcn->lcnphy_rssi_gs = sprom->rssisav2g;
4842	4837
4843	4838	pi_lcn->lcnphy_rssi_vf_lowtemp = pi_lcn->lcnphy_rssi_vf;
4844	4839	pi_lcn->lcnphy_rssi_vc_lowtemp = pi_lcn->lcnphy_rssi_vc;
@@ -4848,7 +4843,7 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi) · 3 unmodified lines
4848	4843	pi_lcn->lcnphy_rssi_vc_hightemp = pi_lcn->lcnphy_rssi_vc;
4849	4844	pi_lcn->lcnphy_rssi_gs_hightemp = pi_lcn->lcnphy_rssi_gs;
4850	4845
4851		− txpwr = (s8)wlapi_getintvar(shim, BRCMS_SROM_MAXP2GA0);
	4846	+ txpwr = sprom->core_pwr_info[0].maxpwr_2g;
4852	4847	pi->tx_srom_max_2g = txpwr;
4853	4848
4854	4849	for (i = 0; i < PWRTBL_NUM_COEFF; i++) {
@@ -4856,8 +4851,8 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi) · 1 unmodified line
4856	4851	pi->txpa_2g_high_temp[i] = pi->txpa_2g[i];
4857	4852	}
4858	4853
4859		− cckpo = (u16)wlapi_getintvar(shim, BRCMS_SROM_CCK2GPO);
4860		− offset_ofdm = (u32)wlapi_getintvar(shim, BRCMS_SROM_OFDM2GPO);
	4854	+ cckpo = sprom->cck2gpo;
	4855	+ offset_ofdm = sprom->ofdm2gpo;
4861	4856	if (cckpo) {
4862	4857	uint max_pwr_chan = txpwr;
4863	4858
@@ -4876,7 +4871,7 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi) · 12 unmodified lines
4876	4871	} else {
4877	4872	u8 opo = 0;
4878	4873
4879		− opo = (u8)wlapi_getintvar(shim, BRCMS_SROM_OPO);
	4874	+ opo = sprom->opo;
4880	4875
4881	4876	for (i = TXP_FIRST_CCK; i <= TXP_LAST_CCK; i++)
4882	4877	pi->tx_srom_max_rate_2g[i] = txpwr;
@@ -4886,12 +4881,8 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi) · 3 unmodified lines
4886	4881	((offset_ofdm & 0xf) * 2);
4887	4882	offset_ofdm >>= 4;
4888	4883	}
4889		− offset_mcs =
4890		− wlapi_getintvar(shim,
4891		− BRCMS_SROM_MCS2GPO1) << 16;
4892		− offset_mcs \|=
4893		− (u16) wlapi_getintvar(shim,
4894		− BRCMS_SROM_MCS2GPO0);
	4884	+ offset_mcs = sprom->mcs2gpo[1] << 16;
	4885	+ offset_mcs \|= sprom->mcs2gpo[0];
4895	4886	pi_lcn->lcnphy_mcs20_po = offset_mcs;
4896	4887	for (i = TXP_FIRST_SISO_MCS_20;
4897	4888	i <= TXP_LAST_SISO_MCS_20; i++) {
@@ -4901,25 +4892,17 @@ static bool wlc_phy_txpwr_srom_read_lcnphy(struct brcms_phy *pi) · 3 unmodified lines
4901	4892	}
4902	4893	}
4903	4894
4904		− pi_lcn->lcnphy_rawtempsense =
4905		− (u16)wlapi_getintvar(shim, BRCMS_SROM_RAWTEMPSENSE);
4906		− pi_lcn->lcnphy_measPower =
4907		− (u8)wlapi_getintvar(shim, BRCMS_SROM_MEASPOWER);
4908		− pi_lcn->lcnphy_tempsense_slope =
4909		− (u8)wlapi_getintvar(shim, BRCMS_SROM_TEMPSENSE_SLOPE);
4910		− pi_lcn->lcnphy_hw_iqcal_en =
4911		− (bool)wlapi_getintvar(shim, BRCMS_SROM_HW_IQCAL_EN);
4912		− pi_lcn->lcnphy_iqcal_swp_dis =
4913		− (bool)wlapi_getintvar(shim, BRCMS_SROM_IQCAL_SWP_DIS);
4914		− pi_lcn->lcnphy_tempcorrx =
4915		− (u8)wlapi_getintvar(shim, BRCMS_SROM_TEMPCORRX);
4916		− pi_lcn->lcnphy_tempsense_option =
4917		− (u8)wlapi_getintvar(shim, BRCMS_SROM_TEMPSENSE_OPTION);
4918		− pi_lcn->lcnphy_freqoffset_corr =
4919		− (u8)wlapi_getintvar(shim, BRCMS_SROM_FREQOFFSET_CORR);
4920		− if ((u8)wlapi_getintvar(shim, BRCMS_SROM_AA2G) > 1)
	4895	+ pi_lcn->lcnphy_rawtempsense = sprom->rawtempsense;
	4896	+ pi_lcn->lcnphy_measPower = sprom->measpower;
	4897	+ pi_lcn->lcnphy_tempsense_slope = sprom->tempsense_slope;
	4898	+ pi_lcn->lcnphy_hw_iqcal_en = sprom->hw_iqcal_en;
	4899	+ pi_lcn->lcnphy_iqcal_swp_dis = sprom->iqcal_swp_dis;
	4900	+ pi_lcn->lcnphy_tempcorrx = sprom->tempcorrx;
	4901	+ pi_lcn->lcnphy_tempsense_option = sprom->tempsense_option;
	4902	+ pi_lcn->lcnphy_freqoffset_corr = sprom->freqoffset_corr;
	4903	+ if (sprom->ant_available_bg > 1)
4921	4904	wlc_phy_ant_rxdiv_set((struct brcms_phy_pub *) pi,
4922		− (u8) wlapi_getintvar(shim, BRCMS_SROM_AA2G));
	4905	+ sprom->ant_available_bg);
4923	4906	}
4924	4907	pi_lcn->lcnphy_cck_dig_filt_type = -1;
4925	4908

drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c+108−225

@@ -14386,30 +14386,30 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi) · 14385 unmodified lines
14386	14386	{
14387	14387	u16 bw40po, cddpo, stbcpo, bwduppo;
14388	14388	uint band_num;
14389		− struct phy_shim_info *shim = pi->sh->physhim;
	14389	+ struct ssb_sprom *sprom = &pi->d11core->bus->sprom;
14390	14390
14391	14391	if (pi->sh->sromrev >= 9)
14392	14392	return;
14393	14393
14394		− bw40po = (u16) wlapi_getintvar(shim, BRCMS_SROM_BW40PO);
	14394	+ bw40po = sprom->bw40po;
14395	14395	pi->bw402gpo = bw40po & 0xf;
14396	14396	pi->bw405gpo = (bw40po & 0xf0) >> 4;
14397	14397	pi->bw405glpo = (bw40po & 0xf00) >> 8;
14398	14398	pi->bw405ghpo = (bw40po & 0xf000) >> 12;
14399	14399
14400		− cddpo = (u16) wlapi_getintvar(shim, BRCMS_SROM_CDDPO);
	14400	+ cddpo = sprom->cddpo;
14401	14401	pi->cdd2gpo = cddpo & 0xf;
14402	14402	pi->cdd5gpo = (cddpo & 0xf0) >> 4;
14403	14403	pi->cdd5glpo = (cddpo & 0xf00) >> 8;
14404	14404	pi->cdd5ghpo = (cddpo & 0xf000) >> 12;
14405	14405
14406		− stbcpo = (u16) wlapi_getintvar(shim, BRCMS_SROM_STBCPO);
	14406	+ stbcpo = sprom->stbcpo;
14407	14407	pi->stbc2gpo = stbcpo & 0xf;
14408	14408	pi->stbc5gpo = (stbcpo & 0xf0) >> 4;
14409	14409	pi->stbc5glpo = (stbcpo & 0xf00) >> 8;
14410	14410	pi->stbc5ghpo = (stbcpo & 0xf000) >> 12;
14411	14411
14412		− bwduppo = (u16) wlapi_getintvar(shim, BRCMS_SROM_BWDUPPO);
	14412	+ bwduppo = sprom->bwduppo;
14413	14413	pi->bwdup2gpo = bwduppo & 0xf;
14414	14414	pi->bwdup5gpo = (bwduppo & 0xf0) >> 4;
14415	14415	pi->bwdup5glpo = (bwduppo & 0xf00) >> 8;
@@ -14419,242 +14419,137 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi) · 3 unmodified lines
14419	14419	band_num++) {
14420	14420	switch (band_num) {
14421	14421	case 0:
14422		−
14423	14422	pi->nphy_pwrctrl_info[PHY_CORE_0].max_pwr_2g =
14424		− (s8) wlapi_getintvar(shim,
14425		− BRCMS_SROM_MAXP2GA0);
	14423	+ sprom->core_pwr_info[0].maxpwr_2g;
14426	14424	pi->nphy_pwrctrl_info[PHY_CORE_1].max_pwr_2g =
14427		− (s8) wlapi_getintvar(shim,
14428		− BRCMS_SROM_MAXP2GA1);
	14425	+ sprom->core_pwr_info[1].maxpwr_2g;
14429	14426	pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_2g_a1 =
14430		− (s16) wlapi_getintvar(shim,
14431		− BRCMS_SROM_PA2GW0A0);
	14427	+ sprom->core_pwr_info[0].pa_2g[0];
14432	14428	pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_2g_a1 =
14433		− (s16) wlapi_getintvar(shim,
14434		− BRCMS_SROM_PA2GW0A1);
	14429	+ sprom->core_pwr_info[1].pa_2g[0];
14435	14430	pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_2g_b0 =
14436		− (s16) wlapi_getintvar(shim,
14437		− BRCMS_SROM_PA2GW1A0);
	14431	+ sprom->core_pwr_info[0].pa_2g[1];
14438	14432	pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_2g_b0 =
14439		− (s16) wlapi_getintvar(shim,
14440		− BRCMS_SROM_PA2GW1A1);
	14433	+ sprom->core_pwr_info[1].pa_2g[1];
14441	14434	pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_2g_b1 =
14442		− (s16) wlapi_getintvar(shim,
14443		− BRCMS_SROM_PA2GW2A0);
	14435	+ sprom->core_pwr_info[0].pa_2g[2];
14444	14436	pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_2g_b1 =
14445		− (s16) wlapi_getintvar(shim,
14446		− BRCMS_SROM_PA2GW2A1);
	14437	+ sprom->core_pwr_info[1].pa_2g[2];
14447	14438	pi->nphy_pwrctrl_info[PHY_CORE_0].idle_targ_2g =
14448		− (s8) wlapi_getintvar(shim, BRCMS_SROM_ITT2GA0);
	14439	+ sprom->core_pwr_info[0].itssi_2g;
14449	14440	pi->nphy_pwrctrl_info[PHY_CORE_1].idle_targ_2g =
14450		− (s8) wlapi_getintvar(shim, BRCMS_SROM_ITT2GA1);
14451		−
14452		− pi->cck2gpo = (u16) wlapi_getintvar(shim,
14453		− BRCMS_SROM_CCK2GPO);
14454		−
14455		− pi->ofdm2gpo =
14456		− (u32) wlapi_getintvar(shim,
14457		− BRCMS_SROM_OFDM2GPO);
14458		−
14459		− pi->mcs2gpo[0] =
14460		− (u16) wlapi_getintvar(shim,
14461		− BRCMS_SROM_MCS2GPO0);
14462		− pi->mcs2gpo[1] =
14463		− (u16) wlapi_getintvar(shim,
14464		− BRCMS_SROM_MCS2GPO1);
14465		− pi->mcs2gpo[2] =
14466		− (u16) wlapi_getintvar(shim,
14467		− BRCMS_SROM_MCS2GPO2);
14468		− pi->mcs2gpo[3] =
14469		− (u16) wlapi_getintvar(shim,
14470		− BRCMS_SROM_MCS2GPO3);
14471		− pi->mcs2gpo[4] =
14472		− (u16) wlapi_getintvar(shim,
14473		− BRCMS_SROM_MCS2GPO4);
14474		− pi->mcs2gpo[5] =
14475		− (u16) wlapi_getintvar(shim,
14476		− BRCMS_SROM_MCS2GPO5);
14477		− pi->mcs2gpo[6] =
14478		− (u16) wlapi_getintvar(shim,
14479		− BRCMS_SROM_MCS2GPO6);
14480		− pi->mcs2gpo[7] =
14481		− (u16) wlapi_getintvar(shim,
14482		− BRCMS_SROM_MCS2GPO7);
	14441	+ sprom->core_pwr_info[1].itssi_2g;
	14442	+
	14443	+ pi->cck2gpo = sprom->cck2gpo;
	14444	+
	14445	+ pi->ofdm2gpo = sprom->ofdm2gpo;
	14446	+
	14447	+ pi->mcs2gpo[0] = sprom->mcs2gpo[0];
	14448	+ pi->mcs2gpo[1] = sprom->mcs2gpo[1];
	14449	+ pi->mcs2gpo[2] = sprom->mcs2gpo[2];
	14450	+ pi->mcs2gpo[3] = sprom->mcs2gpo[3];
	14451	+ pi->mcs2gpo[4] = sprom->mcs2gpo[4];
	14452	+ pi->mcs2gpo[5] = sprom->mcs2gpo[5];
	14453	+ pi->mcs2gpo[6] = sprom->mcs2gpo[6];
	14454	+ pi->mcs2gpo[7] = sprom->mcs2gpo[7];
14483	14455	break;
14484	14456	case 1:
14485	14457
14486	14458	pi->nphy_pwrctrl_info[PHY_CORE_0].max_pwr_5gm =
14487		− (s8) wlapi_getintvar(shim, BRCMS_SROM_MAXP5GA0);
	14459	+ sprom->core_pwr_info[0].maxpwr_5g;
14488	14460	pi->nphy_pwrctrl_info[PHY_CORE_1].max_pwr_5gm =
14489		− (s8) wlapi_getintvar(shim,
14490		− BRCMS_SROM_MAXP5GA1);
	14461	+ sprom->core_pwr_info[1].maxpwr_5g;
14491	14462	pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_5gm_a1 =
14492		− (s16) wlapi_getintvar(shim,
14493		− BRCMS_SROM_PA5GW0A0);
	14463	+ sprom->core_pwr_info[0].pa_5g[0];
14494	14464	pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_5gm_a1 =
14495		− (s16) wlapi_getintvar(shim,
14496		− BRCMS_SROM_PA5GW0A1);
	14465	+ sprom->core_pwr_info[1].pa_5g[0];
14497	14466	pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_5gm_b0 =
14498		− (s16) wlapi_getintvar(shim,
14499		− BRCMS_SROM_PA5GW1A0);
	14467	+ sprom->core_pwr_info[0].pa_5g[1];
14500	14468	pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_5gm_b0 =
14501		− (s16) wlapi_getintvar(shim,
14502		− BRCMS_SROM_PA5GW1A1);
	14469	+ sprom->core_pwr_info[1].pa_5g[1];
14503	14470	pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_5gm_b1 =
14504		− (s16) wlapi_getintvar(shim,
14505		− BRCMS_SROM_PA5GW2A0);
	14471	+ sprom->core_pwr_info[0].pa_5g[2];
14506	14472	pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_5gm_b1 =
14507		− (s16) wlapi_getintvar(shim,
14508		− BRCMS_SROM_PA5GW2A1);
	14473	+ sprom->core_pwr_info[1].pa_5g[2];
14509	14474	pi->nphy_pwrctrl_info[PHY_CORE_0].idle_targ_5gm =
14510		− (s8) wlapi_getintvar(shim, BRCMS_SROM_ITT5GA0);
	14475	+ sprom->core_pwr_info[0].itssi_5g;
14511	14476	pi->nphy_pwrctrl_info[PHY_CORE_1].idle_targ_5gm =
14512		− (s8) wlapi_getintvar(shim, BRCMS_SROM_ITT5GA1);
14513		−
14514		− pi->ofdm5gpo =
14515		− (u32) wlapi_getintvar(shim,
14516		− BRCMS_SROM_OFDM5GPO);
14517		−
14518		− pi->mcs5gpo[0] =
14519		− (u16) wlapi_getintvar(shim,
14520		− BRCMS_SROM_MCS5GPO0);
14521		− pi->mcs5gpo[1] =
14522		− (u16) wlapi_getintvar(shim,
14523		− BRCMS_SROM_MCS5GPO1);
14524		− pi->mcs5gpo[2] =
14525		− (u16) wlapi_getintvar(shim,
14526		− BRCMS_SROM_MCS5GPO2);
14527		− pi->mcs5gpo[3] =
14528		− (u16) wlapi_getintvar(shim,
14529		− BRCMS_SROM_MCS5GPO3);
14530		− pi->mcs5gpo[4] =
14531		− (u16) wlapi_getintvar(shim,
14532		− BRCMS_SROM_MCS5GPO4);
14533		− pi->mcs5gpo[5] =
14534		− (u16) wlapi_getintvar(shim,
14535		− BRCMS_SROM_MCS5GPO5);
14536		− pi->mcs5gpo[6] =
14537		− (u16) wlapi_getintvar(shim,
14538		− BRCMS_SROM_MCS5GPO6);
14539		− pi->mcs5gpo[7] =
14540		− (u16) wlapi_getintvar(shim,
14541		− BRCMS_SROM_MCS5GPO7);
	14477	+ sprom->core_pwr_info[1].itssi_5g;
	14478	+
	14479	+ pi->ofdm5gpo = sprom->ofdm5gpo;
	14480	+
	14481	+ pi->mcs5gpo[0] = sprom->mcs5gpo[0];
	14482	+ pi->mcs5gpo[1] = sprom->mcs5gpo[1];
	14483	+ pi->mcs5gpo[2] = sprom->mcs5gpo[2];
	14484	+ pi->mcs5gpo[3] = sprom->mcs5gpo[3];
	14485	+ pi->mcs5gpo[4] = sprom->mcs5gpo[4];
	14486	+ pi->mcs5gpo[5] = sprom->mcs5gpo[5];
	14487	+ pi->mcs5gpo[6] = sprom->mcs5gpo[6];
	14488	+ pi->mcs5gpo[7] = sprom->mcs5gpo[7];
14542	14489	break;
14543	14490	case 2:
14544	14491
14545	14492	pi->nphy_pwrctrl_info[0].max_pwr_5gl =
14546		− (s8) wlapi_getintvar(shim,
14547		− BRCMS_SROM_MAXP5GLA0);
	14493	+ sprom->core_pwr_info[0].maxpwr_5gl;
14548	14494	pi->nphy_pwrctrl_info[1].max_pwr_5gl =
14549		− (s8) wlapi_getintvar(shim,
14550		− BRCMS_SROM_MAXP5GLA1);
	14495	+ sprom->core_pwr_info[1].maxpwr_5gl;
14551	14496	pi->nphy_pwrctrl_info[0].pwrdet_5gl_a1 =
14552		− (s16) wlapi_getintvar(shim,
14553		− BRCMS_SROM_PA5GLW0A0);
	14497	+ sprom->core_pwr_info[0].pa_5gl[0];
14554	14498	pi->nphy_pwrctrl_info[1].pwrdet_5gl_a1 =
14555		− (s16) wlapi_getintvar(shim,
14556		− BRCMS_SROM_PA5GLW0A1);
	14499	+ sprom->core_pwr_info[1].pa_5gl[0];
14557	14500	pi->nphy_pwrctrl_info[0].pwrdet_5gl_b0 =
14558		− (s16) wlapi_getintvar(shim,
14559		− BRCMS_SROM_PA5GLW1A0);
	14501	+ sprom->core_pwr_info[0].pa_5gl[1];
14560	14502	pi->nphy_pwrctrl_info[1].pwrdet_5gl_b0 =
14561		− (s16) wlapi_getintvar(shim,
14562		− BRCMS_SROM_PA5GLW1A1);
	14503	+ sprom->core_pwr_info[1].pa_5gl[1];
14563	14504	pi->nphy_pwrctrl_info[0].pwrdet_5gl_b1 =
14564		− (s16) wlapi_getintvar(shim,
14565		− BRCMS_SROM_PA5GLW2A0);
	14505	+ sprom->core_pwr_info[0].pa_5gl[2];
14566	14506	pi->nphy_pwrctrl_info[1].pwrdet_5gl_b1 =
14567		− (s16) wlapi_getintvar(shim,
14568		− BRCMS_SROM_PA5GLW2A1);
	14507	+ sprom->core_pwr_info[1].pa_5gl[2];
14569	14508	pi->nphy_pwrctrl_info[0].idle_targ_5gl = 0;
14570	14509	pi->nphy_pwrctrl_info[1].idle_targ_5gl = 0;
14571	14510
14572		− pi->ofdm5glpo =
14573		− (u32) wlapi_getintvar(shim,
14574		− BRCMS_SROM_OFDM5GLPO);
14575		−
14576		− pi->mcs5glpo[0] =
14577		− (u16) wlapi_getintvar(shim,
14578		− BRCMS_SROM_MCS5GLPO0);
14579		− pi->mcs5glpo[1] =
14580		− (u16) wlapi_getintvar(shim,
14581		− BRCMS_SROM_MCS5GLPO1);
14582		− pi->mcs5glpo[2] =
14583		− (u16) wlapi_getintvar(shim,
14584		− BRCMS_SROM_MCS5GLPO2);
14585		− pi->mcs5glpo[3] =
14586		− (u16) wlapi_getintvar(shim,
14587		− BRCMS_SROM_MCS5GLPO3);
14588		− pi->mcs5glpo[4] =
14589		− (u16) wlapi_getintvar(shim,
14590		− BRCMS_SROM_MCS5GLPO4);
14591		− pi->mcs5glpo[5] =
14592		− (u16) wlapi_getintvar(shim,
14593		− BRCMS_SROM_MCS5GLPO5);
14594		− pi->mcs5glpo[6] =
14595		− (u16) wlapi_getintvar(shim,
14596		− BRCMS_SROM_MCS5GLPO6);
14597		− pi->mcs5glpo[7] =
14598		− (u16) wlapi_getintvar(shim,
14599		− BRCMS_SROM_MCS5GLPO7);
	14511	+ pi->ofdm5glpo = sprom->ofdm5glpo;
	14512	+
	14513	+ pi->mcs5glpo[0] = sprom->mcs5glpo[0];
	14514	+ pi->mcs5glpo[1] = sprom->mcs5glpo[1];
	14515	+ pi->mcs5glpo[2] = sprom->mcs5glpo[2];
	14516	+ pi->mcs5glpo[3] = sprom->mcs5glpo[3];
	14517	+ pi->mcs5glpo[4] = sprom->mcs5glpo[4];
	14518	+ pi->mcs5glpo[5] = sprom->mcs5glpo[5];
	14519	+ pi->mcs5glpo[6] = sprom->mcs5glpo[6];
	14520	+ pi->mcs5glpo[7] = sprom->mcs5glpo[7];
14600	14521	break;
14601	14522	case 3:
14602	14523
14603	14524	pi->nphy_pwrctrl_info[0].max_pwr_5gh =
14604		− (s8) wlapi_getintvar(shim,
14605		− BRCMS_SROM_MAXP5GHA0);
	14525	+ sprom->core_pwr_info[0].maxpwr_5gh;
14606	14526	pi->nphy_pwrctrl_info[1].max_pwr_5gh =
14607		− (s8) wlapi_getintvar(shim,
14608		− BRCMS_SROM_MAXP5GHA1);
	14527	+ sprom->core_pwr_info[1].maxpwr_5gh;
14609	14528	pi->nphy_pwrctrl_info[0].pwrdet_5gh_a1 =
14610		− (s16) wlapi_getintvar(shim,
14611		− BRCMS_SROM_PA5GHW0A0);
	14529	+ sprom->core_pwr_info[0].pa_5gh[0];
14612	14530	pi->nphy_pwrctrl_info[1].pwrdet_5gh_a1 =
14613		− (s16) wlapi_getintvar(shim,
14614		− BRCMS_SROM_PA5GHW0A1);
	14531	+ sprom->core_pwr_info[1].pa_5gh[0];
14615	14532	pi->nphy_pwrctrl_info[0].pwrdet_5gh_b0 =
14616		− (s16) wlapi_getintvar(shim,
14617		− BRCMS_SROM_PA5GHW1A0);
	14533	+ sprom->core_pwr_info[0].pa_5gh[1];
14618	14534	pi->nphy_pwrctrl_info[1].pwrdet_5gh_b0 =
14619		− (s16) wlapi_getintvar(shim,
14620		− BRCMS_SROM_PA5GHW1A1);
	14535	+ sprom->core_pwr_info[1].pa_5gh[1];
14621	14536	pi->nphy_pwrctrl_info[0].pwrdet_5gh_b1 =
14622		− (s16) wlapi_getintvar(shim,
14623		− BRCMS_SROM_PA5GHW2A0);
	14537	+ sprom->core_pwr_info[0].pa_5gh[2];
14624	14538	pi->nphy_pwrctrl_info[1].pwrdet_5gh_b1 =
14625		− (s16) wlapi_getintvar(shim,
14626		− BRCMS_SROM_PA5GHW2A1);
	14539	+ sprom->core_pwr_info[1].pa_5gh[2];
14627	14540	pi->nphy_pwrctrl_info[0].idle_targ_5gh = 0;
14628	14541	pi->nphy_pwrctrl_info[1].idle_targ_5gh = 0;
14629	14542
14630		− pi->ofdm5ghpo =
14631		− (u32) wlapi_getintvar(shim,
14632		− BRCMS_SROM_OFDM5GHPO);
14633		−
14634		− pi->mcs5ghpo[0] =
14635		− (u16) wlapi_getintvar(shim,
14636		− BRCMS_SROM_MCS5GHPO0);
14637		− pi->mcs5ghpo[1] =
14638		− (u16) wlapi_getintvar(shim,
14639		− BRCMS_SROM_MCS5GHPO1);
14640		− pi->mcs5ghpo[2] =
14641		− (u16) wlapi_getintvar(shim,
14642		− BRCMS_SROM_MCS5GHPO2);
14643		− pi->mcs5ghpo[3] =
14644		− (u16) wlapi_getintvar(shim,
14645		− BRCMS_SROM_MCS5GHPO3);
14646		− pi->mcs5ghpo[4] =
14647		− (u16) wlapi_getintvar(shim,
14648		− BRCMS_SROM_MCS5GHPO4);
14649		− pi->mcs5ghpo[5] =
14650		− (u16) wlapi_getintvar(shim,
14651		− BRCMS_SROM_MCS5GHPO5);
14652		− pi->mcs5ghpo[6] =
14653		− (u16) wlapi_getintvar(shim,
14654		− BRCMS_SROM_MCS5GHPO6);
14655		− pi->mcs5ghpo[7] =
14656		− (u16) wlapi_getintvar(shim,
14657		− BRCMS_SROM_MCS5GHPO7);
	14543	+ pi->ofdm5ghpo = sprom->ofdm5ghpo;
	14544	+
	14545	+ pi->mcs5ghpo[0] = sprom->mcs5ghpo[0];
	14546	+ pi->mcs5ghpo[1] = sprom->mcs5ghpo[1];
	14547	+ pi->mcs5ghpo[2] = sprom->mcs5ghpo[2];
	14548	+ pi->mcs5ghpo[3] = sprom->mcs5ghpo[3];
	14549	+ pi->mcs5ghpo[4] = sprom->mcs5ghpo[4];
	14550	+ pi->mcs5ghpo[5] = sprom->mcs5ghpo[5];
	14551	+ pi->mcs5ghpo[6] = sprom->mcs5ghpo[6];
	14552	+ pi->mcs5ghpo[7] = sprom->mcs5ghpo[7];
14658	14553	break;
14659	14554	}
14660	14555	}
@@ -14664,45 +14559,34 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi) · 3 unmodified lines
14664	14559
14665	14560	static bool wlc_phy_txpwr_srom_read_nphy(struct brcms_phy *pi)
14666	14561	{
14667		− struct phy_shim_info *shim = pi->sh->physhim;
14668		−
14669		− pi->antswitch = (u8) wlapi_getintvar(shim, BRCMS_SROM_ANTSWITCH);
14670		− pi->aa2g = (u8) wlapi_getintvar(shim, BRCMS_SROM_AA2G);
14671		− pi->aa5g = (u8) wlapi_getintvar(shim, BRCMS_SROM_AA5G);
14672		−
14673		− pi->srom_fem2g.tssipos = (u8) wlapi_getintvar(shim,
14674		− BRCMS_SROM_TSSIPOS2G);
14675		− pi->srom_fem2g.extpagain = (u8) wlapi_getintvar(shim,
14676		− BRCMS_SROM_EXTPAGAIN2G);
14677		− pi->srom_fem2g.pdetrange = (u8) wlapi_getintvar(shim,
14678		− BRCMS_SROM_PDETRANGE2G);
14679		− pi->srom_fem2g.triso = (u8) wlapi_getintvar(shim, BRCMS_SROM_TRISO2G);
14680		− pi->srom_fem2g.antswctrllut =
14681		− (u8) wlapi_getintvar(shim, BRCMS_SROM_ANTSWCTL2G);
14682		−
14683		− pi->srom_fem5g.tssipos = (u8) wlapi_getintvar(shim,
14684		− BRCMS_SROM_TSSIPOS5G);
14685		− pi->srom_fem5g.extpagain = (u8) wlapi_getintvar(shim,
14686		− BRCMS_SROM_EXTPAGAIN5G);
14687		− pi->srom_fem5g.pdetrange = (u8) wlapi_getintvar(shim,
14688		− BRCMS_SROM_PDETRANGE5G);
14689		− pi->srom_fem5g.triso = (u8) wlapi_getintvar(shim, BRCMS_SROM_TRISO5G);
14690		− if (wlapi_getvar(shim, BRCMS_SROM_ANTSWCTL5G))
14691		− pi->srom_fem5g.antswctrllut =
14692		− (u8) wlapi_getintvar(shim, BRCMS_SROM_ANTSWCTL5G);
	14562	+ struct ssb_sprom *sprom = &pi->d11core->bus->sprom;
	14563	+
	14564	+ pi->antswitch = sprom->antswitch;
	14565	+ pi->aa2g = sprom->ant_available_bg;
	14566	+ pi->aa5g = sprom->ant_available_a;
	14567	+
	14568	+ pi->srom_fem2g.tssipos = sprom->fem.ghz2.tssipos;
	14569	+ pi->srom_fem2g.extpagain = sprom->fem.ghz2.extpa_gain;
	14570	+ pi->srom_fem2g.pdetrange = sprom->fem.ghz2.pdet_range;
	14571	+ pi->srom_fem2g.triso = sprom->fem.ghz2.tr_iso;
	14572	+ pi->srom_fem2g.antswctrllut = sprom->fem.ghz2.antswlut;
	14573	+
	14574	+ pi->srom_fem5g.tssipos = sprom->fem.ghz5.tssipos;
	14575	+ pi->srom_fem5g.extpagain = sprom->fem.ghz5.extpa_gain;
	14576	+ pi->srom_fem5g.pdetrange = sprom->fem.ghz5.pdet_range;
	14577	+ pi->srom_fem5g.triso = sprom->fem.ghz5.tr_iso;
	14578	+ if (sprom->fem.ghz5.antswlut)
	14579	+ pi->srom_fem5g.antswctrllut = sprom->fem.ghz5.antswlut;
14693	14580	else
14694		− pi->srom_fem5g.antswctrllut =
14695		− (u8) wlapi_getintvar(shim, BRCMS_SROM_ANTSWCTL2G);
	14581	+ pi->srom_fem5g.antswctrllut = sprom->fem.ghz2.antswlut;
14696	14582
14697	14583	wlc_phy_txpower_ipa_upd(pi);
14698	14584
14699		− pi->phy_txcore_disable_temp =
14700		− (s16) wlapi_getintvar(shim, BRCMS_SROM_TEMPTHRESH);
	14585	+ pi->phy_txcore_disable_temp = sprom->tempthresh;
14701	14586	if (pi->phy_txcore_disable_temp == 0)
14702	14587	pi->phy_txcore_disable_temp = PHY_CHAIN_TX_DISABLE_TEMP;
14703	14588
14704		− pi->phy_tempsense_offset = (s8) wlapi_getintvar(shim,
14705		− BRCMS_SROM_TEMPOFFSET);
	14589	+ pi->phy_tempsense_offset = sprom->tempoffset;
14706	14590	if (pi->phy_tempsense_offset != 0) {
14707	14591	if (pi->phy_tempsense_offset >
14708	14592	(NPHY_SROM_TEMPSHIFT + NPHY_SROM_MAXTEMPOFFSET))
@@ -14717,8 +14601,7 @@ static bool wlc_phy_txpwr_srom_read_nphy(struct brcms_phy *pi) · 8 unmodified lines
14717	14601	pi->phy_txcore_enable_temp =
14718	14602	pi->phy_txcore_disable_temp - PHY_HYSTERESIS_DELTATEMP;
14719	14603
14720		− pi->phycal_tempdelta =
14721		− (u8) wlapi_getintvar(shim, BRCMS_SROM_PHYCAL_TEMPDELTA);
	14604	+ pi->phycal_tempdelta = sprom->phycal_tempdelta;
14722	14605	if (pi->phycal_tempdelta > NPHY_CAL_MAXTEMPDELTA)
14723	14606	pi->phycal_tempdelta = 0;
14724	14607
@@ -21460,7 +21343,7 @@ void wlc_phy_antsel_init(struct brcms_phy_pub *ppi, bool lut_init) · 6735 unmodified lines
21460	21343	write_phy_reg(pi, 0xc8, 0x0);
21461	21344	write_phy_reg(pi, 0xc9, 0x0);
21462	21345
21463		− ai_gpiocontrol(pi->sh->sih, mask, mask, GPIO_DRV_PRIORITY);
	21346	+ bcma_chipco_gpio_control(&pi->d11core->bus->drv_cc, mask, mask);
21464	21347
21465	21348	mc = bcma_read32(pi->d11core, D11REGOFFS(maccontrol));
21466	21349	mc &= ~MCTL_GPOUT_SEL_MASK;

drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c+0−9

@@ -214,12 +214,3 @@ wlapi_copyto_objmem(struct phy_shim_info physhim, uint offset, const void buf, · 213 unmodified lines
214	214	{
215	215	brcms_b_copyto_objmem(physhim->wlc_hw, offset, buf, l, sel);
216	216	}
217		−
218		−char wlapi_getvar(struct phy_shim_info physhim, enum brcms_srom_id id)
219		−{
220		− return getvar(physhim->wlc_hw->sih, id);
221		−}
222		−int wlapi_getintvar(struct phy_shim_info *physhim, enum brcms_srom_id id)
223		−{
224		− return getintvar(physhim->wlc_hw->sih, id);
225		−}

drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h+0−3

@@ -175,8 +175,5 @@ extern void wlapi_copyto_objmem(struct phy_shim_info *physhim, uint, · 174 unmodified lines
175	175	extern void wlapi_high_update_phy_mode(struct phy_shim_info *physhim,
176	176	u32 phy_mode);
177	177	extern u16 wlapi_bmac_get_txant(struct phy_shim_info *physhim);
178		−extern char wlapi_getvar(struct phy_shim_info physhim, enum brcms_srom_id id);
179		−extern int wlapi_getintvar(struct phy_shim_info *physhim,
180		− enum brcms_srom_id id);
181	178
182	179	#endif /* _BRCM_PHY_SHIM_H_ */

drivers/net/wireless/brcm80211/brcmsmac/pub.h+0−228

@@ -22,232 +22,6 @@ · 21 unmodified lines
22	22	#include "types.h"
23	23	#include "defs.h"
24	24
25		−enum brcms_srom_id {
26		− BRCMS_SROM_NULL,
27		− BRCMS_SROM_CONT,
28		− BRCMS_SROM_AA2G,
29		− BRCMS_SROM_AA5G,
30		− BRCMS_SROM_AG0,
31		− BRCMS_SROM_AG1,
32		− BRCMS_SROM_AG2,
33		− BRCMS_SROM_AG3,
34		− BRCMS_SROM_ANTSWCTL2G,
35		− BRCMS_SROM_ANTSWCTL5G,
36		− BRCMS_SROM_ANTSWITCH,
37		− BRCMS_SROM_BOARDFLAGS2,
38		− BRCMS_SROM_BOARDFLAGS,
39		− BRCMS_SROM_BOARDNUM,
40		− BRCMS_SROM_BOARDREV,
41		− BRCMS_SROM_BOARDTYPE,
42		− BRCMS_SROM_BW40PO,
43		− BRCMS_SROM_BWDUPPO,
44		− BRCMS_SROM_BXA2G,
45		− BRCMS_SROM_BXA5G,
46		− BRCMS_SROM_CC,
47		− BRCMS_SROM_CCK2GPO,
48		− BRCMS_SROM_CCKBW202GPO,
49		− BRCMS_SROM_CCKBW20UL2GPO,
50		− BRCMS_SROM_CCODE,
51		− BRCMS_SROM_CDDPO,
52		− BRCMS_SROM_DEVID,
53		− BRCMS_SROM_ET1MACADDR,
54		− BRCMS_SROM_EXTPAGAIN2G,
55		− BRCMS_SROM_EXTPAGAIN5G,
56		− BRCMS_SROM_FREQOFFSET_CORR,
57		− BRCMS_SROM_HW_IQCAL_EN,
58		− BRCMS_SROM_IL0MACADDR,
59		− BRCMS_SROM_IQCAL_SWP_DIS,
60		− BRCMS_SROM_LEDBH0,
61		− BRCMS_SROM_LEDBH1,
62		− BRCMS_SROM_LEDBH2,
63		− BRCMS_SROM_LEDBH3,
64		− BRCMS_SROM_LEDDC,
65		− BRCMS_SROM_LEGOFDM40DUPPO,
66		− BRCMS_SROM_LEGOFDMBW202GPO,
67		− BRCMS_SROM_LEGOFDMBW205GHPO,
68		− BRCMS_SROM_LEGOFDMBW205GLPO,
69		− BRCMS_SROM_LEGOFDMBW205GMPO,
70		− BRCMS_SROM_LEGOFDMBW20UL2GPO,
71		− BRCMS_SROM_LEGOFDMBW20UL5GHPO,
72		− BRCMS_SROM_LEGOFDMBW20UL5GLPO,
73		− BRCMS_SROM_LEGOFDMBW20UL5GMPO,
74		− BRCMS_SROM_MACADDR,
75		− BRCMS_SROM_MCS2GPO0,
76		− BRCMS_SROM_MCS2GPO1,
77		− BRCMS_SROM_MCS2GPO2,
78		− BRCMS_SROM_MCS2GPO3,
79		− BRCMS_SROM_MCS2GPO4,
80		− BRCMS_SROM_MCS2GPO5,
81		− BRCMS_SROM_MCS2GPO6,
82		− BRCMS_SROM_MCS2GPO7,
83		− BRCMS_SROM_MCS32PO,
84		− BRCMS_SROM_MCS5GHPO0,
85		− BRCMS_SROM_MCS5GHPO1,
86		− BRCMS_SROM_MCS5GHPO2,
87		− BRCMS_SROM_MCS5GHPO3,
88		− BRCMS_SROM_MCS5GHPO4,
89		− BRCMS_SROM_MCS5GHPO5,
90		− BRCMS_SROM_MCS5GHPO6,
91		− BRCMS_SROM_MCS5GHPO7,
92		− BRCMS_SROM_MCS5GLPO0,
93		− BRCMS_SROM_MCS5GLPO1,
94		− BRCMS_SROM_MCS5GLPO2,
95		− BRCMS_SROM_MCS5GLPO3,
96		− BRCMS_SROM_MCS5GLPO4,
97		− BRCMS_SROM_MCS5GLPO5,
98		− BRCMS_SROM_MCS5GLPO6,
99		− BRCMS_SROM_MCS5GLPO7,
100		− BRCMS_SROM_MCS5GPO0,
101		− BRCMS_SROM_MCS5GPO1,
102		− BRCMS_SROM_MCS5GPO2,
103		− BRCMS_SROM_MCS5GPO3,
104		− BRCMS_SROM_MCS5GPO4,
105		− BRCMS_SROM_MCS5GPO5,
106		− BRCMS_SROM_MCS5GPO6,
107		− BRCMS_SROM_MCS5GPO7,
108		− BRCMS_SROM_MCSBW202GPO,
109		− BRCMS_SROM_MCSBW205GHPO,
110		− BRCMS_SROM_MCSBW205GLPO,
111		− BRCMS_SROM_MCSBW205GMPO,
112		− BRCMS_SROM_MCSBW20UL2GPO,
113		− BRCMS_SROM_MCSBW20UL5GHPO,
114		− BRCMS_SROM_MCSBW20UL5GLPO,
115		− BRCMS_SROM_MCSBW20UL5GMPO,
116		− BRCMS_SROM_MCSBW402GPO,
117		− BRCMS_SROM_MCSBW405GHPO,
118		− BRCMS_SROM_MCSBW405GLPO,
119		− BRCMS_SROM_MCSBW405GMPO,
120		− BRCMS_SROM_MEASPOWER,
121		− BRCMS_SROM_OFDM2GPO,
122		− BRCMS_SROM_OFDM5GHPO,
123		− BRCMS_SROM_OFDM5GLPO,
124		− BRCMS_SROM_OFDM5GPO,
125		− BRCMS_SROM_OPO,
126		− BRCMS_SROM_PA0B0,
127		− BRCMS_SROM_PA0B1,
128		− BRCMS_SROM_PA0B2,
129		− BRCMS_SROM_PA0ITSSIT,
130		− BRCMS_SROM_PA0MAXPWR,
131		− BRCMS_SROM_PA1B0,
132		− BRCMS_SROM_PA1B1,
133		− BRCMS_SROM_PA1B2,
134		− BRCMS_SROM_PA1HIB0,
135		− BRCMS_SROM_PA1HIB1,
136		− BRCMS_SROM_PA1HIB2,
137		− BRCMS_SROM_PA1HIMAXPWR,
138		− BRCMS_SROM_PA1ITSSIT,
139		− BRCMS_SROM_PA1LOB0,
140		− BRCMS_SROM_PA1LOB1,
141		− BRCMS_SROM_PA1LOB2,
142		− BRCMS_SROM_PA1LOMAXPWR,
143		− BRCMS_SROM_PA1MAXPWR,
144		− BRCMS_SROM_PDETRANGE2G,
145		− BRCMS_SROM_PDETRANGE5G,
146		− BRCMS_SROM_PHYCAL_TEMPDELTA,
147		− BRCMS_SROM_RAWTEMPSENSE,
148		− BRCMS_SROM_REGREV,
149		− BRCMS_SROM_REV,
150		− BRCMS_SROM_RSSISAV2G,
151		− BRCMS_SROM_RSSISAV5G,
152		− BRCMS_SROM_RSSISMC2G,
153		− BRCMS_SROM_RSSISMC5G,
154		− BRCMS_SROM_RSSISMF2G,
155		− BRCMS_SROM_RSSISMF5G,
156		− BRCMS_SROM_RXCHAIN,
157		− BRCMS_SROM_RXPO2G,
158		− BRCMS_SROM_RXPO5G,
159		− BRCMS_SROM_STBCPO,
160		− BRCMS_SROM_TEMPCORRX,
161		− BRCMS_SROM_TEMPOFFSET,
162		− BRCMS_SROM_TEMPSENSE_OPTION,
163		− BRCMS_SROM_TEMPSENSE_SLOPE,
164		− BRCMS_SROM_TEMPTHRESH,
165		− BRCMS_SROM_TRI2G,
166		− BRCMS_SROM_TRI5GH,
167		− BRCMS_SROM_TRI5GL,
168		− BRCMS_SROM_TRI5G,
169		− BRCMS_SROM_TRISO2G,
170		− BRCMS_SROM_TRISO5G,
171		− BRCMS_SROM_TSSIPOS2G,
172		− BRCMS_SROM_TSSIPOS5G,
173		− BRCMS_SROM_TXCHAIN,
174		− /*
175		− * per-path identifiers (see srom.c)
176		− */
177		− BRCMS_SROM_ITT2GA0,
178		− BRCMS_SROM_ITT2GA1,
179		− BRCMS_SROM_ITT2GA2,
180		− BRCMS_SROM_ITT2GA3,
181		− BRCMS_SROM_ITT5GA0,
182		− BRCMS_SROM_ITT5GA1,
183		− BRCMS_SROM_ITT5GA2,
184		− BRCMS_SROM_ITT5GA3,
185		− BRCMS_SROM_MAXP2GA0,
186		− BRCMS_SROM_MAXP2GA1,
187		− BRCMS_SROM_MAXP2GA2,
188		− BRCMS_SROM_MAXP2GA3,
189		− BRCMS_SROM_MAXP5GA0,
190		− BRCMS_SROM_MAXP5GA1,
191		− BRCMS_SROM_MAXP5GA2,
192		− BRCMS_SROM_MAXP5GA3,
193		− BRCMS_SROM_MAXP5GHA0,
194		− BRCMS_SROM_MAXP5GHA1,
195		− BRCMS_SROM_MAXP5GHA2,
196		− BRCMS_SROM_MAXP5GHA3,
197		− BRCMS_SROM_MAXP5GLA0,
198		− BRCMS_SROM_MAXP5GLA1,
199		− BRCMS_SROM_MAXP5GLA2,
200		− BRCMS_SROM_MAXP5GLA3,
201		− BRCMS_SROM_PA2GW0A0,
202		− BRCMS_SROM_PA2GW0A1,
203		− BRCMS_SROM_PA2GW0A2,
204		− BRCMS_SROM_PA2GW0A3,
205		− BRCMS_SROM_PA2GW1A0,
206		− BRCMS_SROM_PA2GW1A1,
207		− BRCMS_SROM_PA2GW1A2,
208		− BRCMS_SROM_PA2GW1A3,
209		− BRCMS_SROM_PA2GW2A0,
210		− BRCMS_SROM_PA2GW2A1,
211		− BRCMS_SROM_PA2GW2A2,
212		− BRCMS_SROM_PA2GW2A3,
213		− BRCMS_SROM_PA5GHW0A0,
214		− BRCMS_SROM_PA5GHW0A1,
215		− BRCMS_SROM_PA5GHW0A2,
216		− BRCMS_SROM_PA5GHW0A3,
217		− BRCMS_SROM_PA5GHW1A0,
218		− BRCMS_SROM_PA5GHW1A1,
219		− BRCMS_SROM_PA5GHW1A2,
220		− BRCMS_SROM_PA5GHW1A3,
221		− BRCMS_SROM_PA5GHW2A0,
222		− BRCMS_SROM_PA5GHW2A1,
223		− BRCMS_SROM_PA5GHW2A2,
224		− BRCMS_SROM_PA5GHW2A3,
225		− BRCMS_SROM_PA5GLW0A0,
226		− BRCMS_SROM_PA5GLW0A1,
227		− BRCMS_SROM_PA5GLW0A2,
228		− BRCMS_SROM_PA5GLW0A3,
229		− BRCMS_SROM_PA5GLW1A0,
230		− BRCMS_SROM_PA5GLW1A1,
231		− BRCMS_SROM_PA5GLW1A2,
232		− BRCMS_SROM_PA5GLW1A3,
233		− BRCMS_SROM_PA5GLW2A0,
234		− BRCMS_SROM_PA5GLW2A1,
235		− BRCMS_SROM_PA5GLW2A2,
236		− BRCMS_SROM_PA5GLW2A3,
237		− BRCMS_SROM_PA5GW0A0,
238		− BRCMS_SROM_PA5GW0A1,
239		− BRCMS_SROM_PA5GW0A2,
240		− BRCMS_SROM_PA5GW0A3,
241		− BRCMS_SROM_PA5GW1A0,
242		− BRCMS_SROM_PA5GW1A1,
243		− BRCMS_SROM_PA5GW1A2,
244		− BRCMS_SROM_PA5GW1A3,
245		− BRCMS_SROM_PA5GW2A0,
246		− BRCMS_SROM_PA5GW2A1,
247		− BRCMS_SROM_PA5GW2A2,
248		− BRCMS_SROM_PA5GW2A3,
249		−};
250		−
251	25	#define BRCMS_NUMRATES 16 /* max # of rates in a rateset */
252	26
253	27	/* phy types */
@@ -565,8 +339,6 @@ extern void brcms_c_ampdu_flush(struct brcms_c_info *wlc, · 311 unmodified lines
565	339	struct ieee80211_sta *sta, u16 tid);
566	340	extern void brcms_c_ampdu_tx_operational(struct brcms_c_info *wlc, u8 tid,
567	341	u8 ba_wsize, uint max_rx_ampdu_bytes);
568		−extern char getvar(struct si_pub sih, enum brcms_srom_id id);
569		−extern int getintvar(struct si_pub *sih, enum brcms_srom_id id);
570	342	extern int brcms_c_module_register(struct brcms_pub *pub,
571	343	const char name, struct brcms_info hdl,
572	344	int (down_fn)(void handle));

drivers/net/wireless/brcm80211/brcmsmac/srom.c+0−980

@@ -1,980 +0,0 @@
1		−/*
2		− * Copyright (c) 2010 Broadcom Corporation
3		− *
4		− * Permission to use, copy, modify, and/or distribute this software for any
5		− * purpose with or without fee is hereby granted, provided that the above
6		− * copyright notice and this permission notice appear in all copies.
7		− *
8		− * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9		− * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10		− * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
11		− * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12		− * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
13		− * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
14		− * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15		− */
16		−
17		−#include <linux/kernel.h>
18		−#include <linux/string.h>
19		−#include <linux/io.h>
20		−#include <linux/etherdevice.h>
21		−#include <linux/crc8.h>
22		−#include <stdarg.h>
23		−
24		−#include <chipcommon.h>
25		−#include <brcmu_utils.h>
26		−#include "pub.h"
27		−#include "nicpci.h"
28		−#include "aiutils.h"
29		−#include "otp.h"
30		−#include "srom.h"
31		−#include "soc.h"
32		−
33		−/*
34		− * SROM CRC8 polynomial value:
35		− *
36		− * x^8 + x^7 +x^6 + x^4 + x^2 + 1
37		− */
38		−#define SROM_CRC8_POLY 0xAB
39		−
40		−/* Maximum srom: 6 Kilobits == 768 bytes */
41		−#define SROM_MAX 768
42		−
43		−/* PCI fields */
44		−#define PCI_F0DEVID 48
45		−
46		−#define SROM_WORDS 64
47		−
48		−#define SROM_SSID 2
49		−
50		−#define SROM_WL1LHMAXP 29
51		−
52		−#define SROM_WL1LPAB0 30
53		−#define SROM_WL1LPAB1 31
54		−#define SROM_WL1LPAB2 32
55		−
56		−#define SROM_WL1HPAB0 33
57		−#define SROM_WL1HPAB1 34
58		−#define SROM_WL1HPAB2 35
59		−
60		−#define SROM_MACHI_IL0 36
61		−#define SROM_MACMID_IL0 37
62		−#define SROM_MACLO_IL0 38
63		−#define SROM_MACHI_ET1 42
64		−#define SROM_MACMID_ET1 43
65		−#define SROM_MACLO_ET1 44
66		−
67		−#define SROM_BXARSSI2G 40
68		−#define SROM_BXARSSI5G 41
69		−
70		−#define SROM_TRI52G 42
71		−#define SROM_TRI5GHL 43
72		−
73		−#define SROM_RXPO52G 45
74		−
75		−#define SROM_AABREV 46
76		−/* Fields in AABREV */
77		−#define SROM_BR_MASK 0x00ff
78		−#define SROM_CC_MASK 0x0f00
79		−#define SROM_CC_SHIFT 8
80		−#define SROM_AA0_MASK 0x3000
81		−#define SROM_AA0_SHIFT 12
82		−#define SROM_AA1_MASK 0xc000
83		−#define SROM_AA1_SHIFT 14
84		−
85		−#define SROM_WL0PAB0 47
86		−#define SROM_WL0PAB1 48
87		−#define SROM_WL0PAB2 49
88		−
89		−#define SROM_LEDBH10 50
90		−#define SROM_LEDBH32 51
91		−
92		−#define SROM_WL10MAXP 52
93		−
94		−#define SROM_WL1PAB0 53
95		−#define SROM_WL1PAB1 54
96		−#define SROM_WL1PAB2 55
97		−
98		−#define SROM_ITT 56
99		−
100		−#define SROM_BFL 57
101		−#define SROM_BFL2 28
102		−
103		−#define SROM_AG10 58
104		−
105		−#define SROM_CCODE 59
106		−
107		−#define SROM_OPO 60
108		−
109		−#define SROM_CRCREV 63
110		−
111		−#define SROM4_WORDS 220
112		−
113		−#define SROM4_TXCHAIN_MASK 0x000f
114		−#define SROM4_RXCHAIN_MASK 0x00f0
115		−#define SROM4_SWITCH_MASK 0xff00
116		−
117		−/* Per-path fields */
118		−#define MAX_PATH_SROM 4
119		−
120		−#define SROM4_CRCREV 219
121		−
122		−/* SROM Rev 8: Make space for a 48word hardware header for PCIe rev >= 6.
123		− * This is acombined srom for both MIMO and SISO boards, usable in
124		− * the .130 4Kilobit OTP with hardware redundancy.
125		− */
126		−#define SROM8_BREV 65
127		−
128		−#define SROM8_BFL0 66
129		−#define SROM8_BFL1 67
130		−#define SROM8_BFL2 68
131		−#define SROM8_BFL3 69
132		−
133		−#define SROM8_MACHI 70
134		−#define SROM8_MACMID 71
135		−#define SROM8_MACLO 72
136		−
137		−#define SROM8_CCODE 73
138		−#define SROM8_REGREV 74
139		−
140		−#define SROM8_LEDBH10 75
141		−#define SROM8_LEDBH32 76
142		−
143		−#define SROM8_LEDDC 77
144		−
145		−#define SROM8_AA 78
146		−
147		−#define SROM8_AG10 79
148		−#define SROM8_AG32 80
149		−
150		−#define SROM8_TXRXC 81
151		−
152		−#define SROM8_BXARSSI2G 82
153		−#define SROM8_BXARSSI5G 83
154		−#define SROM8_TRI52G 84
155		−#define SROM8_TRI5GHL 85
156		−#define SROM8_RXPO52G 86
157		−
158		−#define SROM8_FEM2G 87
159		−#define SROM8_FEM5G 88
160		−#define SROM8_FEM_ANTSWLUT_MASK 0xf800
161		−#define SROM8_FEM_ANTSWLUT_SHIFT 11
162		−#define SROM8_FEM_TR_ISO_MASK 0x0700
163		−#define SROM8_FEM_TR_ISO_SHIFT 8
164		−#define SROM8_FEM_PDET_RANGE_MASK 0x00f8
165		−#define SROM8_FEM_PDET_RANGE_SHIFT 3
166		−#define SROM8_FEM_EXTPA_GAIN_MASK 0x0006
167		−#define SROM8_FEM_EXTPA_GAIN_SHIFT 1
168		−#define SROM8_FEM_TSSIPOS_MASK 0x0001
169		−#define SROM8_FEM_TSSIPOS_SHIFT 0
170		−
171		−#define SROM8_THERMAL 89
172		−
173		−/* Temp sense related entries */
174		−#define SROM8_MPWR_RAWTS 90
175		−#define SROM8_TS_SLP_OPT_CORRX 91
176		−/* FOC: freiquency offset correction, HWIQ: H/W IOCAL enable,
177		− * IQSWP: IQ CAL swap disable */
178		−#define SROM8_FOC_HWIQ_IQSWP 92
179		−
180		−/* Temperature delta for PHY calibration */
181		−#define SROM8_PHYCAL_TEMPDELTA 93
182		−
183		−/* Per-path offsets & fields */
184		−#define SROM8_PATH0 96
185		−#define SROM8_PATH1 112
186		−#define SROM8_PATH2 128
187		−#define SROM8_PATH3 144
188		−
189		−#define SROM8_2G_ITT_MAXP 0
190		−#define SROM8_2G_PA 1
191		−#define SROM8_5G_ITT_MAXP 4
192		−#define SROM8_5GLH_MAXP 5
193		−#define SROM8_5G_PA 6
194		−#define SROM8_5GL_PA 9
195		−#define SROM8_5GH_PA 12
196		−
197		−/* All the miriad power offsets */
198		−#define SROM8_2G_CCKPO 160
199		−
200		−#define SROM8_2G_OFDMPO 161
201		−#define SROM8_5G_OFDMPO 163
202		−#define SROM8_5GL_OFDMPO 165
203		−#define SROM8_5GH_OFDMPO 167
204		−
205		−#define SROM8_2G_MCSPO 169
206		−#define SROM8_5G_MCSPO 177
207		−#define SROM8_5GL_MCSPO 185
208		−#define SROM8_5GH_MCSPO 193
209		−
210		−#define SROM8_CDDPO 201
211		−#define SROM8_STBCPO 202
212		−#define SROM8_BW40PO 203
213		−#define SROM8_BWDUPPO 204
214		−
215		−/* SISO PA parameters are in the path0 spaces */
216		−#define SROM8_SISO 96
217		−
218		−/* Legacy names for SISO PA paramters */
219		−#define SROM8_W0_ITTMAXP (SROM8_SISO + SROM8_2G_ITT_MAXP)
220		−#define SROM8_W0_PAB0 (SROM8_SISO + SROM8_2G_PA)
221		−#define SROM8_W0_PAB1 (SROM8_SISO + SROM8_2G_PA + 1)
222		−#define SROM8_W0_PAB2 (SROM8_SISO + SROM8_2G_PA + 2)
223		−#define SROM8_W1_ITTMAXP (SROM8_SISO + SROM8_5G_ITT_MAXP)
224		−#define SROM8_W1_MAXP_LCHC (SROM8_SISO + SROM8_5GLH_MAXP)
225		−#define SROM8_W1_PAB0 (SROM8_SISO + SROM8_5G_PA)
226		−#define SROM8_W1_PAB1 (SROM8_SISO + SROM8_5G_PA + 1)
227		−#define SROM8_W1_PAB2 (SROM8_SISO + SROM8_5G_PA + 2)
228		−#define SROM8_W1_PAB0_LC (SROM8_SISO + SROM8_5GL_PA)
229		−#define SROM8_W1_PAB1_LC (SROM8_SISO + SROM8_5GL_PA + 1)
230		−#define SROM8_W1_PAB2_LC (SROM8_SISO + SROM8_5GL_PA + 2)
231		−#define SROM8_W1_PAB0_HC (SROM8_SISO + SROM8_5GH_PA)
232		−#define SROM8_W1_PAB1_HC (SROM8_SISO + SROM8_5GH_PA + 1)
233		−#define SROM8_W1_PAB2_HC (SROM8_SISO + SROM8_5GH_PA + 2)
234		−
235		−/* SROM REV 9 */
236		−#define SROM9_2GPO_CCKBW20 160
237		−#define SROM9_2GPO_CCKBW20UL 161
238		−#define SROM9_2GPO_LOFDMBW20 162
239		−#define SROM9_2GPO_LOFDMBW20UL 164
240		−
241		−#define SROM9_5GLPO_LOFDMBW20 166
242		−#define SROM9_5GLPO_LOFDMBW20UL 168
243		−#define SROM9_5GMPO_LOFDMBW20 170
244		−#define SROM9_5GMPO_LOFDMBW20UL 172
245		−#define SROM9_5GHPO_LOFDMBW20 174
246		−#define SROM9_5GHPO_LOFDMBW20UL 176
247		−
248		−#define SROM9_2GPO_MCSBW20 178
249		−#define SROM9_2GPO_MCSBW20UL 180
250		−#define SROM9_2GPO_MCSBW40 182
251		−
252		−#define SROM9_5GLPO_MCSBW20 184
253		−#define SROM9_5GLPO_MCSBW20UL 186
254		−#define SROM9_5GLPO_MCSBW40 188
255		−#define SROM9_5GMPO_MCSBW20 190
256		−#define SROM9_5GMPO_MCSBW20UL 192
257		−#define SROM9_5GMPO_MCSBW40 194
258		−#define SROM9_5GHPO_MCSBW20 196
259		−#define SROM9_5GHPO_MCSBW20UL 198
260		−#define SROM9_5GHPO_MCSBW40 200
261		−
262		−#define SROM9_PO_MCS32 202
263		−#define SROM9_PO_LOFDM40DUP 203
264		−
265		−/* SROM flags (see sromvar_t) */
266		−
267		−/* value continues as described by the next entry */
268		−#define SRFL_MORE 1
269		−#define SRFL_NOFFS 2 /* value bits can't be all one's */
270		−#define SRFL_PRHEX 4 /* value is in hexdecimal format */
271		−#define SRFL_PRSIGN 8 /* value is in signed decimal format */
272		−#define SRFL_CCODE 0x10 /* value is in country code format */
273		−#define SRFL_ETHADDR 0x20 /* value is an Ethernet address */
274		−#define SRFL_LEDDC 0x40 /* value is an LED duty cycle */
275		−/* do not generate a nvram param, entry is for mfgc */
276		−#define SRFL_NOVAR 0x80
277		−
278		−/* Max. nvram variable table size */
279		−#define MAXSZ_NVRAM_VARS 4096
280		−
281		−/*
282		− * indicates type of value.
283		− */
284		−enum brcms_srom_var_type {
285		− BRCMS_SROM_STRING,
286		− BRCMS_SROM_SNUMBER,
287		− BRCMS_SROM_UNUMBER
288		−};
289		−
290		−/*
291		− * storage type for srom variable.
292		− *
293		− * var_list: for linked list operations.
294		− * varid: identifier of the variable.
295		− * var_type: type of variable.
296		− * buf: variable value when var_type == BRCMS_SROM_STRING.
297		− * uval: unsigned variable value when var_type == BRCMS_SROM_UNUMBER.
298		− * sval: signed variable value when var_type == BRCMS_SROM_SNUMBER.
299		− */
300		−struct brcms_srom_list_head {
301		− struct list_head var_list;
302		− enum brcms_srom_id varid;
303		− enum brcms_srom_var_type var_type;
304		− union {
305		− char buf[0];
306		− u32 uval;
307		− s32 sval;
308		− };
309		−};
310		−
311		−struct brcms_sromvar {
312		− enum brcms_srom_id varid;
313		− u32 revmask;
314		− u32 flags;
315		− u16 off;
316		− u16 mask;
317		−};
318		−
319		−struct brcms_varbuf {
320		− char base; / pointer to buffer base */
321		− char buf; / pointer to current position */
322		− unsigned int size; /* current (residual) size in bytes */
323		−};
324		−
325		−/*
326		− * Assumptions:
327		− * - Ethernet address spans across 3 consecutive words
328		− *
329		− * Table rules:
330		− * - Add multiple entries next to each other if a value spans across multiple
331		− * words (even multiple fields in the same word) with each entry except the
332		− * last having it's SRFL_MORE bit set.
333		− * - Ethernet address entry does not follow above rule and must not have
334		− * SRFL_MORE bit set. Its SRFL_ETHADDR bit implies it takes multiple words.
335		− * - The last entry's name field must be NULL to indicate the end of the table.
336		− * Other entries must have non-NULL name.
337		− */
338		−static const struct brcms_sromvar pci_sromvars[] = {
339		− {BRCMS_SROM_DEVID, 0xffffff00, SRFL_PRHEX \| SRFL_NOVAR, PCI_F0DEVID,
340		− 0xffff},
341		− {BRCMS_SROM_BOARDREV, 0xffffff00, SRFL_PRHEX, SROM8_BREV, 0xffff},
342		− {BRCMS_SROM_BOARDFLAGS, 0xffffff00, SRFL_PRHEX \| SRFL_MORE, SROM8_BFL0,
343		− 0xffff},
344		− {BRCMS_SROM_CONT, 0, 0, SROM8_BFL1, 0xffff},
345		− {BRCMS_SROM_BOARDFLAGS2, 0xffffff00, SRFL_PRHEX \| SRFL_MORE, SROM8_BFL2,
346		− 0xffff},
347		− {BRCMS_SROM_CONT, 0, 0, SROM8_BFL3, 0xffff},
348		− {BRCMS_SROM_BOARDTYPE, 0xfffffffc, SRFL_PRHEX, SROM_SSID, 0xffff},
349		− {BRCMS_SROM_BOARDNUM, 0xffffff00, 0, SROM8_MACLO, 0xffff},
350		− {BRCMS_SROM_REGREV, 0xffffff00, 0, SROM8_REGREV, 0x00ff},
351		− {BRCMS_SROM_LEDBH0, 0xffffff00, SRFL_NOFFS, SROM8_LEDBH10, 0x00ff},
352		− {BRCMS_SROM_LEDBH1, 0xffffff00, SRFL_NOFFS, SROM8_LEDBH10, 0xff00},
353		− {BRCMS_SROM_LEDBH2, 0xffffff00, SRFL_NOFFS, SROM8_LEDBH32, 0x00ff},
354		− {BRCMS_SROM_LEDBH3, 0xffffff00, SRFL_NOFFS, SROM8_LEDBH32, 0xff00},
355		− {BRCMS_SROM_PA0B0, 0xffffff00, SRFL_PRHEX, SROM8_W0_PAB0, 0xffff},
356		− {BRCMS_SROM_PA0B1, 0xffffff00, SRFL_PRHEX, SROM8_W0_PAB1, 0xffff},
357		− {BRCMS_SROM_PA0B2, 0xffffff00, SRFL_PRHEX, SROM8_W0_PAB2, 0xffff},
358		− {BRCMS_SROM_PA0ITSSIT, 0xffffff00, 0, SROM8_W0_ITTMAXP, 0xff00},
359		− {BRCMS_SROM_PA0MAXPWR, 0xffffff00, 0, SROM8_W0_ITTMAXP, 0x00ff},
360		− {BRCMS_SROM_OPO, 0xffffff00, 0, SROM8_2G_OFDMPO, 0x00ff},
361		− {BRCMS_SROM_AA2G, 0xffffff00, 0, SROM8_AA, 0x00ff},
362		− {BRCMS_SROM_AA5G, 0xffffff00, 0, SROM8_AA, 0xff00},
363		− {BRCMS_SROM_AG0, 0xffffff00, 0, SROM8_AG10, 0x00ff},
364		− {BRCMS_SROM_AG1, 0xffffff00, 0, SROM8_AG10, 0xff00},
365		− {BRCMS_SROM_AG2, 0xffffff00, 0, SROM8_AG32, 0x00ff},
366		− {BRCMS_SROM_AG3, 0xffffff00, 0, SROM8_AG32, 0xff00},
367		− {BRCMS_SROM_PA1B0, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB0, 0xffff},
368		− {BRCMS_SROM_PA1B1, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB1, 0xffff},
369		− {BRCMS_SROM_PA1B2, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB2, 0xffff},
370		− {BRCMS_SROM_PA1LOB0, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB0_LC, 0xffff},
371		− {BRCMS_SROM_PA1LOB1, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB1_LC, 0xffff},
372		− {BRCMS_SROM_PA1LOB2, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB2_LC, 0xffff},
373		− {BRCMS_SROM_PA1HIB0, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB0_HC, 0xffff},
374		− {BRCMS_SROM_PA1HIB1, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB1_HC, 0xffff},
375		− {BRCMS_SROM_PA1HIB2, 0xffffff00, SRFL_PRHEX, SROM8_W1_PAB2_HC, 0xffff},
376		− {BRCMS_SROM_PA1ITSSIT, 0xffffff00, 0, SROM8_W1_ITTMAXP, 0xff00},
377		− {BRCMS_SROM_PA1MAXPWR, 0xffffff00, 0, SROM8_W1_ITTMAXP, 0x00ff},
378		− {BRCMS_SROM_PA1LOMAXPWR, 0xffffff00, 0, SROM8_W1_MAXP_LCHC, 0xff00},
379		− {BRCMS_SROM_PA1HIMAXPWR, 0xffffff00, 0, SROM8_W1_MAXP_LCHC, 0x00ff},
380		− {BRCMS_SROM_BXA2G, 0xffffff00, 0, SROM8_BXARSSI2G, 0x1800},
381		− {BRCMS_SROM_RSSISAV2G, 0xffffff00, 0, SROM8_BXARSSI2G, 0x0700},
382		− {BRCMS_SROM_RSSISMC2G, 0xffffff00, 0, SROM8_BXARSSI2G, 0x00f0},
383		− {BRCMS_SROM_RSSISMF2G, 0xffffff00, 0, SROM8_BXARSSI2G, 0x000f},
384		− {BRCMS_SROM_BXA5G, 0xffffff00, 0, SROM8_BXARSSI5G, 0x1800},
385		− {BRCMS_SROM_RSSISAV5G, 0xffffff00, 0, SROM8_BXARSSI5G, 0x0700},
386		− {BRCMS_SROM_RSSISMC5G, 0xffffff00, 0, SROM8_BXARSSI5G, 0x00f0},
387		− {BRCMS_SROM_RSSISMF5G, 0xffffff00, 0, SROM8_BXARSSI5G, 0x000f},
388		− {BRCMS_SROM_TRI2G, 0xffffff00, 0, SROM8_TRI52G, 0x00ff},
389		− {BRCMS_SROM_TRI5G, 0xffffff00, 0, SROM8_TRI52G, 0xff00},
390		− {BRCMS_SROM_TRI5GL, 0xffffff00, 0, SROM8_TRI5GHL, 0x00ff},
391		− {BRCMS_SROM_TRI5GH, 0xffffff00, 0, SROM8_TRI5GHL, 0xff00},
392		− {BRCMS_SROM_RXPO2G, 0xffffff00, SRFL_PRSIGN, SROM8_RXPO52G, 0x00ff},
393		− {BRCMS_SROM_RXPO5G, 0xffffff00, SRFL_PRSIGN, SROM8_RXPO52G, 0xff00},
394		− {BRCMS_SROM_TXCHAIN, 0xffffff00, SRFL_NOFFS, SROM8_TXRXC,
395		− SROM4_TXCHAIN_MASK},
396		− {BRCMS_SROM_RXCHAIN, 0xffffff00, SRFL_NOFFS, SROM8_TXRXC,
397		− SROM4_RXCHAIN_MASK},
398		− {BRCMS_SROM_ANTSWITCH, 0xffffff00, SRFL_NOFFS, SROM8_TXRXC,
399		− SROM4_SWITCH_MASK},
400		− {BRCMS_SROM_TSSIPOS2G, 0xffffff00, 0, SROM8_FEM2G,
401		− SROM8_FEM_TSSIPOS_MASK},
402		− {BRCMS_SROM_EXTPAGAIN2G, 0xffffff00, 0, SROM8_FEM2G,
403		− SROM8_FEM_EXTPA_GAIN_MASK},
404		− {BRCMS_SROM_PDETRANGE2G, 0xffffff00, 0, SROM8_FEM2G,
405		− SROM8_FEM_PDET_RANGE_MASK},
406		− {BRCMS_SROM_TRISO2G, 0xffffff00, 0, SROM8_FEM2G, SROM8_FEM_TR_ISO_MASK},
407		− {BRCMS_SROM_ANTSWCTL2G, 0xffffff00, 0, SROM8_FEM2G,
408		− SROM8_FEM_ANTSWLUT_MASK},
409		− {BRCMS_SROM_TSSIPOS5G, 0xffffff00, 0, SROM8_FEM5G,
410		− SROM8_FEM_TSSIPOS_MASK},
411		− {BRCMS_SROM_EXTPAGAIN5G, 0xffffff00, 0, SROM8_FEM5G,
412		− SROM8_FEM_EXTPA_GAIN_MASK},
413		− {BRCMS_SROM_PDETRANGE5G, 0xffffff00, 0, SROM8_FEM5G,
414		− SROM8_FEM_PDET_RANGE_MASK},
415		− {BRCMS_SROM_TRISO5G, 0xffffff00, 0, SROM8_FEM5G, SROM8_FEM_TR_ISO_MASK},
416		− {BRCMS_SROM_ANTSWCTL5G, 0xffffff00, 0, SROM8_FEM5G,
417		− SROM8_FEM_ANTSWLUT_MASK},
418		− {BRCMS_SROM_TEMPTHRESH, 0xffffff00, 0, SROM8_THERMAL, 0xff00},
419		− {BRCMS_SROM_TEMPOFFSET, 0xffffff00, 0, SROM8_THERMAL, 0x00ff},
420		−
421		− {BRCMS_SROM_CCODE, 0xffffff00, SRFL_CCODE, SROM8_CCODE, 0xffff},
422		− {BRCMS_SROM_MACADDR, 0xffffff00, SRFL_ETHADDR, SROM8_MACHI, 0xffff},
423		− {BRCMS_SROM_LEDDC, 0xffffff00, SRFL_NOFFS \| SRFL_LEDDC, SROM8_LEDDC,
424		− 0xffff},
425		− {BRCMS_SROM_RAWTEMPSENSE, 0xffffff00, SRFL_PRHEX, SROM8_MPWR_RAWTS,
426		− 0x01ff},
427		− {BRCMS_SROM_MEASPOWER, 0xffffff00, SRFL_PRHEX, SROM8_MPWR_RAWTS,
428		− 0xfe00},
429		− {BRCMS_SROM_TEMPSENSE_SLOPE, 0xffffff00, SRFL_PRHEX,
430		− SROM8_TS_SLP_OPT_CORRX, 0x00ff},
431		− {BRCMS_SROM_TEMPCORRX, 0xffffff00, SRFL_PRHEX, SROM8_TS_SLP_OPT_CORRX,
432		− 0xfc00},
433		− {BRCMS_SROM_TEMPSENSE_OPTION, 0xffffff00, SRFL_PRHEX,
434		− SROM8_TS_SLP_OPT_CORRX, 0x0300},
435		− {BRCMS_SROM_FREQOFFSET_CORR, 0xffffff00, SRFL_PRHEX,
436		− SROM8_FOC_HWIQ_IQSWP, 0x000f},
437		− {BRCMS_SROM_IQCAL_SWP_DIS, 0xffffff00, SRFL_PRHEX, SROM8_FOC_HWIQ_IQSWP,
438		− 0x0010},
439		− {BRCMS_SROM_HW_IQCAL_EN, 0xffffff00, SRFL_PRHEX, SROM8_FOC_HWIQ_IQSWP,
440		− 0x0020},
441		− {BRCMS_SROM_PHYCAL_TEMPDELTA, 0xffffff00, 0, SROM8_PHYCAL_TEMPDELTA,
442		− 0x00ff},
443		−
444		− {BRCMS_SROM_CCK2GPO, 0x00000100, 0, SROM8_2G_CCKPO, 0xffff},
445		− {BRCMS_SROM_OFDM2GPO, 0x00000100, SRFL_MORE, SROM8_2G_OFDMPO, 0xffff},
446		− {BRCMS_SROM_CONT, 0, 0, SROM8_2G_OFDMPO + 1, 0xffff},
447		− {BRCMS_SROM_OFDM5GPO, 0x00000100, SRFL_MORE, SROM8_5G_OFDMPO, 0xffff},
448		− {BRCMS_SROM_CONT, 0, 0, SROM8_5G_OFDMPO + 1, 0xffff},
449		− {BRCMS_SROM_OFDM5GLPO, 0x00000100, SRFL_MORE, SROM8_5GL_OFDMPO, 0xffff},
450		− {BRCMS_SROM_CONT, 0, 0, SROM8_5GL_OFDMPO + 1, 0xffff},
451		− {BRCMS_SROM_OFDM5GHPO, 0x00000100, SRFL_MORE, SROM8_5GH_OFDMPO, 0xffff},
452		− {BRCMS_SROM_CONT, 0, 0, SROM8_5GH_OFDMPO + 1, 0xffff},
453		− {BRCMS_SROM_MCS2GPO0, 0x00000100, 0, SROM8_2G_MCSPO, 0xffff},
454		− {BRCMS_SROM_MCS2GPO1, 0x00000100, 0, SROM8_2G_MCSPO + 1, 0xffff},
455		− {BRCMS_SROM_MCS2GPO2, 0x00000100, 0, SROM8_2G_MCSPO + 2, 0xffff},
456		− {BRCMS_SROM_MCS2GPO3, 0x00000100, 0, SROM8_2G_MCSPO + 3, 0xffff},
457		− {BRCMS_SROM_MCS2GPO4, 0x00000100, 0, SROM8_2G_MCSPO + 4, 0xffff},
458		− {BRCMS_SROM_MCS2GPO5, 0x00000100, 0, SROM8_2G_MCSPO + 5, 0xffff},
459		− {BRCMS_SROM_MCS2GPO6, 0x00000100, 0, SROM8_2G_MCSPO + 6, 0xffff},
460		− {BRCMS_SROM_MCS2GPO7, 0x00000100, 0, SROM8_2G_MCSPO + 7, 0xffff},
461		− {BRCMS_SROM_MCS5GPO0, 0x00000100, 0, SROM8_5G_MCSPO, 0xffff},
462		− {BRCMS_SROM_MCS5GPO1, 0x00000100, 0, SROM8_5G_MCSPO + 1, 0xffff},
463		− {BRCMS_SROM_MCS5GPO2, 0x00000100, 0, SROM8_5G_MCSPO + 2, 0xffff},
464		− {BRCMS_SROM_MCS5GPO3, 0x00000100, 0, SROM8_5G_MCSPO + 3, 0xffff},
465		− {BRCMS_SROM_MCS5GPO4, 0x00000100, 0, SROM8_5G_MCSPO + 4, 0xffff},
466		− {BRCMS_SROM_MCS5GPO5, 0x00000100, 0, SROM8_5G_MCSPO + 5, 0xffff},
467		− {BRCMS_SROM_MCS5GPO6, 0x00000100, 0, SROM8_5G_MCSPO + 6, 0xffff},
468		− {BRCMS_SROM_MCS5GPO7, 0x00000100, 0, SROM8_5G_MCSPO + 7, 0xffff},
469		− {BRCMS_SROM_MCS5GLPO0, 0x00000100, 0, SROM8_5GL_MCSPO, 0xffff},
470		− {BRCMS_SROM_MCS5GLPO1, 0x00000100, 0, SROM8_5GL_MCSPO + 1, 0xffff},
471		− {BRCMS_SROM_MCS5GLPO2, 0x00000100, 0, SROM8_5GL_MCSPO + 2, 0xffff},
472		− {BRCMS_SROM_MCS5GLPO3, 0x00000100, 0, SROM8_5GL_MCSPO + 3, 0xffff},
473		− {BRCMS_SROM_MCS5GLPO4, 0x00000100, 0, SROM8_5GL_MCSPO + 4, 0xffff},
474		− {BRCMS_SROM_MCS5GLPO5, 0x00000100, 0, SROM8_5GL_MCSPO + 5, 0xffff},
475		− {BRCMS_SROM_MCS5GLPO6, 0x00000100, 0, SROM8_5GL_MCSPO + 6, 0xffff},
476		− {BRCMS_SROM_MCS5GLPO7, 0x00000100, 0, SROM8_5GL_MCSPO + 7, 0xffff},
477		− {BRCMS_SROM_MCS5GHPO0, 0x00000100, 0, SROM8_5GH_MCSPO, 0xffff},
478		− {BRCMS_SROM_MCS5GHPO1, 0x00000100, 0, SROM8_5GH_MCSPO + 1, 0xffff},
479		− {BRCMS_SROM_MCS5GHPO2, 0x00000100, 0, SROM8_5GH_MCSPO + 2, 0xffff},
480		− {BRCMS_SROM_MCS5GHPO3, 0x00000100, 0, SROM8_5GH_MCSPO + 3, 0xffff},
481		− {BRCMS_SROM_MCS5GHPO4, 0x00000100, 0, SROM8_5GH_MCSPO + 4, 0xffff},
482		− {BRCMS_SROM_MCS5GHPO5, 0x00000100, 0, SROM8_5GH_MCSPO + 5, 0xffff},
483		− {BRCMS_SROM_MCS5GHPO6, 0x00000100, 0, SROM8_5GH_MCSPO + 6, 0xffff},
484		− {BRCMS_SROM_MCS5GHPO7, 0x00000100, 0, SROM8_5GH_MCSPO + 7, 0xffff},
485		− {BRCMS_SROM_CDDPO, 0x00000100, 0, SROM8_CDDPO, 0xffff},
486		− {BRCMS_SROM_STBCPO, 0x00000100, 0, SROM8_STBCPO, 0xffff},
487		− {BRCMS_SROM_BW40PO, 0x00000100, 0, SROM8_BW40PO, 0xffff},
488		− {BRCMS_SROM_BWDUPPO, 0x00000100, 0, SROM8_BWDUPPO, 0xffff},
489		−
490		− /* power per rate from sromrev 9 */
491		− {BRCMS_SROM_CCKBW202GPO, 0xfffffe00, 0, SROM9_2GPO_CCKBW20, 0xffff},
492		− {BRCMS_SROM_CCKBW20UL2GPO, 0xfffffe00, 0, SROM9_2GPO_CCKBW20UL, 0xffff},
493		− {BRCMS_SROM_LEGOFDMBW202GPO, 0xfffffe00, SRFL_MORE,
494		− SROM9_2GPO_LOFDMBW20, 0xffff},
495		− {BRCMS_SROM_CONT, 0, 0, SROM9_2GPO_LOFDMBW20 + 1, 0xffff},
496		− {BRCMS_SROM_LEGOFDMBW20UL2GPO, 0xfffffe00, SRFL_MORE,
497		− SROM9_2GPO_LOFDMBW20UL, 0xffff},
498		− {BRCMS_SROM_CONT, 0, 0, SROM9_2GPO_LOFDMBW20UL + 1, 0xffff},
499		− {BRCMS_SROM_LEGOFDMBW205GLPO, 0xfffffe00, SRFL_MORE,
500		− SROM9_5GLPO_LOFDMBW20, 0xffff},
501		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GLPO_LOFDMBW20 + 1, 0xffff},
502		− {BRCMS_SROM_LEGOFDMBW20UL5GLPO, 0xfffffe00, SRFL_MORE,
503		− SROM9_5GLPO_LOFDMBW20UL, 0xffff},
504		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GLPO_LOFDMBW20UL + 1, 0xffff},
505		− {BRCMS_SROM_LEGOFDMBW205GMPO, 0xfffffe00, SRFL_MORE,
506		− SROM9_5GMPO_LOFDMBW20, 0xffff},
507		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GMPO_LOFDMBW20 + 1, 0xffff},
508		− {BRCMS_SROM_LEGOFDMBW20UL5GMPO, 0xfffffe00, SRFL_MORE,
509		− SROM9_5GMPO_LOFDMBW20UL, 0xffff},
510		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GMPO_LOFDMBW20UL + 1, 0xffff},
511		− {BRCMS_SROM_LEGOFDMBW205GHPO, 0xfffffe00, SRFL_MORE,
512		− SROM9_5GHPO_LOFDMBW20, 0xffff},
513		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GHPO_LOFDMBW20 + 1, 0xffff},
514		− {BRCMS_SROM_LEGOFDMBW20UL5GHPO, 0xfffffe00, SRFL_MORE,
515		− SROM9_5GHPO_LOFDMBW20UL, 0xffff},
516		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GHPO_LOFDMBW20UL + 1, 0xffff},
517		− {BRCMS_SROM_MCSBW202GPO, 0xfffffe00, SRFL_MORE, SROM9_2GPO_MCSBW20,
518		− 0xffff},
519		− {BRCMS_SROM_CONT, 0, 0, SROM9_2GPO_MCSBW20 + 1, 0xffff},
520		− {BRCMS_SROM_MCSBW20UL2GPO, 0xfffffe00, SRFL_MORE, SROM9_2GPO_MCSBW20UL,
521		− 0xffff},
522		− {BRCMS_SROM_CONT, 0, 0, SROM9_2GPO_MCSBW20UL + 1, 0xffff},
523		− {BRCMS_SROM_MCSBW402GPO, 0xfffffe00, SRFL_MORE, SROM9_2GPO_MCSBW40,
524		− 0xffff},
525		− {BRCMS_SROM_CONT, 0, 0, SROM9_2GPO_MCSBW40 + 1, 0xffff},
526		− {BRCMS_SROM_MCSBW205GLPO, 0xfffffe00, SRFL_MORE, SROM9_5GLPO_MCSBW20,
527		− 0xffff},
528		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GLPO_MCSBW20 + 1, 0xffff},
529		− {BRCMS_SROM_MCSBW20UL5GLPO, 0xfffffe00, SRFL_MORE,
530		− SROM9_5GLPO_MCSBW20UL, 0xffff},
531		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GLPO_MCSBW20UL + 1, 0xffff},
532		− {BRCMS_SROM_MCSBW405GLPO, 0xfffffe00, SRFL_MORE, SROM9_5GLPO_MCSBW40,
533		− 0xffff},
534		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GLPO_MCSBW40 + 1, 0xffff},
535		− {BRCMS_SROM_MCSBW205GMPO, 0xfffffe00, SRFL_MORE, SROM9_5GMPO_MCSBW20,
536		− 0xffff},
537		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GMPO_MCSBW20 + 1, 0xffff},
538		− {BRCMS_SROM_MCSBW20UL5GMPO, 0xfffffe00, SRFL_MORE,
539		− SROM9_5GMPO_MCSBW20UL, 0xffff},
540		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GMPO_MCSBW20UL + 1, 0xffff},
541		− {BRCMS_SROM_MCSBW405GMPO, 0xfffffe00, SRFL_MORE, SROM9_5GMPO_MCSBW40,
542		− 0xffff},
543		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GMPO_MCSBW40 + 1, 0xffff},
544		− {BRCMS_SROM_MCSBW205GHPO, 0xfffffe00, SRFL_MORE, SROM9_5GHPO_MCSBW20,
545		− 0xffff},
546		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GHPO_MCSBW20 + 1, 0xffff},
547		− {BRCMS_SROM_MCSBW20UL5GHPO, 0xfffffe00, SRFL_MORE,
548		− SROM9_5GHPO_MCSBW20UL, 0xffff},
549		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GHPO_MCSBW20UL + 1, 0xffff},
550		− {BRCMS_SROM_MCSBW405GHPO, 0xfffffe00, SRFL_MORE, SROM9_5GHPO_MCSBW40,
551		− 0xffff},
552		− {BRCMS_SROM_CONT, 0, 0, SROM9_5GHPO_MCSBW40 + 1, 0xffff},
553		− {BRCMS_SROM_MCS32PO, 0xfffffe00, 0, SROM9_PO_MCS32, 0xffff},
554		− {BRCMS_SROM_LEGOFDM40DUPPO, 0xfffffe00, 0, SROM9_PO_LOFDM40DUP, 0xffff},
555		−
556		− {BRCMS_SROM_NULL, 0, 0, 0, 0}
557		−};
558		−
559		−static const struct brcms_sromvar perpath_pci_sromvars[] = {
560		− {BRCMS_SROM_MAXP2GA0, 0xffffff00, 0, SROM8_2G_ITT_MAXP, 0x00ff},
561		− {BRCMS_SROM_ITT2GA0, 0xffffff00, 0, SROM8_2G_ITT_MAXP, 0xff00},
562		− {BRCMS_SROM_ITT5GA0, 0xffffff00, 0, SROM8_5G_ITT_MAXP, 0xff00},
563		− {BRCMS_SROM_PA2GW0A0, 0xffffff00, SRFL_PRHEX, SROM8_2G_PA, 0xffff},
564		− {BRCMS_SROM_PA2GW1A0, 0xffffff00, SRFL_PRHEX, SROM8_2G_PA + 1, 0xffff},
565		− {BRCMS_SROM_PA2GW2A0, 0xffffff00, SRFL_PRHEX, SROM8_2G_PA + 2, 0xffff},
566		− {BRCMS_SROM_MAXP5GA0, 0xffffff00, 0, SROM8_5G_ITT_MAXP, 0x00ff},
567		− {BRCMS_SROM_MAXP5GHA0, 0xffffff00, 0, SROM8_5GLH_MAXP, 0x00ff},
568		− {BRCMS_SROM_MAXP5GLA0, 0xffffff00, 0, SROM8_5GLH_MAXP, 0xff00},
569		− {BRCMS_SROM_PA5GW0A0, 0xffffff00, SRFL_PRHEX, SROM8_5G_PA, 0xffff},
570		− {BRCMS_SROM_PA5GW1A0, 0xffffff00, SRFL_PRHEX, SROM8_5G_PA + 1, 0xffff},
571		− {BRCMS_SROM_PA5GW2A0, 0xffffff00, SRFL_PRHEX, SROM8_5G_PA + 2, 0xffff},
572		− {BRCMS_SROM_PA5GLW0A0, 0xffffff00, SRFL_PRHEX, SROM8_5GL_PA, 0xffff},
573		− {BRCMS_SROM_PA5GLW1A0, 0xffffff00, SRFL_PRHEX, SROM8_5GL_PA + 1,
574		− 0xffff},
575		− {BRCMS_SROM_PA5GLW2A0, 0xffffff00, SRFL_PRHEX, SROM8_5GL_PA + 2,
576		− 0xffff},
577		− {BRCMS_SROM_PA5GHW0A0, 0xffffff00, SRFL_PRHEX, SROM8_5GH_PA, 0xffff},
578		− {BRCMS_SROM_PA5GHW1A0, 0xffffff00, SRFL_PRHEX, SROM8_5GH_PA + 1,
579		− 0xffff},
580		− {BRCMS_SROM_PA5GHW2A0, 0xffffff00, SRFL_PRHEX, SROM8_5GH_PA + 2,
581		− 0xffff},
582		− {BRCMS_SROM_NULL, 0, 0, 0, 0}
583		−};
584		−
585		−/* crc table has the same contents for every device instance, so it can be
586		− * shared between devices. */
587		−static u8 brcms_srom_crc8_table[CRC8_TABLE_SIZE];
588		−
589		−static uint mask_shift(u16 mask)
590		−{
591		− uint i;
592		− for (i = 0; i < (sizeof(mask) << 3); i++) {
593		− if (mask & (1 << i))
594		− return i;
595		− }
596		− return 0;
597		−}
598		−
599		−static uint mask_width(u16 mask)
600		−{
601		− int i;
602		− for (i = (sizeof(mask) << 3) - 1; i >= 0; i--) {
603		− if (mask & (1 << i))
604		− return (uint) (i - mask_shift(mask) + 1);
605		− }
606		− return 0;
607		−}
608		−
609		−static inline void le16_to_cpu_buf(u16 *buf, uint nwords)
610		−{
611		− while (nwords--)
612		− (buf + nwords) = le16_to_cpu((__le16 *)(buf + nwords));
613		−}
614		−
615		−static inline void cpu_to_le16_buf(u16 *buf, uint nwords)
616		−{
617		− while (nwords--)
618		− (__le16 )(buf + nwords) = cpu_to_le16(*(buf + nwords));
619		−}
620		−
621		−/*
622		− * convert binary srom data into linked list of srom variable items.
623		− */
624		−static int
625		−_initvars_srom_pci(u8 sromrev, u16 srom, struct list_head var_list)
626		−{
627		− struct brcms_srom_list_head *entry;
628		− enum brcms_srom_id id;
629		− u16 w;
630		− u32 val = 0;
631		− const struct brcms_sromvar *srv;
632		− uint width;
633		− uint flags;
634		− u32 sr = (1 << sromrev);
635		− uint p;
636		− uint pb = SROM8_PATH0;
637		− const uint psz = SROM8_PATH1 - SROM8_PATH0;
638		−
639		− /* first store the srom revision */
640		− entry = kzalloc(sizeof(struct brcms_srom_list_head), GFP_KERNEL);
641		− if (!entry)
642		− return -ENOMEM;
643		−
644		− entry->varid = BRCMS_SROM_REV;
645		− entry->var_type = BRCMS_SROM_UNUMBER;
646		− entry->uval = sromrev;
647		− list_add(&entry->var_list, var_list);
648		−
649		− for (srv = pci_sromvars; srv->varid != BRCMS_SROM_NULL; srv++) {
650		− enum brcms_srom_var_type type;
651		− u8 ea[ETH_ALEN];
652		− u8 extra_space = 0;
653		−
654		− if ((srv->revmask & sr) == 0)
655		− continue;
656		−
657		− flags = srv->flags;
658		− id = srv->varid;
659		−
660		− /* This entry is for mfgc only. Don't generate param for it, */
661		− if (flags & SRFL_NOVAR)
662		− continue;
663		−
664		− if (flags & SRFL_ETHADDR) {
665		− /*
666		− * stored in string format XX:XX:XX:XX:XX:XX (17 chars)
667		− */
668		− ea[0] = (srom[srv->off] >> 8) & 0xff;
669		− ea[1] = srom[srv->off] & 0xff;
670		− ea[2] = (srom[srv->off + 1] >> 8) & 0xff;
671		− ea[3] = srom[srv->off + 1] & 0xff;
672		− ea[4] = (srom[srv->off + 2] >> 8) & 0xff;
673		− ea[5] = srom[srv->off + 2] & 0xff;
674		− /* 17 characters + string terminator - union size */
675		− extra_space = 18 - sizeof(s32);
676		− type = BRCMS_SROM_STRING;
677		− } else {
678		− w = srom[srv->off];
679		− val = (w & srv->mask) >> mask_shift(srv->mask);
680		− width = mask_width(srv->mask);
681		−
682		− while (srv->flags & SRFL_MORE) {
683		− srv++;
684		− if (srv->off == 0)
685		− continue;
686		−
687		− w = srom[srv->off];
688		− val +=
689		− ((w & srv->mask) >> mask_shift(srv->
690		− mask)) <<
691		− width;
692		− width += mask_width(srv->mask);
693		− }
694		−
695		− if ((flags & SRFL_NOFFS)
696		− && ((int)val == (1 << width) - 1))
697		− continue;
698		−
699		− if (flags & SRFL_CCODE) {
700		− type = BRCMS_SROM_STRING;
701		− } else if (flags & SRFL_LEDDC) {
702		− /* LED Powersave duty cycle has to be scaled:
703		− *(oncount >> 24) (offcount >> 8)
704		− */
705		− u32 w32 = /* oncount */
706		− (((val >> 8) & 0xff) << 24) \|
707		− /* offcount */
708		− (((val & 0xff)) << 8);
709		− type = BRCMS_SROM_UNUMBER;
710		− val = w32;
711		− } else if ((flags & SRFL_PRSIGN)
712		− && (val & (1 << (width - 1)))) {
713		− type = BRCMS_SROM_SNUMBER;
714		− val \|= ~0 << width;
715		− } else
716		− type = BRCMS_SROM_UNUMBER;
717		− }
718		−
719		− entry = kzalloc(sizeof(struct brcms_srom_list_head) +
720		− extra_space, GFP_KERNEL);
721		− if (!entry)
722		− return -ENOMEM;
723		− entry->varid = id;
724		− entry->var_type = type;
725		− if (flags & SRFL_ETHADDR) {
726		− snprintf(entry->buf, 18, "%pM", ea);
727		− } else if (flags & SRFL_CCODE) {
728		− if (val == 0)
729		− entry->buf[0] = '\0';
730		− else
731		− snprintf(entry->buf, 3, "%c%c",
732		− (val >> 8), (val & 0xff));
733		− } else {
734		− entry->uval = val;
735		− }
736		−
737		− list_add(&entry->var_list, var_list);
738		− }
739		−
740		− for (p = 0; p < MAX_PATH_SROM; p++) {
741		− for (srv = perpath_pci_sromvars;
742		− srv->varid != BRCMS_SROM_NULL; srv++) {
743		− if ((srv->revmask & sr) == 0)
744		− continue;
745		−
746		− if (srv->flags & SRFL_NOVAR)
747		− continue;
748		−
749		− w = srom[pb + srv->off];
750		− val = (w & srv->mask) >> mask_shift(srv->mask);
751		− width = mask_width(srv->mask);
752		−
753		− /* Cheating: no per-path var is more than
754		− * 1 word */
755		− if ((srv->flags & SRFL_NOFFS)
756		− && ((int)val == (1 << width) - 1))
757		− continue;
758		−
759		− entry =
760		− kzalloc(sizeof(struct brcms_srom_list_head),
761		− GFP_KERNEL);
762		− if (!entry)
763		− return -ENOMEM;
764		− entry->varid = srv->varid+p;
765		− entry->var_type = BRCMS_SROM_UNUMBER;
766		− entry->uval = val;
767		− list_add(&entry->var_list, var_list);
768		− }
769		− pb += psz;
770		− }
771		− return 0;
772		−}
773		−
774		−/*
775		− * The crc check is done on a little-endian array, we need
776		− * to switch the bytes around before checking crc (and
777		− * then switch it back).
778		− */
779		−static int do_crc_check(u16 *buf, unsigned nwords)
780		−{
781		− u8 crc;
782		−
783		− cpu_to_le16_buf(buf, nwords);
784		− crc = crc8(brcms_srom_crc8_table, (void *)buf, nwords << 1, CRC8_INIT_VALUE);
785		− le16_to_cpu_buf(buf, nwords);
786		−
787		− return crc == CRC8_GOOD_VALUE(brcms_srom_crc8_table);
788		−}
789		−
790		−/*
791		− * Read in and validate sprom.
792		− * Return 0 on success, nonzero on error.
793		− */
794		−static int
795		−sprom_read_pci(struct si_pub sih, u16 buf, uint nwords, bool check_crc)
796		−{
797		− int err = 0;
798		− uint i;
799		− struct bcma_device *core;
800		− uint sprom_offset;
801		−
802		− /* determine core to read */
803		− if (ai_get_ccrev(sih) < 32) {
804		− core = ai_findcore(sih, BCMA_CORE_80211, 0);
805		− sprom_offset = PCI_BAR0_SPROM_OFFSET;
806		− } else {
807		− core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
808		− sprom_offset = CHIPCREGOFFS(sromotp);
809		− }
810		−
811		− /* read the sprom */
812		− for (i = 0; i < nwords; i++)
813		− buf[i] = bcma_read16(core, sprom_offset+i*2);
814		−
815		− if (buf[0] == 0xffff)
816		− /*
817		− * The hardware thinks that an srom that starts with
818		− * 0xffff is blank, regardless of the rest of the
819		− * content, so declare it bad.
820		− */
821		− return -ENODATA;
822		−
823		− if (check_crc && !do_crc_check(buf, nwords))
824		− err = -EIO;
825		−
826		− return err;
827		−}
828		−
829		−static int otp_read_pci(struct si_pub sih, u16 buf, uint nwords)
830		−{
831		− u8 *otp;
832		− uint sz = OTP_SZ_MAX / 2; /* size in words */
833		− int err = 0;
834		−
835		− otp = kzalloc(OTP_SZ_MAX, GFP_ATOMIC);
836		− if (otp == NULL)
837		− return -ENOMEM;
838		−
839		− err = otp_read_region(sih, OTP_HW_RGN, (u16 *) otp, &sz);
840		−
841		− sz = min_t(uint, sz, nwords);
842		− memcpy(buf, otp, sz * 2);
843		−
844		− kfree(otp);
845		−
846		− /* Check CRC */
847		− if (buf[0] == 0xffff)
848		− /* The hardware thinks that an srom that starts with 0xffff
849		− * is blank, regardless of the rest of the content, so declare
850		− * it bad.
851		− */
852		− return -ENODATA;
853		−
854		− /* fixup the endianness so crc8 will pass */
855		− cpu_to_le16_buf(buf, sz);
856		− if (crc8(brcms_srom_crc8_table, (u8 ) buf, sz 2,
857		− CRC8_INIT_VALUE) != CRC8_GOOD_VALUE(brcms_srom_crc8_table))
858		− err = -EIO;
859		− else
860		− /* now correct the endianness of the byte array */
861		− le16_to_cpu_buf(buf, sz);
862		−
863		− return err;
864		−}
865		−
866		−/*
867		− * Initialize nonvolatile variable table from sprom.
868		− * Return 0 on success, nonzero on error.
869		− */
870		−int srom_var_init(struct si_pub *sih)
871		−{
872		− u16 *srom;
873		− u8 sromrev = 0;
874		− u32 sr;
875		− int err = 0;
876		−
877		− /*
878		− * Apply CRC over SROM content regardless SROM is present or not.
879		− */
880		− srom = kmalloc(SROM_MAX, GFP_ATOMIC);
881		− if (!srom)
882		− return -ENOMEM;
883		−
884		− crc8_populate_lsb(brcms_srom_crc8_table, SROM_CRC8_POLY);
885		− if (ai_is_sprom_available(sih)) {
886		− err = sprom_read_pci(sih, srom, SROM4_WORDS, true);
887		−
888		− if (err == 0)
889		− /* srom read and passed crc */
890		− /* top word of sprom contains version and crc8 */
891		− sromrev = srom[SROM4_CRCREV] & 0xff;
892		− } else {
893		− /* Use OTP if SPROM not available */
894		− err = otp_read_pci(sih, srom, SROM4_WORDS);
895		− if (err == 0)
896		− /* OTP only contain SROM rev8/rev9 for now */
897		− sromrev = srom[SROM4_CRCREV] & 0xff;
898		− }
899		−
900		− if (!err) {
901		− struct si_info sii = (struct si_info )sih;
902		−
903		− /* Bitmask for the sromrev */
904		− sr = 1 << sromrev;
905		−
906		− /*
907		− * srom version check: Current valid versions: 8, 9
908		− */
909		− if ((sr & 0x300) == 0) {
910		− err = -EINVAL;
911		− goto errout;
912		− }
913		−
914		− INIT_LIST_HEAD(&sii->var_list);
915		−
916		− /* parse SROM into name=value pairs. */
917		− err = _initvars_srom_pci(sromrev, srom, &sii->var_list);
918		− if (err)
919		− srom_free_vars(sih);
920		− }
921		−
922		−errout:
923		− kfree(srom);
924		− return err;
925		−}
926		−
927		−void srom_free_vars(struct si_pub *sih)
928		−{
929		− struct si_info *sii;
930		− struct brcms_srom_list_head entry, next;
931		−
932		− sii = (struct si_info *)sih;
933		− list_for_each_entry_safe(entry, next, &sii->var_list, var_list) {
934		− list_del(&entry->var_list);
935		− kfree(entry);
936		− }
937		−}
938		−
939		−/*
940		− * Search the name=value vars for a specific one and return its value.
941		− * Returns NULL if not found.
942		− */
943		−char getvar(struct si_pub sih, enum brcms_srom_id id)
944		−{
945		− struct si_info *sii;
946		− struct brcms_srom_list_head *entry;
947		−
948		− sii = (struct si_info *)sih;
949		−
950		− list_for_each_entry(entry, &sii->var_list, var_list)
951		− if (entry->varid == id)
952		− return &entry->buf[0];
953		−
954		− /* nothing found */
955		− return NULL;
956		−}
957		−
958		−/*
959		− * Search the vars for a specific one and return its value as
960		− * an integer. Returns 0 if not found.-
961		− */
962		−int getintvar(struct si_pub *sih, enum brcms_srom_id id)
963		−{
964		− struct si_info *sii;
965		− struct brcms_srom_list_head *entry;
966		− unsigned long res;
967		−
968		− sii = (struct si_info *)sih;
969		−
970		− list_for_each_entry(entry, &sii->var_list, var_list)
971		− if (entry->varid == id) {
972		− if (entry->var_type == BRCMS_SROM_SNUMBER \|\|
973		− entry->var_type == BRCMS_SROM_UNUMBER)
974		− return (int)entry->sval;
975		− else if (!kstrtoul(&entry->buf[0], 0, &res))
976		− return (int)res;
977		− }
978		−
979		− return 0;
980		−}

drivers/net/wireless/brcm80211/brcmsmac/srom.h+0−29

@@ -1,29 +0,0 @@
1		−/*
2		− * Copyright (c) 2010 Broadcom Corporation
3		− *
4		− * Permission to use, copy, modify, and/or distribute this software for any
5		− * purpose with or without fee is hereby granted, provided that the above
6		− * copyright notice and this permission notice appear in all copies.
7		− *
8		− * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9		− * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10		− * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
11		− * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12		− * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
13		− * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
14		− * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15		− */
16		−
17		−#ifndef _BRCM_SROM_H_
18		−#define _BRCM_SROM_H_
19		−
20		−#include "types.h"
21		−
22		−/* Prototypes */
23		−extern int srom_var_init(struct si_pub *sih);
24		−extern void srom_free_vars(struct si_pub *sih);
25		−
26		−extern int srom_read(struct si_pub sih, uint bus, void curmap,
27		− uint byteoff, uint nbytes, u16 *buf, bool check_crc);
28		−
29		−#endif /* _BRCM_SROM_H_ */

drivers/net/wireless/brcm80211/brcmsmac/stf.c+4−2

@@ -370,9 +370,11 @@ void brcms_c_stf_phy_txant_upd(struct brcms_c_info *wlc) · 369 unmodified lines
370	370
371	371	void brcms_c_stf_phy_chain_calc(struct brcms_c_info *wlc)
372	372	{
	373	+ struct ssb_sprom *sprom = &wlc->hw->d11core->bus->sprom;
	374	+
373	375	/* get available rx/tx chains */
374		− wlc->stf->hw_txchain = (u8) getintvar(wlc->hw->sih, BRCMS_SROM_TXCHAIN);
375		− wlc->stf->hw_rxchain = (u8) getintvar(wlc->hw->sih, BRCMS_SROM_RXCHAIN);
	376	+ wlc->stf->hw_txchain = sprom->txchain;
	377	+ wlc->stf->hw_rxchain = sprom->rxchain;
376	378
377	379	/* these parameter are intended to be used for all PHY types */
378	380	if (wlc->stf->hw_txchain == 0 \|\| wlc->stf->hw_txchain == 0xf) {

drivers/net/wireless/iwlwifi/iwl-agn-lib.c+33−2

@@ -31,6 +31,7 @@ · 30 unmodified lines
31	31	#include <linux/module.h>
32	32	#include <linux/init.h>
33	33	#include <linux/sched.h>
	34	+#include <net/mac80211.h>
34	35
35	36	#include "iwl-dev.h"
36	37	#include "iwl-io.h"
@@ -273,9 +274,20 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv) · 236 unmodified lines
273	274	return;
274	275	}
275	276
	277	+ /*
	278	+ * Possible situations when BT needs to take over for receive,
	279	+ * at the same time where STA needs to response to AP's frame(s),
	280	+ * reduce the tx power of the required response frames, by that,
	281	+ * allow the concurrent BT receive & WiFi transmit
	282	+ * (BT - ANT A, WiFi -ANT B), without interference to one another
	283	+ *
	284	+ * Reduced tx power apply to control frames only (ACK/Back/CTS)
	285	+ * when indicated by the BT config command
	286	+ */
276	287	basic.kill_ack_mask = priv->kill_ack_mask;
277	288	basic.kill_cts_mask = priv->kill_cts_mask;
278		− basic.reduce_txpower = priv->reduced_txpower;
	289	+ if (priv->reduced_txpower)
	290	+ basic.reduce_txpower = IWLAGN_BT_REDUCED_TX_PWR;
279	291	basic.valid = priv->bt_valid;
280	292
281	293	/*
@@ -589,13 +601,31 @@ static bool iwlagn_set_kill_msk(struct iwl_priv *priv, · 307 unmodified lines
589	601	return need_update;
590	602	}
591	603
	604	+/*
	605	+ * Upon RSSI changes, sends a bt config command with following changes
	606	+ * 1. enable/disable "reduced control frames tx power
	607	+ * 2. update the "kill)ack_mask" and "kill_cts_mask"
	608	+ *
	609	+ * If "reduced tx power" is enabled, uCode shall
	610	+ * 1. ACK/Back/CTS rate shall reduced to 6Mbps
	611	+ * 2. not use duplciate 20/40MHz mode
	612	+ */
592	613	static bool iwlagn_fill_txpower_mode(struct iwl_priv *priv,
593	614	struct iwl_bt_uart_msg *uart_msg)
594	615	{
595	616	bool need_update = false;
	617	+ struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
	618	+ int ave_rssi;
596	619
	620	+ ave_rssi = ieee80211_ave_rssi(ctx->vif);
	621	+ if (!ave_rssi) {
	622	+ /* no rssi data, no changes to reduce tx power */
	623	+ IWL_DEBUG_COEX(priv, "no rssi data available\n");
	624	+ return need_update;
	625	+ }
597	626	if (!priv->reduced_txpower &&
598	627	!iwl_is_associated(priv, IWL_RXON_CTX_PAN) &&
	628	+ (ave_rssi > BT_ENABLE_REDUCED_TXPOWER_THRESHOLD) &&
599	629	(uart_msg->frame3 & (BT_UART_MSG_FRAME3ACL_MSK \|
600	630	BT_UART_MSG_FRAME3OBEX_MSK)) &&
601	631	!(uart_msg->frame3 & (BT_UART_MSG_FRAME3SCOESCO_MSK \|
@@ -606,13 +636,14 @@ static bool iwlagn_fill_txpower_mode(struct iwl_priv *priv, · 4 unmodified lines
606	636	need_update = true;
607	637	} else if (priv->reduced_txpower &&
608	638	(iwl_is_associated(priv, IWL_RXON_CTX_PAN) \|\|
	639	+ (ave_rssi < BT_DISABLE_REDUCED_TXPOWER_THRESHOLD) \|\|
609	640	(uart_msg->frame3 & (BT_UART_MSG_FRAME3SCOESCO_MSK \|
610	641	BT_UART_MSG_FRAME3SNIFF_MSK \| BT_UART_MSG_FRAME3A2DP_MSK)) \|\|
611	642	!(uart_msg->frame3 & (BT_UART_MSG_FRAME3ACL_MSK \|
612	643	BT_UART_MSG_FRAME3OBEX_MSK)))) {
613	644	/* disable reduced tx power */
614	645	priv->reduced_txpower = false;
615		− priv->bt_valid &= ~IWLAGN_BT_VALID_REDUCED_TX_PWR;
	646	+ priv->bt_valid \|= IWLAGN_BT_VALID_REDUCED_TX_PWR;
616	647	need_update = true;
617	648	}
618	649

drivers/net/wireless/iwlwifi/iwl-agn-rxon.c+4−0

@@ -61,6 +61,10 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv, · 60 unmodified lines
61	61	RXON_FILTER_ACCEPT_GRP_MSK;
62	62	break;
63	63
	64	+ case NL80211_IFTYPE_MONITOR:
	65	+ ctx->staging.dev_type = RXON_DEV_TYPE_SNIFFER;
	66	+ break;
	67	+
64	68	default:
65	69	IWL_ERR(priv, "Unsupported interface type %d\n",
66	70	ctx->vif->type);

drivers/net/wireless/iwlwifi/iwl-agn-tx.c+12−7

@@ -590,11 +590,17 @@ turn_off: · 589 unmodified lines
590	590	spin_unlock_bh(&priv->sta_lock);
591	591
592	592	if (test_bit(txq_id, priv->agg_q_alloc)) {
593		− /* If the transport didn't know that we wanted to start
594		− * agreggation, don't tell it that we want to stop them
	593	+ /*
	594	+ * If the transport didn't know that we wanted to start
	595	+ * agreggation, don't tell it that we want to stop them.
	596	+ * This can happen when we don't get the addBA response on
	597	+ * time, or we hadn't time to drain the AC queues.
595	598	*/
596		− if (agg_state != IWL_AGG_STARTING)
	599	+ if (agg_state == IWL_AGG_ON)
597	600	iwl_trans_tx_agg_disable(priv->trans, txq_id);
	601	+ else
	602	+ IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",
	603	+ agg_state);
598	604	iwlagn_dealloc_agg_txq(priv, txq_id);
599	605	}
600	606
@@ -1300,10 +1306,11 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, · 699 unmodified lines
1300	1306	(u8 *) &ba_resp->sta_addr_lo32,
1301	1307	ba_resp->sta_id);
1302	1308	IWL_DEBUG_TX_REPLY(priv, "TID = %d, SeqCtl = %d, bitmap = 0x%llx, "
1303		− "scd_flow = %d, scd_ssn = %d\n",
	1309	+ "scd_flow = %d, scd_ssn = %d sent:%d, acked:%d\n",
1304	1310	ba_resp->tid, le16_to_cpu(ba_resp->seq_ctl),
1305	1311	(unsigned long long)le64_to_cpu(ba_resp->bitmap),
1306		− scd_flow, ba_resp_scd_ssn);
	1312	+ scd_flow, ba_resp_scd_ssn, ba_resp->txed,
	1313	+ ba_resp->txed_2_done);
1307	1314
1308	1315	/* Mark that the expected block-ack response arrived */
1309	1316	agg->wait_for_ba = false;
@@ -1319,8 +1326,6 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, · 9 unmodified lines
1319	1326	*/
1320	1327	ba_resp->txed = ba_resp->txed_2_done;
1321	1328	}
1322		− IWL_DEBUG_HT(priv, "agg frames sent:%d, acked:%d\n",
1323		− ba_resp->txed, ba_resp->txed_2_done);
1324	1329
1325	1330	priv->tid_data[sta_id][tid].next_reclaimed = ba_resp_scd_ssn;
1326	1331

drivers/net/wireless/iwlwifi/iwl-agn.c+1−1

@@ -603,7 +603,7 @@ void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags) · 602 unmodified lines
603	603	priv->contexts[IWL_RXON_CTX_BSS].wep_key_cmd = REPLY_WEPKEY;
604	604	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;
605	605	priv->contexts[IWL_RXON_CTX_BSS].exclusive_interface_modes =
606		− BIT(NL80211_IFTYPE_ADHOC);
	606	+ BIT(NL80211_IFTYPE_ADHOC) \| BIT(NL80211_IFTYPE_MONITOR);
607	607	priv->contexts[IWL_RXON_CTX_BSS].interface_modes =
608	608	BIT(NL80211_IFTYPE_STATION);
609	609	priv->contexts[IWL_RXON_CTX_BSS].ap_devtype = RXON_DEV_TYPE_AP;

drivers/net/wireless/iwlwifi/iwl-commands.h+6−1

@@ -1910,6 +1910,8 @@ enum iwl_bt_kill_idx { · 1909 unmodified lines
1910	1910	IWLAGN_BT_VALID_REDUCED_TX_PWR \| \
1911	1911	IWLAGN_BT_VALID_3W_LUT)
1912	1912
	1913	+#define IWLAGN_BT_REDUCED_TX_PWR BIT(0)
	1914	+
1913	1915	#define IWLAGN_BT_DECISION_LUT_SIZE 12
1914	1916
1915	1917	struct iwl_basic_bt_cmd {
@@ -1923,6 +1925,10 @@ struct iwl_basic_bt_cmd { · 7 unmodified lines
1923	1925	u8 bt3_timer_t2_value;
1924	1926	__le16 bt4_reaction_time; /* unused */
1925	1927	__le32 bt3_lookup_table[IWLAGN_BT_DECISION_LUT_SIZE];
	1928	+ /*
	1929	+ * bit 0: use reduced tx power for control frame
	1930	+ * bit 1 - 7: reserved
	1931	+ */
1926	1932	u8 reduce_txpower;
1927	1933	u8 reserved;
1928	1934	__le16 valid;
@@ -2272,7 +2278,6 @@ struct iwl_ssid_ie { · 343 unmodified lines
2272	2278	#define IWL_GOOD_CRC_TH_DISABLED 0
2273	2279	#define IWL_GOOD_CRC_TH_DEFAULT cpu_to_le16(1)
2274	2280	#define IWL_GOOD_CRC_TH_NEVER cpu_to_le16(0xffff)
2275		−#define IWL_MAX_SCAN_SIZE 1024
2276	2281	#define IWL_MAX_CMD_SIZE 4096
2277	2282
2278	2283	/*

drivers/net/wireless/iwlwifi/iwl-mac80211.c+3−2

@@ -150,6 +150,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, · 149 unmodified lines
150	150	IEEE80211_HW_QUEUE_CONTROL \|
151	151	IEEE80211_HW_SUPPORTS_PS \|
152	152	IEEE80211_HW_SUPPORTS_DYNAMIC_PS \|
	153	+ IEEE80211_HW_WANT_MONITOR_VIF \|
153	154	IEEE80211_HW_SCAN_WHILE_IDLE;
154	155
155	156	hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE;
@@ -223,8 +224,8 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, · 67 unmodified lines
223	224	hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
224	225
225	226	hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX;
226		− /* we create the 802.11 header and a zero-length SSID element */
227		− hw->wiphy->max_scan_ie_len = capa->max_probe_length - 24 - 2;
	227	+ /* we create the 802.11 header and a max-length SSID element */
	228	+ hw->wiphy->max_scan_ie_len = capa->max_probe_length - 24 - 34;
228	229
229	230	/*
230	231	* We don't use all queues: 4 and 9 are unused and any

drivers/net/wireless/iwlwifi/iwl-power.c+6−2

@@ -253,6 +253,8 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv, · 252 unmodified lines
253	253
254	254	IWL_DEBUG_POWER(priv, "numSkipDtim = %u, dtimPeriod = %d\n",
255	255	skip, period);
	256	+ /* The power level here is 0-4 (used as array index), but user expects
	257	+ to see 1-5 (according to spec). */
256	258	IWL_DEBUG_POWER(priv, "Sleep command for index %d\n", lvl + 1);
257	259	}
258	260
@@ -308,10 +310,12 @@ static void iwl_power_build_cmd(struct iwl_priv *priv, · 49 unmodified lines
308	310	priv->power_data.debug_sleep_level_override,
309	311	dtimper);
310	312	else {
	313	+ /* Note that the user parameter is 1-5 (according to spec),
	314	+ but we pass 0-4 because it acts as an array index. */
311	315	if (iwlwifi_mod_params.power_level > IWL_POWER_INDEX_1 &&
312		− iwlwifi_mod_params.power_level <= IWL_POWER_INDEX_5)
	316	+ iwlwifi_mod_params.power_level <= IWL_POWER_NUM)
313	317	iwl_static_sleep_cmd(priv, cmd,
314		− iwlwifi_mod_params.power_level, dtimper);
	318	+ iwlwifi_mod_params.power_level - 1, dtimper);
315	319	else
316	320	iwl_static_sleep_cmd(priv, cmd,
317	321	IWL_POWER_INDEX_1, dtimper);

drivers/net/wireless/iwlwifi/iwl-scan.c+38−14

@@ -52,6 +52,7 @@ · 51 unmodified lines
52	52	#define IWL_PASSIVE_DWELL_TIME_52 (10)
53	53	#define IWL_PASSIVE_DWELL_BASE (100)
54	54	#define IWL_CHANNEL_TUNE_TIME 5
	55	+#define MAX_SCAN_CHANNEL 50
55	56
56	57	static int iwl_send_scan_abort(struct iwl_priv *priv)
57	58	{
@@ -616,7 +617,8 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv, · 558 unmodified lines
616	617	*/
617	618
618	619	static u16 iwl_fill_probe_req(struct ieee80211_mgmt frame, const u8 ta,
619		− const u8 *ies, int ie_len, int left)
	620	+ const u8 ies, int ie_len, const u8 ssid,
	621	+ u8 ssid_len, int left)
620	622	{
621	623	int len = 0;
622	624	u8 *pos = NULL;
@@ -638,14 +640,18 @@ static u16 iwl_fill_probe_req(struct ieee80211_mgmt frame, const u8 ta, · 15 unmodified lines
638	640	/* ...next IE... */
639	641	pos = &frame->u.probe_req.variable[0];
640	642
641		− /* fill in our indirect SSID IE */
642		− left -= 2;
	643	+ /* fill in our SSID IE */
	644	+ left -= ssid_len + 2;
643	645	if (left < 0)
644	646	return 0;
645	647	*pos++ = WLAN_EID_SSID;
646		− *pos++ = 0;
	648	+ *pos++ = ssid_len;
	649	+ if (ssid && ssid_len) {
	650	+ memcpy(pos, ssid, ssid_len);
	651	+ pos += ssid_len;
	652	+ }
647	653
648		− len += 2;
	654	+ len += ssid_len + 2;
649	655
650	656	if (WARN_ON(left < ie_len))
651	657	return len;
@@ -679,6 +685,15 @@ static int iwlagn_request_scan(struct iwl_priv priv, struct ieee80211_vif vif) · 27 unmodified lines
679	685	u8 active_chains;
680	686	u8 scan_tx_antennas = priv->hw_params.valid_tx_ant;
681	687	int ret;
	688	+ int scan_cmd_size = sizeof(struct iwl_scan_cmd) +
	689	+ MAX_SCAN_CHANNEL * sizeof(struct iwl_scan_channel) +
	690	+ priv->fw->ucode_capa.max_probe_length;
	691	+ const u8 *ssid = NULL;
	692	+ u8 ssid_len = 0;
	693	+
	694	+ if (WARN_ON_ONCE(priv->scan_request &&
	695	+ priv->scan_request->n_channels > MAX_SCAN_CHANNEL))
	696	+ return -EINVAL;
682	697
683	698	lockdep_assert_held(&priv->mutex);
684	699
@@ -686,8 +701,7 @@ static int iwlagn_request_scan(struct iwl_priv priv, struct ieee80211_vif vif) · 1 unmodified line
686	701	ctx = iwl_rxon_ctx_from_vif(vif);
687	702
688	703	if (!priv->scan_cmd) {
689		− priv->scan_cmd = kmalloc(sizeof(struct iwl_scan_cmd) +
690		− IWL_MAX_SCAN_SIZE, GFP_KERNEL);
	704	+ priv->scan_cmd = kmalloc(scan_cmd_size, GFP_KERNEL);
691	705	if (!priv->scan_cmd) {
692	706	IWL_DEBUG_SCAN(priv,
693	707	"fail to allocate memory for scan\n");
@@ -695,7 +709,7 @@ static int iwlagn_request_scan(struct iwl_priv priv, struct ieee80211_vif vif) · 1 unmodified line
695	709	}
696	710	}
697	711	scan = priv->scan_cmd;
698		− memset(scan, 0, sizeof(struct iwl_scan_cmd) + IWL_MAX_SCAN_SIZE);
	712	+ memset(scan, 0, scan_cmd_size);
699	713
700	714	scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH;
701	715	scan->quiet_time = IWL_ACTIVE_QUIET_TIME;
@@ -746,10 +760,18 @@ static int iwlagn_request_scan(struct iwl_priv priv, struct ieee80211_vif vif) · 44 unmodified lines
746	760	if (priv->scan_request->n_ssids) {
747	761	int i, p = 0;
748	762	IWL_DEBUG_SCAN(priv, "Kicking off active scan\n");
749		− for (i = 0; i < priv->scan_request->n_ssids; i++) {
750		− /* always does wildcard anyway */
751		− if (!priv->scan_request->ssids[i].ssid_len)
752		− continue;
	763	+ /*
	764	+ * The highest priority SSID is inserted to the
	765	+ * probe request template.
	766	+ */
	767	+ ssid_len = priv->scan_request->ssids[0].ssid_len;
	768	+ ssid = priv->scan_request->ssids[0].ssid;
	769	+
	770	+ /*
	771	+ * Invert the order of ssids, the firmware will invert
	772	+ * it back.
	773	+ */
	774	+ for (i = priv->scan_request->n_ssids - 1; i >= 1; i--) {
753	775	scan->direct_scan[p].id = WLAN_EID_SSID;
754	776	scan->direct_scan[p].len =
755	777	priv->scan_request->ssids[i].ssid_len;
@@ -883,7 +905,8 @@ static int iwlagn_request_scan(struct iwl_priv priv, struct ieee80211_vif vif) · 127 unmodified lines
883	905	vif->addr,
884	906	priv->scan_request->ie,
885	907	priv->scan_request->ie_len,
886		− IWL_MAX_SCAN_SIZE - sizeof(*scan));
	908	+ ssid, ssid_len,
	909	+ scan_cmd_size - sizeof(*scan));
887	910	break;
888	911	case IWL_SCAN_RADIO_RESET:
889	912	case IWL_SCAN_ROC:
@@ -891,7 +914,8 @@ static int iwlagn_request_scan(struct iwl_priv priv, struct ieee80211_vif vif) · 1 unmodified line
891	914	cmd_len = iwl_fill_probe_req(
892	915	(struct ieee80211_mgmt *)scan->data,
893	916	iwl_bcast_addr, NULL, 0,
894		− IWL_MAX_SCAN_SIZE - sizeof(*scan));
	917	+ NULL, 0,
	918	+ scan_cmd_size - sizeof(*scan));
895	919	break;
896	920	default:
897	921	BUG();

drivers/net/wireless/mac80211_hwsim.c+5−0

@@ -746,6 +746,11 @@ static void mac80211_hwsim_tx(struct ieee80211_hw hw, struct sk_buff skb) · 745 unmodified lines
746	746	hwsim_check_sta_magic(txi->control.sta);
747	747
748	748	ieee80211_tx_info_clear_status(txi);
	749	+
	750	+ /* frame was transmitted at most favorable rate at first attempt */
	751	+ txi->control.rates[0].count = 1;
	752	+ txi->control.rates[1].idx = -1;
	753	+
749	754	if (!(txi->flags & IEEE80211_TX_CTL_NO_ACK) && ack)
750	755	txi->flags \|= IEEE80211_TX_STAT_ACK;
751	756	ieee80211_tx_status_irqsafe(hw, skb);

drivers/net/wireless/mwifiex/Makefile+2−0

@@ -29,6 +29,8 @@ mwifiex-y += scan.o · 28 unmodified lines
29	29	mwifiex-y += join.o
30	30	mwifiex-y += sta_ioctl.o
31	31	mwifiex-y += sta_cmd.o
	32	+mwifiex-y += uap_cmd.o
	33	+mwifiex-y += ie.o
32	34	mwifiex-y += sta_cmdresp.o
33	35	mwifiex-y += sta_event.o
34	36	mwifiex-y += sta_tx.o

drivers/net/wireless/mwifiex/cfg80211.c+351−147

@@ -20,6 +20,23 @@ · 19 unmodified lines
20	20	#include "cfg80211.h"
21	21	#include "main.h"
22	22
	23	+static const struct ieee80211_iface_limit mwifiex_ap_sta_limits[] = {
	24	+ {
	25	+ .max = 1, .types = BIT(NL80211_IFTYPE_STATION),
	26	+ },
	27	+ {
	28	+ .max = 1, .types = BIT(NL80211_IFTYPE_AP),
	29	+ },
	30	+};
	31	+
	32	+static const struct ieee80211_iface_combination mwifiex_iface_comb_ap_sta = {
	33	+ .limits = mwifiex_ap_sta_limits,
	34	+ .num_different_channels = 1,
	35	+ .n_limits = ARRAY_SIZE(mwifiex_ap_sta_limits),
	36	+ .max_interfaces = MWIFIEX_MAX_BSS_NUM,
	37	+ .beacon_int_infra_match = true,
	38	+};
	39	+
23	40	/*
24	41	* This function maps the nl802.11 channel type into driver channel type.
25	42	*
@@ -67,7 +84,7 @@ mwifiex_is_alg_wep(u32 cipher) · 41 unmodified lines
67	84	/*
68	85	* This function retrieves the private structure from kernel wiphy structure.
69	86	*/
70		−static void mwifiex_cfg80211_get_priv(struct wiphy wiphy)
	87	+static void mwifiex_cfg80211_get_adapter(struct wiphy wiphy)
71	88	{
72	89	return (void ) ((unsigned long *) wiphy_priv(wiphy));
73	90	}
@@ -80,8 +97,10 @@ mwifiex_cfg80211_del_key(struct wiphy wiphy, struct net_device netdev, · 6 unmodified lines
80	97	u8 key_index, bool pairwise, const u8 *mac_addr)
81	98	{
82	99	struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
	100	+ const u8 bc_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
	101	+ const u8 *peer_mac = pairwise ? mac_addr : bc_mac;
83	102
84		− if (mwifiex_set_encode(priv, NULL, 0, key_index, 1)) {
	103	+ if (mwifiex_set_encode(priv, NULL, 0, key_index, peer_mac, 1)) {
85	104	wiphy_err(wiphy, "deleting the crypto keys\n");
86	105	return -EFAULT;
87	106	}
@@ -98,7 +117,8 @@ mwifiex_cfg80211_set_tx_power(struct wiphy *wiphy, · 10 unmodified lines
98	117	enum nl80211_tx_power_setting type,
99	118	int mbm)
100	119	{
101		− struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
	120	+ struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);
	121	+ struct mwifiex_private *priv;
102	122	struct mwifiex_power_cfg power_cfg;
103	123	int dbm = MBM_TO_DBM(mbm);
104	124
@@ -109,6 +129,8 @@ mwifiex_cfg80211_set_tx_power(struct wiphy *wiphy, · 4 unmodified lines
109	129	power_cfg.is_power_auto = 1;
110	130	}
111	131
	132	+ priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
	133	+
112	134	return mwifiex_set_tx_power(priv, &power_cfg);
113	135	}
114	136
@@ -148,7 +170,7 @@ mwifiex_cfg80211_set_default_key(struct wiphy wiphy, struct net_device netdev, · 33 unmodified lines
148	170	if (!priv->sec_info.wep_enabled)
149	171	return 0;
150	172
151		− if (mwifiex_set_encode(priv, NULL, 0, key_index, 0)) {
	173	+ if (mwifiex_set_encode(priv, NULL, 0, key_index, NULL, 0)) {
152	174	wiphy_err(wiphy, "set default Tx key index\n");
153	175	return -EFAULT;
154	176	}
@@ -165,9 +187,11 @@ mwifiex_cfg80211_add_key(struct wiphy wiphy, struct net_device netdev, · 10 unmodified lines
165	187	struct key_params *params)
166	188	{
167	189	struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
	190	+ const u8 bc_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
	191	+ const u8 *peer_mac = pairwise ? mac_addr : bc_mac;
168	192
169	193	if (mwifiex_set_encode(priv, params->key, params->key_len,
170		− key_index, 0)) {
	194	+ key_index, peer_mac, 0)) {
171	195	wiphy_err(wiphy, "crypto keys added\n");
172	196	return -EFAULT;
173	197	}
@@ -192,13 +216,13 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy) · 18 unmodified lines
192	216	enum ieee80211_band band;
193	217	struct ieee80211_supported_band *sband;
194	218	struct ieee80211_channel *ch;
195		− struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
196		− struct mwifiex_adapter *adapter = priv->adapter;
	219	+ struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);
	220	+ struct mwifiex_private *priv;
197	221	struct mwifiex_802_11d_domain_reg *domain_info = &adapter->domain_reg;
198	222
199	223	/* Set country code */
200		− domain_info->country_code[0] = priv->country_code[0];
201		− domain_info->country_code[1] = priv->country_code[1];
	224	+ domain_info->country_code[0] = adapter->country_code[0];
	225	+ domain_info->country_code[1] = adapter->country_code[1];
202	226	domain_info->country_code[2] = ' ';
203	227
204	228	band = mwifiex_band_to_radio_type(adapter->config_bands);
@@ -250,6 +274,8 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy) · 45 unmodified lines
250	274
251	275	domain_info->no_of_triplet = no_of_triplet;
252	276
	277	+ priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
	278	+
253	279	if (mwifiex_send_cmd_async(priv, HostCmd_CMD_802_11D_DOMAIN_INFO,
254	280	HostCmd_ACT_GEN_SET, 0, NULL)) {
255	281	wiphy_err(wiphy, "11D: setting domain info in FW\n");
@@ -272,12 +298,12 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy) · 16 unmodified lines
272	298	static int mwifiex_reg_notifier(struct wiphy *wiphy,
273	299	struct regulatory_request *request)
274	300	{
275		− struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
	301	+ struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);
276	302
277		− wiphy_dbg(wiphy, "info: cfg80211 regulatory domain callback for domain"
278		− " %c%c\n", request->alpha2[0], request->alpha2[1]);
	303	+ wiphy_dbg(wiphy, "info: cfg80211 regulatory domain callback for %c%c\n",
	304	+ request->alpha2[0], request->alpha2[1]);
279	305
280		− memcpy(priv->country_code, request->alpha2, sizeof(request->alpha2));
	306	+ memcpy(adapter->country_code, request->alpha2, sizeof(request->alpha2));
281	307
282	308	switch (request->initiator) {
283	309	case NL80211_REGDOM_SET_BY_DRIVER:
@@ -361,33 +387,10 @@ mwifiex_set_rf_channel(struct mwifiex_private *priv, · 77 unmodified lines
361	387	if (mwifiex_bss_set_channel(priv, &cfp))
362	388	return -EFAULT;
363	389
364		− return mwifiex_drv_change_adhoc_chan(priv, cfp.channel);
365		−}
366		−
367		−/*
368		− * CFG802.11 operation handler to set channel.
369		− *
370		− * This function can only be used when station is not connected.
371		− */
372		−static int
373		−mwifiex_cfg80211_set_channel(struct wiphy wiphy, struct net_device dev,
374		− struct ieee80211_channel *chan,
375		− enum nl80211_channel_type channel_type)
376		−{
377		− struct mwifiex_private *priv;
378		−
379		− if (dev)
380		− priv = mwifiex_netdev_get_priv(dev);
	390	+ if (priv->bss_type == MWIFIEX_BSS_TYPE_STA)
	391	+ return mwifiex_drv_change_adhoc_chan(priv, cfp.channel);
381	392	else
382		− priv = mwifiex_cfg80211_get_priv(wiphy);
383		−
384		− if (priv->media_connected) {
385		− wiphy_err(wiphy, "This setting is valid only when station "
386		− "is not connected\n");
387		− return -EINVAL;
388		− }
389		−
390		− return mwifiex_set_rf_channel(priv, chan, channel_type);
	393	+ return mwifiex_uap_set_channel(priv, cfp.channel);
391	394	}
392	395
393	396	/*
@@ -399,18 +402,13 @@ mwifiex_cfg80211_set_channel(struct wiphy wiphy, struct net_device dev, · 5 unmodified lines
399	402	static int
400	403	mwifiex_set_frag(struct mwifiex_private *priv, u32 frag_thr)
401	404	{
402		− int ret;
403		−
404	405	if (frag_thr < MWIFIEX_FRAG_MIN_VALUE \|\|
405	406	frag_thr > MWIFIEX_FRAG_MAX_VALUE)
406		− return -EINVAL;
407		−
408		− /* Send request to firmware */
409		− ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
410		− HostCmd_ACT_GEN_SET, FRAG_THRESH_I,
411		− &frag_thr);
	407	+ frag_thr = MWIFIEX_FRAG_MAX_VALUE;
412	408
413		− return ret;
	409	+ return mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
	410	+ HostCmd_ACT_GEN_SET, FRAG_THRESH_I,
	411	+ &frag_thr);
414	412	}
415	413
416	414	/*
@@ -439,19 +437,85 @@ mwifiex_set_rts(struct mwifiex_private *priv, u32 rts_thr) · 22 unmodified lines
439	437	static int
440	438	mwifiex_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
441	439	{
442		− struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
443		− int ret = 0;
	440	+ struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);
	441	+ struct mwifiex_private *priv;
	442	+ struct mwifiex_uap_bss_param *bss_cfg;
	443	+ int ret, bss_started, i;
	444	+
	445	+ for (i = 0; i < adapter->priv_num; i++) {
	446	+ priv = adapter->priv[i];
	447	+
	448	+ switch (priv->bss_role) {
	449	+ case MWIFIEX_BSS_ROLE_UAP:
	450	+ bss_cfg = kzalloc(sizeof(struct mwifiex_uap_bss_param),
	451	+ GFP_KERNEL);
	452	+ if (!bss_cfg)
	453	+ return -ENOMEM;
	454	+
	455	+ mwifiex_set_sys_config_invalid_data(bss_cfg);
	456	+
	457	+ if (changed & WIPHY_PARAM_RTS_THRESHOLD)
	458	+ bss_cfg->rts_threshold = wiphy->rts_threshold;
	459	+ if (changed & WIPHY_PARAM_FRAG_THRESHOLD)
	460	+ bss_cfg->frag_threshold = wiphy->frag_threshold;
	461	+ if (changed & WIPHY_PARAM_RETRY_LONG)
	462	+ bss_cfg->retry_limit = wiphy->retry_long;
	463	+
	464	+ bss_started = priv->bss_started;
	465	+
	466	+ ret = mwifiex_send_cmd_sync(priv,
	467	+ HostCmd_CMD_UAP_BSS_STOP,
	468	+ HostCmd_ACT_GEN_SET, 0,
	469	+ NULL);
	470	+ if (ret) {
	471	+ wiphy_err(wiphy, "Failed to stop the BSS\n");
	472	+ kfree(bss_cfg);
	473	+ return ret;
	474	+ }
444	475
445		− if (changed & WIPHY_PARAM_RTS_THRESHOLD) {
446		− ret = mwifiex_set_rts(priv, wiphy->rts_threshold);
447		− if (ret)
448		− return ret;
449		− }
	476	+ ret = mwifiex_send_cmd_async(priv,
	477	+ HostCmd_CMD_UAP_SYS_CONFIG,
	478	+ HostCmd_ACT_GEN_SET,
	479	+ UAP_BSS_PARAMS_I, bss_cfg);
450	480
451		− if (changed & WIPHY_PARAM_FRAG_THRESHOLD)
452		− ret = mwifiex_set_frag(priv, wiphy->frag_threshold);
	481	+ kfree(bss_cfg);
453	482
454		− return ret;
	483	+ if (ret) {
	484	+ wiphy_err(wiphy, "Failed to set bss config\n");
	485	+ return ret;
	486	+ }
	487	+
	488	+ if (!bss_started)
	489	+ break;
	490	+
	491	+ ret = mwifiex_send_cmd_async(priv,
	492	+ HostCmd_CMD_UAP_BSS_START,
	493	+ HostCmd_ACT_GEN_SET, 0,
	494	+ NULL);
	495	+ if (ret) {
	496	+ wiphy_err(wiphy, "Failed to start BSS\n");
	497	+ return ret;
	498	+ }
	499	+
	500	+ break;
	501	+ case MWIFIEX_BSS_ROLE_STA:
	502	+ if (changed & WIPHY_PARAM_RTS_THRESHOLD) {
	503	+ ret = mwifiex_set_rts(priv,
	504	+ wiphy->rts_threshold);
	505	+ if (ret)
	506	+ return ret;
	507	+ }
	508	+ if (changed & WIPHY_PARAM_FRAG_THRESHOLD) {
	509	+ ret = mwifiex_set_frag(priv,
	510	+ wiphy->frag_threshold);
	511	+ if (ret)
	512	+ return ret;
	513	+ }
	514	+ break;
	515	+ }
	516	+ }
	517	+
	518	+ return 0;
455	519	}
456	520
457	521	/*
@@ -466,31 +530,59 @@ mwifiex_cfg80211_change_virtual_intf(struct wiphy *wiphy, · 8 unmodified lines
466	530	int ret;
467	531	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
468	532
469		− if (priv->bss_mode == type) {
470		− wiphy_warn(wiphy, "already set to required type\n");
471		− return 0;
472		− }
473		−
474		− priv->bss_mode = type;
475		−
476		− switch (type) {
	533	+ switch (dev->ieee80211_ptr->iftype) {
477	534	case NL80211_IFTYPE_ADHOC:
478		− dev->ieee80211_ptr->iftype = NL80211_IFTYPE_ADHOC;
479		− wiphy_dbg(wiphy, "info: setting interface type to adhoc\n");
	535	+ switch (type) {
	536	+ case NL80211_IFTYPE_STATION:
	537	+ break;
	538	+ case NL80211_IFTYPE_UNSPECIFIED:
	539	+ wiphy_warn(wiphy, "%s: kept type as IBSS\n", dev->name);
	540	+ case NL80211_IFTYPE_ADHOC: /* This shouldn't happen */
	541	+ return 0;
	542	+ case NL80211_IFTYPE_AP:
	543	+ default:
	544	+ wiphy_err(wiphy, "%s: changing to %d not supported\n",
	545	+ dev->name, type);
	546	+ return -EOPNOTSUPP;
	547	+ }
480	548	break;
481	549	case NL80211_IFTYPE_STATION:
482		− dev->ieee80211_ptr->iftype = NL80211_IFTYPE_STATION;
483		− wiphy_dbg(wiphy, "info: setting interface type to managed\n");
	550	+ switch (type) {
	551	+ case NL80211_IFTYPE_ADHOC:
	552	+ break;
	553	+ case NL80211_IFTYPE_UNSPECIFIED:
	554	+ wiphy_warn(wiphy, "%s: kept type as STA\n", dev->name);
	555	+ case NL80211_IFTYPE_STATION: /* This shouldn't happen */
	556	+ return 0;
	557	+ case NL80211_IFTYPE_AP:
	558	+ default:
	559	+ wiphy_err(wiphy, "%s: changing to %d not supported\n",
	560	+ dev->name, type);
	561	+ return -EOPNOTSUPP;
	562	+ }
	563	+ break;
	564	+ case NL80211_IFTYPE_AP:
	565	+ switch (type) {
	566	+ case NL80211_IFTYPE_UNSPECIFIED:
	567	+ wiphy_warn(wiphy, "%s: kept type as AP\n", dev->name);
	568	+ case NL80211_IFTYPE_AP: /* This shouldn't happen */
	569	+ return 0;
	570	+ case NL80211_IFTYPE_ADHOC:
	571	+ case NL80211_IFTYPE_STATION:
	572	+ default:
	573	+ wiphy_err(wiphy, "%s: changing to %d not supported\n",
	574	+ dev->name, type);
	575	+ return -EOPNOTSUPP;
	576	+ }
484	577	break;
485		− case NL80211_IFTYPE_UNSPECIFIED:
486		− dev->ieee80211_ptr->iftype = NL80211_IFTYPE_STATION;
487		− wiphy_dbg(wiphy, "info: setting interface type to auto\n");
488		− return 0;
489	578	default:
490		− wiphy_err(wiphy, "unknown interface type: %d\n", type);
491		− return -EINVAL;
	579	+ wiphy_err(wiphy, "%s: unknown iftype: %d\n",
	580	+ dev->name, dev->ieee80211_ptr->iftype);
	581	+ return -EOPNOTSUPP;
492	582	}
493	583
	584	+ dev->ieee80211_ptr->iftype = type;
	585	+ priv->bss_mode = type;
494	586	mwifiex_deauthenticate(priv, NULL);
495	587
496	588	priv->sec_info.authentication_mode = NL80211_AUTHTYPE_OPEN_SYSTEM;
@@ -804,6 +896,90 @@ static int mwifiex_cfg80211_set_cqm_rssi_config(struct wiphy *wiphy, · 307 unmodified lines
804	896	return 0;
805	897	}
806	898
	899	+/* cfg80211 operation handler for stop ap.
	900	+ * Function stops BSS running at uAP interface.
	901	+ */
	902	+static int mwifiex_cfg80211_stop_ap(struct wiphy wiphy, struct net_device dev)
	903	+{
	904	+ struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
	905	+
	906	+ if (mwifiex_del_mgmt_ies(priv))
	907	+ wiphy_err(wiphy, "Failed to delete mgmt IEs!\n");
	908	+
	909	+ if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_UAP_BSS_STOP,
	910	+ HostCmd_ACT_GEN_SET, 0, NULL)) {
	911	+ wiphy_err(wiphy, "Failed to stop the BSS\n");
	912	+ return -1;
	913	+ }
	914	+
	915	+ return 0;
	916	+}
	917	+
	918	+/* cfg80211 operation handler for start_ap.
	919	+ * Function sets beacon period, DTIM period, SSID and security into
	920	+ * AP config structure.
	921	+ * AP is configured with these settings and BSS is started.
	922	+ */
	923	+static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
	924	+ struct net_device *dev,
	925	+ struct cfg80211_ap_settings *params)
	926	+{
	927	+ struct mwifiex_uap_bss_param *bss_cfg;
	928	+ struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
	929	+
	930	+ if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP)
	931	+ return -1;
	932	+ if (mwifiex_set_mgmt_ies(priv, params))
	933	+ return -1;
	934	+
	935	+ bss_cfg = kzalloc(sizeof(struct mwifiex_uap_bss_param), GFP_KERNEL);
	936	+ if (!bss_cfg)
	937	+ return -ENOMEM;
	938	+
	939	+ mwifiex_set_sys_config_invalid_data(bss_cfg);
	940	+
	941	+ if (params->beacon_interval)
	942	+ bss_cfg->beacon_period = params->beacon_interval;
	943	+ if (params->dtim_period)
	944	+ bss_cfg->dtim_period = params->dtim_period;
	945	+
	946	+ if (params->ssid && params->ssid_len) {
	947	+ memcpy(bss_cfg->ssid.ssid, params->ssid, params->ssid_len);
	948	+ bss_cfg->ssid.ssid_len = params->ssid_len;
	949	+ }
	950	+
	951	+ if (mwifiex_set_secure_params(priv, bss_cfg, params)) {
	952	+ kfree(bss_cfg);
	953	+ wiphy_err(wiphy, "Failed to parse secuirty parameters!\n");
	954	+ return -1;
	955	+ }
	956	+
	957	+ if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_UAP_BSS_STOP,
	958	+ HostCmd_ACT_GEN_SET, 0, NULL)) {
	959	+ wiphy_err(wiphy, "Failed to stop the BSS\n");
	960	+ kfree(bss_cfg);
	961	+ return -1;
	962	+ }
	963	+
	964	+ if (mwifiex_send_cmd_async(priv, HostCmd_CMD_UAP_SYS_CONFIG,
	965	+ HostCmd_ACT_GEN_SET,
	966	+ UAP_BSS_PARAMS_I, bss_cfg)) {
	967	+ wiphy_err(wiphy, "Failed to set the SSID\n");
	968	+ kfree(bss_cfg);
	969	+ return -1;
	970	+ }
	971	+
	972	+ kfree(bss_cfg);
	973	+
	974	+ if (mwifiex_send_cmd_async(priv, HostCmd_CMD_UAP_BSS_START,
	975	+ HostCmd_ACT_GEN_SET, 0, NULL)) {
	976	+ wiphy_err(wiphy, "Failed to start the BSS\n");
	977	+ return -1;
	978	+ }
	979	+
	980	+ return 0;
	981	+}
	982	+
807	983	/*
808	984	* CFG802.11 operation handler for disconnection request.
809	985	*
@@ -923,7 +1099,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private priv, size_t ssid_len, u8 ssid, · 113 unmodified lines
923	1099	priv->wep_key_curr_index = 0;
924	1100	priv->sec_info.encryption_mode = 0;
925	1101	priv->sec_info.is_authtype_auto = 0;
926		− ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);
	1102	+ ret = mwifiex_set_encode(priv, NULL, 0, 0, NULL, 1);
927	1103
928	1104	if (mode == NL80211_IFTYPE_ADHOC) {
929	1105	/* "privacy" is set only for ad-hoc mode */
@@ -971,7 +1147,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private priv, size_t ssid_len, u8 ssid, · 41 unmodified lines
971	1147	" with key len %d\n", sme->key_len);
972	1148	priv->wep_key_curr_index = sme->key_idx;
973	1149	ret = mwifiex_set_encode(priv, sme->key, sme->key_len,
974		− sme->key_idx, 0);
	1150	+ sme->key_idx, NULL, 0);
975	1151	}
976	1152	}
977	1153	done:
@@ -1050,6 +1226,11 @@ mwifiex_cfg80211_connect(struct wiphy wiphy, struct net_device dev, · 72 unmodified lines
1050	1226	goto done;
1051	1227	}
1052	1228
	1229	+ if (priv->bss_mode == NL80211_IFTYPE_AP) {
	1230	+ wiphy_err(wiphy, "skip association request for AP interface\n");
	1231	+ goto done;
	1232	+ }
	1233	+
1053	1234	wiphy_dbg(wiphy, "info: Trying to associate to %s and bssid %pM\n",
1054	1235	(char *) sme->ssid, sme->bssid);
1055	1236
@@ -1283,15 +1464,12 @@ struct net_device mwifiex_add_virtual_intf(struct wiphy wiphy, · 227 unmodified lines
1283	1464	u32 *flags,
1284	1465	struct vif_params *params)
1285	1466	{
1286		− struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
1287		− struct mwifiex_adapter *adapter;
	1467	+ struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);
	1468	+ struct mwifiex_private *priv;
1288	1469	struct net_device *dev;
1289	1470	void *mdev_priv;
	1471	+ struct wireless_dev *wdev;
1290	1472
1291		− if (!priv)
1292		− return NULL;
1293		−
1294		− adapter = priv->adapter;
1295	1473	if (!adapter)
1296	1474	return NULL;
1297	1475
@@ -1299,12 +1477,21 @@ struct net_device mwifiex_add_virtual_intf(struct wiphy wiphy, · 1 unmodified line
1299	1477	case NL80211_IFTYPE_UNSPECIFIED:
1300	1478	case NL80211_IFTYPE_STATION:
1301	1479	case NL80211_IFTYPE_ADHOC:
	1480	+ priv = adapter->priv[MWIFIEX_BSS_TYPE_STA];
1302	1481	if (priv->bss_mode) {
1303		− wiphy_err(wiphy, "cannot create multiple"
1304		− " station/adhoc interfaces\n");
	1482	+ wiphy_err(wiphy,
	1483	+ "cannot create multiple sta/adhoc ifaces\n");
1305	1484	return NULL;
1306	1485	}
1307	1486
	1487	+ wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);
	1488	+ if (!wdev)
	1489	+ return NULL;
	1490	+
	1491	+ wdev->wiphy = wiphy;
	1492	+ priv->wdev = wdev;
	1493	+ wdev->iftype = NL80211_IFTYPE_STATION;
	1494	+
1308	1495	if (type == NL80211_IFTYPE_UNSPECIFIED)
1309	1496	priv->bss_mode = NL80211_IFTYPE_STATION;
1310	1497	else
@@ -1312,10 +1499,35 @@ struct net_device mwifiex_add_virtual_intf(struct wiphy wiphy, · 1 unmodified line
1312	1499
1313	1500	priv->bss_type = MWIFIEX_BSS_TYPE_STA;
1314	1501	priv->frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;
1315		− priv->bss_priority = 0;
	1502	+ priv->bss_priority = MWIFIEX_BSS_ROLE_STA;
1316	1503	priv->bss_role = MWIFIEX_BSS_ROLE_STA;
1317	1504	priv->bss_num = 0;
1318	1505
	1506	+ break;
	1507	+ case NL80211_IFTYPE_AP:
	1508	+ priv = adapter->priv[MWIFIEX_BSS_TYPE_UAP];
	1509	+
	1510	+ if (priv->bss_mode) {
	1511	+ wiphy_err(wiphy, "Can't create multiple AP interfaces");
	1512	+ return NULL;
	1513	+ }
	1514	+
	1515	+ wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);
	1516	+ if (!wdev)
	1517	+ return NULL;
	1518	+
	1519	+ priv->wdev = wdev;
	1520	+ wdev->wiphy = wiphy;
	1521	+ wdev->iftype = NL80211_IFTYPE_AP;
	1522	+
	1523	+ priv->bss_type = MWIFIEX_BSS_TYPE_UAP;
	1524	+ priv->frame_type = MWIFIEX_DATA_FRAME_TYPE_ETH_II;
	1525	+ priv->bss_priority = MWIFIEX_BSS_ROLE_UAP;
	1526	+ priv->bss_role = MWIFIEX_BSS_ROLE_UAP;
	1527	+ priv->bss_started = 0;
	1528	+ priv->bss_num = 0;
	1529	+ priv->bss_mode = type;
	1530	+
1319	1531	break;
1320	1532	default:
1321	1533	wiphy_err(wiphy, "type not supported\n");
@@ -1329,6 +1541,15 @@ struct net_device mwifiex_add_virtual_intf(struct wiphy wiphy, · 7 unmodified lines
1329	1541	goto error;
1330	1542	}
1331	1543
	1544	+ mwifiex_init_priv_params(priv, dev);
	1545	+ priv->netdev = dev;
	1546	+
	1547	+ mwifiex_setup_ht_caps(&wiphy->bands[IEEE80211_BAND_2GHZ]->ht_cap, priv);
	1548	+
	1549	+ if (adapter->config_bands & BAND_A)
	1550	+ mwifiex_setup_ht_caps(
	1551	+ &wiphy->bands[IEEE80211_BAND_5GHZ]->ht_cap, priv);
	1552	+
1332	1553	dev_net_set(dev, wiphy_net(wiphy));
1333	1554	dev->ieee80211_ptr = priv->wdev;
1334	1555	dev->ieee80211_ptr->iftype = priv->bss_mode;
@@ -1343,9 +1564,6 @@ struct net_device mwifiex_add_virtual_intf(struct wiphy wiphy, · 8 unmodified lines
1343	1564	mdev_priv = netdev_priv(dev);
1344	1565	((unsigned long ) mdev_priv) = (unsigned long) priv;
1345	1566
1346		− priv->netdev = dev;
1347		− mwifiex_init_priv_params(priv, dev);
1348		−
1349	1567	SET_NETDEV_DEV(dev, adapter->dev);
1350	1568
1351	1569	/* Register network device */
@@ -1417,7 +1635,6 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = { · 65 unmodified lines
1417	1635	.get_station = mwifiex_cfg80211_get_station,
1418	1636	.dump_station = mwifiex_cfg80211_dump_station,
1419	1637	.set_wiphy_params = mwifiex_cfg80211_set_wiphy_params,
1420		− .set_channel = mwifiex_cfg80211_set_channel,
1421	1638	.join_ibss = mwifiex_cfg80211_join_ibss,
1422	1639	.leave_ibss = mwifiex_cfg80211_leave_ibss,
1423	1640	.add_key = mwifiex_cfg80211_add_key,
@@ -1426,6 +1643,8 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = { · 2 unmodified lines
1426	1643	.set_power_mgmt = mwifiex_cfg80211_set_power_mgmt,
1427	1644	.set_tx_power = mwifiex_cfg80211_set_tx_power,
1428	1645	.set_bitrate_mask = mwifiex_cfg80211_set_bitrate_mask,
	1646	+ .start_ap = mwifiex_cfg80211_start_ap,
	1647	+ .stop_ap = mwifiex_cfg80211_stop_ap,
1429	1648	.set_cqm_rssi_config = mwifiex_cfg80211_set_cqm_rssi_config,
1430	1649	};
1431	1650
@@ -1436,82 +1655,67 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = { · 4 unmodified lines
1436	1655	* default parameters and handler function pointers, and finally
1437	1656	* registers the device.
1438	1657	*/
1439		−int mwifiex_register_cfg80211(struct mwifiex_private *priv)
	1658	+
	1659	+int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
1440	1660	{
1441	1661	int ret;
1442	1662	void *wdev_priv;
1443		− struct wireless_dev *wdev;
1444		− struct ieee80211_sta_ht_cap *ht_info;
	1663	+ struct wiphy *wiphy;
	1664	+ struct mwifiex_private *priv = adapter->priv[MWIFIEX_BSS_TYPE_STA];
1445	1665	u8 *country_code;
1446	1666
1447		− wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);
1448		− if (!wdev) {
1449		− dev_err(priv->adapter->dev, "%s: allocating wireless device\n",
1450		− __func__);
1451		− return -ENOMEM;
1452		− }
1453		− wdev->wiphy =
1454		− wiphy_new(&mwifiex_cfg80211_ops,
1455		− sizeof(struct mwifiex_private *));
1456		− if (!wdev->wiphy) {
1457		− kfree(wdev);
	1667	+ /* create a new wiphy for use with cfg80211 */
	1668	+ wiphy = wiphy_new(&mwifiex_cfg80211_ops,
	1669	+ sizeof(struct mwifiex_adapter *));
	1670	+ if (!wiphy) {
	1671	+ dev_err(adapter->dev, "%s: creating new wiphy\n", __func__);
1458	1672	return -ENOMEM;
1459	1673	}
1460		− wdev->iftype = NL80211_IFTYPE_STATION;
1461		− wdev->wiphy->max_scan_ssids = 10;
1462		− wdev->wiphy->max_scan_ie_len = MWIFIEX_MAX_VSIE_LEN;
1463		− wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) \|
1464		− BIT(NL80211_IFTYPE_ADHOC);
1465		−
1466		− wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &mwifiex_band_2ghz;
1467		− ht_info = &wdev->wiphy->bands[IEEE80211_BAND_2GHZ]->ht_cap;
1468		− mwifiex_setup_ht_caps(ht_info, priv);
1469		−
1470		− if (priv->adapter->config_bands & BAND_A) {
1471		− wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &mwifiex_band_5ghz;
1472		− ht_info = &wdev->wiphy->bands[IEEE80211_BAND_5GHZ]->ht_cap;
1473		− mwifiex_setup_ht_caps(ht_info, priv);
1474		− } else {
1475		− wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = NULL;
1476		− }
	1674	+ wiphy->max_scan_ssids = MWIFIEX_MAX_SSID_LIST_LENGTH;
	1675	+ wiphy->max_scan_ie_len = MWIFIEX_MAX_VSIE_LEN;
	1676	+ wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) \|
	1677	+ BIT(NL80211_IFTYPE_ADHOC) \|
	1678	+ BIT(NL80211_IFTYPE_AP);
	1679	+
	1680	+ wiphy->bands[IEEE80211_BAND_2GHZ] = &mwifiex_band_2ghz;
	1681	+ if (adapter->config_bands & BAND_A)
	1682	+ wiphy->bands[IEEE80211_BAND_5GHZ] = &mwifiex_band_5ghz;
	1683	+ else
	1684	+ wiphy->bands[IEEE80211_BAND_5GHZ] = NULL;
	1685	+
	1686	+ wiphy->iface_combinations = &mwifiex_iface_comb_ap_sta;
	1687	+ wiphy->n_iface_combinations = 1;
1477	1688
1478	1689	/* Initialize cipher suits */
1479		− wdev->wiphy->cipher_suites = mwifiex_cipher_suites;
1480		− wdev->wiphy->n_cipher_suites = ARRAY_SIZE(mwifiex_cipher_suites);
	1690	+ wiphy->cipher_suites = mwifiex_cipher_suites;
	1691	+ wiphy->n_cipher_suites = ARRAY_SIZE(mwifiex_cipher_suites);
1481	1692
1482		− memcpy(wdev->wiphy->perm_addr, priv->curr_addr, ETH_ALEN);
1483		− wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
	1693	+ memcpy(wiphy->perm_addr, priv->curr_addr, ETH_ALEN);
	1694	+ wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
	1695	+ wiphy->flags \|= WIPHY_FLAG_HAVE_AP_SME \| WIPHY_FLAG_CUSTOM_REGULATORY;
1484	1696
1485	1697	/* Reserve space for mwifiex specific private data for BSS */
1486		− wdev->wiphy->bss_priv_size = sizeof(struct mwifiex_bss_priv);
1487		−
1488		− wdev->wiphy->reg_notifier = mwifiex_reg_notifier;
	1698	+ wiphy->bss_priv_size = sizeof(struct mwifiex_bss_priv);
1489	1699
1490		− /* Set struct mwifiex_private pointer in wiphy_priv */
1491		− wdev_priv = wiphy_priv(wdev->wiphy);
	1700	+ wiphy->reg_notifier = mwifiex_reg_notifier;
1492	1701
1493		− (unsigned long ) wdev_priv = (unsigned long) priv;
	1702	+ /* Set struct mwifiex_adapter pointer in wiphy_priv */
	1703	+ wdev_priv = wiphy_priv(wiphy);
	1704	+ (unsigned long )wdev_priv = (unsigned long)adapter;
1494	1705
1495		− set_wiphy_dev(wdev->wiphy, (struct device *) priv->adapter->dev);
	1706	+ set_wiphy_dev(wiphy, (struct device *)priv->adapter->dev);
1496	1707
1497		− ret = wiphy_register(wdev->wiphy);
	1708	+ ret = wiphy_register(wiphy);
1498	1709	if (ret < 0) {
1499		− dev_err(priv->adapter->dev, "%s: registering cfg80211 device\n",
1500		− __func__);
1501		− wiphy_free(wdev->wiphy);
1502		− kfree(wdev);
	1710	+ dev_err(adapter->dev,
	1711	+ "%s: wiphy_register failed: %d\n", __func__, ret);
	1712	+ wiphy_free(wiphy);
1503	1713	return ret;
1504		− } else {
1505		− dev_dbg(priv->adapter->dev,
1506		− "info: successfully registered wiphy device\n");
1507	1714	}
1508		−
1509	1715	country_code = mwifiex_11d_code_2_region(priv->adapter->region_code);
1510		− if (country_code && regulatory_hint(wdev->wiphy, country_code))
1511		− dev_err(priv->adapter->dev,
1512		− "%s: regulatory_hint failed\n", __func__);
1513		−
1514		− priv->wdev = wdev;
	1716	+ if (country_code && regulatory_hint(wiphy, country_code))
	1717	+ dev_err(adapter->dev, "regulatory_hint() failed\n");
1515	1718
	1719	+ adapter->wiphy = wiphy;
1516	1720	return ret;
1517	1721	}

drivers/net/wireless/mwifiex/cfg80211.h+1−1

@@ -24,6 +24,6 @@ · 23 unmodified lines
24	24
25	25	#include "main.h"
26	26
27		−int mwifiex_register_cfg80211(struct mwifiex_private *);
	27	+int mwifiex_register_cfg80211(struct mwifiex_adapter *);
28	28
29	29	#endif

drivers/net/wireless/mwifiex/cmdevt.c+19−2

@@ -440,6 +440,11 @@ int mwifiex_process_event(struct mwifiex_adapter *adapter) · 439 unmodified lines
440	440	do_gettimeofday(&tstamp);
441	441	dev_dbg(adapter->dev, "event: %lu.%lu: cause: %#x\n",
442	442	tstamp.tv_sec, tstamp.tv_usec, eventcause);
	443	+ } else {
	444	+ /* Handle PS_SLEEP/AWAKE events on STA */
	445	+ priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);
	446	+ if (!priv)
	447	+ priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
443	448	}
444	449
445	450	ret = mwifiex_process_sta_event(priv);
@@ -540,8 +545,20 @@ int mwifiex_send_cmd_async(struct mwifiex_private *priv, uint16_t cmd_no, · 94 unmodified lines
540	545
541	546	/* Prepare command */
542	547	if (cmd_no) {
543		− ret = mwifiex_sta_prepare_cmd(priv, cmd_no, cmd_action,
544		− cmd_oid, data_buf, cmd_ptr);
	548	+ switch (cmd_no) {
	549	+ case HostCmd_CMD_UAP_SYS_CONFIG:
	550	+ case HostCmd_CMD_UAP_BSS_START:
	551	+ case HostCmd_CMD_UAP_BSS_STOP:
	552	+ ret = mwifiex_uap_prepare_cmd(priv, cmd_no, cmd_action,
	553	+ cmd_oid, data_buf,
	554	+ cmd_ptr);
	555	+ break;
	556	+ default:
	557	+ ret = mwifiex_sta_prepare_cmd(priv, cmd_no, cmd_action,
	558	+ cmd_oid, data_buf,
	559	+ cmd_ptr);
	560	+ break;
	561	+ }
545	562	} else {
546	563	ret = mwifiex_cmd_host_cmd(priv, cmd_ptr, data_buf);
547	564	cmd_node->cmd_flag \|= CMD_F_HOSTCMD;

drivers/net/wireless/mwifiex/decl.h+12−1

@@ -28,7 +28,7 @@ · 27 unmodified lines
28	28	#include <linux/ieee80211.h>
29	29
30	30
31		−#define MWIFIEX_MAX_BSS_NUM (1)
	31	+#define MWIFIEX_MAX_BSS_NUM (2)
32	32
33	33	#define MWIFIEX_MIN_DATA_HEADER_LEN 36 /* sizeof(mwifiex_txpd)
34	34	* + 4 byte alignment
@@ -55,11 +55,17 @@ · 20 unmodified lines
55	55	#define MWIFIEX_RX_DATA_BUF_SIZE (4 * 1024)
56	56	#define MWIFIEX_RX_CMD_BUF_SIZE (2 * 1024)
57	57
	58	+#define MAX_BEACON_PERIOD (4000)
	59	+#define MIN_BEACON_PERIOD (50)
	60	+#define MAX_DTIM_PERIOD (100)
	61	+#define MIN_DTIM_PERIOD (1)
	62	+
58	63	#define MWIFIEX_RTS_MIN_VALUE (0)
59	64	#define MWIFIEX_RTS_MAX_VALUE (2347)
60	65	#define MWIFIEX_FRAG_MIN_VALUE (256)
61	66	#define MWIFIEX_FRAG_MAX_VALUE (2346)
62	67
	68	+#define MWIFIEX_RETRY_LIMIT 14
63	69	#define MWIFIEX_SDIO_BLOCK_SIZE 256
64	70
65	71	#define MWIFIEX_BUF_FLAG_REQUEUED_PKT BIT(0)
@@ -92,6 +98,11 @@ struct mwifiex_fw_image { · 26 unmodified lines
92	98	u32 fw_len;
93	99	};
94	100
	101	+struct mwifiex_802_11_ssid {
	102	+ u32 ssid_len;
	103	+ u8 ssid[IEEE80211_MAX_SSID_LEN];
	104	+};
	105	+
95	106	struct mwifiex_wait_queue {
96	107	wait_queue_head_t wait;
97	108	int status;

drivers/net/wireless/mwifiex/fw.h+158−1

@@ -93,6 +93,20 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { · 92 unmodified lines
93	93
94	94	#define CAL_SNR(RSSI, NF) ((s16)((s16)(RSSI)-(s16)(NF)))
95	95
	96	+#define UAP_BSS_PARAMS_I 0
	97	+#define UAP_CUSTOM_IE_I 1
	98	+#define MWIFIEX_AUTO_IDX_MASK 0xffff
	99	+#define MWIFIEX_DELETE_MASK 0x0000
	100	+#define MGMT_MASK_ASSOC_REQ 0x01
	101	+#define MGMT_MASK_REASSOC_REQ 0x04
	102	+#define MGMT_MASK_ASSOC_RESP 0x02
	103	+#define MGMT_MASK_REASSOC_RESP 0x08
	104	+#define MGMT_MASK_PROBE_REQ 0x10
	105	+#define MGMT_MASK_PROBE_RESP 0x20
	106	+#define MGMT_MASK_BEACON 0x100
	107	+
	108	+#define TLV_TYPE_UAP_SSID 0x0000
	109	+
96	110	#define PROPRIETARY_TLV_BASE_ID 0x0100
97	111	#define TLV_TYPE_KEY_MATERIAL (PROPRIETARY_TLV_BASE_ID + 0)
98	112	#define TLV_TYPE_CHANLIST (PROPRIETARY_TLV_BASE_ID + 1)
@@ -104,14 +118,26 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { · 5 unmodified lines
104	118	#define TLV_TYPE_TSFTIMESTAMP (PROPRIETARY_TLV_BASE_ID + 19)
105	119	#define TLV_TYPE_RSSI_HIGH (PROPRIETARY_TLV_BASE_ID + 22)
106	120	#define TLV_TYPE_AUTH_TYPE (PROPRIETARY_TLV_BASE_ID + 31)
	121	+#define TLV_TYPE_STA_MAC_ADDR (PROPRIETARY_TLV_BASE_ID + 32)
107	122	#define TLV_TYPE_CHANNELBANDLIST (PROPRIETARY_TLV_BASE_ID + 42)
	123	+#define TLV_TYPE_UAP_BEACON_PERIOD (PROPRIETARY_TLV_BASE_ID + 44)
	124	+#define TLV_TYPE_UAP_DTIM_PERIOD (PROPRIETARY_TLV_BASE_ID + 45)
	125	+#define TLV_TYPE_UAP_RTS_THRESHOLD (PROPRIETARY_TLV_BASE_ID + 51)
	126	+#define TLV_TYPE_UAP_WPA_PASSPHRASE (PROPRIETARY_TLV_BASE_ID + 60)
	127	+#define TLV_TYPE_UAP_ENCRY_PROTOCOL (PROPRIETARY_TLV_BASE_ID + 64)
	128	+#define TLV_TYPE_UAP_AKMP (PROPRIETARY_TLV_BASE_ID + 65)
	129	+#define TLV_TYPE_UAP_FRAG_THRESHOLD (PROPRIETARY_TLV_BASE_ID + 70)
108	130	#define TLV_TYPE_RATE_DROP_CONTROL (PROPRIETARY_TLV_BASE_ID + 82)
109	131	#define TLV_TYPE_RATE_SCOPE (PROPRIETARY_TLV_BASE_ID + 83)
110	132	#define TLV_TYPE_POWER_GROUP (PROPRIETARY_TLV_BASE_ID + 84)
	133	+#define TLV_TYPE_UAP_RETRY_LIMIT (PROPRIETARY_TLV_BASE_ID + 93)
111	134	#define TLV_TYPE_WAPI_IE (PROPRIETARY_TLV_BASE_ID + 94)
	135	+#define TLV_TYPE_UAP_MGMT_FRAME (PROPRIETARY_TLV_BASE_ID + 104)
112	136	#define TLV_TYPE_MGMT_IE (PROPRIETARY_TLV_BASE_ID + 105)
113	137	#define TLV_TYPE_AUTO_DS_PARAM (PROPRIETARY_TLV_BASE_ID + 113)
114	138	#define TLV_TYPE_PS_PARAM (PROPRIETARY_TLV_BASE_ID + 114)
	139	+#define TLV_TYPE_PWK_CIPHER (PROPRIETARY_TLV_BASE_ID + 145)
	140	+#define TLV_TYPE_GWK_CIPHER (PROPRIETARY_TLV_BASE_ID + 146)
115	141
116	142	#define MWIFIEX_TX_DATA_BUF_SIZE_2K 2048
117	143
@@ -209,6 +235,9 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { · 91 unmodified lines
209	235	#define HostCmd_CMD_RSSI_INFO 0x00a4
210	236	#define HostCmd_CMD_FUNC_INIT 0x00a9
211	237	#define HostCmd_CMD_FUNC_SHUTDOWN 0x00aa
	238	+#define HostCmd_CMD_UAP_SYS_CONFIG 0x00b0
	239	+#define HostCmd_CMD_UAP_BSS_START 0x00b1
	240	+#define HostCmd_CMD_UAP_BSS_STOP 0x00b2
212	241	#define HostCmd_CMD_11N_CFG 0x00cd
213	242	#define HostCmd_CMD_11N_ADDBA_REQ 0x00ce
214	243	#define HostCmd_CMD_11N_ADDBA_RSP 0x00cf
@@ -223,6 +252,19 @@ enum MWIFIEX_802_11_PRIVACY_FILTER { · 8 unmodified lines
223	252	#define HostCmd_CMD_SET_BSS_MODE 0x00f7
224	253	#define HostCmd_CMD_PCIE_DESC_DETAILS 0x00fa
225	254
	255	+#define PROTOCOL_NO_SECURITY 0x01
	256	+#define PROTOCOL_STATIC_WEP 0x02
	257	+#define PROTOCOL_WPA 0x08
	258	+#define PROTOCOL_WPA2 0x20
	259	+#define PROTOCOL_WPA2_MIXED 0x28
	260	+#define PROTOCOL_EAP 0x40
	261	+#define KEY_MGMT_NONE 0x04
	262	+#define KEY_MGMT_PSK 0x02
	263	+#define KEY_MGMT_EAP 0x01
	264	+#define CIPHER_TKIP 0x04
	265	+#define CIPHER_AES_CCMP 0x08
	266	+#define VALID_CIPHER_BITMAP 0x0c
	267	+
226	268	enum ENH_PS_MODES {
227	269	EN_PS = 1,
228	270	DIS_PS = 2,
@@ -313,15 +355,20 @@ enum ENH_PS_MODES { · 84 unmodified lines
313	355	#define EVENT_DATA_SNR_HIGH 0x00000027
314	356	#define EVENT_LINK_QUALITY 0x00000028
315	357	#define EVENT_PORT_RELEASE 0x0000002b
	358	+#define EVENT_UAP_STA_DEAUTH 0x0000002c
	359	+#define EVENT_UAP_STA_ASSOC 0x0000002d
	360	+#define EVENT_UAP_BSS_START 0x0000002e
316	361	#define EVENT_PRE_BEACON_LOST 0x00000031
317	362	#define EVENT_ADDBA 0x00000033
318	363	#define EVENT_DELBA 0x00000034
319	364	#define EVENT_BA_STREAM_TIEMOUT 0x00000037
320	365	#define EVENT_AMSDU_AGGR_CTRL 0x00000042
	366	+#define EVENT_UAP_BSS_IDLE 0x00000043
	367	+#define EVENT_UAP_BSS_ACTIVE 0x00000044
321	368	#define EVENT_WEP_ICV_ERR 0x00000046
322	369	#define EVENT_HS_ACT_REQ 0x00000047
323	370	#define EVENT_BW_CHANGE 0x00000048
324		−
	371	+#define EVENT_UAP_MIC_COUNTERMEASURES 0x0000004c
325	372	#define EVENT_HOSTWAKE_STAIE 0x0000004d
326	373
327	374	#define EVENT_ID_MASK 0xffff
@@ -1103,6 +1150,101 @@ struct host_cmd_ds_802_11_eeprom_access { · 775 unmodified lines
1103	1150	u8 value;
1104	1151	} __packed;
1105	1152
	1153	+struct host_cmd_tlv {
	1154	+ __le16 type;
	1155	+ __le16 len;
	1156	+} __packed;
	1157	+
	1158	+struct mwifiex_assoc_event {
	1159	+ u8 sta_addr[ETH_ALEN];
	1160	+ __le16 type;
	1161	+ __le16 len;
	1162	+ __le16 frame_control;
	1163	+ __le16 cap_info;
	1164	+ __le16 listen_interval;
	1165	+ u8 data[0];
	1166	+} __packed;
	1167	+
	1168	+struct host_cmd_ds_sys_config {
	1169	+ __le16 action;
	1170	+ u8 tlv[0];
	1171	+};
	1172	+
	1173	+struct host_cmd_tlv_akmp {
	1174	+ struct host_cmd_tlv tlv;
	1175	+ __le16 key_mgmt;
	1176	+ __le16 key_mgmt_operation;
	1177	+} __packed;
	1178	+
	1179	+struct host_cmd_tlv_pwk_cipher {
	1180	+ struct host_cmd_tlv tlv;
	1181	+ __le16 proto;
	1182	+ u8 cipher;
	1183	+ u8 reserved;
	1184	+} __packed;
	1185	+
	1186	+struct host_cmd_tlv_gwk_cipher {
	1187	+ struct host_cmd_tlv tlv;
	1188	+ u8 cipher;
	1189	+ u8 reserved;
	1190	+} __packed;
	1191	+
	1192	+struct host_cmd_tlv_passphrase {
	1193	+ struct host_cmd_tlv tlv;
	1194	+ u8 passphrase[0];
	1195	+} __packed;
	1196	+
	1197	+struct host_cmd_tlv_auth_type {
	1198	+ struct host_cmd_tlv tlv;
	1199	+ u8 auth_type;
	1200	+} __packed;
	1201	+
	1202	+struct host_cmd_tlv_encrypt_protocol {
	1203	+ struct host_cmd_tlv tlv;
	1204	+ __le16 proto;
	1205	+} __packed;
	1206	+
	1207	+struct host_cmd_tlv_ssid {
	1208	+ struct host_cmd_tlv tlv;
	1209	+ u8 ssid[0];
	1210	+} __packed;
	1211	+
	1212	+struct host_cmd_tlv_beacon_period {
	1213	+ struct host_cmd_tlv tlv;
	1214	+ __le16 period;
	1215	+} __packed;
	1216	+
	1217	+struct host_cmd_tlv_dtim_period {
	1218	+ struct host_cmd_tlv tlv;
	1219	+ u8 period;
	1220	+} __packed;
	1221	+
	1222	+struct host_cmd_tlv_frag_threshold {
	1223	+ struct host_cmd_tlv tlv;
	1224	+ __le16 frag_thr;
	1225	+} __packed;
	1226	+
	1227	+struct host_cmd_tlv_rts_threshold {
	1228	+ struct host_cmd_tlv tlv;
	1229	+ __le16 rts_thr;
	1230	+} __packed;
	1231	+
	1232	+struct host_cmd_tlv_retry_limit {
	1233	+ struct host_cmd_tlv tlv;
	1234	+ u8 limit;
	1235	+} __packed;
	1236	+
	1237	+struct host_cmd_tlv_mac_addr {
	1238	+ struct host_cmd_tlv tlv;
	1239	+ u8 mac_addr[ETH_ALEN];
	1240	+} __packed;
	1241	+
	1242	+struct host_cmd_tlv_channel_band {
	1243	+ struct host_cmd_tlv tlv;
	1244	+ u8 band_config;
	1245	+ u8 channel;
	1246	+} __packed;
	1247	+
1106	1248	struct host_cmd_ds_802_11_rf_channel {
1107	1249	__le16 action;
1108	1250	__le16 current_channel;
@@ -1167,6 +1309,20 @@ struct host_cmd_ds_802_11_subsc_evt { · 58 unmodified lines
1167	1309	__le16 events;
1168	1310	} __packed;
1169	1311
	1312	+struct mwifiex_ie {
	1313	+ __le16 ie_index;
	1314	+ __le16 mgmt_subtype_mask;
	1315	+ __le16 ie_length;
	1316	+ u8 ie_buffer[IEEE_MAX_IE_SIZE];
	1317	+} __packed;
	1318	+
	1319	+#define MAX_MGMT_IE_INDEX 16
	1320	+struct mwifiex_ie_list {
	1321	+ __le16 type;
	1322	+ __le16 len;
	1323	+ struct mwifiex_ie ie_list[MAX_MGMT_IE_INDEX];
	1324	+} __packed;
	1325	+
1170	1326	struct host_cmd_ds_command {
1171	1327	__le16 command;
1172	1328	__le16 size;
@@ -1217,6 +1373,7 @@ struct host_cmd_ds_command { · 44 unmodified lines
1217	1373	struct host_cmd_ds_pcie_details pcie_host_spec;
1218	1374	struct host_cmd_ds_802_11_eeprom_access eeprom;
1219	1375	struct host_cmd_ds_802_11_subsc_evt subsc_evt;
	1376	+ struct host_cmd_ds_sys_config uap_sys_config;
1220	1377	} params;
1221	1378	} __packed;
1222	1379

drivers/net/wireless/mwifiex/ie.c+396−0

@@ -0,0 +1,396 @@
	1	+/*
	2	+ * Marvell Wireless LAN device driver: management IE handling- setting and
	3	+ * deleting IE.
	4	+ *
	5	+ * Copyright (C) 2012, Marvell International Ltd.
	6	+ *
	7	+ * This software file (the "File") is distributed by Marvell International
	8	+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
	9	+ * (the "License"). You may use, redistribute and/or modify this File in
	10	+ * accordance with the terms and conditions of the License, a copy of which
	11	+ * is available by writing to the Free Software Foundation, Inc.,
	12	+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
	13	+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
	14	+ *
	15	+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
	16	+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
	17	+ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
	18	+ * this warranty disclaimer.
	19	+ */
	20	+
	21	+#include "main.h"
	22	+
	23	+/* This function checks if current IE index is used by any on other interface.
	24	+ * Return: -1: yes, current IE index is used by someone else.
	25	+ * 0: no, current IE index is NOT used by other interface.
	26	+ */
	27	+static int
	28	+mwifiex_ie_index_used_by_other_intf(struct mwifiex_private *priv, u16 idx)
	29	+{
	30	+ int i;
	31	+ struct mwifiex_adapter *adapter = priv->adapter;
	32	+ struct mwifiex_ie *ie;
	33	+
	34	+ for (i = 0; i < adapter->priv_num; i++) {
	35	+ if (adapter->priv[i] != priv) {
	36	+ ie = &adapter->priv[i]->mgmt_ie[idx];
	37	+ if (ie->mgmt_subtype_mask && ie->ie_length)
	38	+ return -1;
	39	+ }
	40	+ }
	41	+
	42	+ return 0;
	43	+}
	44	+
	45	+/* Get unused IE index. This index will be used for setting new IE */
	46	+static int
	47	+mwifiex_ie_get_autoidx(struct mwifiex_private *priv, u16 subtype_mask,
	48	+ struct mwifiex_ie ie, u16 index)
	49	+{
	50	+ u16 mask, len, i;
	51	+
	52	+ for (i = 0; i < priv->adapter->max_mgmt_ie_index; i++) {
	53	+ mask = le16_to_cpu(priv->mgmt_ie[i].mgmt_subtype_mask);
	54	+ len = le16_to_cpu(priv->mgmt_ie[i].ie_length) +
	55	+ le16_to_cpu(ie->ie_length);
	56	+
	57	+ if (mask == MWIFIEX_AUTO_IDX_MASK)
	58	+ continue;
	59	+
	60	+ if (mask == subtype_mask) {
	61	+ if (len > IEEE_MAX_IE_SIZE)
	62	+ continue;
	63	+
	64	+ *index = i;
	65	+ return 0;
	66	+ }
	67	+
	68	+ if (!priv->mgmt_ie[i].ie_length) {
	69	+ if (mwifiex_ie_index_used_by_other_intf(priv, i))
	70	+ continue;
	71	+
	72	+ *index = i;
	73	+ return 0;
	74	+ }
	75	+ }
	76	+
	77	+ return -1;
	78	+}
	79	+
	80	+/* This function prepares IE data buffer for command to be sent to FW */
	81	+static int
	82	+mwifiex_update_autoindex_ies(struct mwifiex_private *priv,
	83	+ struct mwifiex_ie_list *ie_list)
	84	+{
	85	+ u16 travel_len, index, mask;
	86	+ s16 input_len;
	87	+ struct mwifiex_ie *ie;
	88	+ u8 *tmp;
	89	+
	90	+ input_len = le16_to_cpu(ie_list->len);
	91	+ travel_len = sizeof(struct host_cmd_tlv);
	92	+
	93	+ ie_list->len = 0;
	94	+
	95	+ while (input_len > 0) {
	96	+ ie = (struct mwifiex_ie )(((u8 )ie_list) + travel_len);
	97	+ input_len -= le16_to_cpu(ie->ie_length) + MWIFIEX_IE_HDR_SIZE;
	98	+ travel_len += le16_to_cpu(ie->ie_length) + MWIFIEX_IE_HDR_SIZE;
	99	+
	100	+ index = le16_to_cpu(ie->ie_index);
	101	+ mask = le16_to_cpu(ie->mgmt_subtype_mask);
	102	+
	103	+ if (index == MWIFIEX_AUTO_IDX_MASK) {
	104	+ /* automatic addition */
	105	+ if (mwifiex_ie_get_autoidx(priv, mask, ie, &index))
	106	+ return -1;
	107	+ if (index == MWIFIEX_AUTO_IDX_MASK)
	108	+ return -1;
	109	+
	110	+ tmp = (u8 *)&priv->mgmt_ie[index].ie_buffer;
	111	+ tmp += le16_to_cpu(priv->mgmt_ie[index].ie_length);
	112	+ memcpy(tmp, &ie->ie_buffer, le16_to_cpu(ie->ie_length));
	113	+ le16_add_cpu(&priv->mgmt_ie[index].ie_length,
	114	+ le16_to_cpu(ie->ie_length));
	115	+ priv->mgmt_ie[index].ie_index = cpu_to_le16(index);
	116	+ priv->mgmt_ie[index].mgmt_subtype_mask =
	117	+ cpu_to_le16(mask);
	118	+
	119	+ ie->ie_index = cpu_to_le16(index);
	120	+ ie->ie_length = priv->mgmt_ie[index].ie_length;
	121	+ memcpy(&ie->ie_buffer, &priv->mgmt_ie[index].ie_buffer,
	122	+ le16_to_cpu(priv->mgmt_ie[index].ie_length));
	123	+ } else {
	124	+ if (mask != MWIFIEX_DELETE_MASK)
	125	+ return -1;
	126	+ /*
	127	+ * Check if this index is being used on any
	128	+ * other interface.
	129	+ */
	130	+ if (mwifiex_ie_index_used_by_other_intf(priv, index))
	131	+ return -1;
	132	+
	133	+ ie->ie_length = 0;
	134	+ memcpy(&priv->mgmt_ie[index], ie,
	135	+ sizeof(struct mwifiex_ie));
	136	+ }
	137	+
	138	+ le16_add_cpu(&ie_list->len,
	139	+ le16_to_cpu(priv->mgmt_ie[index].ie_length) +
	140	+ MWIFIEX_IE_HDR_SIZE);
	141	+ }
	142	+
	143	+ if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP)
	144	+ return mwifiex_send_cmd_async(priv, HostCmd_CMD_UAP_SYS_CONFIG,
	145	+ HostCmd_ACT_GEN_SET,
	146	+ UAP_CUSTOM_IE_I, ie_list);
	147	+
	148	+ return 0;
	149	+}
	150	+
	151	+/* Copy individual custom IEs for beacon, probe response and assoc response
	152	+ * and prepare single structure for IE setting.
	153	+ * This function also updates allocated IE indices from driver.
	154	+ */
	155	+static int
	156	+mwifiex_update_uap_custom_ie(struct mwifiex_private *priv,
	157	+ struct mwifiex_ie beacon_ie, u16 beacon_idx,
	158	+ struct mwifiex_ie pr_ie, u16 probe_idx,
	159	+ struct mwifiex_ie ar_ie, u16 assoc_idx)
	160	+{
	161	+ struct mwifiex_ie_list *ap_custom_ie;
	162	+ u8 *pos;
	163	+ u16 len;
	164	+ int ret;
	165	+
	166	+ ap_custom_ie = kzalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
	167	+ if (!ap_custom_ie)
	168	+ return -ENOMEM;
	169	+
	170	+ ap_custom_ie->type = cpu_to_le16(TLV_TYPE_MGMT_IE);
	171	+ pos = (u8 *)ap_custom_ie->ie_list;
	172	+
	173	+ if (beacon_ie) {
	174	+ len = sizeof(struct mwifiex_ie) - IEEE_MAX_IE_SIZE +
	175	+ le16_to_cpu(beacon_ie->ie_length);
	176	+ memcpy(pos, beacon_ie, len);
	177	+ pos += len;
	178	+ le16_add_cpu(&ap_custom_ie->len, len);
	179	+ }
	180	+ if (pr_ie) {
	181	+ len = sizeof(struct mwifiex_ie) - IEEE_MAX_IE_SIZE +
	182	+ le16_to_cpu(pr_ie->ie_length);
	183	+ memcpy(pos, pr_ie, len);
	184	+ pos += len;
	185	+ le16_add_cpu(&ap_custom_ie->len, len);
	186	+ }
	187	+ if (ar_ie) {
	188	+ len = sizeof(struct mwifiex_ie) - IEEE_MAX_IE_SIZE +
	189	+ le16_to_cpu(ar_ie->ie_length);
	190	+ memcpy(pos, ar_ie, len);
	191	+ pos += len;
	192	+ le16_add_cpu(&ap_custom_ie->len, len);
	193	+ }
	194	+
	195	+ ret = mwifiex_update_autoindex_ies(priv, ap_custom_ie);
	196	+
	197	+ pos = (u8 *)(&ap_custom_ie->ie_list[0].ie_index);
	198	+ if (beacon_ie && *beacon_idx == MWIFIEX_AUTO_IDX_MASK) {
	199	+ /* save beacon ie index after auto-indexing */
	200	+ *beacon_idx = le16_to_cpu(ap_custom_ie->ie_list[0].ie_index);
	201	+ len = sizeof(*beacon_ie) - IEEE_MAX_IE_SIZE +
	202	+ le16_to_cpu(beacon_ie->ie_length);
	203	+ pos += len;
	204	+ }
	205	+ if (pr_ie && le16_to_cpu(pr_ie->ie_index) == MWIFIEX_AUTO_IDX_MASK) {
	206	+ /* save probe resp ie index after auto-indexing */
	207	+ probe_idx = ((u16 *)pos);
	208	+ len = sizeof(*pr_ie) - IEEE_MAX_IE_SIZE +
	209	+ le16_to_cpu(pr_ie->ie_length);
	210	+ pos += len;
	211	+ }
	212	+ if (ar_ie && le16_to_cpu(ar_ie->ie_index) == MWIFIEX_AUTO_IDX_MASK)
	213	+ /* save assoc resp ie index after auto-indexing */
	214	+ assoc_idx = ((u16 *)pos);
	215	+
	216	+ return ret;
	217	+}
	218	+
	219	+/* This function parses different IEs- Tail IEs, beacon IEs, probe response IEs,
	220	+ * association response IEs from cfg80211_ap_settings function and sets these IE
	221	+ * to FW.
	222	+ */
	223	+int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
	224	+ struct cfg80211_ap_settings *params)
	225	+{
	226	+ struct mwifiex_ie beacon_ie = NULL, pr_ie = NULL;
	227	+ struct mwifiex_ie ar_ie = NULL, rsn_ie = NULL;
	228	+ struct ieee_types_header *ie = NULL;
	229	+ u16 beacon_idx = MWIFIEX_AUTO_IDX_MASK, pr_idx = MWIFIEX_AUTO_IDX_MASK;
	230	+ u16 ar_idx = MWIFIEX_AUTO_IDX_MASK, rsn_idx = MWIFIEX_AUTO_IDX_MASK;
	231	+ u16 mask;
	232	+ int ret = 0;
	233	+
	234	+ if (params->beacon.tail && params->beacon.tail_len) {
	235	+ ie = (void *)cfg80211_find_ie(WLAN_EID_RSN, params->beacon.tail,
	236	+ params->beacon.tail_len);
	237	+ if (ie) {
	238	+ rsn_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
	239	+ if (!rsn_ie)
	240	+ return -ENOMEM;
	241	+
	242	+ rsn_ie->ie_index = cpu_to_le16(rsn_idx);
	243	+ mask = MGMT_MASK_BEACON \| MGMT_MASK_PROBE_RESP \|
	244	+ MGMT_MASK_ASSOC_RESP;
	245	+ rsn_ie->mgmt_subtype_mask = cpu_to_le16(mask);
	246	+ rsn_ie->ie_length = cpu_to_le16(ie->len + 2);
	247	+ memcpy(rsn_ie->ie_buffer, ie, ie->len + 2);
	248	+
	249	+ if (mwifiex_update_uap_custom_ie(priv, rsn_ie, &rsn_idx,
	250	+ NULL, NULL,
	251	+ NULL, NULL)) {
	252	+ ret = -1;
	253	+ goto done;
	254	+ }
	255	+
	256	+ priv->rsn_idx = rsn_idx;
	257	+ }
	258	+ }
	259	+
	260	+ if (params->beacon.beacon_ies && params->beacon.beacon_ies_len) {
	261	+ beacon_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
	262	+ if (!beacon_ie) {
	263	+ ret = -ENOMEM;
	264	+ goto done;
	265	+ }
	266	+
	267	+ beacon_ie->ie_index = cpu_to_le16(beacon_idx);
	268	+ beacon_ie->mgmt_subtype_mask = cpu_to_le16(MGMT_MASK_BEACON);
	269	+ beacon_ie->ie_length =
	270	+ cpu_to_le16(params->beacon.beacon_ies_len);
	271	+ memcpy(beacon_ie->ie_buffer, params->beacon.beacon_ies,
	272	+ params->beacon.beacon_ies_len);
	273	+ }
	274	+
	275	+ if (params->beacon.proberesp_ies && params->beacon.proberesp_ies_len) {
	276	+ pr_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
	277	+ if (!pr_ie) {
	278	+ ret = -ENOMEM;
	279	+ goto done;
	280	+ }
	281	+
	282	+ pr_ie->ie_index = cpu_to_le16(pr_idx);
	283	+ pr_ie->mgmt_subtype_mask = cpu_to_le16(MGMT_MASK_PROBE_RESP);
	284	+ pr_ie->ie_length =
	285	+ cpu_to_le16(params->beacon.proberesp_ies_len);
	286	+ memcpy(pr_ie->ie_buffer, params->beacon.proberesp_ies,
	287	+ params->beacon.proberesp_ies_len);
	288	+ }
	289	+
	290	+ if (params->beacon.assocresp_ies && params->beacon.assocresp_ies_len) {
	291	+ ar_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
	292	+ if (!ar_ie) {
	293	+ ret = -ENOMEM;
	294	+ goto done;
	295	+ }
	296	+
	297	+ ar_ie->ie_index = cpu_to_le16(ar_idx);
	298	+ mask = MGMT_MASK_ASSOC_RESP \| MGMT_MASK_REASSOC_RESP;
	299	+ ar_ie->mgmt_subtype_mask = cpu_to_le16(mask);
	300	+ ar_ie->ie_length =
	301	+ cpu_to_le16(params->beacon.assocresp_ies_len);
	302	+ memcpy(ar_ie->ie_buffer, params->beacon.assocresp_ies,
	303	+ params->beacon.assocresp_ies_len);
	304	+ }
	305	+
	306	+ if (beacon_ie \|\| pr_ie \|\| ar_ie) {
	307	+ ret = mwifiex_update_uap_custom_ie(priv, beacon_ie,
	308	+ &beacon_idx, pr_ie,
	309	+ &pr_idx, ar_ie, &ar_idx);
	310	+ if (ret)
	311	+ goto done;
	312	+ }
	313	+
	314	+ priv->beacon_idx = beacon_idx;
	315	+ priv->proberesp_idx = pr_idx;
	316	+ priv->assocresp_idx = ar_idx;
	317	+
	318	+done:
	319	+ kfree(beacon_ie);
	320	+ kfree(pr_ie);
	321	+ kfree(ar_ie);
	322	+ kfree(rsn_ie);
	323	+
	324	+ return ret;
	325	+}
	326	+
	327	+/* This function removes management IE set */
	328	+int mwifiex_del_mgmt_ies(struct mwifiex_private *priv)
	329	+{
	330	+ struct mwifiex_ie beacon_ie = NULL, pr_ie = NULL;
	331	+ struct mwifiex_ie ar_ie = NULL, rsn_ie = NULL;
	332	+ int ret = 0;
	333	+
	334	+ if (priv->rsn_idx != MWIFIEX_AUTO_IDX_MASK) {
	335	+ rsn_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
	336	+ if (!rsn_ie)
	337	+ return -ENOMEM;
	338	+
	339	+ rsn_ie->ie_index = cpu_to_le16(priv->rsn_idx);
	340	+ rsn_ie->mgmt_subtype_mask = cpu_to_le16(MWIFIEX_DELETE_MASK);
	341	+ rsn_ie->ie_length = 0;
	342	+ if (mwifiex_update_uap_custom_ie(priv, rsn_ie, &priv->rsn_idx,
	343	+ NULL, &priv->proberesp_idx,
	344	+ NULL, &priv->assocresp_idx)) {
	345	+ ret = -1;
	346	+ goto done;
	347	+ }
	348	+
	349	+ priv->rsn_idx = MWIFIEX_AUTO_IDX_MASK;
	350	+ }
	351	+
	352	+ if (priv->beacon_idx != MWIFIEX_AUTO_IDX_MASK) {
	353	+ beacon_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
	354	+ if (!beacon_ie) {
	355	+ ret = -ENOMEM;
	356	+ goto done;
	357	+ }
	358	+ beacon_ie->ie_index = cpu_to_le16(priv->beacon_idx);
	359	+ beacon_ie->mgmt_subtype_mask = cpu_to_le16(MWIFIEX_DELETE_MASK);
	360	+ beacon_ie->ie_length = 0;
	361	+ }
	362	+ if (priv->proberesp_idx != MWIFIEX_AUTO_IDX_MASK) {
	363	+ pr_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
	364	+ if (!pr_ie) {
	365	+ ret = -ENOMEM;
	366	+ goto done;
	367	+ }
	368	+ pr_ie->ie_index = cpu_to_le16(priv->proberesp_idx);
	369	+ pr_ie->mgmt_subtype_mask = cpu_to_le16(MWIFIEX_DELETE_MASK);
	370	+ pr_ie->ie_length = 0;
	371	+ }
	372	+ if (priv->assocresp_idx != MWIFIEX_AUTO_IDX_MASK) {
	373	+ ar_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
	374	+ if (!ar_ie) {
	375	+ ret = -ENOMEM;
	376	+ goto done;
	377	+ }
	378	+ ar_ie->ie_index = cpu_to_le16(priv->assocresp_idx);
	379	+ ar_ie->mgmt_subtype_mask = cpu_to_le16(MWIFIEX_DELETE_MASK);
	380	+ ar_ie->ie_length = 0;
	381	+ }
	382	+
	383	+ if (beacon_ie \|\| pr_ie \|\| ar_ie)
	384	+ ret = mwifiex_update_uap_custom_ie(priv,
	385	+ beacon_ie, &priv->beacon_idx,
	386	+ pr_ie, &priv->proberesp_idx,
	387	+ ar_ie, &priv->assocresp_idx);
	388	+
	389	+done:
	390	+ kfree(beacon_ie);
	391	+ kfree(pr_ie);
	392	+ kfree(ar_ie);
	393	+ kfree(rsn_ie);
	394	+
	395	+ return ret;
	396	+}

drivers/net/wireless/mwifiex/init.c+1−0

@@ -279,6 +279,7 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) · 278 unmodified lines
279	279	memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));
280	280	adapter->arp_filter_size = 0;
281	281	adapter->channel_type = NL80211_CHAN_HT20;
	282	+ adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX;
282	283	}
283	284
284	285	/*

drivers/net/wireless/mwifiex/ioctl.h+32−0

@@ -62,6 +62,36 @@ enum { · 61 unmodified lines
62	62	BAND_AN = 16,
63	63	};
64	64
	65	+#define MWIFIEX_WPA_PASSHPHRASE_LEN 64
	66	+struct wpa_param {
	67	+ u8 pairwise_cipher_wpa;
	68	+ u8 pairwise_cipher_wpa2;
	69	+ u8 group_cipher;
	70	+ u32 length;
	71	+ u8 passphrase[MWIFIEX_WPA_PASSHPHRASE_LEN];
	72	+};
	73	+
	74	+#define KEY_MGMT_ON_HOST 0x03
	75	+#define MWIFIEX_AUTH_MODE_AUTO 0xFF
	76	+#define BAND_CONFIG_MANUAL 0x00
	77	+struct mwifiex_uap_bss_param {
	78	+ u8 channel;
	79	+ u8 band_cfg;
	80	+ u16 rts_threshold;
	81	+ u16 frag_threshold;
	82	+ u8 retry_limit;
	83	+ struct mwifiex_802_11_ssid ssid;
	84	+ u8 bcast_ssid_ctl;
	85	+ u8 radio_ctl;
	86	+ u8 dtim_period;
	87	+ u16 beacon_period;
	88	+ u16 auth_mode;
	89	+ u16 protocol;
	90	+ u16 key_mgmt;
	91	+ u16 key_mgmt_operation;
	92	+ struct wpa_param wpa_cfg;
	93	+};
	94	+
65	95	enum {
66	96	ADHOC_IDLE,
67	97	ADHOC_STARTED,
@@ -269,6 +299,8 @@ struct mwifiex_ds_read_eeprom { · 201 unmodified lines
269	299
270	300	#define IEEE_MAX_IE_SIZE 256
271	301
	302	+#define MWIFIEX_IE_HDR_SIZE (sizeof(struct mwifiex_ie) - IEEE_MAX_IE_SIZE)
	303	+
272	304	struct mwifiex_ds_misc_gen_ie {
273	305	u32 type;
274	306	u32 len;

drivers/net/wireless/mwifiex/join.c+16−10

@@ -1374,22 +1374,28 @@ static int mwifiex_deauthenticate_infra(struct mwifiex_private priv, u8 mac) · 1373 unmodified lines
1374	1374	*
1375	1375	* In case of infra made, it sends deauthentication request, and
1376	1376	* in case of ad-hoc mode, a stop network request is sent to the firmware.
	1377	+ * In AP mode, a command to stop bss is sent to firmware.
1377	1378	*/
1378	1379	int mwifiex_deauthenticate(struct mwifiex_private priv, u8 mac)
1379	1380	{
1380		− int ret = 0;
	1381	+ if (!priv->media_connected)
	1382	+ return 0;
1381	1383
1382		− if (priv->media_connected) {
1383		− if (priv->bss_mode == NL80211_IFTYPE_STATION) {
1384		− ret = mwifiex_deauthenticate_infra(priv, mac);
1385		− } else if (priv->bss_mode == NL80211_IFTYPE_ADHOC) {
1386		− ret = mwifiex_send_cmd_sync(priv,
1387		− HostCmd_CMD_802_11_AD_HOC_STOP,
1388		− HostCmd_ACT_GEN_SET, 0, NULL);
1389		− }
	1384	+ switch (priv->bss_mode) {
	1385	+ case NL80211_IFTYPE_STATION:
	1386	+ return mwifiex_deauthenticate_infra(priv, mac);
	1387	+ case NL80211_IFTYPE_ADHOC:
	1388	+ return mwifiex_send_cmd_sync(priv,
	1389	+ HostCmd_CMD_802_11_AD_HOC_STOP,
	1390	+ HostCmd_ACT_GEN_SET, 0, NULL);
	1391	+ case NL80211_IFTYPE_AP:
	1392	+ return mwifiex_send_cmd_sync(priv, HostCmd_CMD_UAP_BSS_STOP,
	1393	+ HostCmd_ACT_GEN_SET, 0, NULL);
	1394	+ default:
	1395	+ break;
1390	1396	}
1391	1397
1392		− return ret;
	1398	+ return 0;
1393	1399	}
1394	1400	EXPORT_SYMBOL_GPL(mwifiex_deauthenticate);
1395	1401

drivers/net/wireless/mwifiex/main.c+36−21

@@ -64,17 +64,17 @@ static int mwifiex_register(void card, struct mwifiex_if_ops if_ops, · 63 unmodified lines
64	64
65	65	adapter->priv_num = 0;
66	66
67		− /* Allocate memory for private structure */
68		− adapter->priv[0] = kzalloc(sizeof(struct mwifiex_private), GFP_KERNEL);
69		− if (!adapter->priv[0]) {
70		− dev_err(adapter->dev,
71		− "%s: failed to alloc priv[0]\n", __func__);
72		− goto error;
73		− }
74		−
75		− adapter->priv_num++;
	67	+ for (i = 0; i < MWIFIEX_MAX_BSS_NUM; i++) {
	68	+ /* Allocate memory for private structure */
	69	+ adapter->priv[i] =
	70	+ kzalloc(sizeof(struct mwifiex_private), GFP_KERNEL);
	71	+ if (!adapter->priv[i])
	72	+ goto error;
76	73
77		− adapter->priv[0]->adapter = adapter;
	74	+ adapter->priv[i]->adapter = adapter;
	75	+ adapter->priv[i]->bss_priority = i;
	76	+ adapter->priv_num++;
	77	+ }
78	78	mwifiex_init_lock_list(adapter);
79	79
80	80	init_timer(&adapter->cmd_timer);
@@ -349,19 +349,26 @@ static void mwifiex_fw_dpc(const struct firmware firmware, void context) · 268 unmodified lines
349	349	if (adapter->hw_status != MWIFIEX_HW_STATUS_READY)
350	350	goto done;
351	351
352		− priv = adapter->priv[0];
353		− if (mwifiex_register_cfg80211(priv) != 0) {
	352	+ priv = adapter->priv[MWIFIEX_BSS_ROLE_STA];
	353	+ if (mwifiex_register_cfg80211(adapter)) {
354	354	dev_err(adapter->dev, "cannot register with cfg80211\n");
355	355	goto err_init_fw;
356	356	}
357	357
358	358	rtnl_lock();
359	359	/* Create station interface by default */
360		− if (!mwifiex_add_virtual_intf(priv->wdev->wiphy, "mlan%d",
	360	+ if (!mwifiex_add_virtual_intf(adapter->wiphy, "mlan%d",
361	361	NL80211_IFTYPE_STATION, NULL, NULL)) {
362	362	dev_err(adapter->dev, "cannot create default STA interface\n");
363	363	goto err_add_intf;
364	364	}
	365	+
	366	+ /* Create AP interface by default */
	367	+ if (!mwifiex_add_virtual_intf(adapter->wiphy, "uap%d",
	368	+ NL80211_IFTYPE_AP, NULL, NULL)) {
	369	+ dev_err(adapter->dev, "cannot create default AP interface\n");
	370	+ goto err_add_intf;
	371	+ }
365	372	rtnl_unlock();
366	373
367	374	mwifiex_drv_get_driver_version(adapter, fmt, sizeof(fmt) - 1);
@@ -369,7 +376,7 @@ static void mwifiex_fw_dpc(const struct firmware firmware, void context) · 1 unmodified line
369	376	goto done;
370	377
371	378	err_add_intf:
372		− mwifiex_del_virtual_intf(priv->wdev->wiphy, priv->netdev);
	379	+ mwifiex_del_virtual_intf(adapter->wiphy, priv->netdev);
373	380	rtnl_unlock();
374	381	err_init_fw:
375	382	pr_debug("info: %s: unregister device\n", __func__);
@@ -633,6 +640,12 @@ void mwifiex_init_priv_params(struct mwifiex_private *priv, · 257 unmodified lines
633	640	priv->current_key_index = 0;
634	641	priv->media_connected = false;
635	642	memset(&priv->nick_name, 0, sizeof(priv->nick_name));
	643	+ memset(priv->mgmt_ie, 0,
	644	+ sizeof(struct mwifiex_ie) * MAX_MGMT_IE_INDEX);
	645	+ priv->beacon_idx = MWIFIEX_AUTO_IDX_MASK;
	646	+ priv->proberesp_idx = MWIFIEX_AUTO_IDX_MASK;
	647	+ priv->assocresp_idx = MWIFIEX_AUTO_IDX_MASK;
	648	+ priv->rsn_idx = MWIFIEX_AUTO_IDX_MASK;
636	649	priv->num_tx_timeout = 0;
637	650	memcpy(dev->dev_addr, priv->curr_addr, ETH_ALEN);
638	651	}
@@ -830,19 +843,21 @@ int mwifiex_remove_card(struct mwifiex_adapter adapter, struct semaphore sem) · 191 unmodified lines
830	843
831	844	rtnl_lock();
832	845	if (priv->wdev && priv->netdev)
833		− mwifiex_del_virtual_intf(priv->wdev->wiphy,
834		− priv->netdev);
	846	+ mwifiex_del_virtual_intf(adapter->wiphy, priv->netdev);
835	847	rtnl_unlock();
836	848	}
837	849
838	850	priv = adapter->priv[0];
839		− if (!priv)
	851	+ if (!priv \|\| !priv->wdev)
840	852	goto exit_remove;
841	853
842		− if (priv->wdev) {
843		− wiphy_unregister(priv->wdev->wiphy);
844		− wiphy_free(priv->wdev->wiphy);
845		− kfree(priv->wdev);
	854	+ wiphy_unregister(priv->wdev->wiphy);
	855	+ wiphy_free(priv->wdev->wiphy);
	856	+
	857	+ for (i = 0; i < adapter->priv_num; i++) {
	858	+ priv = adapter->priv[i];
	859	+ if (priv)
	860	+ kfree(priv->wdev);
846	861	}
847	862
848	863	mwifiex_terminate_workqueue(adapter);

drivers/net/wireless/mwifiex/main.h+24−2

@@ -116,6 +116,7 @@ enum { · 115 unmodified lines
116	116	#define MAX_FREQUENCY_BAND_BG 2484
117	117
118	118	#define MWIFIEX_EVENT_HEADER_LEN 4
	119	+#define MWIFIEX_UAP_EVENT_EXTRA_HEADER 2
119	120
120	121	#define MWIFIEX_TYPE_LEN 4
121	122	#define MWIFIEX_USB_TYPE_CMD 0xF00DFACE
@@ -370,6 +371,7 @@ struct mwifiex_private { · 248 unmodified lines
370	371	u8 bss_role;
371	372	u8 bss_priority;
372	373	u8 bss_num;
	374	+ u8 bss_started;
373	375	u8 frame_type;
374	376	u8 curr_addr[ETH_ALEN];
375	377	u8 media_connected;
@@ -470,12 +472,16 @@ struct mwifiex_private { · 94 unmodified lines
470	472	struct cfg80211_scan_request *scan_request;
471	473	struct mwifiex_user_scan_cfg *user_scan_cfg;
472	474	u8 cfg_bssid[6];
473		− u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
474	475	struct wps wps;
475	476	u8 scan_block;
476	477	s32 cqm_rssi_thold;
477	478	u32 cqm_rssi_hyst;
478	479	u8 subsc_evt_rssi_state;
	480	+ struct mwifiex_ie mgmt_ie[MAX_MGMT_IE_INDEX];
	481	+ u16 beacon_idx;
	482	+ u16 proberesp_idx;
	483	+ u16 assocresp_idx;
	484	+ u16 rsn_idx;
479	485	};
480	486
481	487	enum mwifiex_ba_status {
@@ -571,6 +577,7 @@ struct mwifiex_adapter { · 89 unmodified lines
571	577	char fw_name[32];
572	578	int winner;
573	579	struct device *dev;
	580	+ struct wiphy *wiphy;
574	581	bool surprise_removed;
575	582	u32 fw_release_number;
576	583	u16 init_wait_q_woken;
@@ -677,6 +684,8 @@ struct mwifiex_adapter { · 100 unmodified lines
677	684	struct cmd_ctrl_node *cmd_queued;
678	685	spinlock_t queue_lock; /* lock for tx queues */
679	686	struct completion fw_load;
	687	+ u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
	688	+ u16 max_mgmt_ie_index;
680	689	};
681	690
682	691	int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);
@@ -760,6 +769,9 @@ int mwifiex_process_rx_packet(struct mwifiex_adapter *adapter, · 77 unmodified lines
760	769	int mwifiex_sta_prepare_cmd(struct mwifiex_private *, uint16_t cmd_no,
761	770	u16 cmd_action, u32 cmd_oid,
762	771	void data_buf, void cmd_buf);
	772	+int mwifiex_uap_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
	773	+ u16 cmd_action, u32 cmd_oid,
	774	+ void data_buf, void cmd_buf);
763	775	int mwifiex_process_sta_cmdresp(struct mwifiex_private *, u16 cmdresp_no,
764	776	struct host_cmd_ds_command *resp);
765	777	int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *,
@@ -820,6 +832,9 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv, · 54 unmodified lines
820	832	int is_command_pending(struct mwifiex_adapter *adapter);
821	833	void mwifiex_init_priv_params(struct mwifiex_private *priv,
822	834	struct net_device *dev);
	835	+int mwifiex_set_secure_params(struct mwifiex_private *priv,
	836	+ struct mwifiex_uap_bss_param *bss_config,
	837	+ struct cfg80211_ap_settings *params);
823	838
824	839	/*
825	840	* This function checks if the queuing is RA based or not.
@@ -933,7 +948,8 @@ int mwifiex_set_radio(struct mwifiex_private *priv, u8 option); · 107 unmodified lines
933	948	int mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, u16 channel);
934	949
935	950	int mwifiex_set_encode(struct mwifiex_private priv, const u8 key,
936		− int key_len, u8 key_index, int disable);
	951	+ int key_len, u8 key_index, const u8 *mac_addr,
	952	+ int disable);
937	953
938	954	int mwifiex_set_gen_ie(struct mwifiex_private priv, u8 ie, int ie_len);
939	955
@@ -969,6 +985,7 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv, · 29 unmodified lines
969	985
970	986	int mwifiex_main_process(struct mwifiex_adapter *);
971	987
	988	+int mwifiex_uap_set_channel(struct mwifiex_private *priv, int channel);
972	989	int mwifiex_bss_set_channel(struct mwifiex_private *,
973	990	struct mwifiex_chan_freq_power *cfp);
974	991	int mwifiex_get_bss_info(struct mwifiex_private *,
@@ -986,6 +1003,11 @@ struct net_device mwifiex_add_virtual_intf(struct wiphy wiphy, · 11 unmodified lines
986	1003	u32 flags, struct vif_params params);
987	1004	int mwifiex_del_virtual_intf(struct wiphy wiphy, struct net_device dev);
988	1005
	1006	+void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config);
	1007	+
	1008	+int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
	1009	+ struct cfg80211_ap_settings *params);
	1010	+int mwifiex_del_mgmt_ies(struct mwifiex_private *priv);
989	1011	u8 *mwifiex_11d_code_2_region(u8 code);
990	1012
991	1013	#ifdef CONFIG_DEBUG_FS

drivers/net/wireless/mwifiex/sta_cmd.c+47−22

@@ -498,7 +498,8 @@ mwifiex_cmd_802_11_key_material(struct mwifiex_private *priv, · 497 unmodified lines
498	498	{
499	499	struct host_cmd_ds_802_11_key_material *key_material =
500	500	&cmd->params.key_material;
501		− u16 key_param_len = 0;
	501	+ struct host_cmd_tlv_mac_addr *tlv_mac;
	502	+ u16 key_param_len = 0, cmd_size;
502	503	int ret = 0;
503	504	const u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
504	505
@@ -614,11 +615,26 @@ mwifiex_cmd_802_11_key_material(struct mwifiex_private *priv, · 109 unmodified lines
614	615	cpu_to_le16((u16) enc_key->key_len +
615	616	KEYPARAMSET_FIXED_LEN);
616	617
617		− key_param_len = (u16) (enc_key->key_len + KEYPARAMSET_FIXED_LEN)
	618	+ key_param_len = (u16)(enc_key->key_len + KEYPARAMSET_FIXED_LEN)
618	619	+ sizeof(struct mwifiex_ie_types_header);
619	620
620	621	cmd->size = cpu_to_le16(sizeof(key_material->action) + S_DS_GEN
621	622	+ key_param_len);
	623	+
	624	+ if (priv->bss_type == MWIFIEX_BSS_TYPE_UAP) {
	625	+ tlv_mac = (void )((u8 )&key_material->key_param_set +
	626	+ key_param_len);
	627	+ tlv_mac->tlv.type = cpu_to_le16(TLV_TYPE_STA_MAC_ADDR);
	628	+ tlv_mac->tlv.len = cpu_to_le16(ETH_ALEN);
	629	+ memcpy(tlv_mac->mac_addr, enc_key->mac_addr, ETH_ALEN);
	630	+ cmd_size = key_param_len + S_DS_GEN +
	631	+ sizeof(key_material->action) +
	632	+ sizeof(struct host_cmd_tlv_mac_addr);
	633	+ } else {
	634	+ cmd_size = key_param_len + S_DS_GEN +
	635	+ sizeof(key_material->action);
	636	+ }
	637	+ cmd->size = cpu_to_le16(cmd_size);
622	638	}
623	639
624	640	return ret;
@@ -1248,13 +1264,15 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta) · 623 unmodified lines
1248	1264	if (ret)
1249	1265	return -1;
1250	1266
1251		− /* Enable IEEE PS by default */
1252		− priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
1253		− ret = mwifiex_send_cmd_async(priv,
1254		− HostCmd_CMD_802_11_PS_MODE_ENH,
1255		− EN_AUTO_PS, BITMAP_STA_PS, NULL);
1256		− if (ret)
1257		− return -1;
	1267	+ if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
	1268	+ /* Enable IEEE PS by default */
	1269	+ priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
	1270	+ ret = mwifiex_send_cmd_async(
	1271	+ priv, HostCmd_CMD_802_11_PS_MODE_ENH,
	1272	+ EN_AUTO_PS, BITMAP_STA_PS, NULL);
	1273	+ if (ret)
	1274	+ return -1;
	1275	+ }
1258	1276	}
1259	1277
1260	1278	/* get tx rate */
@@ -1270,12 +1288,14 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta) · 9 unmodified lines
1270	1288	if (ret)
1271	1289	return -1;
1272	1290
1273		− /* set ibss coalescing_status */
1274		− ret = mwifiex_send_cmd_async(priv,
1275		− HostCmd_CMD_802_11_IBSS_COALESCING_STATUS,
1276		− HostCmd_ACT_GEN_SET, 0, &enable);
1277		− if (ret)
1278		− return -1;
	1291	+ if (priv->bss_type == MWIFIEX_BSS_TYPE_STA) {
	1292	+ /* set ibss coalescing_status */
	1293	+ ret = mwifiex_send_cmd_async(
	1294	+ priv, HostCmd_CMD_802_11_IBSS_COALESCING_STATUS,
	1295	+ HostCmd_ACT_GEN_SET, 0, &enable);
	1296	+ if (ret)
	1297	+ return -1;
	1298	+ }
1279	1299
1280	1300	memset(&amsdu_aggr_ctrl, 0, sizeof(amsdu_aggr_ctrl));
1281	1301	amsdu_aggr_ctrl.enable = true;
@@ -1293,7 +1313,8 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta) · 11 unmodified lines
1293	1313	if (ret)
1294	1314	return -1;
1295	1315
1296		− if (first_sta && (priv->adapter->iface_type != MWIFIEX_USB)) {
	1316	+ if (first_sta && priv->adapter->iface_type != MWIFIEX_USB &&
	1317	+ priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
1297	1318	/* Enable auto deep sleep */
1298	1319	auto_ds.auto_ds = DEEP_SLEEP_ON;
1299	1320	auto_ds.idle_time = DEEP_SLEEP_IDLE_TIME;
@@ -1305,12 +1326,16 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta) · 5 unmodified lines
1305	1326	return -1;
1306	1327	}
1307	1328
1308		− /* Send cmd to FW to enable/disable 11D function */
1309		− state_11d = ENABLE_11D;
1310		− ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_802_11_SNMP_MIB,
1311		− HostCmd_ACT_GEN_SET, DOT11D_I, &state_11d);
1312		− if (ret)
1313		− dev_err(priv->adapter->dev, "11D: failed to enable 11D\n");
	1329	+ if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP) {
	1330	+ /* Send cmd to FW to enable/disable 11D function */
	1331	+ state_11d = ENABLE_11D;
	1332	+ ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_802_11_SNMP_MIB,
	1333	+ HostCmd_ACT_GEN_SET, DOT11D_I,
	1334	+ &state_11d);
	1335	+ if (ret)
	1336	+ dev_err(priv->adapter->dev,
	1337	+ "11D: failed to enable 11D\n");
	1338	+ }
1314	1339
1315	1340	/* Send cmd to FW to configure 11n specific configuration
1316	1341	* (Short GI, Channel BW, Green field support etc.) for transmit

drivers/net/wireless/mwifiex/sta_cmdresp.c+8−0

@@ -944,6 +944,14 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no, · 943 unmodified lines
944	944	case HostCmd_CMD_802_11_SUBSCRIBE_EVENT:
945	945	ret = mwifiex_ret_subsc_evt(priv, resp, data_buf);
946	946	break;
	947	+ case HostCmd_CMD_UAP_SYS_CONFIG:
	948	+ break;
	949	+ case HostCmd_CMD_UAP_BSS_START:
	950	+ priv->bss_started = 1;
	951	+ break;
	952	+ case HostCmd_CMD_UAP_BSS_STOP:
	953	+ priv->bss_started = 0;
	954	+ break;
947	955	default:
948	956	dev_err(adapter->dev, "CMD_RESP: unknown cmd response %#x\n",
949	957	resp->command);

drivers/net/wireless/mwifiex/sta_event.c+50−1

@@ -184,8 +184,10 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv) · 183 unmodified lines
184	184	int mwifiex_process_sta_event(struct mwifiex_private *priv)
185	185	{
186	186	struct mwifiex_adapter *adapter = priv->adapter;
187		− int ret = 0;
	187	+ int len, ret = 0;
188	188	u32 eventcause = adapter->event_cause;
	189	+ struct station_info sinfo;
	190	+ struct mwifiex_assoc_event *event;
189	191
190	192	switch (eventcause) {
191	193	case EVENT_DUMMY_HOST_WAKEUP_SIGNAL:
@@ -402,6 +404,53 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) · 210 unmodified lines
402	404	case EVENT_HOSTWAKE_STAIE:
403	405	dev_dbg(adapter->dev, "event: HOSTWAKE_STAIE %d\n", eventcause);
404	406	break;
	407	+
	408	+ case EVENT_UAP_STA_ASSOC:
	409	+ skb_pull(adapter->event_skb, MWIFIEX_UAP_EVENT_EXTRA_HEADER);
	410	+ memset(&sinfo, 0, sizeof(sinfo));
	411	+ event = (struct mwifiex_assoc_event *)adapter->event_skb->data;
	412	+ if (le16_to_cpu(event->type) == TLV_TYPE_UAP_MGMT_FRAME) {
	413	+ len = -1;
	414	+
	415	+ if (ieee80211_is_assoc_req(event->frame_control))
	416	+ len = 0;
	417	+ else if (ieee80211_is_reassoc_req(event->frame_control))
	418	+ /* There will be ETH_ALEN bytes of
	419	+ * current_ap_addr before the re-assoc ies.
	420	+ */
	421	+ len = ETH_ALEN;
	422	+
	423	+ if (len != -1) {
	424	+ sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
	425	+ sinfo.assoc_req_ies = (u8 *)&event->data[len];
	426	+ len = (u8 *)sinfo.assoc_req_ies -
	427	+ (u8 *)&event->frame_control;
	428	+ sinfo.assoc_req_ies_len =
	429	+ le16_to_cpu(event->len) - (u16)len;
	430	+ }
	431	+ }
	432	+ cfg80211_new_sta(priv->netdev, event->sta_addr, &sinfo,
	433	+ GFP_KERNEL);
	434	+ break;
	435	+ case EVENT_UAP_STA_DEAUTH:
	436	+ skb_pull(adapter->event_skb, MWIFIEX_UAP_EVENT_EXTRA_HEADER);
	437	+ cfg80211_del_sta(priv->netdev, adapter->event_skb->data,
	438	+ GFP_KERNEL);
	439	+ break;
	440	+ case EVENT_UAP_BSS_IDLE:
	441	+ priv->media_connected = false;
	442	+ break;
	443	+ case EVENT_UAP_BSS_ACTIVE:
	444	+ priv->media_connected = true;
	445	+ break;
	446	+ case EVENT_UAP_BSS_START:
	447	+ dev_dbg(adapter->dev, "AP EVENT: event id: %#x\n", eventcause);
	448	+ memcpy(priv->netdev->dev_addr, adapter->event_body+2, ETH_ALEN);
	449	+ break;
	450	+ case EVENT_UAP_MIC_COUNTERMEASURES:
	451	+ /* For future development */
	452	+ dev_dbg(adapter->dev, "AP EVENT: event id: %#x\n", eventcause);
	453	+ break;
405	454	default:
406	455	dev_dbg(adapter->dev, "event: unknown event id: %#x\n",
407	456	eventcause);

drivers/net/wireless/mwifiex/sta_ioctl.c+7−2

@@ -462,7 +462,7 @@ int mwifiex_get_bss_info(struct mwifiex_private *priv, · 461 unmodified lines
462	462
463	463	info->bss_chan = bss_desc->channel;
464	464
465		− memcpy(info->country_code, priv->country_code,
	465	+ memcpy(info->country_code, adapter->country_code,
466	466	IEEE80211_COUNTRY_STRING_LEN);
467	467
468	468	info->media_connected = priv->media_connected;
@@ -1219,7 +1219,8 @@ mwifiex_drv_get_driver_version(struct mwifiex_adapter adapter, char version, · 750 unmodified lines
1219	1219	* with requisite parameters and calls the IOCTL handler.
1220	1220	*/
1221	1221	int mwifiex_set_encode(struct mwifiex_private priv, const u8 key,
1222		− int key_len, u8 key_index, int disable)
	1222	+ int key_len, u8 key_index,
	1223	+ const u8 *mac_addr, int disable)
1223	1224	{
1224	1225	struct mwifiex_ds_encrypt_key encrypt_key;
1225	1226
@@ -1229,8 +1230,12 @@ int mwifiex_set_encode(struct mwifiex_private priv, const u8 key, · 3 unmodified lines
1229	1230	encrypt_key.key_index = key_index;
1230	1231	if (key_len)
1231	1232	memcpy(encrypt_key.key_material, key, key_len);
	1233	+ if (mac_addr)
	1234	+ memcpy(encrypt_key.mac_addr, mac_addr, ETH_ALEN);
1232	1235	} else {
1233	1236	encrypt_key.key_disable = true;
	1237	+ if (mac_addr)
	1238	+ memcpy(encrypt_key.mac_addr, mac_addr, ETH_ALEN);
1234	1239	}
1235	1240
1236	1241	return mwifiex_sec_ioctl_encrypt_key(priv, &encrypt_key);

drivers/net/wireless/mwifiex/uap_cmd.c+432−0

@@ -0,0 +1,432 @@
	1	+/*
	2	+ * Marvell Wireless LAN device driver: AP specific command handling
	3	+ *
	4	+ * Copyright (C) 2012, Marvell International Ltd.
	5	+ *
	6	+ * This software file (the "File") is distributed by Marvell International
	7	+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
	8	+ * (the "License"). You may use, redistribute and/or modify this File in
	9	+ * accordance with the terms and conditions of the License, a copy of which
	10	+ * is available by writing to the Free Software Foundation, Inc.,
	11	+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
	12	+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
	13	+ *
	14	+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
	15	+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
	16	+ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
	17	+ * this warranty disclaimer.
	18	+ */
	19	+
	20	+#include "main.h"
	21	+
	22	+/* This function parses security related parameters from cfg80211_ap_settings
	23	+ * and sets into FW understandable bss_config structure.
	24	+ */
	25	+int mwifiex_set_secure_params(struct mwifiex_private *priv,
	26	+ struct mwifiex_uap_bss_param *bss_config,
	27	+ struct cfg80211_ap_settings *params) {
	28	+ int i;
	29	+
	30	+ switch (params->auth_type) {
	31	+ case NL80211_AUTHTYPE_OPEN_SYSTEM:
	32	+ bss_config->auth_mode = WLAN_AUTH_OPEN;
	33	+ break;
	34	+ case NL80211_AUTHTYPE_SHARED_KEY:
	35	+ bss_config->auth_mode = WLAN_AUTH_SHARED_KEY;
	36	+ break;
	37	+ case NL80211_AUTHTYPE_NETWORK_EAP:
	38	+ bss_config->auth_mode = WLAN_AUTH_LEAP;
	39	+ break;
	40	+ default:
	41	+ bss_config->auth_mode = MWIFIEX_AUTH_MODE_AUTO;
	42	+ break;
	43	+ }
	44	+
	45	+ bss_config->key_mgmt_operation \|= KEY_MGMT_ON_HOST;
	46	+
	47	+ for (i = 0; i < params->crypto.n_akm_suites; i++) {
	48	+ switch (params->crypto.akm_suites[i]) {
	49	+ case WLAN_AKM_SUITE_8021X:
	50	+ if (params->crypto.wpa_versions &
	51	+ NL80211_WPA_VERSION_1) {
	52	+ bss_config->protocol = PROTOCOL_WPA;
	53	+ bss_config->key_mgmt = KEY_MGMT_EAP;
	54	+ }
	55	+ if (params->crypto.wpa_versions &
	56	+ NL80211_WPA_VERSION_2) {
	57	+ bss_config->protocol = PROTOCOL_WPA2;
	58	+ bss_config->key_mgmt = KEY_MGMT_EAP;
	59	+ }
	60	+ break;
	61	+ case WLAN_AKM_SUITE_PSK:
	62	+ if (params->crypto.wpa_versions &
	63	+ NL80211_WPA_VERSION_1) {
	64	+ bss_config->protocol = PROTOCOL_WPA;
	65	+ bss_config->key_mgmt = KEY_MGMT_PSK;
	66	+ }
	67	+ if (params->crypto.wpa_versions &
	68	+ NL80211_WPA_VERSION_2) {
	69	+ bss_config->protocol = PROTOCOL_WPA2;
	70	+ bss_config->key_mgmt = KEY_MGMT_PSK;
	71	+ }
	72	+ break;
	73	+ default:
	74	+ break;
	75	+ }
	76	+ }
	77	+ for (i = 0; i < params->crypto.n_ciphers_pairwise; i++) {
	78	+ switch (params->crypto.ciphers_pairwise[i]) {
	79	+ case WLAN_CIPHER_SUITE_WEP40:
	80	+ case WLAN_CIPHER_SUITE_WEP104:
	81	+ break;
	82	+ case WLAN_CIPHER_SUITE_TKIP:
	83	+ bss_config->wpa_cfg.pairwise_cipher_wpa = CIPHER_TKIP;
	84	+ break;
	85	+ case WLAN_CIPHER_SUITE_CCMP:
	86	+ bss_config->wpa_cfg.pairwise_cipher_wpa2 =
	87	+ CIPHER_AES_CCMP;
	88	+ default:
	89	+ break;
	90	+ }
	91	+ }
	92	+
	93	+ switch (params->crypto.cipher_group) {
	94	+ case WLAN_CIPHER_SUITE_WEP40:
	95	+ case WLAN_CIPHER_SUITE_WEP104:
	96	+ break;
	97	+ case WLAN_CIPHER_SUITE_TKIP:
	98	+ bss_config->wpa_cfg.group_cipher = CIPHER_TKIP;
	99	+ break;
	100	+ case WLAN_CIPHER_SUITE_CCMP:
	101	+ bss_config->wpa_cfg.group_cipher = CIPHER_AES_CCMP;
	102	+ break;
	103	+ default:
	104	+ break;
	105	+ }
	106	+
	107	+ return 0;
	108	+}
	109	+
	110	+/* This function initializes some of mwifiex_uap_bss_param variables.
	111	+ * This helps FW in ignoring invalid values. These values may or may not
	112	+ * be get updated to valid ones at later stage.
	113	+ */
	114	+void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config)
	115	+{
	116	+ config->bcast_ssid_ctl = 0x7F;
	117	+ config->radio_ctl = 0x7F;
	118	+ config->dtim_period = 0x7F;
	119	+ config->beacon_period = 0x7FFF;
	120	+ config->auth_mode = 0x7F;
	121	+ config->rts_threshold = 0x7FFF;
	122	+ config->frag_threshold = 0x7FFF;
	123	+ config->retry_limit = 0x7F;
	124	+}
	125	+
	126	+/* This function parses BSS related parameters from structure
	127	+ * and prepares TLVs. These TLVs are appended to command buffer.
	128	+*/
	129	+static int
	130	+mwifiex_uap_bss_param_prepare(u8 tlv, void cmd_buf, u16 *param_size)
	131	+{
	132	+ struct host_cmd_tlv_dtim_period *dtim_period;
	133	+ struct host_cmd_tlv_beacon_period *beacon_period;
	134	+ struct host_cmd_tlv_ssid *ssid;
	135	+ struct host_cmd_tlv_channel_band *chan_band;
	136	+ struct host_cmd_tlv_frag_threshold *frag_threshold;
	137	+ struct host_cmd_tlv_rts_threshold *rts_threshold;
	138	+ struct host_cmd_tlv_retry_limit *retry_limit;
	139	+ struct host_cmd_tlv_pwk_cipher *pwk_cipher;
	140	+ struct host_cmd_tlv_gwk_cipher *gwk_cipher;
	141	+ struct host_cmd_tlv_encrypt_protocol *encrypt_protocol;
	142	+ struct host_cmd_tlv_auth_type *auth_type;
	143	+ struct host_cmd_tlv_passphrase *passphrase;
	144	+ struct host_cmd_tlv_akmp *tlv_akmp;
	145	+ struct mwifiex_uap_bss_param *bss_cfg = cmd_buf;
	146	+ u16 cmd_size = *param_size;
	147	+
	148	+ if (bss_cfg->ssid.ssid_len) {
	149	+ ssid = (struct host_cmd_tlv_ssid *)tlv;
	150	+ ssid->tlv.type = cpu_to_le16(TLV_TYPE_UAP_SSID);
	151	+ ssid->tlv.len = cpu_to_le16((u16)bss_cfg->ssid.ssid_len);
	152	+ memcpy(ssid->ssid, bss_cfg->ssid.ssid, bss_cfg->ssid.ssid_len);
	153	+ cmd_size += sizeof(struct host_cmd_tlv) +
	154	+ bss_cfg->ssid.ssid_len;
	155	+ tlv += sizeof(struct host_cmd_tlv) + bss_cfg->ssid.ssid_len;
	156	+ }
	157	+ if (bss_cfg->channel && bss_cfg->channel <= MAX_CHANNEL_BAND_BG) {
	158	+ chan_band = (struct host_cmd_tlv_channel_band *)tlv;
	159	+ chan_band->tlv.type = cpu_to_le16(TLV_TYPE_CHANNELBANDLIST);
	160	+ chan_band->tlv.len =
	161	+ cpu_to_le16(sizeof(struct host_cmd_tlv_channel_band) -
	162	+ sizeof(struct host_cmd_tlv));
	163	+ chan_band->band_config = bss_cfg->band_cfg;
	164	+ chan_band->channel = bss_cfg->channel;
	165	+ cmd_size += sizeof(struct host_cmd_tlv_channel_band);
	166	+ tlv += sizeof(struct host_cmd_tlv_channel_band);
	167	+ }
	168	+ if (bss_cfg->beacon_period >= MIN_BEACON_PERIOD &&
	169	+ bss_cfg->beacon_period <= MAX_BEACON_PERIOD) {
	170	+ beacon_period = (struct host_cmd_tlv_beacon_period *)tlv;
	171	+ beacon_period->tlv.type =
	172	+ cpu_to_le16(TLV_TYPE_UAP_BEACON_PERIOD);
	173	+ beacon_period->tlv.len =
	174	+ cpu_to_le16(sizeof(struct host_cmd_tlv_beacon_period) -
	175	+ sizeof(struct host_cmd_tlv));
	176	+ beacon_period->period = cpu_to_le16(bss_cfg->beacon_period);
	177	+ cmd_size += sizeof(struct host_cmd_tlv_beacon_period);
	178	+ tlv += sizeof(struct host_cmd_tlv_beacon_period);
	179	+ }
	180	+ if (bss_cfg->dtim_period >= MIN_DTIM_PERIOD &&
	181	+ bss_cfg->dtim_period <= MAX_DTIM_PERIOD) {
	182	+ dtim_period = (struct host_cmd_tlv_dtim_period *)tlv;
	183	+ dtim_period->tlv.type = cpu_to_le16(TLV_TYPE_UAP_DTIM_PERIOD);
	184	+ dtim_period->tlv.len =
	185	+ cpu_to_le16(sizeof(struct host_cmd_tlv_dtim_period) -
	186	+ sizeof(struct host_cmd_tlv));
	187	+ dtim_period->period = bss_cfg->dtim_period;
	188	+ cmd_size += sizeof(struct host_cmd_tlv_dtim_period);
	189	+ tlv += sizeof(struct host_cmd_tlv_dtim_period);
	190	+ }
	191	+ if (bss_cfg->rts_threshold <= MWIFIEX_RTS_MAX_VALUE) {
	192	+ rts_threshold = (struct host_cmd_tlv_rts_threshold *)tlv;
	193	+ rts_threshold->tlv.type =
	194	+ cpu_to_le16(TLV_TYPE_UAP_RTS_THRESHOLD);
	195	+ rts_threshold->tlv.len =
	196	+ cpu_to_le16(sizeof(struct host_cmd_tlv_rts_threshold) -
	197	+ sizeof(struct host_cmd_tlv));
	198	+ rts_threshold->rts_thr = cpu_to_le16(bss_cfg->rts_threshold);
	199	+ cmd_size += sizeof(struct host_cmd_tlv_frag_threshold);
	200	+ tlv += sizeof(struct host_cmd_tlv_frag_threshold);
	201	+ }
	202	+ if ((bss_cfg->frag_threshold >= MWIFIEX_FRAG_MIN_VALUE) &&
	203	+ (bss_cfg->frag_threshold <= MWIFIEX_FRAG_MAX_VALUE)) {
	204	+ frag_threshold = (struct host_cmd_tlv_frag_threshold *)tlv;
	205	+ frag_threshold->tlv.type =
	206	+ cpu_to_le16(TLV_TYPE_UAP_FRAG_THRESHOLD);
	207	+ frag_threshold->tlv.len =
	208	+ cpu_to_le16(sizeof(struct host_cmd_tlv_frag_threshold) -
	209	+ sizeof(struct host_cmd_tlv));
	210	+ frag_threshold->frag_thr = cpu_to_le16(bss_cfg->frag_threshold);
	211	+ cmd_size += sizeof(struct host_cmd_tlv_frag_threshold);
	212	+ tlv += sizeof(struct host_cmd_tlv_frag_threshold);
	213	+ }
	214	+ if (bss_cfg->retry_limit <= MWIFIEX_RETRY_LIMIT) {
	215	+ retry_limit = (struct host_cmd_tlv_retry_limit *)tlv;
	216	+ retry_limit->tlv.type = cpu_to_le16(TLV_TYPE_UAP_RETRY_LIMIT);
	217	+ retry_limit->tlv.len =
	218	+ cpu_to_le16(sizeof(struct host_cmd_tlv_retry_limit) -
	219	+ sizeof(struct host_cmd_tlv));
	220	+ retry_limit->limit = (u8)bss_cfg->retry_limit;
	221	+ cmd_size += sizeof(struct host_cmd_tlv_retry_limit);
	222	+ tlv += sizeof(struct host_cmd_tlv_retry_limit);
	223	+ }
	224	+ if ((bss_cfg->protocol & PROTOCOL_WPA) \|\|
	225	+ (bss_cfg->protocol & PROTOCOL_WPA2) \|\|
	226	+ (bss_cfg->protocol & PROTOCOL_EAP)) {
	227	+ tlv_akmp = (struct host_cmd_tlv_akmp *)tlv;
	228	+ tlv_akmp->tlv.type = cpu_to_le16(TLV_TYPE_UAP_AKMP);
	229	+ tlv_akmp->tlv.len =
	230	+ cpu_to_le16(sizeof(struct host_cmd_tlv_akmp) -
	231	+ sizeof(struct host_cmd_tlv));
	232	+ tlv_akmp->key_mgmt_operation =
	233	+ cpu_to_le16(bss_cfg->key_mgmt_operation);
	234	+ tlv_akmp->key_mgmt = cpu_to_le16(bss_cfg->key_mgmt);
	235	+ cmd_size += sizeof(struct host_cmd_tlv_akmp);
	236	+ tlv += sizeof(struct host_cmd_tlv_akmp);
	237	+
	238	+ if (bss_cfg->wpa_cfg.pairwise_cipher_wpa &
	239	+ VALID_CIPHER_BITMAP) {
	240	+ pwk_cipher = (struct host_cmd_tlv_pwk_cipher *)tlv;
	241	+ pwk_cipher->tlv.type =
	242	+ cpu_to_le16(TLV_TYPE_PWK_CIPHER);
	243	+ pwk_cipher->tlv.len = cpu_to_le16(
	244	+ sizeof(struct host_cmd_tlv_pwk_cipher) -
	245	+ sizeof(struct host_cmd_tlv));
	246	+ pwk_cipher->proto = cpu_to_le16(PROTOCOL_WPA);
	247	+ pwk_cipher->cipher =
	248	+ bss_cfg->wpa_cfg.pairwise_cipher_wpa;
	249	+ cmd_size += sizeof(struct host_cmd_tlv_pwk_cipher);
	250	+ tlv += sizeof(struct host_cmd_tlv_pwk_cipher);
	251	+ }
	252	+ if (bss_cfg->wpa_cfg.pairwise_cipher_wpa2 &
	253	+ VALID_CIPHER_BITMAP) {
	254	+ pwk_cipher = (struct host_cmd_tlv_pwk_cipher *)tlv;
	255	+ pwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_PWK_CIPHER);
	256	+ pwk_cipher->tlv.len = cpu_to_le16(
	257	+ sizeof(struct host_cmd_tlv_pwk_cipher) -
	258	+ sizeof(struct host_cmd_tlv));
	259	+ pwk_cipher->proto = cpu_to_le16(PROTOCOL_WPA2);
	260	+ pwk_cipher->cipher =
	261	+ bss_cfg->wpa_cfg.pairwise_cipher_wpa2;
	262	+ cmd_size += sizeof(struct host_cmd_tlv_pwk_cipher);
	263	+ tlv += sizeof(struct host_cmd_tlv_pwk_cipher);
	264	+ }
	265	+ if (bss_cfg->wpa_cfg.group_cipher & VALID_CIPHER_BITMAP) {
	266	+ gwk_cipher = (struct host_cmd_tlv_gwk_cipher *)tlv;
	267	+ gwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_GWK_CIPHER);
	268	+ gwk_cipher->tlv.len = cpu_to_le16(
	269	+ sizeof(struct host_cmd_tlv_gwk_cipher) -
	270	+ sizeof(struct host_cmd_tlv));
	271	+ gwk_cipher->cipher = bss_cfg->wpa_cfg.group_cipher;
	272	+ cmd_size += sizeof(struct host_cmd_tlv_gwk_cipher);
	273	+ tlv += sizeof(struct host_cmd_tlv_gwk_cipher);
	274	+ }
	275	+ if (bss_cfg->wpa_cfg.length) {
	276	+ passphrase = (struct host_cmd_tlv_passphrase *)tlv;
	277	+ passphrase->tlv.type =
	278	+ cpu_to_le16(TLV_TYPE_UAP_WPA_PASSPHRASE);
	279	+ passphrase->tlv.len =
	280	+ cpu_to_le16(bss_cfg->wpa_cfg.length);
	281	+ memcpy(passphrase->passphrase,
	282	+ bss_cfg->wpa_cfg.passphrase,
	283	+ bss_cfg->wpa_cfg.length);
	284	+ cmd_size += sizeof(struct host_cmd_tlv) +
	285	+ bss_cfg->wpa_cfg.length;
	286	+ tlv += sizeof(struct host_cmd_tlv) +
	287	+ bss_cfg->wpa_cfg.length;
	288	+ }
	289	+ }
	290	+ if ((bss_cfg->auth_mode <= WLAN_AUTH_SHARED_KEY) \|\|
	291	+ (bss_cfg->auth_mode == MWIFIEX_AUTH_MODE_AUTO)) {
	292	+ auth_type = (struct host_cmd_tlv_auth_type *)tlv;
	293	+ auth_type->tlv.type = cpu_to_le16(TLV_TYPE_AUTH_TYPE);
	294	+ auth_type->tlv.len =
	295	+ cpu_to_le16(sizeof(struct host_cmd_tlv_auth_type) -
	296	+ sizeof(struct host_cmd_tlv));
	297	+ auth_type->auth_type = (u8)bss_cfg->auth_mode;
	298	+ cmd_size += sizeof(struct host_cmd_tlv_auth_type);
	299	+ tlv += sizeof(struct host_cmd_tlv_auth_type);
	300	+ }
	301	+ if (bss_cfg->protocol) {
	302	+ encrypt_protocol = (struct host_cmd_tlv_encrypt_protocol *)tlv;
	303	+ encrypt_protocol->tlv.type =
	304	+ cpu_to_le16(TLV_TYPE_UAP_ENCRY_PROTOCOL);
	305	+ encrypt_protocol->tlv.len =
	306	+ cpu_to_le16(sizeof(struct host_cmd_tlv_encrypt_protocol)
	307	+ - sizeof(struct host_cmd_tlv));
	308	+ encrypt_protocol->proto = cpu_to_le16(bss_cfg->protocol);
	309	+ cmd_size += sizeof(struct host_cmd_tlv_encrypt_protocol);
	310	+ tlv += sizeof(struct host_cmd_tlv_encrypt_protocol);
	311	+ }
	312	+
	313	+ *param_size = cmd_size;
	314	+
	315	+ return 0;
	316	+}
	317	+
	318	+/* This function parses custom IEs from IE list and prepares command buffer */
	319	+static int mwifiex_uap_custom_ie_prepare(u8 tlv, void cmd_buf, u16 *ie_size)
	320	+{
	321	+ struct mwifiex_ie_list *ap_ie = cmd_buf;
	322	+ struct host_cmd_tlv tlv_ie = (struct host_cmd_tlv )tlv;
	323	+
	324	+ if (!ap_ie \|\| !ap_ie->len \|\| !ap_ie->ie_list)
	325	+ return -1;
	326	+
	327	+ *ie_size += le16_to_cpu(ap_ie->len) + sizeof(struct host_cmd_tlv);
	328	+
	329	+ tlv_ie->type = cpu_to_le16(TLV_TYPE_MGMT_IE);
	330	+ tlv_ie->len = ap_ie->len;
	331	+ tlv += sizeof(struct host_cmd_tlv);
	332	+
	333	+ memcpy(tlv, ap_ie->ie_list, le16_to_cpu(ap_ie->len));
	334	+
	335	+ return 0;
	336	+}
	337	+
	338	+/* Parse AP config structure and prepare TLV based command structure
	339	+ * to be sent to FW for uAP configuration
	340	+ */
	341	+static int
	342	+mwifiex_cmd_uap_sys_config(struct host_cmd_ds_command *cmd, u16 cmd_action,
	343	+ u32 type, void *cmd_buf)
	344	+{
	345	+ u8 *tlv;
	346	+ u16 cmd_size, param_size, ie_size;
	347	+ struct host_cmd_ds_sys_config *sys_cfg;
	348	+
	349	+ cmd->command = cpu_to_le16(HostCmd_CMD_UAP_SYS_CONFIG);
	350	+ cmd_size = (u16)(sizeof(struct host_cmd_ds_sys_config) + S_DS_GEN);
	351	+ sys_cfg = (struct host_cmd_ds_sys_config *)&cmd->params.uap_sys_config;
	352	+ sys_cfg->action = cpu_to_le16(cmd_action);
	353	+ tlv = sys_cfg->tlv;
	354	+
	355	+ switch (type) {
	356	+ case UAP_BSS_PARAMS_I:
	357	+ param_size = cmd_size;
	358	+ if (mwifiex_uap_bss_param_prepare(tlv, cmd_buf, &param_size))
	359	+ return -1;
	360	+ cmd->size = cpu_to_le16(param_size);
	361	+ break;
	362	+ case UAP_CUSTOM_IE_I:
	363	+ ie_size = cmd_size;
	364	+ if (mwifiex_uap_custom_ie_prepare(tlv, cmd_buf, &ie_size))
	365	+ return -1;
	366	+ cmd->size = cpu_to_le16(ie_size);
	367	+ break;
	368	+ default:
	369	+ return -1;
	370	+ }
	371	+
	372	+ return 0;
	373	+}
	374	+
	375	+/* This function prepares the AP specific commands before sending them
	376	+ * to the firmware.
	377	+ * This is a generic function which calls specific command preparation
	378	+ * routines based upon the command number.
	379	+ */
	380	+int mwifiex_uap_prepare_cmd(struct mwifiex_private *priv, u16 cmd_no,
	381	+ u16 cmd_action, u32 type,
	382	+ void data_buf, void cmd_buf)
	383	+{
	384	+ struct host_cmd_ds_command *cmd = cmd_buf;
	385	+
	386	+ switch (cmd_no) {
	387	+ case HostCmd_CMD_UAP_SYS_CONFIG:
	388	+ if (mwifiex_cmd_uap_sys_config(cmd, cmd_action, type, data_buf))
	389	+ return -1;
	390	+ break;
	391	+ case HostCmd_CMD_UAP_BSS_START:
	392	+ case HostCmd_CMD_UAP_BSS_STOP:
	393	+ cmd->command = cpu_to_le16(cmd_no);
	394	+ cmd->size = cpu_to_le16(S_DS_GEN);
	395	+ break;
	396	+ default:
	397	+ dev_err(priv->adapter->dev,
	398	+ "PREP_CMD: unknown cmd %#x\n", cmd_no);
	399	+ return -1;
	400	+ }
	401	+
	402	+ return 0;
	403	+}
	404	+
	405	+/* This function sets the RF channel for AP.
	406	+ *
	407	+ * This function populates channel information in AP config structure
	408	+ * and sends command to configure channel information in AP.
	409	+ */
	410	+int mwifiex_uap_set_channel(struct mwifiex_private *priv, int channel)
	411	+{
	412	+ struct mwifiex_uap_bss_param *bss_cfg;
	413	+ struct wiphy *wiphy = priv->wdev->wiphy;
	414	+
	415	+ bss_cfg = kzalloc(sizeof(struct mwifiex_uap_bss_param), GFP_KERNEL);
	416	+ if (!bss_cfg)
	417	+ return -ENOMEM;
	418	+
	419	+ bss_cfg->band_cfg = BAND_CONFIG_MANUAL;
	420	+ bss_cfg->channel = channel;
	421	+
	422	+ if (mwifiex_send_cmd_async(priv, HostCmd_CMD_UAP_SYS_CONFIG,
	423	+ HostCmd_ACT_GEN_SET,
	424	+ UAP_BSS_PARAMS_I, bss_cfg)) {
	425	+ wiphy_err(wiphy, "Failed to set the uAP channel\n");
	426	+ kfree(bss_cfg);
	427	+ return -1;
	428	+ }
	429	+
	430	+ kfree(bss_cfg);
	431	+ return 0;
	432	+}

drivers/net/wireless/mwifiex/wmm.c+4−0

@@ -885,6 +885,10 @@ mwifiex_wmm_get_highest_priolist_ptr(struct mwifiex_adapter *adapter, · 884 unmodified lines
885	885	tid_ptr = &(priv_tmp)->wmm.
886	886	tid_tbl_ptr[tos_to_tid[i]];
887	887
	888	+ /* For non-STA ra_list_curr may be NULL */
	889	+ if (!tid_ptr->ra_list_curr)
	890	+ continue;
	891	+
888	892	spin_lock_irqsave(&tid_ptr->tid_tbl_lock,
889	893	flags);
890	894	is_list_empty =

drivers/net/wireless/rndis_wlan.c+0−14

@@ -505,9 +505,6 @@ static int rndis_join_ibss(struct wiphy wiphy, struct net_device dev, · 504 unmodified lines
505	505
506	506	static int rndis_leave_ibss(struct wiphy wiphy, struct net_device dev);
507	507
508		−static int rndis_set_channel(struct wiphy wiphy, struct net_device dev,
509		− struct ieee80211_channel *chan, enum nl80211_channel_type channel_type);
510		−
511	508	static int rndis_add_key(struct wiphy wiphy, struct net_device netdev,
512	509	u8 key_index, bool pairwise, const u8 *mac_addr,
513	510	struct key_params *params);
@@ -549,7 +546,6 @@ static const struct cfg80211_ops rndis_config_ops = { · 35 unmodified lines
549	546	.disconnect = rndis_disconnect,
550	547	.join_ibss = rndis_join_ibss,
551	548	.leave_ibss = rndis_leave_ibss,
552		− .set_channel = rndis_set_channel,
553	549	.add_key = rndis_add_key,
554	550	.del_key = rndis_del_key,
555	551	.set_default_key = rndis_set_default_key,
@@ -2398,16 +2394,6 @@ static int rndis_leave_ibss(struct wiphy wiphy, struct net_device dev) · 1842 unmodified lines
2398	2394	return deauthenticate(usbdev);
2399	2395	}
2400	2396
2401		−static int rndis_set_channel(struct wiphy wiphy, struct net_device netdev,
2402		− struct ieee80211_channel *chan, enum nl80211_channel_type channel_type)
2403		−{
2404		− struct rndis_wlan_private *priv = wiphy_priv(wiphy);
2405		− struct usbnet *usbdev = priv->usbdev;
2406		−
2407		− return set_channel(usbdev,
2408		− ieee80211_frequency_to_channel(chan->center_freq));
2409		−}
2410		−
2411	2397	static int rndis_add_key(struct wiphy wiphy, struct net_device netdev,
2412	2398	u8 key_index, bool pairwise, const u8 *mac_addr,
2413	2399	struct key_params *params)

drivers/net/wireless/rt2x00/rt2800pci.c+1−0

@@ -1192,6 +1192,7 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = { · 1191 unmodified lines
1192	1192	{ PCI_DEVICE(0x1814, 0x5390) },
1193	1193	{ PCI_DEVICE(0x1814, 0x5392) },
1194	1194	{ PCI_DEVICE(0x1814, 0x539a) },
	1195	+ { PCI_DEVICE(0x1814, 0x539b) },
1195	1196	{ PCI_DEVICE(0x1814, 0x539f) },
1196	1197	#endif
1197	1198	{ 0, }

drivers/net/wireless/ti/wl12xx/Kconfig+1−0

@@ -1,5 +1,6 @@
1	1	config WL12XX
2	2	tristate "TI wl12xx support"
	3	+ depends on MAC80211
3	4	select WLCORE
4	5	---help---
5	6	This module adds support for wireless adapters based on TI wl1271,

drivers/net/wireless/ti/wlcore/Kconfig+1−1

@@ -1,6 +1,6 @@
1	1	config WLCORE
2	2	tristate "TI wlcore support"
3		− depends on WL_TI && GENERIC_HARDIRQS
	3	+ depends on WL_TI && GENERIC_HARDIRQS && MAC80211
4	4	depends on INET
5	5	select FW_LOADER
6	6	---help---

drivers/net/wireless/ti/wlcore/acx.c+80−0

@@ -1714,3 +1714,83 @@ out: · 1713 unmodified lines
1714	1714	return ret;
1715	1715
1716	1716	}
	1717	+
	1718	+/* Set the global behaviour of RX filters - On/Off + default action */
	1719	+int wl1271_acx_default_rx_filter_enable(struct wl1271 *wl, bool enable,
	1720	+ enum rx_filter_action action)
	1721	+{
	1722	+ struct acx_default_rx_filter *acx;
	1723	+ int ret;
	1724	+
	1725	+ wl1271_debug(DEBUG_ACX, "acx default rx filter en: %d act: %d",
	1726	+ enable, action);
	1727	+
	1728	+ acx = kzalloc(sizeof(*acx), GFP_KERNEL);
	1729	+ if (!acx)
	1730	+ return -ENOMEM;
	1731	+
	1732	+ acx->enable = enable;
	1733	+ acx->default_action = action;
	1734	+
	1735	+ ret = wl1271_cmd_configure(wl, ACX_ENABLE_RX_DATA_FILTER, acx,
	1736	+ sizeof(*acx));
	1737	+ if (ret < 0) {
	1738	+ wl1271_warning("acx default rx filter enable failed: %d", ret);
	1739	+ goto out;
	1740	+ }
	1741	+
	1742	+out:
	1743	+ kfree(acx);
	1744	+ return ret;
	1745	+}
	1746	+
	1747	+/* Configure or disable a specific RX filter pattern */
	1748	+int wl1271_acx_set_rx_filter(struct wl1271 *wl, u8 index, bool enable,
	1749	+ struct wl12xx_rx_filter *filter)
	1750	+{
	1751	+ struct acx_rx_filter_cfg *acx;
	1752	+ int fields_size = 0;
	1753	+ int acx_size;
	1754	+ int ret;
	1755	+
	1756	+ WARN_ON(enable && !filter);
	1757	+ WARN_ON(index >= WL1271_MAX_RX_FILTERS);
	1758	+
	1759	+ wl1271_debug(DEBUG_ACX,
	1760	+ "acx set rx filter idx: %d enable: %d filter: %p",
	1761	+ index, enable, filter);
	1762	+
	1763	+ if (enable) {
	1764	+ fields_size = wl1271_rx_filter_get_fields_size(filter);
	1765	+
	1766	+ wl1271_debug(DEBUG_ACX, "act: %d num_fields: %d field_size: %d",
	1767	+ filter->action, filter->num_fields, fields_size);
	1768	+ }
	1769	+
	1770	+ acx_size = ALIGN(sizeof(*acx) + fields_size, 4);
	1771	+ acx = kzalloc(acx_size, GFP_KERNEL);
	1772	+
	1773	+ if (!acx)
	1774	+ return -ENOMEM;
	1775	+
	1776	+ acx->enable = enable;
	1777	+ acx->index = index;
	1778	+
	1779	+ if (enable) {
	1780	+ acx->num_fields = filter->num_fields;
	1781	+ acx->action = filter->action;
	1782	+ wl1271_rx_filter_flatten_fields(filter, acx->fields);
	1783	+ }
	1784	+
	1785	+ wl1271_dump(DEBUG_ACX, "RX_FILTER: ", acx, acx_size);
	1786	+
	1787	+ ret = wl1271_cmd_configure(wl, ACX_SET_RX_DATA_FILTER, acx, acx_size);
	1788	+ if (ret < 0) {
	1789	+ wl1271_warning("setting rx filter failed: %d", ret);
	1790	+ goto out;
	1791	+ }
	1792	+
	1793	+out:
	1794	+ kfree(acx);
	1795	+ return ret;
	1796	+}

drivers/net/wireless/ti/wlcore/acx.h+30−0

@@ -1147,6 +1147,32 @@ struct wl12xx_acx_config_hangover { · 1146 unmodified lines
1147	1147	u8 padding[2];
1148	1148	} __packed;
1149	1149
	1150	+
	1151	+struct acx_default_rx_filter {
	1152	+ struct acx_header header;
	1153	+ u8 enable;
	1154	+
	1155	+ /* action of type FILTER_XXX */
	1156	+ u8 default_action;
	1157	+
	1158	+ u8 pad[2];
	1159	+} __packed;
	1160	+
	1161	+
	1162	+struct acx_rx_filter_cfg {
	1163	+ struct acx_header header;
	1164	+
	1165	+ u8 enable;
	1166	+
	1167	+ /* 0 - WL1271_MAX_RX_FILTERS-1 */
	1168	+ u8 index;
	1169	+
	1170	+ u8 action;
	1171	+
	1172	+ u8 num_fields;
	1173	+ u8 fields[0];
	1174	+} __packed;
	1175	+
1150	1176	enum {
1151	1177	ACX_WAKE_UP_CONDITIONS = 0x0000,
1152	1178	ACX_MEM_CFG = 0x0001,
@@ -1304,5 +1330,9 @@ int wl1271_acx_set_inconnection_sta(struct wl1271 wl, u8 addr); · 151 unmodified lines
1304	1330	int wl1271_acx_fm_coex(struct wl1271 *wl);
1305	1331	int wl12xx_acx_set_rate_mgmt_params(struct wl1271 *wl);
1306	1332	int wl12xx_acx_config_hangover(struct wl1271 *wl);
	1333	+int wl1271_acx_default_rx_filter_enable(struct wl1271 *wl, bool enable,
	1334	+ enum rx_filter_action action);
	1335	+int wl1271_acx_set_rx_filter(struct wl1271 *wl, u8 index, bool enable,
	1336	+ struct wl12xx_rx_filter *filter);
1307	1337
1308	1338	#endif /* __WL1271_ACX_H__ */

drivers/net/wireless/ti/wlcore/boot.c+2−1

@@ -72,7 +72,7 @@ static int wlcore_boot_fw_version(struct wl1271 *wl) · 71 unmodified lines
72	72	struct wl1271_static_data *static_data;
73	73	int ret;
74	74
75		− static_data = kmalloc(sizeof(*static_data), GFP_DMA);
	75	+ static_data = kmalloc(sizeof(*static_data), GFP_KERNEL \| GFP_DMA);
76	76	if (!static_data) {
77	77	wl1271_error("Couldn't allocate memory for static data!");
78	78	return -ENOMEM;
@@ -413,6 +413,7 @@ int wlcore_boot_run_firmware(struct wl1271 *wl) · 334 unmodified lines
413	413
414	414	/* unmask required mbox events */
415	415	wl->event_mask = BSS_LOSE_EVENT_ID \|
	416	+ REGAINED_BSS_EVENT_ID \|
416	417	SCAN_COMPLETE_EVENT_ID \|
417	418	ROLE_STOP_COMPLETE_EVENT_ID \|
418	419	RSSI_SNR_TRIGGER_0_EVENT_ID \|

drivers/net/wireless/ti/wlcore/cmd.c+5−3

@@ -123,7 +123,9 @@ static int wl1271_cmd_wait_for_event_or_timeout(struct wl1271 *wl, u32 mask) · 122 unmodified lines
123	123	unsigned long timeout;
124	124	int ret = 0;
125	125
126		− events_vector = kmalloc(sizeof(*events_vector), GFP_DMA);
	126	+ events_vector = kmalloc(sizeof(*events_vector), GFP_KERNEL \| GFP_DMA);
	127	+ if (!events_vector)
	128	+ return -ENOMEM;
127	129
128	130	timeout = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT);
129	131
@@ -1034,7 +1036,7 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 wl, struct wl12xx_vif wlvif) · 904 unmodified lines
1034	1036	skb_reserve(skb, sizeof(*hdr) + WL1271_EXTRA_SPACE_MAX);
1035	1037
1036	1038	tmpl = (struct wl12xx_arp_rsp_template )skb_put(skb, sizeof(tmpl));
1037		− memset(tmpl, 0, sizeof(tmpl));
	1039	+ memset(tmpl, 0, sizeof(*tmpl));
1038	1040
1039	1041	/* llc layer */
1040	1042	memcpy(tmpl->llc_hdr, rfc1042_header, sizeof(rfc1042_header));
@@ -1083,7 +1085,7 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 wl, struct wl12xx_vif wlvif) · 42 unmodified lines
1083	1085
1084	1086	/* mac80211 header */
1085	1087	hdr = (struct ieee80211_hdr_3addr )skb_push(skb, sizeof(hdr));
1086		− memset(hdr, 0, sizeof(hdr));
	1088	+ memset(hdr, 0, sizeof(*hdr));
1087	1089	fc = IEEE80211_FTYPE_DATA \| IEEE80211_FCTL_TODS;
1088	1090	if (wlvif->sta.qos)
1089	1091	fc \|= IEEE80211_STYPE_QOS_DATA;

drivers/net/wireless/ti/wlcore/event.c+12−17

@@ -103,7 +103,6 @@ static int wl1271_event_process(struct wl1271 *wl) · 102 unmodified lines
103	103	struct ieee80211_vif *vif;
104	104	struct wl12xx_vif *wlvif;
105	105	u32 vector;
106		− bool beacon_loss = false;
107	106	bool disconnect_sta = false;
108	107	unsigned long sta_bitmap = 0;
109	108
@@ -141,20 +140,23 @@ static int wl1271_event_process(struct wl1271 *wl) · 31 unmodified lines
141	140	mbox->soft_gemini_sense_info);
142	141
143	142	/*
144		− * The BSS_LOSE_EVENT_ID is only needed while psm (and hence beacon
145		− * filtering) is enabled. Without PSM, the stack will receive all
146		− * beacons and can detect beacon loss by itself.
147		− *
148		− * As there's possibility that the driver disables PSM before receiving
149		− * BSS_LOSE_EVENT, beacon loss has to be reported to the stack.
150		− *
	143	+ * We are HW_MONITOR device. On beacon loss - queue
	144	+ * connection loss work. Cancel it on REGAINED event.
151	145	*/
152	146	if (vector & BSS_LOSE_EVENT_ID) {
153	147	/* TODO: check for multi-role */
	148	+ int delay = wl->conf.conn.synch_fail_thold *
	149	+ wl->conf.conn.bss_lose_timeout;
154	150	wl1271_info("Beacon loss detected.");
	151	+ cancel_delayed_work_sync(&wl->connection_loss_work);
	152	+ ieee80211_queue_delayed_work(wl->hw, &wl->connection_loss_work,
	153	+ msecs_to_jiffies(delay));
	154	+ }
155	155
156		− /* indicate to the stack, that beacons have been lost */
157		− beacon_loss = true;
	156	+ if (vector & REGAINED_BSS_EVENT_ID) {
	157	+ /* TODO: check for multi-role */
	158	+ wl1271_info("Beacon regained.");
	159	+ cancel_delayed_work_sync(&wl->connection_loss_work);
158	160	}
159	161
160	162	if (vector & RSSI_SNR_TRIGGER_0_EVENT_ID) {
@@ -257,13 +259,6 @@ static int wl1271_event_process(struct wl1271 *wl) · 96 unmodified lines
257	259	rcu_read_unlock();
258	260	}
259	261	}
260		−
261		− if (beacon_loss)
262		− wl12xx_for_each_wlvif_sta(wl, wlvif) {
263		− vif = wl12xx_wlvif_to_vif(wlvif);
264		− ieee80211_connection_loss(vif);
265		− }
266		−
267	262	return 0;
268	263	}
269	264

drivers/net/wireless/ti/wlcore/main.c+315−8

@@ -1120,6 +1120,7 @@ int wl1271_plt_stop(struct wl1271 *wl) · 1119 unmodified lines
1120	1120	cancel_work_sync(&wl->recovery_work);
1121	1121	cancel_delayed_work_sync(&wl->elp_work);
1122	1122	cancel_delayed_work_sync(&wl->tx_watchdog_work);
	1123	+ cancel_delayed_work_sync(&wl->connection_loss_work);
1123	1124
1124	1125	mutex_lock(&wl->mutex);
1125	1126	wl1271_power_off(wl);
@@ -1261,8 +1262,270 @@ static struct sk_buff wl12xx_alloc_dummy_packet(struct wl1271 wl) · 135 unmodified lines
1261	1262
1262	1263
1263	1264	#ifdef CONFIG_PM
	1265	+static int
	1266	+wl1271_validate_wowlan_pattern(struct cfg80211_wowlan_trig_pkt_pattern *p)
	1267	+{
	1268	+ int num_fields = 0, in_field = 0, fields_size = 0;
	1269	+ int i, pattern_len = 0;
	1270	+
	1271	+ if (!p->mask) {
	1272	+ wl1271_warning("No mask in WoWLAN pattern");
	1273	+ return -EINVAL;
	1274	+ }
	1275	+
	1276	+ /*
	1277	+ * The pattern is broken up into segments of bytes at different offsets
	1278	+ * that need to be checked by the FW filter. Each segment is called
	1279	+ * a field in the FW API. We verify that the total number of fields
	1280	+ * required for this pattern won't exceed FW limits (8)
	1281	+ * as well as the total fields buffer won't exceed the FW limit.
	1282	+ * Note that if there's a pattern which crosses Ethernet/IP header
	1283	+ * boundary a new field is required.
	1284	+ */
	1285	+ for (i = 0; i < p->pattern_len; i++) {
	1286	+ if (test_bit(i, (unsigned long *)p->mask)) {
	1287	+ if (!in_field) {
	1288	+ in_field = 1;
	1289	+ pattern_len = 1;
	1290	+ } else {
	1291	+ if (i == WL1271_RX_FILTER_ETH_HEADER_SIZE) {
	1292	+ num_fields++;
	1293	+ fields_size += pattern_len +
	1294	+ RX_FILTER_FIELD_OVERHEAD;
	1295	+ pattern_len = 1;
	1296	+ } else
	1297	+ pattern_len++;
	1298	+ }
	1299	+ } else {
	1300	+ if (in_field) {
	1301	+ in_field = 0;
	1302	+ fields_size += pattern_len +
	1303	+ RX_FILTER_FIELD_OVERHEAD;
	1304	+ num_fields++;
	1305	+ }
	1306	+ }
	1307	+ }
	1308	+
	1309	+ if (in_field) {
	1310	+ fields_size += pattern_len + RX_FILTER_FIELD_OVERHEAD;
	1311	+ num_fields++;
	1312	+ }
	1313	+
	1314	+ if (num_fields > WL1271_RX_FILTER_MAX_FIELDS) {
	1315	+ wl1271_warning("RX Filter too complex. Too many segments");
	1316	+ return -EINVAL;
	1317	+ }
	1318	+
	1319	+ if (fields_size > WL1271_RX_FILTER_MAX_FIELDS_SIZE) {
	1320	+ wl1271_warning("RX filter pattern is too big");
	1321	+ return -E2BIG;
	1322	+ }
	1323	+
	1324	+ return 0;
	1325	+}
	1326	+
	1327	+struct wl12xx_rx_filter *wl1271_rx_filter_alloc(void)
	1328	+{
	1329	+ return kzalloc(sizeof(struct wl12xx_rx_filter), GFP_KERNEL);
	1330	+}
	1331	+
	1332	+void wl1271_rx_filter_free(struct wl12xx_rx_filter *filter)
	1333	+{
	1334	+ int i;
	1335	+
	1336	+ if (filter == NULL)
	1337	+ return;
	1338	+
	1339	+ for (i = 0; i < filter->num_fields; i++)
	1340	+ kfree(filter->fields[i].pattern);
	1341	+
	1342	+ kfree(filter);
	1343	+}
	1344	+
	1345	+int wl1271_rx_filter_alloc_field(struct wl12xx_rx_filter *filter,
	1346	+ u16 offset, u8 flags,
	1347	+ u8 *pattern, u8 len)
	1348	+{
	1349	+ struct wl12xx_rx_filter_field *field;
	1350	+
	1351	+ if (filter->num_fields == WL1271_RX_FILTER_MAX_FIELDS) {
	1352	+ wl1271_warning("Max fields per RX filter. can't alloc another");
	1353	+ return -EINVAL;
	1354	+ }
	1355	+
	1356	+ field = &filter->fields[filter->num_fields];
	1357	+
	1358	+ field->pattern = kzalloc(len, GFP_KERNEL);
	1359	+ if (!field->pattern) {
	1360	+ wl1271_warning("Failed to allocate RX filter pattern");
	1361	+ return -ENOMEM;
	1362	+ }
	1363	+
	1364	+ filter->num_fields++;
	1365	+
	1366	+ field->offset = cpu_to_le16(offset);
	1367	+ field->flags = flags;
	1368	+ field->len = len;
	1369	+ memcpy(field->pattern, pattern, len);
	1370	+
	1371	+ return 0;
	1372	+}
	1373	+
	1374	+int wl1271_rx_filter_get_fields_size(struct wl12xx_rx_filter *filter)
	1375	+{
	1376	+ int i, fields_size = 0;
	1377	+
	1378	+ for (i = 0; i < filter->num_fields; i++)
	1379	+ fields_size += filter->fields[i].len +
	1380	+ sizeof(struct wl12xx_rx_filter_field) -
	1381	+ sizeof(u8 *);
	1382	+
	1383	+ return fields_size;
	1384	+}
	1385	+
	1386	+void wl1271_rx_filter_flatten_fields(struct wl12xx_rx_filter *filter,
	1387	+ u8 *buf)
	1388	+{
	1389	+ int i;
	1390	+ struct wl12xx_rx_filter_field *field;
	1391	+
	1392	+ for (i = 0; i < filter->num_fields; i++) {
	1393	+ field = (struct wl12xx_rx_filter_field *)buf;
	1394	+
	1395	+ field->offset = filter->fields[i].offset;
	1396	+ field->flags = filter->fields[i].flags;
	1397	+ field->len = filter->fields[i].len;
	1398	+
	1399	+ memcpy(&field->pattern, filter->fields[i].pattern, field->len);
	1400	+ buf += sizeof(struct wl12xx_rx_filter_field) -
	1401	+ sizeof(u8 *) + field->len;
	1402	+ }
	1403	+}
	1404	+
	1405	+/*
	1406	+ * Allocates an RX filter returned through f
	1407	+ * which needs to be freed using rx_filter_free()
	1408	+ */
	1409	+static int wl1271_convert_wowlan_pattern_to_rx_filter(
	1410	+ struct cfg80211_wowlan_trig_pkt_pattern *p,
	1411	+ struct wl12xx_rx_filter **f)
	1412	+{
	1413	+ int i, j, ret = 0;
	1414	+ struct wl12xx_rx_filter *filter;
	1415	+ u16 offset;
	1416	+ u8 flags, len;
	1417	+
	1418	+ filter = wl1271_rx_filter_alloc();
	1419	+ if (!filter) {
	1420	+ wl1271_warning("Failed to alloc rx filter");
	1421	+ ret = -ENOMEM;
	1422	+ goto err;
	1423	+ }
	1424	+
	1425	+ i = 0;
	1426	+ while (i < p->pattern_len) {
	1427	+ if (!test_bit(i, (unsigned long *)p->mask)) {
	1428	+ i++;
	1429	+ continue;
	1430	+ }
	1431	+
	1432	+ for (j = i; j < p->pattern_len; j++) {
	1433	+ if (!test_bit(j, (unsigned long *)p->mask))
	1434	+ break;
	1435	+
	1436	+ if (i < WL1271_RX_FILTER_ETH_HEADER_SIZE &&
	1437	+ j >= WL1271_RX_FILTER_ETH_HEADER_SIZE)
	1438	+ break;
	1439	+ }
	1440	+
	1441	+ if (i < WL1271_RX_FILTER_ETH_HEADER_SIZE) {
	1442	+ offset = i;
	1443	+ flags = WL1271_RX_FILTER_FLAG_ETHERNET_HEADER;
	1444	+ } else {
	1445	+ offset = i - WL1271_RX_FILTER_ETH_HEADER_SIZE;
	1446	+ flags = WL1271_RX_FILTER_FLAG_IP_HEADER;
	1447	+ }
	1448	+
	1449	+ len = j - i;
	1450	+
	1451	+ ret = wl1271_rx_filter_alloc_field(filter,
	1452	+ offset,
	1453	+ flags,
	1454	+ &p->pattern[i], len);
	1455	+ if (ret)
	1456	+ goto err;
	1457	+
	1458	+ i = j;
	1459	+ }
	1460	+
	1461	+ filter->action = FILTER_SIGNAL;
	1462	+
	1463	+ *f = filter;
	1464	+ return 0;
	1465	+
	1466	+err:
	1467	+ wl1271_rx_filter_free(filter);
	1468	+ *f = NULL;
	1469	+
	1470	+ return ret;
	1471	+}
	1472	+
	1473	+static int wl1271_configure_wowlan(struct wl1271 *wl,
	1474	+ struct cfg80211_wowlan *wow)
	1475	+{
	1476	+ int i, ret;
	1477	+
	1478	+ if (!wow \|\| wow->any \|\| !wow->n_patterns) {
	1479	+ wl1271_acx_default_rx_filter_enable(wl, 0, FILTER_SIGNAL);
	1480	+ wl1271_rx_filter_clear_all(wl);
	1481	+ return 0;
	1482	+ }
	1483	+
	1484	+ if (WARN_ON(wow->n_patterns > WL1271_MAX_RX_FILTERS))
	1485	+ return -EINVAL;
	1486	+
	1487	+ /* Validate all incoming patterns before clearing current FW state */
	1488	+ for (i = 0; i < wow->n_patterns; i++) {
	1489	+ ret = wl1271_validate_wowlan_pattern(&wow->patterns[i]);
	1490	+ if (ret) {
	1491	+ wl1271_warning("Bad wowlan pattern %d", i);
	1492	+ return ret;
	1493	+ }
	1494	+ }
	1495	+
	1496	+ wl1271_acx_default_rx_filter_enable(wl, 0, FILTER_SIGNAL);
	1497	+ wl1271_rx_filter_clear_all(wl);
	1498	+
	1499	+ /* Translate WoWLAN patterns into filters */
	1500	+ for (i = 0; i < wow->n_patterns; i++) {
	1501	+ struct cfg80211_wowlan_trig_pkt_pattern *p;
	1502	+ struct wl12xx_rx_filter *filter = NULL;
	1503	+
	1504	+ p = &wow->patterns[i];
	1505	+
	1506	+ ret = wl1271_convert_wowlan_pattern_to_rx_filter(p, &filter);
	1507	+ if (ret) {
	1508	+ wl1271_warning("Failed to create an RX filter from "
	1509	+ "wowlan pattern %d", i);
	1510	+ goto out;
	1511	+ }
	1512	+
	1513	+ ret = wl1271_rx_filter_enable(wl, i, 1, filter);
	1514	+
	1515	+ wl1271_rx_filter_free(filter);
	1516	+ if (ret)
	1517	+ goto out;
	1518	+ }
	1519	+
	1520	+ ret = wl1271_acx_default_rx_filter_enable(wl, 1, FILTER_DROP);
	1521	+
	1522	+out:
	1523	+ return ret;
	1524	+}
	1525	+
1264	1526	static int wl1271_configure_suspend_sta(struct wl1271 *wl,
1265		− struct wl12xx_vif *wlvif)
	1527	+ struct wl12xx_vif *wlvif,
	1528	+ struct cfg80211_wowlan *wow)
1266	1529	{
1267	1530	int ret = 0;
1268	1531
@@ -1273,6 +1536,7 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl, · 4 unmodified lines
1273	1536	if (ret < 0)
1274	1537	goto out;
1275	1538
	1539	+ wl1271_configure_wowlan(wl, wow);
1276	1540	ret = wl1271_acx_wake_up_conditions(wl, wlvif,
1277	1541	wl->conf.conn.suspend_wake_up_event,
1278	1542	wl->conf.conn.suspend_listen_interval);
@@ -1308,10 +1572,11 @@ out: · 29 unmodified lines
1308	1572	}
1309	1573
1310	1574	static int wl1271_configure_suspend(struct wl1271 *wl,
1311		− struct wl12xx_vif *wlvif)
	1575	+ struct wl12xx_vif *wlvif,
	1576	+ struct cfg80211_wowlan *wow)
1312	1577	{
1313	1578	if (wlvif->bss_type == BSS_TYPE_STA_BSS)
1314		− return wl1271_configure_suspend_sta(wl, wlvif);
	1579	+ return wl1271_configure_suspend_sta(wl, wlvif, wow);
1315	1580	if (wlvif->bss_type == BSS_TYPE_AP_BSS)
1316	1581	return wl1271_configure_suspend_ap(wl, wlvif);
1317	1582	return 0;
@@ -1332,6 +1597,8 @@ static void wl1271_configure_resume(struct wl1271 *wl, · 14 unmodified lines
1332	1597	return;
1333	1598
1334	1599	if (is_sta) {
	1600	+ wl1271_configure_wowlan(wl, NULL);
	1601	+
1335	1602	ret = wl1271_acx_wake_up_conditions(wl, wlvif,
1336	1603	wl->conf.conn.wake_up_event,
1337	1604	wl->conf.conn.listen_interval);
@@ -1355,15 +1622,16 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw, · 17 unmodified lines
1355	1622	int ret;
1356	1623
1357	1624	wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow);
1358		− WARN_ON(!wow \|\| !wow->any);
	1625	+ WARN_ON(!wow);
1359	1626
1360	1627	wl1271_tx_flush(wl);
1361	1628
1362	1629	mutex_lock(&wl->mutex);
1363	1630	wl->wow_enabled = true;
1364	1631	wl12xx_for_each_wlvif(wl, wlvif) {
1365		− ret = wl1271_configure_suspend(wl, wlvif);
	1632	+ ret = wl1271_configure_suspend(wl, wlvif, wow);
1366	1633	if (ret < 0) {
	1634	+ mutex_unlock(&wl->mutex);
1367	1635	wl1271_warning("couldn't prepare device to suspend");
1368	1636	return ret;
1369	1637	}
@@ -1487,6 +1755,7 @@ static void wl1271_op_stop(struct ieee80211_hw *hw) · 117 unmodified lines
1487	1755	cancel_work_sync(&wl->tx_work);
1488	1756	cancel_delayed_work_sync(&wl->elp_work);
1489	1757	cancel_delayed_work_sync(&wl->tx_watchdog_work);
	1758	+ cancel_delayed_work_sync(&wl->connection_loss_work);
1490	1759
1491	1760	/* let's notify MAC80211 about the remaining pending TX frames */
1492	1761	wl12xx_tx_reset(wl, true);
@@ -3439,6 +3708,9 @@ sta_not_found: · 1946 unmodified lines
3439	3708	do_join = true;
3440	3709	set_assoc = true;
3441	3710
	3711	+ /* Cancel connection_loss_work */
	3712	+ cancel_delayed_work_sync(&wl->connection_loss_work);
	3713	+
3442	3714	/*
3443	3715	* use basic rates from AP, and determine lowest rate
3444	3716	* to use with control frames.
@@ -4549,6 +4821,34 @@ static struct bin_attribute fwlog_attr = { · 1104 unmodified lines
4549	4821	.read = wl1271_sysfs_read_fwlog,
4550	4822	};
4551	4823
	4824	+static void wl1271_connection_loss_work(struct work_struct *work)
	4825	+{
	4826	+ struct delayed_work *dwork;
	4827	+ struct wl1271 *wl;
	4828	+ struct ieee80211_vif *vif;
	4829	+ struct wl12xx_vif *wlvif;
	4830	+
	4831	+ dwork = container_of(work, struct delayed_work, work);
	4832	+ wl = container_of(dwork, struct wl1271, connection_loss_work);
	4833	+
	4834	+ wl1271_info("Connection loss work.");
	4835	+
	4836	+ mutex_lock(&wl->mutex);
	4837	+
	4838	+ if (unlikely(wl->state == WL1271_STATE_OFF))
	4839	+ goto out;
	4840	+
	4841	+ /* Call mac80211 connection loss */
	4842	+ wl12xx_for_each_wlvif_sta(wl, wlvif) {
	4843	+ if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
	4844	+ goto out;
	4845	+ vif = wl12xx_wlvif_to_vif(wlvif);
	4846	+ ieee80211_connection_loss(vif);
	4847	+ }
	4848	+out:
	4849	+ mutex_unlock(&wl->mutex);
	4850	+}
	4851	+
4552	4852	static void wl12xx_derive_mac_addresses(struct wl1271 *wl,
4553	4853	u32 oui, u32 nic, int n)
4554	4854	{
@@ -4804,6 +5104,8 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size) · 249 unmodified lines
4804	5104	INIT_WORK(&wl->recovery_work, wl1271_recovery_work);
4805	5105	INIT_DELAYED_WORK(&wl->scan_complete_work, wl1271_scan_complete_work);
4806	5106	INIT_DELAYED_WORK(&wl->tx_watchdog_work, wl12xx_tx_watchdog_work);
	5107	+ INIT_DELAYED_WORK(&wl->connection_loss_work,
	5108	+ wl1271_connection_loss_work);
4807	5109
4808	5110	wl->freezable_wq = create_freezable_workqueue("wl12xx_wq");
4809	5111	if (!wl->freezable_wq) {
@@ -4861,7 +5163,7 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size) · 51 unmodified lines
4861	5163	goto err_dummy_packet;
4862	5164	}
4863	5165
4864		− wl->mbox = kmalloc(sizeof(*wl->mbox), GFP_DMA);
	5166	+ wl->mbox = kmalloc(sizeof(*wl->mbox), GFP_KERNEL \| GFP_DMA);
4865	5167	if (!wl->mbox) {
4866	5168	ret = -ENOMEM;
4867	5169	goto err_fwlog;
@@ -5003,9 +5305,14 @@ int __devinit wlcore_probe(struct wl1271 wl, struct platform_device pdev) · 135 unmodified lines
5003	5305	if (!ret) {
5004	5306	wl->irq_wake_enabled = true;
5005	5307	device_init_wakeup(wl->dev, 1);
5006		− if (pdata->pwr_in_suspend)
	5308	+ if (pdata->pwr_in_suspend) {
5007	5309	wl->hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY;
5008		−
	5310	+ wl->hw->wiphy->wowlan.n_patterns =
	5311	+ WL1271_MAX_RX_FILTERS;
	5312	+ wl->hw->wiphy->wowlan.pattern_min_len = 1;
	5313	+ wl->hw->wiphy->wowlan.pattern_max_len =
	5314	+ WL1271_RX_FILTER_MAX_PATTERN_SIZE;
	5315	+ }
5009	5316	}
5010	5317	disable_irq(wl->irq);
5011	5318

drivers/net/wireless/ti/wlcore/rx.c+36−0

@@ -278,3 +278,39 @@ void wl12xx_rx(struct wl1271 wl, struct wl_fw_status status) · 277 unmodified lines
278	278
279	279	wl12xx_rearm_rx_streaming(wl, active_hlids);
280	280	}
	281	+
	282	+int wl1271_rx_filter_enable(struct wl1271 *wl,
	283	+ int index, bool enable,
	284	+ struct wl12xx_rx_filter *filter)
	285	+{
	286	+ int ret;
	287	+
	288	+ if (wl->rx_filter_enabled[index] == enable) {
	289	+ wl1271_warning("Request to enable an already "
	290	+ "enabled rx filter %d", index);
	291	+ return 0;
	292	+ }
	293	+
	294	+ ret = wl1271_acx_set_rx_filter(wl, index, enable, filter);
	295	+
	296	+ if (ret) {
	297	+ wl1271_error("Failed to %s rx data filter %d (err=%d)",
	298	+ enable ? "enable" : "disable", index, ret);
	299	+ return ret;
	300	+ }
	301	+
	302	+ wl->rx_filter_enabled[index] = enable;
	303	+
	304	+ return 0;
	305	+}
	306	+
	307	+void wl1271_rx_filter_clear_all(struct wl1271 *wl)
	308	+{
	309	+ int i;
	310	+
	311	+ for (i = 0; i < WL1271_MAX_RX_FILTERS; i++) {
	312	+ if (!wl->rx_filter_enabled[i])
	313	+ continue;
	314	+ wl1271_rx_filter_enable(wl, i, 0, NULL);
	315	+ }
	316	+}

drivers/net/wireless/ti/wlcore/rx.h+4−0

@@ -138,5 +138,9 @@ struct wl1271_rx_descriptor { · 137 unmodified lines
138	138
139	139	void wl12xx_rx(struct wl1271 wl, struct wl_fw_status status);
140	140	u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band);
	141	+int wl1271_rx_filter_enable(struct wl1271 *wl,
	142	+ int index, bool enable,
	143	+ struct wl12xx_rx_filter *filter);
	144	+void wl1271_rx_filter_clear_all(struct wl1271 *wl);
141	145
142	146	#endif

drivers/net/wireless/ti/wlcore/wl12xx.h+41−0

@@ -279,6 +279,39 @@ struct wl1271_link { · 278 unmodified lines
279	279	u8 ba_bitmap;
280	280	};
281	281
	282	+#define WL1271_MAX_RX_FILTERS 5
	283	+#define WL1271_RX_FILTER_MAX_FIELDS 8
	284	+
	285	+#define WL1271_RX_FILTER_ETH_HEADER_SIZE 14
	286	+#define WL1271_RX_FILTER_MAX_FIELDS_SIZE 95
	287	+#define RX_FILTER_FIELD_OVERHEAD \
	288	+ (sizeof(struct wl12xx_rx_filter_field) - sizeof(u8 *))
	289	+#define WL1271_RX_FILTER_MAX_PATTERN_SIZE \
	290	+ (WL1271_RX_FILTER_MAX_FIELDS_SIZE - RX_FILTER_FIELD_OVERHEAD)
	291	+
	292	+#define WL1271_RX_FILTER_FLAG_MASK BIT(0)
	293	+#define WL1271_RX_FILTER_FLAG_IP_HEADER 0
	294	+#define WL1271_RX_FILTER_FLAG_ETHERNET_HEADER BIT(1)
	295	+
	296	+enum rx_filter_action {
	297	+ FILTER_DROP = 0,
	298	+ FILTER_SIGNAL = 1,
	299	+ FILTER_FW_HANDLE = 2
	300	+};
	301	+
	302	+struct wl12xx_rx_filter_field {
	303	+ __le16 offset;
	304	+ u8 len;
	305	+ u8 flags;
	306	+ u8 *pattern;
	307	+} __packed;
	308	+
	309	+struct wl12xx_rx_filter {
	310	+ u8 action;
	311	+ int num_fields;
	312	+ struct wl12xx_rx_filter_field fields[WL1271_RX_FILTER_MAX_FIELDS];
	313	+};
	314	+
282	315	struct wl1271_station {
283	316	u8 hlid;
284	317	};
@@ -439,6 +472,14 @@ int wl1271_plt_stop(struct wl1271 *wl); · 154 unmodified lines
439	472	int wl1271_recalc_rx_streaming(struct wl1271 wl, struct wl12xx_vif wlvif);
440	473	void wl12xx_queue_recovery_work(struct wl1271 *wl);
441	474	size_t wl12xx_copy_fwlog(struct wl1271 wl, u8 memblock, size_t maxlen);
	475	+int wl1271_rx_filter_alloc_field(struct wl12xx_rx_filter *filter,
	476	+ u16 offset, u8 flags,
	477	+ u8 *pattern, u8 len);
	478	+void wl1271_rx_filter_free(struct wl12xx_rx_filter *filter);
	479	+struct wl12xx_rx_filter *wl1271_rx_filter_alloc(void);
	480	+int wl1271_rx_filter_get_fields_size(struct wl12xx_rx_filter *filter);
	481	+void wl1271_rx_filter_flatten_fields(struct wl12xx_rx_filter *filter,
	482	+ u8 *buf);
442	483
443	484	#define JOIN_TIMEOUT 5000 /* 5000 milliseconds to join */
444	485

drivers/net/wireless/ti/wlcore/wlcore.h+6−0

@@ -243,6 +243,9 @@ struct wl1271 { · 242 unmodified lines
243	243	struct wl1271_scan scan;
244	244	struct delayed_work scan_complete_work;
245	245
	246	+ /* Connection loss work */
	247	+ struct delayed_work connection_loss_work;
	248	+
246	249	bool sched_scanning;
247	250
248	251	/* The current band */
@@ -349,6 +352,9 @@ struct wl1271 { · 100 unmodified lines
349	352
350	353	/* size of the private FW status data */
351	354	size_t fw_status_priv_len;
	355	+
	356	+ /* RX Data filter rule state - enabled/disabled */
	357	+ bool rx_filter_enabled[WL1271_MAX_RX_FILTERS];
352	358	};
353	359
354	360	int __devinit wlcore_probe(struct wl1271 wl, struct platform_device pdev);

drivers/net/xen-netfront.c+0−6

@@ -1962,9 +1962,6 @@ static int __init netif_init(void) · 1961 unmodified lines
1962	1962	if (!xen_domain())
1963	1963	return -ENODEV;
1964	1964
1965		− if (xen_initial_domain())
1966		− return 0;
1967		−
1968	1965	if (xen_hvm_domain() && !xen_platform_pci_unplug)
1969	1966	return -ENODEV;
1970	1967
@@ -1977,9 +1974,6 @@ module_init(netif_init); · 6 unmodified lines
1977	1974
1978	1975	static void __exit netif_exit(void)
1979	1976	{
1980		− if (xen_initial_domain())
1981		− return;
1982		−
1983	1977	xenbus_unregister_driver(&netfront_driver);
1984	1978	}
1985	1979	module_exit(netif_exit);

drivers/nfc/Kconfig+13−0

@@ -17,6 +17,19 @@ config PN544_NFC · 16 unmodified lines
17	17	To compile this driver as a module, choose m here. The module will
18	18	be called pn544.
19	19
	20	+config PN544_HCI_NFC
	21	+ tristate "HCI PN544 NFC driver"
	22	+ depends on I2C && NFC_SHDLC
	23	+ select CRC_CCITT
	24	+ default n
	25	+ ---help---
	26	+ NXP PN544 i2c driver.
	27	+ This is a driver based on the SHDLC and HCI NFC kernel layers and
	28	+ will thus not work with NXP libnfc library.
	29	+
	30	+ To compile this driver as a module, choose m here. The module will
	31	+ be called pn544_hci.
	32	+
20	33	config NFC_PN533
21	34	tristate "NXP PN533 USB driver"
22	35	depends on USB

drivers/nfc/Makefile+1−0

@@ -3,6 +3,7 @@ · 2 unmodified lines
3	3	#
4	4
5	5	obj-$(CONFIG_PN544_NFC) += pn544.o
	6	+obj-$(CONFIG_PN544_HCI_NFC) += pn544_hci.o
6	7	obj-$(CONFIG_NFC_PN533) += pn533.o
7	8	obj-$(CONFIG_NFC_WILINK) += nfcwilink.o
8	9

drivers/nfc/pn533.c+8−11

@@ -394,9 +394,6 @@ static void pn533_wq_cmd_complete(struct work_struct *work) · 393 unmodified lines
394	394	struct pn533_frame *in_frame;
395	395	int rc;
396	396
397		− if (dev == NULL)
398		− return;
399		−
400	397	in_frame = dev->wq_in_frame;
401	398
402	399	if (dev->wq_in_error)
@@ -1194,8 +1191,8 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev) · 791 unmodified lines
1194	1191	return rc;
1195	1192	}
1196	1193
1197		−static int pn533_activate_target(struct nfc_dev *nfc_dev, u32 target_idx,
1198		− u32 protocol)
	1194	+static int pn533_activate_target(struct nfc_dev *nfc_dev,
	1195	+ struct nfc_target *target, u32 protocol)
1199	1196	{
1200	1197	struct pn533 *dev = nfc_get_drvdata(nfc_dev);
1201	1198	int rc;
@@ -1243,7 +1240,8 @@ static int pn533_activate_target(struct nfc_dev *nfc_dev, u32 target_idx, · 41 unmodified lines
1243	1240	return 0;
1244	1241	}
1245	1242
1246		−static void pn533_deactivate_target(struct nfc_dev *nfc_dev, u32 target_idx)
	1243	+static void pn533_deactivate_target(struct nfc_dev *nfc_dev,
	1244	+ struct nfc_target *target)
1247	1245	{
1248	1246	struct pn533 *dev = nfc_get_drvdata(nfc_dev);
1249	1247	u8 tg;
@@ -1351,7 +1349,7 @@ static int pn533_in_dep_link_up_complete(struct pn533 dev, void arg, · 101 unmodified lines
1351	1349	return 0;
1352	1350	}
1353	1351
1354		−static int pn533_dep_link_up(struct nfc_dev *nfc_dev, int target_idx,
	1352	+static int pn533_dep_link_up(struct nfc_dev nfc_dev, struct nfc_target target,
1355	1353	u8 comm_mode, u8* gb, size_t gb_len)
1356	1354	{
1357	1355	struct pn533 *dev = nfc_get_drvdata(nfc_dev);
@@ -1552,10 +1550,9 @@ error: · 194 unmodified lines
1552	1550	return 0;
1553	1551	}
1554	1552
1555		−static int pn533_data_exchange(struct nfc_dev *nfc_dev, u32 target_idx,
1556		− struct sk_buff *skb,
1557		− data_exchange_cb_t cb,
1558		− void *cb_context)
	1553	+static int pn533_data_exchange(struct nfc_dev *nfc_dev,
	1554	+ struct nfc_target target, struct sk_buff skb,
	1555	+ data_exchange_cb_t cb, void *cb_context)
1559	1556	{
1560	1557	struct pn533 *dev = nfc_get_drvdata(nfc_dev);
1561	1558	struct pn533_frame out_frame, in_frame;

drivers/nfc/pn544_hci.c+947−0

@@ -0,0 +1,947 @@
	1	+/*
	2	+ * HCI based Driver for NXP PN544 NFC Chip
	3	+ *
	4	+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
	5	+ *
	6	+ * This program is free software; you can redistribute it and/or modify it
	7	+ * under the terms and conditions of the GNU General Public License,
	8	+ * version 2, as published by the Free Software Foundation.
	9	+ *
	10	+ * This program is distributed in the hope that it will be useful,
	11	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	+ * GNU General Public License for more details.
	14	+ *
	15	+ * You should have received a copy of the GNU General Public License
	16	+ * along with this program; if not, write to the
	17	+ * Free Software Foundation, Inc.,
	18	+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
	19	+ */
	20	+
	21	+#include <linux/crc-ccitt.h>
	22	+#include <linux/module.h>
	23	+#include <linux/delay.h>
	24	+#include <linux/slab.h>
	25	+#include <linux/miscdevice.h>
	26	+#include <linux/interrupt.h>
	27	+#include <linux/gpio.h>
	28	+#include <linux/i2c.h>
	29	+
	30	+#include <linux/nfc.h>
	31	+#include <net/nfc/hci.h>
	32	+#include <net/nfc/shdlc.h>
	33	+
	34	+#include <linux/nfc/pn544.h>
	35	+
	36	+#define DRIVER_DESC "HCI NFC driver for PN544"
	37	+
	38	+#define PN544_HCI_DRIVER_NAME "pn544_hci"
	39	+
	40	+/* Timing restrictions (ms) */
	41	+#define PN544_HCI_RESETVEN_TIME 30
	42	+
	43	+static struct i2c_device_id pn544_hci_id_table[] = {
	44	+ {"pn544", 0},
	45	+ {}
	46	+};
	47	+
	48	+MODULE_DEVICE_TABLE(i2c, pn544_hci_id_table);
	49	+
	50	+#define HCI_MODE 0
	51	+#define FW_MODE 1
	52	+
	53	+/* framing in HCI mode */
	54	+#define PN544_HCI_LLC_LEN 1
	55	+#define PN544_HCI_LLC_CRC 2
	56	+#define PN544_HCI_LLC_LEN_CRC (PN544_HCI_LLC_LEN + PN544_HCI_LLC_CRC)
	57	+#define PN544_HCI_LLC_MIN_SIZE (1 + PN544_HCI_LLC_LEN_CRC)
	58	+#define PN544_HCI_LLC_MAX_PAYLOAD 29
	59	+#define PN544_HCI_LLC_MAX_SIZE (PN544_HCI_LLC_LEN_CRC + 1 + \
	60	+ PN544_HCI_LLC_MAX_PAYLOAD)
	61	+
	62	+enum pn544_state {
	63	+ PN544_ST_COLD,
	64	+ PN544_ST_FW_READY,
	65	+ PN544_ST_READY,
	66	+};
	67	+
	68	+#define FULL_VERSION_LEN 11
	69	+
	70	+/* Proprietary commands */
	71	+#define PN544_WRITE 0x3f
	72	+
	73	+/* Proprietary gates, events, commands and registers */
	74	+
	75	+/* NFC_HCI_RF_READER_A_GATE additional registers and commands */
	76	+#define PN544_RF_READER_A_AUTO_ACTIVATION 0x10
	77	+#define PN544_RF_READER_A_CMD_CONTINUE_ACTIVATION 0x12
	78	+#define PN544_MIFARE_CMD 0x21
	79	+
	80	+/* Commands that apply to all RF readers */
	81	+#define PN544_RF_READER_CMD_PRESENCE_CHECK 0x30
	82	+#define PN544_RF_READER_CMD_ACTIVATE_NEXT 0x32
	83	+
	84	+/* NFC_HCI_ID_MGMT_GATE additional registers */
	85	+#define PN544_ID_MGMT_FULL_VERSION_SW 0x10
	86	+
	87	+#define PN544_RF_READER_ISO15693_GATE 0x12
	88	+
	89	+#define PN544_RF_READER_F_GATE 0x14
	90	+#define PN544_FELICA_ID 0x04
	91	+#define PN544_FELICA_RAW 0x20
	92	+
	93	+#define PN544_RF_READER_JEWEL_GATE 0x15
	94	+#define PN544_JEWEL_RAW_CMD 0x23
	95	+
	96	+#define PN544_RF_READER_NFCIP1_INITIATOR_GATE 0x30
	97	+#define PN544_RF_READER_NFCIP1_TARGET_GATE 0x31
	98	+
	99	+#define PN544_SYS_MGMT_GATE 0x90
	100	+#define PN544_SYS_MGMT_INFO_NOTIFICATION 0x02
	101	+
	102	+#define PN544_POLLING_LOOP_MGMT_GATE 0x94
	103	+#define PN544_PL_RDPHASES 0x06
	104	+#define PN544_PL_EMULATION 0x07
	105	+#define PN544_PL_NFCT_DEACTIVATED 0x09
	106	+
	107	+#define PN544_SWP_MGMT_GATE 0xA0
	108	+
	109	+#define PN544_NFC_WI_MGMT_GATE 0xA1
	110	+
	111	+static u8 pn544_custom_gates[] = {
	112	+ PN544_SYS_MGMT_GATE,
	113	+ PN544_SWP_MGMT_GATE,
	114	+ PN544_POLLING_LOOP_MGMT_GATE,
	115	+ PN544_NFC_WI_MGMT_GATE,
	116	+ PN544_RF_READER_F_GATE,
	117	+ PN544_RF_READER_JEWEL_GATE,
	118	+ PN544_RF_READER_ISO15693_GATE,
	119	+ PN544_RF_READER_NFCIP1_INITIATOR_GATE,
	120	+ PN544_RF_READER_NFCIP1_TARGET_GATE
	121	+};
	122	+
	123	+/* Largest headroom needed for outgoing custom commands */
	124	+#define PN544_CMDS_HEADROOM 2
	125	+
	126	+struct pn544_hci_info {
	127	+ struct i2c_client *i2c_dev;
	128	+ struct nfc_shdlc *shdlc;
	129	+
	130	+ enum pn544_state state;
	131	+
	132	+ struct mutex info_lock;
	133	+
	134	+ unsigned int gpio_en;
	135	+ unsigned int gpio_irq;
	136	+ unsigned int gpio_fw;
	137	+ unsigned int en_polarity;
	138	+
	139	+ int hard_fault; /*
	140	+ * < 0 if hardware error occured (e.g. i2c err)
	141	+ * and prevents normal operation.
	142	+ */
	143	+};
	144	+
	145	+static void pn544_hci_platform_init(struct pn544_hci_info *info)
	146	+{
	147	+ int polarity, retry, ret;
	148	+ char rset_cmd[] = { 0x05, 0xF9, 0x04, 0x00, 0xC3, 0xE5 };
	149	+ int count = sizeof(rset_cmd);
	150	+
	151	+ pr_info(DRIVER_DESC ": %s\n", __func__);
	152	+ dev_info(&info->i2c_dev->dev, "Detecting nfc_en polarity\n");
	153	+
	154	+ /* Disable fw download */
	155	+ gpio_set_value(info->gpio_fw, 0);
	156	+
	157	+ for (polarity = 0; polarity < 2; polarity++) {
	158	+ info->en_polarity = polarity;
	159	+ retry = 3;
	160	+ while (retry--) {
	161	+ /* power off */
	162	+ gpio_set_value(info->gpio_en, !info->en_polarity);
	163	+ usleep_range(10000, 15000);
	164	+
	165	+ /* power on */
	166	+ gpio_set_value(info->gpio_en, info->en_polarity);
	167	+ usleep_range(10000, 15000);
	168	+
	169	+ /* send reset */
	170	+ dev_dbg(&info->i2c_dev->dev, "Sending reset cmd\n");
	171	+ ret = i2c_master_send(info->i2c_dev, rset_cmd, count);
	172	+ if (ret == count) {
	173	+ dev_info(&info->i2c_dev->dev,
	174	+ "nfc_en polarity : active %s\n",
	175	+ (polarity == 0 ? "low" : "high"));
	176	+ goto out;
	177	+ }
	178	+ }
	179	+ }
	180	+
	181	+ dev_err(&info->i2c_dev->dev,
	182	+ "Could not detect nfc_en polarity, fallback to active high\n");
	183	+
	184	+out:
	185	+ gpio_set_value(info->gpio_en, !info->en_polarity);
	186	+}
	187	+
	188	+static int pn544_hci_enable(struct pn544_hci_info *info, int mode)
	189	+{
	190	+ pr_info(DRIVER_DESC ": %s\n", __func__);
	191	+
	192	+ gpio_set_value(info->gpio_fw, 0);
	193	+ gpio_set_value(info->gpio_en, info->en_polarity);
	194	+ usleep_range(10000, 15000);
	195	+
	196	+ return 0;
	197	+}
	198	+
	199	+static void pn544_hci_disable(struct pn544_hci_info *info)
	200	+{
	201	+ pr_info(DRIVER_DESC ": %s\n", __func__);
	202	+
	203	+ gpio_set_value(info->gpio_fw, 0);
	204	+ gpio_set_value(info->gpio_en, !info->en_polarity);
	205	+ usleep_range(10000, 15000);
	206	+
	207	+ gpio_set_value(info->gpio_en, info->en_polarity);
	208	+ usleep_range(10000, 15000);
	209	+
	210	+ gpio_set_value(info->gpio_en, !info->en_polarity);
	211	+ usleep_range(10000, 15000);
	212	+}
	213	+
	214	+static int pn544_hci_i2c_write(struct i2c_client client, u8 buf, int len)
	215	+{
	216	+ int r;
	217	+
	218	+ usleep_range(3000, 6000);
	219	+
	220	+ r = i2c_master_send(client, buf, len);
	221	+
	222	+ if (r == -EREMOTEIO) { /* Retry, chip was in standby */
	223	+ usleep_range(6000, 10000);
	224	+ r = i2c_master_send(client, buf, len);
	225	+ }
	226	+
	227	+ if (r >= 0 && r != len)
	228	+ r = -EREMOTEIO;
	229	+
	230	+ return r;
	231	+}
	232	+
	233	+static int check_crc(u8 *buf, int buflen)
	234	+{
	235	+ u8 len;
	236	+ u16 crc;
	237	+
	238	+ len = buf[0] + 1;
	239	+ crc = crc_ccitt(0xffff, buf, len - 2);
	240	+ crc = ~crc;
	241	+
	242	+ if (buf[len - 2] != (crc & 0xff) \|\| buf[len - 1] != (crc >> 8)) {
	243	+ pr_err(PN544_HCI_DRIVER_NAME ": CRC error 0x%x != 0x%x 0x%x\n",
	244	+ crc, buf[len - 1], buf[len - 2]);
	245	+
	246	+ pr_info(DRIVER_DESC ": %s : BAD CRC\n", __func__);
	247	+ print_hex_dump(KERN_DEBUG, "crc: ", DUMP_PREFIX_NONE,
	248	+ 16, 2, buf, buflen, false);
	249	+ return -EPERM;
	250	+ }
	251	+ return 0;
	252	+}
	253	+
	254	+/*
	255	+ * Reads an shdlc frame and returns it in a newly allocated sk_buff. Guarantees
	256	+ * that i2c bus will be flushed and that next read will start on a new frame.
	257	+ * returned skb contains only LLC header and payload.
	258	+ * returns:
	259	+ * -EREMOTEIO : i2c read error (fatal)
	260	+ * -EBADMSG : frame was incorrect and discarded
	261	+ * -ENOMEM : cannot allocate skb, frame dropped
	262	+ */
	263	+static int pn544_hci_i2c_read(struct i2c_client client, struct sk_buff *skb)
	264	+{
	265	+ int r;
	266	+ u8 len;
	267	+ u8 tmp[PN544_HCI_LLC_MAX_SIZE - 1];
	268	+
	269	+ r = i2c_master_recv(client, &len, 1);
	270	+ if (r != 1) {
	271	+ dev_err(&client->dev, "cannot read len byte\n");
	272	+ return -EREMOTEIO;
	273	+ }
	274	+
	275	+ if ((len < (PN544_HCI_LLC_MIN_SIZE - 1)) \|\|
	276	+ (len > (PN544_HCI_LLC_MAX_SIZE - 1))) {
	277	+ dev_err(&client->dev, "invalid len byte\n");
	278	+ r = -EBADMSG;
	279	+ goto flush;
	280	+ }
	281	+
	282	+ *skb = alloc_skb(1 + len, GFP_KERNEL);
	283	+ if (*skb == NULL) {
	284	+ r = -ENOMEM;
	285	+ goto flush;
	286	+ }
	287	+
	288	+ skb_put(skb, 1) = len;
	289	+
	290	+ r = i2c_master_recv(client, skb_put(*skb, len), len);
	291	+ if (r != len) {
	292	+ kfree_skb(*skb);
	293	+ return -EREMOTEIO;
	294	+ }
	295	+
	296	+ r = check_crc((skb)->data, (skb)->len);
	297	+ if (r != 0) {
	298	+ kfree_skb(*skb);
	299	+ r = -EBADMSG;
	300	+ goto flush;
	301	+ }
	302	+
	303	+ skb_pull(*skb, 1);
	304	+ skb_trim(skb, (skb)->len - 2);
	305	+
	306	+ usleep_range(3000, 6000);
	307	+
	308	+ return 0;
	309	+
	310	+flush:
	311	+ if (i2c_master_recv(client, tmp, sizeof(tmp)) < 0)
	312	+ r = -EREMOTEIO;
	313	+
	314	+ usleep_range(3000, 6000);
	315	+
	316	+ return r;
	317	+}
	318	+
	319	+/*
	320	+ * Reads an shdlc frame from the chip. This is not as straightforward as it
	321	+ * seems. There are cases where we could loose the frame start synchronization.
	322	+ * The frame format is len-data-crc, and corruption can occur anywhere while
	323	+ * transiting on i2c bus, such that we could read an invalid len.
	324	+ * In order to recover synchronization with the next frame, we must be sure
	325	+ * to read the real amount of data without using the len byte. We do this by
	326	+ * assuming the following:
	327	+ * - the chip will always present only one single complete frame on the bus
	328	+ * before triggering the interrupt
	329	+ * - the chip will not present a new frame until we have completely read
	330	+ * the previous one (or until we have handled the interrupt).
	331	+ * The tricky case is when we read a corrupted len that is less than the real
	332	+ * len. We must detect this here in order to determine that we need to flush
	333	+ * the bus. This is the reason why we check the crc here.
	334	+ */
	335	+static irqreturn_t pn544_hci_irq_thread_fn(int irq, void *dev_id)
	336	+{
	337	+ struct pn544_hci_info *info = dev_id;
	338	+ struct i2c_client *client = info->i2c_dev;
	339	+ struct sk_buff *skb = NULL;
	340	+ int r;
	341	+
	342	+ BUG_ON(!info);
	343	+ BUG_ON(irq != info->i2c_dev->irq);
	344	+
	345	+ dev_dbg(&client->dev, "IRQ\n");
	346	+
	347	+ if (info->hard_fault != 0)
	348	+ return IRQ_HANDLED;
	349	+
	350	+ r = pn544_hci_i2c_read(client, &skb);
	351	+ if (r == -EREMOTEIO) {
	352	+ info->hard_fault = r;
	353	+
	354	+ nfc_shdlc_recv_frame(info->shdlc, NULL);
	355	+
	356	+ return IRQ_HANDLED;
	357	+ } else if ((r == -ENOMEM) \|\| (r == -EBADMSG)) {
	358	+ return IRQ_HANDLED;
	359	+ }
	360	+
	361	+ nfc_shdlc_recv_frame(info->shdlc, skb);
	362	+
	363	+ return IRQ_HANDLED;
	364	+}
	365	+
	366	+static int pn544_hci_open(struct nfc_shdlc *shdlc)
	367	+{
	368	+ struct pn544_hci_info *info = nfc_shdlc_get_clientdata(shdlc);
	369	+ int r = 0;
	370	+
	371	+ mutex_lock(&info->info_lock);
	372	+
	373	+ if (info->state != PN544_ST_COLD) {
	374	+ r = -EBUSY;
	375	+ goto out;
	376	+ }
	377	+
	378	+ r = pn544_hci_enable(info, HCI_MODE);
	379	+
	380	+out:
	381	+ mutex_unlock(&info->info_lock);
	382	+ return r;
	383	+}
	384	+
	385	+static void pn544_hci_close(struct nfc_shdlc *shdlc)
	386	+{
	387	+ struct pn544_hci_info *info = nfc_shdlc_get_clientdata(shdlc);
	388	+
	389	+ mutex_lock(&info->info_lock);
	390	+
	391	+ if (info->state == PN544_ST_COLD)
	392	+ goto out;
	393	+
	394	+ pn544_hci_disable(info);
	395	+
	396	+out:
	397	+ mutex_unlock(&info->info_lock);
	398	+}
	399	+
	400	+static int pn544_hci_ready(struct nfc_shdlc *shdlc)
	401	+{
	402	+ struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc);
	403	+ struct sk_buff *skb;
	404	+ static struct hw_config {
	405	+ u8 adr[2];
	406	+ u8 value;
	407	+ } hw_config[] = {
	408	+ {{0x9f, 0x9a}, 0x00},
	409	+
	410	+ {{0x98, 0x10}, 0xbc},
	411	+
	412	+ {{0x9e, 0x71}, 0x00},
	413	+
	414	+ {{0x98, 0x09}, 0x00},
	415	+
	416	+ {{0x9e, 0xb4}, 0x00},
	417	+
	418	+ {{0x9e, 0xd9}, 0xff},
	419	+ {{0x9e, 0xda}, 0xff},
	420	+ {{0x9e, 0xdb}, 0x23},
	421	+ {{0x9e, 0xdc}, 0x21},
	422	+ {{0x9e, 0xdd}, 0x22},
	423	+ {{0x9e, 0xde}, 0x24},
	424	+
	425	+ {{0x9c, 0x01}, 0x08},
	426	+
	427	+ {{0x9e, 0xaa}, 0x01},
	428	+
	429	+ {{0x9b, 0xd1}, 0x0d},
	430	+ {{0x9b, 0xd2}, 0x24},
	431	+ {{0x9b, 0xd3}, 0x0a},
	432	+ {{0x9b, 0xd4}, 0x22},
	433	+ {{0x9b, 0xd5}, 0x08},
	434	+ {{0x9b, 0xd6}, 0x1e},
	435	+ {{0x9b, 0xdd}, 0x1c},
	436	+
	437	+ {{0x9b, 0x84}, 0x13},
	438	+ {{0x99, 0x81}, 0x7f},
	439	+ {{0x99, 0x31}, 0x70},
	440	+
	441	+ {{0x98, 0x00}, 0x3f},
	442	+
	443	+ {{0x9f, 0x09}, 0x00},
	444	+
	445	+ {{0x9f, 0x0a}, 0x05},
	446	+
	447	+ {{0x9e, 0xd1}, 0xa1},
	448	+ {{0x99, 0x23}, 0x00},
	449	+
	450	+ {{0x9e, 0x74}, 0x80},
	451	+
	452	+ {{0x9f, 0x28}, 0x10},
	453	+
	454	+ {{0x9f, 0x35}, 0x14},
	455	+
	456	+ {{0x9f, 0x36}, 0x60},
	457	+
	458	+ {{0x9c, 0x31}, 0x00},
	459	+
	460	+ {{0x9c, 0x32}, 0xc8},
	461	+
	462	+ {{0x9c, 0x19}, 0x40},
	463	+
	464	+ {{0x9c, 0x1a}, 0x40},
	465	+
	466	+ {{0x9c, 0x0c}, 0x00},
	467	+
	468	+ {{0x9c, 0x0d}, 0x00},
	469	+
	470	+ {{0x9c, 0x12}, 0x00},
	471	+
	472	+ {{0x9c, 0x13}, 0x00},
	473	+
	474	+ {{0x98, 0xa2}, 0x0e},
	475	+
	476	+ {{0x98, 0x93}, 0x40},
	477	+
	478	+ {{0x98, 0x7d}, 0x02},
	479	+ {{0x98, 0x7e}, 0x00},
	480	+ {{0x9f, 0xc8}, 0x01},
	481	+ };
	482	+ struct hw_config *p = hw_config;
	483	+ int count = ARRAY_SIZE(hw_config);
	484	+ struct sk_buff *res_skb;
	485	+ u8 param[4];
	486	+ int r;
	487	+
	488	+ param[0] = 0;
	489	+ while (count--) {
	490	+ param[1] = p->adr[0];
	491	+ param[2] = p->adr[1];
	492	+ param[3] = p->value;
	493	+
	494	+ r = nfc_hci_send_cmd(hdev, PN544_SYS_MGMT_GATE, PN544_WRITE,
	495	+ param, 4, &res_skb);
	496	+ if (r < 0)
	497	+ return r;
	498	+
	499	+ if (res_skb->len != 1) {
	500	+ kfree_skb(res_skb);
	501	+ return -EPROTO;
	502	+ }
	503	+
	504	+ if (res_skb->data[0] != p->value) {
	505	+ kfree_skb(res_skb);
	506	+ return -EIO;
	507	+ }
	508	+
	509	+ kfree_skb(res_skb);
	510	+
	511	+ p++;
	512	+ }
	513	+
	514	+ param[0] = NFC_HCI_UICC_HOST_ID;
	515	+ r = nfc_hci_set_param(hdev, NFC_HCI_ADMIN_GATE,
	516	+ NFC_HCI_ADMIN_WHITELIST, param, 1);
	517	+ if (r < 0)
	518	+ return r;
	519	+
	520	+ param[0] = 0x3d;
	521	+ r = nfc_hci_set_param(hdev, PN544_SYS_MGMT_GATE,
	522	+ PN544_SYS_MGMT_INFO_NOTIFICATION, param, 1);
	523	+ if (r < 0)
	524	+ return r;
	525	+
	526	+ param[0] = 0x0;
	527	+ r = nfc_hci_set_param(hdev, NFC_HCI_RF_READER_A_GATE,
	528	+ PN544_RF_READER_A_AUTO_ACTIVATION, param, 1);
	529	+ if (r < 0)
	530	+ return r;
	531	+
	532	+ r = nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
	533	+ NFC_HCI_EVT_END_OPERATION, NULL, 0);
	534	+ if (r < 0)
	535	+ return r;
	536	+
	537	+ param[0] = 0x1;
	538	+ r = nfc_hci_set_param(hdev, PN544_POLLING_LOOP_MGMT_GATE,
	539	+ PN544_PL_NFCT_DEACTIVATED, param, 1);
	540	+ if (r < 0)
	541	+ return r;
	542	+
	543	+ param[0] = 0x0;
	544	+ r = nfc_hci_set_param(hdev, PN544_POLLING_LOOP_MGMT_GATE,
	545	+ PN544_PL_RDPHASES, param, 1);
	546	+ if (r < 0)
	547	+ return r;
	548	+
	549	+ r = nfc_hci_get_param(hdev, NFC_HCI_ID_MGMT_GATE,
	550	+ PN544_ID_MGMT_FULL_VERSION_SW, &skb);
	551	+ if (r < 0)
	552	+ return r;
	553	+
	554	+ if (skb->len != FULL_VERSION_LEN) {
	555	+ kfree_skb(skb);
	556	+ return -EINVAL;
	557	+ }
	558	+
	559	+ print_hex_dump(KERN_DEBUG, "FULL VERSION SOFTWARE INFO: ",
	560	+ DUMP_PREFIX_NONE, 16, 1,
	561	+ skb->data, FULL_VERSION_LEN, false);
	562	+
	563	+ kfree_skb(skb);
	564	+
	565	+ return 0;
	566	+}
	567	+
	568	+static int pn544_hci_xmit(struct nfc_shdlc shdlc, struct sk_buff skb)
	569	+{
	570	+ struct pn544_hci_info *info = nfc_shdlc_get_clientdata(shdlc);
	571	+ struct i2c_client *client = info->i2c_dev;
	572	+
	573	+ if (info->hard_fault != 0)
	574	+ return info->hard_fault;
	575	+
	576	+ return pn544_hci_i2c_write(client, skb->data, skb->len);
	577	+}
	578	+
	579	+static int pn544_hci_start_poll(struct nfc_shdlc *shdlc, u32 protocols)
	580	+{
	581	+ struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc);
	582	+ u8 phases = 0;
	583	+ int r;
	584	+ u8 duration[2];
	585	+ u8 activated;
	586	+
	587	+ pr_info(DRIVER_DESC ": %s protocols = %d\n", __func__, protocols);
	588	+
	589	+ r = nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
	590	+ NFC_HCI_EVT_END_OPERATION, NULL, 0);
	591	+ if (r < 0)
	592	+ return r;
	593	+
	594	+ duration[0] = 0x18;
	595	+ duration[1] = 0x6a;
	596	+ r = nfc_hci_set_param(hdev, PN544_POLLING_LOOP_MGMT_GATE,
	597	+ PN544_PL_EMULATION, duration, 2);
	598	+ if (r < 0)
	599	+ return r;
	600	+
	601	+ activated = 0;
	602	+ r = nfc_hci_set_param(hdev, PN544_POLLING_LOOP_MGMT_GATE,
	603	+ PN544_PL_NFCT_DEACTIVATED, &activated, 1);
	604	+ if (r < 0)
	605	+ return r;
	606	+
	607	+ if (protocols & (NFC_PROTO_ISO14443_MASK \| NFC_PROTO_MIFARE_MASK \|
	608	+ NFC_PROTO_JEWEL_MASK))
	609	+ phases \|= 1; /* Type A */
	610	+ if (protocols & NFC_PROTO_FELICA_MASK) {
	611	+ phases \|= (1 << 2); /* Type F 212 */
	612	+ phases \|= (1 << 3); /* Type F 424 */
	613	+ }
	614	+
	615	+ phases \|= (1 << 5); /* NFC active */
	616	+
	617	+ r = nfc_hci_set_param(hdev, PN544_POLLING_LOOP_MGMT_GATE,
	618	+ PN544_PL_RDPHASES, &phases, 1);
	619	+ if (r < 0)
	620	+ return r;
	621	+
	622	+ r = nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
	623	+ NFC_HCI_EVT_READER_REQUESTED, NULL, 0);
	624	+ if (r < 0)
	625	+ nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
	626	+ NFC_HCI_EVT_END_OPERATION, NULL, 0);
	627	+
	628	+ return r;
	629	+}
	630	+
	631	+static int pn544_hci_target_from_gate(struct nfc_shdlc *shdlc, u8 gate,
	632	+ struct nfc_target *target)
	633	+{
	634	+ switch (gate) {
	635	+ case PN544_RF_READER_F_GATE:
	636	+ target->supported_protocols = NFC_PROTO_FELICA_MASK;
	637	+ break;
	638	+ case PN544_RF_READER_JEWEL_GATE:
	639	+ target->supported_protocols = NFC_PROTO_JEWEL_MASK;
	640	+ target->sens_res = 0x0c00;
	641	+ break;
	642	+ default:
	643	+ return -EPROTO;
	644	+ }
	645	+
	646	+ return 0;
	647	+}
	648	+
	649	+static int pn544_hci_complete_target_discovered(struct nfc_shdlc *shdlc,
	650	+ u8 gate,
	651	+ struct nfc_target *target)
	652	+{
	653	+ struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc);
	654	+ struct sk_buff *uid_skb;
	655	+ int r = 0;
	656	+
	657	+ if (target->supported_protocols & NFC_PROTO_MIFARE_MASK) {
	658	+ if (target->nfcid1_len != 4 && target->nfcid1_len != 7 &&
	659	+ target->nfcid1_len != 10)
	660	+ return -EPROTO;
	661	+
	662	+ r = nfc_hci_send_cmd(hdev, NFC_HCI_RF_READER_A_GATE,
	663	+ PN544_RF_READER_CMD_ACTIVATE_NEXT,
	664	+ target->nfcid1, target->nfcid1_len, NULL);
	665	+ } else if (target->supported_protocols & NFC_PROTO_FELICA_MASK) {
	666	+ r = nfc_hci_get_param(hdev, PN544_RF_READER_F_GATE,
	667	+ PN544_FELICA_ID, &uid_skb);
	668	+ if (r < 0)
	669	+ return r;
	670	+
	671	+ if (uid_skb->len != 8) {
	672	+ kfree_skb(uid_skb);
	673	+ return -EPROTO;
	674	+ }
	675	+
	676	+ r = nfc_hci_send_cmd(hdev, PN544_RF_READER_F_GATE,
	677	+ PN544_RF_READER_CMD_ACTIVATE_NEXT,
	678	+ uid_skb->data, uid_skb->len, NULL);
	679	+ kfree_skb(uid_skb);
	680	+ } else if (target->supported_protocols & NFC_PROTO_ISO14443_MASK) {
	681	+ /*
	682	+ * TODO: maybe other ISO 14443 require some kind of continue
	683	+ * activation, but for now we've seen only this one below.
	684	+ */
	685	+ if (target->sens_res == 0x4403) /* Type 4 Mifare DESFire */
	686	+ r = nfc_hci_send_cmd(hdev, NFC_HCI_RF_READER_A_GATE,
	687	+ PN544_RF_READER_A_CMD_CONTINUE_ACTIVATION,
	688	+ NULL, 0, NULL);
	689	+ }
	690	+
	691	+ return r;
	692	+}
	693	+
	694	+#define MIFARE_CMD_AUTH_KEY_A 0x60
	695	+#define MIFARE_CMD_AUTH_KEY_B 0x61
	696	+#define MIFARE_CMD_HEADER 2
	697	+#define MIFARE_UID_LEN 4
	698	+#define MIFARE_KEY_LEN 6
	699	+#define MIFARE_CMD_LEN 12
	700	+/*
	701	+ * Returns:
	702	+ * <= 0: driver handled the data exchange
	703	+ * 1: driver doesn't especially handle, please do standard processing
	704	+ */
	705	+static int pn544_hci_data_exchange(struct nfc_shdlc *shdlc,
	706	+ struct nfc_target *target,
	707	+ struct sk_buff *skb,
	708	+ struct sk_buff **res_skb)
	709	+{
	710	+ struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc);
	711	+ int r;
	712	+
	713	+ pr_info(DRIVER_DESC ": %s for gate=%d\n", __func__,
	714	+ target->hci_reader_gate);
	715	+
	716	+ switch (target->hci_reader_gate) {
	717	+ case NFC_HCI_RF_READER_A_GATE:
	718	+ if (target->supported_protocols & NFC_PROTO_MIFARE_MASK) {
	719	+ /*
	720	+ * It seems that pn544 is inverting key and UID for
	721	+ * MIFARE authentication commands.
	722	+ */
	723	+ if (skb->len == MIFARE_CMD_LEN &&
	724	+ (skb->data[0] == MIFARE_CMD_AUTH_KEY_A \|\|
	725	+ skb->data[0] == MIFARE_CMD_AUTH_KEY_B)) {
	726	+ u8 uid[MIFARE_UID_LEN];
	727	+ u8 *data = skb->data + MIFARE_CMD_HEADER;
	728	+
	729	+ memcpy(uid, data + MIFARE_KEY_LEN,
	730	+ MIFARE_UID_LEN);
	731	+ memmove(data + MIFARE_UID_LEN, data,
	732	+ MIFARE_KEY_LEN);
	733	+ memcpy(data, uid, MIFARE_UID_LEN);
	734	+ }
	735	+
	736	+ return nfc_hci_send_cmd(hdev, target->hci_reader_gate,
	737	+ PN544_MIFARE_CMD,
	738	+ skb->data, skb->len, res_skb);
	739	+ } else
	740	+ return 1;
	741	+ case PN544_RF_READER_F_GATE:
	742	+ *skb_push(skb, 1) = 0;
	743	+ *skb_push(skb, 1) = 0;
	744	+
	745	+ r = nfc_hci_send_cmd(hdev, target->hci_reader_gate,
	746	+ PN544_FELICA_RAW,
	747	+ skb->data, skb->len, res_skb);
	748	+ if (r == 0)
	749	+ skb_pull(*res_skb, 1);
	750	+ return r;
	751	+ case PN544_RF_READER_JEWEL_GATE:
	752	+ return nfc_hci_send_cmd(hdev, target->hci_reader_gate,
	753	+ PN544_JEWEL_RAW_CMD,
	754	+ skb->data, skb->len, res_skb);
	755	+ default:
	756	+ return 1;
	757	+ }
	758	+}
	759	+
	760	+static int pn544_hci_check_presence(struct nfc_shdlc *shdlc,
	761	+ struct nfc_target *target)
	762	+{
	763	+ struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc);
	764	+
	765	+ return nfc_hci_send_cmd(hdev, target->hci_reader_gate,
	766	+ PN544_RF_READER_CMD_PRESENCE_CHECK,
	767	+ NULL, 0, NULL);
	768	+}
	769	+
	770	+static struct nfc_shdlc_ops pn544_shdlc_ops = {
	771	+ .open = pn544_hci_open,
	772	+ .close = pn544_hci_close,
	773	+ .hci_ready = pn544_hci_ready,
	774	+ .xmit = pn544_hci_xmit,
	775	+ .start_poll = pn544_hci_start_poll,
	776	+ .target_from_gate = pn544_hci_target_from_gate,
	777	+ .complete_target_discovered = pn544_hci_complete_target_discovered,
	778	+ .data_exchange = pn544_hci_data_exchange,
	779	+ .check_presence = pn544_hci_check_presence,
	780	+};
	781	+
	782	+static int __devinit pn544_hci_probe(struct i2c_client *client,
	783	+ const struct i2c_device_id *id)
	784	+{
	785	+ struct pn544_hci_info *info;
	786	+ struct pn544_nfc_platform_data *pdata;
	787	+ int r = 0;
	788	+ u32 protocols;
	789	+ struct nfc_hci_init_data init_data;
	790	+
	791	+ dev_dbg(&client->dev, "%s\n", __func__);
	792	+ dev_dbg(&client->dev, "IRQ: %d\n", client->irq);
	793	+
	794	+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
	795	+ dev_err(&client->dev, "Need I2C_FUNC_I2C\n");
	796	+ return -ENODEV;
	797	+ }
	798	+
	799	+ info = kzalloc(sizeof(struct pn544_hci_info), GFP_KERNEL);
	800	+ if (!info) {
	801	+ dev_err(&client->dev,
	802	+ "Cannot allocate memory for pn544_hci_info.\n");
	803	+ r = -ENOMEM;
	804	+ goto err_info_alloc;
	805	+ }
	806	+
	807	+ info->i2c_dev = client;
	808	+ info->state = PN544_ST_COLD;
	809	+ mutex_init(&info->info_lock);
	810	+ i2c_set_clientdata(client, info);
	811	+
	812	+ pdata = client->dev.platform_data;
	813	+ if (pdata == NULL) {
	814	+ dev_err(&client->dev, "No platform data\n");
	815	+ r = -EINVAL;
	816	+ goto err_pdata;
	817	+ }
	818	+
	819	+ if (pdata->request_resources == NULL) {
	820	+ dev_err(&client->dev, "request_resources() missing\n");
	821	+ r = -EINVAL;
	822	+ goto err_pdata;
	823	+ }
	824	+
	825	+ r = pdata->request_resources(client);
	826	+ if (r) {
	827	+ dev_err(&client->dev, "Cannot get platform resources\n");
	828	+ goto err_pdata;
	829	+ }
	830	+
	831	+ info->gpio_en = pdata->get_gpio(NFC_GPIO_ENABLE);
	832	+ info->gpio_fw = pdata->get_gpio(NFC_GPIO_FW_RESET);
	833	+ info->gpio_irq = pdata->get_gpio(NFC_GPIO_IRQ);
	834	+
	835	+ pn544_hci_platform_init(info);
	836	+
	837	+ r = request_threaded_irq(client->irq, NULL, pn544_hci_irq_thread_fn,
	838	+ IRQF_TRIGGER_RISING, PN544_HCI_DRIVER_NAME,
	839	+ info);
	840	+ if (r < 0) {
	841	+ dev_err(&client->dev, "Unable to register IRQ handler\n");
	842	+ goto err_rti;
	843	+ }
	844	+
	845	+ init_data.gate_count = ARRAY_SIZE(pn544_custom_gates);
	846	+
	847	+ memcpy(init_data.gates, pn544_custom_gates,
	848	+ ARRAY_SIZE(pn544_custom_gates));
	849	+
	850	+ /*
	851	+ * TODO: Session id must include the driver name + some bus addr
	852	+ * persistent info to discriminate 2 identical chips
	853	+ */
	854	+ strcpy(init_data.session_id, "ID544HCI");
	855	+
	856	+ protocols = NFC_PROTO_JEWEL_MASK \|
	857	+ NFC_PROTO_MIFARE_MASK \|
	858	+ NFC_PROTO_FELICA_MASK \|
	859	+ NFC_PROTO_ISO14443_MASK \|
	860	+ NFC_PROTO_NFC_DEP_MASK;
	861	+
	862	+ info->shdlc = nfc_shdlc_allocate(&pn544_shdlc_ops,
	863	+ &init_data, protocols,
	864	+ PN544_CMDS_HEADROOM, 0,
	865	+ PN544_HCI_LLC_MAX_PAYLOAD,
	866	+ dev_name(&client->dev));
	867	+ if (!info->shdlc) {
	868	+ dev_err(&client->dev, "Cannot allocate nfc shdlc.\n");
	869	+ r = -ENOMEM;
	870	+ goto err_allocshdlc;
	871	+ }
	872	+
	873	+ nfc_shdlc_set_clientdata(info->shdlc, info);
	874	+
	875	+ return 0;
	876	+
	877	+err_allocshdlc:
	878	+ free_irq(client->irq, info);
	879	+
	880	+err_rti:
	881	+ if (pdata->free_resources != NULL)
	882	+ pdata->free_resources();
	883	+
	884	+err_pdata:
	885	+ kfree(info);
	886	+
	887	+err_info_alloc:
	888	+ return r;
	889	+}
	890	+
	891	+static __devexit int pn544_hci_remove(struct i2c_client *client)
	892	+{
	893	+ struct pn544_hci_info *info = i2c_get_clientdata(client);
	894	+ struct pn544_nfc_platform_data *pdata = client->dev.platform_data;
	895	+
	896	+ dev_dbg(&client->dev, "%s\n", __func__);
	897	+
	898	+ nfc_shdlc_free(info->shdlc);
	899	+
	900	+ if (info->state != PN544_ST_COLD) {
	901	+ if (pdata->disable)
	902	+ pdata->disable();
	903	+ }
	904	+
	905	+ free_irq(client->irq, info);
	906	+ if (pdata->free_resources)
	907	+ pdata->free_resources();
	908	+
	909	+ kfree(info);
	910	+
	911	+ return 0;
	912	+}
	913	+
	914	+static struct i2c_driver pn544_hci_driver = {
	915	+ .driver = {
	916	+ .name = PN544_HCI_DRIVER_NAME,
	917	+ },
	918	+ .probe = pn544_hci_probe,
	919	+ .id_table = pn544_hci_id_table,
	920	+ .remove = __devexit_p(pn544_hci_remove),
	921	+};
	922	+
	923	+static int __init pn544_hci_init(void)
	924	+{
	925	+ int r;
	926	+
	927	+ pr_debug(DRIVER_DESC ": %s\n", __func__);
	928	+
	929	+ r = i2c_add_driver(&pn544_hci_driver);
	930	+ if (r) {
	931	+ pr_err(PN544_HCI_DRIVER_NAME ": driver registration failed\n");
	932	+ return r;
	933	+ }
	934	+
	935	+ return 0;
	936	+}
	937	+
	938	+static void __exit pn544_hci_exit(void)
	939	+{
	940	+ i2c_del_driver(&pn544_hci_driver);
	941	+}
	942	+
	943	+module_init(pn544_hci_init);
	944	+module_exit(pn544_hci_exit);
	945	+
	946	+MODULE_LICENSE("GPL");
	947	+MODULE_DESCRIPTION(DRIVER_DESC);

drivers/ssb/b43_pci_bridge.c+2−0

@@ -29,6 +29,8 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = { · 28 unmodified lines
29	29	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4319) },
30	30	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4320) },
31	31	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
	32	+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4322) },
	33	+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43222) },
32	34	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4324) },
33	35	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4325) },
34	36	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4328) },

drivers/ssb/pci.c+82−6

@@ -178,6 +178,18 @@ err_pci: · 177 unmodified lines
178	178	#define SPEX(_outvar, _offset, _mask, _shift) \
179	179	SPEX16(_outvar, _offset, _mask, _shift)
180	180
	181	+#define SPEX_ARRAY8(_field, _offset, _mask, _shift) \
	182	+ do { \
	183	+ SPEX(_field[0], _offset + 0, _mask, _shift); \
	184	+ SPEX(_field[1], _offset + 2, _mask, _shift); \
	185	+ SPEX(_field[2], _offset + 4, _mask, _shift); \
	186	+ SPEX(_field[3], _offset + 6, _mask, _shift); \
	187	+ SPEX(_field[4], _offset + 8, _mask, _shift); \
	188	+ SPEX(_field[5], _offset + 10, _mask, _shift); \
	189	+ SPEX(_field[6], _offset + 12, _mask, _shift); \
	190	+ SPEX(_field[7], _offset + 14, _mask, _shift); \
	191	+ } while (0)
	192	+
181	193
182	194	static inline u8 ssb_crc8(u8 crc, u8 data)
183	195	{
@@ -360,8 +372,9 @@ static void sprom_extract_r123(struct ssb_sprom out, const u16 in) · 176 unmodified lines
360	372	SPEX(et0mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0M, 14);
361	373	SPEX(et1mdcport, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1M, 15);
362	374	SPEX(board_rev, SSB_SPROM1_BINF, SSB_SPROM1_BINF_BREV, 0);
363		− SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,
364		− SSB_SPROM1_BINF_CCODE_SHIFT);
	375	+ if (out->revision == 1)
	376	+ SPEX(country_code, SSB_SPROM1_BINF, SSB_SPROM1_BINF_CCODE,
	377	+ SSB_SPROM1_BINF_CCODE_SHIFT);
365	378	SPEX(ant_available_a, SSB_SPROM1_BINF, SSB_SPROM1_BINF_ANTA,
366	379	SSB_SPROM1_BINF_ANTA_SHIFT);
367	380	SPEX(ant_available_bg, SSB_SPROM1_BINF, SSB_SPROM1_BINF_ANTBG,
@@ -387,6 +400,8 @@ static void sprom_extract_r123(struct ssb_sprom out, const u16 in) · 19 unmodified lines
387	400	SPEX(boardflags_lo, SSB_SPROM1_BFLLO, 0xFFFF, 0);
388	401	if (out->revision >= 2)
389	402	SPEX(boardflags_hi, SSB_SPROM2_BFLHI, 0xFFFF, 0);
	403	+ SPEX(alpha2[0], SSB_SPROM1_CCODE, 0xff00, 8);
	404	+ SPEX(alpha2[1], SSB_SPROM1_CCODE, 0x00ff, 0);
390	405
391	406	/* Extract the antenna gain values. */
392	407	out->antenna_gain.a0 = r123_extract_antgain(out->revision, in,
@@ -455,14 +470,17 @@ static void sprom_extract_r45(struct ssb_sprom out, const u16 in) · 62 unmodified lines
455	470	SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0);
456	471	SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,
457	472	SSB_SPROM4_ETHPHY_ET1A_SHIFT);
	473	+ SPEX(board_rev, SSB_SPROM4_BOARDREV, 0xFFFF, 0);
458	474	if (out->revision == 4) {
459		− SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
	475	+ SPEX(alpha2[0], SSB_SPROM4_CCODE, 0xff00, 8);
	476	+ SPEX(alpha2[1], SSB_SPROM4_CCODE, 0x00ff, 0);
460	477	SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
461	478	SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
462	479	SPEX(boardflags2_lo, SSB_SPROM4_BFL2LO, 0xFFFF, 0);
463	480	SPEX(boardflags2_hi, SSB_SPROM4_BFL2HI, 0xFFFF, 0);
464	481	} else {
465		− SPEX(country_code, SSB_SPROM5_CCODE, 0xFFFF, 0);
	482	+ SPEX(alpha2[0], SSB_SPROM5_CCODE, 0xff00, 8);
	483	+ SPEX(alpha2[1], SSB_SPROM5_CCODE, 0x00ff, 0);
466	484	SPEX(boardflags_lo, SSB_SPROM5_BFLLO, 0xFFFF, 0);
467	485	SPEX(boardflags_hi, SSB_SPROM5_BFLHI, 0xFFFF, 0);
468	486	SPEX(boardflags2_lo, SSB_SPROM5_BFL2LO, 0xFFFF, 0);
@@ -525,7 +543,9 @@ static void sprom_extract_r8(struct ssb_sprom out, const u16 in) · 56 unmodified lines
525	543	v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
526	544	(((__be16 )out->il0mac) + i) = cpu_to_be16(v);
527	545	}
528		− SPEX(country_code, SSB_SPROM8_CCODE, 0xFFFF, 0);
	546	+ SPEX(board_rev, SSB_SPROM8_BOARDREV, 0xFFFF, 0);
	547	+ SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
	548	+ SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
529	549	SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
530	550	SPEX(boardflags_hi, SSB_SPROM8_BFLHI, 0xFFFF, 0);
531	551	SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, 0xFFFF, 0);
@@ -655,6 +675,63 @@ static void sprom_extract_r8(struct ssb_sprom out, const u16 in) · 123 unmodified lines
655	675	SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G,
656	676	SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
657	677
	678	+ SPEX(leddc_on_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_ON,
	679	+ SSB_SPROM8_LEDDC_ON_SHIFT);
	680	+ SPEX(leddc_off_time, SSB_SPROM8_LEDDC, SSB_SPROM8_LEDDC_OFF,
	681	+ SSB_SPROM8_LEDDC_OFF_SHIFT);
	682	+
	683	+ SPEX(txchain, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_TXCHAIN,
	684	+ SSB_SPROM8_TXRXC_TXCHAIN_SHIFT);
	685	+ SPEX(rxchain, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_RXCHAIN,
	686	+ SSB_SPROM8_TXRXC_RXCHAIN_SHIFT);
	687	+ SPEX(antswitch, SSB_SPROM8_TXRXC, SSB_SPROM8_TXRXC_SWITCH,
	688	+ SSB_SPROM8_TXRXC_SWITCH_SHIFT);
	689	+
	690	+ SPEX(opo, SSB_SPROM8_OFDM2GPO, 0x00ff, 0);
	691	+
	692	+ SPEX_ARRAY8(mcs2gpo, SSB_SPROM8_2G_MCSPO, ~0, 0);
	693	+ SPEX_ARRAY8(mcs5gpo, SSB_SPROM8_5G_MCSPO, ~0, 0);
	694	+ SPEX_ARRAY8(mcs5glpo, SSB_SPROM8_5GL_MCSPO, ~0, 0);
	695	+ SPEX_ARRAY8(mcs5ghpo, SSB_SPROM8_5GH_MCSPO, ~0, 0);
	696	+
	697	+ SPEX(rawtempsense, SSB_SPROM8_RAWTS, SSB_SPROM8_RAWTS_RAWTEMP,
	698	+ SSB_SPROM8_RAWTS_RAWTEMP_SHIFT);
	699	+ SPEX(measpower, SSB_SPROM8_RAWTS, SSB_SPROM8_RAWTS_MEASPOWER,
	700	+ SSB_SPROM8_RAWTS_MEASPOWER_SHIFT);
	701	+ SPEX(tempsense_slope, SSB_SPROM8_OPT_CORRX,
	702	+ SSB_SPROM8_OPT_CORRX_TEMP_SLOPE,
	703	+ SSB_SPROM8_OPT_CORRX_TEMP_SLOPE_SHIFT);
	704	+ SPEX(tempcorrx, SSB_SPROM8_OPT_CORRX, SSB_SPROM8_OPT_CORRX_TEMPCORRX,
	705	+ SSB_SPROM8_OPT_CORRX_TEMPCORRX_SHIFT);
	706	+ SPEX(tempsense_option, SSB_SPROM8_OPT_CORRX,
	707	+ SSB_SPROM8_OPT_CORRX_TEMP_OPTION,
	708	+ SSB_SPROM8_OPT_CORRX_TEMP_OPTION_SHIFT);
	709	+ SPEX(freqoffset_corr, SSB_SPROM8_HWIQ_IQSWP,
	710	+ SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR,
	711	+ SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR_SHIFT);
	712	+ SPEX(iqcal_swp_dis, SSB_SPROM8_HWIQ_IQSWP,
	713	+ SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP,
	714	+ SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP_SHIFT);
	715	+ SPEX(hw_iqcal_en, SSB_SPROM8_HWIQ_IQSWP, SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL,
	716	+ SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL_SHIFT);
	717	+
	718	+ SPEX(bw40po, SSB_SPROM8_BW40PO, ~0, 0);
	719	+ SPEX(cddpo, SSB_SPROM8_CDDPO, ~0, 0);
	720	+ SPEX(stbcpo, SSB_SPROM8_STBCPO, ~0, 0);
	721	+ SPEX(bwduppo, SSB_SPROM8_BWDUPPO, ~0, 0);
	722	+
	723	+ SPEX(tempthresh, SSB_SPROM8_THERMAL, SSB_SPROM8_THERMAL_TRESH,
	724	+ SSB_SPROM8_THERMAL_TRESH_SHIFT);
	725	+ SPEX(tempoffset, SSB_SPROM8_THERMAL, SSB_SPROM8_THERMAL_OFFSET,
	726	+ SSB_SPROM8_THERMAL_OFFSET_SHIFT);
	727	+ SPEX(phycal_tempdelta, SSB_SPROM8_TEMPDELTA,
	728	+ SSB_SPROM8_TEMPDELTA_PHYCAL,
	729	+ SSB_SPROM8_TEMPDELTA_PHYCAL_SHIFT);
	730	+ SPEX(temps_period, SSB_SPROM8_TEMPDELTA, SSB_SPROM8_TEMPDELTA_PERIOD,
	731	+ SSB_SPROM8_TEMPDELTA_PERIOD_SHIFT);
	732	+ SPEX(temps_hysteresis, SSB_SPROM8_TEMPDELTA,
	733	+ SSB_SPROM8_TEMPDELTA_HYSTERESIS,
	734	+ SSB_SPROM8_TEMPDELTA_HYSTERESIS_SHIFT);
658	735	sprom_extract_r458(out, in);
659	736
660	737	/* TODO - get remaining rev 8 stuff needed */
@@ -784,7 +861,6 @@ static void ssb_pci_get_boardinfo(struct ssb_bus *bus, · 123 unmodified lines
784	861	{
785	862	bi->vendor = bus->host_pci->subsystem_vendor;
786	863	bi->type = bus->host_pci->subsystem_device;
787		− bi->rev = bus->host_pci->revision;
788	864	}
789	865
790	866	int ssb_pci_get_invariants(struct ssb_bus *bus,

fs/dcache.c+2−0

@@ -3093,6 +3093,7 @@ static void __init dcache_init_early(void) · 3092 unmodified lines
3093	3093	HASH_EARLY,
3094	3094	&d_hash_shift,
3095	3095	&d_hash_mask,
	3096	+ 0,
3096	3097	0);
3097	3098
3098	3099	for (loop = 0; loop < (1U << d_hash_shift); loop++)
@@ -3123,6 +3124,7 @@ static void __init dcache_init(void) · 24 unmodified lines
3123	3124	0,
3124	3125	&d_hash_shift,
3125	3126	&d_hash_mask,
	3127	+ 0,
3126	3128	0);
3127	3129
3128	3130	for (loop = 0; loop < (1U << d_hash_shift); loop++)

fs/inode.c+2−0

@@ -1647,6 +1647,7 @@ void __init inode_init_early(void) · 1646 unmodified lines
1647	1647	HASH_EARLY,
1648	1648	&i_hash_shift,
1649	1649	&i_hash_mask,
	1650	+ 0,
1650	1651	0);
1651	1652
1652	1653	for (loop = 0; loop < (1U << i_hash_shift); loop++)
@@ -1677,6 +1678,7 @@ void __init inode_init(void) · 24 unmodified lines
1677	1678	0,
1678	1679	&i_hash_shift,
1679	1680	&i_hash_mask,
	1681	+ 0,
1680	1682	0);
1681	1683
1682	1684	for (loop = 0; loop < (1U << i_hash_shift); loop++)

include/linux/Kbuild+1−0

@@ -270,6 +270,7 @@ header-y += netfilter_ipv4.h · 269 unmodified lines
270	270	header-y += netfilter_ipv6.h
271	271	header-y += netlink.h
272	272	header-y += netrom.h
	273	+header-y += nfc.h
273	274	header-y += nfs.h
274	275	header-y += nfs2.h
275	276	header-y += nfs3.h

include/linux/bcma/bcma.h+7−0

@@ -26,6 +26,11 @@ struct bcma_chipinfo { · 25 unmodified lines
26	26	u8 pkg;
27	27	};
28	28
	29	+struct bcma_boardinfo {
	30	+ u16 vendor;
	31	+ u16 type;
	32	+};
	33	+
29	34	enum bcma_clkmode {
30	35	BCMA_CLKMODE_FAST,
31	36	BCMA_CLKMODE_DYNAMIC,
@@ -199,6 +204,8 @@ struct bcma_bus { · 167 unmodified lines
199	204
200	205	struct bcma_chipinfo chipinfo;
201	206
	207	+ struct bcma_boardinfo boardinfo;
	208	+
202	209	struct bcma_device *mapped_core;
203	210	struct list_head cores;
204	211	u8 nr_cores;

include/linux/bcma/bcma_driver_pci.h+11−0

@@ -87,6 +87,13 @@ struct pci_dev; · 86 unmodified lines
87	87	#define BCMA_CORE_PCI_PCICFG2 0x0600 /* PCI config space 2 (rev >= 8) */
88	88	#define BCMA_CORE_PCI_PCICFG3 0x0700 /* PCI config space 3 (rev >= 8) */
89	89	#define BCMA_CORE_PCI_SPROM(wordoffset) (0x0800 + ((wordoffset) * 2)) /* SPROM shadow area (72 bytes) */
	90	+#define BCMA_CORE_PCI_SPROM_PI_OFFSET 0 /* first word */
	91	+#define BCMA_CORE_PCI_SPROM_PI_MASK 0xf000 /* bit 15:12 */
	92	+#define BCMA_CORE_PCI_SPROM_PI_SHIFT 12 /* bit 15:12 */
	93	+#define BCMA_CORE_PCI_SPROM_MISC_CONFIG 5 /* word 5 */
	94	+#define BCMA_CORE_PCI_SPROM_L23READY_EXIT_NOPERST 0x8000 /* bit 15 */
	95	+#define BCMA_CORE_PCI_SPROM_CLKREQ_OFFSET_REV5 20 /* word 20 for srom rev <= 5 */
	96	+#define BCMA_CORE_PCI_SPROM_CLKREQ_ENB 0x0800 /* bit 11 */
90	97
91	98	/* SBtoPCIx */
92	99	#define BCMA_CORE_PCI_SBTOPCI_MEM 0x00000000
@@ -133,6 +140,7 @@ struct pci_dev; · 40 unmodified lines
133	140	#define BCMA_CORE_PCI_DLLP_LRREG 0x120 /* Link Replay */
134	141	#define BCMA_CORE_PCI_DLLP_LACKTOREG 0x124 /* Link Ack Timeout */
135	142	#define BCMA_CORE_PCI_DLLP_PMTHRESHREG 0x128 /* Power Management Threshold */
	143	+#define BCMA_CORE_PCI_ASPMTIMER_EXTEND 0x01000000 /* > rev7: enable extend ASPM timer */
136	144	#define BCMA_CORE_PCI_DLLP_RTRYWPREG 0x12C /* Retry buffer write ptr */
137	145	#define BCMA_CORE_PCI_DLLP_RTRYRPREG 0x130 /* Retry buffer Read ptr */
138	146	#define BCMA_CORE_PCI_DLLP_RTRYPPREG 0x134 /* Retry buffer Purged ptr */
@@ -201,12 +209,15 @@ struct bcma_drv_pci { · 62 unmodified lines
201	209	};
202	210
203	211	/* Register access */
	212	+#define pcicore_read16(pc, offset) bcma_read16((pc)->core, offset)
204	213	#define pcicore_read32(pc, offset) bcma_read32((pc)->core, offset)
	214	+#define pcicore_write16(pc, offset, val) bcma_write16((pc)->core, offset, val)
205	215	#define pcicore_write32(pc, offset, val) bcma_write32((pc)->core, offset, val)
206	216
207	217	extern void __devinit bcma_core_pci_init(struct bcma_drv_pci *pc);
208	218	extern int bcma_core_pci_irq_ctl(struct bcma_drv_pci *pc,
209	219	struct bcma_device *core, bool enable);
	220	+extern void bcma_core_pci_extend_L1timer(struct bcma_drv_pci *pc, bool extend);
210	221
211	222	extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
212	223	extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);

include/linux/bootmem.h+2−1

@@ -154,7 +154,8 @@ extern void alloc_large_system_hash(const char tablename, · 153 unmodified lines
154	154	int flags,
155	155	unsigned int *_hash_shift,
156	156	unsigned int *_hash_mask,
157		− unsigned long limit);
	157	+ unsigned long low_limit,
	158	+ unsigned long high_limit);
158	159
159	160	#define HASH_EARLY 0x00000001 /* Allocating during early boot? */
160	161	#define HASH_SMALL 0x00000002 /* sub-page allocation allowed, min

include/linux/if_arp.h+1−1

@@ -82,7 +82,7 @@ · 81 unmodified lines
82	82	#define ARPHRD_FCPL 786 /* Fibrechannel public loop */
83	83	#define ARPHRD_FCFABRIC 787 /* Fibrechannel fabric */
84	84	/* 787->799 reserved for fibrechannel media types */
85		−/* 800 used to be used for token ring */
	85	+#define ARPHRD_IEEE802_TR 800 /* Magic type ident for TR */
86	86	#define ARPHRD_IEEE80211 801 /* IEEE 802.11 */
87	87	#define ARPHRD_IEEE80211_PRISM 802 /* IEEE 802.11 + Prism2 header */
88	88	#define ARPHRD_IEEE80211_RADIOTAP 803 /* IEEE 802.11 + radiotap header */

include/linux/ipx.h+1−1

@@ -38,7 +38,7 @@ struct ipx_interface_definition { · 37 unmodified lines
38	38	#define IPX_FRAME_8022 2
39	39	#define IPX_FRAME_ETHERII 3
40	40	#define IPX_FRAME_8023 4
41		−/* obsolete token ring was 5 */
	41	+#define IPX_FRAME_TR_8022 5 /* obsolete */
42	42	unsigned char ipx_special;
43	43	#define IPX_SPECIAL_NONE 0
44	44	#define IPX_PRIMARY 1

include/linux/micrel_phy.h+1−1

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	3
4	4	#define MICREL_PHY_ID_MASK 0x00fffff0
5	5
6		−#define PHY_ID_KSZ9021 0x00221611
	6	+#define PHY_ID_KSZ9021 0x00221610
7	7	#define PHY_ID_KS8737 0x00221720
8	8	#define PHY_ID_KS8041 0x00221510
9	9	#define PHY_ID_KS8051 0x00221550

include/linux/nfc/pn544.h+7−0

@@ -84,6 +84,12 @@ struct pn544_fw_packet { · 83 unmodified lines
84	84	};
85	85
86	86	#ifdef __KERNEL__
	87	+enum {
	88	+ NFC_GPIO_ENABLE,
	89	+ NFC_GPIO_FW_RESET,
	90	+ NFC_GPIO_IRQ
	91	+};
	92	+
87	93	/* board config */
88	94	struct pn544_nfc_platform_data {
89	95	int (request_resources) (struct i2c_client client);
@@ -91,6 +97,7 @@ struct pn544_nfc_platform_data { · 1 unmodified line
91	97	void (*enable) (int fw);
92	98	int (*test) (void);
93	99	void (*disable) (void);
	100	+ int (*get_gpio)(int type);
94	101	};
95	102	#endif /* __KERNEL__ */
96	103

include/linux/nl80211.h+5−3

@@ -1594,6 +1594,8 @@ enum nl80211_sta_flags { · 1593 unmodified lines
1594	1594	NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
1595	1595	};
1596	1596
	1597	+#define NL80211_STA_FLAG_MAX_OLD_API NL80211_STA_FLAG_TDLS_PEER
	1598	+
1597	1599	/**
1598	1600	* struct nl80211_sta_flag_update - station flags mask/set
1599	1601	* @mask: mask of station flags to set
@@ -1994,9 +1996,9 @@ enum nl80211_reg_rule_flags { · 394 unmodified lines
1994	1996	* enum nl80211_dfs_regions - regulatory DFS regions
1995	1997	*
1996	1998	* @NL80211_DFS_UNSET: Country has no DFS master region specified
1997		− * @NL80211_DFS_FCC_: Country follows DFS master rules from FCC
1998		− * @NL80211_DFS_FCC_: Country follows DFS master rules from ETSI
1999		− * @NL80211_DFS_JP_: Country follows DFS master rules from JP/MKK/Telec
	1999	+ * @NL80211_DFS_FCC: Country follows DFS master rules from FCC
	2000	+ * @NL80211_DFS_ETSI: Country follows DFS master rules from ETSI
	2001	+ * @NL80211_DFS_JP: Country follows DFS master rules from JP/MKK/Telec
2000	2002	*/
2001	2003	enum nl80211_dfs_regions {
2002	2004	NL80211_DFS_UNSET = 0,

include/linux/ssb/ssb.h+0−1

@@ -188,7 +188,6 @@ struct ssb_sprom { · 187 unmodified lines
188	188	struct ssb_boardinfo {
189	189	u16 vendor;
190	190	u16 type;
191		− u8 rev;
192	191	};
193	192
194	193

include/linux/ssb/ssb_regs.h+57−4

@@ -228,6 +228,7 @@ · 227 unmodified lines
228	228	#define SSB_SPROM1_AGAIN_BG_SHIFT 0
229	229	#define SSB_SPROM1_AGAIN_A 0xFF00 /* A-PHY */
230	230	#define SSB_SPROM1_AGAIN_A_SHIFT 8
	231	+#define SSB_SPROM1_CCODE 0x0076
231	232
232	233	/* SPROM Revision 2 (inherits from rev 1) */
233	234	#define SSB_SPROM2_BFLHI 0x0038 /* Boardflags (high 16 bits) */
@@ -267,6 +268,7 @@ · 33 unmodified lines
267	268	#define SSB_SPROM3_OFDMGPO 0x107A /* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
268	269
269	270	/* SPROM Revision 4 */
	271	+#define SSB_SPROM4_BOARDREV 0x0042 /* Board revision */
270	272	#define SSB_SPROM4_BFLLO 0x0044 /* Boardflags (low 16 bits) */
271	273	#define SSB_SPROM4_BFLHI 0x0046 /* Board Flags Hi */
272	274	#define SSB_SPROM4_BFL2LO 0x0048 /* Board flags 2 (low 16 bits) */
@@ -389,6 +391,11 @@ · 116 unmodified lines
389	391	#define SSB_SPROM8_GPIOB_P2 0x00FF /* Pin 2 */
390	392	#define SSB_SPROM8_GPIOB_P3 0xFF00 /* Pin 3 */
391	393	#define SSB_SPROM8_GPIOB_P3_SHIFT 8
	394	+#define SSB_SPROM8_LEDDC 0x009A
	395	+#define SSB_SPROM8_LEDDC_ON 0xFF00 /* oncount */
	396	+#define SSB_SPROM8_LEDDC_ON_SHIFT 8
	397	+#define SSB_SPROM8_LEDDC_OFF 0x00FF /* offcount */
	398	+#define SSB_SPROM8_LEDDC_OFF_SHIFT 0
392	399	#define SSB_SPROM8_ANTAVAIL 0x009C /* Antenna available bitfields*/
393	400	#define SSB_SPROM8_ANTAVAIL_A 0xFF00 /* A-PHY bitfield */
394	401	#define SSB_SPROM8_ANTAVAIL_A_SHIFT 8
@@ -404,6 +411,13 @@ · 9 unmodified lines
404	411	#define SSB_SPROM8_AGAIN2_SHIFT 0
405	412	#define SSB_SPROM8_AGAIN3 0xFF00 /* Antenna 3 */
406	413	#define SSB_SPROM8_AGAIN3_SHIFT 8
	414	+#define SSB_SPROM8_TXRXC 0x00A2
	415	+#define SSB_SPROM8_TXRXC_TXCHAIN 0x000f
	416	+#define SSB_SPROM8_TXRXC_TXCHAIN_SHIFT 0
	417	+#define SSB_SPROM8_TXRXC_RXCHAIN 0x00f0
	418	+#define SSB_SPROM8_TXRXC_RXCHAIN_SHIFT 4
	419	+#define SSB_SPROM8_TXRXC_SWITCH 0xff00
	420	+#define SSB_SPROM8_TXRXC_SWITCH_SHIFT 8
407	421	#define SSB_SPROM8_RSSIPARM2G 0x00A4 /* RSSI params for 2GHz */
408	422	#define SSB_SPROM8_RSSISMF2G 0x000F
409	423	#define SSB_SPROM8_RSSISMC2G 0x00F0
@@ -430,6 +444,7 @@ · 20 unmodified lines
430	444	#define SSB_SPROM8_TRI5GH_SHIFT 8
431	445	#define SSB_SPROM8_RXPO 0x00AC /* RX power offsets */
432	446	#define SSB_SPROM8_RXPO2G 0x00FF /* 2GHz RX power offset */
	447	+#define SSB_SPROM8_RXPO2G_SHIFT 0
433	448	#define SSB_SPROM8_RXPO5G 0xFF00 /* 5GHz RX power offset */
434	449	#define SSB_SPROM8_RXPO5G_SHIFT 8
435	450	#define SSB_SPROM8_FEM2G 0x00AE
@@ -445,10 +460,38 @@ · 9 unmodified lines
445	460	#define SSB_SROM8_FEM_ANTSWLUT 0xF800
446	461	#define SSB_SROM8_FEM_ANTSWLUT_SHIFT 11
447	462	#define SSB_SPROM8_THERMAL 0x00B2
448		−#define SSB_SPROM8_MPWR_RAWTS 0x00B4
449		−#define SSB_SPROM8_TS_SLP_OPT_CORRX 0x00B6
450		−#define SSB_SPROM8_FOC_HWIQ_IQSWP 0x00B8
451		−#define SSB_SPROM8_PHYCAL_TEMPDELTA 0x00BA
	463	+#define SSB_SPROM8_THERMAL_OFFSET 0x00ff
	464	+#define SSB_SPROM8_THERMAL_OFFSET_SHIFT 0
	465	+#define SSB_SPROM8_THERMAL_TRESH 0xff00
	466	+#define SSB_SPROM8_THERMAL_TRESH_SHIFT 8
	467	+/* Temp sense related entries */
	468	+#define SSB_SPROM8_RAWTS 0x00B4
	469	+#define SSB_SPROM8_RAWTS_RAWTEMP 0x01ff
	470	+#define SSB_SPROM8_RAWTS_RAWTEMP_SHIFT 0
	471	+#define SSB_SPROM8_RAWTS_MEASPOWER 0xfe00
	472	+#define SSB_SPROM8_RAWTS_MEASPOWER_SHIFT 9
	473	+#define SSB_SPROM8_OPT_CORRX 0x00B6
	474	+#define SSB_SPROM8_OPT_CORRX_TEMP_SLOPE 0x00ff
	475	+#define SSB_SPROM8_OPT_CORRX_TEMP_SLOPE_SHIFT 0
	476	+#define SSB_SPROM8_OPT_CORRX_TEMPCORRX 0xfc00
	477	+#define SSB_SPROM8_OPT_CORRX_TEMPCORRX_SHIFT 10
	478	+#define SSB_SPROM8_OPT_CORRX_TEMP_OPTION 0x0300
	479	+#define SSB_SPROM8_OPT_CORRX_TEMP_OPTION_SHIFT 8
	480	+/* FOC: freiquency offset correction, HWIQ: H/W IOCAL enable, IQSWP: IQ CAL swap disable */
	481	+#define SSB_SPROM8_HWIQ_IQSWP 0x00B8
	482	+#define SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR 0x000f
	483	+#define SSB_SPROM8_HWIQ_IQSWP_FREQ_CORR_SHIFT 0
	484	+#define SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP 0x0010
	485	+#define SSB_SPROM8_HWIQ_IQSWP_IQCAL_SWP_SHIFT 4
	486	+#define SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL 0x0020
	487	+#define SSB_SPROM8_HWIQ_IQSWP_HW_IQCAL_SHIFT 5
	488	+#define SSB_SPROM8_TEMPDELTA 0x00BA
	489	+#define SSB_SPROM8_TEMPDELTA_PHYCAL 0x00ff
	490	+#define SSB_SPROM8_TEMPDELTA_PHYCAL_SHIFT 0
	491	+#define SSB_SPROM8_TEMPDELTA_PERIOD 0x0f00
	492	+#define SSB_SPROM8_TEMPDELTA_PERIOD_SHIFT 8
	493	+#define SSB_SPROM8_TEMPDELTA_HYSTERESIS 0xf000
	494	+#define SSB_SPROM8_TEMPDELTA_HYSTERESIS_SHIFT 12
452	495
453	496	/* There are 4 blocks with power info sharing the same layout */
454	497	#define SSB_SROM8_PWR_INFO_CORE0 0x00C0
@@ -513,6 +556,16 @@ · 58 unmodified lines
513	556	#define SSB_SPROM8_OFDM5GLPO 0x014A /* 5.2GHz OFDM power offset */
514	557	#define SSB_SPROM8_OFDM5GHPO 0x014E /* 5.8GHz OFDM power offset */
515	558
	559	+#define SSB_SPROM8_2G_MCSPO 0x0152
	560	+#define SSB_SPROM8_5G_MCSPO 0x0162
	561	+#define SSB_SPROM8_5GL_MCSPO 0x0172
	562	+#define SSB_SPROM8_5GH_MCSPO 0x0182
	563	+
	564	+#define SSB_SPROM8_CDDPO 0x0192
	565	+#define SSB_SPROM8_STBCPO 0x0194
	566	+#define SSB_SPROM8_BW40PO 0x0196
	567	+#define SSB_SPROM8_BWDUPPO 0x0198
	568	+
516	569	/* Values for boardflags_lo read from SPROM */
517	570	#define SSB_BFL_BTCOEXIST 0x0001 /* implements Bluetooth coexistance */
518	571	#define SSB_BFL_PACTRL 0x0002 /* GPIO 9 controlling the PA */

include/net/bluetooth/bluetooth.h+24−8

@@ -163,6 +163,11 @@ typedef struct { · 162 unmodified lines
163	163	__u8 b[6];
164	164	} __packed bdaddr_t;
165	165
	166	+/* BD Address type */
	167	+#define BDADDR_BREDR 0x00
	168	+#define BDADDR_LE_PUBLIC 0x01
	169	+#define BDADDR_LE_RANDOM 0x02
	170	+
166	171	#define BDADDR_ANY (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}})
167	172	#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}})
168	173
@@ -178,7 +183,6 @@ static inline void bacpy(bdaddr_t dst, bdaddr_t src) · 9 unmodified lines
178	183
179	184	void baswap(bdaddr_t dst, bdaddr_t src);
180	185	char batostr(bdaddr_t ba);
181		−bdaddr_t strtoba(char str);
182	186
183	187	/* Common socket structures and functions */
184	188
@@ -190,8 +194,12 @@ struct bt_sock { · 5 unmodified lines
190	194	bdaddr_t dst;
191	195	struct list_head accept_q;
192	196	struct sock *parent;
193		− u32 defer_setup;
194		− bool suspended;
	197	+ unsigned long flags;
	198	+};
	199	+
	200	+enum {
	201	+ BT_SK_DEFER_SETUP,
	202	+ BT_SK_SUSPEND,
195	203	};
196	204
197	205	struct bt_sock_list {
@@ -216,14 +224,24 @@ void bt_accept_unlink(struct sock *sk); · 18 unmodified lines
216	224	struct sock bt_accept_dequeue(struct sock parent, struct socket *newsock);
217	225
218	226	/* Skb helpers */
	227	+struct l2cap_ctrl {
	228	+ unsigned int sframe : 1,
	229	+ poll : 1,
	230	+ final : 1,
	231	+ fcs : 1,
	232	+ sar : 2,
	233	+ super : 2;
	234	+ __u16 reqseq;
	235	+ __u16 txseq;
	236	+ __u8 retries;
	237	+};
	238	+
219	239	struct bt_skb_cb {
220	240	__u8 pkt_type;
221	241	__u8 incoming;
222	242	__u16 expect;
223		− __u16 tx_seq;
224		− __u8 retries;
225		− __u8 sar;
226	243	__u8 force_active;
	244	+ struct l2cap_ctrl control;
227	245	};
228	246	#define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb))
229	247
@@ -243,12 +261,10 @@ static inline struct sk_buff bt_skb_send_alloc(struct sock sk, · 13 unmodified lines
243	261	{
244	262	struct sk_buff *skb;
245	263
246		− release_sock(sk);
247	264	if ((skb = sock_alloc_send_skb(sk, len + BT_SKB_RESERVE, nb, err))) {
248	265	skb_reserve(skb, BT_SKB_RESERVE);
249	266	bt_cb(skb)->incoming = 0;
250	267	}
251		− lock_sock(sk);
252	268
253	269	if (!skb && *err)
254	270	return NULL;

include/net/bluetooth/hci.h+7−1

@@ -102,6 +102,7 @@ enum { · 101 unmodified lines
102	102	HCI_DISCOVERABLE,
103	103	HCI_LINK_SECURITY,
104	104	HCI_PENDING_CLASS,
	105	+ HCI_PERIODIC_INQ,
105	106	};
106	107
107	108	/* HCI ioctl defines */
@@ -324,6 +325,8 @@ struct hci_cp_inquiry { · 216 unmodified lines
324	325
325	326	#define HCI_OP_INQUIRY_CANCEL 0x0402
326	327
	328	+#define HCI_OP_PERIODIC_INQ 0x0403
	329	+
327	330	#define HCI_OP_EXIT_PERIODIC_INQ 0x0404
328	331
329	332	#define HCI_OP_CREATE_CONN 0x0405
@@ -717,6 +720,10 @@ struct hci_rp_read_local_oob_data { · 387 unmodified lines
717	720	} __packed;
718	721
719	722	#define HCI_OP_READ_INQ_RSP_TX_POWER 0x0c58
	723	+struct hci_rp_read_inq_rsp_tx_power {
	724	+ __u8 status;
	725	+ __s8 tx_power;
	726	+} __packed;
720	727
721	728	#define HCI_OP_READ_FLOW_CONTROL_MODE 0x0c66
722	729	struct hci_rp_read_flow_control_mode {
@@ -1431,6 +1438,5 @@ struct hci_inquiry_req { · 708 unmodified lines
1431	1438	#define IREQ_CACHE_FLUSH 0x0001
1432	1439
1433	1440	extern bool enable_hs;
1434		−extern bool enable_le;
1435	1441
1436	1442	#endif /* __HCI_H */

include/net/bluetooth/hci_core.h+36−31

@@ -155,9 +155,14 @@ struct hci_dev { · 154 unmodified lines
155	155	__u16 hci_rev;
156	156	__u8 lmp_ver;
157	157	__u16 manufacturer;
158		− __le16 lmp_subver;
	158	+ __u16 lmp_subver;
159	159	__u16 voice_setting;
160	160	__u8 io_capability;
	161	+ __s8 inq_tx_power;
	162	+ __u16 devid_source;
	163	+ __u16 devid_vendor;
	164	+ __u16 devid_product;
	165	+ __u16 devid_version;
161	166
162	167	__u16 pkt_type;
163	168	__u16 esco_type;
@@ -250,9 +255,6 @@ struct hci_dev { · 86 unmodified lines
250	255
251	256	struct list_head remote_oob_data;
252	257
253		− struct list_head adv_entries;
254		− struct delayed_work adv_work;
255		−
256	258	struct hci_dev_stats stat;
257	259
258	260	struct sk_buff_head driver_init;
@@ -263,7 +265,6 @@ struct hci_dev { · 4 unmodified lines
263	265
264	266	struct dentry *debugfs;
265	267
266		− struct device *parent;
267	268	struct device dev;
268	269
269	270	struct rfkill *rfkill;
@@ -571,7 +572,7 @@ int hci_chan_del(struct hci_chan *chan); · 301 unmodified lines
571	572	void hci_chan_list_flush(struct hci_conn *conn);
572	573
573	574	struct hci_conn hci_connect(struct hci_dev hdev, int type, bdaddr_t *dst,
574		− __u8 sec_level, __u8 auth_type);
	575	+ __u8 dst_type, __u8 sec_level, __u8 auth_type);
575	576	int hci_conn_check_link_mode(struct hci_conn *conn);
576	577	int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level);
577	578	int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type);
@@ -673,8 +674,8 @@ int hci_add_link_key(struct hci_dev hdev, struct hci_conn conn, int new_key, · 95 unmodified lines
673	674	bdaddr_t bdaddr, u8 val, u8 type, u8 pin_len);
674	675	struct smp_ltk hci_find_ltk(struct hci_dev hdev, __le16 ediv, u8 rand[8]);
675	676	int hci_add_ltk(struct hci_dev hdev, bdaddr_t bdaddr, u8 addr_type, u8 type,
676		− int new_key, u8 authenticated, u8 tk[16], u8 enc_size, u16 ediv,
677		− u8 rand[8]);
	677	+ int new_key, u8 authenticated, u8 tk[16], u8 enc_size,
	678	+ __le16 ediv, u8 rand[8]);
678	679	struct smp_ltk hci_find_ltk_by_addr(struct hci_dev hdev, bdaddr_t *bdaddr,
679	680	u8 addr_type);
680	681	int hci_remove_ltk(struct hci_dev hdev, bdaddr_t bdaddr);
@@ -688,14 +689,6 @@ int hci_add_remote_oob_data(struct hci_dev hdev, bdaddr_t bdaddr, u8 *hash, · 7 unmodified lines
688	689	u8 *randomizer);
689	690	int hci_remove_remote_oob_data(struct hci_dev hdev, bdaddr_t bdaddr);
690	691
691		−#define ADV_CLEAR_TIMEOUT (360HZ) /* Three minutes */
692		−int hci_adv_entries_clear(struct hci_dev *hdev);
693		−struct adv_entry hci_find_adv_entry(struct hci_dev hdev, bdaddr_t *bdaddr);
694		−int hci_add_adv_entry(struct hci_dev *hdev,
695		− struct hci_ev_le_advertising_info *ev);
696		−
697		−void hci_del_off_timer(struct hci_dev *hdev);
698		−
699	692	void hci_event_packet(struct hci_dev hdev, struct sk_buff skb);
700	693
701	694	int hci_recv_frame(struct sk_buff *skb);
@@ -709,7 +702,7 @@ void hci_conn_init_sysfs(struct hci_conn *conn); · 7 unmodified lines
709	702	void hci_conn_add_sysfs(struct hci_conn *conn);
710	703	void hci_conn_del_sysfs(struct hci_conn *conn);
711	704
712		−#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->parent = (pdev))
	705	+#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->dev.parent = (pdev))
713	706
714	707	/* ----- LMP capabilities ----- */
715	708	#define lmp_rswitch_capable(dev) ((dev)->features[0] & LMP_RSWITCH)
@@ -933,6 +926,23 @@ static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type) · 217 unmodified lines
933	926	return false;
934	927	}
935	928
	929	+static inline size_t eir_get_length(u8 *eir, size_t eir_len)
	930	+{
	931	+ size_t parsed = 0;
	932	+
	933	+ while (parsed < eir_len) {
	934	+ u8 field_len = eir[0];
	935	+
	936	+ if (field_len == 0)
	937	+ return parsed;
	938	+
	939	+ parsed += field_len + 1;
	940	+ eir += field_len + 1;
	941	+ }
	942	+
	943	+ return eir_len;
	944	+}
	945	+
936	946	static inline u16 eir_append_data(u8 eir, u16 eir_len, u8 type, u8 data,
937	947	u8 data_len)
938	948	{
@@ -961,17 +971,12 @@ void hci_send_to_monitor(struct hci_dev hdev, struct sk_buff skb); · 22 unmodified lines
961	971	void hci_sock_dev_event(struct hci_dev *hdev, int event);
962	972
963	973	/* Management interface */
964		−#define MGMT_ADDR_BREDR 0x00
965		−#define MGMT_ADDR_LE_PUBLIC 0x01
966		−#define MGMT_ADDR_LE_RANDOM 0x02
967		−#define MGMT_ADDR_INVALID 0xff
968		−
969		−#define DISCOV_TYPE_BREDR (BIT(MGMT_ADDR_BREDR))
970		−#define DISCOV_TYPE_LE (BIT(MGMT_ADDR_LE_PUBLIC) \| \
971		− BIT(MGMT_ADDR_LE_RANDOM))
972		−#define DISCOV_TYPE_INTERLEAVED (BIT(MGMT_ADDR_BREDR) \| \
973		− BIT(MGMT_ADDR_LE_PUBLIC) \| \
974		− BIT(MGMT_ADDR_LE_RANDOM))
	974	+#define DISCOV_TYPE_BREDR (BIT(BDADDR_BREDR))
	975	+#define DISCOV_TYPE_LE (BIT(BDADDR_LE_PUBLIC) \| \
	976	+ BIT(BDADDR_LE_RANDOM))
	977	+#define DISCOV_TYPE_INTERLEAVED (BIT(BDADDR_BREDR) \| \
	978	+ BIT(BDADDR_LE_PUBLIC) \| \
	979	+ BIT(BDADDR_LE_RANDOM))
975	980
976	981	int mgmt_control(struct sock sk, struct msghdr msg, size_t len);
977	982	int mgmt_index_added(struct hci_dev *hdev);
@@ -1067,12 +1072,12 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, · 89 unmodified lines
1067	1072	u16 latency, u16 to_multiplier);
1068	1073	void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],
1069	1074	__u8 ltk[16]);
1070		−void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16]);
1071		−void hci_le_ltk_neg_reply(struct hci_conn *conn);
1072		−
1073	1075	int hci_do_inquiry(struct hci_dev *hdev, u8 length);
1074	1076	int hci_cancel_inquiry(struct hci_dev *hdev);
1075	1077	int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window,
1076	1078	int timeout);
	1079	+int hci_cancel_le_scan(struct hci_dev *hdev);
	1080	+
	1081	+u8 bdaddr_to_le(u8 bdaddr_type);
1077	1082
1078	1083	#endif /* __HCI_CORE_H */

include/net/bluetooth/l2cap.h+79−14

@@ -44,6 +44,7 @@ · 43 unmodified lines
44	44	#define L2CAP_DEFAULT_MAX_SDU_SIZE 0xFFFF
45	45	#define L2CAP_DEFAULT_SDU_ITIME 0xFFFFFFFF
46	46	#define L2CAP_DEFAULT_ACC_LAT 0xFFFFFFFF
	47	+#define L2CAP_BREDR_MAX_PAYLOAD 1019 /* 3-DH5 packet */
47	48
48	49	#define L2CAP_DISC_TIMEOUT msecs_to_jiffies(100)
49	50	#define L2CAP_DISC_REJ_TIMEOUT msecs_to_jiffies(5000)
@@ -57,6 +58,7 @@ struct sockaddr_l2 { · 7 unmodified lines
57	58	__le16 l2_psm;
58	59	bdaddr_t l2_bdaddr;
59	60	__le16 l2_cid;
	61	+ __u8 l2_bdaddr_type;
60	62	};
61	63
62	64	/* L2CAP socket options */
@@ -139,6 +141,8 @@ struct l2cap_conninfo { · 76 unmodified lines
139	141
140	142	#define L2CAP_CTRL_TXSEQ_SHIFT 1
141	143	#define L2CAP_CTRL_SUPER_SHIFT 2
	144	+#define L2CAP_CTRL_POLL_SHIFT 4
	145	+#define L2CAP_CTRL_FINAL_SHIFT 7
142	146	#define L2CAP_CTRL_REQSEQ_SHIFT 8
143	147	#define L2CAP_CTRL_SAR_SHIFT 14
144	148
@@ -152,9 +156,11 @@ struct l2cap_conninfo { · 7 unmodified lines
152	156	#define L2CAP_EXT_CTRL_FINAL 0x00000002
153	157	#define L2CAP_EXT_CTRL_FRAME_TYPE 0x00000001 /* I- or S-Frame */
154	158
	159	+#define L2CAP_EXT_CTRL_FINAL_SHIFT 1
155	160	#define L2CAP_EXT_CTRL_REQSEQ_SHIFT 2
156	161	#define L2CAP_EXT_CTRL_SAR_SHIFT 16
157	162	#define L2CAP_EXT_CTRL_SUPER_SHIFT 16
	163	+#define L2CAP_EXT_CTRL_POLL_SHIFT 18
158	164	#define L2CAP_EXT_CTRL_TXSEQ_SHIFT 18
159	165
160	166	/* L2CAP Supervisory Function */
@@ -186,6 +192,8 @@ struct l2cap_hdr { · 25 unmodified lines
186	192	#define L2CAP_FCS_SIZE 2
187	193	#define L2CAP_SDULEN_SIZE 2
188	194	#define L2CAP_PSMLEN_SIZE 2
	195	+#define L2CAP_ENH_CTRL_SIZE 2
	196	+#define L2CAP_EXT_CTRL_SIZE 4
189	197
190	198	struct l2cap_cmd_hdr {
191	199	__u8 code;
@@ -401,6 +409,16 @@ struct l2cap_conn_param_update_rsp { · 209 unmodified lines
401	409	#define L2CAP_CONN_PARAM_REJECTED 0x0001
402	410
403	411	/* ----- L2CAP channels and connections ----- */
	412	+struct l2cap_seq_list {
	413	+ __u16 head;
	414	+ __u16 tail;
	415	+ __u16 mask;
	416	+ __u16 *list;
	417	+};
	418	+
	419	+#define L2CAP_SEQ_LIST_CLEAR 0xFFFF
	420	+#define L2CAP_SEQ_LIST_TAIL 0x8000
	421	+
404	422	struct srej_list {
405	423	__u16 tx_seq;
406	424	struct list_head list;
@@ -446,6 +464,9 @@ struct l2cap_chan { · 39 unmodified lines
446	464	__u16 monitor_timeout;
447	465	__u16 mps;
448	466
	467	+ __u8 tx_state;
	468	+ __u8 rx_state;
	469	+
449	470	unsigned long conf_state;
450	471	unsigned long conn_state;
451	472	unsigned long flags;
@@ -456,9 +477,11 @@ struct l2cap_chan { · 4 unmodified lines
456	477	__u16 buffer_seq;
457	478	__u16 buffer_seq_srej;
458	479	__u16 srej_save_reqseq;
	480	+ __u16 last_acked_seq;
459	481	__u16 frames_sent;
460	482	__u16 unacked_frames;
461	483	__u8 retry_count;
	484	+ __u16 srej_queue_next;
462	485	__u8 num_acked;
463	486	__u16 sdu_len;
464	487	struct sk_buff *sdu;
@@ -490,6 +513,8 @@ struct l2cap_chan { · 25 unmodified lines
490	513	struct sk_buff *tx_send_head;
491	514	struct sk_buff_head tx_q;
492	515	struct sk_buff_head srej_q;
	516	+ struct l2cap_seq_list srej_list;
	517	+ struct l2cap_seq_list retrans_list;
493	518	struct list_head srej_l;
494	519
495	520	struct list_head list;
@@ -508,8 +533,7 @@ struct l2cap_ops { · 12 unmodified lines
508	533	void (close) (void data);
509	534	void (state_change) (void data, int state);
510	535	struct sk_buff (alloc_skb) (struct l2cap_chan *chan,
511		− unsigned long len, int nb, int *err);
512		−
	536	+ unsigned long len, int nb);
513	537	};
514	538
515	539	struct l2cap_conn {
@@ -600,6 +624,44 @@ enum { · 84 unmodified lines
600	624	FLAG_EFS_ENABLE,
601	625	};
602	626
	627	+enum {
	628	+ L2CAP_TX_STATE_XMIT,
	629	+ L2CAP_TX_STATE_WAIT_F,
	630	+};
	631	+
	632	+enum {
	633	+ L2CAP_RX_STATE_RECV,
	634	+ L2CAP_RX_STATE_SREJ_SENT,
	635	+};
	636	+
	637	+enum {
	638	+ L2CAP_TXSEQ_EXPECTED,
	639	+ L2CAP_TXSEQ_EXPECTED_SREJ,
	640	+ L2CAP_TXSEQ_UNEXPECTED,
	641	+ L2CAP_TXSEQ_UNEXPECTED_SREJ,
	642	+ L2CAP_TXSEQ_DUPLICATE,
	643	+ L2CAP_TXSEQ_DUPLICATE_SREJ,
	644	+ L2CAP_TXSEQ_INVALID,
	645	+ L2CAP_TXSEQ_INVALID_IGNORE,
	646	+};
	647	+
	648	+enum {
	649	+ L2CAP_EV_DATA_REQUEST,
	650	+ L2CAP_EV_LOCAL_BUSY_DETECTED,
	651	+ L2CAP_EV_LOCAL_BUSY_CLEAR,
	652	+ L2CAP_EV_RECV_REQSEQ_AND_FBIT,
	653	+ L2CAP_EV_RECV_FBIT,
	654	+ L2CAP_EV_RETRANS_TO,
	655	+ L2CAP_EV_MONITOR_TO,
	656	+ L2CAP_EV_EXPLICIT_POLL,
	657	+ L2CAP_EV_RECV_IFRAME,
	658	+ L2CAP_EV_RECV_RR,
	659	+ L2CAP_EV_RECV_REJ,
	660	+ L2CAP_EV_RECV_RNR,
	661	+ L2CAP_EV_RECV_SREJ,
	662	+ L2CAP_EV_RECV_FRAME,
	663	+};
	664	+
603	665	static inline void l2cap_chan_hold(struct l2cap_chan *c)
604	666	{
605	667	atomic_inc(&c->refcnt);
@@ -622,21 +684,26 @@ static inline void l2cap_chan_unlock(struct l2cap_chan *chan) · 16 unmodified lines
622	684	}
623	685
624	686	static inline void l2cap_set_timer(struct l2cap_chan *chan,
625		− struct delayed_work *work, long timeout)
	687	+ struct delayed_work *work, long timeout)
626	688	{
627	689	BT_DBG("chan %p state %s timeout %ld", chan,
628		− state_to_string(chan->state), timeout);
	690	+ state_to_string(chan->state), timeout);
629	691
	692	+ /* If delayed work cancelled do not hold(chan)
	693	+ since it is already done with previous set_timer */
630	694	if (!cancel_delayed_work(work))
631	695	l2cap_chan_hold(chan);
	696	+
632	697	schedule_delayed_work(work, timeout);
633	698	}
634	699
635	700	static inline bool l2cap_clear_timer(struct l2cap_chan *chan,
636		− struct delayed_work *work)
	701	+ struct delayed_work *work)
637	702	{
638	703	bool ret;
639	704
	705	+ /* put(chan) if delayed work cancelled otherwise it
	706	+ is done in delayed work function */
640	707	ret = cancel_delayed_work(work);
641	708	if (ret)
642	709	l2cap_chan_put(chan);
@@ -658,13 +725,10 @@ static inline bool l2cap_clear_timer(struct l2cap_chan *chan, · 15 unmodified lines
658	725
659	726	static inline int __seq_offset(struct l2cap_chan *chan, __u16 seq1, __u16 seq2)
660	727	{
661		− int offset;
662		−
663		− offset = (seq1 - seq2) % (chan->tx_win_max + 1);
664		− if (offset < 0)
665		− offset += (chan->tx_win_max + 1);
666		−
667		− return offset;
	728	+ if (seq1 >= seq2)
	729	+ return seq1 - seq2;
	730	+ else
	731	+ return chan->tx_win_max + 1 - seq2 + seq1;
668	732	}
669	733
670	734	static inline __u16 __next_seq(struct l2cap_chan *chan, __u16 seq)
@@ -852,14 +916,15 @@ int __l2cap_wait_ack(struct sock *sk); · 181 unmodified lines
852	916	int l2cap_add_psm(struct l2cap_chan chan, bdaddr_t src, __le16 psm);
853	917	int l2cap_add_scid(struct l2cap_chan *chan, __u16 scid);
854	918
855		−struct l2cap_chan l2cap_chan_create(struct sock sk);
	919	+struct l2cap_chan *l2cap_chan_create(void);
856	920	void l2cap_chan_close(struct l2cap_chan *chan, int reason);
857	921	void l2cap_chan_destroy(struct l2cap_chan *chan);
858	922	int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
859		− bdaddr_t *dst);
	923	+ bdaddr_t *dst, u8 dst_type);
860	924	int l2cap_chan_send(struct l2cap_chan chan, struct msghdr msg, size_t len,
861	925	u32 priority);
862	926	void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
863	927	int l2cap_chan_check_security(struct l2cap_chan *chan);
	928	+void l2cap_chan_set_defaults(struct l2cap_chan *chan);
864	929
865	930	#endif /* __L2CAP_H */

include/net/bluetooth/mgmt.h+9−0

@@ -341,6 +341,15 @@ struct mgmt_cp_unblock_device { · 340 unmodified lines
341	341	} __packed;
342	342	#define MGMT_UNBLOCK_DEVICE_SIZE MGMT_ADDR_INFO_SIZE
343	343
	344	+#define MGMT_OP_SET_DEVICE_ID 0x0028
	345	+struct mgmt_cp_set_device_id {
	346	+ __le16 source;
	347	+ __le16 vendor;
	348	+ __le16 product;
	349	+ __le16 version;
	350	+} __packed;
	351	+#define MGMT_SET_DEVICE_ID_SIZE 8
	352	+
344	353	#define MGMT_EV_CMD_COMPLETE 0x0001
345	354	struct mgmt_ev_cmd_complete {
346	355	__le16 opcode;

include/net/bluetooth/smp.h+1−1

@@ -77,7 +77,7 @@ struct smp_cmd_encrypt_info { · 76 unmodified lines
77	77
78	78	#define SMP_CMD_MASTER_IDENT 0x07
79	79	struct smp_cmd_master_ident {
80		− __u16 ediv;
	80	+ __le16 ediv;
81	81	__u8 rand[8];
82	82	} __packed;
83	83

include/net/cfg80211.h+3−3

@@ -3365,9 +3365,9 @@ void cfg80211_report_obss_beacon(struct wiphy *wiphy, · 3364 unmodified lines
3365	3365	* @chan: main channel
3366	3366	* @channel_type: HT mode
3367	3367	*/
3368		−int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
3369		− struct ieee80211_channel *chan,
3370		− enum nl80211_channel_type channel_type);
	3368	+bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
	3369	+ struct ieee80211_channel *chan,
	3370	+ enum nl80211_channel_type channel_type);
3371	3371
3372	3372	/*
3373	3373	* cfg80211_ch_switch_notify - update wdev channel and notify userspace

include/net/mac80211.h+11−1

@@ -667,6 +667,9 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) · 666 unmodified lines
667	667	* @RX_FLAG_SHORT_GI: Short guard interval was used
668	668	* @RX_FLAG_NO_SIGNAL_VAL: The signal strength value is not present.
669	669	* Valid only for data frames (mainly A-MPDU)
	670	+ * @RX_FLAG_HT_GF: This frame was received in a HT-greenfield transmission, if
	671	+ * the driver fills this value it should add %IEEE80211_RADIOTAP_MCS_HAVE_FMT
	672	+ * to hw.radiotap_mcs_details to advertise that fact
670	673	*/
671	674	enum mac80211_rx_flags {
672	675	RX_FLAG_MMIC_ERROR = 1<<0,
@@ -681,6 +684,7 @@ enum mac80211_rx_flags { · 8 unmodified lines
681	684	RX_FLAG_40MHZ = 1<<10,
682	685	RX_FLAG_SHORT_GI = 1<<11,
683	686	RX_FLAG_NO_SIGNAL_VAL = 1<<12,
	687	+ RX_FLAG_HT_GF = 1<<13,
684	688	};
685	689
686	690	/**
@@ -939,7 +943,7 @@ static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif) · 252 unmodified lines
939	943	* CCMP key if it requires CCMP encryption of management frames (MFP) to
940	944	* be done in software.
941	945	* @IEEE80211_KEY_FLAG_PUT_IV_SPACE: This flag should be set by the driver
942		− * for a CCMP key if space should be prepared for the IV, but the IV
	946	+ * if space should be prepared for the IV, but the IV
943	947	* itself should not be generated. Do not set together with
944	948	* @IEEE80211_KEY_FLAG_GENERATE_IV on the same key.
945	949	*/
@@ -1288,6 +1292,11 @@ enum ieee80211_hw_flags { · 342 unmodified lines
1288	1292	*
1289	1293	* @offchannel_tx_hw_queue: HW queue ID to use for offchannel TX
1290	1294	* (if %IEEE80211_HW_QUEUE_CONTROL is set)
	1295	+ *
	1296	+ * @radiotap_mcs_details: lists which MCS information can the HW
	1297	+ * reports, by default it is set to _MCS, _GI and _BW but doesn't
	1298	+ * include _FMT. Use %IEEE80211_RADIOTAP_MCS_HAVE_* values, only
	1299	+ * adding _BW is supported today.
1291	1300	*/
1292	1301	struct ieee80211_hw {
1293	1302	struct ieee80211_conf conf;
@@ -1309,6 +1318,7 @@ struct ieee80211_hw { · 15 unmodified lines
1309	1318	u8 max_rx_aggregation_subframes;
1310	1319	u8 max_tx_aggregation_subframes;
1311	1320	u8 offchannel_tx_hw_queue;
	1321	+ u8 radiotap_mcs_details;
1312	1322	};
1313	1323
1314	1324	/**

include/net/nfc/hci.h+2−4

@@ -39,6 +39,8 @@ struct nfc_hci_ops { · 38 unmodified lines
39	39	int (data_exchange) (struct nfc_hci_dev hdev,
40	40	struct nfc_target *target,
41	41	struct sk_buff skb, struct sk_buff *res_skb);
	42	+ int (check_presence)(struct nfc_hci_dev hdev,
	43	+ struct nfc_target *target);
42	44	};
43	45
44	46	#define NFC_HCI_MAX_CUSTOM_GATES 15
@@ -82,10 +84,6 @@ struct nfc_hci_dev { · 37 unmodified lines
82	84
83	85	u8 gate2pipe[NFC_HCI_MAX_GATES];
84	86
85		− bool poll_started;
86		− struct nfc_target *targets;
87		− int target_count;
88		−
89	87	u8 sw_romlib;
90	88	u8 sw_patch;
91	89	u8 sw_flashlib_major;

include/net/nfc/nfc.h+10−9

@@ -48,26 +48,28 @@ struct nfc_dev; · 47 unmodified lines
48	48	typedef void (data_exchange_cb_t)(void context, struct sk_buff *skb,
49	49	int err);
50	50
	51	+struct nfc_target;
	52	+
51	53	struct nfc_ops {
52	54	int (dev_up)(struct nfc_dev dev);
53	55	int (dev_down)(struct nfc_dev dev);
54	56	int (start_poll)(struct nfc_dev dev, u32 protocols);
55	57	void (stop_poll)(struct nfc_dev dev);
56		− int (dep_link_up)(struct nfc_dev dev, int target_idx, u8 comm_mode,
57		− u8 *gb, size_t gb_len);
	58	+ int (dep_link_up)(struct nfc_dev dev, struct nfc_target *target,
	59	+ u8 comm_mode, u8 *gb, size_t gb_len);
58	60	int (dep_link_down)(struct nfc_dev dev);
59		− int (activate_target)(struct nfc_dev dev, u32 target_idx,
	61	+ int (activate_target)(struct nfc_dev dev, struct nfc_target *target,
60	62	u32 protocol);
61		− void (deactivate_target)(struct nfc_dev dev, u32 target_idx);
62		− int (data_exchange)(struct nfc_dev dev, u32 target_idx,
	63	+ void (deactivate_target)(struct nfc_dev dev,
	64	+ struct nfc_target *target);
	65	+ int (data_exchange)(struct nfc_dev dev, struct nfc_target *target,
63	66	struct sk_buff *skb, data_exchange_cb_t cb,
64	67	void *cb_context);
65		− int (check_presence)(struct nfc_dev dev, u32 target_idx);
	68	+ int (check_presence)(struct nfc_dev dev, struct nfc_target *target);
66	69	};
67	70
68	71	#define NFC_TARGET_IDX_ANY -1
69	72	#define NFC_MAX_GT_LEN 48
70		−#define NFC_TARGET_IDX_NONE 0xffffffff
71	73
72	74	struct nfc_target {
73	75	u32 idx;
@@ -95,11 +97,10 @@ struct nfc_dev { · 21 unmodified lines
95	97	struct nfc_target *targets;
96	98	int n_targets;
97	99	int targets_generation;
98		− spinlock_t targets_lock;
99	100	struct device dev;
100	101	bool dev_up;
101	102	bool polling;
102		− u32 activated_target_idx;
	103	+ struct nfc_target *active_target;
103	104	bool dep_link_up;
104	105	u32 dep_rf_mode;
105	106	struct nfc_genl_data genl_data;

include/net/nfc/shdlc.h+2−0

@@ -35,6 +35,8 @@ struct nfc_shdlc_ops { · 34 unmodified lines
35	35	int (data_exchange) (struct nfc_shdlc shdlc,
36	36	struct nfc_target *target,
37	37	struct sk_buff skb, struct sk_buff *res_skb);
	38	+ int (check_presence)(struct nfc_shdlc shdlc,
	39	+ struct nfc_target *target);
38	40	};
39	41
40	42	enum shdlc_state {

kernel/pid.c+2−1

@@ -547,7 +547,8 @@ void __init pidhash_init(void) · 546 unmodified lines
547	547
548	548	pid_hash = alloc_large_system_hash("PID", sizeof(*pid_hash), 0, 18,
549	549	HASH_EARLY \| HASH_SMALL,
550		− &pidhash_shift, NULL, 4096);
	550	+ &pidhash_shift, NULL,
	551	+ 0, 4096);
551	552	pidhash_size = 1U << pidhash_shift;
552	553
553	554	for (i = 0; i < pidhash_size; i++)

mm/page_alloc.c+5−2

@@ -5242,9 +5242,10 @@ void __init alloc_large_system_hash(const char tablename, · 5241 unmodified lines
5242	5242	int flags,
5243	5243	unsigned int *_hash_shift,
5244	5244	unsigned int *_hash_mask,
5245		− unsigned long limit)
	5245	+ unsigned long low_limit,
	5246	+ unsigned long high_limit)
5246	5247	{
5247		− unsigned long long max = limit;
	5248	+ unsigned long long max = high_limit;
5248	5249	unsigned long log2qty, size;
5249	5250	void *table = NULL;
5250	5251
@@ -5282,6 +5283,8 @@ void __init alloc_large_system_hash(const char tablename, · 31 unmodified lines
5282	5283	}
5283	5284	max = min(max, 0x80000000ULL);
5284	5285
	5286	+ if (numentries < low_limit)
	5287	+ numentries = low_limit;
5285	5288	if (numentries > max)
5286	5289	numentries = max;
5287	5290

net/bluetooth/af_bluetooth.c+4−4

@@ -210,7 +210,7 @@ struct sock bt_accept_dequeue(struct sock parent, struct socket *newsock) · 209 unmodified lines
210	210	}
211	211
212	212	if (sk->sk_state == BT_CONNECTED \|\| !newsock \|\|
213		− bt_sk(parent)->defer_setup) {
	213	+ test_bit(BT_DEFER_SETUP, &bt_sk(parent)->flags)) {
214	214	bt_accept_unlink(sk);
215	215	if (newsock)
216	216	sock_graft(sk, newsock);
@@ -410,8 +410,8 @@ static inline unsigned int bt_accept_poll(struct sock *parent) · 193 unmodified lines
410	410	list_for_each_safe(p, n, &bt_sk(parent)->accept_q) {
411	411	sk = (struct sock *) list_entry(p, struct bt_sock, accept_q);
412	412	if (sk->sk_state == BT_CONNECTED \|\|
413		− (bt_sk(parent)->defer_setup &&
414		− sk->sk_state == BT_CONNECT2))
	413	+ (test_bit(BT_SK_DEFER_SETUP, &bt_sk(parent)->flags) &&
	414	+ sk->sk_state == BT_CONNECT2))
415	415	return POLLIN \| POLLRDNORM;
416	416	}
417	417
@@ -450,7 +450,7 @@ unsigned int bt_sock_poll(struct file file, struct socket sock, poll_table *wa · 32 unmodified lines
450	450	sk->sk_state == BT_CONFIG)
451	451	return mask;
452	452
453		− if (!bt_sk(sk)->suspended && sock_writeable(sk))
	453	+ if (!test_bit(BT_SK_SUSPEND, &bt_sk(sk)->flags) && sock_writeable(sk))
454	454	mask \|= POLLOUT \| POLLWRNORM \| POLLWRBAND;
455	455	else
456	456	set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);

net/bluetooth/bnep/core.c+1−1

@@ -340,7 +340,7 @@ static inline int bnep_rx_frame(struct bnep_session s, struct sk_buff skb) · 339 unmodified lines
340	340	}
341	341
342	342	/* Strip 802.1p header */
343		− if (ntohs(s->eh.h_proto) == 0x8100) {
	343	+ if (ntohs(s->eh.h_proto) == ETH_P_8021Q) {
344	344	if (!skb_pull(skb, 4))
345	345	goto badframe;
346	346	s->eh.h_proto = get_unaligned((__be16 *) (skb->data - 2));

net/bluetooth/hci_conn.c+11−45

@@ -223,36 +223,6 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8], · 222 unmodified lines
223	223	}
224	224	EXPORT_SYMBOL(hci_le_start_enc);
225	225
226		−void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16])
227		−{
228		− struct hci_dev *hdev = conn->hdev;
229		− struct hci_cp_le_ltk_reply cp;
230		−
231		− BT_DBG("%p", conn);
232		−
233		− memset(&cp, 0, sizeof(cp));
234		−
235		− cp.handle = cpu_to_le16(conn->handle);
236		− memcpy(cp.ltk, ltk, sizeof(ltk));
237		−
238		− hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
239		−}
240		−EXPORT_SYMBOL(hci_le_ltk_reply);
241		−
242		−void hci_le_ltk_neg_reply(struct hci_conn *conn)
243		−{
244		− struct hci_dev *hdev = conn->hdev;
245		− struct hci_cp_le_ltk_neg_reply cp;
246		−
247		− BT_DBG("%p", conn);
248		−
249		− memset(&cp, 0, sizeof(cp));
250		−
251		− cp.handle = cpu_to_le16(conn->handle);
252		−
253		− hci_send_cmd(hdev, HCI_OP_LE_LTK_NEG_REPLY, sizeof(cp), &cp);
254		−}
255		−
256	226	/* Device _must_ be locked */
257	227	void hci_sco_setup(struct hci_conn *conn, __u8 status)
258	228	{
@@ -513,7 +483,8 @@ EXPORT_SYMBOL(hci_get_route); · 254 unmodified lines
513	483
514	484	/* Create SCO, ACL or LE connection.
515	485	* Device _must_ be locked */
516		−struct hci_conn hci_connect(struct hci_dev hdev, int type, bdaddr_t *dst, __u8 sec_level, __u8 auth_type)
	486	+struct hci_conn hci_connect(struct hci_dev hdev, int type, bdaddr_t *dst,
	487	+ __u8 dst_type, __u8 sec_level, __u8 auth_type)
517	488	{
518	489	struct hci_conn *acl;
519	490	struct hci_conn *sco;
@@ -522,23 +493,18 @@ struct hci_conn hci_connect(struct hci_dev hdev, int type, bdaddr_t *dst, __u8 · 2 unmodified lines
522	493	BT_DBG("%s dst %s", hdev->name, batostr(dst));
523	494
524	495	if (type == LE_LINK) {
525		− struct adv_entry *entry;
526		−
527	496	le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);
528		− if (le)
529		− return ERR_PTR(-EBUSY);
530		−
531		− entry = hci_find_adv_entry(hdev, dst);
532		− if (!entry)
533		− return ERR_PTR(-EHOSTUNREACH);
	497	+ if (!le) {
	498	+ le = hci_conn_add(hdev, LE_LINK, dst);
	499	+ if (!le)
	500	+ return ERR_PTR(-ENOMEM);
534	501
535		− le = hci_conn_add(hdev, LE_LINK, dst);
536		− if (!le)
537		− return ERR_PTR(-ENOMEM);
538		−
539		− le->dst_type = entry->bdaddr_type;
	502	+ le->dst_type = bdaddr_to_le(dst_type);
	503	+ hci_le_connect(le);
	504	+ }
540	505
541		− hci_le_connect(le);
	506	+ le->pending_sec_level = sec_level;
	507	+ le->auth_type = auth_type;
542	508
543	509	hci_conn_hold(le);
544	510

net/bluetooth/hci_core.c+107−160

@@ -83,6 +83,7 @@ void hci_req_complete(struct hci_dev *hdev, __u16 cmd, int result) · 82 unmodified lines
83	83	*/
84	84	if (test_bit(HCI_INIT, &hdev->flags) && hdev->init_last_cmd != cmd) {
85	85	struct hci_command_hdr sent = (void ) hdev->sent_cmd->data;
	86	+ u16 opcode = __le16_to_cpu(sent->opcode);
86	87	struct sk_buff *skb;
87	88
88	89	/* Some CSR based controllers generate a spontaneous
@@ -92,7 +93,7 @@ void hci_req_complete(struct hci_dev *hdev, __u16 cmd, int result) · 3 unmodified lines
92	93	* command.
93	94	*/
94	95
95		− if (cmd != HCI_OP_RESET \|\| sent->opcode == HCI_OP_RESET)
	96	+ if (cmd != HCI_OP_RESET \|\| opcode == HCI_OP_RESET)
96	97	return;
97	98
98	99	skb = skb_clone(hdev->sent_cmd, GFP_ATOMIC);
@@ -251,6 +252,9 @@ static void amp_init(struct hci_dev *hdev) · 152 unmodified lines
251	252
252	253	/* Read Local Version */
253	254	hci_send_cmd(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL);
	255	+
	256	+ /* Read Local AMP Info */
	257	+ hci_send_cmd(hdev, HCI_OP_READ_LOCAL_AMP_INFO, 0, NULL);
254	258	}
255	259
256	260	static void hci_init_req(struct hci_dev *hdev, unsigned long opt)
@@ -384,7 +388,6 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state) · 127 unmodified lines
384	388	case DISCOVERY_STOPPED:
385	389	if (hdev->discovery.state != DISCOVERY_STARTING)
386	390	mgmt_discovering(hdev, 0);
387		− hdev->discovery.type = 0;
388	391	break;
389	392	case DISCOVERY_STARTING:
390	393	break;
@@ -1089,32 +1092,6 @@ static const struct rfkill_ops hci_rfkill_ops = { · 698 unmodified lines
1089	1092	.set_block = hci_rfkill_set_block,
1090	1093	};
1091	1094
1092		−/* Alloc HCI device */
1093		−struct hci_dev *hci_alloc_dev(void)
1094		−{
1095		− struct hci_dev *hdev;
1096		−
1097		− hdev = kzalloc(sizeof(struct hci_dev), GFP_KERNEL);
1098		− if (!hdev)
1099		− return NULL;
1100		−
1101		− hci_init_sysfs(hdev);
1102		− skb_queue_head_init(&hdev->driver_init);
1103		−
1104		− return hdev;
1105		−}
1106		−EXPORT_SYMBOL(hci_alloc_dev);
1107		−
1108		−/* Free HCI device */
1109		−void hci_free_dev(struct hci_dev *hdev)
1110		−{
1111		− skb_queue_purge(&hdev->driver_init);
1112		−
1113		− /* will free via device release */
1114		− put_device(&hdev->dev);
1115		−}
1116		−EXPORT_SYMBOL(hci_free_dev);
1117		−
1118	1095	static void hci_power_on(struct work_struct *work)
1119	1096	{
1120	1097	struct hci_dev *hdev = container_of(work, struct hci_dev, power_on);
@@ -1336,7 +1313,7 @@ int hci_add_link_key(struct hci_dev hdev, struct hci_conn conn, int new_key, · 215 unmodified lines
1336	1313	}
1337	1314
1338	1315	int hci_add_ltk(struct hci_dev hdev, bdaddr_t bdaddr, u8 addr_type, u8 type,
1339		− int new_key, u8 authenticated, u8 tk[16], u8 enc_size, u16
	1316	+ int new_key, u8 authenticated, u8 tk[16], u8 enc_size, __le16
1340	1317	ediv, u8 rand[8])
1341	1318	{
1342	1319	struct smp_ltk key, old_key;
@@ -1544,75 +1521,6 @@ int hci_blacklist_del(struct hci_dev hdev, bdaddr_t bdaddr, u8 type) · 201 unmodified lines
1544	1521	return mgmt_device_unblocked(hdev, bdaddr, type);
1545	1522	}
1546	1523
1547		−static void hci_clear_adv_cache(struct work_struct *work)
1548		−{
1549		− struct hci_dev *hdev = container_of(work, struct hci_dev,
1550		− adv_work.work);
1551		−
1552		− hci_dev_lock(hdev);
1553		−
1554		− hci_adv_entries_clear(hdev);
1555		−
1556		− hci_dev_unlock(hdev);
1557		−}
1558		−
1559		−int hci_adv_entries_clear(struct hci_dev *hdev)
1560		−{
1561		− struct adv_entry entry, tmp;
1562		−
1563		− list_for_each_entry_safe(entry, tmp, &hdev->adv_entries, list) {
1564		− list_del(&entry->list);
1565		− kfree(entry);
1566		− }
1567		−
1568		− BT_DBG("%s adv cache cleared", hdev->name);
1569		−
1570		− return 0;
1571		−}
1572		−
1573		−struct adv_entry hci_find_adv_entry(struct hci_dev hdev, bdaddr_t *bdaddr)
1574		−{
1575		− struct adv_entry *entry;
1576		−
1577		− list_for_each_entry(entry, &hdev->adv_entries, list)
1578		− if (bacmp(bdaddr, &entry->bdaddr) == 0)
1579		− return entry;
1580		−
1581		− return NULL;
1582		−}
1583		−
1584		−static inline int is_connectable_adv(u8 evt_type)
1585		−{
1586		− if (evt_type == ADV_IND \|\| evt_type == ADV_DIRECT_IND)
1587		− return 1;
1588		−
1589		− return 0;
1590		−}
1591		−
1592		−int hci_add_adv_entry(struct hci_dev *hdev,
1593		− struct hci_ev_le_advertising_info ev) { struct adv_entry entry; if (!is_connectable_adv(ev->evt_type))
1594		− return -EINVAL;
1595		−
1596		− /* Only new entries should be added to adv_entries. So, if
1597		− * bdaddr was found, don't add it. */
1598		− if (hci_find_adv_entry(hdev, &ev->bdaddr))
1599		− return 0;
1600		−
1601		− entry = kzalloc(sizeof(*entry), GFP_KERNEL);
1602		− if (!entry)
1603		− return -ENOMEM;
1604		−
1605		− bacpy(&entry->bdaddr, &ev->bdaddr);
1606		− entry->bdaddr_type = ev->bdaddr_type;
1607		−
1608		− list_add(&entry->list, &hdev->adv_entries);
1609		−
1610		− BT_DBG("%s adv entry added: address %s type %u", hdev->name,
1611		− batostr(&entry->bdaddr), entry->bdaddr_type);
1612		−
1613		− return 0;
1614		−}
1615		−
1616	1524	static void le_scan_param_req(struct hci_dev *hdev, unsigned long opt)
1617	1525	{
1618	1526	struct le_scan_params param = (struct le_scan_params ) opt;
@@ -1670,6 +1578,24 @@ static int hci_do_le_scan(struct hci_dev *hdev, u8 type, u16 interval, · 51 unmodified lines
1670	1578	return 0;
1671	1579	}
1672	1580
	1581	+int hci_cancel_le_scan(struct hci_dev *hdev)
	1582	+{
	1583	+ BT_DBG("%s", hdev->name);
	1584	+
	1585	+ if (!test_bit(HCI_LE_SCAN, &hdev->dev_flags))
	1586	+ return -EALREADY;
	1587	+
	1588	+ if (cancel_delayed_work(&hdev->le_scan_disable)) {
	1589	+ struct hci_cp_le_set_scan_enable cp;
	1590	+
	1591	+ /* Send HCI command to disable LE Scan */
	1592	+ memset(&cp, 0, sizeof(cp));
	1593	+ hci_send_cmd(hdev, HCI_OP_LE_SET_SCAN_ENABLE, sizeof(cp), &cp);
	1594	+ }
	1595	+
	1596	+ return 0;
	1597	+}
	1598	+
1673	1599	static void le_scan_disable_work(struct work_struct *work)
1674	1600	{
1675	1601	struct hci_dev *hdev = container_of(work, struct hci_dev,
@@ -1714,95 +1640,103 @@ int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window, · 38 unmodified lines
1714	1640	return 0;
1715	1641	}
1716	1642
1717		−/* Register HCI device */
1718		−int hci_register_dev(struct hci_dev *hdev)
	1643	+/* Alloc HCI device */
	1644	+struct hci_dev *hci_alloc_dev(void)
1719	1645	{
1720		− struct list_head head = &hci_dev_list, p;
1721		− int i, id, error;
1722		−
1723		− BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
1724		−
1725		− if (!hdev->open \|\| !hdev->close)
1726		− return -EINVAL;
1727		−
1728		− /* Do not allow HCI_AMP devices to register at index 0,
1729		− * so the index can be used as the AMP controller ID.
1730		− */
1731		− id = (hdev->dev_type == HCI_BREDR) ? 0 : 1;
1732		−
1733		− write_lock(&hci_dev_list_lock);
1734		−
1735		− /* Find first available device id */
1736		− list_for_each(p, &hci_dev_list) {
1737		− if (list_entry(p, struct hci_dev, list)->id != id)
1738		− break;
1739		− head = p; id++;
1740		− }
1741		−
1742		− sprintf(hdev->name, "hci%d", id);
1743		− hdev->id = id;
1744		− list_add_tail(&hdev->list, head);
	1646	+ struct hci_dev *hdev;
1745	1647
1746		− mutex_init(&hdev->lock);
	1648	+ hdev = kzalloc(sizeof(struct hci_dev), GFP_KERNEL);
	1649	+ if (!hdev)
	1650	+ return NULL;
1747	1651
1748		− hdev->flags = 0;
1749		− hdev->dev_flags = 0;
1750	1652	hdev->pkt_type = (HCI_DM1 \| HCI_DH1 \| HCI_HV1);
1751	1653	hdev->esco_type = (ESCO_HV1);
1752	1654	hdev->link_mode = (HCI_LM_ACCEPT);
1753	1655	hdev->io_capability = 0x03; /* No Input No Output */
1754	1656
1755		− hdev->idle_timeout = 0;
1756	1657	hdev->sniff_max_interval = 800;
1757	1658	hdev->sniff_min_interval = 80;
1758	1659
	1660	+ mutex_init(&hdev->lock);
	1661	+ mutex_init(&hdev->req_lock);
	1662	+
	1663	+ INIT_LIST_HEAD(&hdev->mgmt_pending);
	1664	+ INIT_LIST_HEAD(&hdev->blacklist);
	1665	+ INIT_LIST_HEAD(&hdev->uuids);
	1666	+ INIT_LIST_HEAD(&hdev->link_keys);
	1667	+ INIT_LIST_HEAD(&hdev->long_term_keys);
	1668	+ INIT_LIST_HEAD(&hdev->remote_oob_data);
	1669	+
1759	1670	INIT_WORK(&hdev->rx_work, hci_rx_work);
1760	1671	INIT_WORK(&hdev->cmd_work, hci_cmd_work);
1761	1672	INIT_WORK(&hdev->tx_work, hci_tx_work);
	1673	+ INIT_WORK(&hdev->power_on, hci_power_on);
	1674	+ INIT_WORK(&hdev->le_scan, le_scan_work);
1762	1675
	1676	+ INIT_DELAYED_WORK(&hdev->power_off, hci_power_off);
	1677	+ INIT_DELAYED_WORK(&hdev->discov_off, hci_discov_off);
	1678	+ INIT_DELAYED_WORK(&hdev->le_scan_disable, le_scan_disable_work);
1763	1679
	1680	+ skb_queue_head_init(&hdev->driver_init);
1764	1681	skb_queue_head_init(&hdev->rx_q);
1765	1682	skb_queue_head_init(&hdev->cmd_q);
1766	1683	skb_queue_head_init(&hdev->raw_q);
1767	1684
1768		− setup_timer(&hdev->cmd_timer, hci_cmd_timer, (unsigned long) hdev);
1769		−
1770		− for (i = 0; i < NUM_REASSEMBLY; i++)
1771		− hdev->reassembly[i] = NULL;
1772		−
1773	1685	init_waitqueue_head(&hdev->req_wait_q);
1774		− mutex_init(&hdev->req_lock);
1775	1686
1776		− discovery_init(hdev);
	1687	+ setup_timer(&hdev->cmd_timer, hci_cmd_timer, (unsigned long) hdev);
1777	1688
	1689	+ hci_init_sysfs(hdev);
	1690	+ discovery_init(hdev);
1778	1691	hci_conn_hash_init(hdev);
1779	1692
1780		− INIT_LIST_HEAD(&hdev->mgmt_pending);
1781		−
1782		− INIT_LIST_HEAD(&hdev->blacklist);
	1693	+ return hdev;
	1694	+}
	1695	+EXPORT_SYMBOL(hci_alloc_dev);
1783	1696
1784		− INIT_LIST_HEAD(&hdev->uuids);
	1697	+/* Free HCI device */
	1698	+void hci_free_dev(struct hci_dev *hdev)
	1699	+{
	1700	+ skb_queue_purge(&hdev->driver_init);
1785	1701
1786		− INIT_LIST_HEAD(&hdev->link_keys);
1787		− INIT_LIST_HEAD(&hdev->long_term_keys);
	1702	+ /* will free via device release */
	1703	+ put_device(&hdev->dev);
	1704	+}
	1705	+EXPORT_SYMBOL(hci_free_dev);
1788	1706
1789		− INIT_LIST_HEAD(&hdev->remote_oob_data);
	1707	+/* Register HCI device */
	1708	+int hci_register_dev(struct hci_dev *hdev)
	1709	+{
	1710	+ struct list_head head, p;
	1711	+ int id, error;
1790	1712
1791		− INIT_LIST_HEAD(&hdev->adv_entries);
	1713	+ if (!hdev->open \|\| !hdev->close)
	1714	+ return -EINVAL;
1792	1715
1793		− INIT_DELAYED_WORK(&hdev->adv_work, hci_clear_adv_cache);
1794		− INIT_WORK(&hdev->power_on, hci_power_on);
1795		− INIT_DELAYED_WORK(&hdev->power_off, hci_power_off);
	1716	+ write_lock(&hci_dev_list_lock);
1796	1717
1797		− INIT_DELAYED_WORK(&hdev->discov_off, hci_discov_off);
	1718	+ /* Do not allow HCI_AMP devices to register at index 0,
	1719	+ * so the index can be used as the AMP controller ID.
	1720	+ */
	1721	+ id = (hdev->dev_type == HCI_BREDR) ? 0 : 1;
	1722	+ head = &hci_dev_list;
1798	1723
1799		− memset(&hdev->stat, 0, sizeof(struct hci_dev_stats));
	1724	+ /* Find first available device id */
	1725	+ list_for_each(p, &hci_dev_list) {
	1726	+ int nid = list_entry(p, struct hci_dev, list)->id;
	1727	+ if (nid > id)
	1728	+ break;
	1729	+ if (nid == id)
	1730	+ id++;
	1731	+ head = p;
	1732	+ }
1800	1733
1801		− atomic_set(&hdev->promisc, 0);
	1734	+ sprintf(hdev->name, "hci%d", id);
	1735	+ hdev->id = id;
1802	1736
1803		− INIT_WORK(&hdev->le_scan, le_scan_work);
	1737	+ BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
1804	1738
1805		− INIT_DELAYED_WORK(&hdev->le_scan_disable, le_scan_disable_work);
	1739	+ list_add(&hdev->list, head);
1806	1740
1807	1741	write_unlock(&hci_dev_list_lock);
1808	1742
@@ -1884,8 +1818,6 @@ void hci_unregister_dev(struct hci_dev *hdev) · 75 unmodified lines
1884	1818
1885	1819	hci_del_sysfs(hdev);
1886	1820
1887		− cancel_delayed_work_sync(&hdev->adv_work);
1888		−
1889	1821	destroy_workqueue(hdev->workqueue);
1890	1822
1891	1823	hci_dev_lock(hdev);
@@ -1894,7 +1826,6 @@ void hci_unregister_dev(struct hci_dev *hdev) · 2 unmodified lines
1894	1826	hci_link_keys_clear(hdev);
1895	1827	hci_smp_ltks_clear(hdev);
1896	1828	hci_remote_oob_data_clear(hdev);
1897		− hci_adv_entries_clear(hdev);
1898	1829	hci_dev_unlock(hdev);
1899	1830
1900	1831	hci_dev_put(hdev);
@@ -2231,6 +2162,12 @@ static void hci_queue_acl(struct hci_conn conn, struct sk_buff_head queue, · 330 unmodified lines
2231	2162	struct hci_dev *hdev = conn->hdev;
2232	2163	struct sk_buff *list;
2233	2164
	2165	+ skb->len = skb_headlen(skb);
	2166	+ skb->data_len = 0;
	2167	+
	2168	+ bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT;
	2169	+ hci_add_acl_hdr(skb, conn->handle, flags);
	2170	+
2234	2171	list = skb_shinfo(skb)->frag_list;
2235	2172	if (!list) {
2236	2173	/* Non fragmented */
@@ -2274,8 +2211,6 @@ void hci_send_acl(struct hci_chan chan, struct sk_buff skb, __u16 flags) · 37 unmodified lines
2274	2211	BT_DBG("%s chan %p flags 0x%x", hdev->name, chan, flags);
2275	2212
2276	2213	skb->dev = (void *) hdev;
2277		− bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT;
2278		− hci_add_acl_hdr(skb, conn->handle, flags);
2279	2214
2280	2215	hci_queue_acl(conn, &chan->data_q, skb, flags);
2281	2216
@@ -2313,7 +2248,7 @@ static inline struct hci_conn hci_low_sent(struct hci_dev hdev, __u8 type, int · 31 unmodified lines
2313	2248	{
2314	2249	struct hci_conn_hash *h = &hdev->conn_hash;
2315	2250	struct hci_conn conn = NULL, c;
2316		− int num = 0, min = ~0;
	2251	+ unsigned int num = 0, min = ~0;
2317	2252
2318	2253	/* We don't have to lock device here. Connections are always
2319	2254	* added and removed with TX task disabled. */
@@ -2394,7 +2329,7 @@ static inline struct hci_chan hci_chan_sent(struct hci_dev hdev, __u8 type, · 74 unmodified lines
2394	2329	{
2395	2330	struct hci_conn_hash *h = &hdev->conn_hash;
2396	2331	struct hci_chan *chan = NULL;
2397		− int num = 0, min = ~0, cur_prio = 0;
	2332	+ unsigned int num = 0, min = ~0, cur_prio = 0;
2398	2333	struct hci_conn *conn;
2399	2334	int cnt, q, conn_num = 0;
2400	2335
@@ -2945,7 +2880,19 @@ int hci_cancel_inquiry(struct hci_dev *hdev) · 544 unmodified lines
2945	2880	BT_DBG("%s", hdev->name);
2946	2881
2947	2882	if (!test_bit(HCI_INQUIRY, &hdev->flags))
2948		− return -EPERM;
	2883	+ return -EALREADY;
2949	2884
2950	2885	return hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL);
2951	2886	}
	2887	+
	2888	+u8 bdaddr_to_le(u8 bdaddr_type)
	2889	+{
	2890	+ switch (bdaddr_type) {
	2891	+ case BDADDR_LE_PUBLIC:
	2892	+ return ADDR_LE_DEV_PUBLIC;
	2893	+
	2894	+ default:
	2895	+ /* Fallback to LE Random address type */
	2896	+ return ADDR_LE_DEV_RANDOM;
	2897	+ }
	2898	+}

net/bluetooth/hci_event.c+54−21

@@ -69,6 +69,18 @@ static void hci_cc_inquiry_cancel(struct hci_dev hdev, struct sk_buff skb) · 68 unmodified lines
69	69	hci_conn_check_pending(hdev);
70	70	}
71	71
	72	+static void hci_cc_periodic_inq(struct hci_dev hdev, struct sk_buff skb)
	73	+{
	74	+ __u8 status = ((__u8 ) skb->data);
	75	+
	76	+ BT_DBG("%s status 0x%x", hdev->name, status);
	77	+
	78	+ if (status)
	79	+ return;
	80	+
	81	+ set_bit(HCI_PERIODIC_INQ, &hdev->dev_flags);
	82	+}
	83	+
72	84	static void hci_cc_exit_periodic_inq(struct hci_dev hdev, struct sk_buff skb)
73	85	{
74	86	__u8 status = ((__u8 ) skb->data);
@@ -78,6 +90,8 @@ static void hci_cc_exit_periodic_inq(struct hci_dev hdev, struct sk_buff skb) · 3 unmodified lines
78	90	if (status)
79	91	return;
80	92
	93	+ clear_bit(HCI_PERIODIC_INQ, &hdev->dev_flags);
	94	+
81	95	hci_conn_check_pending(hdev);
82	96	}
83	97
@@ -192,7 +206,8 @@ static void hci_cc_reset(struct hci_dev hdev, struct sk_buff skb) · 108 unmodified lines
192	206	hci_req_complete(hdev, HCI_OP_RESET, status);
193	207
194	208	/* Reset all non-persistent flags */
195		− hdev->dev_flags &= ~(BIT(HCI_LE_SCAN) \| BIT(HCI_PENDING_CLASS));
	209	+ hdev->dev_flags &= ~(BIT(HCI_LE_SCAN) \| BIT(HCI_PENDING_CLASS) \|
	210	+ BIT(HCI_PERIODIC_INQ));
196	211
197	212	hdev->discovery.state = DISCOVERY_STOPPED;
198	213	}
@@ -505,7 +520,7 @@ static void hci_setup_event_mask(struct hci_dev *hdev) · 306 unmodified lines
505	520	events[5] \|= 0x10; /* Synchronous Connection Changed */
506	521
507	522	if (hdev->features[3] & LMP_RSSI_INQ)
508		− events[4] \|= 0x04; /* Inquiry Result with RSSI */
	523	+ events[4] \|= 0x02; /* Inquiry Result with RSSI */
509	524
510	525	if (hdev->features[5] & LMP_SNIFF_SUBR)
511	526	events[5] \|= 0x20; /* Sniff Subrating */
@@ -615,6 +630,7 @@ done: · 103 unmodified lines
615	630
616	631	static void hci_setup_link_policy(struct hci_dev *hdev)
617	632	{
	633	+ struct hci_cp_write_def_link_policy cp;
618	634	u16 link_policy = 0;
619	635
620	636	if (hdev->features[0] & LMP_RSWITCH)
@@ -626,9 +642,8 @@ static void hci_setup_link_policy(struct hci_dev *hdev) · 5 unmodified lines
626	642	if (hdev->features[1] & LMP_PARK)
627	643	link_policy \|= HCI_LP_PARK;
628	644
629		− link_policy = cpu_to_le16(link_policy);
630		− hci_send_cmd(hdev, HCI_OP_WRITE_DEF_LINK_POLICY, sizeof(link_policy),
631		− &link_policy);
	645	+ cp.policy = cpu_to_le16(link_policy);
	646	+ hci_send_cmd(hdev, HCI_OP_WRITE_DEF_LINK_POLICY, sizeof(cp), &cp);
632	647	}
633	648
634	649	static void hci_cc_read_local_commands(struct hci_dev hdev, struct sk_buff skb)
@@ -710,7 +725,7 @@ static void hci_set_le_support(struct hci_dev *hdev) · 75 unmodified lines
710	725
711	726	memset(&cp, 0, sizeof(cp));
712	727
713		− if (enable_le && test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
	728	+ if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
714	729	cp.le = 1;
715	730	cp.simul = !!(hdev->features[6] & LMP_SIMUL_LE_BR);
716	731	}
@@ -887,11 +902,14 @@ static void hci_cc_write_inquiry_mode(struct hci_dev *hdev, · 170 unmodified lines
887	902	static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev,
888	903	struct sk_buff *skb)
889	904	{
890		− __u8 status = ((__u8 ) skb->data);
	905	+ struct hci_rp_read_inq_rsp_tx_power rp = (void ) skb->data;
891	906
892		− BT_DBG("%s status 0x%x", hdev->name, status);
	907	+ BT_DBG("%s status 0x%x", hdev->name, rp->status);
	908	+
	909	+ if (!rp->status)
	910	+ hdev->inq_tx_power = rp->tx_power;
893	911
894		− hci_req_complete(hdev, HCI_OP_READ_INQ_RSP_TX_POWER, status);
	912	+ hci_req_complete(hdev, HCI_OP_READ_INQ_RSP_TX_POWER, rp->status);
895	913	}
896	914
897	915	static void hci_cc_set_event_flt(struct hci_dev hdev, struct sk_buff skb)
@@ -1082,23 +1100,23 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, · 184 unmodified lines
1082	1100
1083	1101	set_bit(HCI_LE_SCAN, &hdev->dev_flags);
1084	1102
1085		− cancel_delayed_work_sync(&hdev->adv_work);
1086		−
1087	1103	hci_dev_lock(hdev);
1088		− hci_adv_entries_clear(hdev);
1089	1104	hci_discovery_set_state(hdev, DISCOVERY_FINDING);
1090	1105	hci_dev_unlock(hdev);
1091	1106	break;
1092	1107
1093	1108	case LE_SCANNING_DISABLED:
1094		− if (status)
	1109	+ if (status) {
	1110	+ hci_dev_lock(hdev);
	1111	+ mgmt_stop_discovery_failed(hdev, status);
	1112	+ hci_dev_unlock(hdev);
1095	1113	return;
	1114	+ }
1096	1115
1097	1116	clear_bit(HCI_LE_SCAN, &hdev->dev_flags);
1098	1117
1099		− schedule_delayed_work(&hdev->adv_work, ADV_CLEAR_TIMEOUT);
1100		−
1101		− if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED) {
	1118	+ if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED &&
	1119	+ hdev->discovery.state == DISCOVERY_FINDING) {
1102	1120	mgmt_interleaved_discovery(hdev);
1103	1121	} else {
1104	1122	hci_dev_lock(hdev);
@@ -1625,6 +1643,8 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status) · 520 unmodified lines
1625	1643	if (status) {
1626	1644	if (conn && conn->state == BT_CONNECT) {
1627	1645	conn->state = BT_CLOSED;
	1646	+ mgmt_connect_failed(hdev, &cp->peer_addr, conn->type,
	1647	+ conn->dst_type, status);
1628	1648	hci_proto_connect_cfm(conn, status);
1629	1649	hci_conn_del(conn);
1630	1650	}
@@ -1699,6 +1719,9 @@ static inline void hci_inquiry_result_evt(struct hci_dev hdev, struct sk_buff · 68 unmodified lines
1699	1719	if (!num_rsp)
1700	1720	return;
1701	1721
	1722	+ if (test_bit(HCI_PERIODIC_INQ, &hdev->dev_flags))
	1723	+ return;
	1724	+
1702	1725	hci_dev_lock(hdev);
1703	1726
1704	1727	for (; num_rsp; num_rsp--, info++) {
@@ -2040,7 +2063,7 @@ static inline void hci_encrypt_change_evt(struct hci_dev hdev, struct sk_buff · 335 unmodified lines
2040	2063	clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
2041	2064
2042	2065	if (ev->status && conn->state == BT_CONNECTED) {
2043		− hci_acl_disconn(conn, 0x13);
	2066	+ hci_acl_disconn(conn, HCI_ERROR_AUTH_FAILURE);
2044	2067	hci_conn_put(conn);
2045	2068	goto unlock;
2046	2069	}
@@ -2154,6 +2177,10 @@ static inline void hci_cmd_complete_evt(struct hci_dev hdev, struct sk_buff sk · 107 unmodified lines
2154	2177	hci_cc_inquiry_cancel(hdev, skb);
2155	2178	break;
2156	2179
	2180	+ case HCI_OP_PERIODIC_INQ:
	2181	+ hci_cc_periodic_inq(hdev, skb);
	2182	+ break;
	2183	+
2157	2184	case HCI_OP_EXIT_PERIODIC_INQ:
2158	2185	hci_cc_exit_periodic_inq(hdev, skb);
2159	2186	break;
@@ -2806,6 +2833,9 @@ static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct · 646 unmodified lines
2806	2833	if (!num_rsp)
2807	2834	return;
2808	2835
	2836	+ if (test_bit(HCI_PERIODIC_INQ, &hdev->dev_flags))
	2837	+ return;
	2838	+
2809	2839	hci_dev_lock(hdev);
2810	2840
2811	2841	if ((skb->len - 1) / num_rsp != sizeof(struct inquiry_info_with_rssi)) {
@@ -2971,12 +3001,16 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct · 159 unmodified lines
2971	3001	struct inquiry_data data;
2972	3002	struct extended_inquiry_info info = (void ) (skb->data + 1);
2973	3003	int num_rsp = ((__u8 ) skb->data);
	3004	+ size_t eir_len;
2974	3005
2975	3006	BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
2976	3007
2977	3008	if (!num_rsp)
2978	3009	return;
2979	3010
	3011	+ if (test_bit(HCI_PERIODIC_INQ, &hdev->dev_flags))
	3012	+ return;
	3013	+
2980	3014	hci_dev_lock(hdev);
2981	3015
2982	3016	for (; num_rsp; num_rsp--, info++) {
@@ -3000,9 +3034,10 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct · 17 unmodified lines
3000	3034
3001	3035	name_known = hci_inquiry_cache_update(hdev, &data, name_known,
3002	3036	&ssp);
	3037	+ eir_len = eir_get_length(info->data, sizeof(info->data));
3003	3038	mgmt_device_found(hdev, &info->bdaddr, ACL_LINK, 0x00,
3004	3039	info->dev_class, info->rssi, !name_known,
3005		− ssp, info->data, sizeof(info->data));
	3040	+ ssp, info->data, eir_len);
3006	3041	}
3007	3042
3008	3043	hci_dev_unlock(hdev);
@@ -3322,8 +3357,6 @@ static inline void hci_le_adv_report_evt(struct hci_dev *hdev, · 313 unmodified lines
3322	3357	while (num_reports--) {
3323	3358	struct hci_ev_le_advertising_info *ev = ptr;
3324	3359
3325		− hci_add_adv_entry(hdev, ev);
3326		−
3327	3360	rssi = ev->data[ev->length];
3328	3361	mgmt_device_found(hdev, &ev->bdaddr, LE_LINK, ev->bdaddr_type,
3329	3362	NULL, rssi, 0, 1, ev->data, ev->length);
@@ -3343,7 +3376,7 @@ static inline void hci_le_ltk_request_evt(struct hci_dev *hdev, · 13 unmodified lines
3343	3376	struct hci_conn *conn;
3344	3377	struct smp_ltk *ltk;
3345	3378
3346		− BT_DBG("%s handle %d", hdev->name, cpu_to_le16(ev->handle));
	3379	+ BT_DBG("%s handle %d", hdev->name, __le16_to_cpu(ev->handle));
3347	3380
3348	3381	hci_dev_lock(hdev);
3349	3382

net/bluetooth/hci_sysfs.c+2−3

@@ -444,8 +444,8 @@ static const struct file_operations blacklist_fops = { · 443 unmodified lines
444	444
445	445	static void print_bt_uuid(struct seq_file f, u8 uuid)
446	446	{
447		− u32 data0, data4;
448		− u16 data1, data2, data3, data5;
	447	+ __be32 data0, data4;
	448	+ __be16 data1, data2, data3, data5;
449	449
450	450	memcpy(&data0, &uuid[0], 4);
451	451	memcpy(&data1, &uuid[4], 2);
@@ -533,7 +533,6 @@ int hci_add_sysfs(struct hci_dev *hdev) · 81 unmodified lines
533	533
534	534	BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
535	535
536		− dev->parent = hdev->parent;
537	536	dev_set_name(dev, "%s", hdev->name);
538	537
539	538	err = device_add(dev);

net/bluetooth/l2cap_core.c+538−224

@@ -4,6 +4,7 @@ · 3 unmodified lines
4	4	Copyright (C) 2009-2010 Gustavo F. Padovan <gustavo@padovan.org>
5	5	Copyright (C) 2010 Google Inc.
6	6	Copyright (C) 2011 ProFUSION Embedded Systems
	7	+ Copyright (c) 2012 Code Aurora Forum. All rights reserved.
7	8
8	9	Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
9	10
@@ -70,7 +71,7 @@ static void l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16 len, · 60 unmodified lines
70	71	void *data);
71	72	static int l2cap_build_conf_req(struct l2cap_chan chan, void data);
72	73	static void l2cap_send_disconn_req(struct l2cap_conn *conn,
73		− struct l2cap_chan *chan, int err);
	74	+ struct l2cap_chan *chan, int err);
74	75
75	76	/* ---- L2CAP channels ---- */
76	77
@@ -97,13 +98,15 @@ static struct l2cap_chan __l2cap_get_chan_by_scid(struct l2cap_conn conn, u16 · 20 unmodified lines
97	98	}
98	99
99	100	/* Find channel with given SCID.
100		− * Returns locked socket */
	101	+ * Returns locked channel. */
101	102	static struct l2cap_chan l2cap_get_chan_by_scid(struct l2cap_conn conn, u16 cid)
102	103	{
103	104	struct l2cap_chan *c;
104	105
105	106	mutex_lock(&conn->chan_lock);
106	107	c = __l2cap_get_chan_by_scid(conn, cid);
	108	+ if (c)
	109	+ l2cap_chan_lock(c);
107	110	mutex_unlock(&conn->chan_lock);
108	111
109	112	return c;
@@ -120,17 +123,6 @@ static struct l2cap_chan __l2cap_get_chan_by_ident(struct l2cap_conn conn, u8 · 10 unmodified lines
120	123	return NULL;
121	124	}
122	125
123		−static inline struct l2cap_chan l2cap_get_chan_by_ident(struct l2cap_conn conn, u8 ident)
124		−{
125		− struct l2cap_chan *c;
126		−
127		− mutex_lock(&conn->chan_lock);
128		− c = __l2cap_get_chan_by_ident(conn, ident);
129		− mutex_unlock(&conn->chan_lock);
130		−
131		− return c;
132		−}
133		−
134	126	static struct l2cap_chan __l2cap_global_chan_by_addr(__le16 psm, bdaddr_t src)
135	127	{
136	128	struct l2cap_chan *c;
@@ -232,6 +224,124 @@ static inline void l2cap_chan_set_err(struct l2cap_chan *chan, int err) · 95 unmodified lines
232	224	release_sock(sk);
233	225	}
234	226
	227	+/* ---- L2CAP sequence number lists ---- */
	228	+
	229	+/* For ERTM, ordered lists of sequence numbers must be tracked for
	230	+ * SREJ requests that are received and for frames that are to be
	231	+ * retransmitted. These seq_list functions implement a singly-linked
	232	+ * list in an array, where membership in the list can also be checked
	233	+ * in constant time. Items can also be added to the tail of the list
	234	+ * and removed from the head in constant time, without further memory
	235	+ * allocs or frees.
	236	+ */
	237	+
	238	+static int l2cap_seq_list_init(struct l2cap_seq_list *seq_list, u16 size)
	239	+{
	240	+ size_t alloc_size, i;
	241	+
	242	+ /* Allocated size is a power of 2 to map sequence numbers
	243	+ * (which may be up to 14 bits) in to a smaller array that is
	244	+ * sized for the negotiated ERTM transmit windows.
	245	+ */
	246	+ alloc_size = roundup_pow_of_two(size);
	247	+
	248	+ seq_list->list = kmalloc(sizeof(u16) * alloc_size, GFP_KERNEL);
	249	+ if (!seq_list->list)
	250	+ return -ENOMEM;
	251	+
	252	+ seq_list->mask = alloc_size - 1;
	253	+ seq_list->head = L2CAP_SEQ_LIST_CLEAR;
	254	+ seq_list->tail = L2CAP_SEQ_LIST_CLEAR;
	255	+ for (i = 0; i < alloc_size; i++)
	256	+ seq_list->list[i] = L2CAP_SEQ_LIST_CLEAR;
	257	+
	258	+ return 0;
	259	+}
	260	+
	261	+static inline void l2cap_seq_list_free(struct l2cap_seq_list *seq_list)
	262	+{
	263	+ kfree(seq_list->list);
	264	+}
	265	+
	266	+static inline bool l2cap_seq_list_contains(struct l2cap_seq_list *seq_list,
	267	+ u16 seq)
	268	+{
	269	+ /* Constant-time check for list membership */
	270	+ return seq_list->list[seq & seq_list->mask] != L2CAP_SEQ_LIST_CLEAR;
	271	+}
	272	+
	273	+static u16 l2cap_seq_list_remove(struct l2cap_seq_list *seq_list, u16 seq)
	274	+{
	275	+ u16 mask = seq_list->mask;
	276	+
	277	+ if (seq_list->head == L2CAP_SEQ_LIST_CLEAR) {
	278	+ /* In case someone tries to pop the head of an empty list */
	279	+ return L2CAP_SEQ_LIST_CLEAR;
	280	+ } else if (seq_list->head == seq) {
	281	+ /* Head can be removed in constant time */
	282	+ seq_list->head = seq_list->list[seq & mask];
	283	+ seq_list->list[seq & mask] = L2CAP_SEQ_LIST_CLEAR;
	284	+
	285	+ if (seq_list->head == L2CAP_SEQ_LIST_TAIL) {
	286	+ seq_list->head = L2CAP_SEQ_LIST_CLEAR;
	287	+ seq_list->tail = L2CAP_SEQ_LIST_CLEAR;
	288	+ }
	289	+ } else {
	290	+ /* Walk the list to find the sequence number */
	291	+ u16 prev = seq_list->head;
	292	+ while (seq_list->list[prev & mask] != seq) {
	293	+ prev = seq_list->list[prev & mask];
	294	+ if (prev == L2CAP_SEQ_LIST_TAIL)
	295	+ return L2CAP_SEQ_LIST_CLEAR;
	296	+ }
	297	+
	298	+ /* Unlink the number from the list and clear it */
	299	+ seq_list->list[prev & mask] = seq_list->list[seq & mask];
	300	+ seq_list->list[seq & mask] = L2CAP_SEQ_LIST_CLEAR;
	301	+ if (seq_list->tail == seq)
	302	+ seq_list->tail = prev;
	303	+ }
	304	+ return seq;
	305	+}
	306	+
	307	+static inline u16 l2cap_seq_list_pop(struct l2cap_seq_list *seq_list)
	308	+{
	309	+ /* Remove the head in constant time */
	310	+ return l2cap_seq_list_remove(seq_list, seq_list->head);
	311	+}
	312	+
	313	+static void l2cap_seq_list_clear(struct l2cap_seq_list *seq_list)
	314	+{
	315	+ u16 i;
	316	+
	317	+ if (seq_list->head == L2CAP_SEQ_LIST_CLEAR)
	318	+ return;
	319	+
	320	+ for (i = 0; i <= seq_list->mask; i++)
	321	+ seq_list->list[i] = L2CAP_SEQ_LIST_CLEAR;
	322	+
	323	+ seq_list->head = L2CAP_SEQ_LIST_CLEAR;
	324	+ seq_list->tail = L2CAP_SEQ_LIST_CLEAR;
	325	+}
	326	+
	327	+static void l2cap_seq_list_append(struct l2cap_seq_list *seq_list, u16 seq)
	328	+{
	329	+ u16 mask = seq_list->mask;
	330	+
	331	+ /* All appends happen in constant time */
	332	+
	333	+ if (seq_list->list[seq & mask] != L2CAP_SEQ_LIST_CLEAR)
	334	+ return;
	335	+
	336	+ if (seq_list->tail == L2CAP_SEQ_LIST_CLEAR)
	337	+ seq_list->head = seq;
	338	+ else
	339	+ seq_list->list[seq_list->tail & mask] = seq;
	340	+
	341	+ seq_list->tail = seq;
	342	+ seq_list->list[seq & mask] = L2CAP_SEQ_LIST_TAIL;
	343	+}
	344	+
235	345	static void l2cap_chan_timeout(struct work_struct *work)
236	346	{
237	347	struct l2cap_chan *chan = container_of(work, struct l2cap_chan,
@@ -262,7 +372,7 @@ static void l2cap_chan_timeout(struct work_struct *work) · 24 unmodified lines
262	372	l2cap_chan_put(chan);
263	373	}
264	374
265		−struct l2cap_chan l2cap_chan_create(struct sock sk)
	375	+struct l2cap_chan *l2cap_chan_create(void)
266	376	{
267	377	struct l2cap_chan *chan;
268	378
@@ -272,8 +382,6 @@ struct l2cap_chan l2cap_chan_create(struct sock sk) · 3 unmodified lines
272	382
273	383	mutex_init(&chan->lock);
274	384
275		− chan->sk = sk;
276		−
277	385	write_lock(&chan_list_lock);
278	386	list_add(&chan->global_l, &chan_list);
279	387	write_unlock(&chan_list_lock);
@@ -284,7 +392,7 @@ struct l2cap_chan l2cap_chan_create(struct sock sk) · 4 unmodified lines
284	392
285	393	atomic_set(&chan->refcnt, 1);
286	394
287		− BT_DBG("sk %p chan %p", sk, chan);
	395	+ BT_DBG("chan %p", chan);
288	396
289	397	return chan;
290	398	}
@@ -298,10 +406,21 @@ void l2cap_chan_destroy(struct l2cap_chan *chan) · 7 unmodified lines
298	406	l2cap_chan_put(chan);
299	407	}
300	408
301		−void __l2cap_chan_add(struct l2cap_conn conn, struct l2cap_chan chan)
	409	+void l2cap_chan_set_defaults(struct l2cap_chan *chan)
	410	+{
	411	+ chan->fcs = L2CAP_FCS_CRC16;
	412	+ chan->max_tx = L2CAP_DEFAULT_MAX_TX;
	413	+ chan->tx_win = L2CAP_DEFAULT_TX_WINDOW;
	414	+ chan->tx_win_max = L2CAP_DEFAULT_TX_WINDOW;
	415	+ chan->sec_level = BT_SECURITY_LOW;
	416	+
	417	+ set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
	418	+}
	419	+
	420	+static void __l2cap_chan_add(struct l2cap_conn conn, struct l2cap_chan chan)
302	421	{
303	422	BT_DBG("conn %p, psm 0x%2.2x, dcid 0x%4.4x", conn,
304		− chan->psm, chan->dcid);
	423	+ __le16_to_cpu(chan->psm), chan->dcid);
305	424
306	425	conn->disc_reason = HCI_ERROR_REMOTE_USER_TERM;
307	426
@@ -347,7 +466,7 @@ void __l2cap_chan_add(struct l2cap_conn conn, struct l2cap_chan chan) · 39 unmodified lines
347	466	list_add(&chan->list, &conn->chan_l);
348	467	}
349	468
350		−void l2cap_chan_add(struct l2cap_conn conn, struct l2cap_chan chan)
	469	+static void l2cap_chan_add(struct l2cap_conn conn, struct l2cap_chan chan)
351	470	{
352	471	mutex_lock(&conn->chan_lock);
353	472	__l2cap_chan_add(conn, chan);
@@ -405,6 +524,8 @@ static void l2cap_chan_del(struct l2cap_chan *chan, int err) · 51 unmodified lines
405	524
406	525	skb_queue_purge(&chan->srej_q);
407	526
	527	+ l2cap_seq_list_free(&chan->srej_list);
	528	+ l2cap_seq_list_free(&chan->retrans_list);
408	529	list_for_each_entry_safe(l, tmp, &chan->srej_l, list) {
409	530	list_del(&l->list);
410	531	kfree(l);
@@ -453,7 +574,6 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason) · 42 unmodified lines
453	574	case BT_CONFIG:
454	575	if (chan->chan_type == L2CAP_CHAN_CONN_ORIENTED &&
455	576	conn->hcon->type == ACL_LINK) {
456		− __clear_chan_timer(chan);
457	577	__set_chan_timer(chan, sk->sk_sndtimeo);
458	578	l2cap_send_disconn_req(conn, chan, reason);
459	579	} else
@@ -466,7 +586,7 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason) · 6 unmodified lines
466	586	struct l2cap_conn_rsp rsp;
467	587	__u16 result;
468	588
469		− if (bt_sk(sk)->defer_setup)
	589	+ if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags))
470	590	result = L2CAP_CR_SEC_BLOCK;
471	591	else
472	592	result = L2CAP_CR_BAD_PSM;
@@ -599,6 +719,117 @@ static void l2cap_do_send(struct l2cap_chan chan, struct sk_buff skb) · 126 unmodified lines
599	719	hci_send_acl(chan->conn->hchan, skb, flags);
600	720	}
601	721
	722	+static void __unpack_enhanced_control(u16 enh, struct l2cap_ctrl *control)
	723	+{
	724	+ control->reqseq = (enh & L2CAP_CTRL_REQSEQ) >> L2CAP_CTRL_REQSEQ_SHIFT;
	725	+ control->final = (enh & L2CAP_CTRL_FINAL) >> L2CAP_CTRL_FINAL_SHIFT;
	726	+
	727	+ if (enh & L2CAP_CTRL_FRAME_TYPE) {
	728	+ /* S-Frame */
	729	+ control->sframe = 1;
	730	+ control->poll = (enh & L2CAP_CTRL_POLL) >> L2CAP_CTRL_POLL_SHIFT;
	731	+ control->super = (enh & L2CAP_CTRL_SUPERVISE) >> L2CAP_CTRL_SUPER_SHIFT;
	732	+
	733	+ control->sar = 0;
	734	+ control->txseq = 0;
	735	+ } else {
	736	+ /* I-Frame */
	737	+ control->sframe = 0;
	738	+ control->sar = (enh & L2CAP_CTRL_SAR) >> L2CAP_CTRL_SAR_SHIFT;
	739	+ control->txseq = (enh & L2CAP_CTRL_TXSEQ) >> L2CAP_CTRL_TXSEQ_SHIFT;
	740	+
	741	+ control->poll = 0;
	742	+ control->super = 0;
	743	+ }
	744	+}
	745	+
	746	+static void __unpack_extended_control(u32 ext, struct l2cap_ctrl *control)
	747	+{
	748	+ control->reqseq = (ext & L2CAP_EXT_CTRL_REQSEQ) >> L2CAP_EXT_CTRL_REQSEQ_SHIFT;
	749	+ control->final = (ext & L2CAP_EXT_CTRL_FINAL) >> L2CAP_EXT_CTRL_FINAL_SHIFT;
	750	+
	751	+ if (ext & L2CAP_EXT_CTRL_FRAME_TYPE) {
	752	+ /* S-Frame */
	753	+ control->sframe = 1;
	754	+ control->poll = (ext & L2CAP_EXT_CTRL_POLL) >> L2CAP_EXT_CTRL_POLL_SHIFT;
	755	+ control->super = (ext & L2CAP_EXT_CTRL_SUPERVISE) >> L2CAP_EXT_CTRL_SUPER_SHIFT;
	756	+
	757	+ control->sar = 0;
	758	+ control->txseq = 0;
	759	+ } else {
	760	+ /* I-Frame */
	761	+ control->sframe = 0;
	762	+ control->sar = (ext & L2CAP_EXT_CTRL_SAR) >> L2CAP_EXT_CTRL_SAR_SHIFT;
	763	+ control->txseq = (ext & L2CAP_EXT_CTRL_TXSEQ) >> L2CAP_EXT_CTRL_TXSEQ_SHIFT;
	764	+
	765	+ control->poll = 0;
	766	+ control->super = 0;
	767	+ }
	768	+}
	769	+
	770	+static inline void __unpack_control(struct l2cap_chan *chan,
	771	+ struct sk_buff *skb)
	772	+{
	773	+ if (test_bit(FLAG_EXT_CTRL, &chan->flags)) {
	774	+ __unpack_extended_control(get_unaligned_le32(skb->data),
	775	+ &bt_cb(skb)->control);
	776	+ } else {
	777	+ __unpack_enhanced_control(get_unaligned_le16(skb->data),
	778	+ &bt_cb(skb)->control);
	779	+ }
	780	+}
	781	+
	782	+static u32 __pack_extended_control(struct l2cap_ctrl *control)
	783	+{
	784	+ u32 packed;
	785	+
	786	+ packed = control->reqseq << L2CAP_EXT_CTRL_REQSEQ_SHIFT;
	787	+ packed \|= control->final << L2CAP_EXT_CTRL_FINAL_SHIFT;
	788	+
	789	+ if (control->sframe) {
	790	+ packed \|= control->poll << L2CAP_EXT_CTRL_POLL_SHIFT;
	791	+ packed \|= control->super << L2CAP_EXT_CTRL_SUPER_SHIFT;
	792	+ packed \|= L2CAP_EXT_CTRL_FRAME_TYPE;
	793	+ } else {
	794	+ packed \|= control->sar << L2CAP_EXT_CTRL_SAR_SHIFT;
	795	+ packed \|= control->txseq << L2CAP_EXT_CTRL_TXSEQ_SHIFT;
	796	+ }
	797	+
	798	+ return packed;
	799	+}
	800	+
	801	+static u16 __pack_enhanced_control(struct l2cap_ctrl *control)
	802	+{
	803	+ u16 packed;
	804	+
	805	+ packed = control->reqseq << L2CAP_CTRL_REQSEQ_SHIFT;
	806	+ packed \|= control->final << L2CAP_CTRL_FINAL_SHIFT;
	807	+
	808	+ if (control->sframe) {
	809	+ packed \|= control->poll << L2CAP_CTRL_POLL_SHIFT;
	810	+ packed \|= control->super << L2CAP_CTRL_SUPER_SHIFT;
	811	+ packed \|= L2CAP_CTRL_FRAME_TYPE;
	812	+ } else {
	813	+ packed \|= control->sar << L2CAP_CTRL_SAR_SHIFT;
	814	+ packed \|= control->txseq << L2CAP_CTRL_TXSEQ_SHIFT;
	815	+ }
	816	+
	817	+ return packed;
	818	+}
	819	+
	820	+static inline void __pack_control(struct l2cap_chan *chan,
	821	+ struct l2cap_ctrl *control,
	822	+ struct sk_buff *skb)
	823	+{
	824	+ if (test_bit(FLAG_EXT_CTRL, &chan->flags)) {
	825	+ put_unaligned_le32(__pack_extended_control(control),
	826	+ skb->data + L2CAP_HDR_SIZE);
	827	+ } else {
	828	+ put_unaligned_le16(__pack_enhanced_control(control),
	829	+ skb->data + L2CAP_HDR_SIZE);
	830	+ }
	831	+}
	832	+
602	833	static inline void l2cap_send_sframe(struct l2cap_chan *chan, u32 control)
603	834	{
604	835	struct sk_buff *skb;
@@ -681,10 +912,38 @@ static void l2cap_send_conn_req(struct l2cap_chan *chan) · 76 unmodified lines
681	912	l2cap_send_cmd(conn, chan->ident, L2CAP_CONN_REQ, sizeof(req), &req);
682	913	}
683	914
	915	+static void l2cap_chan_ready(struct l2cap_chan *chan)
	916	+{
	917	+ struct sock *sk = chan->sk;
	918	+ struct sock *parent;
	919	+
	920	+ lock_sock(sk);
	921	+
	922	+ parent = bt_sk(sk)->parent;
	923	+
	924	+ BT_DBG("sk %p, parent %p", sk, parent);
	925	+
	926	+ chan->conf_state = 0;
	927	+ __clear_chan_timer(chan);
	928	+
	929	+ __l2cap_state_change(chan, BT_CONNECTED);
	930	+ sk->sk_state_change(sk);
	931	+
	932	+ if (parent)
	933	+ parent->sk_data_ready(parent, 0);
	934	+
	935	+ release_sock(sk);
	936	+}
	937	+
684	938	static void l2cap_do_start(struct l2cap_chan *chan)
685	939	{
686	940	struct l2cap_conn *conn = chan->conn;
687	941
	942	+ if (conn->hcon->type == LE_LINK) {
	943	+ l2cap_chan_ready(chan);
	944	+ return;
	945	+ }
	946	+
688	947	if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_SENT) {
689	948	if (!(conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_DONE))
690	949	return;
@@ -791,7 +1050,8 @@ static void l2cap_conn_start(struct l2cap_conn *conn) · 100 unmodified lines
791	1050
792	1051	if (l2cap_chan_check_security(chan)) {
793	1052	lock_sock(sk);
794		− if (bt_sk(sk)->defer_setup) {
	1053	+ if (test_bit(BT_SK_DEFER_SETUP,
	1054	+ &bt_sk(sk)->flags)) {
795	1055	struct sock *parent = bt_sk(sk)->parent;
796	1056	rsp.result = cpu_to_le16(L2CAP_CR_PEND);
797	1057	rsp.status = cpu_to_le16(L2CAP_CS_AUTHOR_PEND);
@@ -830,10 +1090,12 @@ static void l2cap_conn_start(struct l2cap_conn *conn) · 32 unmodified lines
830	1090	mutex_unlock(&conn->chan_lock);
831	1091	}
832	1092
833		−/* Find socket with cid and source bdaddr.
	1093	+/* Find socket with cid and source/destination bdaddr.
834	1094	* Returns closest match, locked.
835	1095	*/
836		−static struct l2cap_chan l2cap_global_chan_by_scid(int state, __le16 cid, bdaddr_t src)
	1096	+static struct l2cap_chan *l2cap_global_chan_by_scid(int state, u16 cid,
	1097	+ bdaddr_t *src,
	1098	+ bdaddr_t *dst)
837	1099	{
838	1100	struct l2cap_chan c, c1 = NULL;
839	1101
@@ -846,14 +1108,22 @@ static struct l2cap_chan *l2cap_global_chan_by_scid(int state, __le16 cid, bdadd · 6 unmodified lines
846	1108	continue;
847	1109
848	1110	if (c->scid == cid) {
	1111	+ int src_match, dst_match;
	1112	+ int src_any, dst_any;
	1113	+
849	1114	/* Exact match. */
850		− if (!bacmp(&bt_sk(sk)->src, src)) {
	1115	+ src_match = !bacmp(&bt_sk(sk)->src, src);
	1116	+ dst_match = !bacmp(&bt_sk(sk)->dst, dst);
	1117	+ if (src_match && dst_match) {
851	1118	read_unlock(&chan_list_lock);
852	1119	return c;
853	1120	}
854	1121
855	1122	/* Closest match */
856		− if (!bacmp(&bt_sk(sk)->src, BDADDR_ANY))
	1123	+ src_any = !bacmp(&bt_sk(sk)->src, BDADDR_ANY);
	1124	+ dst_any = !bacmp(&bt_sk(sk)->dst, BDADDR_ANY);
	1125	+ if ((src_match && dst_any) \|\| (src_any && dst_match) \|\|
	1126	+ (src_any && dst_any))
857	1127	c1 = c;
858	1128	}
859	1129	}
@@ -872,7 +1142,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) · 12 unmodified lines
872	1142
873	1143	/* Check if we have socket listening on cid */
874	1144	pchan = l2cap_global_chan_by_scid(BT_LISTEN, L2CAP_CID_LE_DATA,
875		− conn->src);
	1145	+ conn->src, conn->dst);
876	1146	if (!pchan)
877	1147	return;
878	1148
@@ -910,29 +1180,6 @@ clean: · 31 unmodified lines
910	1180	release_sock(parent);
911	1181	}
912	1182
913		−static void l2cap_chan_ready(struct l2cap_chan *chan)
914		−{
915		− struct sock *sk = chan->sk;
916		− struct sock *parent;
917		−
918		− lock_sock(sk);
919		−
920		− parent = bt_sk(sk)->parent;
921		−
922		− BT_DBG("sk %p, parent %p", sk, parent);
923		−
924		− chan->conf_state = 0;
925		− __clear_chan_timer(chan);
926		−
927		− __l2cap_state_change(chan, BT_CONNECTED);
928		− sk->sk_state_change(sk);
929		−
930		− if (parent)
931		− parent->sk_data_ready(parent, 0);
932		−
933		− release_sock(sk);
934		−}
935		−
936	1183	static void l2cap_conn_ready(struct l2cap_conn *conn)
937	1184	{
938	1185	struct l2cap_chan *chan;
@@ -1016,6 +1263,7 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err) · 77 unmodified lines
1016	1263
1017	1264	/* Kill channels */
1018	1265	list_for_each_entry_safe(chan, l, &conn->chan_l, list) {
	1266	+ l2cap_chan_hold(chan);
1019	1267	l2cap_chan_lock(chan);
1020	1268
1021	1269	l2cap_chan_del(chan, err);
@@ -1023,6 +1271,7 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err) · 1 unmodified line
1023	1271	l2cap_chan_unlock(chan);
1024	1272
1025	1273	chan->ops->close(chan->data);
	1274	+ l2cap_chan_put(chan);
1026	1275	}
1027	1276
1028	1277	mutex_unlock(&conn->chan_lock);
@@ -1100,10 +1349,12 @@ static struct l2cap_conn l2cap_conn_add(struct hci_conn hcon, u8 status) · 71 unmodified lines
1100	1349
1101	1350	/* ---- Socket interface ---- */
1102	1351
1103		−/* Find socket with psm and source bdaddr.
	1352	+/* Find socket with psm and source / destination bdaddr.
1104	1353	* Returns closest match.
1105	1354	*/
1106		−static struct l2cap_chan l2cap_global_chan_by_psm(int state, __le16 psm, bdaddr_t src)
	1355	+static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm,
	1356	+ bdaddr_t *src,
	1357	+ bdaddr_t *dst)
1107	1358	{
1108	1359	struct l2cap_chan c, c1 = NULL;
1109	1360
@@ -1116,14 +1367,22 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, bdaddr · 6 unmodified lines
1116	1367	continue;
1117	1368
1118	1369	if (c->psm == psm) {
	1370	+ int src_match, dst_match;
	1371	+ int src_any, dst_any;
	1372	+
1119	1373	/* Exact match. */
1120		− if (!bacmp(&bt_sk(sk)->src, src)) {
	1374	+ src_match = !bacmp(&bt_sk(sk)->src, src);
	1375	+ dst_match = !bacmp(&bt_sk(sk)->dst, dst);
	1376	+ if (src_match && dst_match) {
1121	1377	read_unlock(&chan_list_lock);
1122	1378	return c;
1123	1379	}
1124	1380
1125	1381	/* Closest match */
1126		− if (!bacmp(&bt_sk(sk)->src, BDADDR_ANY))
	1382	+ src_any = !bacmp(&bt_sk(sk)->src, BDADDR_ANY);
	1383	+ dst_any = !bacmp(&bt_sk(sk)->dst, BDADDR_ANY);
	1384	+ if ((src_match && dst_any) \|\| (src_any && dst_match) \|\|
	1385	+ (src_any && dst_any))
1127	1386	c1 = c;
1128	1387	}
1129	1388	}
@@ -1133,7 +1392,8 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, bdaddr · 3 unmodified lines
1133	1392	return c1;
1134	1393	}
1135	1394
1136		−int l2cap_chan_connect(struct l2cap_chan chan, __le16 psm, u16 cid, bdaddr_t dst)
	1395	+int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
	1396	+ bdaddr_t *dst, u8 dst_type)
1137	1397	{
1138	1398	struct sock *sk = chan->sk;
1139	1399	bdaddr_t *src = &bt_sk(sk)->src;
@@ -1143,8 +1403,8 @@ int l2cap_chan_connect(struct l2cap_chan chan, __le16 psm, u16 cid, bdaddr_t d · 3 unmodified lines
1143	1403	__u8 auth_type;
1144	1404	int err;
1145	1405
1146		− BT_DBG("%s -> %s psm 0x%2.2x", batostr(src), batostr(dst),
1147		− chan->psm);
	1406	+ BT_DBG("%s -> %s (type %u) psm 0x%2.2x", batostr(src), batostr(dst),
	1407	+ dst_type, __le16_to_cpu(chan->psm));
1148	1408
1149	1409	hdev = hci_get_route(dst, src);
1150	1410	if (!hdev)
@@ -1218,11 +1478,11 @@ int l2cap_chan_connect(struct l2cap_chan chan, __le16 psm, u16 cid, bdaddr_t d · 67 unmodified lines
1218	1478	auth_type = l2cap_get_auth_type(chan);
1219	1479
1220	1480	if (chan->dcid == L2CAP_CID_LE_DATA)
1221		− hcon = hci_connect(hdev, LE_LINK, dst,
1222		− chan->sec_level, auth_type);
	1481	+ hcon = hci_connect(hdev, LE_LINK, dst, dst_type,
	1482	+ chan->sec_level, auth_type);
1223	1483	else
1224		− hcon = hci_connect(hdev, ACL_LINK, dst,
1225		− chan->sec_level, auth_type);
	1484	+ hcon = hci_connect(hdev, ACL_LINK, dst, dst_type,
	1485	+ chan->sec_level, auth_type);
1226	1486
1227	1487	if (IS_ERR(hcon)) {
1228	1488	err = PTR_ERR(hcon);
@@ -1236,6 +1496,18 @@ int l2cap_chan_connect(struct l2cap_chan chan, __le16 psm, u16 cid, bdaddr_t d · 7 unmodified lines
1236	1496	goto done;
1237	1497	}
1238	1498
	1499	+ if (hcon->type == LE_LINK) {
	1500	+ err = 0;
	1501	+
	1502	+ if (!list_empty(&conn->chan_l)) {
	1503	+ err = -EBUSY;
	1504	+ hci_conn_put(hcon);
	1505	+ }
	1506	+
	1507	+ if (err)
	1508	+ goto done;
	1509	+ }
	1510	+
1239	1511	/* Update source addr of the socket */
1240	1512	bacpy(src, conn->src);
1241	1513
@@ -1346,7 +1618,7 @@ static void l2cap_drop_acked_frames(struct l2cap_chan *chan) · 104 unmodified lines
1346	1618
1347	1619	while ((skb = skb_peek(&chan->tx_q)) &&
1348	1620	chan->unacked_frames) {
1349		− if (bt_cb(skb)->tx_seq == chan->expected_ack_seq)
	1621	+ if (bt_cb(skb)->control.txseq == chan->expected_ack_seq)
1350	1622	break;
1351	1623
1352	1624	skb = skb_dequeue(&chan->tx_q);
@@ -1368,6 +1640,7 @@ static void l2cap_streaming_send(struct l2cap_chan *chan) · 15 unmodified lines
1368	1640	while ((skb = skb_dequeue(&chan->tx_q))) {
1369	1641	control = __get_control(chan, skb->data + L2CAP_HDR_SIZE);
1370	1642	control \|= __set_txseq(chan, chan->next_tx_seq);
	1643	+ control \|= __set_ctrl_sar(chan, bt_cb(skb)->control.sar);
1371	1644	__put_control(chan, control, skb->data + L2CAP_HDR_SIZE);
1372	1645
1373	1646	if (chan->fcs == L2CAP_FCS_CRC16) {
@@ -1393,21 +1666,21 @@ static void l2cap_retransmit_one_frame(struct l2cap_chan *chan, u16 tx_seq) · 19 unmodified lines
1393	1666	if (!skb)
1394	1667	return;
1395	1668
1396		− while (bt_cb(skb)->tx_seq != tx_seq) {
	1669	+ while (bt_cb(skb)->control.txseq != tx_seq) {
1397	1670	if (skb_queue_is_last(&chan->tx_q, skb))
1398	1671	return;
1399	1672
1400	1673	skb = skb_queue_next(&chan->tx_q, skb);
1401	1674	}
1402	1675
1403		− if (chan->remote_max_tx &&
1404		− bt_cb(skb)->retries == chan->remote_max_tx) {
	1676	+ if (bt_cb(skb)->control.retries == chan->remote_max_tx &&
	1677	+ chan->remote_max_tx) {
1405	1678	l2cap_send_disconn_req(chan->conn, chan, ECONNABORTED);
1406	1679	return;
1407	1680	}
1408	1681
1409	1682	tx_skb = skb_clone(skb, GFP_ATOMIC);
1410		− bt_cb(skb)->retries++;
	1683	+ bt_cb(skb)->control.retries++;
1411	1684
1412	1685	control = __get_control(chan, tx_skb->data + L2CAP_HDR_SIZE);
1413	1686	control &= __get_sar_mask(chan);
@@ -1440,17 +1713,20 @@ static int l2cap_ertm_send(struct l2cap_chan *chan) · 26 unmodified lines
1440	1713	if (chan->state != BT_CONNECTED)
1441	1714	return -ENOTCONN;
1442	1715
	1716	+ if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state))
	1717	+ return 0;
	1718	+
1443	1719	while ((skb = chan->tx_send_head) && (!l2cap_tx_window_full(chan))) {
1444	1720
1445		− if (chan->remote_max_tx &&
1446		− bt_cb(skb)->retries == chan->remote_max_tx) {
	1721	+ if (bt_cb(skb)->control.retries == chan->remote_max_tx &&
	1722	+ chan->remote_max_tx) {
1447	1723	l2cap_send_disconn_req(chan->conn, chan, ECONNABORTED);
1448	1724	break;
1449	1725	}
1450	1726
1451	1727	tx_skb = skb_clone(skb, GFP_ATOMIC);
1452	1728
1453		− bt_cb(skb)->retries++;
	1729	+ bt_cb(skb)->control.retries++;
1454	1730
1455	1731	control = __get_control(chan, tx_skb->data + L2CAP_HDR_SIZE);
1456	1732	control &= __get_sar_mask(chan);
@@ -1460,6 +1736,7 @@ static int l2cap_ertm_send(struct l2cap_chan *chan) · 3 unmodified lines
1460	1736
1461	1737	control \|= __set_reqseq(chan, chan->buffer_seq);
1462	1738	control \|= __set_txseq(chan, chan->next_tx_seq);
	1739	+ control \|= __set_ctrl_sar(chan, bt_cb(skb)->control.sar);
1463	1740
1464	1741	__put_control(chan, control, tx_skb->data + L2CAP_HDR_SIZE);
1465	1742
@@ -1474,11 +1751,11 @@ static int l2cap_ertm_send(struct l2cap_chan *chan) · 8 unmodified lines
1474	1751
1475	1752	__set_retrans_timer(chan);
1476	1753
1477		− bt_cb(skb)->tx_seq = chan->next_tx_seq;
	1754	+ bt_cb(skb)->control.txseq = chan->next_tx_seq;
1478	1755
1479	1756	chan->next_tx_seq = __next_seq(chan, chan->next_tx_seq);
1480	1757
1481		− if (bt_cb(skb)->retries == 1) {
	1758	+ if (bt_cb(skb)->control.retries == 1) {
1482	1759	chan->unacked_frames++;
1483	1760
1484	1761	if (!nsent++)
@@ -1554,7 +1831,7 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan, · 69 unmodified lines
1554	1831	{
1555	1832	struct l2cap_conn *conn = chan->conn;
1556	1833	struct sk_buff **frag;
1557		− int err, sent = 0;
	1834	+ int sent = 0;
1558	1835
1559	1836	if (memcpy_fromiovec(skb_put(skb, count), msg->msg_iov, count))
1560	1837	return -EFAULT;
@@ -1565,14 +1842,17 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan, · 4 unmodified lines
1565	1842	/* Continuation fragments (no L2CAP header) */
1566	1843	frag = &skb_shinfo(skb)->frag_list;
1567	1844	while (len) {
	1845	+ struct sk_buff *tmp;
	1846	+
1568	1847	count = min_t(unsigned int, conn->mtu, len);
1569	1848
1570		− *frag = chan->ops->alloc_skb(chan, count,
1571		− msg->msg_flags & MSG_DONTWAIT,
1572		− &err);
	1849	+ tmp = chan->ops->alloc_skb(chan, count,
	1850	+ msg->msg_flags & MSG_DONTWAIT);
	1851	+ if (IS_ERR(tmp))
	1852	+ return PTR_ERR(tmp);
	1853	+
	1854	+ *frag = tmp;
1573	1855
1574		− if (!*frag)
1575		− return err;
1576	1856	if (memcpy_fromiovec(skb_put(*frag, count), msg->msg_iov, count))
1577	1857	return -EFAULT;
1578	1858
@@ -1581,6 +1861,9 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan, · 2 unmodified lines
1581	1861	sent += count;
1582	1862	len -= count;
1583	1863
	1864	+ skb->len += (*frag)->len;
	1865	+ skb->data_len += (*frag)->len;
	1866	+
1584	1867	frag = &(*frag)->next;
1585	1868	}
1586	1869
@@ -1601,18 +1884,17 @@ static struct sk_buff l2cap_create_connless_pdu(struct l2cap_chan chan, · 14 unmodified lines
1601	1884	count = min_t(unsigned int, (conn->mtu - hlen), len);
1602	1885
1603	1886	skb = chan->ops->alloc_skb(chan, count + hlen,
1604		− msg->msg_flags & MSG_DONTWAIT, &err);
1605		−
1606		− if (!skb)
1607		− return ERR_PTR(err);
	1887	+ msg->msg_flags & MSG_DONTWAIT);
	1888	+ if (IS_ERR(skb))
	1889	+ return skb;
1608	1890
1609	1891	skb->priority = priority;
1610	1892
1611	1893	/* Create L2CAP header */
1612	1894	lh = (struct l2cap_hdr *) skb_put(skb, L2CAP_HDR_SIZE);
1613	1895	lh->cid = cpu_to_le16(chan->dcid);
1614		− lh->len = cpu_to_le16(len + (hlen - L2CAP_HDR_SIZE));
1615		− put_unaligned_le16(chan->psm, skb_put(skb, 2));
	1896	+ lh->len = cpu_to_le16(len + L2CAP_PSMLEN_SIZE);
	1897	+ put_unaligned(chan->psm, skb_put(skb, L2CAP_PSMLEN_SIZE));
1616	1898
1617	1899	err = l2cap_skbuff_fromiovec(chan, msg, len, count, skb);
1618	1900	if (unlikely(err < 0)) {
@@ -1628,25 +1910,24 @@ static struct sk_buff l2cap_create_basic_pdu(struct l2cap_chan chan, · 9 unmodified lines
1628	1910	{
1629	1911	struct l2cap_conn *conn = chan->conn;
1630	1912	struct sk_buff *skb;
1631		− int err, count, hlen = L2CAP_HDR_SIZE;
	1913	+ int err, count;
1632	1914	struct l2cap_hdr *lh;
1633	1915
1634	1916	BT_DBG("chan %p len %d", chan, (int)len);
1635	1917
1636		− count = min_t(unsigned int, (conn->mtu - hlen), len);
	1918	+ count = min_t(unsigned int, (conn->mtu - L2CAP_HDR_SIZE), len);
1637	1919
1638		− skb = chan->ops->alloc_skb(chan, count + hlen,
1639		− msg->msg_flags & MSG_DONTWAIT, &err);
1640		−
1641		− if (!skb)
1642		− return ERR_PTR(err);
	1920	+ skb = chan->ops->alloc_skb(chan, count + L2CAP_HDR_SIZE,
	1921	+ msg->msg_flags & MSG_DONTWAIT);
	1922	+ if (IS_ERR(skb))
	1923	+ return skb;
1643	1924
1644	1925	skb->priority = priority;
1645	1926
1646	1927	/* Create L2CAP header */
1647	1928	lh = (struct l2cap_hdr *) skb_put(skb, L2CAP_HDR_SIZE);
1648	1929	lh->cid = cpu_to_le16(chan->dcid);
1649		− lh->len = cpu_to_le16(len + (hlen - L2CAP_HDR_SIZE));
	1930	+ lh->len = cpu_to_le16(len);
1650	1931
1651	1932	err = l2cap_skbuff_fromiovec(chan, msg, len, count, skb);
1652	1933	if (unlikely(err < 0)) {
@@ -1658,7 +1939,7 @@ static struct sk_buff l2cap_create_basic_pdu(struct l2cap_chan chan, · 5 unmodified lines
1658	1939
1659	1940	static struct sk_buff l2cap_create_iframe_pdu(struct l2cap_chan chan,
1660	1941	struct msghdr *msg, size_t len,
1661		− u32 control, u16 sdulen)
	1942	+ u16 sdulen)
1662	1943	{
1663	1944	struct l2cap_conn *conn = chan->conn;
1664	1945	struct sk_buff *skb;
@@ -1684,17 +1965,16 @@ static struct sk_buff l2cap_create_iframe_pdu(struct l2cap_chan chan, · 19 unmodified lines
1684	1965	count = min_t(unsigned int, (conn->mtu - hlen), len);
1685	1966
1686	1967	skb = chan->ops->alloc_skb(chan, count + hlen,
1687		− msg->msg_flags & MSG_DONTWAIT, &err);
1688		−
1689		− if (!skb)
1690		− return ERR_PTR(err);
	1968	+ msg->msg_flags & MSG_DONTWAIT);
	1969	+ if (IS_ERR(skb))
	1970	+ return skb;
1691	1971
1692	1972	/* Create L2CAP header */
1693	1973	lh = (struct l2cap_hdr *) skb_put(skb, L2CAP_HDR_SIZE);
1694	1974	lh->cid = cpu_to_le16(chan->dcid);
1695	1975	lh->len = cpu_to_le16(len + (hlen - L2CAP_HDR_SIZE));
1696	1976
1697		− __put_control(chan, control, skb_put(skb, __ctrl_size(chan)));
	1977	+ __put_control(chan, 0, skb_put(skb, __ctrl_size(chan)));
1698	1978
1699	1979	if (sdulen)
1700	1980	put_unaligned_le16(sdulen, skb_put(skb, L2CAP_SDULEN_SIZE));
@@ -1708,61 +1988,82 @@ static struct sk_buff l2cap_create_iframe_pdu(struct l2cap_chan chan, · 7 unmodified lines
1708	1988	if (chan->fcs == L2CAP_FCS_CRC16)
1709	1989	put_unaligned_le16(0, skb_put(skb, L2CAP_FCS_SIZE));
1710	1990
1711		− bt_cb(skb)->retries = 0;
	1991	+ bt_cb(skb)->control.retries = 0;
1712	1992	return skb;
1713	1993	}
1714	1994
1715		−static int l2cap_sar_segment_sdu(struct l2cap_chan chan, struct msghdr msg, size_t len)
	1995	+static int l2cap_segment_sdu(struct l2cap_chan *chan,
	1996	+ struct sk_buff_head *seg_queue,
	1997	+ struct msghdr *msg, size_t len)
1716	1998	{
1717	1999	struct sk_buff *skb;
1718		− struct sk_buff_head sar_queue;
1719		− u32 control;
1720		− size_t size = 0;
	2000	+ u16 sdu_len;
	2001	+ size_t pdu_len;
	2002	+ int err = 0;
	2003	+ u8 sar;
1721	2004
1722		− skb_queue_head_init(&sar_queue);
1723		− control = __set_ctrl_sar(chan, L2CAP_SAR_START);
1724		− skb = l2cap_create_iframe_pdu(chan, msg, chan->remote_mps, control, len);
1725		− if (IS_ERR(skb))
1726		− return PTR_ERR(skb);
	2005	+ BT_DBG("chan %p, msg %p, len %d", chan, msg, (int)len);
1727	2006
1728		− __skb_queue_tail(&sar_queue, skb);
1729		− len -= chan->remote_mps;
1730		− size += chan->remote_mps;
	2007	+ /* It is critical that ERTM PDUs fit in a single HCI fragment,
	2008	+ * so fragmented skbs are not used. The HCI layer's handling
	2009	+ * of fragmented skbs is not compatible with ERTM's queueing.
	2010	+ */
1731	2011
1732		− while (len > 0) {
1733		− size_t buflen;
	2012	+ /* PDU size is derived from the HCI MTU */
	2013	+ pdu_len = chan->conn->mtu;
1734	2014
1735		− if (len > chan->remote_mps) {
1736		− control = __set_ctrl_sar(chan, L2CAP_SAR_CONTINUE);
1737		− buflen = chan->remote_mps;
1738		− } else {
1739		− control = __set_ctrl_sar(chan, L2CAP_SAR_END);
1740		− buflen = len;
1741		− }
	2015	+ pdu_len = min_t(size_t, pdu_len, L2CAP_BREDR_MAX_PAYLOAD);
	2016	+
	2017	+ /* Adjust for largest possible L2CAP overhead. */
	2018	+ pdu_len -= L2CAP_EXT_HDR_SIZE + L2CAP_FCS_SIZE;
	2019	+
	2020	+ /* Remote device may have requested smaller PDUs */
	2021	+ pdu_len = min_t(size_t, pdu_len, chan->remote_mps);
	2022	+
	2023	+ if (len <= pdu_len) {
	2024	+ sar = L2CAP_SAR_UNSEGMENTED;
	2025	+ sdu_len = 0;
	2026	+ pdu_len = len;
	2027	+ } else {
	2028	+ sar = L2CAP_SAR_START;
	2029	+ sdu_len = len;
	2030	+ pdu_len -= L2CAP_SDULEN_SIZE;
	2031	+ }
	2032	+
	2033	+ while (len > 0) {
	2034	+ skb = l2cap_create_iframe_pdu(chan, msg, pdu_len, sdu_len);
1742	2035
1743		− skb = l2cap_create_iframe_pdu(chan, msg, buflen, control, 0);
1744	2036	if (IS_ERR(skb)) {
1745		− skb_queue_purge(&sar_queue);
	2037	+ __skb_queue_purge(seg_queue);
1746	2038	return PTR_ERR(skb);
1747	2039	}
1748	2040
1749		− __skb_queue_tail(&sar_queue, skb);
1750		− len -= buflen;
1751		− size += buflen;
	2041	+ bt_cb(skb)->control.sar = sar;
	2042	+ __skb_queue_tail(seg_queue, skb);
	2043	+
	2044	+ len -= pdu_len;
	2045	+ if (sdu_len) {
	2046	+ sdu_len = 0;
	2047	+ pdu_len += L2CAP_SDULEN_SIZE;
	2048	+ }
	2049	+
	2050	+ if (len <= pdu_len) {
	2051	+ sar = L2CAP_SAR_END;
	2052	+ pdu_len = len;
	2053	+ } else {
	2054	+ sar = L2CAP_SAR_CONTINUE;
	2055	+ }
1752	2056	}
1753		− skb_queue_splice_tail(&sar_queue, &chan->tx_q);
1754		− if (chan->tx_send_head == NULL)
1755		− chan->tx_send_head = sar_queue.next;
1756	2057
1757		− return size;
	2058	+ return err;
1758	2059	}
1759	2060
1760	2061	int l2cap_chan_send(struct l2cap_chan chan, struct msghdr msg, size_t len,
1761	2062	u32 priority)
1762	2063	{
1763	2064	struct sk_buff *skb;
1764		− u32 control;
1765	2065	int err;
	2066	+ struct sk_buff_head seg_queue;
1766	2067
1767	2068	/* Connectionless channel */
1768	2069	if (chan->chan_type == L2CAP_CHAN_CONN_LESS) {
@@ -1791,42 +2092,47 @@ int l2cap_chan_send(struct l2cap_chan chan, struct msghdr msg, size_t len, · 22 unmodified lines
1791	2092
1792	2093	case L2CAP_MODE_ERTM:
1793	2094	case L2CAP_MODE_STREAMING:
1794		− /* Entire SDU fits into one PDU */
1795		− if (len <= chan->remote_mps) {
1796		− control = __set_ctrl_sar(chan, L2CAP_SAR_UNSEGMENTED);
1797		− skb = l2cap_create_iframe_pdu(chan, msg, len, control,
1798		− 0);
1799		− if (IS_ERR(skb))
1800		− return PTR_ERR(skb);
	2095	+ /* Check outgoing MTU */
	2096	+ if (len > chan->omtu) {
	2097	+ err = -EMSGSIZE;
	2098	+ break;
	2099	+ }
1801	2100
1802		− __skb_queue_tail(&chan->tx_q, skb);
	2101	+ __skb_queue_head_init(&seg_queue);
1803	2102
1804		− if (chan->tx_send_head == NULL)
1805		− chan->tx_send_head = skb;
	2103	+ /* Do segmentation before calling in to the state machine,
	2104	+ * since it's possible to block while waiting for memory
	2105	+ * allocation.
	2106	+ */
	2107	+ err = l2cap_segment_sdu(chan, &seg_queue, msg, len);
1806	2108
1807		− } else {
1808		− /* Segment SDU into multiples PDUs */
1809		− err = l2cap_sar_segment_sdu(chan, msg, len);
1810		− if (err < 0)
1811		− return err;
	2109	+ /* The channel could have been closed while segmenting,
	2110	+ * check that it is still connected.
	2111	+ */
	2112	+ if (chan->state != BT_CONNECTED) {
	2113	+ __skb_queue_purge(&seg_queue);
	2114	+ err = -ENOTCONN;
1812	2115	}
1813	2116
1814		− if (chan->mode == L2CAP_MODE_STREAMING) {
1815		− l2cap_streaming_send(chan);
1816		− err = len;
	2117	+ if (err)
1817	2118	break;
1818		− }
1819	2119
1820		− if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state) &&
1821		− test_bit(CONN_WAIT_F, &chan->conn_state)) {
1822		− err = len;
1823		− break;
1824		− }
	2120	+ if (chan->mode == L2CAP_MODE_ERTM && chan->tx_send_head == NULL)
	2121	+ chan->tx_send_head = seg_queue.next;
	2122	+ skb_queue_splice_tail_init(&seg_queue, &chan->tx_q);
	2123	+
	2124	+ if (chan->mode == L2CAP_MODE_ERTM)
	2125	+ err = l2cap_ertm_send(chan);
	2126	+ else
	2127	+ l2cap_streaming_send(chan);
1825	2128
1826		− err = l2cap_ertm_send(chan);
1827	2129	if (err >= 0)
1828	2130	err = len;
1829	2131
	2132	+ /* If the skbs were not queued for sending, they'll still be in
	2133	+ * seg_queue and need to be purged.
	2134	+ */
	2135	+ __skb_queue_purge(&seg_queue);
1830	2136	break;
1831	2137
1832	2138	default:
@@ -2040,13 +2346,29 @@ static void l2cap_ack_timeout(struct work_struct *work) · 207 unmodified lines
2040	2346	l2cap_chan_put(chan);
2041	2347	}
2042	2348
2043		−static inline void l2cap_ertm_init(struct l2cap_chan *chan)
	2349	+static inline int l2cap_ertm_init(struct l2cap_chan *chan)
2044	2350	{
	2351	+ int err;
	2352	+
	2353	+ chan->next_tx_seq = 0;
	2354	+ chan->expected_tx_seq = 0;
2045	2355	chan->expected_ack_seq = 0;
2046	2356	chan->unacked_frames = 0;
2047	2357	chan->buffer_seq = 0;
2048	2358	chan->num_acked = 0;
2049	2359	chan->frames_sent = 0;
	2360	+ chan->last_acked_seq = 0;
	2361	+ chan->sdu = NULL;
	2362	+ chan->sdu_last_frag = NULL;
	2363	+ chan->sdu_len = 0;
	2364	+
	2365	+ skb_queue_head_init(&chan->tx_q);
	2366	+
	2367	+ if (chan->mode != L2CAP_MODE_ERTM)
	2368	+ return 0;
	2369	+
	2370	+ chan->rx_state = L2CAP_RX_STATE_RECV;
	2371	+ chan->tx_state = L2CAP_TX_STATE_XMIT;
2050	2372
2051	2373	INIT_DELAYED_WORK(&chan->retrans_timer, l2cap_retrans_timeout);
2052	2374	INIT_DELAYED_WORK(&chan->monitor_timer, l2cap_monitor_timeout);
@@ -2055,6 +2377,11 @@ static inline void l2cap_ertm_init(struct l2cap_chan *chan) · 2 unmodified lines
2055	2377	skb_queue_head_init(&chan->srej_q);
2056	2378
2057	2379	INIT_LIST_HEAD(&chan->srej_l);
	2380	+ err = l2cap_seq_list_init(&chan->srej_list, chan->tx_win);
	2381	+ if (err < 0)
	2382	+ return err;
	2383	+
	2384	+ return l2cap_seq_list_init(&chan->retrans_list, chan->remote_tx_win);
2058	2385	}
2059	2386
2060	2387	static inline __u8 l2cap_select_mode(__u8 mode, __u16 remote_feat_mask)
@@ -2378,9 +2705,9 @@ done: · 317 unmodified lines
2378	2705	chan->remote_mps = size;
2379	2706
2380	2707	rfc.retrans_timeout =
2381		− le16_to_cpu(L2CAP_DEFAULT_RETRANS_TO);
	2708	+ __constant_cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO);
2382	2709	rfc.monitor_timeout =
2383		− le16_to_cpu(L2CAP_DEFAULT_MONITOR_TO);
	2710	+ __constant_cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO);
2384	2711
2385	2712	set_bit(CONF_MODE_DONE, &chan->conf_state);
2386	2713
@@ -2644,10 +2971,10 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd · 257 unmodified lines
2644	2971	u16 dcid = 0, scid = __le16_to_cpu(req->scid);
2645	2972	__le16 psm = req->psm;
2646	2973
2647		− BT_DBG("psm 0x%2.2x scid 0x%4.4x", psm, scid);
	2974	+ BT_DBG("psm 0x%2.2x scid 0x%4.4x", __le16_to_cpu(psm), scid);
2648	2975
2649	2976	/* Check if we have socket listening on psm */
2650		− pchan = l2cap_global_chan_by_psm(BT_LISTEN, psm, conn->src);
	2977	+ pchan = l2cap_global_chan_by_psm(BT_LISTEN, psm, conn->src, conn->dst);
2651	2978	if (!pchan) {
2652	2979	result = L2CAP_CR_BAD_PSM;
2653	2980	goto sendresp;
@@ -2706,7 +3033,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd · 52 unmodified lines
2706	3033
2707	3034	if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_DONE) {
2708	3035	if (l2cap_chan_check_security(chan)) {
2709		− if (bt_sk(sk)->defer_setup) {
	3036	+ if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) {
2710	3037	__l2cap_state_change(chan, BT_CONNECT2);
2711	3038	result = L2CAP_CR_PEND;
2712	3039	status = L2CAP_CS_AUTHOR_PEND;
@@ -2848,7 +3175,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr · 135 unmodified lines
2848	3175	u16 dcid, flags;
2849	3176	u8 rsp[64];
2850	3177	struct l2cap_chan *chan;
2851		− int len;
	3178	+ int len, err = 0;
2852	3179
2853	3180	dcid = __le16_to_cpu(req->dcid);
2854	3181	flags = __le16_to_cpu(req->flags);
@@ -2859,8 +3186,6 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr · 4 unmodified lines
2859	3186	if (!chan)
2860	3187	return -ENOENT;
2861	3188
2862		− l2cap_chan_lock(chan);
2863		−
2864	3189	if (chan->state != BT_CONFIG && chan->state != BT_CONNECT2) {
2865	3190	struct l2cap_cmd_rej_cid rej;
2866	3191
@@ -2915,13 +3240,15 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr · 48 unmodified lines
2915	3240
2916	3241	l2cap_state_change(chan, BT_CONNECTED);
2917	3242
2918		− chan->next_tx_seq = 0;
2919		− chan->expected_tx_seq = 0;
2920		− skb_queue_head_init(&chan->tx_q);
2921		− if (chan->mode == L2CAP_MODE_ERTM)
2922		− l2cap_ertm_init(chan);
	3243	+ if (chan->mode == L2CAP_MODE_ERTM \|\|
	3244	+ chan->mode == L2CAP_MODE_STREAMING)
	3245	+ err = l2cap_ertm_init(chan);
	3246	+
	3247	+ if (err < 0)
	3248	+ l2cap_send_disconn_req(chan->conn, chan, -err);
	3249	+ else
	3250	+ l2cap_chan_ready(chan);
2923	3251
2924		− l2cap_chan_ready(chan);
2925	3252	goto unlock;
2926	3253	}
2927	3254
@@ -2949,7 +3276,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr · 21 unmodified lines
2949	3276
2950	3277	unlock:
2951	3278	l2cap_chan_unlock(chan);
2952		− return 0;
	3279	+ return err;
2953	3280	}
2954	3281
2955	3282	static inline int l2cap_config_rsp(struct l2cap_conn conn, struct l2cap_cmd_hdr cmd, u8 *data)
@@ -2957,21 +3284,20 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr · 1 unmodified line
2957	3284	struct l2cap_conf_rsp rsp = (struct l2cap_conf_rsp )data;
2958	3285	u16 scid, flags, result;
2959	3286	struct l2cap_chan *chan;
2960		− int len = cmd->len - sizeof(*rsp);
	3287	+ int len = le16_to_cpu(cmd->len) - sizeof(*rsp);
	3288	+ int err = 0;
2961	3289
2962	3290	scid = __le16_to_cpu(rsp->scid);
2963	3291	flags = __le16_to_cpu(rsp->flags);
2964	3292	result = __le16_to_cpu(rsp->result);
2965	3293
2966		− BT_DBG("scid 0x%4.4x flags 0x%2.2x result 0x%2.2x",
2967		− scid, flags, result);
	3294	+ BT_DBG("scid 0x%4.4x flags 0x%2.2x result 0x%2.2x len %d", scid, flags,
	3295	+ result, len);
2968	3296
2969	3297	chan = l2cap_get_chan_by_scid(conn, scid);
2970	3298	if (!chan)
2971	3299	return 0;
2972	3300
2973		− l2cap_chan_lock(chan);
2974		−
2975	3301	switch (result) {
2976	3302	case L2CAP_CONF_SUCCESS:
2977	3303	l2cap_conf_rfc_get(chan, rsp->data, len);
@@ -3045,18 +3371,19 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr · 67 unmodified lines
3045	3371	set_default_fcs(chan);
3046	3372
3047	3373	l2cap_state_change(chan, BT_CONNECTED);
3048		− chan->next_tx_seq = 0;
3049		− chan->expected_tx_seq = 0;
3050		− skb_queue_head_init(&chan->tx_q);
3051		− if (chan->mode == L2CAP_MODE_ERTM)
3052		− l2cap_ertm_init(chan);
	3374	+ if (chan->mode == L2CAP_MODE_ERTM \|\|
	3375	+ chan->mode == L2CAP_MODE_STREAMING)
	3376	+ err = l2cap_ertm_init(chan);
3053	3377
3054		− l2cap_chan_ready(chan);
	3378	+ if (err < 0)
	3379	+ l2cap_send_disconn_req(chan->conn, chan, -err);
	3380	+ else
	3381	+ l2cap_chan_ready(chan);
3055	3382	}
3056	3383
3057	3384	done:
3058	3385	l2cap_chan_unlock(chan);
3059		− return 0;
	3386	+ return err;
3060	3387	}
3061	3388
3062	3389	static inline int l2cap_disconnect_req(struct l2cap_conn conn, struct l2cap_cmd_hdr cmd, u8 *data)
@@ -3092,11 +3419,13 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn, struct l2cap_cmd · 29 unmodified lines
3092	3419	sk->sk_shutdown = SHUTDOWN_MASK;
3093	3420	release_sock(sk);
3094	3421
	3422	+ l2cap_chan_hold(chan);
3095	3423	l2cap_chan_del(chan, ECONNRESET);
3096	3424
3097	3425	l2cap_chan_unlock(chan);
3098	3426
3099	3427	chan->ops->close(chan->data);
	3428	+ l2cap_chan_put(chan);
3100	3429
3101	3430	mutex_unlock(&conn->chan_lock);
3102	3431
@@ -3124,11 +3453,13 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, struct l2cap_cmd · 21 unmodified lines
3124	3453
3125	3454	l2cap_chan_lock(chan);
3126	3455
	3456	+ l2cap_chan_hold(chan);
3127	3457	l2cap_chan_del(chan, 0);
3128	3458
3129	3459	l2cap_chan_unlock(chan);
3130	3460
3131	3461	chan->ops->close(chan->data);
	3462	+ l2cap_chan_put(chan);
3132	3463
3133	3464	mutex_unlock(&conn->chan_lock);
3134	3465
@@ -3265,8 +3596,8 @@ static inline int l2cap_create_channel_req(struct l2cap_conn *conn, · 130 unmodified lines
3265	3596	/* Placeholder: Always reject */
3266	3597	rsp.dcid = 0;
3267	3598	rsp.scid = cpu_to_le16(scid);
3268		− rsp.result = L2CAP_CR_NO_MEM;
3269		− rsp.status = L2CAP_CS_NO_INFO;
	3599	+ rsp.result = __constant_cpu_to_le16(L2CAP_CR_NO_MEM);
	3600	+ rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);
3270	3601
3271	3602	l2cap_send_cmd(conn, cmd->ident, L2CAP_CREATE_CHAN_RSP,
3272	3603	sizeof(rsp), &rsp);
@@ -3665,19 +3996,19 @@ static int l2cap_add_to_srej_queue(struct l2cap_chan chan, struct sk_buff skb, · 392 unmodified lines
3665	3996	struct sk_buff *next_skb;
3666	3997	int tx_seq_offset, next_tx_seq_offset;
3667	3998
3668		− bt_cb(skb)->tx_seq = tx_seq;
3669		− bt_cb(skb)->sar = sar;
	3999	+ bt_cb(skb)->control.txseq = tx_seq;
	4000	+ bt_cb(skb)->control.sar = sar;
3670	4001
3671	4002	next_skb = skb_peek(&chan->srej_q);
3672	4003
3673	4004	tx_seq_offset = __seq_offset(chan, tx_seq, chan->buffer_seq);
3674	4005
3675	4006	while (next_skb) {
3676		− if (bt_cb(next_skb)->tx_seq == tx_seq)
	4007	+ if (bt_cb(next_skb)->control.txseq == tx_seq)
3677	4008	return -EINVAL;
3678	4009
3679	4010	next_tx_seq_offset = __seq_offset(chan,
3680		− bt_cb(next_skb)->tx_seq, chan->buffer_seq);
	4011	+ bt_cb(next_skb)->control.txseq, chan->buffer_seq);
3681	4012
3682	4013	if (next_tx_seq_offset > tx_seq_offset) {
3683	4014	__skb_queue_before(&chan->srej_q, next_skb, skb);
@@ -3800,6 +4131,7 @@ static void l2cap_ertm_enter_local_busy(struct l2cap_chan *chan) · 116 unmodified lines
3800	4131	BT_DBG("chan %p, Enter local busy", chan);
3801	4132
3802	4133	set_bit(CONN_LOCAL_BUSY, &chan->conn_state);
	4134	+ l2cap_seq_list_clear(&chan->srej_list);
3803	4135
3804	4136	__set_ack_timer(chan);
3805	4137	}
@@ -3848,11 +4180,11 @@ static void l2cap_check_srej_gap(struct l2cap_chan *chan, u16 tx_seq) · 42 unmodified lines
3848	4180	!test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {
3849	4181	int err;
3850	4182
3851		− if (bt_cb(skb)->tx_seq != tx_seq)
	4183	+ if (bt_cb(skb)->control.txseq != tx_seq)
3852	4184	break;
3853	4185
3854	4186	skb = skb_dequeue(&chan->srej_q);
3855		− control = __set_ctrl_sar(chan, bt_cb(skb)->sar);
	4187	+ control = __set_ctrl_sar(chan, bt_cb(skb)->control.sar);
3856	4188	err = l2cap_reassemble_sdu(chan, skb, control);
3857	4189
3858	4190	if (err < 0) {
@@ -3892,6 +4224,7 @@ static int l2cap_send_srejframe(struct l2cap_chan *chan, u16 tx_seq) · 33 unmodified lines
3892	4224	while (tx_seq != chan->expected_tx_seq) {
3893	4225	control = __set_ctrl_super(chan, L2CAP_SUPER_SREJ);
3894	4226	control \|= __set_reqseq(chan, chan->expected_tx_seq);
	4227	+ l2cap_seq_list_append(&chan->srej_list, chan->expected_tx_seq);
3895	4228	l2cap_send_sframe(chan, control);
3896	4229
3897	4230	new = kzalloc(sizeof(struct srej_list), GFP_ATOMIC);
@@ -4022,8 +4355,8 @@ expected: · 124 unmodified lines
4022	4355	chan->expected_tx_seq = __next_seq(chan, chan->expected_tx_seq);
4023	4356
4024	4357	if (test_bit(CONN_SREJ_SENT, &chan->conn_state)) {
4025		− bt_cb(skb)->tx_seq = tx_seq;
4026		− bt_cb(skb)->sar = sar;
	4358	+ bt_cb(skb)->control.txseq = tx_seq;
	4359	+ bt_cb(skb)->control.sar = sar;
4027	4360	__skb_queue_tail(&chan->srej_q, skb);
4028	4361	return 0;
4029	4362	}
@@ -4220,6 +4553,8 @@ static int l2cap_ertm_data_rcv(struct l2cap_chan chan, struct sk_buff skb) · 190 unmodified lines
4220	4553	u16 req_seq;
4221	4554	int len, next_tx_seq_offset, req_seq_offset;
4222	4555
	4556	+ __unpack_control(chan, skb);
	4557	+
4223	4558	control = __get_control(chan, skb->data);
4224	4559	skb_pull(skb, __ctrl_size(chan));
4225	4560	len = skb->len;
@@ -4295,8 +4630,6 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk · 69 unmodified lines
4295	4630	return 0;
4296	4631	}
4297	4632
4298		− l2cap_chan_lock(chan);
4299		−
4300	4633	BT_DBG("chan %p, len %d", chan, skb->len);
4301	4634
4302	4635	if (chan->state != BT_CONNECTED)
@@ -4375,7 +4708,7 @@ static inline int l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm, str · 72 unmodified lines
4375	4708	{
4376	4709	struct l2cap_chan *chan;
4377	4710
4378		− chan = l2cap_global_chan_by_psm(0, psm, conn->src);
	4711	+ chan = l2cap_global_chan_by_psm(0, psm, conn->src, conn->dst);
4379	4712	if (!chan)
4380	4713	goto drop;
4381	4714
@@ -4396,11 +4729,12 @@ drop: · 14 unmodified lines
4396	4729	return 0;
4397	4730	}
4398	4731
4399		−static inline int l2cap_att_channel(struct l2cap_conn conn, __le16 cid, struct sk_buff skb)
	4732	+static inline int l2cap_att_channel(struct l2cap_conn *conn, u16 cid,
	4733	+ struct sk_buff *skb)
4400	4734	{
4401	4735	struct l2cap_chan *chan;
4402	4736
4403		− chan = l2cap_global_chan_by_scid(0, cid, conn->src);
	4737	+ chan = l2cap_global_chan_by_scid(0, cid, conn->src, conn->dst);
4404	4738	if (!chan)
4405	4739	goto drop;
4406	4740
@@ -4445,7 +4779,7 @@ static void l2cap_recv_frame(struct l2cap_conn conn, struct sk_buff skb) · 38 unmodified lines
4445	4779	break;
4446	4780
4447	4781	case L2CAP_CID_CONN_LESS:
4448		− psm = get_unaligned_le16(skb->data);
	4782	+ psm = get_unaligned((__le16 *) skb->data);
4449	4783	skb_pull(skb, 2);
4450	4784	l2cap_conless_channel(conn, psm, skb);
4451	4785	break;
@@ -4540,7 +4874,6 @@ static inline void l2cap_check_encryption(struct l2cap_chan *chan, u8 encrypt) · 88 unmodified lines
4540	4874
4541	4875	if (encrypt == 0x00) {
4542	4876	if (chan->sec_level == BT_SECURITY_MEDIUM) {
4543		− __clear_chan_timer(chan);
4544	4877	__set_chan_timer(chan, L2CAP_ENC_TIMEOUT);
4545	4878	} else if (chan->sec_level == BT_SECURITY_HIGH)
4546	4879	l2cap_chan_close(chan, ECONNREFUSED);
@@ -4561,7 +4894,8 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) · 14 unmodified lines
4561	4894	BT_DBG("conn %p", conn);
4562	4895
4563	4896	if (hcon->type == LE_LINK) {
4564		− smp_distribute_keys(conn, 0);
	4897	+ if (!status && encrypt)
	4898	+ smp_distribute_keys(conn, 0);
4565	4899	cancel_delayed_work(&conn->security_timer);
4566	4900	}
4567	4901
@@ -4591,7 +4925,7 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) · 23 unmodified lines
4591	4925	chan->state == BT_CONFIG)) {
4592	4926	struct sock *sk = chan->sk;
4593	4927
4594		− bt_sk(sk)->suspended = false;
	4928	+ clear_bit(BT_SK_SUSPEND, &bt_sk(sk)->flags);
4595	4929	sk->sk_state_change(sk);
4596	4930
4597	4931	l2cap_check_encryption(chan, encrypt);
@@ -4603,7 +4937,6 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) · 5 unmodified lines
4603	4937	if (!status) {
4604	4938	l2cap_send_conn_req(chan);
4605	4939	} else {
4606		− __clear_chan_timer(chan);
4607	4940	__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);
4608	4941	}
4609	4942	} else if (chan->state == BT_CONNECT2) {
@@ -4614,7 +4947,8 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) · 4 unmodified lines
4614	4947	lock_sock(sk);
4615	4948
4616	4949	if (!status) {
4617		− if (bt_sk(sk)->defer_setup) {
	4950	+ if (test_bit(BT_SK_DEFER_SETUP,
	4951	+ &bt_sk(sk)->flags)) {
4618	4952	struct sock *parent = bt_sk(sk)->parent;
4619	4953	res = L2CAP_CR_PEND;
4620	4954	stat = L2CAP_CS_AUTHOR_PEND;
@@ -4664,8 +4998,6 @@ int l2cap_recv_acldata(struct hci_conn hcon, struct sk_buff skb, u16 flags) · 43 unmodified lines
4664	4998
4665	4999	if (!(flags & ACL_CONT)) {
4666	5000	struct l2cap_hdr *hdr;
4667		− struct l2cap_chan *chan;
4668		− u16 cid;
4669	5001	int len;
4670	5002
4671	5003	if (conn->rx_len) {
@@ -4685,7 +5017,6 @@ int l2cap_recv_acldata(struct hci_conn hcon, struct sk_buff skb, u16 flags) · 13 unmodified lines
4685	5017
4686	5018	hdr = (struct l2cap_hdr *) skb->data;
4687	5019	len = __le16_to_cpu(hdr->len) + L2CAP_HDR_SIZE;
4688		− cid = __le16_to_cpu(hdr->cid);
4689	5020
4690	5021	if (len == skb->len) {
4691	5022	/* Complete frame received */
@@ -4702,23 +5033,6 @@ int l2cap_recv_acldata(struct hci_conn hcon, struct sk_buff skb, u16 flags) · 10 unmodified lines
4702	5033	goto drop;
4703	5034	}
4704	5035
4705		− chan = l2cap_get_chan_by_scid(conn, cid);
4706		−
4707		− if (chan && chan->sk) {
4708		− struct sock *sk = chan->sk;
4709		− lock_sock(sk);
4710		−
4711		− if (chan->imtu < len - L2CAP_HDR_SIZE) {
4712		− BT_ERR("Frame exceeding recv MTU (len %d, "
4713		− "MTU %d)", len,
4714		− chan->imtu);
4715		− release_sock(sk);
4716		− l2cap_conn_unreliable(conn, ECOMM);
4717		− goto drop;
4718		− }
4719		− release_sock(sk);
4720		− }
4721		−
4722	5036	/* Allocate skb for the complete frame (with header) */
4723	5037	conn->rx_skb = bt_skb_alloc(len, GFP_ATOMIC);
4724	5038	if (!conn->rx_skb)

net/bluetooth/l2cap_sock.c+46−30

@@ -124,7 +124,7 @@ static int l2cap_sock_connect(struct socket sock, struct sockaddr addr, int al · 123 unmodified lines
124	124	return -EINVAL;
125	125
126	126	err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),
127		− &la.l2_bdaddr);
	127	+ &la.l2_bdaddr, la.l2_bdaddr_type);
128	128	if (err)
129	129	return err;
130	130
@@ -148,12 +148,16 @@ static int l2cap_sock_listen(struct socket *sock, int backlog) · 17 unmodified lines
148	148
149	149	lock_sock(sk);
150	150
151		− if ((sock->type != SOCK_SEQPACKET && sock->type != SOCK_STREAM)
152		− \|\| sk->sk_state != BT_BOUND) {
	151	+ if (sk->sk_state != BT_BOUND) {
153	152	err = -EBADFD;
154	153	goto done;
155	154	}
156	155
	156	+ if (sk->sk_type != SOCK_SEQPACKET && sk->sk_type != SOCK_STREAM) {
	157	+ err = -EINVAL;
	158	+ goto done;
	159	+ }
	160	+
157	161	switch (chan->mode) {
158	162	case L2CAP_MODE_BASIC:
159	163	break;
@@ -320,8 +324,8 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us · 160 unmodified lines
320	324
321	325	case L2CAP_CONNINFO:
322	326	if (sk->sk_state != BT_CONNECTED &&
323		− !(sk->sk_state == BT_CONNECT2 &&
324		− bt_sk(sk)->defer_setup)) {
	327	+ !(sk->sk_state == BT_CONNECT2 &&
	328	+ test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags))) {
325	329	err = -ENOTCONN;
326	330	break;
327	331	}
@@ -375,7 +379,10 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch · 47 unmodified lines
375	379	}
376	380
377	381	memset(&sec, 0, sizeof(sec));
378		− sec.level = chan->sec_level;
	382	+ if (chan->conn)
	383	+ sec.level = chan->conn->hcon->sec_level;
	384	+ else
	385	+ sec.level = chan->sec_level;
379	386
380	387	if (sk->sk_state == BT_CONNECTED)
381	388	sec.key_size = chan->conn->hcon->enc_key_size;
@@ -392,7 +399,8 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch · 10 unmodified lines
392	399	break;
393	400	}
394	401
395		− if (put_user(bt_sk(sk)->defer_setup, (u32 __user *) optval))
	402	+ if (put_user(test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags),
	403	+ (u32 __user *) optval))
396	404	err = -EFAULT;
397	405
398	406	break;
@@ -594,10 +602,10 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch · 195 unmodified lines
594	602
595	603	/* or for ACL link */
596	604	} else if ((sk->sk_state == BT_CONNECT2 &&
597		− bt_sk(sk)->defer_setup) \|\|
	605	+ test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) \|\|
598	606	sk->sk_state == BT_CONNECTED) {
599	607	if (!l2cap_chan_check_security(chan))
600		− bt_sk(sk)->suspended = true;
	608	+ set_bit(BT_SK_SUSPEND, &bt_sk(sk)->flags);
601	609	else
602	610	sk->sk_state_change(sk);
603	611	} else {
@@ -616,7 +624,10 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch · 12 unmodified lines
616	624	break;
617	625	}
618	626
619		− bt_sk(sk)->defer_setup = opt;
	627	+ if (opt)
	628	+ set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
	629	+ else
	630	+ clear_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
620	631	break;
621	632
622	633	case BT_FLUSHABLE:
@@ -716,16 +727,13 @@ static int l2cap_sock_sendmsg(struct kiocb iocb, struct socket sock, struct ms · 93 unmodified lines
716	727	if (msg->msg_flags & MSG_OOB)
717	728	return -EOPNOTSUPP;
718	729
719		− lock_sock(sk);
720		−
721		− if (sk->sk_state != BT_CONNECTED) {
722		− release_sock(sk);
	730	+ if (sk->sk_state != BT_CONNECTED)
723	731	return -ENOTCONN;
724		− }
725	732
	733	+ l2cap_chan_lock(chan);
726	734	err = l2cap_chan_send(chan, msg, len, sk->sk_priority);
	735	+ l2cap_chan_unlock(chan);
727	736
728		− release_sock(sk);
729	737	return err;
730	738	}
731	739
@@ -737,7 +745,8 @@ static int l2cap_sock_recvmsg(struct kiocb iocb, struct socket sock, struct ms · 5 unmodified lines
737	745
738	746	lock_sock(sk);
739	747
740		− if (sk->sk_state == BT_CONNECT2 && bt_sk(sk)->defer_setup) {
	748	+ if (sk->sk_state == BT_CONNECT2 && test_bit(BT_SK_DEFER_SETUP,
	749	+ &bt_sk(sk)->flags)) {
741	750	sk->sk_state = BT_CONFIG;
742	751	pi->chan->state = BT_CONFIG;
743	752
@@ -931,12 +940,19 @@ static void l2cap_sock_state_change_cb(void *data, int state) · 187 unmodified lines
931	940	}
932	941
933	942	static struct sk_buff l2cap_sock_alloc_skb_cb(struct l2cap_chan chan,
934		− unsigned long len, int nb,
935		− int *err)
	943	+ unsigned long len, int nb)
936	944	{
937		− struct sock *sk = chan->sk;
	945	+ struct sk_buff *skb;
	946	+ int err;
	947	+
	948	+ l2cap_chan_unlock(chan);
	949	+ skb = bt_skb_send_alloc(chan->sk, len, nb, &err);
	950	+ l2cap_chan_lock(chan);
	951	+
	952	+ if (!skb)
	953	+ return ERR_PTR(err);
938	954
939		− return bt_skb_send_alloc(sk, len, nb, err);
	955	+ return skb;
940	956	}
941	957
942	958	static struct l2cap_ops l2cap_chan_ops = {
@@ -952,6 +968,7 @@ static void l2cap_sock_destruct(struct sock *sk) · 9 unmodified lines
952	968	{
953	969	BT_DBG("sk %p", sk);
954	970
	971	+ l2cap_chan_put(l2cap_pi(sk)->chan);
955	972	if (l2cap_pi(sk)->rx_busy_skb) {
956	973	kfree_skb(l2cap_pi(sk)->rx_busy_skb);
957	974	l2cap_pi(sk)->rx_busy_skb = NULL;
@@ -972,7 +989,7 @@ static void l2cap_sock_init(struct sock sk, struct sock parent) · 14 unmodified lines
972	989	struct l2cap_chan *pchan = l2cap_pi(parent)->chan;
973	990
974	991	sk->sk_type = parent->sk_type;
975		− bt_sk(sk)->defer_setup = bt_sk(parent)->defer_setup;
	992	+ bt_sk(sk)->flags = bt_sk(parent)->flags;
976	993
977	994	chan->chan_type = pchan->chan_type;
978	995	chan->imtu = pchan->imtu;
@@ -1010,13 +1027,8 @@ static void l2cap_sock_init(struct sock sk, struct sock parent) · 31 unmodified lines
1010	1027	} else {
1011	1028	chan->mode = L2CAP_MODE_BASIC;
1012	1029	}
1013		− chan->max_tx = L2CAP_DEFAULT_MAX_TX;
1014		− chan->fcs = L2CAP_FCS_CRC16;
1015		− chan->tx_win = L2CAP_DEFAULT_TX_WINDOW;
1016		− chan->tx_win_max = L2CAP_DEFAULT_TX_WINDOW;
1017		− chan->sec_level = BT_SECURITY_LOW;
1018		− chan->flags = 0;
1019		− set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
	1030	+
	1031	+ l2cap_chan_set_defaults(chan);
1020	1032	}
1021	1033
1022	1034	/* Default config options */
@@ -1052,12 +1064,16 @@ static struct sock l2cap_sock_alloc(struct net net, struct socket *sock, int p · 29 unmodified lines
1052	1064	sk->sk_protocol = proto;
1053	1065	sk->sk_state = BT_OPEN;
1054	1066
1055		− chan = l2cap_chan_create(sk);
	1067	+ chan = l2cap_chan_create();
1056	1068	if (!chan) {
1057	1069	l2cap_sock_kill(sk);
1058	1070	return NULL;
1059	1071	}
1060	1072
	1073	+ l2cap_chan_hold(chan);
	1074	+
	1075	+ chan->sk = sk;
	1076	+
1061	1077	l2cap_pi(sk)->chan = chan;
1062	1078
1063	1079	return sk;

net/bluetooth/mgmt.c+172−114

@@ -35,10 +35,9 @@ · 34 unmodified lines
35	35	#include <net/bluetooth/smp.h>
36	36
37	37	bool enable_hs;
38		−bool enable_le;
39	38
40	39	#define MGMT_VERSION 1
41		−#define MGMT_REVISION 0
	40	+#define MGMT_REVISION 1
42	41
43	42	static const u16 mgmt_commands[] = {
44	43	MGMT_OP_READ_INDEX_LIST,
@@ -78,6 +77,7 @@ static const u16 mgmt_commands[] = { · 33 unmodified lines
78	77	MGMT_OP_CONFIRM_NAME,
79	78	MGMT_OP_BLOCK_DEVICE,
80	79	MGMT_OP_UNBLOCK_DEVICE,
	80	+ MGMT_OP_SET_DEVICE_ID,
81	81	};
82	82
83	83	static const u16 mgmt_events[] = {
@@ -224,7 +224,7 @@ static int cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status) · 140 unmodified lines
224	224
225	225	ev = (void ) skb_put(skb, sizeof(ev));
226	226	ev->status = status;
227		− put_unaligned_le16(cmd, &ev->opcode);
	227	+ ev->opcode = cpu_to_le16(cmd);
228	228
229	229	err = sock_queue_rcv_skb(sk, skb);
230	230	if (err < 0)
@@ -254,7 +254,7 @@ static int cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status, · 23 unmodified lines
254	254	hdr->len = cpu_to_le16(sizeof(*ev) + rp_len);
255	255
256	256	ev = (void ) skb_put(skb, sizeof(ev) + rp_len);
257		− put_unaligned_le16(cmd, &ev->opcode);
	257	+ ev->opcode = cpu_to_le16(cmd);
258	258	ev->status = status;
259	259
260	260	if (rp)
@@ -275,7 +275,7 @@ static int read_version(struct sock sk, struct hci_dev hdev, void *data, · 14 unmodified lines
275	275	BT_DBG("sock %p", sk);
276	276
277	277	rp.version = MGMT_VERSION;
278		− put_unaligned_le16(MGMT_REVISION, &rp.revision);
	278	+ rp.revision = __constant_cpu_to_le16(MGMT_REVISION);
279	279
280	280	return cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_VERSION, 0, &rp,
281	281	sizeof(rp));
@@ -285,9 +285,9 @@ static int read_commands(struct sock sk, struct hci_dev hdev, void *data, · 3 unmodified lines
285	285	u16 data_len)
286	286	{
287	287	struct mgmt_rp_read_commands *rp;
288		− u16 num_commands = ARRAY_SIZE(mgmt_commands);
289		− u16 num_events = ARRAY_SIZE(mgmt_events);
290		− u16 *opcode;
	288	+ const u16 num_commands = ARRAY_SIZE(mgmt_commands);
	289	+ const u16 num_events = ARRAY_SIZE(mgmt_events);
	290	+ __le16 *opcode;
291	291	size_t rp_size;
292	292	int i, err;
293	293
@@ -299,8 +299,8 @@ static int read_commands(struct sock sk, struct hci_dev hdev, void *data, · 5 unmodified lines
299	299	if (!rp)
300	300	return -ENOMEM;
301	301
302		− put_unaligned_le16(num_commands, &rp->num_commands);
303		− put_unaligned_le16(num_events, &rp->num_events);
	302	+ rp->num_commands = __constant_cpu_to_le16(num_commands);
	303	+ rp->num_events = __constant_cpu_to_le16(num_events);
304	304
305	305	for (i = 0, opcode = rp->opcodes; i < num_commands; i++, opcode++)
306	306	put_unaligned_le16(mgmt_commands[i], opcode);
@@ -341,14 +341,14 @@ static int read_index_list(struct sock sk, struct hci_dev hdev, void *data, · 34 unmodified lines
341	341	return -ENOMEM;
342	342	}
343	343
344		− put_unaligned_le16(count, &rp->num_controllers);
	344	+ rp->num_controllers = cpu_to_le16(count);
345	345
346	346	i = 0;
347	347	list_for_each_entry(d, &hci_dev_list, list) {
348	348	if (test_bit(HCI_SETUP, &d->dev_flags))
349	349	continue;
350	350
351		− put_unaligned_le16(d->id, &rp->index[i++]);
	351	+ rp->index[i++] = cpu_to_le16(d->id);
352	352	BT_DBG("Added hci%u", d->id);
353	353	}
354	354
@@ -383,10 +383,8 @@ static u32 get_supported_settings(struct hci_dev *hdev) · 28 unmodified lines
383	383	if (enable_hs)
384	384	settings \|= MGMT_SETTING_HS;
385	385
386		− if (enable_le) {
387		− if (hdev->features[4] & LMP_LE)
388		− settings \|= MGMT_SETTING_LE;
389		− }
	386	+ if (hdev->features[4] & LMP_LE)
	387	+ settings \|= MGMT_SETTING_LE;
390	388
391	389	return settings;
392	390	}
@@ -442,9 +440,7 @@ static u16 get_uuid16(u8 *uuid128) · 49 unmodified lines
442	440	return 0;
443	441	}
444	442
445		− memcpy(&val, &uuid128[12], 4);
446		−
447		− val = le32_to_cpu(val);
	443	+ val = get_unaligned_le32(&uuid128[12]);
448	444	if (val > 0xffff)
449	445	return 0;
450	446
@@ -479,6 +475,28 @@ static void create_eir(struct hci_dev hdev, u8 data) · 28 unmodified lines
479	475	ptr += (name_len + 2);
480	476	}
481	477
	478	+ if (hdev->inq_tx_power) {
	479	+ ptr[0] = 2;
	480	+ ptr[1] = EIR_TX_POWER;
	481	+ ptr[2] = (u8) hdev->inq_tx_power;
	482	+
	483	+ eir_len += 3;
	484	+ ptr += 3;
	485	+ }
	486	+
	487	+ if (hdev->devid_source > 0) {
	488	+ ptr[0] = 9;
	489	+ ptr[1] = EIR_DEVICE_ID;
	490	+
	491	+ put_unaligned_le16(hdev->devid_source, ptr + 2);
	492	+ put_unaligned_le16(hdev->devid_vendor, ptr + 4);
	493	+ put_unaligned_le16(hdev->devid_product, ptr + 6);
	494	+ put_unaligned_le16(hdev->devid_version, ptr + 8);
	495	+
	496	+ eir_len += 10;
	497	+ ptr += 10;
	498	+ }
	499	+
482	500	memset(uuid16_list, 0, sizeof(uuid16_list));
483	501
484	502	/* Group all UUID16 types */
@@ -642,8 +660,7 @@ static int read_controller_info(struct sock sk, struct hci_dev hdev, · 157 unmodified lines
642	660	bacpy(&rp.bdaddr, &hdev->bdaddr);
643	661
644	662	rp.version = hdev->hci_ver;
645		−
646		− put_unaligned_le16(hdev->manufacturer, &rp.manufacturer);
	663	+ rp.manufacturer = cpu_to_le16(hdev->manufacturer);
647	664
648	665	rp.supported_settings = cpu_to_le32(get_supported_settings(hdev));
649	666	rp.current_settings = cpu_to_le32(get_current_settings(hdev));
@@ -840,7 +857,7 @@ static int set_discoverable(struct sock sk, struct hci_dev hdev, void *data, · 190 unmodified lines
840	857
841	858	BT_DBG("request for %s", hdev->name);
842	859
843		− timeout = get_unaligned_le16(&cp->timeout);
	860	+ timeout = __le16_to_cpu(cp->timeout);
844	861	if (!cp->val && timeout > 0)
845	862	return cmd_status(sk, hdev->id, MGMT_OP_SET_DISCOVERABLE,
846	863	MGMT_STATUS_INVALID_PARAMS);
@@ -1122,8 +1139,8 @@ static int set_ssp(struct sock sk, struct hci_dev hdev, void *data, u16 len) · 275 unmodified lines
1122	1139	}
1123	1140
1124	1141	if (mgmt_pending_find(MGMT_OP_SET_SSP, hdev)) {
1125		− err = cmd_status(sk, hdev->id, MGMT_OP_SET_SSP,
1126		− MGMT_STATUS_BUSY);
	1142	+ err = cmd_status(sk, hdev->id, MGMT_OP_SET_SSP,
	1143	+ MGMT_STATUS_BUSY);
1127	1144	goto failed;
1128	1145	}
1129	1146
@@ -1179,7 +1196,7 @@ static int set_le(struct sock sk, struct hci_dev hdev, void *data, u16 len) · 49 unmodified lines
1179	1196
1180	1197	hci_dev_lock(hdev);
1181	1198
1182		− if (!enable_le \|\| !(hdev->features[4] & LMP_LE)) {
	1199	+ if (!(hdev->features[4] & LMP_LE)) {
1183	1200	err = cmd_status(sk, hdev->id, MGMT_OP_SET_LE,
1184	1201	MGMT_STATUS_NOT_SUPPORTED);
1185	1202	goto unlock;
@@ -1227,10 +1244,8 @@ static int set_le(struct sock sk, struct hci_dev hdev, void *data, u16 len) · 41 unmodified lines
1227	1244
1228	1245	err = hci_send_cmd(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED, sizeof(hci_cp),
1229	1246	&hci_cp);
1230		− if (err < 0) {
	1247	+ if (err < 0)
1231	1248	mgmt_pending_remove(cmd);
1232		− goto unlock;
1233		− }
1234	1249
1235	1250	unlock:
1236	1251	hci_dev_unlock(hdev);
@@ -1280,10 +1295,8 @@ static int add_uuid(struct sock sk, struct hci_dev hdev, void *data, u16 len) · 43 unmodified lines
1280	1295	}
1281	1296
1282	1297	cmd = mgmt_pending_add(sk, MGMT_OP_ADD_UUID, hdev, data, len);
1283		− if (!cmd) {
	1298	+ if (!cmd)
1284	1299	err = -ENOMEM;
1285		− goto failed;
1286		− }
1287	1300
1288	1301	failed:
1289	1302	hci_dev_unlock(hdev);
@@ -1368,10 +1381,8 @@ update_class: · 78 unmodified lines
1368	1381	}
1369	1382
1370	1383	cmd = mgmt_pending_add(sk, MGMT_OP_REMOVE_UUID, hdev, data, len);
1371		− if (!cmd) {
	1384	+ if (!cmd)
1372	1385	err = -ENOMEM;
1373		− goto unlock;
1374		− }
1375	1386
1376	1387	unlock:
1377	1388	hci_dev_unlock(hdev);
@@ -1422,10 +1433,8 @@ static int set_dev_class(struct sock sk, struct hci_dev hdev, void *data, · 44 unmodified lines
1422	1433	}
1423	1434
1424	1435	cmd = mgmt_pending_add(sk, MGMT_OP_SET_DEV_CLASS, hdev, data, len);
1425		− if (!cmd) {
	1436	+ if (!cmd)
1426	1437	err = -ENOMEM;
1427		− goto unlock;
1428		− }
1429	1438
1430	1439	unlock:
1431	1440	hci_dev_unlock(hdev);
@@ -1439,7 +1448,7 @@ static int load_link_keys(struct sock sk, struct hci_dev hdev, void *data, · 7 unmodified lines
1439	1448	u16 key_count, expected_len;
1440	1449	int i;
1441	1450
1442		− key_count = get_unaligned_le16(&cp->key_count);
	1451	+ key_count = __le16_to_cpu(cp->key_count);
1443	1452
1444	1453	expected_len = sizeof(cp) + key_count
1445	1454	sizeof(struct mgmt_link_key_info);
@@ -1512,7 +1521,7 @@ static int unpair_device(struct sock sk, struct hci_dev hdev, void *data, · 66 unmodified lines
1512	1521	goto unlock;
1513	1522	}
1514	1523
1515		− if (cp->addr.type == MGMT_ADDR_BREDR)
	1524	+ if (cp->addr.type == BDADDR_BREDR)
1516	1525	err = hci_remove_link_key(hdev, &cp->addr.bdaddr);
1517	1526	else
1518	1527	err = hci_remove_ltk(hdev, &cp->addr.bdaddr);
@@ -1524,7 +1533,7 @@ static int unpair_device(struct sock sk, struct hci_dev hdev, void *data, · 5 unmodified lines
1524	1533	}
1525	1534
1526	1535	if (cp->disconnect) {
1527		− if (cp->addr.type == MGMT_ADDR_BREDR)
	1536	+ if (cp->addr.type == BDADDR_BREDR)
1528	1537	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK,
1529	1538	&cp->addr.bdaddr);
1530	1539	else
@@ -1548,7 +1557,7 @@ static int unpair_device(struct sock sk, struct hci_dev hdev, void *data, · 17 unmodified lines
1548	1557	goto unlock;
1549	1558	}
1550	1559
1551		− put_unaligned_le16(conn->handle, &dc.handle);
	1560	+ dc.handle = cpu_to_le16(conn->handle);
1552	1561	dc.reason = 0x13; /* Remote User Terminated Connection */
1553	1562	err = hci_send_cmd(hdev, HCI_OP_DISCONNECT, sizeof(dc), &dc);
1554	1563	if (err < 0)
@@ -1584,7 +1593,7 @@ static int disconnect(struct sock sk, struct hci_dev hdev, void *data, · 29 unmodified lines
1584	1593	goto failed;
1585	1594	}
1586	1595
1587		− if (cp->addr.type == MGMT_ADDR_BREDR)
	1596	+ if (cp->addr.type == BDADDR_BREDR)
1588	1597	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->addr.bdaddr);
1589	1598	else
1590	1599	conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &cp->addr.bdaddr);
@@ -1601,7 +1610,7 @@ static int disconnect(struct sock sk, struct hci_dev hdev, void *data, · 10 unmodified lines
1601	1610	goto failed;
1602	1611	}
1603	1612
1604		− put_unaligned_le16(conn->handle, &dc.handle);
	1613	+ dc.handle = cpu_to_le16(conn->handle);
1605	1614	dc.reason = 0x13; /* Remote User Terminated Connection */
1606	1615
1607	1616	err = hci_send_cmd(hdev, HCI_OP_DISCONNECT, sizeof(dc), &dc);
@@ -1613,22 +1622,22 @@ failed: · 5 unmodified lines
1613	1622	return err;
1614	1623	}
1615	1624
1616		−static u8 link_to_mgmt(u8 link_type, u8 addr_type)
	1625	+static u8 link_to_bdaddr(u8 link_type, u8 addr_type)
1617	1626	{
1618	1627	switch (link_type) {
1619	1628	case LE_LINK:
1620	1629	switch (addr_type) {
1621	1630	case ADDR_LE_DEV_PUBLIC:
1622		− return MGMT_ADDR_LE_PUBLIC;
1623		− case ADDR_LE_DEV_RANDOM:
1624		− return MGMT_ADDR_LE_RANDOM;
	1631	+ return BDADDR_LE_PUBLIC;
	1632	+
1625	1633	default:
1626		− return MGMT_ADDR_INVALID;
	1634	+ /* Fallback to LE Random address type */
	1635	+ return BDADDR_LE_RANDOM;
1627	1636	}
1628		− case ACL_LINK:
1629		− return MGMT_ADDR_BREDR;
	1637	+
1630	1638	default:
1631		− return MGMT_ADDR_INVALID;
	1639	+ /* Fallback to BR/EDR type */
	1640	+ return BDADDR_BREDR;
1632	1641	}
1633	1642	}
1634	1643
@@ -1669,13 +1678,13 @@ static int get_connections(struct sock sk, struct hci_dev hdev, void *data, · 34 unmodified lines
1669	1678	if (!test_bit(HCI_CONN_MGMT_CONNECTED, &c->flags))
1670	1679	continue;
1671	1680	bacpy(&rp->addr[i].bdaddr, &c->dst);
1672		− rp->addr[i].type = link_to_mgmt(c->type, c->dst_type);
1673		− if (rp->addr[i].type == MGMT_ADDR_INVALID)
	1681	+ rp->addr[i].type = link_to_bdaddr(c->type, c->dst_type);
	1682	+ if (c->type == SCO_LINK \|\| c->type == ESCO_LINK)
1674	1683	continue;
1675	1684	i++;
1676	1685	}
1677	1686
1678		− put_unaligned_le16(i, &rp->conn_count);
	1687	+ rp->conn_count = cpu_to_le16(i);
1679	1688
1680	1689	/* Recalculate length in case of filtered SCO connections, etc */
1681	1690	rp_len = sizeof(rp) + (i sizeof(struct mgmt_addr_info));
@@ -1836,7 +1845,7 @@ static void pairing_complete(struct pending_cmd *cmd, u8 status) · 154 unmodified lines
1836	1845	struct hci_conn *conn = cmd->user_data;
1837	1846
1838	1847	bacpy(&rp.addr.bdaddr, &conn->dst);
1839		− rp.addr.type = link_to_mgmt(conn->type, conn->dst_type);
	1848	+ rp.addr.type = link_to_bdaddr(conn->type, conn->dst_type);
1840	1849
1841	1850	cmd_complete(cmd->sk, cmd->index, MGMT_OP_PAIR_DEVICE, status,
1842	1851	&rp, sizeof(rp));
@@ -1890,12 +1899,12 @@ static int pair_device(struct sock sk, struct hci_dev hdev, void *data, · 47 unmodified lines
1890	1899	else
1891	1900	auth_type = HCI_AT_DEDICATED_BONDING_MITM;
1892	1901
1893		− if (cp->addr.type == MGMT_ADDR_BREDR)
1894		− conn = hci_connect(hdev, ACL_LINK, &cp->addr.bdaddr, sec_level,
1895		− auth_type);
	1902	+ if (cp->addr.type == BDADDR_BREDR)
	1903	+ conn = hci_connect(hdev, ACL_LINK, &cp->addr.bdaddr,
	1904	+ cp->addr.type, sec_level, auth_type);
1896	1905	else
1897		− conn = hci_connect(hdev, LE_LINK, &cp->addr.bdaddr, sec_level,
1898		− auth_type);
	1906	+ conn = hci_connect(hdev, LE_LINK, &cp->addr.bdaddr,
	1907	+ cp->addr.type, sec_level, auth_type);
1899	1908
1900	1909	memset(&rp, 0, sizeof(rp));
1901	1910	bacpy(&rp.addr.bdaddr, &cp->addr.bdaddr);
@@ -1923,7 +1932,7 @@ static int pair_device(struct sock sk, struct hci_dev hdev, void *data, · 21 unmodified lines
1923	1932	}
1924	1933
1925	1934	/* For LE, just connecting isn't a proof that the pairing finished */
1926		− if (cp->addr.type == MGMT_ADDR_BREDR)
	1935	+ if (cp->addr.type == BDADDR_BREDR)
1927	1936	conn->connect_cfm_cb = pairing_complete_cb;
1928	1937
1929	1938	conn->security_cfm_cb = pairing_complete_cb;
@@ -2000,7 +2009,7 @@ static int user_pairing_resp(struct sock sk, struct hci_dev hdev, · 70 unmodified lines
2000	2009	goto done;
2001	2010	}
2002	2011
2003		− if (type == MGMT_ADDR_BREDR)
	2012	+ if (type == BDADDR_BREDR)
2004	2013	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, bdaddr);
2005	2014	else
2006	2015	conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, bdaddr);
@@ -2011,7 +2020,7 @@ static int user_pairing_resp(struct sock sk, struct hci_dev hdev, · 4 unmodified lines
2011	2020	goto done;
2012	2021	}
2013	2022
2014		− if (type == MGMT_ADDR_LE_PUBLIC \|\| type == MGMT_ADDR_LE_RANDOM) {
	2023	+ if (type == BDADDR_LE_PUBLIC \|\| type == BDADDR_LE_RANDOM) {
2015	2024	/* Continue with pairing via SMP */
2016	2025	err = smp_user_confirm_reply(conn, mgmt_op, passkey);
2017	2026
@@ -2295,6 +2304,12 @@ static int start_discovery(struct sock sk, struct hci_dev hdev, · 277 unmodified lines
2295	2304	goto failed;
2296	2305	}
2297	2306
	2307	+ if (test_bit(HCI_PERIODIC_INQ, &hdev->dev_flags)) {
	2308	+ err = cmd_status(sk, hdev->id, MGMT_OP_START_DISCOVERY,
	2309	+ MGMT_STATUS_BUSY);
	2310	+ goto failed;
	2311	+ }
	2312	+
2298	2313	if (hdev->discovery.state != DISCOVERY_STOPPED) {
2299	2314	err = cmd_status(sk, hdev->id, MGMT_OP_START_DISCOVERY,
2300	2315	MGMT_STATUS_BUSY);
@@ -2381,27 +2396,39 @@ static int stop_discovery(struct sock sk, struct hci_dev hdev, void *data, · 80 unmodified lines
2381	2396	goto unlock;
2382	2397	}
2383	2398
2384		− if (hdev->discovery.state == DISCOVERY_FINDING) {
2385		− err = hci_cancel_inquiry(hdev);
2386		− if (err < 0)
2387		− mgmt_pending_remove(cmd);
	2399	+ switch (hdev->discovery.state) {
	2400	+ case DISCOVERY_FINDING:
	2401	+ if (test_bit(HCI_INQUIRY, &hdev->flags))
	2402	+ err = hci_cancel_inquiry(hdev);
2388	2403	else
2389		− hci_discovery_set_state(hdev, DISCOVERY_STOPPING);
2390		− goto unlock;
2391		− }
	2404	+ err = hci_cancel_le_scan(hdev);
2392	2405
2393		− e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_PENDING);
2394		− if (!e) {
2395		− mgmt_pending_remove(cmd);
2396		− err = cmd_complete(sk, hdev->id, MGMT_OP_STOP_DISCOVERY, 0,
2397		− &mgmt_cp->type, sizeof(mgmt_cp->type));
2398		− hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
2399		− goto unlock;
	2406	+ break;
	2407	+
	2408	+ case DISCOVERY_RESOLVING:
	2409	+ e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY,
	2410	+ NAME_PENDING);
	2411	+ if (!e) {
	2412	+ mgmt_pending_remove(cmd);
	2413	+ err = cmd_complete(sk, hdev->id,
	2414	+ MGMT_OP_STOP_DISCOVERY, 0,
	2415	+ &mgmt_cp->type,
	2416	+ sizeof(mgmt_cp->type));
	2417	+ hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
	2418	+ goto unlock;
	2419	+ }
	2420	+
	2421	+ bacpy(&cp.bdaddr, &e->data.bdaddr);
	2422	+ err = hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ_CANCEL,
	2423	+ sizeof(cp), &cp);
	2424	+
	2425	+ break;
	2426	+
	2427	+ default:
	2428	+ BT_DBG("unknown discovery state %u", hdev->discovery.state);
	2429	+ err = -EFAULT;
2400	2430	}
2401	2431
2402		− bacpy(&cp.bdaddr, &e->data.bdaddr);
2403		− err = hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ_CANCEL, sizeof(cp),
2404		− &cp);
2405	2432	if (err < 0)
2406	2433	mgmt_pending_remove(cmd);
2407	2434	else
@@ -2501,6 +2528,37 @@ static int unblock_device(struct sock sk, struct hci_dev hdev, void *data, · 93 unmodified lines
2501	2528	return err;
2502	2529	}
2503	2530
	2531	+static int set_device_id(struct sock sk, struct hci_dev hdev, void *data,
	2532	+ u16 len)
	2533	+{
	2534	+ struct mgmt_cp_set_device_id *cp = data;
	2535	+ int err;
	2536	+ __u16 source;
	2537	+
	2538	+ BT_DBG("%s", hdev->name);
	2539	+
	2540	+ source = __le16_to_cpu(cp->source);
	2541	+
	2542	+ if (source > 0x0002)
	2543	+ return cmd_status(sk, hdev->id, MGMT_OP_SET_DEVICE_ID,
	2544	+ MGMT_STATUS_INVALID_PARAMS);
	2545	+
	2546	+ hci_dev_lock(hdev);
	2547	+
	2548	+ hdev->devid_source = source;
	2549	+ hdev->devid_vendor = __le16_to_cpu(cp->vendor);
	2550	+ hdev->devid_product = __le16_to_cpu(cp->product);
	2551	+ hdev->devid_version = __le16_to_cpu(cp->version);
	2552	+
	2553	+ err = cmd_complete(sk, hdev->id, MGMT_OP_SET_DEVICE_ID, 0, NULL, 0);
	2554	+
	2555	+ update_eir(hdev);
	2556	+
	2557	+ hci_dev_unlock(hdev);
	2558	+
	2559	+ return err;
	2560	+}
	2561	+
2504	2562	static int set_fast_connectable(struct sock sk, struct hci_dev hdev,
2505	2563	void *data, u16 len)
2506	2564	{
@@ -2565,7 +2623,7 @@ static int load_long_term_keys(struct sock sk, struct hci_dev hdev, · 58 unmodified lines
2565	2623	u16 key_count, expected_len;
2566	2624	int i;
2567	2625
2568		− key_count = get_unaligned_le16(&cp->key_count);
	2626	+ key_count = __le16_to_cpu(cp->key_count);
2569	2627
2570	2628	expected_len = sizeof(cp) + key_count
2571	2629	sizeof(struct mgmt_ltk_info);
@@ -2591,7 +2649,8 @@ static int load_long_term_keys(struct sock sk, struct hci_dev hdev, · 19 unmodified lines
2591	2649	else
2592	2650	type = HCI_SMP_LTK_SLAVE;
2593	2651
2594		− hci_add_ltk(hdev, &key->addr.bdaddr, key->addr.type,
	2652	+ hci_add_ltk(hdev, &key->addr.bdaddr,
	2653	+ bdaddr_to_le(key->addr.type),
2595	2654	type, 0, key->authenticated, key->val,
2596	2655	key->enc_size, key->ediv, key->rand);
2597	2656	}
@@ -2601,7 +2660,7 @@ static int load_long_term_keys(struct sock sk, struct hci_dev hdev, · 3 unmodified lines
2601	2660	return 0;
2602	2661	}
2603	2662
2604		−struct mgmt_handler {
	2663	+static const struct mgmt_handler {
2605	2664	int (func) (struct sock sk, struct hci_dev hdev, void data,
2606	2665	u16 data_len);
2607	2666	bool var_len;
@@ -2647,6 +2706,7 @@ struct mgmt_handler { · 39 unmodified lines
2647	2706	{ confirm_name, false, MGMT_CONFIRM_NAME_SIZE },
2648	2707	{ block_device, false, MGMT_BLOCK_DEVICE_SIZE },
2649	2708	{ unblock_device, false, MGMT_UNBLOCK_DEVICE_SIZE },
	2709	+ { set_device_id, false, MGMT_SET_DEVICE_ID_SIZE },
2650	2710	};
2651	2711
2652	2712
@@ -2657,7 +2717,7 @@ int mgmt_control(struct sock sk, struct msghdr msg, size_t msglen) · 4 unmodified lines
2657	2717	struct mgmt_hdr *hdr;
2658	2718	u16 opcode, index, len;
2659	2719	struct hci_dev *hdev = NULL;
2660		− struct mgmt_handler *handler;
	2720	+ const struct mgmt_handler *handler;
2661	2721	int err;
2662	2722
2663	2723	BT_DBG("got %zu bytes", msglen);
@@ -2675,9 +2735,9 @@ int mgmt_control(struct sock sk, struct msghdr msg, size_t msglen) · 11 unmodified lines
2675	2735	}
2676	2736
2677	2737	hdr = buf;
2678		− opcode = get_unaligned_le16(&hdr->opcode);
2679		− index = get_unaligned_le16(&hdr->index);
2680		− len = get_unaligned_le16(&hdr->len);
	2738	+ opcode = __le16_to_cpu(hdr->opcode);
	2739	+ index = __le16_to_cpu(hdr->index);
	2740	+ len = __le16_to_cpu(hdr->len);
2681	2741
2682	2742	if (len != msglen - sizeof(*hdr)) {
2683	2743	err = -EINVAL;
@@ -2884,7 +2944,8 @@ int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status) · 200 unmodified lines
2884	2944	return 0;
2885	2945	}
2886	2946
2887		−int mgmt_new_link_key(struct hci_dev hdev, struct link_key key, bool persistent)
	2947	+int mgmt_new_link_key(struct hci_dev hdev, struct link_key key,
	2948	+ bool persistent)
2888	2949	{
2889	2950	struct mgmt_ev_new_link_key ev;
2890	2951
@@ -2892,7 +2953,7 @@ int mgmt_new_link_key(struct hci_dev hdev, struct link_key key, bool persisten · 1 unmodified line
2892	2953
2893	2954	ev.store_hint = persistent;
2894	2955	bacpy(&ev.key.addr.bdaddr, &key->bdaddr);
2895		− ev.key.addr.type = MGMT_ADDR_BREDR;
	2956	+ ev.key.addr.type = BDADDR_BREDR;
2896	2957	ev.key.type = key->type;
2897	2958	memcpy(ev.key.val, key->val, 16);
2898	2959	ev.key.pin_len = key->pin_len;
@@ -2908,7 +2969,7 @@ int mgmt_new_ltk(struct hci_dev hdev, struct smp_ltk key, u8 persistent) · 9 unmodified lines
2908	2969
2909	2970	ev.store_hint = persistent;
2910	2971	bacpy(&ev.key.addr.bdaddr, &key->bdaddr);
2911		− ev.key.addr.type = key->bdaddr_type;
	2972	+ ev.key.addr.type = link_to_bdaddr(LE_LINK, key->bdaddr_type);
2912	2973	ev.key.authenticated = key->authenticated;
2913	2974	ev.key.enc_size = key->enc_size;
2914	2975	ev.key.ediv = key->ediv;
@@ -2932,7 +2993,7 @@ int mgmt_device_connected(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type, · 17 unmodified lines
2932	2993	u16 eir_len = 0;
2933	2994
2934	2995	bacpy(&ev->addr.bdaddr, bdaddr);
2935		− ev->addr.type = link_to_mgmt(link_type, addr_type);
	2996	+ ev->addr.type = link_to_bdaddr(link_type, addr_type);
2936	2997
2937	2998	ev->flags = __cpu_to_le32(flags);
2938	2999
@@ -2944,7 +3005,7 @@ int mgmt_device_connected(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type, · 5 unmodified lines
2944	3005	eir_len = eir_append_data(ev->eir, eir_len,
2945	3006	EIR_CLASS_OF_DEV, dev_class, 3);
2946	3007
2947		− put_unaligned_le16(eir_len, &ev->eir_len);
	3008	+ ev->eir_len = cpu_to_le16(eir_len);
2948	3009
2949	3010	return mgmt_event(MGMT_EV_DEVICE_CONNECTED, hdev, buf,
2950	3011	sizeof(*ev) + eir_len, NULL);
@@ -2995,13 +3056,13 @@ int mgmt_device_disconnected(struct hci_dev hdev, bdaddr_t bdaddr, · 44 unmodified lines
2995	3056	mgmt_pending_foreach(MGMT_OP_DISCONNECT, hdev, disconnect_rsp, &sk);
2996	3057
2997	3058	bacpy(&ev.bdaddr, bdaddr);
2998		− ev.type = link_to_mgmt(link_type, addr_type);
	3059	+ ev.type = link_to_bdaddr(link_type, addr_type);
2999	3060
3000	3061	err = mgmt_event(MGMT_EV_DEVICE_DISCONNECTED, hdev, &ev, sizeof(ev),
3001	3062	sk);
3002	3063
3003	3064	if (sk)
3004		− sock_put(sk);
	3065	+ sock_put(sk);
3005	3066
3006	3067	mgmt_pending_foreach(MGMT_OP_UNPAIR_DEVICE, hdev, unpair_device_rsp,
3007	3068	hdev);
@@ -3021,7 +3082,7 @@ int mgmt_disconnect_failed(struct hci_dev hdev, bdaddr_t bdaddr, · 13 unmodified lines
3021	3082	return -ENOENT;
3022	3083
3023	3084	bacpy(&rp.addr.bdaddr, bdaddr);
3024		− rp.addr.type = link_to_mgmt(link_type, addr_type);
	3085	+ rp.addr.type = link_to_bdaddr(link_type, addr_type);
3025	3086
3026	3087	err = cmd_complete(cmd->sk, cmd->index, MGMT_OP_DISCONNECT,
3027	3088	mgmt_status(status), &rp, sizeof(rp));
@@ -3039,7 +3100,7 @@ int mgmt_connect_failed(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type, · 11 unmodified lines
3039	3100	struct mgmt_ev_connect_failed ev;
3040	3101
3041	3102	bacpy(&ev.addr.bdaddr, bdaddr);
3042		− ev.addr.type = link_to_mgmt(link_type, addr_type);
	3103	+ ev.addr.type = link_to_bdaddr(link_type, addr_type);
3043	3104	ev.status = mgmt_status(status);
3044	3105
3045	3106	return mgmt_event(MGMT_EV_CONNECT_FAILED, hdev, &ev, sizeof(ev), NULL);
@@ -3050,7 +3111,7 @@ int mgmt_pin_code_request(struct hci_dev hdev, bdaddr_t bdaddr, u8 secure) · 4 unmodified lines
3050	3111	struct mgmt_ev_pin_code_request ev;
3051	3112
3052	3113	bacpy(&ev.addr.bdaddr, bdaddr);
3053		− ev.addr.type = MGMT_ADDR_BREDR;
	3114	+ ev.addr.type = BDADDR_BREDR;
3054	3115	ev.secure = secure;
3055	3116
3056	3117	return mgmt_event(MGMT_EV_PIN_CODE_REQUEST, hdev, &ev, sizeof(ev),
@@ -3069,7 +3130,7 @@ int mgmt_pin_code_reply_complete(struct hci_dev hdev, bdaddr_t bdaddr, · 12 unmodified lines
3069	3130	return -ENOENT;
3070	3131
3071	3132	bacpy(&rp.addr.bdaddr, bdaddr);
3072		− rp.addr.type = MGMT_ADDR_BREDR;
	3133	+ rp.addr.type = BDADDR_BREDR;
3073	3134
3074	3135	err = cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_REPLY,
3075	3136	mgmt_status(status), &rp, sizeof(rp));
@@ -3091,7 +3152,7 @@ int mgmt_pin_code_neg_reply_complete(struct hci_dev hdev, bdaddr_t bdaddr, · 15 unmodified lines
3091	3152	return -ENOENT;
3092	3153
3093	3154	bacpy(&rp.addr.bdaddr, bdaddr);
3094		− rp.addr.type = MGMT_ADDR_BREDR;
	3155	+ rp.addr.type = BDADDR_BREDR;
3095	3156
3096	3157	err = cmd_complete(cmd->sk, hdev->id, MGMT_OP_PIN_CODE_NEG_REPLY,
3097	3158	mgmt_status(status), &rp, sizeof(rp));
@@ -3110,9 +3171,9 @@ int mgmt_user_confirm_request(struct hci_dev hdev, bdaddr_t bdaddr, · 12 unmodified lines
3110	3171	BT_DBG("%s", hdev->name);
3111	3172
3112	3173	bacpy(&ev.addr.bdaddr, bdaddr);
3113		− ev.addr.type = link_to_mgmt(link_type, addr_type);
	3174	+ ev.addr.type = link_to_bdaddr(link_type, addr_type);
3114	3175	ev.confirm_hint = confirm_hint;
3115		− put_unaligned_le32(value, &ev.value);
	3176	+ ev.value = value;
3116	3177
3117	3178	return mgmt_event(MGMT_EV_USER_CONFIRM_REQUEST, hdev, &ev, sizeof(ev),
3118	3179	NULL);
@@ -3126,7 +3187,7 @@ int mgmt_user_passkey_request(struct hci_dev hdev, bdaddr_t bdaddr, · 7 unmodified lines
3126	3187	BT_DBG("%s", hdev->name);
3127	3188
3128	3189	bacpy(&ev.addr.bdaddr, bdaddr);
3129		− ev.addr.type = link_to_mgmt(link_type, addr_type);
	3190	+ ev.addr.type = link_to_bdaddr(link_type, addr_type);
3130	3191
3131	3192	return mgmt_event(MGMT_EV_USER_PASSKEY_REQUEST, hdev, &ev, sizeof(ev),
3132	3193	NULL);
@@ -3145,7 +3206,7 @@ static int user_pairing_resp_complete(struct hci_dev hdev, bdaddr_t bdaddr, · 12 unmodified lines
3145	3206	return -ENOENT;
3146	3207
3147	3208	bacpy(&rp.addr.bdaddr, bdaddr);
3148		− rp.addr.type = link_to_mgmt(link_type, addr_type);
	3209	+ rp.addr.type = link_to_bdaddr(link_type, addr_type);
3149	3210	err = cmd_complete(cmd->sk, hdev->id, opcode, mgmt_status(status),
3150	3211	&rp, sizeof(rp));
3151	3212
@@ -3188,7 +3249,7 @@ int mgmt_auth_failed(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type, · 36 unmodified lines
3188	3249	struct mgmt_ev_auth_failed ev;
3189	3250
3190	3251	bacpy(&ev.addr.bdaddr, bdaddr);
3191		− ev.addr.type = link_to_mgmt(link_type, addr_type);
	3252	+ ev.addr.type = link_to_bdaddr(link_type, addr_type);
3192	3253	ev.status = mgmt_status(status);
3193	3254
3194	3255	return mgmt_event(MGMT_EV_AUTH_FAILED, hdev, &ev, sizeof(ev), NULL);
@@ -3413,10 +3474,10 @@ int mgmt_le_enable_complete(struct hci_dev *hdev, u8 enable, u8 status) · 218 unmodified lines
3413	3474
3414	3475	if (enable && test_and_clear_bit(HCI_LE_ENABLED,
3415	3476	&hdev->dev_flags))
3416		− err = new_settings(hdev, NULL);
	3477	+ err = new_settings(hdev, NULL);
3417	3478
3418		− mgmt_pending_foreach(MGMT_OP_SET_LE, hdev,
3419		− cmd_status_rsp, &mgmt_err);
	3479	+ mgmt_pending_foreach(MGMT_OP_SET_LE, hdev, cmd_status_rsp,
	3480	+ &mgmt_err);
3420	3481
3421	3482	return err;
3422	3483	}
@@ -3455,7 +3516,7 @@ int mgmt_device_found(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type, · 32 unmodified lines
3455	3516	memset(buf, 0, sizeof(buf));
3456	3517
3457	3518	bacpy(&ev->addr.bdaddr, bdaddr);
3458		− ev->addr.type = link_to_mgmt(link_type, addr_type);
	3519	+ ev->addr.type = link_to_bdaddr(link_type, addr_type);
3459	3520	ev->rssi = rssi;
3460	3521	if (cfm_name)
3461	3522	ev->flags[0] \|= MGMT_DEV_FOUND_CONFIRM_NAME;
@@ -3469,7 +3530,7 @@ int mgmt_device_found(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type, · 7 unmodified lines
3469	3530	eir_len = eir_append_data(ev->eir, eir_len, EIR_CLASS_OF_DEV,
3470	3531	dev_class, 3);
3471	3532
3472		− put_unaligned_le16(eir_len, &ev->eir_len);
	3533	+ ev->eir_len = cpu_to_le16(eir_len);
3473	3534
3474	3535	ev_size = sizeof(*ev) + eir_len;
3475	3536
@@ -3488,13 +3549,13 @@ int mgmt_remote_name(struct hci_dev hdev, bdaddr_t bdaddr, u8 link_type, · 12 unmodified lines
3488	3549	memset(buf, 0, sizeof(buf));
3489	3550
3490	3551	bacpy(&ev->addr.bdaddr, bdaddr);
3491		− ev->addr.type = link_to_mgmt(link_type, addr_type);
	3552	+ ev->addr.type = link_to_bdaddr(link_type, addr_type);
3492	3553	ev->rssi = rssi;
3493	3554
3494	3555	eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE, name,
3495	3556	name_len);
3496	3557
3497		− put_unaligned_le16(eir_len, &ev->eir_len);
	3558	+ ev->eir_len = cpu_to_le16(eir_len);
3498	3559
3499	3560	return mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev,
3500	3561	sizeof(*ev) + eir_len, NULL);
@@ -3594,6 +3655,3 @@ int mgmt_device_unblocked(struct hci_dev hdev, bdaddr_t bdaddr, u8 type) · 93 unmodified lines
3594	3655
3595	3656	module_param(enable_hs, bool, 0644);
3596	3657	MODULE_PARM_DESC(enable_hs, "Enable High Speed support");
3597		−
3598		−module_param(enable_le, bool, 0644);
3599		−MODULE_PARM_DESC(enable_le, "Enable Low Energy support");

net/bluetooth/rfcomm/sock.c+10−4

@@ -260,7 +260,8 @@ static void rfcomm_sock_init(struct sock sk, struct sock parent) · 259 unmodified lines
260	260
261	261	if (parent) {
262	262	sk->sk_type = parent->sk_type;
263		− pi->dlc->defer_setup = bt_sk(parent)->defer_setup;
	263	+ pi->dlc->defer_setup = test_bit(BT_SK_DEFER_SETUP,
	264	+ &bt_sk(parent)->flags);
264	265
265	266	pi->sec_level = rfcomm_pi(parent)->sec_level;
266	267	pi->role_switch = rfcomm_pi(parent)->role_switch;
@@ -731,7 +732,11 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c · 464 unmodified lines
731	732	break;
732	733	}
733	734
734		− bt_sk(sk)->defer_setup = opt;
	735	+ if (opt)
	736	+ set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
	737	+ else
	738	+ clear_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
	739	+
735	740	break;
736	741
737	742	default:
@@ -849,7 +854,8 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c · 111 unmodified lines
849	854	break;
850	855	}
851	856
852		− if (put_user(bt_sk(sk)->defer_setup, (u32 __user *) optval))
	857	+ if (put_user(test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags),
	858	+ (u32 __user *) optval))
853	859	err = -EFAULT;
854	860
855	861	break;
@@ -972,7 +978,7 @@ int rfcomm_connect_ind(struct rfcomm_session s, u8 channel, struct rfcomm_dlc · 116 unmodified lines
972	978	done:
973	979	bh_unlock_sock(parent);
974	980
975		− if (bt_sk(parent)->defer_setup)
	981	+ if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(parent)->flags))
976	982	parent->sk_state_change(parent);
977	983
978	984	return result;

net/bluetooth/sco.c+44−31

@@ -61,8 +61,6 @@ static struct bt_sock_list sco_sk_list = { · 60 unmodified lines
61	61	static void __sco_chan_add(struct sco_conn conn, struct sock sk, struct sock *parent);
62	62	static void sco_chan_del(struct sock *sk, int err);
63	63
64		−static int sco_conn_del(struct hci_conn *conn, int err);
65		−
66	64	static void sco_sock_close(struct sock *sk);
67	65	static void sco_sock_kill(struct sock *sk);
68	66
@@ -95,12 +93,12 @@ static void sco_sock_clear_timer(struct sock *sk) · 26 unmodified lines
95	93	}
96	94
97	95	/* ---- SCO connections ---- */
98		−static struct sco_conn sco_conn_add(struct hci_conn hcon, __u8 status)
	96	+static struct sco_conn sco_conn_add(struct hci_conn hcon)
99	97	{
100	98	struct hci_dev *hdev = hcon->hdev;
101	99	struct sco_conn *conn = hcon->sco_data;
102	100
103		− if (conn \|\| status)
	101	+ if (conn)
104	102	return conn;
105	103
106	104	conn = kzalloc(sizeof(struct sco_conn), GFP_ATOMIC);
@@ -195,13 +193,14 @@ static int sco_connect(struct sock *sk) · 88 unmodified lines
195	193	else
196	194	type = SCO_LINK;
197	195
198		− hcon = hci_connect(hdev, type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING);
	196	+ hcon = hci_connect(hdev, type, dst, BDADDR_BREDR, BT_SECURITY_LOW,
	197	+ HCI_AT_NO_BONDING);
199	198	if (IS_ERR(hcon)) {
200	199	err = PTR_ERR(hcon);
201	200	goto done;
202	201	}
203	202
204		− conn = sco_conn_add(hcon, 0);
	203	+ conn = sco_conn_add(hcon);
205	204	if (!conn) {
206	205	hci_conn_put(hcon);
207	206	err = -ENOMEM;
@@ -233,7 +232,7 @@ static inline int sco_send_frame(struct sock sk, struct msghdr msg, int len) · 25 unmodified lines
233	232	{
234	233	struct sco_conn *conn = sco_pi(sk)->conn;
235	234	struct sk_buff *skb;
236		− int err, count;
	235	+ int err;
237	236
238	237	/* Check outgoing MTU */
239	238	if (len > conn->mtu)
@@ -241,20 +240,18 @@ static inline int sco_send_frame(struct sock sk, struct msghdr msg, int len) · 1 unmodified line
241	240
242	241	BT_DBG("sk %p len %d", sk, len);
243	242
244		− count = min_t(unsigned int, conn->mtu, len);
245		− skb = bt_skb_send_alloc(sk, count,
246		− msg->msg_flags & MSG_DONTWAIT, &err);
	243	+ skb = bt_skb_send_alloc(sk, len, msg->msg_flags & MSG_DONTWAIT, &err);
247	244	if (!skb)
248	245	return err;
249	246
250		− if (memcpy_fromiovec(skb_put(skb, count), msg->msg_iov, count)) {
	247	+ if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
251	248	kfree_skb(skb);
252	249	return -EFAULT;
253	250	}
254	251
255	252	hci_send_sco(conn->hcon, skb);
256	253
257		− return count;
	254	+ return len;
258	255	}
259	256
260	257	static inline void sco_recv_frame(struct sco_conn conn, struct sk_buff skb)
@@ -277,17 +274,20 @@ drop: · 16 unmodified lines
277	274	}
278	275
279	276	/* -------- Socket interface ---------- */
280		−static struct sock __sco_get_sock_by_addr(bdaddr_t ba)
	277	+static struct sock __sco_get_sock_listen_by_addr(bdaddr_t ba)
281	278	{
282		− struct sock *sk;
283	279	struct hlist_node *node;
	280	+ struct sock *sk;
	281	+
	282	+ sk_for_each(sk, node, &sco_sk_list.head) {
	283	+ if (sk->sk_state != BT_LISTEN)
	284	+ continue;
284	285
285		− sk_for_each(sk, node, &sco_sk_list.head)
286	286	if (!bacmp(&bt_sk(sk)->src, ba))
287		− goto found;
288		− sk = NULL;
289		−found:
290		− return sk;
	287	+ return sk;
	288	+ }
	289	+
	290	+ return NULL;
291	291	}
292	292
293	293	/* Find socket listening on source bdaddr.
@@ -466,7 +466,6 @@ static int sco_sock_bind(struct socket sock, struct sockaddr addr, int addr_le · 172 unmodified lines
466	466	{
467	467	struct sockaddr_sco sa = (struct sockaddr_sco ) addr;
468	468	struct sock *sk = sock->sk;
469		− bdaddr_t *src = &sa->sco_bdaddr;
470	469	int err = 0;
471	470
472	471	BT_DBG("sk %p %s", sk, batostr(&sa->sco_bdaddr));
@@ -481,17 +480,14 @@ static int sco_sock_bind(struct socket sock, struct sockaddr addr, int addr_le · 8 unmodified lines
481	480	goto done;
482	481	}
483	482
484		− write_lock(&sco_sk_list.lock);
485		−
486		− if (bacmp(src, BDADDR_ANY) && __sco_get_sock_by_addr(src)) {
487		− err = -EADDRINUSE;
488		− } else {
489		− /* Save source address */
490		− bacpy(&bt_sk(sk)->src, &sa->sco_bdaddr);
491		− sk->sk_state = BT_BOUND;
	483	+ if (sk->sk_type != SOCK_SEQPACKET) {
	484	+ err = -EINVAL;
	485	+ goto done;
492	486	}
493	487
494		− write_unlock(&sco_sk_list.lock);
	488	+ bacpy(&bt_sk(sk)->src, &sa->sco_bdaddr);
	489	+
	490	+ sk->sk_state = BT_BOUND;
495	491
496	492	done:
497	493	release_sock(sk);
@@ -537,21 +533,38 @@ done: · 39 unmodified lines
537	533	static int sco_sock_listen(struct socket *sock, int backlog)
538	534	{
539	535	struct sock *sk = sock->sk;
	536	+ bdaddr_t *src = &bt_sk(sk)->src;
540	537	int err = 0;
541	538
542	539	BT_DBG("sk %p backlog %d", sk, backlog);
543	540
544	541	lock_sock(sk);
545	542
546		− if (sk->sk_state != BT_BOUND \|\| sock->type != SOCK_SEQPACKET) {
	543	+ if (sk->sk_state != BT_BOUND) {
547	544	err = -EBADFD;
548	545	goto done;
549	546	}
550	547
	548	+ if (sk->sk_type != SOCK_SEQPACKET) {
	549	+ err = -EINVAL;
	550	+ goto done;
	551	+ }
	552	+
	553	+ write_lock(&sco_sk_list.lock);
	554	+
	555	+ if (__sco_get_sock_listen_by_addr(src)) {
	556	+ err = -EADDRINUSE;
	557	+ goto unlock;
	558	+ }
	559	+
551	560	sk->sk_max_ack_backlog = backlog;
552	561	sk->sk_ack_backlog = 0;
	562	+
553	563	sk->sk_state = BT_LISTEN;
554	564
	565	+unlock:
	566	+ write_unlock(&sco_sk_list.lock);
	567	+
555	568	done:
556	569	release_sock(sk);
557	570	return err;
@@ -923,7 +936,7 @@ int sco_connect_cfm(struct hci_conn *hcon, __u8 status) · 365 unmodified lines
923	936	if (!status) {
924	937	struct sco_conn *conn;
925	938
926		− conn = sco_conn_add(hcon, status);
	939	+ conn = sco_conn_add(hcon);
927	940	if (conn)
928	941	sco_conn_ready(conn);
929	942	} else

net/bluetooth/smp.c+1−1

@@ -956,7 +956,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force) · 955 unmodified lines
956	956	HCI_SMP_LTK_SLAVE, 1, authenticated,
957	957	enc.ltk, smp->enc_key_size, ediv, ident.rand);
958	958
959		− ident.ediv = cpu_to_le16(ediv);
	959	+ ident.ediv = ediv;
960	960
961	961	smp_send_cmd(conn, SMP_CMD_MASTER_IDENT, sizeof(ident), &ident);
962	962

net/ipv4/fib_semantics.c+6−6

@@ -145,6 +145,12 @@ static void free_fib_info_rcu(struct rcu_head *head) · 144 unmodified lines
145	145	{
146	146	struct fib_info *fi = container_of(head, struct fib_info, rcu);
147	147
	148	+ change_nexthops(fi) {
	149	+ if (nexthop_nh->nh_dev)
	150	+ dev_put(nexthop_nh->nh_dev);
	151	+ } endfor_nexthops(fi);
	152	+
	153	+ release_net(fi->fib_net);
148	154	if (fi->fib_metrics != (u32 *) dst_default_metrics)
149	155	kfree(fi->fib_metrics);
150	156	kfree(fi);
@@ -156,13 +162,7 @@ void free_fib_info(struct fib_info *fi) · 5 unmodified lines
156	162	pr_warn("Freeing alive fib_info %p\n", fi);
157	163	return;
158	164	}
159		− change_nexthops(fi) {
160		− if (nexthop_nh->nh_dev)
161		− dev_put(nexthop_nh->nh_dev);
162		− nexthop_nh->nh_dev = NULL;
163		− } endfor_nexthops(fi);
164	165	fib_info_cnt--;
165		− release_net(fi->fib_net);
166	166	call_rcu(&fi->rcu, free_fib_info_rcu);
167	167	}
168	168

net/ipv4/route.c+1−0

@@ -3452,6 +3452,7 @@ int __init ip_rt_init(void) · 3451 unmodified lines
3452	3452	0,
3453	3453	&rt_hash_log,
3454	3454	&rt_hash_mask,
	3455	+ 0,
3455	3456	rhash_entries ? 0 : 512 * 1024);
3456	3457	memset(rt_hash_table, 0, (rt_hash_mask + 1) * sizeof(struct rt_hash_bucket));
3457	3458	rt_hash_lock_init();

net/ipv4/tcp.c+2−0

@@ -3514,6 +3514,7 @@ void __init tcp_init(void) · 3513 unmodified lines
3514	3514	0,
3515	3515	NULL,
3516	3516	&tcp_hashinfo.ehash_mask,
	3517	+ 0,
3517	3518	thash_entries ? 0 : 512 * 1024);
3518	3519	for (i = 0; i <= tcp_hashinfo.ehash_mask; i++) {
3519	3520	INIT_HLIST_NULLS_HEAD(&tcp_hashinfo.ehash[i].chain, i);
@@ -3530,6 +3531,7 @@ void __init tcp_init(void) · 10 unmodified lines
3530	3531	0,
3531	3532	&tcp_hashinfo.bhash_size,
3532	3533	NULL,
	3534	+ 0,
3533	3535	64 * 1024);
3534	3536	tcp_hashinfo.bhash_size = 1U << tcp_hashinfo.bhash_size;
3535	3537	for (i = 0; i < tcp_hashinfo.bhash_size; i++) {

net/ipv4/tcp_input.c+5−0

@@ -4555,6 +4555,11 @@ static bool tcp_try_coalesce(struct sock *sk, · 4554 unmodified lines
4555	4555
4556	4556	if (tcp_hdr(from)->fin)
4557	4557	return false;
	4558	+
	4559	+ /* Its possible this segment overlaps with prior segment in queue */
	4560	+ if (TCP_SKB_CB(from)->seq != TCP_SKB_CB(to)->end_seq)
	4561	+ return false;
	4562	+
4558	4563	if (!skb_try_coalesce(to, from, fragstolen, &delta))
4559	4564	return false;
4560	4565

net/ipv4/udp.c+10−20

@@ -2192,26 +2192,16 @@ void __init udp_table_init(struct udp_table table, const char name) · 2191 unmodified lines
2192	2192	{
2193	2193	unsigned int i;
2194	2194
2195		− if (!CONFIG_BASE_SMALL)
2196		− table->hash = alloc_large_system_hash(name,
2197		− 2 * sizeof(struct udp_hslot),
2198		− uhash_entries,
2199		− 21, /* one slot per 2 MB */
2200		− 0,
2201		− &table->log,
2202		− &table->mask,
2203		− 64 * 1024);
2204		− /*
2205		− * Make sure hash table has the minimum size
2206		− */
2207		− if (CONFIG_BASE_SMALL \|\| table->mask < UDP_HTABLE_SIZE_MIN - 1) {
2208		− table->hash = kmalloc(UDP_HTABLE_SIZE_MIN *
2209		− 2 * sizeof(struct udp_hslot), GFP_KERNEL);
2210		− if (!table->hash)
2211		− panic(name);
2212		− table->log = ilog2(UDP_HTABLE_SIZE_MIN);
2213		− table->mask = UDP_HTABLE_SIZE_MIN - 1;
2214		− }
	2195	+ table->hash = alloc_large_system_hash(name,
	2196	+ 2 * sizeof(struct udp_hslot),
	2197	+ uhash_entries,
	2198	+ 21, /* one slot per 2 MB */
	2199	+ 0,
	2200	+ &table->log,
	2201	+ &table->mask,
	2202	+ UDP_HTABLE_SIZE_MIN,
	2203	+ 64 * 1024);
	2204	+
2215	2205	table->hash2 = table->hash + (table->mask + 1);
2216	2206	for (i = 0; i <= table->mask; i++) {
2217	2207	INIT_HLIST_NULLS_HEAD(&table->hash[i].head, i);

net/mac80211/agg-tx.c+8−2

@@ -421,16 +421,22 @@ static void sta_tx_agg_session_timer_expired(unsigned long data) · 420 unmodified lines
421	421	struct tid_ampdu_tx *tid_tx;
422	422	unsigned long timeout;
423	423
424		− tid_tx = rcu_dereference_protected_tid_tx(sta, *ptid);
425		− if (!tid_tx)
	424	+ rcu_read_lock();
	425	+ tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[*ptid]);
	426	+ if (!tid_tx \|\| test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
	427	+ rcu_read_unlock();
426	428	return;
	429	+ }
427	430
428	431	timeout = tid_tx->last_tx + TU_TO_JIFFIES(tid_tx->timeout);
429	432	if (time_is_after_jiffies(timeout)) {
430	433	mod_timer(&tid_tx->session_timer, timeout);
	434	+ rcu_read_unlock();
431	435	return;
432	436	}
433	437
	438	+ rcu_read_unlock();
	439	+
434	440	#ifdef CONFIG_MAC80211_HT_DEBUG
435	441	printk(KERN_DEBUG "tx session timer expired on tid %d\n", (u16)*ptid);
436	442	#endif

net/mac80211/debugfs_netdev.c+2−0

@@ -509,6 +509,7 @@ IEEE80211_IF_FILE(dot11MeshHWMPRannInterval, · 508 unmodified lines
509	509	u.mesh.mshcfg.dot11MeshHWMPRannInterval, DEC);
510	510	IEEE80211_IF_FILE(dot11MeshForwarding, u.mesh.mshcfg.dot11MeshForwarding, DEC);
511	511	IEEE80211_IF_FILE(rssi_threshold, u.mesh.mshcfg.rssi_threshold, DEC);
	512	+IEEE80211_IF_FILE(ht_opmode, u.mesh.mshcfg.ht_opmode, DEC);
512	513	#endif
513	514
514	515	#define DEBUGFS_ADD_MODE(name, mode) \
@@ -608,6 +609,7 @@ static void add_mesh_config(struct ieee80211_sub_if_data *sdata) · 93 unmodified lines
608	609	MESHPARAMS_ADD(dot11MeshHWMPRannInterval);
609	610	MESHPARAMS_ADD(dot11MeshGateAnnouncementProtocol);
610	611	MESHPARAMS_ADD(rssi_threshold);
	612	+ MESHPARAMS_ADD(ht_opmode);
611	613	#undef MESHPARAMS_ADD
612	614	}
613	615	#endif

net/mac80211/ibss.c+5−0

@@ -163,6 +163,11 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, · 162 unmodified lines
163	163	sizeof(struct ieee80211_ht_operation));
164	164	pos = ieee80211_ie_build_ht_cap(pos, &sband->ht_cap,
165	165	sband->ht_cap.cap);
	166	+ /*
	167	+ * Note: According to 802.11n-2009 9.13.3.1, HT Protection
	168	+ * field and RIFS Mode are reserved in IBSS mode, therefore
	169	+ * keep them at 0
	170	+ */
166	171	pos = ieee80211_ie_build_ht_oper(pos, &sband->ht_cap,
167	172	chan, channel_type, 0);
168	173	}

net/mac80211/iface.c+3−1

@@ -206,8 +206,10 @@ static void ieee80211_set_default_queues(struct ieee80211_sub_if_data *sdata) · 205 unmodified lines
206	206	for (i = 0; i < IEEE80211_NUM_ACS; i++) {
207	207	if (local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)
208	208	sdata->vif.hw_queue[i] = IEEE80211_INVAL_HW_QUEUE;
209		− else
	209	+ else if (local->hw.queues >= IEEE80211_NUM_ACS)
210	210	sdata->vif.hw_queue[i] = i;
	211	+ else
	212	+ sdata->vif.hw_queue[i] = 0;
211	213	}
212	214	sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
213	215	}

net/mac80211/main.c+3−0

@@ -596,6 +596,9 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, · 595 unmodified lines
596	596	local->hw.offchannel_tx_hw_queue = IEEE80211_INVAL_HW_QUEUE;
597	597	local->hw.conf.long_frame_max_tx_count = wiphy->retry_long;
598	598	local->hw.conf.short_frame_max_tx_count = wiphy->retry_short;
	599	+ local->hw.radiotap_mcs_details = IEEE80211_RADIOTAP_MCS_HAVE_MCS \|
	600	+ IEEE80211_RADIOTAP_MCS_HAVE_GI \|
	601	+ IEEE80211_RADIOTAP_MCS_HAVE_BW;
599	602	local->user_power_level = -1;
600	603	wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask;
601	604

net/mac80211/mesh.c+4−2

@@ -109,8 +109,10 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata, · 108 unmodified lines
109	109
110	110	/* Disallow HT40+/- mismatch */
111	111	if (ie->ht_operation &&
112		− local->_oper_channel_type > NL80211_CHAN_HT20 &&
113		− sta_channel_type > NL80211_CHAN_HT20 &&
	112	+ (local->_oper_channel_type == NL80211_CHAN_HT40MINUS \|\|
	113	+ local->_oper_channel_type == NL80211_CHAN_HT40PLUS) &&
	114	+ (sta_channel_type == NL80211_CHAN_HT40MINUS \|\|
	115	+ sta_channel_type == NL80211_CHAN_HT40PLUS) &&
114	116	local->_oper_channel_type != sta_channel_type)
115	117	goto mismatch;
116	118

net/mac80211/mesh_hwmp.c+4−1

@@ -603,7 +603,10 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata, · 602 unmodified lines
603	603	hopcount, ttl, cpu_to_le32(lifetime),
604	604	cpu_to_le32(metric), cpu_to_le32(preq_id),
605	605	sdata);
606		− ifmsh->mshstats.fwded_mcast++;
	606	+ if (!is_multicast_ether_addr(da))
	607	+ ifmsh->mshstats.fwded_unicast++;
	608	+ else
	609	+ ifmsh->mshstats.fwded_mcast++;
607	610	ifmsh->mshstats.fwded_frames++;
608	611	}
609	612	}

net/mac80211/mesh_plink.c+33−32

@@ -105,15 +105,15 @@ static struct sta_info mesh_plink_alloc(struct ieee80211_sub_if_data sdata, · 104 unmodified lines
105	105	return sta;
106	106	}
107	107
108		−/** mesh_set_ht_prot_mode - set correct HT protection mode
	108	+/*
	109	+ * mesh_set_ht_prot_mode - set correct HT protection mode
109	110	*
110		− * Section 9.23.3.5 of IEEE 80211s standard describes the protection rules for
111		− * HT mesh STA in a MBSS. Three HT protection modes are supported for now,
112		− * non-HT mixed mode, 20MHz-protection and no-protection mode. non-HT mixed
113		− * mode is selected if any non-HT peers are present in our MBSS.
114		− * 20MHz-protection mode is selected if all peers in our 20/40MHz MBSS support
115		− * HT and atleast one HT20 peer is present. Otherwise no-protection mode is
116		− * selected.
	111	+ * Section 9.23.3.5 of IEEE 80211-2012 describes the protection rules for HT
	112	+ * mesh STA in a MBSS. Three HT protection modes are supported for now, non-HT
	113	+ * mixed mode, 20MHz-protection and no-protection mode. non-HT mixed mode is
	114	+ * selected if any non-HT peers are present in our MBSS. 20MHz-protection mode
	115	+ * is selected if all peers in our 20/40MHz MBSS support HT and atleast one
	116	+ * HT20 peer is present. Otherwise no-protection mode is selected.
117	117	*/
118	118	static u32 mesh_set_ht_prot_mode(struct ieee80211_sub_if_data *sdata)
119	119	{
@@ -128,21 +128,22 @@ static u32 mesh_set_ht_prot_mode(struct ieee80211_sub_if_data *sdata) · 8 unmodified lines
128	128
129	129	rcu_read_lock();
130	130	list_for_each_entry_rcu(sta, &local->sta_list, list) {
131		− if (sdata == sta->sdata &&
132		− sta->plink_state == NL80211_PLINK_ESTAB) {
133		− switch (sta->ch_type) {
134		− case NL80211_CHAN_NO_HT:
135		− mpl_dbg("mesh_plink %pM: nonHT sta (%pM) is present",
136		− sdata->vif.addr, sta->sta.addr);
137		− non_ht_sta = true;
138		− goto out;
139		− case NL80211_CHAN_HT20:
140		− mpl_dbg("mesh_plink %pM: HT20 sta (%pM) is present",
141		− sdata->vif.addr, sta->sta.addr);
142		− ht20_sta = true;
143		− default:
144		− break;
145		− }
	131	+ if (sdata != sta->sdata \|\|
	132	+ sta->plink_state != NL80211_PLINK_ESTAB)
	133	+ continue;
	134	+
	135	+ switch (sta->ch_type) {
	136	+ case NL80211_CHAN_NO_HT:
	137	+ mpl_dbg("mesh_plink %pM: nonHT sta (%pM) is present",
	138	+ sdata->vif.addr, sta->sta.addr);
	139	+ non_ht_sta = true;
	140	+ goto out;
	141	+ case NL80211_CHAN_HT20:
	142	+ mpl_dbg("mesh_plink %pM: HT20 sta (%pM) is present",
	143	+ sdata->vif.addr, sta->sta.addr);
	144	+ ht20_sta = true;
	145	+ default:
	146	+ break;
146	147	}
147	148	}
148	149	out:
@@ -346,6 +347,15 @@ static struct sta_info mesh_peer_init(struct ieee80211_sub_if_data sdata, · 197 unmodified lines
346	347
347	348	sta = sta_info_get(sdata, addr);
348	349	if (!sta) {
	350	+ /* Userspace handles peer allocation when security is enabled */
	351	+ if (sdata->u.mesh.security & IEEE80211_MESH_SEC_AUTHED) {
	352	+ cfg80211_notify_new_peer_candidate(sdata->dev, addr,
	353	+ elems->ie_start,
	354	+ elems->total_len,
	355	+ GFP_ATOMIC);
	356	+ return NULL;
	357	+ }
	358	+
349	359	sta = mesh_plink_alloc(sdata, addr);
350	360	if (!sta)
351	361	return NULL;
@@ -387,15 +397,6 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata, · 35 unmodified lines
387	397	{
388	398	struct sta_info *sta;
389	399
390		− /* Userspace handles peer allocation when security is enabled */
391		− if (sdata->u.mesh.security & IEEE80211_MESH_SEC_AUTHED) {
392		− cfg80211_notify_new_peer_candidate(sdata->dev, hw_addr,
393		− elems->ie_start,
394		− elems->total_len,
395		− GFP_KERNEL);
396		− return;
397		− }
398		−
399	400	rcu_read_lock();
400	401	sta = mesh_peer_init(sdata, hw_addr, elems);
401	402	if (!sta)

net/mac80211/rx.c+3−3

@@ -204,14 +204,14 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, · 203 unmodified lines
204	204
205	205	if (status->flag & RX_FLAG_HT) {
206	206	rthdr->it_present \|= cpu_to_le32(1 << IEEE80211_RADIOTAP_MCS);
207		− *pos++ = IEEE80211_RADIOTAP_MCS_HAVE_MCS \|
208		− IEEE80211_RADIOTAP_MCS_HAVE_GI \|
209		− IEEE80211_RADIOTAP_MCS_HAVE_BW;
	207	+ *pos++ = local->hw.radiotap_mcs_details;
210	208	*pos = 0;
211	209	if (status->flag & RX_FLAG_SHORT_GI)
212	210	*pos \|= IEEE80211_RADIOTAP_MCS_SGI;
213	211	if (status->flag & RX_FLAG_40MHZ)
214	212	*pos \|= IEEE80211_RADIOTAP_MCS_BW_40;
	213	+ if (status->flag & RX_FLAG_HT_GF)
	214	+ *pos \|= IEEE80211_RADIOTAP_MCS_FMT_GF;
215	215	pos++;
216	216	*pos++ = status->rate_idx;
217	217	}

net/mac80211/wep.c+12−3

@@ -92,6 +92,7 @@ static u8 ieee80211_wep_add_iv(struct ieee80211_local local, · 91 unmodified lines
92	92	int keylen, int keyidx)
93	93	{
94	94	struct ieee80211_hdr hdr = (struct ieee80211_hdr )skb->data;
	95	+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
95	96	unsigned int hdrlen;
96	97	u8 *newhdr;
97	98
@@ -104,6 +105,13 @@ static u8 ieee80211_wep_add_iv(struct ieee80211_local local, · 6 unmodified lines
104	105	hdrlen = ieee80211_hdrlen(hdr->frame_control);
105	106	newhdr = skb_push(skb, WEP_IV_LEN);
106	107	memmove(newhdr, newhdr + WEP_IV_LEN, hdrlen);
	108	+
	109	+ /* the HW only needs room for the IV, but not the actual IV */
	110	+ if (info->control.hw_key &&
	111	+ (info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE))
	112	+ return newhdr + hdrlen;
	113	+
	114	+ skb_set_network_header(skb, skb_network_offset(skb) + WEP_IV_LEN);
107	115	ieee80211_wep_get_iv(local, keylen, keyidx, newhdr + hdrlen);
108	116	return newhdr + hdrlen;
109	117	}
@@ -313,14 +321,15 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx) · 203 unmodified lines
313	321	static int wep_encrypt_skb(struct ieee80211_tx_data tx, struct sk_buff skb)
314	322	{
315	323	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
	324	+ struct ieee80211_key_conf *hw_key = info->control.hw_key;
316	325
317		− if (!info->control.hw_key) {
	326	+ if (!hw_key) {
318	327	if (ieee80211_wep_encrypt(tx->local, skb, tx->key->conf.key,
319	328	tx->key->conf.keylen,
320	329	tx->key->conf.keyidx))
321	330	return -1;
322		− } else if (info->control.hw_key->flags &
323		− IEEE80211_KEY_FLAG_GENERATE_IV) {
	331	+ } else if ((hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) \|\|
	332	+ (hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)) {
324	333	if (!ieee80211_wep_add_iv(tx->local, skb,
325	334	tx->key->conf.keylen,
326	335	tx->key->conf.keyidx))

net/mac80211/wpa.c+9−1

@@ -183,7 +183,8 @@ static int tkip_encrypt_skb(struct ieee80211_tx_data tx, struct sk_buff skb) · 182 unmodified lines
183	183	u8 *pos;
184	184
185	185	if (info->control.hw_key &&
186		− !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV)) {
	186	+ !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) &&
	187	+ !(info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)) {
187	188	/* hwaccel - with no need for software-generated IV */
188	189	return 0;
189	190	}
@@ -202,8 +203,14 @@ static int tkip_encrypt_skb(struct ieee80211_tx_data tx, struct sk_buff skb) · 12 unmodified lines
202	203
203	204	pos = skb_push(skb, TKIP_IV_LEN);
204	205	memmove(pos, pos + TKIP_IV_LEN, hdrlen);
	206	+ skb_set_network_header(skb, skb_network_offset(skb) + TKIP_IV_LEN);
205	207	pos += hdrlen;
206	208
	209	+ /* the HW only needs room for the IV, but not the actual IV */
	210	+ if (info->control.hw_key &&
	211	+ (info->control.hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE))
	212	+ return 0;
	213	+
207	214	/* Increase IV for the frame */
208	215	spin_lock_irqsave(&key->u.tkip.txlock, flags);
209	216	key->u.tkip.tx.iv16++;
@@ -422,6 +429,7 @@ static int ccmp_encrypt_skb(struct ieee80211_tx_data tx, struct sk_buff skb) · 212 unmodified lines
422	429
423	430	pos = skb_push(skb, CCMP_HDR_LEN);
424	431	memmove(pos, pos + CCMP_HDR_LEN, hdrlen);
	432	+ skb_set_network_header(skb, skb_network_offset(skb) + CCMP_HDR_LEN);
425	433
426	434	/* the HW only needs room for the IV, but not the actual IV */
427	435	if (info->control.hw_key &&

net/nfc/core.c+85−27

@@ -97,7 +97,7 @@ int nfc_dev_down(struct nfc_dev *dev) · 96 unmodified lines
97	97	goto error;
98	98	}
99	99
100		− if (dev->polling \|\| dev->activated_target_idx != NFC_TARGET_IDX_NONE) {
	100	+ if (dev->polling \|\| dev->active_target) {
101	101	rc = -EBUSY;
102	102	goto error;
103	103	}
@@ -183,11 +183,27 @@ error: · 79 unmodified lines
183	183	return rc;
184	184	}
185	185
	186	+static struct nfc_target nfc_find_target(struct nfc_dev dev, u32 target_idx)
	187	+{
	188	+ int i;
	189	+
	190	+ if (dev->n_targets == 0)
	191	+ return NULL;
	192	+
	193	+ for (i = 0; i < dev->n_targets ; i++) {
	194	+ if (dev->targets[i].idx == target_idx)
	195	+ return &dev->targets[i];
	196	+ }
	197	+
	198	+ return NULL;
	199	+}
	200	+
186	201	int nfc_dep_link_up(struct nfc_dev *dev, int target_index, u8 comm_mode)
187	202	{
188	203	int rc = 0;
189	204	u8 *gb;
190	205	size_t gb_len;
	206	+ struct nfc_target *target;
191	207
192	208	pr_debug("dev_name=%s comm %d\n", dev_name(&dev->dev), comm_mode);
193	209
@@ -212,9 +228,15 @@ int nfc_dep_link_up(struct nfc_dev *dev, int target_index, u8 comm_mode) · 18 unmodified lines
212	228	goto error;
213	229	}
214	230
215		− rc = dev->ops->dep_link_up(dev, target_index, comm_mode, gb, gb_len);
	231	+ target = nfc_find_target(dev, target_index);
	232	+ if (target == NULL) {
	233	+ rc = -ENOTCONN;
	234	+ goto error;
	235	+ }
	236	+
	237	+ rc = dev->ops->dep_link_up(dev, target, comm_mode, gb, gb_len);
216	238	if (!rc)
217		− dev->activated_target_idx = target_index;
	239	+ dev->active_target = target;
218	240
219	241	error:
220	242	device_unlock(&dev->dev);
@@ -250,7 +272,7 @@ int nfc_dep_link_down(struct nfc_dev *dev) · 29 unmodified lines
250	272	rc = dev->ops->dep_link_down(dev);
251	273	if (!rc) {
252	274	dev->dep_link_up = false;
253		− dev->activated_target_idx = NFC_TARGET_IDX_NONE;
	275	+ dev->active_target = NULL;
254	276	nfc_llcp_mac_is_down(dev);
255	277	nfc_genl_dep_link_down_event(dev);
256	278	}
@@ -282,6 +304,7 @@ EXPORT_SYMBOL(nfc_dep_link_is_up); · 25 unmodified lines
282	304	int nfc_activate_target(struct nfc_dev *dev, u32 target_idx, u32 protocol)
283	305	{
284	306	int rc;
	307	+ struct nfc_target *target;
285	308
286	309	pr_debug("dev_name=%s target_idx=%u protocol=%u\n",
287	310	dev_name(&dev->dev), target_idx, protocol);
@@ -293,9 +316,20 @@ int nfc_activate_target(struct nfc_dev *dev, u32 target_idx, u32 protocol) · 5 unmodified lines
293	316	goto error;
294	317	}
295	318
296		− rc = dev->ops->activate_target(dev, target_idx, protocol);
	319	+ if (dev->active_target) {
	320	+ rc = -EBUSY;
	321	+ goto error;
	322	+ }
	323	+
	324	+ target = nfc_find_target(dev, target_idx);
	325	+ if (target == NULL) {
	326	+ rc = -ENOTCONN;
	327	+ goto error;
	328	+ }
	329	+
	330	+ rc = dev->ops->activate_target(dev, target, protocol);
297	331	if (!rc) {
298		− dev->activated_target_idx = target_idx;
	332	+ dev->active_target = target;
299	333
300	334	if (dev->ops->check_presence)
301	335	mod_timer(&dev->check_pres_timer, jiffies +
@@ -327,11 +361,21 @@ int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx) · 25 unmodified lines
327	361	goto error;
328	362	}
329	363
	364	+ if (dev->active_target == NULL) {
	365	+ rc = -ENOTCONN;
	366	+ goto error;
	367	+ }
	368	+
	369	+ if (dev->active_target->idx != target_idx) {
	370	+ rc = -ENOTCONN;
	371	+ goto error;
	372	+ }
	373	+
330	374	if (dev->ops->check_presence)
331	375	del_timer_sync(&dev->check_pres_timer);
332	376
333		− dev->ops->deactivate_target(dev, target_idx);
334		− dev->activated_target_idx = NFC_TARGET_IDX_NONE;
	377	+ dev->ops->deactivate_target(dev, dev->active_target);
	378	+ dev->active_target = NULL;
335	379
336	380	error:
337	381	device_unlock(&dev->dev);
@@ -365,13 +409,13 @@ int nfc_data_exchange(struct nfc_dev dev, u32 target_idx, struct sk_buff skb, · 27 unmodified lines
365	409	goto error;
366	410	}
367	411
368		− if (dev->activated_target_idx == NFC_TARGET_IDX_NONE) {
	412	+ if (dev->active_target == NULL) {
369	413	rc = -ENOTCONN;
370	414	kfree_skb(skb);
371	415	goto error;
372	416	}
373	417
374		− if (target_idx != dev->activated_target_idx) {
	418	+ if (dev->active_target->idx != target_idx) {
375	419	rc = -EADDRNOTAVAIL;
376	420	kfree_skb(skb);
377	421	goto error;
@@ -380,7 +424,8 @@ int nfc_data_exchange(struct nfc_dev dev, u32 target_idx, struct sk_buff skb, · 2 unmodified lines
380	424	if (dev->ops->check_presence)
381	425	del_timer_sync(&dev->check_pres_timer);
382	426
383		− rc = dev->ops->data_exchange(dev, target_idx, skb, cb, cb_context);
	427	+ rc = dev->ops->data_exchange(dev, dev->active_target, skb, cb,
	428	+ cb_context);
384	429
385	430	if (!rc && dev->ops->check_presence)
386	431	mod_timer(&dev->check_pres_timer, jiffies +
@@ -456,6 +501,9 @@ EXPORT_SYMBOL(nfc_alloc_recv_skb); · 69 unmodified lines
456	501	* The device driver must call this function when one or many nfc targets
457	502	* are found. After calling this function, the device driver must stop
458	503	* polling for targets.
	504	+ * IMPORTANT: this function must not be called from an atomic context.
	505	+ * In addition, it must also not be called from a context that would prevent
	506	+ * the NFC Core to call other nfc ops entry point concurrently.
459	507	*/
460	508	int nfc_targets_found(struct nfc_dev *dev,
461	509	struct nfc_target *targets, int n_targets)
@@ -469,7 +517,7 @@ int nfc_targets_found(struct nfc_dev *dev, · 7 unmodified lines
469	517	for (i = 0; i < n_targets; i++)
470	518	targets[i].idx = dev->target_next_idx++;
471	519
472		− spin_lock_bh(&dev->targets_lock);
	520	+ device_lock(&dev->dev);
473	521
474	522	dev->targets_generation++;
475	523
@@ -479,12 +527,12 @@ int nfc_targets_found(struct nfc_dev *dev, · 3 unmodified lines
479	527
480	528	if (!dev->targets) {
481	529	dev->n_targets = 0;
482		− spin_unlock_bh(&dev->targets_lock);
	530	+ device_unlock(&dev->dev);
483	531	return -ENOMEM;
484	532	}
485	533
486	534	dev->n_targets = n_targets;
487		− spin_unlock_bh(&dev->targets_lock);
	535	+ device_unlock(&dev->dev);
488	536
489	537	nfc_genl_targets_found(dev);
490	538
@@ -492,6 +540,18 @@ int nfc_targets_found(struct nfc_dev *dev, · 1 unmodified line
492	540	}
493	541	EXPORT_SYMBOL(nfc_targets_found);
494	542
	543	+/**
	544	+ * nfc_target_lost - inform that an activated target went out of field
	545	+ *
	546	+ * @dev: The nfc device that had the activated target in field
	547	+ * @target_idx: the nfc index of the target
	548	+ *
	549	+ * The device driver must call this function when the activated target
	550	+ * goes out of the field.
	551	+ * IMPORTANT: this function must not be called from an atomic context.
	552	+ * In addition, it must also not be called from a context that would prevent
	553	+ * the NFC Core to call other nfc ops entry point concurrently.
	554	+ */
495	555	int nfc_target_lost(struct nfc_dev *dev, u32 target_idx)
496	556	{
497	557	struct nfc_target *tg;
@@ -499,7 +559,7 @@ int nfc_target_lost(struct nfc_dev *dev, u32 target_idx) · 1 unmodified line
499	559
500	560	pr_debug("dev_name %s n_target %d\n", dev_name(&dev->dev), target_idx);
501	561
502		− spin_lock_bh(&dev->targets_lock);
	562	+ device_lock(&dev->dev);
503	563
504	564	for (i = 0; i < dev->n_targets; i++) {
505	565	tg = &dev->targets[i];
@@ -508,13 +568,13 @@ int nfc_target_lost(struct nfc_dev *dev, u32 target_idx) · 2 unmodified lines
508	568	}
509	569
510	570	if (i == dev->n_targets) {
511		− spin_unlock_bh(&dev->targets_lock);
	571	+ device_unlock(&dev->dev);
512	572	return -EINVAL;
513	573	}
514	574
515	575	dev->targets_generation++;
516	576	dev->n_targets--;
517		− dev->activated_target_idx = NFC_TARGET_IDX_NONE;
	577	+ dev->active_target = NULL;
518	578
519	579	if (dev->n_targets) {
520	580	memcpy(&dev->targets[i], &dev->targets[i + 1],
@@ -524,7 +584,7 @@ int nfc_target_lost(struct nfc_dev *dev, u32 target_idx) · 3 unmodified lines
524	584	dev->targets = NULL;
525	585	}
526	586
527		− spin_unlock_bh(&dev->targets_lock);
	587	+ device_unlock(&dev->dev);
528	588
529	589	nfc_genl_target_lost(dev, target_idx);
530	590
@@ -556,15 +616,16 @@ static void nfc_check_pres_work(struct work_struct *work) · 25 unmodified lines
556	616
557	617	device_lock(&dev->dev);
558	618
559		− if (dev->activated_target_idx != NFC_TARGET_IDX_NONE &&
560		− timer_pending(&dev->check_pres_timer) == 0) {
561		− rc = dev->ops->check_presence(dev, dev->activated_target_idx);
	619	+ if (dev->active_target && timer_pending(&dev->check_pres_timer) == 0) {
	620	+ rc = dev->ops->check_presence(dev, dev->active_target);
562	621	if (!rc) {
563	622	mod_timer(&dev->check_pres_timer, jiffies +
564	623	msecs_to_jiffies(NFC_CHECK_PRES_FREQ_MS));
565	624	} else {
566		− nfc_target_lost(dev, dev->activated_target_idx);
567		− dev->activated_target_idx = NFC_TARGET_IDX_NONE;
	625	+ u32 active_target_idx = dev->active_target->idx;
	626	+ device_unlock(&dev->dev);
	627	+ nfc_target_lost(dev, active_target_idx);
	628	+ return;
568	629	}
569	630	}
570	631
@@ -637,14 +698,12 @@ struct nfc_dev nfc_allocate_device(struct nfc_ops ops, · 66 unmodified lines
637	698	dev->tx_headroom = tx_headroom;
638	699	dev->tx_tailroom = tx_tailroom;
639	700
640		− spin_lock_init(&dev->targets_lock);
641	701	nfc_genl_data_init(&dev->genl_data);
642	702
	703	+
643	704	/* first generation must not be 0 */
644	705	dev->targets_generation = 1;
645	706
646		− dev->activated_target_idx = NFC_TARGET_IDX_NONE;
647		−
648	707	if (ops->check_presence) {
649	708	char name[32];
650	709	init_timer(&dev->check_pres_timer);
@@ -662,7 +721,6 @@ struct nfc_dev nfc_allocate_device(struct nfc_ops ops, · 11 unmodified lines
662	721	}
663	722	}
664	723
665		−
666	724	return dev;
667	725	}
668	726	EXPORT_SYMBOL(nfc_allocate_device);

net/nfc/hci/Kconfig+1−0

@@ -9,6 +9,7 @@ config NFC_HCI · 8 unmodified lines
9	9
10	10	config NFC_SHDLC
11	11	depends on NFC_HCI
	12	+ select CRC_CCITT
12	13	bool "SHDLC link layer for HCI based NFC drivers"
13	14	default n
14	15	---help---

net/nfc/hci/core.c+23−55

@@ -235,13 +235,6 @@ static int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate) · 234 unmodified lines
235	235	targets->hci_reader_gate = gate;
236	236
237	237	r = nfc_targets_found(hdev->ndev, targets, 1);
238		− if (r < 0)
239		− goto exit;
240		−
241		− kfree(hdev->targets);
242		− hdev->targets = targets;
243		− targets = NULL;
244		− hdev->target_count = 1;
245	238
246	239	exit:
247	240	kfree(targets);
@@ -258,11 +251,6 @@ void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event, · 10 unmodified lines
258	251
259	252	switch (event) {
260	253	case NFC_HCI_EVT_TARGET_DISCOVERED:
261		− if (hdev->poll_started == false) {
262		− r = -EPROTO;
263		− goto exit;
264		− }
265		−
266	254	if (skb->len < 1) { /* no status data? */
267	255	r = -EPROTO;
268	256	goto exit;
@@ -496,74 +484,42 @@ static int hci_dev_down(struct nfc_dev *nfc_dev) · 227 unmodified lines
496	484	static int hci_start_poll(struct nfc_dev *nfc_dev, u32 protocols)
497	485	{
498	486	struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
499		− int r;
500	487
501	488	if (hdev->ops->start_poll)
502		− r = hdev->ops->start_poll(hdev, protocols);
	489	+ return hdev->ops->start_poll(hdev, protocols);
503	490	else
504		− r = nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
	491	+ return nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
505	492	NFC_HCI_EVT_READER_REQUESTED, NULL, 0);
506		− if (r == 0)
507		− hdev->poll_started = true;
508		−
509		− return r;
510	493	}
511	494
512	495	static void hci_stop_poll(struct nfc_dev *nfc_dev)
513	496	{
514	497	struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
515	498
516		− if (hdev->poll_started) {
517		− nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
518		− NFC_HCI_EVT_END_OPERATION, NULL, 0);
519		− hdev->poll_started = false;
520		− }
521		−}
522		−
523		−static struct nfc_target hci_find_target(struct nfc_hci_dev hdev,
524		− u32 target_idx)
525		−{
526		− int i;
527		− if (hdev->poll_started == false \|\| hdev->targets == NULL)
528		− return NULL;
529		−
530		− for (i = 0; i < hdev->target_count; i++) {
531		− if (hdev->targets[i].idx == target_idx)
532		− return &hdev->targets[i];
533		− }
534		−
535		− return NULL;
	499	+ nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
	500	+ NFC_HCI_EVT_END_OPERATION, NULL, 0);
536	501	}
537	502
538		−static int hci_activate_target(struct nfc_dev *nfc_dev, u32 target_idx,
539		− u32 protocol)
	503	+static int hci_activate_target(struct nfc_dev *nfc_dev,
	504	+ struct nfc_target *target, u32 protocol)
540	505	{
541		− struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
542		−
543		− if (hci_find_target(hdev, target_idx) == NULL)
544		− return -ENOMEDIUM;
545		−
546	506	return 0;
547	507	}
548	508
549		−static void hci_deactivate_target(struct nfc_dev *nfc_dev, u32 target_idx)
	509	+static void hci_deactivate_target(struct nfc_dev *nfc_dev,
	510	+ struct nfc_target *target)
550	511	{
551	512	}
552	513
553		−static int hci_data_exchange(struct nfc_dev *nfc_dev, u32 target_idx,
	514	+static int hci_data_exchange(struct nfc_dev nfc_dev, struct nfc_target target,
554	515	struct sk_buff *skb, data_exchange_cb_t cb,
555	516	void *cb_context)
556	517	{
557	518	struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
558	519	int r;
559		− struct nfc_target *target;
560	520	struct sk_buff *res_skb = NULL;
561	521
562		− pr_debug("target_idx=%d\n", target_idx);
563		−
564		− target = hci_find_target(hdev, target_idx);
565		− if (target == NULL)
566		− return -ENOMEDIUM;
	522	+ pr_debug("target_idx=%d\n", target->idx);
567	523
568	524	switch (target->hci_reader_gate) {
569	525	case NFC_HCI_RF_READER_A_GATE:
@@ -605,7 +561,18 @@ static int hci_data_exchange(struct nfc_dev *nfc_dev, u32 target_idx, · 35 unmodified lines
605	561	return 0;
606	562	}
607	563
608		−struct nfc_ops hci_nfc_ops = {
	564	+static int hci_check_presence(struct nfc_dev *nfc_dev,
	565	+ struct nfc_target *target)
	566	+{
	567	+ struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
	568	+
	569	+ if (hdev->ops->check_presence)
	570	+ return hdev->ops->check_presence(hdev, target);
	571	+
	572	+ return 0;
	573	+}
	574	+
	575	+static struct nfc_ops hci_nfc_ops = {
609	576	.dev_up = hci_dev_up,
610	577	.dev_down = hci_dev_down,
611	578	.start_poll = hci_start_poll,
@@ -613,6 +580,7 @@ struct nfc_ops hci_nfc_ops = { · 1 unmodified line
613	580	.activate_target = hci_activate_target,
614	581	.deactivate_target = hci_deactivate_target,
615	582	.data_exchange = hci_data_exchange,
	583	+ .check_presence = hci_check_presence,
616	584	};
617	585
618	586	struct nfc_hci_dev nfc_hci_allocate_device(struct nfc_hci_ops ops,

net/nfc/hci/shdlc.c+12−0

@@ -816,6 +816,17 @@ static int nfc_shdlc_data_exchange(struct nfc_hci_dev *hdev, · 815 unmodified lines
816	816	return -EPERM;
817	817	}
818	818
	819	+static int nfc_shdlc_check_presence(struct nfc_hci_dev *hdev,
	820	+ struct nfc_target *target)
	821	+{
	822	+ struct nfc_shdlc *shdlc = nfc_hci_get_clientdata(hdev);
	823	+
	824	+ if (shdlc->ops->check_presence)
	825	+ return shdlc->ops->check_presence(shdlc, target);
	826	+
	827	+ return 0;
	828	+}
	829	+
819	830	static struct nfc_hci_ops shdlc_ops = {
820	831	.open = nfc_shdlc_open,
821	832	.close = nfc_shdlc_close,
@@ -825,6 +836,7 @@ static struct nfc_hci_ops shdlc_ops = { · 3 unmodified lines
825	836	.target_from_gate = nfc_shdlc_target_from_gate,
826	837	.complete_target_discovered = nfc_shdlc_complete_target_discovered,
827	838	.data_exchange = nfc_shdlc_data_exchange,
	839	+ .check_presence = nfc_shdlc_check_presence,
828	840	};
829	841
830	842	struct nfc_shdlc nfc_shdlc_allocate(struct nfc_shdlc_ops ops,

net/nfc/llcp/commands.c+2−2

@@ -488,7 +488,7 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock, · 487 unmodified lines
488	488
489	489	memcpy(skb_put(pdu, frag_len), msg_ptr, frag_len);
490	490
491		− skb_queue_head(&sock->tx_queue, pdu);
	491	+ skb_queue_tail(&sock->tx_queue, pdu);
492	492
493	493	lock_sock(sk);
494	494
@@ -502,7 +502,7 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock, · 7 unmodified lines
502	502
503	503	kfree(msg_data);
504	504
505		− return 0;
	505	+ return len;
506	506	}
507	507
508	508	int nfc_llcp_send_rr(struct nfc_llcp_sock *sock)

net/nfc/llcp/llcp.c+7−0

@@ -448,6 +448,8 @@ static struct nfc_llcp_sock nfc_llcp_sock_get(struct nfc_llcp_local local, · 447 unmodified lines
448	448	{
449	449	struct nfc_llcp_sock sock, llcp_sock, *n;
450	450
	451	+ pr_debug("ssap dsap %d %d\n", ssap, dsap);
	452	+
451	453	if (ssap == 0 && dsap == 0)
452	454	return NULL;
453	455
@@ -783,6 +785,7 @@ static void nfc_llcp_recv_disc(struct nfc_llcp_local *local, · 329 unmodified lines
783	785	static void nfc_llcp_recv_cc(struct nfc_llcp_local local, struct sk_buff skb)
784	786	{
785	787	struct nfc_llcp_sock *llcp_sock;
	788	+ struct sock *sk;
786	789	u8 dsap, ssap;
787	790
788	791	dsap = nfc_llcp_dsap(skb);
@@ -801,10 +804,14 @@ static void nfc_llcp_recv_cc(struct nfc_llcp_local local, struct sk_buff skb) · 12 unmodified lines
801	804	}
802	805
803	806	llcp_sock->dsap = ssap;
	807	+ sk = &llcp_sock->sk;
804	808
805	809	nfc_llcp_parse_tlv(local, &skb->data[LLCP_HEADER_SIZE],
806	810	skb->len - LLCP_HEADER_SIZE);
807	811
	812	+ sk->sk_state = LLCP_CONNECTED;
	813	+ sk->sk_state_change(sk);
	814	+
808	815	nfc_llcp_sock_put(llcp_sock);
809	816	}
810	817

net/nfc/llcp/sock.c+55−2

@@ -27,6 +27,42 @@ · 26 unmodified lines
27	27	#include "../nfc.h"
28	28	#include "llcp.h"
29	29
	30	+static int sock_wait_state(struct sock *sk, int state, unsigned long timeo)
	31	+{
	32	+ DECLARE_WAITQUEUE(wait, current);
	33	+ int err = 0;
	34	+
	35	+ pr_debug("sk %p", sk);
	36	+
	37	+ add_wait_queue(sk_sleep(sk), &wait);
	38	+ set_current_state(TASK_INTERRUPTIBLE);
	39	+
	40	+ while (sk->sk_state != state) {
	41	+ if (!timeo) {
	42	+ err = -EINPROGRESS;
	43	+ break;
	44	+ }
	45	+
	46	+ if (signal_pending(current)) {
	47	+ err = sock_intr_errno(timeo);
	48	+ break;
	49	+ }
	50	+
	51	+ release_sock(sk);
	52	+ timeo = schedule_timeout(timeo);
	53	+ lock_sock(sk);
	54	+ set_current_state(TASK_INTERRUPTIBLE);
	55	+
	56	+ err = sock_error(sk);
	57	+ if (err)
	58	+ break;
	59	+ }
	60	+
	61	+ __set_current_state(TASK_RUNNING);
	62	+ remove_wait_queue(sk_sleep(sk), &wait);
	63	+ return err;
	64	+}
	65	+
30	66	static struct proto llcp_sock_proto = {
31	67	.name = "NFC_LLCP",
32	68	.owner = THIS_MODULE,
@@ -304,11 +340,24 @@ static unsigned int llcp_sock_poll(struct file file, struct socket sock, · 271 unmodified lines
304	340	mask \|= POLLERR;
305	341
306	342	if (!skb_queue_empty(&sk->sk_receive_queue))
307		− mask \|= POLLIN;
	343	+ mask \|= POLLIN \| POLLRDNORM;
308	344
309	345	if (sk->sk_state == LLCP_CLOSED)
310	346	mask \|= POLLHUP;
311	347
	348	+ if (sk->sk_shutdown & RCV_SHUTDOWN)
	349	+ mask \|= POLLRDHUP \| POLLIN \| POLLRDNORM;
	350	+
	351	+ if (sk->sk_shutdown == SHUTDOWN_MASK)
	352	+ mask \|= POLLHUP;
	353	+
	354	+ if (sock_writeable(sk))
	355	+ mask \|= POLLOUT \| POLLWRNORM \| POLLWRBAND;
	356	+ else
	357	+ set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);
	358	+
	359	+ pr_debug("mask 0x%x\n", mask);
	360	+
312	361	return mask;
313	362	}
314	363
@@ -462,9 +511,13 @@ static int llcp_sock_connect(struct socket sock, struct sockaddr _addr, · 147 unmodified lines
462	511	if (ret)
463	512	goto put_dev;
464	513
465		− sk->sk_state = LLCP_CONNECTED;
	514	+ ret = sock_wait_state(sk, LLCP_CONNECTED,
	515	+ sock_sndtimeo(sk, flags & O_NONBLOCK));
	516	+ if (ret)
	517	+ goto put_dev;
466	518
467	519	release_sock(sk);
	520	+
468	521	return 0;
469	522
470	523	put_dev:

net/nfc/nci/core.c+14−13

@@ -436,16 +436,16 @@ static void nci_stop_poll(struct nfc_dev *nfc_dev) · 435 unmodified lines
436	436	msecs_to_jiffies(NCI_RF_DEACTIVATE_TIMEOUT));
437	437	}
438	438
439		−static int nci_activate_target(struct nfc_dev *nfc_dev, __u32 target_idx,
440		− __u32 protocol)
	439	+static int nci_activate_target(struct nfc_dev *nfc_dev,
	440	+ struct nfc_target *target, __u32 protocol)
441	441	{
442	442	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
443	443	struct nci_rf_discover_select_param param;
444		− struct nfc_target *target = NULL;
	444	+ struct nfc_target *nci_target = NULL;
445	445	int i;
446	446	int rc = 0;
447	447
448		− pr_debug("target_idx %d, protocol 0x%x\n", target_idx, protocol);
	448	+ pr_debug("target_idx %d, protocol 0x%x\n", target->idx, protocol);
449	449
450	450	if ((atomic_read(&ndev->state) != NCI_W4_HOST_SELECT) &&
451	451	(atomic_read(&ndev->state) != NCI_POLL_ACTIVE)) {
@@ -459,25 +459,25 @@ static int nci_activate_target(struct nfc_dev *nfc_dev, __u32 target_idx, · 7 unmodified lines
459	459	}
460	460
461	461	for (i = 0; i < ndev->n_targets; i++) {
462		− if (ndev->targets[i].idx == target_idx) {
463		− target = &ndev->targets[i];
	462	+ if (ndev->targets[i].idx == target->idx) {
	463	+ nci_target = &ndev->targets[i];
464	464	break;
465	465	}
466	466	}
467	467
468		− if (!target) {
	468	+ if (!nci_target) {
469	469	pr_err("unable to find the selected target\n");
470	470	return -EINVAL;
471	471	}
472	472
473		− if (!(target->supported_protocols & (1 << protocol))) {
	473	+ if (!(nci_target->supported_protocols & (1 << protocol))) {
474	474	pr_err("target does not support the requested protocol 0x%x\n",
475	475	protocol);
476	476	return -EINVAL;
477	477	}
478	478
479	479	if (atomic_read(&ndev->state) == NCI_W4_HOST_SELECT) {
480		− param.rf_discovery_id = target->logical_idx;
	480	+ param.rf_discovery_id = nci_target->logical_idx;
481	481
482	482	if (protocol == NFC_PROTO_JEWEL)
483	483	param.rf_protocol = NCI_RF_PROTOCOL_T1T;
@@ -501,11 +501,12 @@ static int nci_activate_target(struct nfc_dev *nfc_dev, __u32 target_idx, · 17 unmodified lines
501	501	return rc;
502	502	}
503	503
504		−static void nci_deactivate_target(struct nfc_dev *nfc_dev, __u32 target_idx)
	504	+static void nci_deactivate_target(struct nfc_dev *nfc_dev,
	505	+ struct nfc_target *target)
505	506	{
506	507	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
507	508
508		− pr_debug("target_idx %d\n", target_idx);
	509	+ pr_debug("target_idx %d\n", target->idx);
509	510
510	511	if (!ndev->target_active_prot) {
511	512	pr_err("unable to deactivate target, no active target\n");
@@ -520,14 +521,14 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev, __u32 target_idx) · 8 unmodified lines
520	521	}
521	522	}
522	523
523		−static int nci_data_exchange(struct nfc_dev *nfc_dev, __u32 target_idx,
	524	+static int nci_data_exchange(struct nfc_dev nfc_dev, struct nfc_target target,
524	525	struct sk_buff *skb,
525	526	data_exchange_cb_t cb, void *cb_context)
526	527	{
527	528	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
528	529	int rc;
529	530
530		− pr_debug("target_idx %d, len %d\n", target_idx, skb->len);
	531	+ pr_debug("target_idx %d, len %d\n", target->idx, skb->len);
531	532
532	533	if (!ndev->target_active_prot) {
533	534	pr_err("unable to exchange data, no active target\n");

net/nfc/nci/data.c+4−4

@@ -49,7 +49,7 @@ void nci_data_exchange_complete(struct nci_dev ndev, struct sk_buff skb, · 48 unmodified lines
49	49
50	50	if (cb) {
51	51	ndev->data_exchange_cb = NULL;
52		− ndev->data_exchange_cb_context = 0;
	52	+ ndev->data_exchange_cb_context = NULL;
53	53
54	54	/* forward skb to nfc core */
55	55	cb(cb_context, skb, err);
@@ -200,10 +200,10 @@ static void nci_add_rx_data_frag(struct nci_dev *ndev, · 144 unmodified lines
200	200	pr_err("error adding room for accumulated rx data\n");
201	201
202	202	kfree_skb(skb);
203		− skb = 0;
	203	+ skb = NULL;
204	204
205	205	kfree_skb(ndev->rx_data_reassembly);
206		− ndev->rx_data_reassembly = 0;
	206	+ ndev->rx_data_reassembly = NULL;
207	207
208	208	err = -ENOMEM;
209	209	goto exit;
@@ -216,7 +216,7 @@ static void nci_add_rx_data_frag(struct nci_dev *ndev, · 6 unmodified lines
216	216
217	217	/* third, free old reassembly */
218	218	kfree_skb(ndev->rx_data_reassembly);
219		− ndev->rx_data_reassembly = 0;
	219	+ ndev->rx_data_reassembly = NULL;
220	220	}
221	221
222	222	if (pbf == NCI_PBF_CONT) {

net/nfc/nci/lib.c+1−0

@@ -31,6 +31,7 @@ · 30 unmodified lines
31	31	#include <linux/errno.h>
32	32
33	33	#include <net/nfc/nci.h>
	34	+#include <net/nfc/nci_core.h>
34	35
35	36	/* NCI status codes to Unix errno mapping */
36	37	int nci_to_errno(__u8 code)

net/nfc/nci/ntf.c+1−1

@@ -497,7 +497,7 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev, · 496 unmodified lines
497	497	/* drop partial rx data packet */
498	498	if (ndev->rx_data_reassembly) {
499	499	kfree_skb(ndev->rx_data_reassembly);
500		− ndev->rx_data_reassembly = 0;
	500	+ ndev->rx_data_reassembly = NULL;
501	501	}
502	502
503	503	/* complete the data exchange transaction, if exists */

net/nfc/netlink.c+3−3

@@ -33,7 +33,7 @@ static struct genl_multicast_group nfc_genl_event_mcgrp = { · 32 unmodified lines
33	33	.name = NFC_GENL_MCAST_EVENT_NAME,
34	34	};
35	35
36		−struct genl_family nfc_genl_family = {
	36	+static struct genl_family nfc_genl_family = {
37	37	.id = GENL_ID_GENERATE,
38	38	.hdrsize = 0,
39	39	.name = NFC_GENL_NAME,
@@ -128,7 +128,7 @@ static int nfc_genl_dump_targets(struct sk_buff *skb, · 88 unmodified lines
128	128	cb->args[1] = (long) dev;
129	129	}
130	130
131		− spin_lock_bh(&dev->targets_lock);
	131	+ device_lock(&dev->dev);
132	132
133	133	cb->seq = dev->targets_generation;
134	134
@@ -141,7 +141,7 @@ static int nfc_genl_dump_targets(struct sk_buff *skb, · 6 unmodified lines
141	141	i++;
142	142	}
143	143
144		− spin_unlock_bh(&dev->targets_lock);
	144	+ device_unlock(&dev->dev);
145	145
146	146	cb->args[0] = i;
147	147

net/nfc/nfc.h+1−1

@@ -84,7 +84,7 @@ static inline int nfc_llcp_set_remote_gb(struct nfc_dev *dev, · 83 unmodified lines
84	84	return 0;
85	85	}
86	86
87		−static inline u8 nfc_llcp_general_bytes(struct nfc_dev dev, u8 *gb_len)
	87	+static inline u8 nfc_llcp_general_bytes(struct nfc_dev dev, size_t *gb_len)
88	88	{
89	89	*gb_len = 0;
90	90	return NULL;

net/wireless/chan.c+1−1

@@ -45,7 +45,7 @@ rdev_freq_to_chan(struct cfg80211_registered_device *rdev, · 44 unmodified lines
45	45	return chan;
46	46	}
47	47
48		−int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
	48	+bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
49	49	struct ieee80211_channel *chan,
50	50	enum nl80211_channel_type channel_type)
51	51	{

net/wireless/core.c+2−2

@@ -664,7 +664,7 @@ void wiphy_unregister(struct wiphy *wiphy) · 663 unmodified lines
664	664	mutex_lock(&rdev->devlist_mtx);
665	665	__count = rdev->opencount;
666	666	mutex_unlock(&rdev->devlist_mtx);
667		− __count == 0;}));
	667	+ __count == 0; }));
668	668
669	669	mutex_lock(&rdev->devlist_mtx);
670	670	BUG_ON(!list_empty(&rdev->netdev_list));
@@ -776,7 +776,7 @@ static struct device_type wiphy_type = { · 105 unmodified lines
776	776	.name = "wlan",
777	777	};
778	778
779		−static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
	779	+static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
780	780	unsigned long state,
781	781	void *ndev)
782	782	{

net/wireless/core.h+0−2

@@ -445,8 +445,6 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, · 444 unmodified lines
445	445	struct wireless_dev *wdev, int freq,
446	446	enum nl80211_channel_type channel_type);
447	447
448		−u16 cfg80211_calculate_bitrate(struct rate_info *rate);
449		−
450	448	int ieee80211_get_ratemask(struct ieee80211_supported_band *sband,
451	449	const u8 *rates, unsigned int n_rates,
452	450	u32 *mask);

net/wireless/nl80211.c+37−32

@@ -1179,6 +1179,27 @@ static bool nl80211_can_set_dev_channel(struct wireless_dev *wdev) · 1178 unmodified lines
1179	1179	wdev->iftype == NL80211_IFTYPE_P2P_GO;
1180	1180	}
1181	1181
	1182	+static bool nl80211_valid_channel_type(struct genl_info *info,
	1183	+ enum nl80211_channel_type *channel_type)
	1184	+{
	1185	+ enum nl80211_channel_type tmp;
	1186	+
	1187	+ if (!info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE])
	1188	+ return false;
	1189	+
	1190	+ tmp = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
	1191	+ if (tmp != NL80211_CHAN_NO_HT &&
	1192	+ tmp != NL80211_CHAN_HT20 &&
	1193	+ tmp != NL80211_CHAN_HT40PLUS &&
	1194	+ tmp != NL80211_CHAN_HT40MINUS)
	1195	+ return false;
	1196	+
	1197	+ if (channel_type)
	1198	+ *channel_type = tmp;
	1199	+
	1200	+ return true;
	1201	+}
	1202	+
1182	1203	static int __nl80211_set_channel(struct cfg80211_registered_device *rdev,
1183	1204	struct wireless_dev *wdev,
1184	1205	struct genl_info *info)
@@ -1193,15 +1214,9 @@ static int __nl80211_set_channel(struct cfg80211_registered_device *rdev, · 8 unmodified lines
1193	1214	if (!nl80211_can_set_dev_channel(wdev))
1194	1215	return -EOPNOTSUPP;
1195	1216
1196		− if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
1197		− channel_type = nla_get_u32(info->attrs[
1198		− NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
1199		− if (channel_type != NL80211_CHAN_NO_HT &&
1200		− channel_type != NL80211_CHAN_HT20 &&
1201		− channel_type != NL80211_CHAN_HT40PLUS &&
1202		− channel_type != NL80211_CHAN_HT40MINUS)
1203		− return -EINVAL;
1204		− }
	1217	+ if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE] &&
	1218	+ !nl80211_valid_channel_type(info, &channel_type))
	1219	+ return -EINVAL;
1205	1220
1206	1221	freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);
1207	1222
@@ -2410,10 +2425,16 @@ static int parse_station_flags(struct genl_info *info, · 1202 unmodified lines
2410	2425	return -EINVAL;
2411	2426	}
2412	2427
2413		− for (flag = 1; flag <= NL80211_STA_FLAG_MAX; flag++)
2414		− if (flags[flag])
	2428	+ for (flag = 1; flag <= NL80211_STA_FLAG_MAX; flag++) {
	2429	+ if (flags[flag]) {
2415	2430	params->sta_flags_set \|= (1<<flag);
2416	2431
	2432	+ /* no longer support new API additions in old API */
	2433	+ if (flag > NL80211_STA_FLAG_MAX_OLD_API)
	2434	+ return -EINVAL;
	2435	+ }
	2436	+ }
	2437	+
2417	2438	return 0;
2418	2439	}
2419	2440
@@ -4912,12 +4933,7 @@ static int nl80211_join_ibss(struct sk_buff skb, struct genl_info info) · 2492 unmodified lines
4912	4933	if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
4913	4934	enum nl80211_channel_type channel_type;
4914	4935
4915		− channel_type = nla_get_u32(
4916		− info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
4917		− if (channel_type != NL80211_CHAN_NO_HT &&
4918		− channel_type != NL80211_CHAN_HT20 &&
4919		− channel_type != NL80211_CHAN_HT40MINUS &&
4920		− channel_type != NL80211_CHAN_HT40PLUS)
	4936	+ if (!nl80211_valid_channel_type(info, &channel_type))
4921	4937	return -EINVAL;
4922	4938
4923	4939	if (channel_type != NL80211_CHAN_NO_HT &&
@@ -5485,15 +5501,9 @@ static int nl80211_remain_on_channel(struct sk_buff *skb, · 561 unmodified lines
5485	5501	!(rdev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL))
5486	5502	return -EOPNOTSUPP;
5487	5503
5488		− if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
5489		− channel_type = nla_get_u32(
5490		− info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
5491		− if (channel_type != NL80211_CHAN_NO_HT &&
5492		− channel_type != NL80211_CHAN_HT20 &&
5493		− channel_type != NL80211_CHAN_HT40PLUS &&
5494		− channel_type != NL80211_CHAN_HT40MINUS)
5495		− return -EINVAL;
5496		− }
	5504	+ if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE] &&
	5505	+ !nl80211_valid_channel_type(info, &channel_type))
	5506	+ return -EINVAL;
5497	5507
5498	5508	freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);
5499	5509	chan = rdev_freq_to_chan(rdev, freq, channel_type);
@@ -5764,12 +5774,7 @@ static int nl80211_tx_mgmt(struct sk_buff skb, struct genl_info info) · 264 unmodified lines
5764	5774	}
5765	5775
5766	5776	if (info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]) {
5767		− channel_type = nla_get_u32(
5768		− info->attrs[NL80211_ATTR_WIPHY_CHANNEL_TYPE]);
5769		− if (channel_type != NL80211_CHAN_NO_HT &&
5770		− channel_type != NL80211_CHAN_HT20 &&
5771		− channel_type != NL80211_CHAN_HT40PLUS &&
5772		− channel_type != NL80211_CHAN_HT40MINUS)
	5777	+ if (!nl80211_valid_channel_type(info, &channel_type))
5773	5778	return -EINVAL;
5774	5779	channel_type_valid = true;
5775	5780	}

net/wireless/util.c+1−1

@@ -879,7 +879,7 @@ u16 cfg80211_calculate_bitrate(struct rate_info *rate) · 878 unmodified lines
879	879	return rate->legacy;
880	880
881	881	/* the formula below does only work for MCS values smaller than 32 */
882		− if (rate->mcs >= 32)
	882	+ if (WARN_ON_ONCE(rate->mcs >= 32))
883	883	return 0;
884	884
885	885	modulation = rate->mcs & 7;