Enable wifi support for Wandboard Dual
v2 cover Enable wifi support for Wandboard Dual
This patchset provides fixes and wifi support for Wandboard-Dual.
Fixes ESDHC platform data in kernel board init
Replaces old wifi driver in drivers/staging with a backported driver from kernel v3.5
Adds a recipe to install wifi chip firmware (linux-firmware bbappend)
Adds a recipe (wandboard-wifi-support) to provide the nvram file for the chip and to create appropriate symlinks for the firmware files.
Adds a dependency in the wandboard-dual machine conf to integrate the wandboard-wifi-support recipe.
Changes since v1:
Removed an unneeded formatting change to the ESDHC platform data patch.
Combined the remove and add patches for the wifi device driver, as well as integrated the changes to the kernel recipe.
Separated out the machine-specific code from the linux-firmware.bbappend and removed the PRINC in linux-firmware_git.bbappend in anticipation that we will be upstreaming this into oe-core.
Created a machine-specific wifi support recipe for wandboard.
Added patch numbers to the shortlog
John Weber (5):
linux-imx (3.0.35): wandboard: fix sdhc platform data linux-imx (3.0.35): wandboard: replace brcm80211 driver
linux-firmware: Add bbappend to include Broadcom wifi drivers
wandboard-wifi-support: add nvram file and create firmware links
wandboard-dual: Add wandboard-wifi-support to machine
conf/machine/wandboard-dual.conf | 3 + .../files/LICENCE.broadcom_bcm43xx | 65 + .../files/wandboard-brcmfmac-nvram.txt | 70 + .../wandboard-wifi-support.bb | 41 + .../linux-firmware/linux-firmware_git.bbappend | 24 + ...002-wandboard-dual-fix-sdhc-platform-data.patch | 52 + ....0.35-Add-brcm80211-driver-backported-fro.patch |94038 +++++++++++++++ ...mx-3.0.35-remove-brcm80211-staging-driver.patch |123141 ++++++++++++++++++++ .../linux-imx-3.0.35/wandboard-dual/defconfig | 6 + recipes-kernel/linux/linux-imx_3.0.35.bbappend | 5 +- 10 files changed, 217444 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/wandboard-wifi-support/files/LICENCE.broadcom_bcm43xx create mode 100644 recipes-bsp/wandboard-wifi-support/files/wandboard-brcmfmac-nvram.txt create mode 100644 recipes-bsp/wandboard-wifi-support/wandboard-wifi-support.bb create mode 100644 recipes-kernel/linux-firmware/linux-firmware_git.bbappend create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-Add-brcm80211-driver-backported-fro.patch create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patch
Signature · 1 line
1.7.9.5
PATCH v2 1/5 linux-imx (3.0.35): wandboard: fix sdhc platform data
Fixes the esdhc_platform_data structure defined in board-wand.c. Before this change there were problems with loading firmware for the BCM4329 wifi module on board Wandboard-Dual. In addition, this squashes some kernel warning messages concerning the MMC bus not having WP and CD for mmc1.
--- ...002-wandboard-dual-fix-sdhc-platform-data.patch | 52 ++++++++++++++++++++ recipes-kernel/linux/linux-imx_3.0.35.bbappend | 3 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch new file +52 -0
@@ -0,0 +1,52 @@ +From ea530483ad42e5b9a89934fbdfd57df81b3a90ab Mon Sep 17 00:00:00 2001 +From: John Weber <[email protected]> +Date: Fri, 15 Mar 2013 08:43:15 -0500 +Subject: [PATCH] wandboard: fix sdhc platform data + +Fixes sdhc platfrom data structure to solve a problem when loading +the firmware files for the on-board Wifi module on Wandboard-dual. +This problem only occured when udev is tasked with loading firmware +from the filesystem. + +Upstream-Status: Pending + +Signed-off-by: John Weber <[email protected]> +--- + arch/arm/mach-mx6/board-wand.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-mx6/board-wand.c b/arch/arm/mach-mx6/board-wand.c +index 7f972eb..7be6726 100644 +--- a/arch/arm/mach-mx6/board-wand.c ++++ b/arch/arm/mach-mx6/board-wand.c +@@ -184,13 +184,17 @@ static const struct esdhc_platform_data wand_sd_data[3] = { + .cd_gpio = WAND_SD1_CD, + .wp_gpio =-EINVAL, + .keep_power_at_suspend = 1, + .support_8bit = 0, ++ .delay_line = 0, + .platform_pad_change = plt_sd_pad_change, ++ .cd_type = ESDHC_CD_CONTROLLER, + }, { +- .cd_gpio =-EINVAL, +- .wp_gpio =-EINVAL, + .keep_power_at_suspend = 1, + .platform_pad_change = plt_sd_pad_change, ++ .always_present = 1, ++ .support_8bit = 0, ++ .delay_line = 0, ++ .cd_type = ESDHC_CD_PERMANENT, + }, { + .cd_gpio = WAND_SD3_CD, + .wp_gpio = WAND_SD3_WP, +@@ -198,6 +202,7 @@ static const struct esdhc_platform_data wand_sd_data[3] = { + .support_8bit = 0, + .delay_line = 0, + .platform_pad_change = plt_sd_pad_change, ++ .cd_type = ESDHC_CD_CONTROLLER, + } + }; + +-- +1.7.9.5 +
recipes-kernel/linux/linux-imx_3.0.35.bbappend +2 -1
@@ -1,10 +1,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -PRINC := "${@int(PRINC) + 1}" +PRINC := "${@int(PRINC) + 2}" # Wandboard-specific patches SRC_URI_append_wandboard-dual = " \ file://wandboard-dual/0001-Linux-3.0.35-Add-wandboard-dual-support.patch \ + file://wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch \ " # Add support for the Congatec qmx6 board SRC_URI_append_cgtqmx6 = " file://cgtqmx6/cgtqmx6.patch"
Signature · 1 line
1.7.9.5
PATCH v2 2/5 linux-imx (3.0.35): wandboard: replace brcm80211 driver
In reply to John WeberReplaces brcm80211 driver what was in drivers/staging with a backport from kernel v3.5 which is located in drivers/net/wireless.
--- ....0.35-Add-brcm80211-driver-backported-fro.patch |94038 +++++++++++++++ ...mx-3.0.35-remove-brcm80211-staging-driver.patch |123141 ++++++++++++++++++++ .../linux-imx-3.0.35/wandboard-dual/defconfig | 6 + recipes-kernel/linux/linux-imx_3.0.35.bbappend | 4 +- 4 files changed, 217188 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-Add-brcm80211-driver-backported-fro.patch create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patch
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-Add-brcm80211-driver-backported-fro.patch new file +94038 -0
@@ -0,0 +1,94038 @@ +From 99044f426f004207f6256add552e64a509c205fd Mon Sep 17 00:00:00 2001 +From: John Weber <[email protected]> +Date: Sat, 9 Mar 2013 09:25:52 -0600 +Subject: [meta-fsl-arm-extra][PATCH 2/2] linux-imx (3.0.35): Add brcm80211 + driver backported from 3.5 + +Upstream-Status: Pending + +Signed-off-by: John Weber <[email protected]> +--- + drivers/net/wireless/Kconfig | 2 + + drivers/net/wireless/Makefile | 4 + + drivers/net/wireless/brcm80211/Kconfig | 62 + + drivers/net/wireless/brcm80211/Makefile | 23 + + drivers/net/wireless/brcm80211/brcmfmac/Makefile | 36 + + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 550 + + .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 703 + + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 669 + + drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 118 + + drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 495 + + .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 882 + + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 79 + + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 1232 + + .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 53 + + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4014 +++ + .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 622 + + .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 136 + + .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 272 + + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 1617 ++ + drivers/net/wireless/brcm80211/brcmfmac/usb.h | 61 + + drivers/net/wireless/brcm80211/brcmfmac/usb_rdl.h | 75 + + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 3881 +++ + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 366 + + drivers/net/wireless/brcm80211/brcmsmac/Makefile | 48 + + drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 841 + + drivers/net/wireless/brcm80211/brcmsmac/aiutils.h | 248 + + drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 1236 + + drivers/net/wireless/brcm80211/brcmsmac/ampdu.h | 30 + + drivers/net/wireless/brcm80211/brcmsmac/antsel.c | 307 + + drivers/net/wireless/brcm80211/brcmsmac/antsel.h | 29 + + .../brcm80211/brcmsmac/brcms_trace_events.c | 23 + + .../brcm80211/brcmsmac/brcms_trace_events.h | 92 + + drivers/net/wireless/brcm80211/brcmsmac/channel.c | 1506 + + drivers/net/wireless/brcm80211/brcmsmac/channel.h | 53 + + drivers/net/wireless/brcm80211/brcmsmac/d11.h | 1901 ++ + drivers/net/wireless/brcm80211/brcmsmac/dma.c | 1444 + + drivers/net/wireless/brcm80211/brcmsmac/dma.h | 122 + + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 1609 ++ + .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 108 + + drivers/net/wireless/brcm80211/brcmsmac/main.c | 8495 ++++++ + drivers/net/wireless/brcm80211/brcmsmac/main.h | 720 + + .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 2961 ++ + .../net/wireless/brcm80211/brcmsmac/phy/phy_hal.h | 299 + + .../net/wireless/brcm80211/brcmsmac/phy/phy_int.h | 1162 + + .../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | 5137 ++++ + .../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.h | 121 + + .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c |28685 ++++++++++++++++++++ + .../wireless/brcm80211/brcmsmac/phy/phy_qmath.c | 308 + + .../wireless/brcm80211/brcmsmac/phy/phy_qmath.h | 42 + + .../wireless/brcm80211/brcmsmac/phy/phy_radio.h | 1533 ++ + .../net/wireless/brcm80211/brcmsmac/phy/phyreg_n.h | 167 + + .../wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c | 3250 +++ + .../wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h | 54 + + .../net/wireless/brcm80211/brcmsmac/phy/phytbl_n.c |10630 ++++++++ + .../net/wireless/brcm80211/brcmsmac/phy/phytbl_n.h | 50 + + drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c | 216 + + drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h | 179 + + drivers/net/wireless/brcm80211/brcmsmac/pmu.c | 375 + + drivers/net/wireless/brcm80211/brcmsmac/pmu.h | 35 + + drivers/net/wireless/brcm80211/brcmsmac/pub.h | 372 + + drivers/net/wireless/brcm80211/brcmsmac/rate.c | 514 + + drivers/net/wireless/brcm80211/brcmsmac/rate.h | 249 + + drivers/net/wireless/brcm80211/brcmsmac/scb.h | 82 + + drivers/net/wireless/brcm80211/brcmsmac/stf.c | 438 + + drivers/net/wireless/brcm80211/brcmsmac/stf.h | 42 + + drivers/net/wireless/brcm80211/brcmsmac/types.h | 304 + + .../net/wireless/brcm80211/brcmsmac/ucode_loader.c | 109 + + .../net/wireless/brcm80211/brcmsmac/ucode_loader.h | 58 + + drivers/net/wireless/brcm80211/brcmutil/Makefile | 28 + + drivers/net/wireless/brcm80211/brcmutil/utils.c | 278 + + .../net/wireless/brcm80211/include/brcm_hw_ids.h | 41 + + .../net/wireless/brcm80211/include/brcmu_utils.h | 196 + + .../net/wireless/brcm80211/include/brcmu_wifi.h | 239 + + .../net/wireless/brcm80211/include/chipcommon.h | 286 + + drivers/net/wireless/brcm80211/include/defs.h | 103 + + drivers/net/wireless/brcm80211/include/soc.h | 98 + + 76 files changed, 93405 insertions(+) + create mode 100644 drivers/net/wireless/brcm80211/Kconfig + create mode 100644 drivers/net/wireless/brcm80211/Makefile + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/Makefile + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/usb.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/usb.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/usb_rdl.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/Makefile + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/aiutils.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/aiutils.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ampdu.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ampdu.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/antsel.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/antsel.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/channel.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/channel.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/d11.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/dma.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/dma.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/main.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/main.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phy_radio.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phyreg_n.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/pmu.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/pmu.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/pub.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/rate.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/rate.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/scb.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/stf.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/stf.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/types.h + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.c + create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h + create mode 100644 drivers/net/wireless/brcm80211/brcmutil/Makefile + create mode 100644 drivers/net/wireless/brcm80211/brcmutil/utils.c + create mode 100644 drivers/net/wireless/brcm80211/include/brcm_hw_ids.h + create mode 100644 drivers/net/wireless/brcm80211/include/brcmu_utils.h + create mode 100644 drivers/net/wireless/brcm80211/include/brcmu_wifi.h + create mode 100644 drivers/net/wireless/brcm80211/include/chipcommon.h + create mode 100644 drivers/net/wireless/brcm80211/include/defs.h + create mode 100644 drivers/net/wireless/brcm80211/include/soc.h + +diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig +index fbcf861..d7da434 100644 +--- a/drivers/net/wireless/Kconfig ++++ b/drivers/net/wireless/Kconfig +@@ -271,6 +271,7 @@ config MWL8K + source "drivers/net/wireless/ath/Kconfig" + source "drivers/net/wireless/b43/Kconfig" + source "drivers/net/wireless/b43legacy/Kconfig" ++source "drivers/net/wireless/brcm80211/Kconfig" + source "drivers/net/wireless/hostap/Kconfig" + source "drivers/net/wireless/ipw2x00/Kconfig" + source "drivers/net/wireless/iwlwifi/Kconfig" +@@ -288,4 +289,5 @@ source "drivers/net/wireless/mwifiex/Kconfig" + #source "drivers/net/wireless/ath6kl/Kconfig" + #source "drivers/net/wireless/ath6kl/Kconfig" + ++ + endif # WLAN +diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile +index 60a0a41..69a03f4 100644 +--- a/drivers/net/wireless/Makefile ++++ b/drivers/net/wireless/Makefile +@@ -59,3 +59,7 @@ obj-$(CONFIG_IWM) += iwmc3200wifi/ + + obj-$(CONFIG_MWIFIEX) += mwifiex/ + #obj-$(CONFIG_ATH6K_LEGACY) += ath6kl/ ++ ++obj-$(CONFIG_BRCMFMAC) += brcm80211/ ++obj-$(CONFIG_BRCMUMAC) += brcm80211/ ++obj-$(CONFIG_BRCMSMAC) += brcm80211/ +diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig +new file mode 100644 +index 0000000..b480088 +--- /dev/null ++++ b/drivers/net/wireless/brcm80211/Kconfig +@@ -0,0 +1,62 @@ ++config BRCMUTIL ++ tristate ++ ++config BRCMSMAC ++ tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver" ++ depends on MAC80211 ++ depends on BCMA ++ select BRCMUTIL ++ select FW_LOADER ++ select CRC_CCITT ++ select CRC8 ++ select CORDIC ++ ---help--- ++ This module adds support for PCIe wireless adapters based on Broadcom ++ IEEE802.11n SoftMAC chipsets. If you choose to build a module, it'll ++ be called brcmsmac.ko. ++ ++config BRCMFMAC ++ tristate "Broadcom IEEE802.11n embedded FullMAC WLAN driver" ++ depends on CFG80211 ++ select BRCMUTIL ++ ---help--- ++ This module adds support for embedded wireless adapters based on ++ Broadcom IEEE802.11n FullMAC chipsets. It has to work with at least ++ one of the bus interface support. If you choose to build a module, ++ it'll be called brcmfmac.ko. ++ ++config BRCMFMAC_SDIO ++ bool "SDIO bus interface support for FullMAC driver" ++ depends on MMC ++ depends on BRCMFMAC ++ select FW_LOADER ++ default y ++ ---help--- ++ This option enables the SDIO bus interface support for Broadcom ++ IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to ++ use the driver for a SDIO wireless card. ++ ++config BRCMFMAC_SDIO_OOB ++ bool "Out of band interrupt support for SDIO interface chipset" ++ depends on BRCMFMAC_SDIO ++ ---help--- ++ This option enables out-of-band interrupt support for Broadcom ++ SDIO Wifi chipset using fullmac in order to gain better ++ performance and deep sleep wake up capability on certain ++ platforms. Say N if you are unsure. ++ ++config BRCMFMAC_USB ++ bool "USB bus interface support for FullMAC driver" ++ depends on USB ++ depends on BRCMFMAC ++ select FW_LOADER ++ ---help--- ++ This option enables the USB bus interface support for Broadcom ++ IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to ++ use the driver for an USB wireless card. ++ ++config BRCMDBG ++ bool "Broadcom driver debug functions" ++ depends on BRCMSMAC || BRCMFMAC ++ ---help--- ++ Selecting this enables additional code for debug purposes. +diff --git a/drivers/net/wireless/brcm80211/Makefile b/drivers/net/wireless/brcm80211/Makefile +new file mode 100644 +index 0000000..b987920 +--- /dev/null ++++ b/drivers/net/wireless/brcm80211/Makefile +@@ -0,0 +1,23 @@ ++# ++# Makefile fragment for Broadcom 802.11n Networking Device Driver ++# ++# Copyright (c) 2010 Broadcom Corporation ++# ++# Permission to use, copy, modify, and/or distribute this software for any ++# purpose with or without fee is hereby granted, provided that the above ++# copyright notice and this permission notice appear in all copies. ++# ++# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY ++# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION ++# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ ++# common flags ++subdir-ccflags-$(CONFIG_BRCMDBG) += -DDEBUG ++ ++obj-$(CONFIG_BRCMUTIL) += brcmutil/ ++obj-$(CONFIG_BRCMFMAC) += brcmfmac/ ++obj-$(CONFIG_BRCMSMAC) += brcmsmac/ +diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile +new file mode 100644 +index 0000000..a4c4d1c +--- /dev/null ++++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile +@@ -0,0 +1,36 @@ ++# ++# Makefile fragment for Broadcom 802.11n Networking Device Driver ++# ++# Copyright (c) 2010 Broadcom Corporation ++# ++# Permission to use, copy, modify, and/or distribute this software for any ++# purpose with or without fee is hereby granted, provided that the above ++# copyright notice and this permission notice appear in all copies. ++# ++# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY ++# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION ++# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ ++ccflags-y += \ ++ -I$(obj) \ ++ -I$(obj)/../include ++ ++ccflags-y += -D__CHECK_ENDIAN__ ++ ++obj-$(CONFIG_BRCMFMAC) += brcmfmac.o ++brcmfmac-objs += \ ++ wl_cfg80211.o \ ++ dhd_cdc.o \ ++ dhd_common.o \ ++ dhd_linux.o ++brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \ ++ dhd_sdio.o \ ++ bcmsdh.o \ ++ bcmsdh_sdmmc.o \ ++ sdio_chip.o ++brcmfmac-$(CONFIG_BRCMFMAC_USB) += \ ++ usb.o +diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +new file mode 100644 +index 0000000..a87f141 +--- /dev/null ++++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +@@ -0,0 +1,550 @@ ++/* ++ * Copyright (c) 2010 Broadcom Corporation ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY ++ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION ++ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++/* ****************** SDIO CARD Interface Functions **************************/ ++ ++#undef pr_fmt ++#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt ++ ++#include <linux/types.h> ++#include <linux/netdevice.h> ++#include <linux/module.h> ++#include <linux/printk.h> ++#include <linux/pci.h> ++#include <linux/pci_ids.h> ++#include <linux/sched.h> ++#include <linux/completion.h> ++#include <linux/mmc/sdio.h> ++#include <linux/mmc/sdio_func.h> ++#include <linux/mmc/card.h> ++ ++#include <defs.h> ++#include <brcm_hw_ids.h> ++#include <brcmu_utils.h> ++#include <brcmu_wifi.h> ++#include <soc.h> ++#include "dhd_bus.h" ++#include "dhd_dbg.h" ++#include "sdio_host.h" ++ ++#define SDIOH_API_ACCESS_RETRY_LIMIT 2 ++ ++#ifdef CONFIG_BRCMFMAC_SDIO_OOB ++static irqreturn_t brcmf_sdio_irqhandler(int irq, void *dev_id) ++{ ++ struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(dev_id); ++ ++ brcmf_dbg(INTR, "oob intr triggered\n"); ++ ++ /* ++ * out-of-band interrupt is level-triggered which won't ++ * be cleared until dpc ++ */ ++ if (sdiodev->irq_en) { ++ disable_irq_nosync(irq); ++ sdiodev->irq_en = false; ++ } ++ ++ brcmf_sdbrcm_isr(sdiodev->bus); ++ ++ return IRQ_HANDLED; ++} ++ ++int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev) ++{ ++ int ret = 0; ++ u8 data; ++ unsigned long flags; ++ ++ brcmf_dbg(TRACE, "Entering\n"); ++ ++ brcmf_dbg(ERROR, "requesting irq %d\n", sdiodev->irq); ++ ret = request_irq(sdiodev->irq, brcmf_sdio_irqhandler, ++ sdiodev->irq_flags, "brcmf_oob_intr", ++ &sdiodev->func[1]->card->dev); ++ if (ret != 0) ++ return ret; ++ spin_lock_init(&sdiodev->irq_en_lock); ++ spin_lock_irqsave(&sdiodev->irq_en_lock, flags); ++ sdiodev->irq_en = true; ++ spin_unlock_irqrestore(&sdiodev->irq_en_lock, flags); ++ ++ ret = enable_irq_wake(sdiodev->irq); ++ if (ret != 0) ++ return ret; ++ sdiodev->irq_wake = true; ++ ++ /* must configure SDIO_CCCR_IENx to enable irq */ ++ data = brcmf_sdio_regrb(sdiodev, SDIO_CCCR_IENx, &ret); ++ data |= 1 << SDIO_FUNC_1 | 1 << SDIO_FUNC_2 | 1; ++ brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, data, &ret); ++ ++ /* redirect, configure and enable io for interrupt signal */ ++ data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE; ++ if (sdiodev->irq_flags & IRQF_TRIGGER_HIGH) ++ data |= SDIO_SEPINT_ACT_HI; ++ brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, data, &ret); ++ ++ return 0; ++} ++ ++int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev) ++{ ++ brcmf_dbg(TRACE, "Entering\n"); ++ ++ brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, 0, NULL); ++ brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, 0, NULL); ++ ++ if (sdiodev->irq_wake) { ++ disable_irq_wake(sdiodev->irq); ++ sdiodev->irq_wake = false; ++ } ++ free_irq(sdiodev->irq, &sdiodev->func[1]->card->dev); ++ sdiodev->irq_en = false; ++ ++ return 0; ++} ++#else /* CONFIG_BRCMFMAC_SDIO_OOB */ ++static void brcmf_sdio_irqhandler(struct sdio_func *func) ++{ ++ struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev); ++ ++ brcmf_dbg(INTR, "ib intr triggered\n"); ++ ++ sdio_release_host(sdiodev->func[1]); ++ brcmf_sdbrcm_isr(sdiodev->bus); ++ sdio_claim_host(sdiodev->func[1]); ++} ++ ++/* dummy handler for SDIO function 2 interrupt */ ++static void brcmf_sdio_dummy_irqhandler(struct sdio_func *func) ++{ ++} ++ ++int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev) ++{ ++ brcmf_dbg(TRACE, "Entering\n"); ++ ++ sdio_claim_host(sdiodev->func[1]); ++ sdio_claim_irq(sdiodev->func[1], brcmf_sdio_irqhandler); ++ sdio_claim_irq(sdiodev->func[2], brcmf_sdio_dummy_irqhandler); ++ sdio_release_host(sdiodev->func[1]); ++ ++ return 0; ++} ++ ++int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev) ++{ ++ brcmf_dbg(TRACE, "Entering\n"); ++ ++ sdio_claim_host(sdiodev->func[1]); ++ sdio_release_irq(sdiodev->func[2]); ++ sdio_release_irq(sdiodev->func[1]); ++ sdio_release_host(sdiodev->func[1]); ++ ++ return 0; ++} ++#endif /* CONFIG_BRCMFMAC_SDIO_OOB */ ++ ++int ++brcmf_sdcard_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address) ++{ ++ int err = 0, i; ++ u8 addr[3]; ++ s32 retry; ++ ++ addr[0] = (address >> 8) & SBSDIO_SBADDRLOW_MASK; ++ addr[1] = (address >> 16) & SBSDIO_SBADDRMID_MASK; ++ addr[2] = (address >> 24) & SBSDIO_SBADDRHIGH_MASK; ++ ++ for (i = 0; i < 3; i++) { ++ retry = 0; ++ do { ++ if (retry) ++ usleep_range(1000, 2000); ++ err = brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE, ++ SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW + i, ++ &addr[i]); ++ } while (err != 0 && retry++ < SDIOH_API_ACCESS_RETRY_LIMIT); ++ ++ if (err) { ++ brcmf_dbg(ERROR, "failed at addr:0x%0x\n", ++ SBSDIO_FUNC1_SBADDRLOW + i); ++ break; ++ } ++ } ++ ++ return err; ++} ++ ++static int ++brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr, ++ void *data, bool write) ++{ ++ u8 func_num, reg_size; ++ u32 bar; ++ s32 retry = 0; ++ int ret; ++ ++ /* ++ * figure out how to read the register based on address range ++ * 0x00 ~ 0x7FF: function 0 CCCR and FBR ++ * 0x10000 ~ 0x1FFFF: function 1 miscellaneous registers ++ * The rest: function 1 silicon backplane core registers ++ */ ++ if ((addr & ~REG_F0_REG_MASK) == 0) { ++ func_num = SDIO_FUNC_0; ++ reg_size = 1; ++ } else if ((addr & ~REG_F1_MISC_MASK) == 0) { ++ func_num = SDIO_FUNC_1; ++ reg_size = 1; ++ } else { ++ func_num = SDIO_FUNC_1; ++ reg_size = 4; ++ ++ /* Set the window for SB core register */ ++ bar = addr & ~SBSDIO_SB_OFT_ADDR_MASK; ++ if (bar != sdiodev->sbwad) { ++ ret = brcmf_sdcard_set_sbaddr_window(sdiodev, bar); ++ if (ret != 0) { ++ memset(data, 0xFF, reg_size); ++ return ret; ++ } ++ sdiodev->sbwad = bar; ++ } ++ addr &= SBSDIO_SB_OFT_ADDR_MASK; ++ addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; ++ } ++ ++ do { ++ if (!write) ++ memset(data, 0, reg_size); ++ if (retry) /* wait for 1 ms till bus get settled down */ ++ usleep_range(1000, 2000); ++ if (reg_size == 1) ++ ret = brcmf_sdioh_request_byte(sdiodev, write, ++ func_num, addr, data); ++ else ++ ret = brcmf_sdioh_request_word(sdiodev, write, ++ func_num, addr, data, 4); ++ } while (ret != 0 && retry++ < SDIOH_API_ACCESS_RETRY_LIMIT); ++ ++ if (ret != 0) ++ brcmf_dbg(ERROR, "failed with %d\n", ret); ++ ++ return ret; ++} ++ ++u8 brcmf_sdio_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret) ++{ ++ u8 data; ++ int retval; ++ ++ brcmf_dbg(INFO, "addr:0x%08x\n", addr); ++ retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, false); ++ brcmf_dbg(INFO, "data:0x%02x\n", data); ++ ++ if (ret) ++ *ret = retval; ++ ++ return data; ++} ++ ++u32 brcmf_sdio_regrl(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret) ++{ ++ u32 data; ++ int retval; ++ ++ brcmf_dbg(INFO, "addr:0x%08x\n", addr); ++ retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, false); ++ brcmf_dbg(INFO, "data:0x%08x\n", data); ++ ++ if (ret) ++ *ret = retval; ++ ++ return data; ++} ++ ++void brcmf_sdio_regwb(struct brcmf_sdio_dev *sdiodev, u32 addr, ++ u8 data, int *ret) ++{ ++ int retval; ++ ++ brcmf_dbg(INFO, "addr:0x%08x, data:0x%02x\n", addr, data); ++ retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, true); ++ ++ if (ret) ++ *ret = retval; ++} ++ ++void brcmf_sdio_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr, ++ u32 data, int *ret) ++{ ++ int retval; ++ ++ brcmf_dbg(INFO, "addr:0x%08x, data:0x%08x\n", addr, data); ++ retval = brcmf_sdio_regrw_helper(sdiodev, addr, &data, true); ++ ++ if (ret) ++ *ret = retval; ++} ++ ++static int brcmf_sdcard_recv_prepare(struct brcmf_sdio_dev *sdiodev, uint fn, ++ uint flags, uint width, u32 *addr) ++{ ++ uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK; ++ int err = 0; ++ ++ /* Async not implemented yet */ ++ if (flags & SDIO_REQ_ASYNC) ++ return -ENOTSUPP; ++ ++ if (bar0 != sdiodev->sbwad) { ++ err = brcmf_sdcard_set_sbaddr_window(sdiodev, bar0); ++ if (err) ++ return err; ++ ++ sdiodev->sbwad = bar0; ++ } ++ ++ *addr &= SBSDIO_SB_OFT_ADDR_MASK; ++ ++ if (width == 4) ++ *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; ++ ++ return 0; ++} ++ ++int ++brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, ++ uint flags, u8 *buf, uint nbytes) ++{ ++ struct sk_buff *mypkt; ++ int err; ++ ++ mypkt = brcmu_pkt_buf_get_skb(nbytes); ++ if (!mypkt) { ++ brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n", ++ nbytes); ++ return -EIO; ++ } ++ ++ err = brcmf_sdcard_recv_pkt(sdiodev, addr, fn, flags, mypkt); ++ if (!err) ++ memcpy(buf, mypkt->data, nbytes); ++ ++ brcmu_pkt_buf_free_skb(mypkt); ++ return err; ++} ++ ++int ++brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, ++ uint flags, struct sk_buff *pkt) ++{ ++ uint incr_fix; ++ uint width; ++ int err = 0; ++ ++ brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n", ++ fn, addr, pkt->len); ++ ++ width = (flags & SDIO_REQ_4BYTE) ? 4 : 2; ++ err = brcmf_sdcard_recv_prepare(sdiodev, fn, flags, width, &addr); ++ if (err) ++ return err; ++ ++ incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC; ++ err = brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_READ, ++ fn, addr, pkt); ++ ++ return err; ++} ++ ++int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, ++ uint flags, struct sk_buff_head *pktq) ++{ ++ uint incr_fix; ++ uint width; ++ int err = 0; ++ ++ brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n", ++ fn, addr, pktq->qlen); ++ ++ width = (flags & SDIO_REQ_4BYTE) ? 4 : 2; ++ err = brcmf_sdcard_recv_prepare(sdiodev, fn, flags, width, &addr); ++ if (err) ++ return err; ++ ++ incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC; ++ err = brcmf_sdioh_request_chain(sdiodev, incr_fix, SDIOH_READ, fn, addr, ++ pktq); ++ ++ return err; ++} ++ ++int ++brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, ++ uint flags, u8 *buf, uint nbytes) ++{ ++ struct sk_buff *mypkt; ++ int err; ++ ++ mypkt = brcmu_pkt_buf_get_skb(nbytes); ++ if (!mypkt) { ++ brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n", ++ nbytes); ++ return -EIO; ++ } ++ ++ memcpy(mypkt->data, buf, nbytes); ++ err = brcmf_sdcard_send_pkt(sdiodev, addr, fn, flags, mypkt); ++ ++ brcmu_pkt_buf_free_skb(mypkt); ++ return err; ++ ++} ++ ++int ++brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, ++ uint flags, struct sk_buff *pkt) ++{ ++ uint incr_fix; ++ uint width; ++ uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; ++ int err = 0; ++ ++ brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n", ++ fn, addr, pkt->len); ++ ++ /* Async not implemented yet */ ++ if (flags & SDIO_REQ_ASYNC) ++ return -ENOTSUPP; ++ ++ if (bar0 != sdiodev->sbwad) { ++ err = brcmf_sdcard_set_sbaddr_window(sdiodev, bar0); ++ if (err) ++ return err; ++ ++ sdiodev->sbwad = bar0; ++ } ++ ++ addr &= SBSDIO_SB_OFT_ADDR_MASK; ++ ++ incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC; ++ width = (flags & SDIO_REQ_4BYTE) ? 4 : 2; ++ if (width == 4) ++ addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; ++ ++ return brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_WRITE, fn, ++ addr, pkt); ++} ++ ++int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr, ++ u8 *buf, uint nbytes) ++{ ++ struct sk_buff *mypkt; ++ bool write = rw ? SDIOH_WRITE : SDIOH_READ; ++ int err; ++ ++ addr &= SBSDIO_SB_OFT_ADDR_MASK; ++ addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; ++ ++ mypkt = brcmu_pkt_buf_get_skb(nbytes); ++ if (!mypkt) { ++ brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n", ++ nbytes); ++ return -EIO; ++ } ++ ++ /* For a write, copy the buffer data into the packet. */ ++ if (write) ++ memcpy(mypkt->data, buf, nbytes); ++ ++ err = brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_INC, write, ++ SDIO_FUNC_1, addr, mypkt); ++ ++ /* For a read, copy the packet data back to the buffer. */ ++ if (!err && !write) ++ memcpy(buf, mypkt->data, nbytes); ++ ++ brcmu_pkt_buf_free_skb(mypkt); ++ return err; ++} ++ ++int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn) ++{ ++ char t_func = (char)fn; ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ /* issue abort cmd52 command through F0 */ ++ brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE, SDIO_FUNC_0, ++ SDIO_CCCR_ABORT, &t_func); ++ ++ brcmf_dbg(TRACE, "Exit\n"); ++ return 0; ++} ++ ++int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) ++{ ++ u32 regs = 0; ++ int ret = 0; ++ ++ ret = brcmf_sdioh_attach(sdiodev); ++ if (ret) ++ goto out; ++ ++ regs = SI_ENUM_BASE; ++ ++ /* Report the BAR, to fix if needed */ ++ sdiodev->sbwad = SI_ENUM_BASE; ++ ++ /* try to attach to the target device */ ++ sdiodev->bus = brcmf_sdbrcm_probe(regs, sdiodev); ++ if (!sdiodev->bus) { ++ brcmf_dbg(ERROR, "device attach failed\n"); ++ ret = -ENODEV; ++ goto out; ++ } ++ ++out: ++ if (ret) ++ brcmf_sdio_remove(sdiodev); ++ ++ return ret; ++} ++EXPORT_SYMBOL(brcmf_sdio_probe); ++ ++int brcmf_sdio_remove(struct brcmf_sdio_dev *sdiodev) ++{ ++ if (sdiodev->bus) { ++ brcmf_sdbrcm_disconnect(sdiodev->bus); ++ sdiodev->bus = NULL; ++ } ++ ++ brcmf_sdioh_detach(sdiodev); ++ ++ sdiodev->sbwad = 0; ++ ++ return 0; ++} ++EXPORT_SYMBOL(brcmf_sdio_remove); ++ ++void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev, bool enable) ++{ ++ if (enable) ++ brcmf_sdbrcm_wd_timer(sdiodev->bus, BRCMF_WD_POLL_MS); ++ else ++ brcmf_sdbrcm_wd_timer(sdiodev->bus, 0); ++} +diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +new file mode 100644 +index 0000000..391a721 +--- /dev/null ++++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +@@ -0,0 +1,703 @@ ++/* ++ * Copyright (c) 2010 Broadcom Corporation ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY ++ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION ++ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#undef pr_fmt ++#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt ++ ++#include <linux/version.h> ++#include <linux/types.h> ++#include <linux/netdevice.h> ++#include <linux/printk.h> ++#include <linux/mmc/sdio.h> ++#include <linux/mmc/core.h> ++#include <linux/mmc/sdio_func.h> ++#include <linux/mmc/sdio_ids.h> ++#include <linux/mmc/card.h> ++#include <linux/suspend.h> ++#include <linux/errno.h> ++#include <linux/sched.h> /* request_irq() */ ++#include <linux/module.h> ++#include <linux/platform_device.h> ++#include <net/cfg80211.h> ++ ++#include <defs.h> ++#include <brcm_hw_ids.h> ++#include <brcmu_utils.h> ++#include <brcmu_wifi.h> ++#include "sdio_host.h" ++#include "dhd_dbg.h" ++#include "dhd_bus.h" ++ ++#define SDIO_VENDOR_ID_BROADCOM 0x02d0 ++ ++#define DMA_ALIGN_MASK 0x03 ++ ++#define SDIO_DEVICE_ID_BROADCOM_4329 0x4329 ++#define SDIO_DEVICE_ID_BROADCOM_4330 0x4330 ++ ++#define SDIO_FUNC1_BLOCKSIZE 64 ++#define SDIO_FUNC2_BLOCKSIZE 512 ++ ++/* devices we support, null terminated */ ++static const struct sdio_device_id brcmf_sdmmc_ids[] = { ++ {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)}, ++ {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)}, ++ { /* end: all zeroes */ }, ++}; ++MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids); ++ ++#ifdef CONFIG_BRCMFMAC_SDIO_OOB ++static struct list_head oobirq_lh; ++struct brcmf_sdio_oobirq { ++ unsigned int irq; ++ unsigned long flags; ++ struct list_head list; ++}; ++#endif /* CONFIG_BRCMFMAC_SDIO_OOB */ ++ ++static bool ++brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev) ++{ ++ bool is_err = false; ++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) ++ is_err = atomic_read(&sdiodev->suspend); ++#endif ++ return is_err; ++} ++ ++static void ++brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev, wait_queue_head_t *wq) ++{ ++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) ++ int retry = 0; ++ while (atomic_read(&sdiodev->suspend) && retry++ != 30) ++ wait_event_timeout(*wq, false, HZ/100); ++#endif ++} ++ ++static inline int brcmf_sdioh_f0_write_byte(struct brcmf_sdio_dev *sdiodev, ++ uint regaddr, u8 *byte) ++{ ++ struct sdio_func *sdfunc = sdiodev->func[0]; ++ int err_ret; ++ ++ /* ++ * Can only directly write to some F0 registers. ++ * Handle F2 enable/disable and Abort command ++ * as a special case. ++ */ ++ if (regaddr == SDIO_CCCR_IOEx) { ++ sdfunc = sdiodev->func[2]; ++ if (sdfunc) { ++ sdio_claim_host(sdfunc); ++ if (*byte & SDIO_FUNC_ENABLE_2) { ++ /* Enable Function 2 */ ++ err_ret = sdio_enable_func(sdfunc); ++ if (err_ret) ++ brcmf_dbg(ERROR, ++ "enable F2 failed:%d\n", ++ err_ret); ++ } else { ++ /* Disable Function 2 */ ++ err_ret = sdio_disable_func(sdfunc); ++ if (err_ret) ++ brcmf_dbg(ERROR, ++ "Disable F2 failed:%d\n", ++ err_ret); ++ } ++ sdio_release_host(sdfunc); ++ } ++ } else if ((regaddr == SDIO_CCCR_ABORT) || ++ (regaddr == SDIO_CCCR_IENx)) { ++ sdfunc = kmemdup(sdiodev->func[0], sizeof(struct sdio_func), ++ GFP_KERNEL); ++ if (!sdfunc) ++ return -ENOMEM; ++ sdfunc->num = 0; ++ sdio_claim_host(sdfunc); ++ sdio_writeb(sdfunc, *byte, regaddr, &err_ret); ++ sdio_release_host(sdfunc); ++ kfree(sdfunc); ++ } else if (regaddr < 0xF0) { ++ brcmf_dbg(ERROR, "F0 Wr:0x%02x: write disallowed\n", regaddr); ++ err_ret = -EPERM; ++ } else { ++ sdio_claim_host(sdfunc); ++ sdio_f0_writeb(sdfunc, *byte, regaddr, &err_ret); ++ sdio_release_host(sdfunc); ++ } ++ ++ return err_ret; ++} ++ ++int brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func, ++ uint regaddr, u8 *byte) ++{ ++ int err_ret; ++ ++ brcmf_dbg(INFO, "rw=%d, func=%d, addr=0x%05x\n", rw, func, regaddr); ++ ++ brcmf_pm_resume_wait(sdiodev, &sdiodev->request_byte_wait); ++ if (brcmf_pm_resume_error(sdiodev)) ++ return -EIO; ++ ++ if (rw && func == 0) { ++ /* handle F0 separately */ ++ err_ret = brcmf_sdioh_f0_write_byte(sdiodev, regaddr, byte); ++ } else { ++ sdio_claim_host(sdiodev->func[func]); ++ if (rw) /* CMD52 Write */ ++ sdio_writeb(sdiodev->func[func], *byte, regaddr, ++ &err_ret); ++ else if (func == 0) { ++ *byte = sdio_f0_readb(sdiodev->func[func], regaddr, ++ &err_ret); ++ } else { ++ *byte = sdio_readb(sdiodev->func[func], regaddr, ++ &err_ret); ++ } ++ sdio_release_host(sdiodev->func[func]); ++ } ++ ++ if (err_ret) ++ brcmf_dbg(ERROR, "Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n", ++ rw ? "write" : "read", func, regaddr, *byte, err_ret); ++ ++ return err_ret; ++} ++ ++int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, ++ uint rw, uint func, uint addr, u32 *word, ++ uint nbytes) ++{ ++ int err_ret = -EIO; ++ ++ if (func == 0) { ++ brcmf_dbg(ERROR, "Only CMD52 allowed to F0\n"); ++ return -EINVAL; ++ } ++ ++ brcmf_dbg(INFO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n", ++ rw, func, addr, nbytes); ++ ++ brcmf_pm_resume_wait(sdiodev, &sdiodev->request_word_wait); ++ if (brcmf_pm_resume_error(sdiodev)) ++ return -EIO; ++ /* Claim host controller */ ++ sdio_claim_host(sdiodev->func[func]); ++ ++ if (rw) { /* CMD52 Write */ ++ if (nbytes == 4) ++ sdio_writel(sdiodev->func[func], *word, addr, ++ &err_ret); ++ else if (nbytes == 2) ++ sdio_writew(sdiodev->func[func], (*word & 0xFFFF), ++ addr, &err_ret); ++ else ++ brcmf_dbg(ERROR, "Invalid nbytes: %d\n", nbytes); ++ } else { /* CMD52 Read */ ++ if (nbytes == 4) ++ *word = sdio_readl(sdiodev->func[func], addr, &err_ret); ++ else if (nbytes == 2) ++ *word = sdio_readw(sdiodev->func[func], addr, ++ &err_ret) & 0xFFFF; ++ else ++ brcmf_dbg(ERROR, "Invalid nbytes: %d\n", nbytes); ++ } ++ ++ /* Release host controller */ ++ sdio_release_host(sdiodev->func[func]); ++ ++ if (err_ret) ++ brcmf_dbg(ERROR, "Failed to %s word, Err: 0x%08x\n", ++ rw ? "write" : "read", err_ret); ++ ++ return err_ret; ++} ++ ++/* precondition: host controller is claimed */ ++static int ++brcmf_sdioh_request_data(struct brcmf_sdio_dev *sdiodev, uint write, bool fifo, ++ uint func, uint addr, struct sk_buff *pkt, uint pktlen) ++{ ++ int err_ret = 0; ++ ++ if ((write) && (!fifo)) { ++ err_ret = sdio_memcpy_toio(sdiodev->func[func], addr, ++ ((u8 *) (pkt->data)), pktlen); ++ } else if (write) { ++ err_ret = sdio_memcpy_toio(sdiodev->func[func], addr, ++ ((u8 *) (pkt->data)), pktlen); ++ } else if (fifo) { ++ err_ret = sdio_readsb(sdiodev->func[func], ++ ((u8 *) (pkt->data)), addr, pktlen); ++ } else { ++ err_ret = sdio_memcpy_fromio(sdiodev->func[func], ++ ((u8 *) (pkt->data)), ++ addr, pktlen); ++ } ++ ++ return err_ret; ++} ++ ++/* ++ * This function takes a queue of packets. The packets on the queue ++ * are assumed to be properly aligned by the caller. ++ */ ++int ++brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc, ++ uint write, uint func, uint addr, ++ struct sk_buff_head *pktq) ++{ ++ bool fifo = (fix_inc == SDIOH_DATA_FIX); ++ u32 SGCount = 0; ++ int err_ret = 0; ++ ++ struct sk_buff *pkt; ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ brcmf_pm_resume_wait(sdiodev, &sdiodev->request_chain_wait); ++ if (brcmf_pm_resume_error(sdiodev)) ++ return -EIO; ++ ++ /* Claim host controller */ ++ sdio_claim_host(sdiodev->func[func]); ++ ++ skb_queue_walk(pktq, pkt) { ++ uint pkt_len = pkt->len; ++ pkt_len += 3; ++ pkt_len &= 0xFFFFFFFC; ++ ++ err_ret = brcmf_sdioh_request_data(sdiodev, write, fifo, func, ++ addr, pkt, pkt_len); ++ if (err_ret) { ++ brcmf_dbg(ERROR, "%s FAILED %p[%d], addr=0x%05x, pkt_len=%d, ERR=0x%08x\n", ++ write ? "TX" : "RX", pkt, SGCount, addr, ++ pkt_len, err_ret); ++ } else { ++ brcmf_dbg(TRACE, "%s xfr'd %p[%d], addr=0x%05x, len=%d\n", ++ write ? "TX" : "RX", pkt, SGCount, addr, ++ pkt_len); ++ } ++ if (!fifo) ++ addr += pkt_len; ++ ++ SGCount++; ++ } ++ ++ /* Release host controller */ ++ sdio_release_host(sdiodev->func[func]); ++ ++ brcmf_dbg(TRACE, "Exit\n"); ++ return err_ret; ++} ++ ++/* ++ * This function takes a single DMA-able packet. ++ */ ++int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, ++ uint fix_inc, uint write, uint func, uint addr, ++ struct sk_buff *pkt) ++{ ++ int status; ++ uint pkt_len; ++ bool fifo = (fix_inc == SDIOH_DATA_FIX); ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ if (pkt == NULL) ++ return -EINVAL; ++ pkt_len = pkt->len; ++ ++ brcmf_pm_resume_wait(sdiodev, &sdiodev->request_buffer_wait); ++ if (brcmf_pm_resume_error(sdiodev)) ++ return -EIO; ++ ++ /* Claim host controller */ ++ sdio_claim_host(sdiodev->func[func]); ++ ++ pkt_len += 3; ++ pkt_len &= (uint)~3; ++ ++ status = brcmf_sdioh_request_data(sdiodev, write, fifo, func, ++ addr, pkt, pkt_len); ++ if (status) { ++ brcmf_dbg(ERROR, "%s FAILED %p, addr=0x%05x, pkt_len=%d, ERR=0x%08x\n", ++ write ? "TX" : "RX", pkt, addr, pkt_len, status); ++ } else { ++ brcmf_dbg(TRACE, "%s xfr'd %p, addr=0x%05x, len=%d\n", ++ write ? "TX" : "RX", pkt, addr, pkt_len); ++ } ++ ++ /* Release host controller */ ++ sdio_release_host(sdiodev->func[func]); ++ ++ return status; ++} ++ ++static int brcmf_sdioh_get_cisaddr(struct brcmf_sdio_dev *sdiodev, u32 regaddr) ++{ ++ /* read 24 bits and return valid 17 bit addr */ ++ int i, ret; ++ u32 scratch, regdata; ++ __le32 scratch_le; ++ u8 *ptr = (u8 *)&scratch_le; ++ ++ for (i = 0; i < 3; i++) { ++ regdata = brcmf_sdio_regrl(sdiodev, regaddr, &ret); ++ if (ret != 0) ++ brcmf_dbg(ERROR, "Can't read!\n"); ++ ++ *ptr++ = (u8) regdata; ++ regaddr++; ++ } ++ ++ /* Only the lower 17-bits are valid */ ++ scratch = le32_to_cpu(scratch_le); ++ scratch &= 0x0001FFFF; ++ return scratch; ++} ++ ++static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev) ++{ ++ int err_ret; ++ u32 fbraddr; ++ u8 func; ++ ++ brcmf_dbg(TRACE, "\n"); ++ ++ /* Get the Card's common CIS address */ ++ sdiodev->func_cis_ptr[0] = brcmf_sdioh_get_cisaddr(sdiodev, ++ SDIO_CCCR_CIS); ++ brcmf_dbg(INFO, "Card's Common CIS Ptr = 0x%x\n", ++ sdiodev->func_cis_ptr[0]); ++ ++ /* Get the Card's function CIS (for each function) */ ++ for (fbraddr = SDIO_FBR_BASE(1), func = 1; ++ func <= sdiodev->num_funcs; func++, fbraddr += SDIOD_FBR_SIZE) { ++ sdiodev->func_cis_ptr[func] = ++ brcmf_sdioh_get_cisaddr(sdiodev, SDIO_FBR_CIS + fbraddr); ++ brcmf_dbg(INFO, "Function %d CIS Ptr = 0x%x\n", ++ func, sdiodev->func_cis_ptr[func]); ++ } ++ ++ /* Enable Function 1 */ ++ sdio_claim_host(sdiodev->func[1]); ++ err_ret = sdio_enable_func(sdiodev->func[1]); ++ sdio_release_host(sdiodev->func[1]); ++ if (err_ret) ++ brcmf_dbg(ERROR, "Failed to enable F1 Err: 0x%08x\n", err_ret); ++ ++ return false; ++} ++ ++/* ++ * Public entry points & extern's ++ */ ++int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev) ++{ ++ int err_ret = 0; ++ ++ brcmf_dbg(TRACE, "\n"); ++ ++ sdiodev->num_funcs = 2; ++ ++ sdio_claim_host(sdiodev->func[1]); ++ err_ret = sdio_set_block_size(sdiodev->func[1], SDIO_FUNC1_BLOCKSIZE); ++ sdio_release_host(sdiodev->func[1]); ++ if (err_ret) { ++ brcmf_dbg(ERROR, "Failed to set F1 blocksize\n"); ++ goto out; ++ } ++ ++ sdio_claim_host(sdiodev->func[2]); ++ err_ret = sdio_set_block_size(sdiodev->func[2], SDIO_FUNC2_BLOCKSIZE); ++ sdio_release_host(sdiodev->func[2]); ++ if (err_ret) { ++ brcmf_dbg(ERROR, "Failed to set F2 blocksize\n"); ++ goto out; ++ } ++ ++ brcmf_sdioh_enablefuncs(sdiodev); ++ ++out: ++ brcmf_dbg(TRACE, "Done\n"); ++ return err_ret; ++} ++ ++void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev) ++{ ++ brcmf_dbg(TRACE, "\n"); ++ ++ /* Disable Function 2 */ ++ sdio_claim_host(sdiodev->func[2]); ++ sdio_disable_func(sdiodev->func[2]); ++ sdio_release_host(sdiodev->func[2]); ++ ++ /* Disable Function 1 */ ++ sdio_claim_host(sdiodev->func[1]); ++ sdio_disable_func(sdiodev->func[1]); ++ sdio_release_host(sdiodev->func[1]); ++ ++} ++ ++#ifdef CONFIG_BRCMFMAC_SDIO_OOB ++static int brcmf_sdio_getintrcfg(struct brcmf_sdio_dev *sdiodev) ++{ ++ struct brcmf_sdio_oobirq *oobirq_entry; ++ ++ if (list_empty(&oobirq_lh)) { ++ brcmf_dbg(ERROR, "no valid oob irq resource\n"); ++ return -ENXIO; ++ } ++ ++ oobirq_entry = list_first_entry(&oobirq_lh, struct brcmf_sdio_oobirq, ++ list); ++ ++ sdiodev->irq = oobirq_entry->irq; ++ sdiodev->irq_flags = oobirq_entry->flags; ++ list_del(&oobirq_entry->list); ++ kfree(oobirq_entry); ++ ++ return 0; ++} ++#else ++static inline int brcmf_sdio_getintrcfg(struct brcmf_sdio_dev *sdiodev) ++{ ++ return 0; ++} ++#endif /* CONFIG_BRCMFMAC_SDIO_OOB */ ++ ++static int brcmf_ops_sdio_probe(struct sdio_func *func, ++ const struct sdio_device_id *id) ++{ ++ int ret = 0; ++ struct brcmf_sdio_dev *sdiodev; ++ struct brcmf_bus *bus_if; ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ brcmf_dbg(TRACE, "func->class=%x\n", func->class); ++ brcmf_dbg(TRACE, "sdio_vendor: 0x%04x\n", func->vendor); ++ brcmf_dbg(TRACE, "sdio_device: 0x%04x\n", func->device); ++ brcmf_dbg(TRACE, "Function#: 0x%04x\n", func->num); ++ ++ if (func->num == 1) { ++ if (dev_get_drvdata(&func->card->dev)) { ++ brcmf_dbg(ERROR, "card private drvdata occupied\n"); ++ return -ENXIO; ++ } ++ bus_if = kzalloc(sizeof(struct brcmf_bus), GFP_KERNEL); ++ if (!bus_if) ++ return -ENOMEM; ++ sdiodev = kzalloc(sizeof(struct brcmf_sdio_dev), GFP_KERNEL); ++ if (!sdiodev) { ++ kfree(bus_if); ++ return -ENOMEM; ++ } ++ sdiodev->func[0] = func; ++ sdiodev->func[1] = func; ++ sdiodev->bus_if = bus_if; ++ bus_if->bus_priv.sdio = sdiodev; ++ bus_if->type = SDIO_BUS; ++ bus_if->align = BRCMF_SDALIGN; ++ dev_set_drvdata(&func->card->dev, sdiodev); ++ ++ atomic_set(&sdiodev->suspend, false); ++ init_waitqueue_head(&sdiodev->request_byte_wait); ++ init_waitqueue_head(&sdiodev->request_word_wait); ++ init_waitqueue_head(&sdiodev->request_chain_wait); ++ init_waitqueue_head(&sdiodev->request_buffer_wait); ++ } ++ ++ if (func->num == 2) { ++ sdiodev = dev_get_drvdata(&func->card->dev); ++ if ((!sdiodev) || (sdiodev->func[1]->card != func->card)) ++ return -ENODEV; ++ ++ ret = brcmf_sdio_getintrcfg(sdiodev); ++ if (ret) ++ return ret; ++ sdiodev->func[2] = func; ++ ++ bus_if = sdiodev->bus_if; ++ sdiodev->dev = &func->dev; ++ dev_set_drvdata(&func->dev, bus_if); ++ ++ brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_probe...\n"); ++ ret = brcmf_sdio_probe(sdiodev); ++ } ++ ++ return ret; ++} ++ ++static void brcmf_ops_sdio_remove(struct sdio_func *func) ++{ ++ struct brcmf_bus *bus_if; ++ struct brcmf_sdio_dev *sdiodev; ++ brcmf_dbg(TRACE, "Enter\n"); ++ brcmf_dbg(INFO, "func->class=%x\n", func->class); ++ brcmf_dbg(INFO, "sdio_vendor: 0x%04x\n", func->vendor); ++ brcmf_dbg(INFO, "sdio_device: 0x%04x\n", func->device); ++ brcmf_dbg(INFO, "Function#: 0x%04x\n", func->num); ++ ++ if (func->num == 2) { ++ bus_if = dev_get_drvdata(&func->dev); ++ sdiodev = bus_if->bus_priv.sdio; ++ brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_remove...\n"); ++ brcmf_sdio_remove(sdiodev); ++ dev_set_drvdata(&func->card->dev, NULL); ++ dev_set_drvdata(&func->dev, NULL); ++ kfree(bus_if); ++ kfree(sdiodev); ++ } ++} ++ ++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) ++static int brcmf_sdio_suspend(struct device *dev) ++{ ++ mmc_pm_flag_t sdio_flags; ++ struct sdio_func *func = dev_to_sdio_func(dev); ++ struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev); ++ int ret = 0; ++ ++ brcmf_dbg(TRACE, "\n"); ++ ++ atomic_set(&sdiodev->suspend, true); ++ ++ sdio_flags = sdio_get_host_pm_caps(sdiodev->func[1]); ++ if (!(sdio_flags & MMC_PM_KEEP_POWER)) { ++ brcmf_dbg(ERROR, "Host can't keep power while suspended\n"); ++ return -EINVAL; ++ } ++ ++ ret = sdio_set_host_pm_flags(sdiodev->func[1], MMC_PM_KEEP_POWER); ++ if (ret) { ++ brcmf_dbg(ERROR, "Failed to set pm_flags\n"); ++ return ret; ++ } ++ ++ brcmf_sdio_wdtmr_enable(sdiodev, false); ++ ++ return ret; ++} ++ ++static int brcmf_sdio_resume(struct device *dev) ++{ ++ struct sdio_func *func = dev_to_sdio_func(dev); ++ struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev); ++ ++ brcmf_sdio_wdtmr_enable(sdiodev, true); ++ atomic_set(&sdiodev->suspend, false); ++ return 0; ++} ++ ++static const struct dev_pm_ops brcmf_sdio_pm_ops = { ++ .suspend = brcmf_sdio_suspend, ++ .resume = brcmf_sdio_resume, ++}; ++#endif /* CONFIG_PM_SLEEP */ ++ ++static struct sdio_driver brcmf_sdmmc_driver = { ++ .probe = brcmf_ops_sdio_probe, ++ .remove = brcmf_ops_sdio_remove, ++ .name = "brcmfmac", ++ .id_table = brcmf_sdmmc_ids, ++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) ++ .drv = { ++ .pm = &brcmf_sdio_pm_ops, ++ }, ++#endif /* CONFIG_PM_SLEEP */ ++}; ++ ++#ifdef CONFIG_BRCMFMAC_SDIO_OOB ++static int brcmf_sdio_pd_probe(struct platform_device *pdev) ++{ ++ struct resource *res; ++ struct brcmf_sdio_oobirq *oobirq_entry; ++ int i, ret; ++ ++ INIT_LIST_HEAD(&oobirq_lh); ++ ++ for (i = 0; ; i++) { ++ res = platform_get_resource(pdev, IORESOURCE_IRQ, i); ++ if (!res) ++ break; ++ ++ oobirq_entry = kzalloc(sizeof(struct brcmf_sdio_oobirq), ++ GFP_KERNEL); ++ oobirq_entry->irq = res->start; ++ oobirq_entry->flags = res->flags & IRQF_TRIGGER_MASK; ++ list_add_tail(&oobirq_entry->list, &oobirq_lh); ++ } ++ if (i == 0) ++ return -ENXIO; ++ ++ ret = sdio_register_driver(&brcmf_sdmmc_driver); ++ ++ if (ret) ++ brcmf_dbg(ERROR, "sdio_register_driver failed: %d\n", ret); ++ ++ return ret; ++} ++ ++static struct platform_driver brcmf_sdio_pd = { ++ .probe = brcmf_sdio_pd_probe, ++ .driver = { ++ .name = "brcmf_sdio_pd" ++ } ++}; ++ ++void brcmf_sdio_exit(void) ++{ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ sdio_unregister_driver(&brcmf_sdmmc_driver); ++ ++ platform_driver_unregister(&brcmf_sdio_pd); ++} ++ ++void brcmf_sdio_init(void) ++{ ++ int ret; ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ ret = platform_driver_register(&brcmf_sdio_pd); ++ ++ if (ret) ++ brcmf_dbg(ERROR, "platform_driver_register failed: %d\n", ret); ++} ++#else ++void brcmf_sdio_exit(void) ++{ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ sdio_unregister_driver(&brcmf_sdmmc_driver); ++} ++ ++void brcmf_sdio_init(void) ++{ ++ int ret; ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ ret = sdio_register_driver(&brcmf_sdmmc_driver); ++ ++ if (ret) ++ brcmf_dbg(ERROR, "sdio_register_driver failed: %d\n", ret); ++} ++#endif /* CONFIG_BRCMFMAC_SDIO_OOB */ +diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h +new file mode 100644 +index 0000000..9f63701 +--- /dev/null ++++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h +@@ -0,0 +1,669 @@ ++/* ++ * Copyright (c) 2010 Broadcom Corporation ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY ++ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION ++ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++/**************** ++ * Common types * ++ */ ++ ++#ifndef _BRCMF_H_ ++#define _BRCMF_H_ ++ ++#define BRCMF_VERSION_STR "4.218.248.5" ++ ++/******************************************************************************* ++ * IO codes that are interpreted by dongle firmware ++ ******************************************************************************/ ++#define BRCMF_C_UP 2 ++#define BRCMF_C_SET_PROMISC 10 ++#define BRCMF_C_GET_RATE 12 ++#define BRCMF_C_GET_INFRA 19 ++#define BRCMF_C_SET_INFRA 20 ++#define BRCMF_C_GET_AUTH 21 ++#define BRCMF_C_SET_AUTH 22 ++#define BRCMF_C_GET_BSSID 23 ++#define BRCMF_C_GET_SSID 25 ++#define BRCMF_C_SET_SSID 26 ++#define BRCMF_C_GET_CHANNEL 29 ++#define BRCMF_C_GET_SRL 31 ++#define BRCMF_C_GET_LRL 33 ++#define BRCMF_C_GET_RADIO 37 ++#define BRCMF_C_SET_RADIO 38 ++#define BRCMF_C_GET_PHYTYPE 39 ++#define BRCMF_C_SET_KEY 45 ++#define BRCMF_C_SET_PASSIVE_SCAN 49 ++#define BRCMF_C_SCAN 50 ++#define BRCMF_C_SCAN_RESULTS 51 ++#define BRCMF_C_DISASSOC 52 ++#define BRCMF_C_REASSOC 53 ++#define BRCMF_C_SET_ROAM_TRIGGER 55 ++#define BRCMF_C_SET_ROAM_DELTA 57 ++#define BRCMF_C_GET_DTIMPRD 77 ++#define BRCMF_C_SET_COUNTRY 84 ++#define BRCMF_C_GET_PM 85 ++#define BRCMF_C_SET_PM 86 ++#define BRCMF_C_GET_AP 117 ++#define BRCMF_C_SET_AP 118 ++#define BRCMF_C_GET_RSSI 127 ++#define BRCMF_C_GET_WSEC 133 ++#define BRCMF_C_SET_WSEC 134 ++#define BRCMF_C_GET_PHY_NOISE 135 ++#define BRCMF_C_GET_BSS_INFO 136 ++#define BRCMF_C_SET_SCAN_CHANNEL_TIME 185 ++#define BRCMF_C_SET_SCAN_UNASSOC_TIME 187 ++#define BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON 201 ++#define BRCMF_C_GET_VALID_CHANNELS 217 ++#define BRCMF_C_GET_KEY_PRIMARY 235 ++#define BRCMF_C_SET_KEY_PRIMARY 236 ++#define BRCMF_C_SET_SCAN_PASSIVE_TIME 258 ++#define BRCMF_C_GET_VAR 262 ++#define BRCMF_C_SET_VAR 263 ++ ++/* phy types (returned by WLC_GET_PHYTPE) */ ++#define WLC_PHY_TYPE_A 0 ++#define WLC_PHY_TYPE_B 1 ++#define WLC_PHY_TYPE_G 2 ++#define WLC_PHY_TYPE_N 4 ++#define WLC_PHY_TYPE_LP 5 ++#define WLC_PHY_TYPE_SSN 6 ++#define WLC_PHY_TYPE_HT 7 ++#define WLC_PHY_TYPE_LCN 8 ++#define WLC_PHY_TYPE_NULL 0xf ++ ++#define BRCMF_EVENTING_MASK_LEN 16 ++ ++#define TOE_TX_CSUM_OL 0x00000001 ++#define TOE_RX_CSUM_OL 0x00000002 ++ ++#define BRCMF_BSS_INFO_VERSION 109 /* curr ver of brcmf_bss_info_le struct */ ++ ++/* size of brcmf_scan_params not including variable length array */ ++#define BRCMF_SCAN_PARAMS_FIXED_SIZE 64 ++ ++/* masks for channel and ssid count */ ++#define BRCMF_SCAN_PARAMS_COUNT_MASK 0x0000ffff ++#define BRCMF_SCAN_PARAMS_NSSID_SHIFT 16 ++ ++#define BRCMF_SCAN_ACTION_START 1 ++#define BRCMF_SCAN_ACTION_CONTINUE 2 ++#define WL_SCAN_ACTION_ABORT 3 ++ ++#define BRCMF_ISCAN_REQ_VERSION 1 ++ ++/* brcmf_iscan_results status values */ ++#define BRCMF_SCAN_RESULTS_SUCCESS 0 ++#define BRCMF_SCAN_RESULTS_PARTIAL 1 ++#define BRCMF_SCAN_RESULTS_PENDING 2 ++#define BRCMF_SCAN_RESULTS_ABORTED 3 ++#define BRCMF_SCAN_RESULTS_NO_MEM 4 ++ ++/* Indicates this key is using soft encrypt */ ++#define WL_SOFT_KEY (1 << 0) ++/* primary (ie tx) key */ ++#define BRCMF_PRIMARY_KEY (1 << 1) ++/* Reserved for backward compat */ ++#define WL_KF_RES_4 (1 << 4) ++/* Reserved for backward compat */ ++#define WL_KF_RES_5 (1 << 5) ++/* Indicates a group key for a IBSS PEER */ ++#define WL_IBSS_PEER_GROUP_KEY (1 << 6) ++ ++/* For supporting multiple interfaces */ ++#define BRCMF_MAX_IFS 16 ++ ++#define DOT11_BSSTYPE_ANY 2 ++#define DOT11_MAX_DEFAULT_KEYS 4 ++ ++#define BRCMF_EVENT_MSG_LINK 0x01 ++#define BRCMF_EVENT_MSG_FLUSHTXQ 0x02 ++#define BRCMF_EVENT_MSG_GROUP 0x04 ++ ++struct brcmf_event_msg { ++ __be16 version; ++ __be16 flags; ++ __be32 event_type; ++ __be32 status; ++ __be32 reason; ++ __be32 auth_type; ++ __be32 datalen; ++ u8 addr[ETH_ALEN]; ++ char ifname[IFNAMSIZ]; ++} __packed; ++ ++struct brcm_ethhdr { ++ u16 subtype; ++ u16 length; ++ u8 version; ++ u8 oui[3]; ++ u16 usr_subtype; ++} __packed; ++ ++struct brcmf_event { ++ struct ethhdr eth; ++ struct brcm_ethhdr hdr; ++ struct brcmf_event_msg msg; ++} __packed; ++ ++/* event codes sent by the dongle to this driver */ ++#define BRCMF_E_SET_SSID 0 ++#define BRCMF_E_JOIN 1 ++#define BRCMF_E_START 2 ++#define BRCMF_E_AUTH 3 ++#define BRCMF_E_AUTH_IND 4 ++#define BRCMF_E_DEAUTH 5 ++#define BRCMF_E_DEAUTH_IND 6 ++#define BRCMF_E_ASSOC 7 ++#define BRCMF_E_ASSOC_IND 8 ++#define BRCMF_E_REASSOC 9 ++#define BRCMF_E_REASSOC_IND 10 ++#define BRCMF_E_DISASSOC 11 ++#define BRCMF_E_DISASSOC_IND 12 ++#define BRCMF_E_QUIET_START 13 ++#define BRCMF_E_QUIET_END 14 ++#define BRCMF_E_BEACON_RX 15 ++#define BRCMF_E_LINK 16 ++#define BRCMF_E_MIC_ERROR 17 ++#define BRCMF_E_NDIS_LINK 18 ++#define BRCMF_E_ROAM 19 ++#define BRCMF_E_TXFAIL 20 ++#define BRCMF_E_PMKID_CACHE 21 ++#define BRCMF_E_RETROGRADE_TSF 22 ++#define BRCMF_E_PRUNE 23 ++#define BRCMF_E_AUTOAUTH 24 ++#define BRCMF_E_EAPOL_MSG 25 ++#define BRCMF_E_SCAN_COMPLETE 26 ++#define BRCMF_E_ADDTS_IND 27 ++#define BRCMF_E_DELTS_IND 28 ++#define BRCMF_E_BCNSENT_IND 29 ++#define BRCMF_E_BCNRX_MSG 30 ++#define BRCMF_E_BCNLOST_MSG 31 ++#define BRCMF_E_ROAM_PREP 32 ++#define BRCMF_E_PFN_NET_FOUND 33 ++#define BRCMF_E_PFN_NET_LOST 34 ++#define BRCMF_E_RESET_COMPLETE 35 ++#define BRCMF_E_JOIN_START 36 ++#define BRCMF_E_ROAM_START 37 ++#define BRCMF_E_ASSOC_START 38 ++#define BRCMF_E_IBSS_ASSOC 39 ++#define BRCMF_E_RADIO 40 ++#define BRCMF_E_PSM_WATCHDOG 41 ++#define BRCMF_E_PROBREQ_MSG 44 ++#define BRCMF_E_SCAN_CONFIRM_IND 45 ++#define BRCMF_E_PSK_SUP 46 ++#define BRCMF_E_COUNTRY_CODE_CHANGED 47 ++#define BRCMF_E_EXCEEDED_MEDIUM_TIME 48 ++#define BRCMF_E_ICV_ERROR 49 ++#define BRCMF_E_UNICAST_DECODE_ERROR 50 ++#define BRCMF_E_MULTICAST_DECODE_ERROR 51 ++#define BRCMF_E_TRACE 52 ++#define BRCMF_E_IF 54 ++#define BRCMF_E_RSSI 56 ++#define BRCMF_E_PFN_SCAN_COMPLETE 57 ++#define BRCMF_E_EXTLOG_MSG 58 ++#define BRCMF_E_ACTION_FRAME 59 ++#define BRCMF_E_ACTION_FRAME_COMPLETE 60 ++#define BRCMF_E_PRE_ASSOC_IND 61 ++#define BRCMF_E_PRE_REASSOC_IND 62 ++#define BRCMF_E_CHANNEL_ADOPTED 63 ++#define BRCMF_E_AP_STARTED 64 ++#define BRCMF_E_DFS_AP_STOP 65 ++#define BRCMF_E_DFS_AP_RESUME 66 ++#define BRCMF_E_RESERVED1 67 ++#define BRCMF_E_RESERVED2 68 ++#define BRCMF_E_ESCAN_RESULT 69 ++#define BRCMF_E_ACTION_FRAME_OFF_CHAN_COMPLETE 70 ++#define BRCMF_E_DCS_REQUEST 73 ++ ++#define BRCMF_E_FIFO_CREDIT_MAP 74 ++ ++#define BRCMF_E_LAST 75 ++ ++#define BRCMF_E_STATUS_SUCCESS 0 ++#define BRCMF_E_STATUS_FAIL 1 ++#define BRCMF_E_STATUS_TIMEOUT 2 ++#define BRCMF_E_STATUS_NO_NETWORKS 3 ++#define BRCMF_E_STATUS_ABORT 4 ++#define BRCMF_E_STATUS_NO_ACK 5 ++#define BRCMF_E_STATUS_UNSOLICITED 6 ++#define BRCMF_E_STATUS_ATTEMPT 7 ++#define BRCMF_E_STATUS_PARTIAL 8 ++#define BRCMF_E_STATUS_NEWSCAN 9 ++#define BRCMF_E_STATUS_NEWASSOC 10 ++#define BRCMF_E_STATUS_11HQUIET 11 ++#define BRCMF_E_STATUS_SUPPRESS 12 ++#define BRCMF_E_STATUS_NOCHANS 13 ++#define BRCMF_E_STATUS_CS_ABORT 15 ++#define BRCMF_E_STATUS_ERROR 16 ++ ++#define BRCMF_E_REASON_INITIAL_ASSOC 0 ++#define BRCMF_E_REASON_LOW_RSSI 1 ++#define BRCMF_E_REASON_DEAUTH 2 ++#define BRCMF_E_REASON_DISASSOC 3 ++#define BRCMF_E_REASON_BCNS_LOST 4 ++#define BRCMF_E_REASON_MINTXRATE 9 ++#define BRCMF_E_REASON_TXFAIL 10 ++ ++#define BRCMF_E_REASON_FAST_ROAM_FAILED 5 ++#define BRCMF_E_REASON_DIRECTED_ROAM 6 ++#define BRCMF_E_REASON_TSPEC_REJECTED 7 ++#define BRCMF_E_REASON_BETTER_AP 8 ++ ++#define BRCMF_E_PRUNE_ENCR_MISMATCH 1 ++#define BRCMF_E_PRUNE_BCAST_BSSID 2 ++#define BRCMF_E_PRUNE_MAC_DENY 3 ++#define BRCMF_E_PRUNE_MAC_NA 4 ++#define BRCMF_E_PRUNE_REG_PASSV 5 ++#define BRCMF_E_PRUNE_SPCT_MGMT 6 ++#define BRCMF_E_PRUNE_RADAR 7 ++#define BRCMF_E_RSN_MISMATCH 8 ++#define BRCMF_E_PRUNE_NO_COMMON_RATES 9 ++#define BRCMF_E_PRUNE_BASIC_RATES 10 ++#define BRCMF_E_PRUNE_CIPHER_NA 12 ++#define BRCMF_E_PRUNE_KNOWN_STA 13 ++#define BRCMF_E_PRUNE_WDS_PEER 15 ++#define BRCMF_E_PRUNE_QBSS_LOAD 16 ++#define BRCMF_E_PRUNE_HOME_AP 17 ++ ++#define BRCMF_E_SUP_OTHER 0 ++#define BRCMF_E_SUP_DECRYPT_KEY_DATA 1 ++#define BRCMF_E_SUP_BAD_UCAST_WEP128 2 ++#define BRCMF_E_SUP_BAD_UCAST_WEP40 3 ++#define BRCMF_E_SUP_UNSUP_KEY_LEN 4 ++#define BRCMF_E_SUP_PW_KEY_CIPHER 5 ++#define BRCMF_E_SUP_MSG3_TOO_MANY_IE 6 ++#define BRCMF_E_SUP_MSG3_IE_MISMATCH 7 ++#define BRCMF_E_SUP_NO_INSTALL_FLAG 8 ++#define BRCMF_E_SUP_MSG3_NO_GTK 9 ++#define BRCMF_E_SUP_GRP_KEY_CIPHER 10 ++#define BRCMF_E_SUP_GRP_MSG1_NO_GTK 11 ++#define BRCMF_E_SUP_GTK_DECRYPT_FAIL 12 ++#define BRCMF_E_SUP_SEND_FAIL 13 ++#define BRCMF_E_SUP_DEAUTH 14 ++ ++#define BRCMF_E_IF_ADD 1 ++#define BRCMF_E_IF_DEL 2 ++#define BRCMF_E_IF_CHANGE 3 ++ ++#define BRCMF_E_IF_ROLE_STA 0 ++#define BRCMF_E_IF_ROLE_AP 1 ++#define BRCMF_E_IF_ROLE_WDS 2 ++ ++#define BRCMF_E_LINK_BCN_LOSS 1 ++#define BRCMF_E_LINK_DISASSOC 2 ++#define BRCMF_E_LINK_ASSOC_REC 3 ++#define BRCMF_E_LINK_BSSCFG_DIS 4 ++ ++/* Pattern matching filter. Specifies an offset within received packets to ++ * start matching, the pattern to match, the size of the pattern, and a bitmask ++ * that indicates which bits within the pattern should be matched. ++ */ ++struct brcmf_pkt_filter_pattern_le { ++ /* ++ * Offset within received packet to start pattern matching. ++ * Offset '0' is the first byte of the ethernet header. ++ */ ++ __le32 offset; ++ /* Size of the pattern. Bitmask must be the same size.*/ ++ __le32 size_bytes; ++ /* ++ * Variable length mask and pattern data. mask starts at offset 0. ++ * Pattern immediately follows mask. ++ */ ++ u8 mask_and_pattern[1]; ++}; ++ ++/* IOVAR "pkt_filter_add" parameter. Used to install packet filters. */ ++struct brcmf_pkt_filter_le { ++ __le32 id; /* Unique filter id, specified by app. */ ++ __le32 type; /* Filter type (WL_PKT_FILTER_TYPE_xxx). */ ++ __le32 negate_match; /* Negate the result of filter matches */ ++ union { /* Filter definitions */ ++ struct brcmf_pkt_filter_pattern_le pattern; /* Filter pattern */ ++ } u; ++}; ++ ++/* IOVAR "pkt_filter_enable" parameter. */ ++struct brcmf_pkt_filter_enable_le { ++ __le32 id; /* Unique filter id */ ++ __le32 enable; /* Enable/disable bool */ ++}; ++ ++/* BSS info structure ++ * Applications MUST CHECK ie_offset field and length field to access IEs and ++ * next bss_info structure in a vector (in struct brcmf_scan_results) ++ */ ++struct brcmf_bss_info_le { ++ __le32 version; /* version field */ ++ __le32 length; /* byte length of data in this record, ++ * starting at version and including IEs ++ */ ++ u8 BSSID[ETH_ALEN]; ++ __le16 beacon_period; /* units are Kusec */ ++ __le16 capability; /* Capability information */ ++ u8 SSID_len; ++ u8 SSID[32]; ++ struct { ++ __le32 count; /* # rates in this set */ ++ u8 rates[16]; /* rates in 500kbps units w/hi bit set if basic */ ++ } rateset; /* supported rates */ ++ __le16 chanspec; /* chanspec for bss */ ++ __le16 atim_window; /* units are Kusec */ ++ u8 dtim_period; /* DTIM period */ ++ __le16 RSSI; /* receive signal strength (in dBm) */ ++ s8 phy_noise; /* noise (in dBm) */ ++ ++ u8 n_cap; /* BSS is 802.11N Capable */ ++ /* 802.11N BSS Capabilities (based on HT_CAP_*): */ ++ __le32 nbss_cap; ++ u8 ctl_ch; /* 802.11N BSS control channel number */ ++ __le32 reserved32[1]; /* Reserved for expansion of BSS properties */ ++ u8 flags; /* flags */ ++ u8 reserved[3]; /* Reserved for expansion of BSS properties */ ++ u8 basic_mcs[MCSSET_LEN]; /* 802.11N BSS required MCS set */ ++ ++ __le16 ie_offset; /* offset at which IEs start, from beginning */ ++ __le32 ie_length; /* byte length of Information Elements */ ++ __le16 SNR; /* average SNR of during frame reception */ ++ /* Add new fields here */ ++ /* variable length Information Elements */ ++}; ++ ++struct brcm_rateset_le { ++ /* # rates in this set */ ++ __le32 count; ++ /* rates in 500kbps units w/hi bit set if basic */ ++ u8 rates[WL_NUMRATES]; ++}; ++ ++struct brcmf_ssid { ++ u32 SSID_len; ++ unsigned char SSID[32]; ++}; ++ ++struct brcmf_ssid_le { ++ __le32 SSID_len; ++ unsigned char SSID[32]; ++}; ++ ++struct brcmf_scan_params_le { ++ struct brcmf_ssid_le ssid_le; /* default: {0, ""} */ ++ u8 bssid[ETH_ALEN]; /* default: bcast */ ++ s8 bss_type; /* default: any, ++ * DOT11_BSSTYPE_ANY/INFRASTRUCTURE/INDEPENDENT ++ */ ++ u8 scan_type; /* flags, 0 use default */ ++ __le32 nprobes; /* -1 use default, number of probes per channel */ ++ __le32 active_time; /* -1 use default, dwell time per channel for ++ * active scanning ++ */ ++ __le32 passive_time; /* -1 use default, dwell time per channel ++ * for passive scanning ++ */ ++ __le32 home_time; /* -1 use default, dwell time for the ++ * home channel between channel scans ++ */ ++ __le32 channel_num; /* count of channels and ssids that follow ++ * ++ * low half is count of channels in ++ * channel_list, 0 means default (use all ++ * available channels) ++ * ++ * high half is entries in struct brcmf_ssid ++ * array that follows channel_list, aligned for ++ * s32 (4 bytes) meaning an odd channel count ++ * implies a 2-byte pad between end of ++ * channel_list and first ssid ++ * ++ * if ssid count is zero, single ssid in the ++ * fixed parameter portion is assumed, otherwise ++ * ssid in the fixed portion is ignored ++ */ ++ __le16 channel_list[1]; /* list of chanspecs */ ++}; ++ ++/* incremental scan struct */ ++struct brcmf_iscan_params_le { ++ __le32 version; ++ __le16 action; ++ __le16 scan_duration; ++ struct brcmf_scan_params_le params_le; ++}; ++ ++struct brcmf_scan_results { ++ u32 buflen; ++ u32 version; ++ u32 count; ++ struct brcmf_bss_info_le bss_info_le[]; ++}; ++ ++struct brcmf_scan_results_le { ++ __le32 buflen; ++ __le32 version; ++ __le32 count; ++}; ++ ++/* used for association with a specific BSSID and chanspec list */ ++struct brcmf_assoc_params_le { ++ /* 00:00:00:00:00:00: broadcast scan */ ++ u8 bssid[ETH_ALEN]; ++ /* 0: all available channels, otherwise count of chanspecs in ++ * chanspec_list */ ++ __le32 chanspec_num; ++ /* list of chanspecs */ ++ __le16 chanspec_list[1]; ++}; ++ ++/* used for join with or without a specific bssid and channel list */ ++struct brcmf_join_params { ++ struct brcmf_ssid_le ssid_le; ++ struct brcmf_assoc_params_le params_le; ++}; ++ ++/* incremental scan results struct */ ++struct brcmf_iscan_results { ++ union { ++ u32 status; ++ __le32 status_le; ++ }; ++ union { ++ struct brcmf_scan_results results; ++ struct brcmf_scan_results_le results_le; ++ }; ++}; ++ ++/* size of brcmf_iscan_results not including variable length array */ ++#define BRCMF_ISCAN_RESULTS_FIXED_SIZE \ ++ (sizeof(struct brcmf_scan_results) + \ ++ offsetof(struct brcmf_iscan_results, results)) ++ ++struct brcmf_wsec_key { ++ u32 index; /* key index */ ++ u32 len; /* key length */ ++ u8 data[WLAN_MAX_KEY_LEN]; /* key data */ ++ u32 pad_1[18]; ++ u32 algo; /* CRYPTO_ALGO_AES_CCM, CRYPTO_ALGO_WEP128, etc */ ++ u32 flags; /* misc flags */ ++ u32 pad_2[3]; ++ u32 iv_initialized; /* has IV been initialized already? */ ++ u32 pad_3; ++ /* Rx IV */ ++ struct { ++ u32 hi; /* upper 32 bits of IV */ ++ u16 lo; /* lower 16 bits of IV */ ++ } rxiv; ++ u32 pad_4[2]; ++ u8 ea[ETH_ALEN]; /* per station */ ++}; ++ ++/* ++ * dongle requires same struct as above but with fields in little endian order ++ */ ++struct brcmf_wsec_key_le { ++ __le32 index; /* key index */ ++ __le32 len; /* key length */ ++ u8 data[WLAN_MAX_KEY_LEN]; /* key data */ ++ __le32 pad_1[18]; ++ __le32 algo; /* CRYPTO_ALGO_AES_CCM, CRYPTO_ALGO_WEP128, etc */ ++ __le32 flags; /* misc flags */ ++ __le32 pad_2[3]; ++ __le32 iv_initialized; /* has IV been initialized already? */ ++ __le32 pad_3; ++ /* Rx IV */ ++ struct { ++ __le32 hi; /* upper 32 bits of IV */ ++ __le16 lo; /* lower 16 bits of IV */ ++ } rxiv; ++ __le32 pad_4[2]; ++ u8 ea[ETH_ALEN]; /* per station */ ++}; ++ ++/* Used to get specific STA parameters */ ++struct brcmf_scb_val_le { ++ __le32 val; ++ u8 ea[ETH_ALEN]; ++}; ++ ++/* channel encoding */ ++struct brcmf_channel_info_le { ++ __le32 hw_channel; ++ __le32 target_channel; ++ __le32 scan_channel; ++}; ++ ++/* Bus independent dongle command */ ++struct brcmf_dcmd { ++ uint cmd; /* common dongle cmd definition */ ++ void *buf; /* pointer to user buffer */ ++ uint len; /* length of user buffer */ ++ u8 set; /* get or set request (optional) */ ++ uint used; /* bytes read or written (optional) */ ++ uint needed; /* bytes needed (optional) */ ++}; ++ ++/* Forward decls for struct brcmf_pub (see below) */ ++struct brcmf_proto; /* device communication protocol info */ ++struct brcmf_cfg80211_dev; /* cfg80211 device info */ ++ ++/* Common structure for module and instance linkage */ ++struct brcmf_pub { ++ /* Linkage ponters */ ++ struct brcmf_bus *bus_if; ++ struct brcmf_proto *prot; ++ struct brcmf_cfg80211_dev *config; ++ struct device *dev; /* fullmac dongle device pointer */ ++ ++ /* Internal brcmf items */ ++ uint hdrlen; /* Total BRCMF header length (proto + bus) */ ++ uint rxsz; /* Rx buffer size bus module should use */ ++ u8 wme_dp; /* wme discard priority */ ++ ++ /* Dongle media info */ ++ bool iswl; /* Dongle-resident driver is wl */ ++ unsigned long drv_version; /* Version of dongle-resident driver */ ++ u8 mac[ETH_ALEN]; /* MAC address obtained from dongle */ ++ ++ /* Additional stats for the bus level */ ++ ++ /* Multicast data packets sent to dongle */ ++ unsigned long tx_multicast; ++ /* Packets flushed due to unscheduled sendup thread */ ++ unsigned long rx_flushed; ++ /* Number of times dpc scheduled by watchdog timer */ ++ unsigned long wd_dpc_sched; ++ ++ /* Number of flow control pkts recvd */ ++ unsigned long fc_packets; ++ ++ /* Last error return */ ++ int bcmerror; ++ ++ /* Last error from dongle */ ++ int dongle_error; ++ ++ /* Suspend disable flag flag */ ++ int suspend_disable_flag; /* "1" to disable all extra powersaving ++ during suspend */ ++ int in_suspend; /* flag set to 1 when early suspend called */ ++ int dtim_skip; /* dtim skip , default 0 means wake each dtim */ ++ ++ /* Pkt filter defination */ ++ char *pktfilter[100]; ++ int pktfilter_count; ++ ++ u8 country_code[BRCM_CNTRY_BUF_SZ]; ++ char eventmask[BRCMF_EVENTING_MASK_LEN]; ++ ++ struct brcmf_if *iflist[BRCMF_MAX_IFS]; ++ ++ struct mutex proto_block; ++ ++ struct work_struct setmacaddr_work; ++ struct work_struct multicast_work; ++ u8 macvalue[ETH_ALEN]; ++ atomic_t pend_8021x_cnt; ++}; ++ ++struct brcmf_if_event { ++ u8 ifidx; ++ u8 action; ++ u8 flags; ++ u8 bssidx; ++}; ++ ++struct bcmevent_name { ++ uint event; ++ const char *name; ++}; ++ ++extern const struct bcmevent_name bcmevent_names[]; ++ ++extern uint brcmf_c_mkiovar(char *name, char *data, uint datalen, ++ char *buf, uint len); ++ ++extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev); ++ ++extern s32 brcmf_exec_dcmd(struct net_device *dev, u32 cmd, void *arg, u32 len); ++ ++/* Return pointer to interface name */ ++extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx); ++ ++/* Query dongle */ ++extern int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, ++ uint cmd, void *buf, uint len); ++ ++#ifdef DEBUG ++extern int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size); ++#endif /* DEBUG */ ++ ++extern int brcmf_ifname2idx(struct brcmf_pub *drvr, char *name); ++extern int brcmf_c_host_event(struct brcmf_pub *drvr, int *idx, ++ void *pktdata, struct brcmf_event_msg *, ++ void **data_ptr); ++ ++extern void brcmf_del_if(struct brcmf_pub *drvr, int ifidx); ++ ++/* Send packet to dongle via data channel */ ++extern int brcmf_sendpkt(struct brcmf_pub *drvr, int ifidx,\ ++ struct sk_buff *pkt); ++ ++extern void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg); ++extern void brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, ++ int enable, int master_mode); ++ ++#define BRCMF_DCMD_SMLEN 256 /* "small" cmd buffer required */ ++#define BRCMF_DCMD_MEDLEN 1536 /* "med" cmd buffer required */ ++#define BRCMF_DCMD_MAXLEN 8192 /* max length cmd buffer required */ ++ ++#endif /* _BRCMF_H_ */ +diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +new file mode 100644 +index 0000000..3669164 +--- /dev/null ++++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +@@ -0,0 +1,118 @@ ++/* ++ * Copyright (c) 2010 Broadcom Corporation ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY ++ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION ++ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifndef _BRCMF_BUS_H_ ++#define _BRCMF_BUS_H_ ++ ++/* The level of bus communication with the dongle */ ++enum brcmf_bus_state { ++ BRCMF_BUS_DOWN, /* Not ready for frame transfers */ ++ BRCMF_BUS_LOAD, /* Download access only (CPU reset) */ ++ BRCMF_BUS_DATA /* Ready for frame transfers */ ++}; ++ ++struct dngl_stats { ++ unsigned long rx_packets; /* total packets received */ ++ unsigned long tx_packets; /* total packets transmitted */ ++ unsigned long rx_bytes; /* total bytes received */ ++ unsigned long tx_bytes; /* total bytes transmitted */ ++ unsigned long rx_errors; /* bad packets received */ ++ unsigned long tx_errors; /* packet transmit problems */ ++ unsigned long rx_dropped; /* packets dropped by dongle */ ++ unsigned long tx_dropped; /* packets dropped by dongle */ ++ unsigned long multicast; /* multicast packets received */ ++}; ++ ++/* interface structure between common and bus layer */ ++struct brcmf_bus { ++ u8 type; /* bus type */ ++ union { ++ struct brcmf_sdio_dev *sdio; ++ struct brcmf_usbdev *usb; ++ } bus_priv; ++ struct brcmf_pub *drvr; /* pointer to driver pub structure brcmf_pub */ ++ enum brcmf_bus_state state; ++ uint maxctl; /* Max size rxctl request from proto to bus */ ++ bool drvr_up; /* Status flag of driver up/down */ ++ unsigned long tx_realloc; /* Tx packets realloced for headroom */ ++ struct dngl_stats dstats; /* Stats for dongle-based data */ ++ u8 align; /* bus alignment requirement */ ++ ++ /* interface functions pointers */ ++ /* Stop bus module: clear pending frames, disable data flow */ ++ void (*brcmf_bus_stop)(struct device *); ++ /* Initialize bus module: prepare for communication w/dongle */ ++ int (*brcmf_bus_init)(struct device *); ++ /* Send a data frame to the dongle. Callee disposes of txp. */ ++ int (*brcmf_bus_txdata)(struct device *, struct sk_buff *); ++ /* Send/receive a control message to/from the dongle. ++ * Expects caller to enforce a single outstanding transaction. ++ */ ++ int (*brcmf_bus_txctl)(struct device *, unsigned char *, uint); ++ int (*brcmf_bus_rxctl)(struct device *, unsigned char *, uint); ++}; ++ ++/* ++ * interface functions from common layer ++ */ ++ ++/* Remove any protocol-specific data header. */ ++extern int brcmf_proto_hdrpull(struct device *dev, int *ifidx, ++ struct sk_buff *rxp); ++ ++extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, ++ struct sk_buff *pkt, int prec); ++ ++/* Receive frame for delivery to OS. Callee disposes of rxp. */ ++extern void brcmf_rx_frame(struct device *dev, int ifidx, ++ struct sk_buff_head *rxlist); ++static inline void brcmf_rx_packet(struct device *dev, int ifidx, ++ struct sk_buff *pkt) ++{ ++ struct sk_buff_head q; ++ ++ skb_queue_head_init(&q); ++ skb_queue_tail(&q, pkt); ++ brcmf_rx_frame(dev, ifidx, &q); ++} ++ ++/* Indication from bus module regarding presence/insertion of dongle. */ ++extern int brcmf_attach(uint bus_hdrlen, struct device *dev); ++/* Indication from bus module regarding removal/absence of dongle */ ++extern void brcmf_detach(struct device *dev); ++ ++/* Indication from bus module to change flow-control state */ ++extern void brcmf_txflowcontrol(struct device *dev, int ifidx, bool on); ++ ++/* Notify tx completion */ ++extern void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, ++ bool success); ++ ++extern int brcmf_bus_start(struct device *dev); ++ ++extern int brcmf_add_if(struct device *dev, int ifidx, ++ char *name, u8 *mac_addr); ++ ++#ifdef CONFIG_BRCMFMAC_SDIO ++extern void brcmf_sdio_exit(void); ++extern void brcmf_sdio_init(void); ++#endif ++#ifdef CONFIG_BRCMFMAC_USB ++extern void brcmf_usb_exit(void); ++extern void brcmf_usb_init(void); ++#endif ++ ++#endif /* _BRCMF_BUS_H_ */ +diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c +new file mode 100644 +index 0000000..ca28295 +--- /dev/null ++++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c +@@ -0,0 +1,495 @@ ++/* ++ * Copyright (c) 2010 Broadcom Corporation ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY ++ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION ++ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++/******************************************************************************* ++ * Communicates with the dongle by using dcmd codes. ++ * For certain dcmd codes, the dongle interprets string data from the host. ++ ******************************************************************************/ ++ ++#undef pr_fmt ++#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt ++ ++#include <linux/types.h> ++#include <linux/netdevice.h> ++#include <linux/printk.h> ++#include <linux/sched.h> ++#include <defs.h> ++ ++#include <brcmu_utils.h> ++#include <brcmu_wifi.h> ++ ++#include "dhd.h" ++#include "dhd_proto.h" ++#include "dhd_bus.h" ++#include "dhd_dbg.h" ++ ++struct brcmf_proto_cdc_dcmd { ++ __le32 cmd; /* dongle command value */ ++ __le32 len; /* lower 16: output buflen; ++ * upper 16: input buflen (excludes header) */ ++ __le32 flags; /* flag defns given below */ ++ __le32 status; /* status code returned from the device */ ++}; ++ ++/* Max valid buffer size that can be sent to the dongle */ ++#define CDC_MAX_MSG_SIZE (ETH_FRAME_LEN+ETH_FCS_LEN) ++ ++/* CDC flag definitions */ ++#define CDC_DCMD_ERROR 0x01 /* 1=cmd failed */ ++#define CDC_DCMD_SET 0x02 /* 0=get, 1=set cmd */ ++#define CDC_DCMD_IF_MASK 0xF000 /* I/F index */ ++#define CDC_DCMD_IF_SHIFT 12 ++#define CDC_DCMD_ID_MASK 0xFFFF0000 /* id an cmd pairing */ ++#define CDC_DCMD_ID_SHIFT 16 /* ID Mask shift bits */ ++#define CDC_DCMD_ID(flags) \ ++ (((flags) & CDC_DCMD_ID_MASK) >> CDC_DCMD_ID_SHIFT) ++ ++/* ++ * BDC header - Broadcom specific extension of CDC. ++ * Used on data packets to convey priority across USB. ++ */ ++#define BDC_HEADER_LEN 4 ++#define BDC_PROTO_VER 2 /* Protocol version */ ++#define BDC_FLAG_VER_MASK 0xf0 /* Protocol version mask */ ++#define BDC_FLAG_VER_SHIFT 4 /* Protocol version shift */ ++#define BDC_FLAG_SUM_GOOD 0x04 /* Good RX checksums */ ++#define BDC_FLAG_SUM_NEEDED 0x08 /* Dongle needs to do TX checksums */ ++#define BDC_PRIORITY_MASK 0x7 ++#define BDC_FLAG2_IF_MASK 0x0f /* packet rx interface in APSTA */ ++#define BDC_FLAG2_IF_SHIFT 0 ++ ++#define BDC_GET_IF_IDX(hdr) \ ++ ((int)((((hdr)->flags2) & BDC_FLAG2_IF_MASK) >> BDC_FLAG2_IF_SHIFT)) ++#define BDC_SET_IF_IDX(hdr, idx) \ ++ ((hdr)->flags2 = (((hdr)->flags2 & ~BDC_FLAG2_IF_MASK) | \ ++ ((idx) << BDC_FLAG2_IF_SHIFT))) ++ ++struct brcmf_proto_bdc_header { ++ u8 flags; ++ u8 priority; /* 802.1d Priority, 4:7 flow control info for usb */ ++ u8 flags2; ++ u8 data_offset; ++}; ++ ++ ++#define RETRIES 2 /* # of retries to retrieve matching dcmd response */ ++#define BUS_HEADER_LEN (16+64) /* Must be atleast SDPCM_RESERVE ++ * (amount of header tha might be added) ++ * plus any space that might be needed ++ * for bus alignment padding. ++ */ ++#define ROUND_UP_MARGIN 2048 /* Biggest bus block size possible for ++ * round off at the end of buffer ++ * Currently is SDIO ++ */ ++ ++struct brcmf_proto { ++ u16 reqid; ++ u8 pending; ++ u32 lastcmd; ++ u8 bus_header[BUS_HEADER_LEN]; ++ struct brcmf_proto_cdc_dcmd msg; ++ unsigned char buf[BRCMF_DCMD_MAXLEN + ROUND_UP_MARGIN]; ++}; ++ ++static int brcmf_proto_cdc_msg(struct brcmf_pub *drvr) ++{ ++ struct brcmf_proto *prot = drvr->prot; ++ int len = le32_to_cpu(prot->msg.len) + ++ sizeof(struct brcmf_proto_cdc_dcmd); ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ /* NOTE : cdc->msg.len holds the desired length of the buffer to be ++ * returned. Only up to CDC_MAX_MSG_SIZE of this buffer area ++ * is actually sent to the dongle ++ */ ++ if (len > CDC_MAX_MSG_SIZE) ++ len = CDC_MAX_MSG_SIZE; ++ ++ /* Send request */ ++ return drvr->bus_if->brcmf_bus_txctl(drvr->dev, ++ (unsigned char *)&prot->msg, ++ len); ++} ++ ++static int brcmf_proto_cdc_cmplt(struct brcmf_pub *drvr, u32 id, u32 len) ++{ ++ int ret; ++ struct brcmf_proto *prot = drvr->prot; ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ do { ++ ret = drvr->bus_if->brcmf_bus_rxctl(drvr->dev, ++ (unsigned char *)&prot->msg, ++ len + sizeof(struct brcmf_proto_cdc_dcmd)); ++ if (ret < 0) ++ break; ++ } while (CDC_DCMD_ID(le32_to_cpu(prot->msg.flags)) != id); ++ ++ return ret; ++} ++ ++int ++brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, ++ void *buf, uint len) ++{ ++ struct brcmf_proto *prot = drvr->prot; ++ struct brcmf_proto_cdc_dcmd *msg = &prot->msg; ++ void *info; ++ int ret = 0, retries = 0; ++ u32 id, flags; ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ brcmf_dbg(CTL, "cmd %d len %d\n", cmd, len); ++ ++ /* Respond "bcmerror" and "bcmerrorstr" with local cache */ ++ if (cmd == BRCMF_C_GET_VAR && buf) { ++ if (!strcmp((char *)buf, "bcmerrorstr")) { ++ strncpy((char *)buf, "bcm_error", ++ BCME_STRLEN); ++ goto done; ++ } else if (!strcmp((char *)buf, "bcmerror")) { ++ *(int *)buf = drvr->dongle_error; ++ goto done; ++ } ++ } ++ ++ memset(msg, 0, sizeof(struct brcmf_proto_cdc_dcmd)); ++ ++ msg->cmd = cpu_to_le32(cmd); ++ msg->len = cpu_to_le32(len); ++ flags = (++prot->reqid << CDC_DCMD_ID_SHIFT); ++ flags = (flags & ~CDC_DCMD_IF_MASK) | ++ (ifidx << CDC_DCMD_IF_SHIFT); ++ msg->flags = cpu_to_le32(flags); ++ ++ if (buf) ++ memcpy(prot->buf, buf, len); ++ ++ ret = brcmf_proto_cdc_msg(drvr); ++ if (ret < 0) { ++ brcmf_dbg(ERROR, "brcmf_proto_cdc_msg failed w/status %d\n", ++ ret); ++ goto done; ++ } ++ ++retry: ++ /* wait for interrupt and get first fragment */ ++ ret = brcmf_proto_cdc_cmplt(drvr, prot->reqid, len); ++ if (ret < 0) ++ goto done; ++ ++ flags = le32_to_cpu(msg->flags); ++ id = (flags & CDC_DCMD_ID_MASK) >> CDC_DCMD_ID_SHIFT; ++ ++ if ((id < prot->reqid) && (++retries < RETRIES)) ++ goto retry; ++ if (id != prot->reqid) { ++ brcmf_dbg(ERROR, "%s: unexpected request id %d (expected %d)\n", ++ brcmf_ifname(drvr, ifidx), id, prot->reqid); ++ ret = -EINVAL; ++ goto done; ++ } ++ ++ /* Check info buffer */ ++ info = (void *)&msg[1]; ++ ++ /* Copy info buffer */ ++ if (buf) { ++ if (ret < (int)len) ++ len = ret; ++ memcpy(buf, info, len); ++ } ++ ++ /* Check the ERROR flag */ ++ if (flags & CDC_DCMD_ERROR) { ++ ret = le32_to_cpu(msg->status); ++ /* Cache error from dongle */ ++ drvr->dongle_error = ret; ++ } ++ ++done: ++ return ret; ++} ++ ++int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, ++ void *buf, uint len) ++{ ++ struct brcmf_proto *prot = drvr->prot; ++ struct brcmf_proto_cdc_dcmd *msg = &prot->msg; ++ int ret = 0; ++ u32 flags, id; ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ brcmf_dbg(CTL, "cmd %d len %d\n", cmd, len); ++ ++ memset(msg, 0, sizeof(struct brcmf_proto_cdc_dcmd)); ++ ++ msg->cmd = cpu_to_le32(cmd); ++ msg->len = cpu_to_le32(len); ++ flags = (++prot->reqid << CDC_DCMD_ID_SHIFT) | CDC_DCMD_SET; ++ flags = (flags & ~CDC_DCMD_IF_MASK) | ++ (ifidx << CDC_DCMD_IF_SHIFT); ++ msg->flags = cpu_to_le32(flags); ++ ++ if (buf) ++ memcpy(prot->buf, buf, len); ++ ++ ret = brcmf_proto_cdc_msg(drvr); ++ if (ret < 0) ++ goto done; ++ ++ ret = brcmf_proto_cdc_cmplt(drvr, prot->reqid, len); ++ if (ret < 0) ++ goto done; ++ ++ flags = le32_to_cpu(msg->flags); ++ id = (flags & CDC_DCMD_ID_MASK) >> CDC_DCMD_ID_SHIFT; ++ ++ if (id != prot->reqid) { ++ brcmf_dbg(ERROR, "%s: unexpected request id %d (expected %d)\n", ++ brcmf_ifname(drvr, ifidx), id, prot->reqid); ++ ret = -EINVAL; ++ goto done; ++ } ++ ++ /* Check the ERROR flag */ ++ if (flags & CDC_DCMD_ERROR) { ++ ret = le32_to_cpu(msg->status); ++ /* Cache error from dongle */ ++ drvr->dongle_error = ret; ++ } ++ ++done: ++ return ret; ++} ++ ++int ++brcmf_proto_dcmd(struct brcmf_pub *drvr, int ifidx, struct brcmf_dcmd *dcmd, ++ int len) ++{ ++ struct brcmf_proto *prot = drvr->prot; ++ int ret = -1; ++ ++ if (drvr->bus_if->state == BRCMF_BUS_DOWN) { ++ brcmf_dbg(ERROR, "bus is down. we have nothing to do.\n"); ++ return ret; ++ } ++ mutex_lock(&drvr->proto_block); ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ if (len > BRCMF_DCMD_MAXLEN) ++ goto done; ++ ++ if (prot->pending == true) { ++ brcmf_dbg(TRACE, "CDC packet is pending!!!! cmd=0x%x (%lu) lastcmd=0x%x (%lu)\n", ++ dcmd->cmd, (unsigned long)dcmd->cmd, prot->lastcmd, ++ (unsigned long)prot->lastcmd); ++ if (dcmd->cmd == BRCMF_C_SET_VAR || ++ dcmd->cmd == BRCMF_C_GET_VAR) ++ brcmf_dbg(TRACE, "iovar cmd=%s\n", (char *)dcmd->buf); ++ ++ goto done; ++ } ++ ++ prot->pending = true; ++ prot->lastcmd = dcmd->cmd; ++ if (dcmd->set) ++ ret = brcmf_proto_cdc_set_dcmd(drvr, ifidx, dcmd->cmd, ++ dcmd->buf, len); ++ else { ++ ret = brcmf_proto_cdc_query_dcmd(drvr, ifidx, dcmd->cmd, ++ dcmd->buf, len); ++ if (ret > 0) ++ dcmd->used = ret - ++ sizeof(struct brcmf_proto_cdc_dcmd); ++ } ++ ++ if (ret >= 0) ++ ret = 0; ++ else { ++ struct brcmf_proto_cdc_dcmd *msg = &prot->msg; ++ /* len == needed when set/query fails from dongle */ ++ dcmd->needed = le32_to_cpu(msg->len); ++ } ++ ++ /* Intercept the wme_dp dongle cmd here */ ++ if (!ret && dcmd->cmd == BRCMF_C_SET_VAR && ++ !strcmp(dcmd->buf, "wme_dp")) { ++ int slen; ++ __le32 val = 0; ++ ++ slen = strlen("wme_dp") + 1; ++ if (len >= (int)(slen + sizeof(int))) ++ memcpy(&val, (char *)dcmd->buf + slen, sizeof(int)); ++ drvr->wme_dp = (u8) le32_to_cpu(val); ++ } ++ ++ prot->pending = false; ++ ++done: ++ mutex_unlock(&drvr->proto_block); ++ ++ return ret; ++} ++ ++static bool pkt_sum_needed(struct sk_buff *skb) ++{ ++ return skb->ip_summed == CHECKSUM_PARTIAL; ++} ++ ++static void pkt_set_sum_good(struct sk_buff *skb, bool x) ++{ ++ skb->ip_summed = (x ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE); ++} ++ ++void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx, ++ struct sk_buff *pktbuf) ++{ ++ struct brcmf_proto_bdc_header *h; ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ /* Push BDC header used to convey priority for buses that don't */ ++ ++ skb_push(pktbuf, BDC_HEADER_LEN); ++ ++ h = (struct brcmf_proto_bdc_header *)(pktbuf->data); ++ ++ h->flags = (BDC_PROTO_VER << BDC_FLAG_VER_SHIFT); ++ if (pkt_sum_needed(pktbuf)) ++ h->flags |= BDC_FLAG_SUM_NEEDED; ++ ++ h->priority = (pktbuf->priority & BDC_PRIORITY_MASK); ++ h->flags2 = 0; ++ h->data_offset = 0; ++ BDC_SET_IF_IDX(h, ifidx); ++} ++ ++int brcmf_proto_hdrpull(struct device *dev, int *ifidx, ++ struct sk_buff *pktbuf) ++{ ++ struct brcmf_proto_bdc_header *h; ++ struct brcmf_bus *bus_if = dev_get_drvdata(dev); ++ struct brcmf_pub *drvr = bus_if->drvr; ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ /* Pop BDC header used to convey priority for buses that don't */ ++ ++ if (pktbuf->len < BDC_HEADER_LEN) { ++ brcmf_dbg(ERROR, "rx data too short (%d < %d)\n", ++ pktbuf->len, BDC_HEADER_LEN); ++ return -EBADE; ++ } ++ ++ h = (struct brcmf_proto_bdc_header *)(pktbuf->data); ++ ++ *ifidx = BDC_GET_IF_IDX(h); ++ if (*ifidx >= BRCMF_MAX_IFS) { ++ brcmf_dbg(ERROR, "rx data ifnum out of range (%d)\n", *ifidx); ++ return -EBADE; ++ } ++ ++ if (((h->flags & BDC_FLAG_VER_MASK) >> BDC_FLAG_VER_SHIFT) != ++ BDC_PROTO_VER) { ++ brcmf_dbg(ERROR, "%s: non-BDC packet received, flags 0x%x\n", ++ brcmf_ifname(drvr, *ifidx), h->flags); ++ return -EBADE; ++ } ++ ++ if (h->flags & BDC_FLAG_SUM_GOOD) { ++ brcmf_dbg(INFO, "%s: BDC packet received with good rx-csum, flags 0x%x\n", ++ brcmf_ifname(drvr, *ifidx), h->flags); ++ pkt_set_sum_good(pktbuf, true); ++ } ++ ++ pktbuf->priority = h->priority & BDC_PRIORITY_MASK; ++ ++ skb_pull(pktbuf, BDC_HEADER_LEN); ++ skb_pull(pktbuf, h->data_offset << 2); ++ ++ return 0; ++} ++ ++int brcmf_proto_attach(struct brcmf_pub *drvr) ++{ ++ struct brcmf_proto *cdc; ++ ++ cdc = kzalloc(sizeof(struct brcmf_proto), GFP_ATOMIC); ++ if (!cdc) ++ goto fail; ++ ++ /* ensure that the msg buf directly follows the cdc msg struct */ ++ if ((unsigned long)(&cdc->msg + 1) != (unsigned long)cdc->buf) { ++ brcmf_dbg(ERROR, "struct brcmf_proto is not correctly defined\n"); ++ goto fail; ++ } ++ ++ drvr->prot = cdc; ++ drvr->hdrlen += BDC_HEADER_LEN; ++ drvr->bus_if->maxctl = BRCMF_DCMD_MAXLEN + ++ sizeof(struct brcmf_proto_cdc_dcmd) + ROUND_UP_MARGIN; ++ return 0; ++ ++fail: ++ kfree(cdc); ++ return -ENOMEM; ++} ++ ++/* ~NOTE~ What if another thread is waiting on the semaphore? Holding it? */ ++void brcmf_proto_detach(struct brcmf_pub *drvr) ++{ ++ kfree(drvr->prot); ++ drvr->prot = NULL; ++} ++ ++int brcmf_proto_init(struct brcmf_pub *drvr) ++{ ++ int ret = 0; ++ char buf[128]; ++ ++ brcmf_dbg(TRACE, "Enter\n"); ++ ++ mutex_lock(&drvr->proto_block); ++ ++ /* Get the device MAC address */ ++ strcpy(buf, "cur_etheraddr"); ++ ret = brcmf_proto_cdc_query_dcmd(drvr, 0, BRCMF_C_GET_VAR, ++ buf, sizeof(buf)); ++ if (ret < 0) { ++ mutex_unlock(&drvr->proto_block); ++ return ret; ++ } ++ memcpy(drvr->mac, buf, ETH_ALEN); ++ ++ mutex_unlock(&drvr->proto_block); ++ ++ ret = brcmf_c_preinit_dcmds(drvr); ++ ++ /* Always assumes wl for now */ ++ drvr->iswl = true; ++ ++ return ret; ++} ++ ++void brcmf_proto_stop(struct brcmf_pub *drvr) ++{ ++ /* Nothing to do for CDC */ ++} +diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c +new file mode 100644 +index 0000000..2962900 +--- /dev/null ++++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c +@@ -0,0 +1,882 @@ ++/* ++ * Copyright (c) 2010 Broadcom Corporation ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY ++ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION ++ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#undef pr_fmt ++#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt ++ ++#include <linux/kernel.h> ++#include <linux/printk.h> ++#include <linux/string.h> ++#include <linux/sched.h> ++#include <linux/netdevice.h> ++#include <asm/unaligned.h> ++#include <defs.h> ++#include <brcmu_wifi.h> ++#include <brcmu_utils.h> ++#include "dhd.h" ++#include "dhd_bus.h" ++#include "dhd_proto.h" ++#include "dhd_dbg.h" ++ ++#define BRCM_OUI "\x00\x10\x18" ++#define DOT11_OUI_LEN 3 ++#define BCMILCP_BCM_SUBTYPE_EVENT 1 ++#define PKTFILTER_BUF_SIZE 2048 ++#define BRCMF_ARPOL_MODE 0xb /* agent|snoop|peer_autoreply */ ++ ++#define MSGTRACE_VERSION 1 ++ ++#define BRCMF_PKT_FILTER_FIXED_LEN offsetof(struct brcmf_pkt_filter_le, u) ++#define BRCMF_PKT_FILTER_PATTERN_FIXED_LEN \ ++ offsetof(struct brcmf_pkt_filter_pattern_le, mask_and_pattern) ++ ++#ifdef DEBUG ++static const char brcmf_version[] = ++ "Dongle Host Driver, version " BRCMF_VERSION_STR "\nCompiled on " ++ __DATE__ " at " __TIME__; ++#else ++static const char brcmf_version[] = ++ "Dongle Host Driver, version " BRCMF_VERSION_STR; ++#endif ++ ++/* Message trace header */ ++struct msgtrace_hdr { ++ u8 version; ++ u8 spare; ++ __be16 len; /* Len of the trace */ ++ __be32 seqnum; /* Sequence number of message. Useful ++ * if the messsage has been lost ++ * because of DMA error or a bus reset ++ * (ex: SDIO Func2) ++ */ ++ __be32 discarded_bytes; /* Number of discarded bytes because of ++ trace overflow */ ++ __be32 discarded_printf; /* Number of discarded printf ++ because of trace overflow */ ++} __packed; ++ ++ ++uint ++brcmf_c_mkiovar(char *name, char *data, uint datalen, char *buf, uint buflen) ++{ ++ uint len; ++ ++ len = strlen(name) + 1; ++ ++ if ((len + datalen) > buflen) ++ return 0; ++ ++ strncpy(buf, name, buflen); ++ ++ /* append data onto the end of the name string */ ++ memcpy(&buf[len], data, datalen); ++ len += datalen; ++ ++ return len; ++} ++ ++bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, ++ struct sk_buff *pkt, int prec) ++{ ++ struct sk_buff *p; ++ int eprec = -1; /* precedence to evict from */ ++ bool discard_oldest; ++ struct brcmf_bus *bus_if = dev_get_drvdata(dev); ++ struct brcmf_pub *drvr = bus_if->drvr;
Lines of this file are not shown. View the raw message.
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patch new file +123141 -0
123,141 lines not on this page · raw message
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/defconfig +6 -0
Lines of this file are not shown. View the raw message.
recipes-kernel/linux/linux-imx_3.0.35.bbappend +3 -1
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.9.5
Part of the diff is not shown here. View the raw message.
PATCH v2 3/5 linux-firmware: Add bbappend to include Broadcom wifi drivers
In reply to John WeberThis recipe adds files for split packages to support the bcm4329, bcm4330, and bcm4334.
They are installed in /lib/firmware/brcm/brcmfmac43<N>.bin where <N> is the last two digits of the device product number.
Note: The wifi driver for these devices expects the firmware file to be named brcmfmac-sdio.bin, and so a link must be created named brcmfmac-sdio.bin to the appropriate file. Ultimately, this could be done with update-alternatives in this recipe but it could also be accomplished in another recipe which RDEPENDS on linux-firmware-bcm43<N>
--- .../linux-firmware/linux-firmware_git.bbappend | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 recipes-kernel/linux-firmware/linux-firmware_git.bbappend
recipes-kernel/linux-firmware/linux-firmware_git.bbappend new file +24 -0
@@ -0,0 +1,24 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}" + +LIC_FILES_CHKSUM += "file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc\ +" + +PACKAGES =+ "${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334" + +LICENSE_${PN}-bcm4329 = "Firmware-bcm4329" +FILES_${PN}-bcm4329 = " \ + /lib/firmware/brcm/brcmfmac4329.bin \ + /lib/firmware/LICENCE.broadcom_bcm43xx \ +" + +LICENSE_${PN}-bcm4330 = "Firmware-bcm4330" +FILES_${PN}-bcm4330 = " \ + /lib/firmware/brcm/brcmfmac4330.bin \ + /lib/firmware/LICENCE.broadcom_bcm43xx \ +" + +LICENSE_${PN}-bcm4334 = "Firmware-bcm4334" +FILES_${PN}-bcm4334 = " \ + /lib/firmware/brcm/brcmfmac4334.bin \ + /lib/firmware/LICENCE.broadcom_bcm43xx \ +"
Signature · 1 line
1.7.9.5
PATCH v2 4/5 wandboard-wifi-support: add nvram file and create firmware links
In reply to John WeberThis recipe provides the nvram file required by the BCM4329 on Wandboard Dual. It also creates links named brcmfrac-sdio.bin to the firmware binary brcmfmac4329.bin (provided by linux-firmware-bcm4329) and creates a link named brcmfmac-sdio.txt to the provided nvram.txt file for Wandboard
All files are installed on the rootfs at /lib/firmware/brcm
--- .../files/LICENCE.broadcom_bcm43xx | 65 ++++++++++++++++++ .../files/wandboard-brcmfmac-nvram.txt | 70 ++++++++++++++++++++ .../wandboard-wifi-support.bb | 41 ++++++++++++ 3 files changed, 176 insertions(+) create mode 100644 recipes-bsp/wandboard-wifi-support/files/LICENCE.broadcom_bcm43xx create mode 100644 recipes-bsp/wandboard-wifi-support/files/wandboard-brcmfmac-nvram.txt create mode 100644 recipes-bsp/wandboard-wifi-support/wandboard-wifi-support.bb
recipes-bsp/wandboard-wifi-support/files/LICENCE.broadcom_bcm43xx new file +65 -0
@@ -0,0 +1,65 @@ +SOFTWARE LICENSE AGREEMENT + +The accompanying software in binary code form (“Software”), is licensed to you, +or, if you are accepting on behalf of an entity, the entity and its affiliates +exercising rights hereunder (“Licensee”) subject to the terms of this software +license agreement (“Agreement”), unless Licensee and Broadcom Corporation +(“Broadcom”) execute a separate written software license agreement governing +use of the Software. ANY USE, REPRODUCTION, OR DISTRIBUTION OF THE SOFTWARE +CONSTITUTES LICENSEE’S ACCEPTANCE OF THIS AGREEMENT. + +1. License. Subject to the terms and conditions of this Agreement, +Broadcom hereby grants to Licensee a limited, non-exclusive, non-transferable, +royalty-free license: (i) to use and integrate the Software with any other +software; and (ii) to reproduce and distribute the Software complete, +unmodified, and as provided by Broadcom, solely for use with Broadcom +proprietary integrated circuit product(s) sold by Broadcom with which the +Software was designed to be used, or their successors. + +2. Restrictions. Licensee shall distribute Software with a copy of this +Agreement. Licensee shall not remove, efface or obscure any copyright or +trademark notices from the Software. Reproductions of the Broadcom copyright +notice shall be included with each copy of the Software, except where such +Software is embedded in a manner not readily accessible to the end user. +Licensee shall not: (i) use, license, sell or otherwise distribute the Software +except as provided in this Agreement; (ii) attempt to modify in any way, +reverse engineer, decompile or disassemble any portion of the Software; or +(iii) use the Software or other material in violation of any applicable law or +regulation, including but not limited to any regulatory agency. This Agreement +shall automatically terminate upon Licensee’s failure to comply with any of the +terms of this Agreement. In such event, Licensee will destroy all copies of the +Software and its component parts. + +3. Ownership. The Software is licensed and not sold. Title to and +ownership of the Software, including all intellectual property rights thereto, +and any portion thereof remain with Broadcom or its licensors. Licensee hereby +covenants that it will not assert any claim that the Software created by or for +Broadcom infringe any intellectual property right owned or controlled by +Licensee. + +4. Disclaimer. THE SOFTWARE IS OFFERED “AS IS,” AND BROADCOM PROVIDES AND +GRANTS AND LICENSEE RECEIVES NO SUPPORT AND NO WARRANTIES OF ANY KIND, EXPRESS +OR IMPLIED, BY STATUTE, COMMUNICATION OR CONDUCT WITH LICENSEE, OR OTHERWISE. +BROADCOM SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A SPECIFIC PURPOSE, OR NONINFRINGEMENT CONCERNING THE SOFTWARE OR +ANY UPGRADES TO OR DOCUMENTATION FOR THE SOFTWARE. WITHOUT LIMITATION OF THE +ABOVE, BROADCOM GRANTS NO WARRANTY THAT THE SOFTWARE IS ERROR-FREE OR WILL +OPERATE WITHOUT INTERRUPTION, AND GRANTS NO WARRANTY REGARDING ITS USE OR THE +RESULTS THEREFROM INCLUDING, WITHOUT LIMITATION, ITS CORRECTNESS, ACCURACY, OR +RELIABILITY. TO THE MAXIMUM EXTENT PERMITTED BY LAW, IN NO EVENT SHALL BROADCOM +OR ANY OF ITS LICENSORS HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER FOR BREACH OF CONTRACT, TORT (INCLUDING NEGLIGENCE) OR +OTHERWISE, ARISING OUT OF THIS AGREEMENT OR USE, REPRODUCTION, OR DISTRIBUTION +OF THE SOFTWARE, INCLUDING BUT NOT LIMITED TO LOSS OF DATA AND LOSS OF PROFITS, +EVEN IF SUCH PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THESE +LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY +LIMITED REMEDY. + +5. Export Laws. LICENSEE UNDERSTANDS AND AGREES THAT THE SOFTWARE IS +SUBJECT TO UNITED STATES AND OTHER APPLICABLE EXPORT-RELATED LAWS AND +REGULATIONS AND THAT LICENSEE MAY NOT EXPORT, RE-EXPORT OR TRANSFER THE +SOFTWARE OR ANY DIRECT PRODUCT OF THE SOFTWARE EXCEPT AS PERMITTED UNDER THOSE +LAWS. WITHOUT LIMITING THE FOREGOING, EXPORT, RE-EXPORT, OR TRANSFER OF THE +SOFTWARE TO CUBA, IRAN, NORTH KOREA, SUDAN, AND SYRIA IS PROHIBITED. +
recipes-bsp/wandboard-wifi-support/files/wandboard-brcmfmac-nvram.txt new file +70 -0
70 lines not on this page · raw message
recipes-bsp/wandboard-wifi-support/wandboard-wifi-support.bb new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v2 5/5 wandboard-dual: Add wandboard-wifi-support to machine
In reply to John WeberAdds a line MACHINE_EXTRA_RRECOMMENDS for wandboard-wifi-support which provides firmware files for the wifi chip (BCM4329) on Wandboard Dual.
--- conf/machine/wandboard-dual.conf | 3 +++ 1 file changed, 3 insertions(+)
conf/machine/wandboard-dual.conf +3 -0
@@ -18,3 +18,6 @@ UBOOT_PADDING = "2" SERIAL_CONSOLE = "115200 ttymxc0" MACHINE_FEATURES += " pci wifi bluetooth" + +MACHINE_EXTRA_RRECOMMENDS += " wandboard-wifi-support" +
Signature · 1 line
1.7.9.5
Quoted 7 lines · John Weber
This patchset provides fixes and wifi support for Wandboard-Dual.
Fixes ESDHC platform data in kernel board init
Replaces old wifi driver in
drivers/stagingwith a backported driver from kernel v3.5
Quoted 7 lines
Adds a recipe to install wifi chip firmware (linux-firmware bbappend)
Adds a recipe (wandboard-wifi-support) to provide the nvram file for the chip and to create appropriate symlinks for the firmware files.
Adds a dependency in the wandboard-dual machine conf to integrate the wandboard-wifi-support recipe.
I merged the kernel backport and fix but did not merge the rest.
The firmware changes I've reworked and sent to OE-Core for merge and rest has been kept for rework after it. You can use a package for nvram.txt only and avoid it being wandboard specific for now.
--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Hi Otavio,
Quoted 4 lines · Otavio Salvador
The firmware changes I've reworked and sent to OE-Core for merge and rest has been kept for rework after it. You can use a package for nvram.txt only and avoid it being wandboard specific for now.
the nvram.txt is board specif, check its header which gives the following details :
+# bcm4329 NVRAM file for Wandboard Dual
+# $Copyright (C) 2008 Broadcom Corporation$
Eric
Review
Quoted 13 lines · Eric Bénard
Hi Otavio,
Quoted 4 lines · Otavio Salvador
The firmware changes I've reworked and sent to OE-Core for merge and rest has been kept for rework after it. You can use a package for nvram.txt only and avoid it being wandboard specific for now.
the nvram.txt is board specif, check its header which gives the following details :
(quoted diff) +2
-0+# bcm4329 NVRAM file for Wandboard Dual +# $Copyright (C) 2008 Broadcom Corporation$
Yes the idea is to provide one which has the nvram by file.
--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Quoted 9 lines · Otavio Salvador
Quoted 8 lines · Eric Bénard
Hi Otavio,
Quoted 4 lines · Otavio Salvador
The firmware changes I've reworked and sent to OE-Core for merge and rest has been kept for rework after it. You can use a package for nvram.txt only and ".
Quoted 8 lines
Review
Quoted 5 lines
the nvram.txt is board specif, check its header which gives the following details :
(quoted diff) +2
-0+# bcm4329 NVRAM file for Wandboard Dual +# $Copyright (C) 2008 Broadcom Corporation$Yes the idea is to provide one which has the nvram by file.
sorry I don't understand what you mean here.
Eric
Hi Otavio,
Quoted 9 lines · Otavio Salvador
Quoted 8 lines · Eric Bénard
Hi Otavio,
Quoted 4 lines · Otavio Salvador
The firmware changes I've reworked and sent to OE-Core for merge and rest has been kept for rework after it. You can use a package for nvram.txt only and avoid it being wandboard specific for now.
Quoted 8 lines
Review
Quoted 5 lines
the nvram.txt is board specif, check its header which gives the following details :
(quoted diff) +2
-0+# bcm4329 NVRAM file for Wandboard Dual +# $Copyright (C) 2008 Broadcom Corporation$Yes the idea is to provide one which has the nvram by file.
OK having seen the new patch from John, I now understand. Sorry for the noise.
Eric
Quoted 17 lines · Eric Bénard
Hi Otavio,
Quoted 12 lines · Otavio Salvador
Quoted 11 lines · Eric Bénard
Hi Otavio,
Quoted 4 lines · Otavio Salvador
The firmware changes I've reworked and sent to OE-Core for merge and rest has been kept for rework after it. You can use a package for nvram.txt only and avoid it being wandboard specific for now.
the nvram.txt is board specif, check its header which gives the following details :
Quoted 7 lines
Quoted 5 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+# bcm4329 NVRAM file for Wandboard Dual +# $Copyright (C) 2008 Broadcom Corporation$Yes the idea is to provide one which has the nvram by file.
OK having seen the new patch from John, I now understand. Sorry for the noise.
I have merged the missing patches now as linux-firmware patch got merged.
--
Otavio Salvador O.S. Systems
E-mail: [email protected] http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Fabio Estevam
reviewerQuoted 1 line · Otavio Salvador
I have merged the missing patches now as linux-firmware patch got merged.
Is this OE linux-firmware tree or the official linux-firmware git?
A patch to the OE linux-firmware recipe that pulls from the linux-firmware git.
Wandboard makes use of this patch to bring in the bcm4329 firmware.
Quoted 11 lines · Fabio Estevam
Quoted 1 line · Otavio Salvador
I have merged the missing patches now as linux-firmware patch got merged.
Is this OE linux-firmware tree or the official linux-firmware git?
_______________________________________________
meta-freescale mailing list [email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale