linux-imx (3.0.35): fix sdhc platform data
PATCH 1/1 linux-imx (3.0.35): fix sdhc platform data
Fixes esdhc platform data for wandboard dual. Without this fix, wandboard-dual is unable to load firmware from the filesystem into the kernel.
--- ...002-wandboard-dual-fix-sdhc-platform-data.patch | 53 ++++++++++++++++++++ 1 files changed, 56 insertions(+), 2 deletions(-) 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 +53 -0
@@ -0,0 +1,53 @@ +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, ++ .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 +
Signature · 1 line
1.7.9.5
PATCH 1/1 linux-imx (3.0.35): remove staging driver for brcm80211
Removes brcm80211 driver in drivers/staging. This is meant to be applied with a patch to add a backported driver from kernel v3.5 which is loaded into drivers/net/wireless.
--- ...mx-3.0.35-remove-brcm80211-staging-driver.patch |123141 ++++++++++++++++++++ 1 files changed, 123142 insertions(+) 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-remove-brcm80211-staging-driver.patch new file +123141 -0
@@ -0,0 +1,123141 @@ +From 748eb185cad62c456dcd316c941f9835520a946d Mon Sep 17 00:00:00 2001 +From: John Weber <[email protected]> +Date: Sat, 9 Mar 2013 09:23:58 -0600 +Subject: [meta-fsl-arm-extra][PATCH 1/2] linux-imx (3.0.35): remove brcm80211 + staging driver + +Upstream-Status: Pending + +Signed-off-by: John Weber <[email protected]> +--- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 2 - + drivers/staging/brcm80211/Kconfig | 40 - + drivers/staging/brcm80211/Makefile | 24 - + drivers/staging/brcm80211/README | 64 - + drivers/staging/brcm80211/TODO | 15 - + drivers/staging/brcm80211/brcmfmac/Makefile | 56 - + drivers/staging/brcm80211/brcmfmac/README | 2 - + drivers/staging/brcm80211/brcmfmac/aiutils.c | 1 - + drivers/staging/brcm80211/brcmfmac/bcmcdc.h | 98 - + drivers/staging/brcm80211/brcmfmac/bcmchip.h | 35 - + drivers/staging/brcm80211/brcmfmac/bcmsdbus.h | 113 - + drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 631 - + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 386 - + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 1239 - + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h | 134 - + .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 235 - + drivers/staging/brcm80211/brcmfmac/dhd.h | 414 - + drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 82 - + drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 474 - + drivers/staging/brcm80211/brcmfmac/dhd_common.c | 1848 -- + .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 158 - + drivers/staging/brcm80211/brcmfmac/dhd_dbg.h | 103 - + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2862 -- + .../staging/brcm80211/brcmfmac/dhd_linux_sched.c | 25 - + drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 90 - + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 6390 ----- + drivers/staging/brcm80211/brcmfmac/dhdioctl.h | 100 - + drivers/staging/brcm80211/brcmfmac/dngl_stats.h | 32 - + .../staging/brcm80211/brcmfmac/hndrte_armtrap.h | 75 - + drivers/staging/brcm80211/brcmfmac/hndrte_cons.h | 62 - + drivers/staging/brcm80211/brcmfmac/msgtrace.h | 61 - + drivers/staging/brcm80211/brcmfmac/sdioh.h | 63 - + drivers/staging/brcm80211/brcmfmac/sdiovar.h | 38 - + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 4428 --- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 414 - + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 3693 --- + drivers/staging/brcm80211/brcmfmac/wl_iw.h | 142 - + drivers/staging/brcm80211/brcmsmac/Makefile | 59 - + drivers/staging/brcm80211/brcmsmac/aiutils.c | 2054 -- + drivers/staging/brcm80211/brcmsmac/aiutils.h | 546 - + drivers/staging/brcm80211/brcmsmac/bcmotp.c | 936 - + drivers/staging/brcm80211/brcmsmac/bcmsrom.c | 714 - + drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h | 513 - + drivers/staging/brcm80211/brcmsmac/d11.h | 1773 -- + drivers/staging/brcm80211/brcmsmac/hnddma.c | 1756 -- + drivers/staging/brcm80211/brcmsmac/nicpci.c | 836 - + drivers/staging/brcm80211/brcmsmac/nvram.c | 215 - + .../staging/brcm80211/brcmsmac/phy/phy_version.h | 36 - + .../staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | 3307 --- + .../staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h | 256 - + .../staging/brcm80211/brcmsmac/phy/wlc_phy_int.h | 1226 - + .../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 5302 ---- + .../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h | 119 - + drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c |29169 -------------------- + .../staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c | 296 - + .../staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h | 40 - + .../staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h | 1533 - + .../staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h | 167 - + .../brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c | 3639 --- + .../brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h | 49 - + .../staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c |10632 ------- + .../staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h | 39 - + drivers/staging/brcm80211/brcmsmac/wl_dbg.h | 92 - + drivers/staging/brcm80211/brcmsmac/wl_export.h | 47 - + drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 1942 -- + drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | 85 - + drivers/staging/brcm80211/brcmsmac/wl_ucode.h | 49 - + .../staging/brcm80211/brcmsmac/wl_ucode_loader.c | 111 - + drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | 300 - + drivers/staging/brcm80211/brcmsmac/wlc_alloc.h | 18 - + drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 1253 - + drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h | 29 - + drivers/staging/brcm80211/brcmsmac/wlc_antsel.c | 320 - + drivers/staging/brcm80211/brcmsmac/wlc_antsel.h | 29 - + drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 3602 --- + drivers/staging/brcm80211/brcmsmac/wlc_bmac.h | 179 - + drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h | 135 - + drivers/staging/brcm80211/brcmsmac/wlc_cfg.h | 280 - + drivers/staging/brcm80211/brcmsmac/wlc_channel.c | 1557 -- + drivers/staging/brcm80211/brcmsmac/wlc_channel.h | 120 - + drivers/staging/brcm80211/brcmsmac/wlc_key.h | 140 - + drivers/staging/brcm80211/brcmsmac/wlc_main.c | 7537 ----- + drivers/staging/brcm80211/brcmsmac/wlc_main.h | 939 - + drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 243 - + drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h | 112 - + drivers/staging/brcm80211/brcmsmac/wlc_pmu.c | 1929 -- + drivers/staging/brcm80211/brcmsmac/wlc_pmu.h | 58 - + drivers/staging/brcm80211/brcmsmac/wlc_pub.h | 584 - + drivers/staging/brcm80211/brcmsmac/wlc_rate.c | 499 - + drivers/staging/brcm80211/brcmsmac/wlc_rate.h | 169 - + drivers/staging/brcm80211/brcmsmac/wlc_scb.h | 80 - + drivers/staging/brcm80211/brcmsmac/wlc_stf.c | 523 - + drivers/staging/brcm80211/brcmsmac/wlc_stf.h | 38 - + drivers/staging/brcm80211/brcmsmac/wlc_types.h | 37 - + drivers/staging/brcm80211/include/aidmp.h | 374 - + drivers/staging/brcm80211/include/bcmdefs.h | 150 - + drivers/staging/brcm80211/include/bcmdevs.h | 124 - + drivers/staging/brcm80211/include/bcmnvram.h | 153 - + drivers/staging/brcm80211/include/bcmotp.h | 44 - + drivers/staging/brcm80211/include/bcmsdh.h | 205 - + drivers/staging/brcm80211/include/bcmsdpcm.h | 208 - + drivers/staging/brcm80211/include/bcmsrom.h | 34 - + drivers/staging/brcm80211/include/bcmsrom_fmt.h | 367 - + drivers/staging/brcm80211/include/bcmutils.h | 500 - + drivers/staging/brcm80211/include/bcmwifi.h | 167 - + drivers/staging/brcm80211/include/hnddma.h | 226 - + drivers/staging/brcm80211/include/hndsoc.h | 199 - + drivers/staging/brcm80211/include/nicpci.h | 79 - + drivers/staging/brcm80211/include/pci_core.h | 122 - + drivers/staging/brcm80211/include/pcicfg.h | 50 - + drivers/staging/brcm80211/include/pcie_core.h | 299 - + drivers/staging/brcm80211/include/proto/802.11.h | 200 - + drivers/staging/brcm80211/include/proto/bcmeth.h | 44 - + drivers/staging/brcm80211/include/proto/bcmevent.h | 207 - + drivers/staging/brcm80211/include/sbchipc.h | 1588 -- + drivers/staging/brcm80211/include/sbconfig.h | 272 - + drivers/staging/brcm80211/include/sbhnddma.h | 315 - + drivers/staging/brcm80211/include/sbsdio.h | 152 - + drivers/staging/brcm80211/include/sbsdpcmdev.h | 281 - + drivers/staging/brcm80211/include/sdio.h | 552 - + drivers/staging/brcm80211/include/wlioctl.h | 1365 - + drivers/staging/brcm80211/util/Makefile | 29 - + drivers/staging/brcm80211/util/bcmutils.c | 796 - + drivers/staging/brcm80211/util/bcmwifi.c | 137 - + 125 files changed, 122118 deletions(-) + delete mode 100644 drivers/staging/brcm80211/Kconfig + delete mode 100644 drivers/staging/brcm80211/Makefile + delete mode 100644 drivers/staging/brcm80211/README + delete mode 100644 drivers/staging/brcm80211/TODO + delete mode 100644 drivers/staging/brcm80211/brcmfmac/Makefile + delete mode 100644 drivers/staging/brcm80211/brcmfmac/README + delete mode 100644 drivers/staging/brcm80211/brcmfmac/aiutils.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmcdc.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmchip.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdbus.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_bus.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_cdc.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_common.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_dbg.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_linux.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_proto.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_sdio.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dhdioctl.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/dngl_stats.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/hndrte_cons.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/msgtrace.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/sdioh.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/sdiovar.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h + delete mode 100644 drivers/staging/brcm80211/brcmfmac/wl_iw.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/wl_iw.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/Makefile + delete mode 100644 drivers/staging/brcm80211/brcmsmac/aiutils.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/aiutils.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/bcmotp.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/bcmsrom.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/d11.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/hnddma.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/nicpci.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/nvram.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/phy_version.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_dbg.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_export.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_mac80211.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_mac80211.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_ucode.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_alloc.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_alloc.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_antsel.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_antsel.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_bmac.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_bmac.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_cfg.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_channel.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_channel.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_key.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_main.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_main.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_pmu.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_pmu.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_pub.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_rate.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_rate.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_scb.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_stf.c + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_stf.h + delete mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_types.h + delete mode 100644 drivers/staging/brcm80211/include/aidmp.h + delete mode 100644 drivers/staging/brcm80211/include/bcmdefs.h + delete mode 100644 drivers/staging/brcm80211/include/bcmdevs.h + delete mode 100644 drivers/staging/brcm80211/include/bcmnvram.h + delete mode 100644 drivers/staging/brcm80211/include/bcmotp.h + delete mode 100644 drivers/staging/brcm80211/include/bcmsdh.h + delete mode 100644 drivers/staging/brcm80211/include/bcmsdpcm.h + delete mode 100644 drivers/staging/brcm80211/include/bcmsrom.h + delete mode 100644 drivers/staging/brcm80211/include/bcmsrom_fmt.h + delete mode 100644 drivers/staging/brcm80211/include/bcmutils.h + delete mode 100644 drivers/staging/brcm80211/include/bcmwifi.h + delete mode 100644 drivers/staging/brcm80211/include/hnddma.h + delete mode 100644 drivers/staging/brcm80211/include/hndsoc.h + delete mode 100644 drivers/staging/brcm80211/include/nicpci.h + delete mode 100644 drivers/staging/brcm80211/include/pci_core.h + delete mode 100644 drivers/staging/brcm80211/include/pcicfg.h + delete mode 100644 drivers/staging/brcm80211/include/pcie_core.h + delete mode 100644 drivers/staging/brcm80211/include/proto/802.11.h + delete mode 100644 drivers/staging/brcm80211/include/proto/bcmeth.h + delete mode 100644 drivers/staging/brcm80211/include/proto/bcmevent.h + delete mode 100644 drivers/staging/brcm80211/include/sbchipc.h + delete mode 100644 drivers/staging/brcm80211/include/sbconfig.h + delete mode 100644 drivers/staging/brcm80211/include/sbhnddma.h + delete mode 100644 drivers/staging/brcm80211/include/sbsdio.h + delete mode 100644 drivers/staging/brcm80211/include/sbsdpcmdev.h + delete mode 100644 drivers/staging/brcm80211/include/sdio.h + delete mode 100644 drivers/staging/brcm80211/include/wlioctl.h + delete mode 100644 drivers/staging/brcm80211/util/Makefile + delete mode 100644 drivers/staging/brcm80211/util/bcmutils.c + delete mode 100644 drivers/staging/brcm80211/util/bcmwifi.c + +diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig +index 196284d..f73909f 100644 +--- a/drivers/staging/Kconfig ++++ b/drivers/staging/Kconfig +@@ -48,8 +48,6 @@ source "drivers/staging/wlan-ng/Kconfig" + + source "drivers/staging/echo/Kconfig" + +-source "drivers/staging/brcm80211/Kconfig" +- + source "drivers/staging/comedi/Kconfig" + + source "drivers/staging/olpc_dcon/Kconfig" +diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile +index fa41b9c..482897c 100644 +--- a/drivers/staging/Makefile ++++ b/drivers/staging/Makefile +@@ -16,8 +16,6 @@ obj-$(CONFIG_USBIP_CORE) += usbip/ + obj-$(CONFIG_W35UND) += winbond/ + obj-$(CONFIG_PRISM2_USB) += wlan-ng/ + obj-$(CONFIG_ECHO) += echo/ +-obj-$(CONFIG_BRCMSMAC) += brcm80211/ +-obj-$(CONFIG_BRCMFMAC) += brcm80211/ + obj-$(CONFIG_COMEDI) += comedi/ + obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ + obj-$(CONFIG_ASUS_OLED) += asus_oled/ +diff --git a/drivers/staging/brcm80211/Kconfig b/drivers/staging/brcm80211/Kconfig +deleted file mode 100644 +index 379cf16..0000000 +--- a/drivers/staging/brcm80211/Kconfig ++++ /dev/null +@@ -1,40 +0,0 @@ +-config BRCMUTIL +- tristate +- default n +- +-config BRCMSMAC +- tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver" +- default n +- depends on PCI +- depends on WLAN && MAC80211 +- depends on X86 || MIPS +- select BRCMUTIL +- select FW_LOADER +- select CRC_CCITT +- ---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" +- default n +- depends on MMC +- depends on WLAN && CFG80211 +- depends on X86 || MIPS +- select BRCMUTIL +- select FW_LOADER +- select WIRELESS_EXT +- select WEXT_PRIV +- ---help--- +- This module adds support for embedded wireless adapters based on +- Broadcom IEEE802.11n FullMAC chipsets. This driver uses the kernel's +- wireless extensions subsystem. If you choose to build a module, +- it'll be called brcmfmac.ko. +- +-config BRCMDBG +- bool "Broadcom driver debug functions" +- default n +- depends on BRCMSMAC || BRCMFMAC +- ---help--- +- Selecting this enables additional code for debug purposes. +diff --git a/drivers/staging/brcm80211/Makefile b/drivers/staging/brcm80211/Makefile +deleted file mode 100644 +index e7b3f27..0000000 +--- a/drivers/staging/brcm80211/Makefile ++++ /dev/null +@@ -1,24 +0,0 @@ +-# +-# 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-y := -DBCMDMA32 +-subdir-ccflags-$(CONFIG_BRCMDBG) += -DBCMDBG -DBCMDBG_ASSERT +- +-obj-$(CONFIG_BRCMUTIL) += util/ +-obj-$(CONFIG_BRCMFMAC) += brcmfmac/ +-obj-$(CONFIG_BRCMSMAC) += brcmsmac/ +diff --git a/drivers/staging/brcm80211/README b/drivers/staging/brcm80211/README +deleted file mode 100644 +index 8ad5586..0000000 +--- a/drivers/staging/brcm80211/README ++++ /dev/null +@@ -1,64 +0,0 @@ +-Broadcom brcmsmac (mac80211-based softmac PCIe) and brcmfmac (SDIO) drivers. +- +-Completely open source host drivers, no binary object files. +- +-Support for the following chips: +-=============================== +- +- brcmsmac (PCIe) +- Name Device ID +- BCM4313 0x4727 +- BCM43224 0x4353 +- BCM43225 0x4357 +- +- brcmfmac (SDIO) +- Name +- BCM4329 +- +-Both brcmsmac and brcmfmac drivers require firmware files that need to be +-separately downloaded. +- +-Firmware +-====================== +-Firmware is available from the Linux firmware repository at: +- +- git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git +- http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git +- https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git +- +- +-=============================================================== +-Broadcom brcmsmac driver +-=============================================================== +-- Support for both 32 and 64 bit Linux kernels +- +- +-Firmware installation +-====================== +-Copy brcm/bcm43xx-0.fw and brcm/bcm43xx_hdr-0.fw to +-/lib/firmware/brcm (or wherever firmware is normally installed +-on your system). +- +- +-=============================================================== +-Broadcom brcmfmac driver +-=============================================================== +-- Support for 32 bit Linux kernel, 64 bit untested +- +- +-Firmware installation +-====================== +-Copy brcm/bcm4329-fullmac-4.bin and brcm/bcm4329-fullmac-4.txt +-to /lib/firmware/brcm (or wherever firmware is normally installed on your +-system). +- +- +-Contact Info: +-============= +-Brett Rudley [email protected] +-Henry Ptasinski [email protected] +-Dowan Kim [email protected] +-Roland Vossen [email protected] +-Arend van Spriel [email protected] +- +-For more info, refer to: http://linuxwireless.org/en/users/Drivers/brcm80211 +diff --git a/drivers/staging/brcm80211/TODO b/drivers/staging/brcm80211/TODO +deleted file mode 100644 +index e9c1393..0000000 +--- a/drivers/staging/brcm80211/TODO ++++ /dev/null +@@ -1,15 +0,0 @@ +-To Do List for Broadcom Mac80211 driver before getting in mainline +- +-Bugs +-==== +-- Oops on AMPDU traffic, to be solved by new ucode (currently under test) +- +-brcmfmac and brcmsmac +-===================== +-- ASSERTS not allowed in mainline, replace by warning + error handling +-- Replace printk and WL_ERROR() with proper routines +- +-brcmfmac +-===================== +-- Replace driver's proprietary ssb interface with generic kernel ssb module +-- Build and test on 64 bit linux kernel +diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile +deleted file mode 100644 +index c5ec562..0000000 +--- a/drivers/staging/brcm80211/brcmfmac/Makefile ++++ /dev/null +@@ -1,56 +0,0 @@ +-# +-# 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 := \ +- -DARP_OFFLOAD_SUPPORT \ +- -DBCMLXSDMMC \ +- -DBCMPLATFORM_BUS \ +- -DBCMSDIO \ +- -DBDC \ +- -DBRCM_FULLMAC \ +- -DDHD_FIRSTREAD=64 \ +- -DDHD_SCHED \ +- -DDHD_SDALIGN=64 \ +- -DEMBEDDED_PLATFORM \ +- -DMAX_HDR_READ=64 \ +- -DMMC_SDIO_ABORT \ +- -DPKT_FILTER_SUPPORT \ +- -DSHOW_EVENTS \ +- -DTOE +- +-ccflags-$(CONFIG_BRCMDBG) += -DDHD_DEBUG +- +-ccflags-y += \ +- -Idrivers/staging/brcm80211/brcmfmac \ +- -Idrivers/staging/brcm80211/include +- +-DHDOFILES = \ +- wl_cfg80211.o \ +- wl_iw.o \ +- dhd_cdc.o \ +- dhd_common.o \ +- dhd_custom_gpio.o \ +- dhd_sdio.o \ +- dhd_linux.o \ +- dhd_linux_sched.o \ +- bcmsdh.o \ +- bcmsdh_linux.o \ +- bcmsdh_sdmmc.o \ +- bcmsdh_sdmmc_linux.o +- +-obj-$(CONFIG_BRCMFMAC) += brcmfmac.o +-brcmfmac-objs += $(DHDOFILES) +diff --git a/drivers/staging/brcm80211/brcmfmac/README b/drivers/staging/brcm80211/brcmfmac/README +deleted file mode 100644 +index 139597f..0000000 +--- a/drivers/staging/brcm80211/brcmfmac/README ++++ /dev/null +@@ -1,2 +0,0 @@ +- +- +diff --git a/drivers/staging/brcm80211/brcmfmac/aiutils.c b/drivers/staging/brcm80211/brcmfmac/aiutils.c +deleted file mode 100644 +index e648086..0000000 +--- a/drivers/staging/brcm80211/brcmfmac/aiutils.c ++++ /dev/null +@@ -1 +0,0 @@ +-#include "../util/aiutils.c" +diff --git a/drivers/staging/brcm80211/brcmfmac/bcmcdc.h b/drivers/staging/brcm80211/brcmfmac/bcmcdc.h +deleted file mode 100644 +index ed4c4a5..0000000 +--- a/drivers/staging/brcm80211/brcmfmac/bcmcdc.h ++++ /dev/null +@@ -1,98 +0,0 @@ +-/* +- * 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. +- */ +-#include <linux/if_ether.h> +- +-typedef struct cdc_ioctl { +- u32 cmd; /* ioctl command value */ +- u32 len; /* lower 16: output buflen; upper 16: +- input buflen (excludes header) */ +- u32 flags; /* flag defns given below */ +- u32 status; /* status code returned from the device */ +-} cdc_ioctl_t; +- +-/* Max valid buffer size that can be sent to the dongle */ +-#define CDC_MAX_MSG_SIZE (ETH_FRAME_LEN+ETH_FCS_LEN) +- +-/* len field is divided into input and output buffer lengths */ +-#define CDCL_IOC_OUTLEN_MASK 0x0000FFFF /* maximum or expected +- response length, */ +- /* excluding IOCTL header */ +-#define CDCL_IOC_OUTLEN_SHIFT 0 +-#define CDCL_IOC_INLEN_MASK 0xFFFF0000 /* input buffer length, +- excluding IOCTL header */ +-#define CDCL_IOC_INLEN_SHIFT 16 +- +-/* CDC flag definitions */ +-#define CDCF_IOC_ERROR 0x01 /* 0=success, 1=ioctl cmd failed */ +-#define CDCF_IOC_SET 0x02 /* 0=get, 1=set cmd */ +-#define CDCF_IOC_IF_MASK 0xF000 /* I/F index */ +-#define CDCF_IOC_IF_SHIFT 12 +-#define CDCF_IOC_ID_MASK 0xFFFF0000 /* used to uniquely id an ioctl +- req/resp pairing */ +-#define CDCF_IOC_ID_SHIFT 16 /* # of bits of shift for ID Mask */ +- +-#define CDC_IOC_IF_IDX(flags) \ +- (((flags) & CDCF_IOC_IF_MASK) >> CDCF_IOC_IF_SHIFT) +-#define CDC_IOC_ID(flags) \ +- (((flags) & CDCF_IOC_ID_MASK) >> CDCF_IOC_ID_SHIFT) +- +-#define CDC_GET_IF_IDX(hdr) \ +- ((int)((((hdr)->flags) & CDCF_IOC_IF_MASK) >> CDCF_IOC_IF_SHIFT)) +-#define CDC_SET_IF_IDX(hdr, idx) \ +- ((hdr)->flags = (((hdr)->flags & ~CDCF_IOC_IF_MASK) | \ +- ((idx) << CDCF_IOC_IF_SHIFT))) +- +-/* +- * BDC header +- * +- * The BDC header is used on data packets to convey priority across USB. +- */ +- +-#define BDC_HEADER_LEN 4 +- +-#define BDC_PROTO_VER 1 /* Protocol version */ +- +-#define BDC_FLAG_VER_MASK 0xf0 /* Protocol version mask */ +-#define BDC_FLAG_VER_SHIFT 4 /* Protocol version shift */ +- +-#define BDC_FLAG__UNUSED 0x03 /* Unassigned */ +-#define BDC_FLAG_SUM_GOOD 0x04 /* Dongle has verified good +- RX checksums */ +-#define BDC_FLAG_SUM_NEEDED 0x08 /* Dongle needs to do TX checksums */ +- +-#define BDC_PRIORITY_MASK 0x7 +- +-#define BDC_FLAG2_FC_FLAG 0x10 /* flag to indicate if pkt contains */ +- /* FLOW CONTROL info only */ +-#define BDC_PRIORITY_FC_SHIFT 4 /* flow control info shift */ +- +-#define BDC_FLAG2_IF_MASK 0x0f /* APSTA: interface on which the +- packet was received */ +-#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 bdc_header { +- u8 flags; /* Flags */ +- u8 priority; /* 802.1d Priority 0:2 bits, 4:7 flow +- control info for usb */ +- u8 flags2; +- u8 rssi; +-}; +diff --git a/drivers/staging/brcm80211/brcmfmac/bcmchip.h b/drivers/staging/brcm80211/brcmfmac/bcmchip.h +deleted file mode 100644 +index c0d4c3b..0000000 +--- a/drivers/staging/brcm80211/brcmfmac/bcmchip.h ++++ /dev/null +@@ -1,35 +0,0 @@ +-/* +- * Copyright (c) 2011 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 _bcmchip_h_ +-#define _bcmchip_h_ +- +-/* Core reg address translation */ +-#define CORE_CC_REG(base, field) (base + offsetof(chipcregs_t, field)) +-#define CORE_BUS_REG(base, field) (base + offsetof(sdpcmd_regs_t, field)) +-#define CORE_SB(base, field) \ +- (base + SBCONFIGOFF + offsetof(sbconfig_t, field)) +- +-/* bcm4329 */ +-/* SDIO device core, ID 0x829 */ +-#define BCM4329_CORE_BUS_BASE 0x18011000 +-/* internal memory core, ID 0x80e */ +-#define BCM4329_CORE_SOCRAM_BASE 0x18003000 +-/* ARM Cortex M3 core, ID 0x82a */ +-#define BCM4329_CORE_ARM_BASE 0x18002000 +-#define BCM4329_RAMSIZE 0x48000 +- +-#endif /* _bcmchip_h_ */ +diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h +deleted file mode 100644 +index 53c3291..0000000 +--- a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h ++++ /dev/null +@@ -1,113 +0,0 @@ +-/* +- * 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 _sdio_api_h_ +-#define _sdio_api_h_ +- +-#define SDIOH_API_RC_SUCCESS (0x00) +-#define SDIOH_API_RC_FAIL (0x01) +-#define SDIOH_API_SUCCESS(status) (status == 0) +- +-#define SDIOH_READ 0 /* Read request */ +-#define SDIOH_WRITE 1 /* Write request */ +- +-#define SDIOH_DATA_FIX 0 /* Fixed addressing */ +-#define SDIOH_DATA_INC 1 /* Incremental addressing */ +- +-#define SDIOH_CMD_TYPE_NORMAL 0 /* Normal command */ +-#define SDIOH_CMD_TYPE_APPEND 1 /* Append command */ +-#define SDIOH_CMD_TYPE_CUTTHRU 2 /* Cut-through command */ +- +-#define SDIOH_DATA_PIO 0 /* PIO mode */ +-#define SDIOH_DATA_DMA 1 /* DMA mode */ +- +-typedef int SDIOH_API_RC; +- +-/* SDio Host structure */ +-typedef struct sdioh_info sdioh_info_t; +- +-/* callback function, taking one arg */ +-typedef void (*sdioh_cb_fn_t) (void *); +- +-/* attach, return handler on success, NULL if failed. +- * The handler shall be provided by all subsequent calls. No local cache +- * cfghdl points to the starting address of pci device mapped memory +- */ +-extern sdioh_info_t *sdioh_attach(void *cfghdl, uint irq); +-extern SDIOH_API_RC sdioh_detach(sdioh_info_t *si); +-extern SDIOH_API_RC sdioh_interrupt_register(sdioh_info_t *si, +- sdioh_cb_fn_t fn, void *argh); +-extern SDIOH_API_RC sdioh_interrupt_deregister(sdioh_info_t *si); +- +-/* query whether SD interrupt is enabled or not */ +-extern SDIOH_API_RC sdioh_interrupt_query(sdioh_info_t *si, bool *onoff); +- +-/* enable or disable SD interrupt */ +-extern SDIOH_API_RC sdioh_interrupt_set(sdioh_info_t *si, bool enable_disable); +- +-#if defined(DHD_DEBUG) +-extern bool sdioh_interrupt_pending(sdioh_info_t *si); +-#endif +- +-extern int sdioh_claim_host_and_lock(sdioh_info_t *si); +-extern int sdioh_release_host_and_unlock(sdioh_info_t *si); +- +-/* read or write one byte using cmd52 */ +-extern SDIOH_API_RC sdioh_request_byte(sdioh_info_t *si, uint rw, uint fnc, +- uint addr, u8 *byte); +- +-/* read or write 2/4 bytes using cmd53 */ +-extern SDIOH_API_RC sdioh_request_word(sdioh_info_t *si, uint cmd_type, +- uint rw, uint fnc, uint addr, +- u32 *word, uint nbyte); +- +-/* read or write any buffer using cmd53 */ +-extern SDIOH_API_RC sdioh_request_buffer(sdioh_info_t *si, uint pio_dma, +- uint fix_inc, uint rw, uint fnc_num, +- u32 addr, uint regwidth, +- u32 buflen, u8 *buffer, +- struct sk_buff *pkt); +- +-/* get cis data */ +-extern SDIOH_API_RC sdioh_cis_read(sdioh_info_t *si, uint fuc, u8 *cis, +- u32 length); +- +-extern SDIOH_API_RC sdioh_cfg_read(sdioh_info_t *si, uint fuc, u32 addr, +- u8 *data); +-extern SDIOH_API_RC sdioh_cfg_write(sdioh_info_t *si, uint fuc, u32 addr, +- u8 *data); +- +-/* query number of io functions */ +-extern uint sdioh_query_iofnum(sdioh_info_t *si); +- +-/* handle iovars */ +-extern int sdioh_iovar_op(sdioh_info_t *si, const char *name, +- void *params, int plen, void *arg, int len, bool set); +- +-/* Issue abort to the specified function and clear controller as needed */ +-extern int sdioh_abort(sdioh_info_t *si, uint fnc); +- +-/* Start and Stop SDIO without re-enumerating the SD card. */ +-extern int sdioh_start(sdioh_info_t *si, int stage); +-extern int sdioh_stop(sdioh_info_t *si); +- +-/* Reset and re-initialize the device */ +-extern int sdioh_sdio_reset(sdioh_info_t *si); +- +-/* Helper function */ +-void *bcmsdh_get_sdioh(bcmsdh_info_t *sdh); +- +-#endif /* _sdio_api_h_ */ +diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +deleted file mode 100644 +index 3750fcf..0000000 +--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c ++++ /dev/null +@@ -1,631 +0,0 @@ +-/* +- * 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. +- */ +-/* ****************** BCMSDH Interface Functions *************************** */ +- +-#include <linux/types.h> +-#include <linux/netdevice.h> +-#include <linux/pci_ids.h> +-#include <bcmdefs.h> +-#include <bcmdevs.h> +-#include <bcmutils.h> +-#include <hndsoc.h> +- +-#include <bcmsdh.h> /* BRCM API for SDIO +- clients (such as wl, dhd) */ +-#include <bcmsdbus.h> /* common SDIO/controller interface */ +-#include <sbsdio.h> /* BRCM sdio device core */ +- +-#include <sdio.h> /* sdio spec */ +-#include "dngl_stats.h" +-#include "dhd.h" +- +-#define SDIOH_API_ACCESS_RETRY_LIMIT 2 +-const uint bcmsdh_msglevel = BCMSDH_ERROR_VAL; +- +-struct bcmsdh_info { +- bool init_success; /* underlying driver successfully attached */ +- void *sdioh; /* handler for sdioh */ +- u32 vendevid; /* Target Vendor and Device ID on SD bus */ +- bool regfail; /* Save status of last +- reg_read/reg_write call */ +- u32 sbwad; /* Save backplane window address */ +-}; +-/* local copy of bcm sd handler */ +-bcmsdh_info_t *l_bcmsdh; +- +-#if defined(OOB_INTR_ONLY) && defined(HW_OOB) +-extern int sdioh_enable_hw_oob_intr(void *sdioh, bool enable); +- +-void bcmsdh_enable_hw_oob_intr(bcmsdh_info_t *sdh, bool enable) +-{ +- sdioh_enable_hw_oob_intr(sdh->sdioh, enable); +-} +-#endif +- +-bcmsdh_info_t *bcmsdh_attach(void *cfghdl, void **regsva, uint irq) +-{ +- bcmsdh_info_t *bcmsdh; +- +- bcmsdh = kzalloc(sizeof(bcmsdh_info_t), GFP_ATOMIC); +- if (bcmsdh == NULL) { +- BCMSDH_ERROR(("bcmsdh_attach: out of memory")); +- return NULL; +- } +- +- /* save the handler locally */ +- l_bcmsdh = bcmsdh; +- +- bcmsdh->sdioh = sdioh_attach(cfghdl, irq); +- if (!bcmsdh->sdioh) { +- bcmsdh_detach(bcmsdh); +- return NULL; +- } +- +- bcmsdh->init_success = true; +- +- *regsva = (u32 *) SI_ENUM_BASE; +- +- /* Report the BAR, to fix if needed */ +- bcmsdh->sbwad = SI_ENUM_BASE; +- return bcmsdh; +-} +- +-int bcmsdh_detach(void *sdh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- +- if (bcmsdh != NULL) { +- if (bcmsdh->sdioh) { +- sdioh_detach(bcmsdh->sdioh); +- bcmsdh->sdioh = NULL; +- } +- kfree(bcmsdh); +- } +- +- l_bcmsdh = NULL; +- return 0; +-} +- +-int +-bcmsdh_iovar_op(void *sdh, const char *name, +- void *params, int plen, void *arg, int len, bool set) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- return sdioh_iovar_op(bcmsdh->sdioh, name, params, plen, arg, len, set); +-} +- +-bool bcmsdh_intr_query(void *sdh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- bool on; +- +- ASSERT(bcmsdh); +- status = sdioh_interrupt_query(bcmsdh->sdioh, &on); +- if (SDIOH_API_SUCCESS(status)) +- return false; +- else +- return on; +-} +- +-int bcmsdh_intr_enable(void *sdh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- ASSERT(bcmsdh); +- +- status = sdioh_interrupt_set(bcmsdh->sdioh, true); +- return SDIOH_API_SUCCESS(status) ? 0 : -EIO; +-} +- +-int bcmsdh_intr_disable(void *sdh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- ASSERT(bcmsdh); +- +- status = sdioh_interrupt_set(bcmsdh->sdioh, false); +- return SDIOH_API_SUCCESS(status) ? 0 : -EIO; +-} +- +-int bcmsdh_intr_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- ASSERT(bcmsdh); +- +- status = sdioh_interrupt_register(bcmsdh->sdioh, fn, argh); +- return SDIOH_API_SUCCESS(status) ? 0 : -EIO; +-} +- +-int bcmsdh_intr_dereg(void *sdh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- ASSERT(bcmsdh); +- +- status = sdioh_interrupt_deregister(bcmsdh->sdioh); +- return SDIOH_API_SUCCESS(status) ? 0 : -EIO; +-} +- +-#if defined(DHD_DEBUG) +-bool bcmsdh_intr_pending(void *sdh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- +- ASSERT(sdh); +- return sdioh_interrupt_pending(bcmsdh->sdioh); +-} +-#endif +- +-int bcmsdh_devremove_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh) +-{ +- ASSERT(sdh); +- +- /* don't support yet */ +- return -ENOTSUPP; +-} +- +-u8 bcmsdh_cfg_read(void *sdh, uint fnc_num, u32 addr, int *err) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT +- s32 retry = 0; +-#endif +- u8 data = 0; +- +- if (!bcmsdh) +- bcmsdh = l_bcmsdh; +- +- ASSERT(bcmsdh->init_success); +- +-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT +- do { +- if (retry) /* wait for 1 ms till bus get settled down */ +- udelay(1000); +-#endif +- status = +- sdioh_cfg_read(bcmsdh->sdioh, fnc_num, addr, +- (u8 *) &data); +-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT +- } while (!SDIOH_API_SUCCESS(status) +- && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT)); +-#endif +- if (err) +- *err = (SDIOH_API_SUCCESS(status) ? 0 : -EIO); +- +- BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n", +- __func__, fnc_num, addr, data)); +- +- return data; +-} +- +-void +-bcmsdh_cfg_write(void *sdh, uint fnc_num, u32 addr, u8 data, int *err) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT +- s32 retry = 0; +-#endif +- +- if (!bcmsdh) +- bcmsdh = l_bcmsdh; +- +- ASSERT(bcmsdh->init_success); +- +-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT +- do { +- if (retry) /* wait for 1 ms till bus get settled down */ +- udelay(1000); +-#endif +- status = +- sdioh_cfg_write(bcmsdh->sdioh, fnc_num, addr, +- (u8 *) &data); +-#ifdef SDIOH_API_ACCESS_RETRY_LIMIT +- } while (!SDIOH_API_SUCCESS(status) +- && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT)); +-#endif +- if (err) +- *err = SDIOH_API_SUCCESS(status) ? 0 : -EIO; +- +- BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n", +- __func__, fnc_num, addr, data)); +-} +- +-u32 bcmsdh_cfg_read_word(void *sdh, uint fnc_num, u32 addr, int *err) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- u32 data = 0; +- +- if (!bcmsdh) +- bcmsdh = l_bcmsdh; +- +- ASSERT(bcmsdh->init_success); +- +- status = +- sdioh_request_word(bcmsdh->sdioh, SDIOH_CMD_TYPE_NORMAL, SDIOH_READ, +- fnc_num, addr, &data, 4); +- +- if (err) +- *err = (SDIOH_API_SUCCESS(status) ? 0 : -EIO); +- +- BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n", +- __func__, fnc_num, addr, data)); +- +- return data; +-} +- +-void +-bcmsdh_cfg_write_word(void *sdh, uint fnc_num, u32 addr, u32 data, +- int *err) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- +- if (!bcmsdh) +- bcmsdh = l_bcmsdh; +- +- ASSERT(bcmsdh->init_success); +- +- status = +- sdioh_request_word(bcmsdh->sdioh, SDIOH_CMD_TYPE_NORMAL, +- SDIOH_WRITE, fnc_num, addr, &data, 4); +- +- if (err) +- *err = (SDIOH_API_SUCCESS(status) ? 0 : -EIO); +- +- BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n", +- __func__, fnc_num, addr, data)); +-} +- +-int bcmsdh_cis_read(void *sdh, uint func, u8 * cis, uint length) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- +- u8 *tmp_buf, *tmp_ptr; +- u8 *ptr; +- bool ascii = func & ~0xf; +- func &= 0x7; +- +- if (!bcmsdh) +- bcmsdh = l_bcmsdh; +- +- ASSERT(bcmsdh->init_success); +- ASSERT(cis); +- ASSERT(length <= SBSDIO_CIS_SIZE_LIMIT); +- +- status = sdioh_cis_read(bcmsdh->sdioh, func, cis, length); +- +- if (ascii) { +- /* Move binary bits to tmp and format them +- into the provided buffer. */ +- tmp_buf = kmalloc(length, GFP_ATOMIC); +- if (tmp_buf == NULL) { +- BCMSDH_ERROR(("%s: out of memory\n", __func__)); +- return -ENOMEM; +- } +- memcpy(tmp_buf, cis, length); +- for (tmp_ptr = tmp_buf, ptr = cis; ptr < (cis + length - 4); +- tmp_ptr++) { +- ptr += sprintf((char *)ptr, "%.2x ", *tmp_ptr & 0xff); +- if ((((tmp_ptr - tmp_buf) + 1) & 0xf) == 0) +- ptr += sprintf((char *)ptr, "\n"); +- } +- kfree(tmp_buf); +- } +- +- return SDIOH_API_SUCCESS(status) ? 0 : -EIO; +-} +- +-static int bcmsdhsdio_set_sbaddr_window(void *sdh, u32 address) +-{ +- int err = 0; +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- bcmsdh_cfg_write(bcmsdh, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRLOW, +- (address >> 8) & SBSDIO_SBADDRLOW_MASK, &err); +- if (!err) +- bcmsdh_cfg_write(bcmsdh, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRMID, +- (address >> 16) & SBSDIO_SBADDRMID_MASK, &err); +- if (!err) +- bcmsdh_cfg_write(bcmsdh, SDIO_FUNC_1, SBSDIO_FUNC1_SBADDRHIGH, +- (address >> 24) & SBSDIO_SBADDRHIGH_MASK, +- &err); +- +- return err; +-} +- +-u32 bcmsdh_reg_read(void *sdh, u32 addr, uint size) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- u32 word = 0; +- uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; +- +- BCMSDH_INFO(("%s:fun = 1, addr = 0x%x, ", __func__, addr)); +- +- if (!bcmsdh) +- bcmsdh = l_bcmsdh; +- +- ASSERT(bcmsdh->init_success); +- +- if (bar0 != bcmsdh->sbwad) { +- if (bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0)) +- return 0xFFFFFFFF; +- +- bcmsdh->sbwad = bar0; +- } +- +- addr &= SBSDIO_SB_OFT_ADDR_MASK; +- if (size == 4) +- addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; +- +- status = sdioh_request_word(bcmsdh->sdioh, SDIOH_CMD_TYPE_NORMAL, +- SDIOH_READ, SDIO_FUNC_1, addr, &word, size); +- +- bcmsdh->regfail = !(SDIOH_API_SUCCESS(status)); +- +- BCMSDH_INFO(("u32data = 0x%x\n", word)); +- +- /* if ok, return appropriately masked word */ +- if (SDIOH_API_SUCCESS(status)) { +- switch (size) { +- case sizeof(u8): +- return word & 0xff; +- case sizeof(u16): +- return word & 0xffff; +- case sizeof(u32): +- return word; +- default: +- bcmsdh->regfail = true; +- +- } +- } +- +- /* otherwise, bad sdio access or invalid size */ +- BCMSDH_ERROR(("%s: error reading addr 0x%04x size %d\n", __func__, +- addr, size)); +- return 0xFFFFFFFF; +-} +- +-u32 bcmsdh_reg_write(void *sdh, u32 addr, uint size, u32 data) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; +- int err = 0; +- +- BCMSDH_INFO(("%s:fun = 1, addr = 0x%x, uint%ddata = 0x%x\n", +- __func__, addr, size * 8, data)); +- +- if (!bcmsdh) +- bcmsdh = l_bcmsdh; +- +- ASSERT(bcmsdh->init_success); +- +- if (bar0 != bcmsdh->sbwad) { +- err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0); +- if (err) +- return err; +- +- bcmsdh->sbwad = bar0; +- } +- +- addr &= SBSDIO_SB_OFT_ADDR_MASK; +- if (size == 4) +- addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; +- status = +- sdioh_request_word(bcmsdh->sdioh, SDIOH_CMD_TYPE_NORMAL, +- SDIOH_WRITE, SDIO_FUNC_1, addr, &data, size); +- bcmsdh->regfail = !(SDIOH_API_SUCCESS(status)); +- +- if (SDIOH_API_SUCCESS(status)) +- return 0; +- +- BCMSDH_ERROR(("%s: error writing 0x%08x to addr 0x%04x size %d\n", +- __func__, data, addr, size)); +- return 0xFFFFFFFF; +-} +- +-bool bcmsdh_regfail(void *sdh) +-{ +- return ((bcmsdh_info_t *) sdh)->regfail; +-} +- +-int +-bcmsdh_recv_buf(void *sdh, u32 addr, uint fn, uint flags, +- u8 *buf, uint nbytes, struct sk_buff *pkt, +- bcmsdh_cmplt_fn_t complete, void *handle) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- uint incr_fix; +- uint width; +- uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; +- int err = 0; +- +- ASSERT(bcmsdh); +- ASSERT(bcmsdh->init_success); +- +- BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n", +- __func__, fn, addr, nbytes)); +- +- /* Async not implemented yet */ +- ASSERT(!(flags & SDIO_REQ_ASYNC)); +- if (flags & SDIO_REQ_ASYNC) +- return -ENOTSUPP; +- +- if (bar0 != bcmsdh->sbwad) { +- err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0); +- if (err) +- return err; +- +- bcmsdh->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; +- +- status = sdioh_request_buffer(bcmsdh->sdioh, SDIOH_DATA_PIO, incr_fix, +- SDIOH_READ, fn, addr, width, nbytes, buf, +- pkt); +- +- return SDIOH_API_SUCCESS(status) ? 0 : -EIO; +-} +- +-int +-bcmsdh_send_buf(void *sdh, u32 addr, uint fn, uint flags, +- u8 *buf, uint nbytes, void *pkt, +- bcmsdh_cmplt_fn_t complete, void *handle) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- uint incr_fix; +- uint width; +- uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; +- int err = 0; +- +- ASSERT(bcmsdh); +- ASSERT(bcmsdh->init_success); +- +- BCMSDH_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n", +- __func__, fn, addr, nbytes)); +- +- /* Async not implemented yet */ +- ASSERT(!(flags & SDIO_REQ_ASYNC)); +- if (flags & SDIO_REQ_ASYNC) +- return -ENOTSUPP; +- +- if (bar0 != bcmsdh->sbwad) { +- err = bcmsdhsdio_set_sbaddr_window(bcmsdh, bar0); +- if (err) +- return err; +- +- bcmsdh->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; +- +- status = sdioh_request_buffer(bcmsdh->sdioh, SDIOH_DATA_PIO, incr_fix, +- SDIOH_WRITE, fn, addr, width, nbytes, buf, +- pkt); +- +- return SDIOH_API_SUCCESS(status) ? 0 : -EIO; +-} +- +-int bcmsdh_rwdata(void *sdh, uint rw, u32 addr, u8 *buf, uint nbytes) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- SDIOH_API_RC status; +- +- ASSERT(bcmsdh); +- ASSERT(bcmsdh->init_success); +- ASSERT((addr & SBSDIO_SBWINDOW_MASK) == 0); +- +- addr &= SBSDIO_SB_OFT_ADDR_MASK; +- addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; +- +- status = +- sdioh_request_buffer(bcmsdh->sdioh, SDIOH_DATA_PIO, SDIOH_DATA_INC, +- (rw ? SDIOH_WRITE : SDIOH_READ), SDIO_FUNC_1, +- addr, 4, nbytes, buf, NULL); +- +- return SDIOH_API_SUCCESS(status) ? 0 : -EIO; +-} +- +-int bcmsdh_abort(void *sdh, uint fn) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- +- return sdioh_abort(bcmsdh->sdioh, fn); +-} +- +-int bcmsdh_start(void *sdh, int stage) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- +- return sdioh_start(bcmsdh->sdioh, stage); +-} +- +-int bcmsdh_stop(void *sdh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- +- return sdioh_stop(bcmsdh->sdioh); +-} +- +-int bcmsdh_query_device(void *sdh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- bcmsdh->vendevid = (PCI_VENDOR_ID_BROADCOM << 16) | 0; +- return bcmsdh->vendevid; +-} +- +-uint bcmsdh_query_iofnum(void *sdh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- +- if (!bcmsdh) +- bcmsdh = l_bcmsdh; +- +- return sdioh_query_iofnum(bcmsdh->sdioh); +-} +- +-int bcmsdh_reset(bcmsdh_info_t *sdh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- +- return sdioh_sdio_reset(bcmsdh->sdioh); +-} +- +-void *bcmsdh_get_sdioh(bcmsdh_info_t *sdh) +-{ +- ASSERT(sdh); +- return sdh->sdioh; +-} +- +-/* Function to pass device-status bits to DHD. */ +-u32 bcmsdh_get_dstatus(void *sdh) +-{ +- return 0; +-} +- +-u32 bcmsdh_cur_sbwad(void *sdh) +-{ +- bcmsdh_info_t *bcmsdh = (bcmsdh_info_t *) sdh; +- +- if (!bcmsdh) +- bcmsdh = l_bcmsdh; +- +- return bcmsdh->sbwad; +-} +- +-void bcmsdh_chipinfo(void *sdh, u32 chip, u32 chiprev) +-{ +- return; +-} +diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +deleted file mode 100644 +index 465f623..0000000 +--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c ++++ /dev/null +@@ -1,386 +0,0 @@ +-/* +- * 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. +- */ +- +-/** +- * @file bcmsdh_linux.c +- */ +- +-#define __UNDEF_NO_VERSION__ +- +-#include <linux/netdevice.h> +-#include <linux/pci.h> +-#include <linux/completion.h> +- +-#include <pcicfg.h> +-#include <bcmdefs.h> +-#include <bcmdevs.h> +-#include <bcmutils.h> +- +-#if defined(OOB_INTR_ONLY) +-#include <linux/irq.h> +-extern void dhdsdio_isr(void *args); +-#include <dngl_stats.h> +-#include <dhd.h> +-#endif /* defined(OOB_INTR_ONLY) */ +-#if defined(CONFIG_MACH_SANDGATE2G) || defined(CONFIG_MACH_LOGICPD_PXA270) +-#if !defined(BCMPLATFORM_BUS) +-#define BCMPLATFORM_BUS +-#endif /* !defined(BCMPLATFORM_BUS) */ +- +-#include <linux/platform_device.h> +-#endif /* CONFIG_MACH_SANDGATE2G */ +- +-#include "dngl_stats.h" +-#include "dhd.h" +- +-/** +- * SDIO Host Controller info +- */ +-typedef struct bcmsdh_hc bcmsdh_hc_t; +- +-struct bcmsdh_hc { +- bcmsdh_hc_t *next; +-#ifdef BCMPLATFORM_BUS +- struct device *dev; /* platform device handle */ +-#else +- struct pci_dev *dev; /* pci device handle */ +-#endif /* BCMPLATFORM_BUS */ +- void *regs; /* SDIO Host Controller address */ +- bcmsdh_info_t *sdh; /* SDIO Host Controller handle */ +- void *ch; +- unsigned int oob_irq; +- unsigned long oob_flags; /* OOB Host specifiction +- as edge and etc */ +- bool oob_irq_registered; +-#if defined(OOB_INTR_ONLY) +- spinlock_t irq_lock; +-#endif +-}; +-static bcmsdh_hc_t *sdhcinfo; +- +-/* driver info, initialized when bcmsdh_register is called */ +-static bcmsdh_driver_t drvinfo = { NULL, NULL }; +- +-/* debugging macros */ +-#define SDLX_MSG(x) +- +-/** +- * Checks to see if vendor and device IDs match a supported SDIO Host Controller. +- */ +-bool bcmsdh_chipmatch(u16 vendor, u16 device) +-{ +- /* Add other vendors and devices as required */ +- +-#ifdef BCMSDIOH_STD +- /* Check for Arasan host controller */ +- if (vendor == VENDOR_SI_IMAGE) +- return true; +- +- /* Check for BRCM 27XX Standard host controller */ +- if (device == BCM27XX_SDIOH_ID && vendor == PCI_VENDOR_ID_BROADCOM) +- return true; +- +- /* Check for BRCM Standard host controller */ +- if (device == SDIOH_FPGA_ID && vendor == PCI_VENDOR_ID_BROADCOM) +- return true; +- +- /* Check for TI PCIxx21 Standard host controller */ +- if (device == PCIXX21_SDIOH_ID && vendor == VENDOR_TI) +- return true; +- +- if (device == PCIXX21_SDIOH0_ID && vendor == VENDOR_TI) +- return true; +- +- /* Ricoh R5C822 Standard SDIO Host */ +- if (device == R5C822_SDIOH_ID && vendor == VENDOR_RICOH) +- return true; +- +- /* JMicron Standard SDIO Host */ +- if (device == JMICRON_SDIOH_ID && vendor == VENDOR_JMICRON) +- return true; +-#endif /* BCMSDIOH_STD */ +-#ifdef BCMSDIOH_SPI +- /* This is the PciSpiHost. */ +- if (device == SPIH_FPGA_ID && vendor == PCI_VENDOR_ID_BROADCOM) { +- return true; +- } +-#endif /* BCMSDIOH_SPI */ +- +- return false; +-} +- +-#if defined(BCMPLATFORM_BUS) +-#if defined(BCMLXSDMMC) +-/* forward declarations */ +-int bcmsdh_probe(struct device *dev); +-EXPORT_SYMBOL(bcmsdh_probe); +- +-int bcmsdh_remove(struct device *dev); +-EXPORT_SYMBOL(bcmsdh_remove); +- +-#else +-/* forward declarations */ +-static int __devinit bcmsdh_probe(struct device *dev); +-static int __devexit bcmsdh_remove(struct device *dev); +-#endif /* BCMLXSDMMC */ +- +-#ifndef BCMLXSDMMC +-static +-#endif /* BCMLXSDMMC */ +-int bcmsdh_probe(struct device *dev) +-{ +- bcmsdh_hc_t *sdhc = NULL; +- unsigned long regs = 0; +- bcmsdh_info_t *sdh = NULL; +-#if !defined(BCMLXSDMMC) && defined(BCMPLATFORM_BUS) +- struct platform_device *pdev; +- struct resource *r; +-#endif /* BCMLXSDMMC */ +- int irq = 0; +- u32 vendevid; +- unsigned long irq_flags = 0; +- +-#if !defined(BCMLXSDMMC) && defined(BCMPLATFORM_BUS) +- pdev = to_platform_device(dev); +- r = platform_get_resource(pdev, IORESOURCE_MEM, 0); +- irq = platform_get_irq(pdev, 0); +- if (!r || irq == NO_IRQ) +- return -ENXIO; +-#endif /* BCMLXSDMMC */ +- +-#if defined(OOB_INTR_ONLY) +-#ifdef HW_OOB +- irq_flags = +- IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL | +- IORESOURCE_IRQ_SHAREABLE; +-#else +- irq_flags = IRQF_TRIGGER_FALLING; +-#endif /* HW_OOB */ +- irq = dhd_customer_oob_irq_map(&irq_flags); +- if (irq < 0) { +- SDLX_MSG(("%s: Host irq is not defined\n", __func__)); +- return 1; +- } +-#endif /* defined(OOB_INTR_ONLY) */ +- /* allocate SDIO Host Controller state info */ +- sdhc = kzalloc(sizeof(bcmsdh_hc_t), GFP_ATOMIC); +- if (!sdhc) { +- SDLX_MSG(("%s: out of memory\n", __func__)); +- goto err; +- } +- sdhc->dev = (void *)dev; +- +-#ifdef BCMLXSDMMC +- sdh = bcmsdh_attach((void *)0, (void **)®s, irq); +- if (!sdh) { +- SDLX_MSG(("%s: bcmsdh_attach failed\n", __func__)); +- goto err; +- } +-#else +- sdh = bcmsdh_attach((void *)r->start, (void **)®s, irq); +- if (!sdh) { +- SDLX_MSG(("%s: bcmsdh_attach failed\n", __func__)); +- goto err; +- } +-#endif /* BCMLXSDMMC */ +- sdhc->sdh = sdh; +- sdhc->oob_irq = irq; +- sdhc->oob_flags = irq_flags; +- sdhc->oob_irq_registered = false; /* to make sure.. */ +-#if defined(OOB_INTR_ONLY) +- spin_lock_init(&sdhc->irq_lock); +-#endif +- +- /* chain SDIO Host Controller info together */ +- sdhc->next = sdhcinfo; +- sdhcinfo = sdhc; +- /* Read the vendor/device ID from the CIS */ +- vendevid = bcmsdh_query_device(sdh); +- +- /* try to attach to the target device */ +- sdhc->ch = drvinfo.attach((vendevid >> 16), (vendevid & 0xFFFF), +- 0, 0, 0, 0, (void *)regs, sdh); +- if (!sdhc->ch) { +- SDLX_MSG(("%s: device attach failed\n", __func__)); +- goto err; +- } +- +- return 0; +- +- /* error handling */ +-err: +- if (sdhc) { +- if (sdhc->sdh) +- bcmsdh_detach(sdhc->sdh); +- kfree(sdhc); +- } +- +- return -ENODEV; +-} +- +-#ifndef BCMLXSDMMC +-static +-#endif /* BCMLXSDMMC */ +-int bcmsdh_remove(struct device *dev) +-{ +- bcmsdh_hc_t *sdhc, *prev; +- +- sdhc = sdhcinfo; +- drvinfo.detach(sdhc->ch); +- bcmsdh_detach(sdhc->sdh); +- /* find the SDIO Host Controller state for this pdev +- and take it out from the list */ +- for (sdhc = sdhcinfo, prev = NULL; sdhc; sdhc = sdhc->next) { +- if (sdhc->dev == (void *)dev) { +- if (prev) +- prev->next = sdhc->next; +- else +- sdhcinfo = NULL; +- break; +- } +- prev = sdhc; +- } +- if (!sdhc) { +- SDLX_MSG(("%s: failed\n", __func__)); +- return 0; +- } +- +- /* release SDIO Host Controller info */ +- kfree(sdhc); +- +-#if !defined(BCMLXSDMMC) +- dev_set_drvdata(dev, NULL); +-#endif /* !defined(BCMLXSDMMC) */ +- +- return 0; +-} +-#endif /* BCMPLATFORM_BUS */ +- +-extern int sdio_function_init(void); +- +-int bcmsdh_register(bcmsdh_driver_t *driver) +-{ +- drvinfo = *driver; +- +- SDLX_MSG(("Linux Kernel SDIO/MMC Driver\n")); +- return sdio_function_init(); +-} +- +-extern void sdio_function_cleanup(void); +- +-void bcmsdh_unregister(void) +-{ +- sdio_function_cleanup(); +-} +- +-#if defined(OOB_INTR_ONLY) +-void bcmsdh_oob_intr_set(bool enable) +-{ +- static bool curstate = 1; +- unsigned long flags; +- +- spin_lock_irqsave(&sdhcinfo->irq_lock, flags); +- if (curstate != enable) { +- if (enable) +- enable_irq(sdhcinfo->oob_irq); +- else +- disable_irq_nosync(sdhcinfo->oob_irq); +- curstate = enable; +- } +- spin_unlock_irqrestore(&sdhcinfo->irq_lock, flags); +-} +- +-static irqreturn_t wlan_oob_irq(int irq, void *dev_id) +-{ +- dhd_pub_t *dhdp; +- +- dhdp = (dhd_pub_t *) dev_get_drvdata(sdhcinfo->dev); +- +- bcmsdh_oob_intr_set(0); +- +- if (dhdp == NULL) { +- SDLX_MSG(("Out of band GPIO interrupt fired way too early\n")); +- return IRQ_HANDLED; +- } +- +- dhdsdio_isr((void *)dhdp->bus); +- +- return IRQ_HANDLED; +-} +- +-int bcmsdh_register_oob_intr(void *dhdp) +-{ +- int error = 0; +- +- SDLX_MSG(("%s Enter\n", __func__)); +- +- sdhcinfo->oob_flags = +- IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL | +- IORESOURCE_IRQ_SHAREABLE; +- dev_set_drvdata(sdhcinfo->dev, dhdp); +- +- if (!sdhcinfo->oob_irq_registered) { +- SDLX_MSG(("%s IRQ=%d Type=%X\n", __func__, +- (int)sdhcinfo->oob_irq, (int)sdhcinfo->oob_flags)); +- /* Refer to customer Host IRQ docs about +- proper irqflags definition */ +- error = +- request_irq(sdhcinfo->oob_irq, wlan_oob_irq, +- sdhcinfo->oob_flags, "bcmsdh_sdmmc", NULL); +- if (error) +- return -ENODEV; +- +- irq_set_irq_wake(sdhcinfo->oob_irq, 1); +- sdhcinfo->oob_irq_registered = true; +- } +- +- return 0; +-} +- +-void bcmsdh_unregister_oob_intr(void) +-{ +- SDLX_MSG(("%s: Enter\n", __func__)); +- +- irq_set_irq_wake(sdhcinfo->oob_irq, 0); +- disable_irq(sdhcinfo->oob_irq); /* just in case.. */ +- free_irq(sdhcinfo->oob_irq, NULL); +- sdhcinfo->oob_irq_registered = false; +-} +-#endif /* defined(OOB_INTR_ONLY) */ +-/* Module parameters specific to each host-controller driver */ +- +-extern uint sd_msglevel; /* Debug message level */ +-module_param(sd_msglevel, uint, 0); +- +-extern uint sd_power; /* 0 = SD Power OFF, +- 1 = SD Power ON. */ +-module_param(sd_power, uint, 0); +- +-extern uint sd_clock; /* SD Clock Control, 0 = SD Clock OFF, +- 1 = SD Clock ON */ +-module_param(sd_clock, uint, 0); +- +-extern uint sd_divisor; /* Divisor (-1 means external clock) */ +-module_param(sd_divisor, uint, 0); +- +-extern uint sd_sdmode; /* Default is SD4, 0=SPI, 1=SD1, 2=SD4 */ +-module_param(sd_sdmode, uint, 0); +- +-extern uint sd_hiok; /* Ok to use hi-speed mode */ +-module_param(sd_hiok, uint, 0); +- +-extern uint sd_f2_blocksize; +-module_param(sd_f2_blocksize, int, 0); +diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +deleted file mode 100644 +index c0ffbd3..0000000 +--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c ++++ /dev/null +@@ -1,1239 +0,0 @@ +-/* +- * 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. +- */ +-#include <linux/types.h> +-#include <linux/netdevice.h> +-#include <bcmdefs.h> +-#include <bcmdevs.h> +-#include <bcmutils.h> +-#include <sdio.h> /* SDIO Device and Protocol Specs */ +-#include <sdioh.h> /* SDIO Host Controller Specification */ +-#include <bcmsdbus.h> /* bcmsdh to/from specific controller APIs */ +-#include <sdiovar.h> /* ioctl/iovars */ +- +-#include <linux/mmc/core.h> +-#include <linux/mmc/sdio_func.h> +-#include <linux/mmc/sdio_ids.h> +-#include <linux/suspend.h> +- +-#include <dngl_stats.h> +-#include <dhd.h> +- +-#include "bcmsdh_sdmmc.h" +- +-extern int sdio_function_init(void); +-extern void sdio_function_cleanup(void); +- +-#if !defined(OOB_INTR_ONLY) +-static void IRQHandler(struct sdio_func *func); +-static void IRQHandlerF2(struct sdio_func *func); +-#endif /* !defined(OOB_INTR_ONLY) */ +-static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, u32 regaddr); +-extern int sdio_reset_comm(struct mmc_card *card); +- +-extern PBCMSDH_SDMMC_INSTANCE gInstance; +- +-uint sd_sdmode = SDIOH_MODE_SD4; /* Use SD4 mode by default */ +-uint sd_f2_blocksize = 512; /* Default blocksize */ +- +-uint sd_divisor = 2; /* Default 48MHz/2 = 24MHz */ +- +-uint sd_power = 1; /* Default to SD Slot powered ON */ +-uint sd_clock = 1; /* Default to SD Clock turned ON */ +-uint sd_hiok = false; /* Don't use hi-speed mode by default */ +-uint sd_msglevel = 0x01; +-uint sd_use_dma = true; +-DHD_PM_RESUME_WAIT_INIT(sdioh_request_byte_wait); +-DHD_PM_RESUME_WAIT_INIT(sdioh_request_word_wait); +-DHD_PM_RESUME_WAIT_INIT(sdioh_request_packet_wait); +-DHD_PM_RESUME_WAIT_INIT(sdioh_request_buffer_wait); +- +-#define DMA_ALIGN_MASK 0x03 +- +-int sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, u32 regaddr, +- int regsize, u32 *data); +- +-void sdioh_sdio_set_host_pm_flags(int flag) +-{ +- if (sdio_set_host_pm_flags(gInstance->func[1], flag)) +- printk(KERN_ERR "%s: Failed to set pm_flags 0x%08x\n",\ +- __func__, (unsigned int)flag); +-} +- +-static int sdioh_sdmmc_card_enablefuncs(sdioh_info_t *sd) +-{ +- int err_ret; +- u32 fbraddr; +- u8 func; +- +- sd_trace(("%s\n", __func__)); +- +- /* Get the Card's common CIS address */ +- sd->com_cis_ptr = sdioh_sdmmc_get_cisaddr(sd, SDIOD_CCCR_CISPTR_0); +- sd->func_cis_ptr[0] = sd->com_cis_ptr; +- sd_info(("%s: Card's Common CIS Ptr = 0x%x\n", __func__, +- sd->com_cis_ptr)); +- +- /* Get the Card's function CIS (for each function) */ +- for (fbraddr = SDIOD_FBR_STARTADDR, func = 1; +- func <= sd->num_funcs; func++, fbraddr += SDIOD_FBR_SIZE) { +- sd->func_cis_ptr[func] = +- sdioh_sdmmc_get_cisaddr(sd, SDIOD_FBR_CISPTR_0 + fbraddr); +- sd_info(("%s: Function %d CIS Ptr = 0x%x\n", __func__, func, +- sd->func_cis_ptr[func])); +- } +- +- sd->func_cis_ptr[0] = sd->com_cis_ptr; +- sd_info(("%s: Card's Common CIS Ptr = 0x%x\n", __func__, +- sd->com_cis_ptr)); +- +- /* Enable Function 1 */ +- sdio_claim_host(gInstance->func[1]); +- err_ret = sdio_enable_func(gInstance->func[1]); +- sdio_release_host(gInstance->func[1]); +- if (err_ret) { +- sd_err(("bcmsdh_sdmmc: Failed to enable F1 Err: 0x%08x", +- err_ret)); +- } +- +- return false; +-} +- +-/* +- * Public entry points & extern's +- */ +-sdioh_info_t *sdioh_attach(void *bar0, uint irq) +-{ +- sdioh_info_t *sd; +- int err_ret; +- +- sd_trace(("%s\n", __func__)); +- +- if (gInstance == NULL) { +- sd_err(("%s: SDIO Device not present\n", __func__)); +- return NULL; +- } +- +- sd = kzalloc(sizeof(sdioh_info_t), GFP_ATOMIC); +- if (sd == NULL) { +- sd_err(("sdioh_attach: out of memory\n")); +- return NULL; +- } +- if (sdioh_sdmmc_osinit(sd) != 0) { +- sd_err(("%s:sdioh_sdmmc_osinit() failed\n", __func__)); +- kfree(sd); +- return NULL; +- } +- +- sd->num_funcs = 2; +- sd->sd_blockmode = true; +- sd->use_client_ints = true; +- sd->client_block_size[0] = 64; +- +- gInstance->sd = sd; +- +- /* Claim host controller */ +- sdio_claim_host(gInstance->func[1]); +- +- sd->client_block_size[1] = 64; +- err_ret = sdio_set_block_size(gInstance->func[1], 64); +- if (err_ret) +- sd_err(("bcmsdh_sdmmc: Failed to set F1 blocksize\n")); +- +- /* Release host controller F1 */ +- sdio_release_host(gInstance->func[1]); +- +- if (gInstance->func[2]) { +- /* Claim host controller F2 */ +- sdio_claim_host(gInstance->func[2]); +- +- sd->client_block_size[2] = sd_f2_blocksize; +- err_ret = +- sdio_set_block_size(gInstance->func[2], sd_f2_blocksize); +- if (err_ret) +- sd_err(("bcmsdh_sdmmc: Failed to set F2 blocksize " +- "to %d\n", sd_f2_blocksize)); +- +- /* Release host controller F2 */ +- sdio_release_host(gInstance->func[2]); +- } +- +- sdioh_sdmmc_card_enablefuncs(sd); +- +- sd_trace(("%s: Done\n", __func__)); +- return sd; +-} +- +-extern SDIOH_API_RC sdioh_detach(sdioh_info_t *sd) +-{ +- sd_trace(("%s\n", __func__)); +- +- if (sd) { +- +- /* Disable Function 2 */ +- sdio_claim_host(gInstance->func[2]); +- sdio_disable_func(gInstance->func[2]); +- sdio_release_host(gInstance->func[2]); +- +- /* Disable Function 1 */ +- sdio_claim_host(gInstance->func[1]); +- sdio_disable_func(gInstance->func[1]); +- sdio_release_host(gInstance->func[1]); +- +- /* deregister irq */ +- sdioh_sdmmc_osfree(sd); +- +- kfree(sd); +- } +- return SDIOH_API_RC_SUCCESS; +-} +- +-#if defined(OOB_INTR_ONLY) && defined(HW_OOB) +- +-extern SDIOH_API_RC sdioh_enable_func_intr(void) +-{ +- u8 reg; +- int err; +- +- if (gInstance->func[0]) { +- sdio_claim_host(gInstance->func[0]); +- +- reg = sdio_readb(gInstance->func[0], SDIOD_CCCR_INTEN, &err); +- if (err) { +- sd_err(("%s: error for read SDIO_CCCR_IENx : 0x%x\n", +- __func__, err)); +- sdio_release_host(gInstance->func[0]); +- return SDIOH_API_RC_FAIL; +- } +- +- /* Enable F1 and F2 interrupts, set master enable */ +- reg |= +- (INTR_CTL_FUNC1_EN | INTR_CTL_FUNC2_EN | +- INTR_CTL_MASTER_EN); +- +- sdio_writeb(gInstance->func[0], reg, SDIOD_CCCR_INTEN, &err); +- sdio_release_host(gInstance->func[0]); +- +- if (err) { +- sd_err(("%s: error for write SDIO_CCCR_IENx : 0x%x\n", +- __func__, err)); +- return SDIOH_API_RC_FAIL; +- } +- } +- +- return SDIOH_API_RC_SUCCESS; +-} +- +-extern SDIOH_API_RC sdioh_disable_func_intr(void) +-{ +- u8 reg; +- int err; +- +- if (gInstance->func[0]) { +- sdio_claim_host(gInstance->func[0]); +- reg = sdio_readb(gInstance->func[0], SDIOD_CCCR_INTEN, &err); +- if (err) { +- sd_err(("%s: error for read SDIO_CCCR_IENx : 0x%x\n", +- __func__, err)); +- sdio_release_host(gInstance->func[0]); +- return SDIOH_API_RC_FAIL; +- } +- +- reg &= ~(INTR_CTL_FUNC1_EN | INTR_CTL_FUNC2_EN); +- /* Disable master interrupt with the last function interrupt */ +- if (!(reg & 0xFE)) +- reg = 0; +- sdio_writeb(gInstance->func[0], reg, SDIOD_CCCR_INTEN, &err); +- +- sdio_release_host(gInstance->func[0]); +- if (err) { +- sd_err(("%s: error for write SDIO_CCCR_IENx : 0x%x\n", +- __func__, err)); +- return SDIOH_API_RC_FAIL; +- } +- } +- return SDIOH_API_RC_SUCCESS; +-} +-#endif /* defined(OOB_INTR_ONLY) && defined(HW_OOB) */ +- +-/* Configure callback to client when we receive client interrupt */ +-extern SDIOH_API_RC +-sdioh_interrupt_register(sdioh_info_t *sd, sdioh_cb_fn_t fn, void *argh) +-{ +- sd_trace(("%s: Entering\n", __func__)); +- if (fn == NULL) { +- sd_err(("%s: interrupt handler is NULL, not registering\n", +- __func__)); +- return SDIOH_API_RC_FAIL; +- } +-#if !defined(OOB_INTR_ONLY) +- sd->intr_handler = fn; +- sd->intr_handler_arg = argh; +- sd->intr_handler_valid = true; +- +- /* register and unmask irq */ +- if (gInstance->func[2]) { +- sdio_claim_host(gInstance->func[2]); +- sdio_claim_irq(gInstance->func[2], IRQHandlerF2); +- sdio_release_host(gInstance->func[2]); +- } +- +- if (gInstance->func[1]) { +- sdio_claim_host(gInstance->func[1]); +- sdio_claim_irq(gInstance->func[1], IRQHandler); +- sdio_release_host(gInstance->func[1]); +- } +-#elif defined(HW_OOB) +- sdioh_enable_func_intr(); +-#endif /* defined(OOB_INTR_ONLY) */ +- return SDIOH_API_RC_SUCCESS; +-} +- +-extern SDIOH_API_RC sdioh_interrupt_deregister(sdioh_info_t *sd) +-{ +- sd_trace(("%s: Entering\n", __func__)); +- +-#if !defined(OOB_INTR_ONLY) +- if (gInstance->func[1]) { +- /* register and unmask irq */ +- sdio_claim_host(gInstance->func[1]); +- sdio_release_irq(gInstance->func[1]); +- sdio_release_host(gInstance->func[1]); +- } +- +- if (gInstance->func[2]) { +- /* Claim host controller F2 */ +- sdio_claim_host(gInstance->func[2]); +- sdio_release_irq(gInstance->func[2]); +- /* Release host controller F2 */ +- sdio_release_host(gInstance->func[2]); +- } +- +- sd->intr_handler_valid = false; +- sd->intr_handler = NULL; +- sd->intr_handler_arg = NULL; +-#elif defined(HW_OOB) +- sdioh_disable_func_intr(); +-#endif /* !defined(OOB_INTR_ONLY) */ +- return SDIOH_API_RC_SUCCESS; +-} +- +-extern SDIOH_API_RC sdioh_interrupt_query(sdioh_info_t *sd, bool *onoff) +-{ +- sd_trace(("%s: Entering\n", __func__)); +- *onoff = sd->client_intr_enabled; +- return SDIOH_API_RC_SUCCESS; +-} +- +-#if defined(DHD_DEBUG) +-extern bool sdioh_interrupt_pending(sdioh_info_t *sd) +-{ +- return 0; +-} +-#endif +- +-uint sdioh_query_iofnum(sdioh_info_t *sd) +-{ +- return sd->num_funcs; +-} +- +-/* IOVar table */ +-enum { +- IOV_MSGLEVEL = 1, +- IOV_BLOCKMODE, +- IOV_BLOCKSIZE, +- IOV_DMA, +- IOV_USEINTS, +- IOV_NUMINTS, +- IOV_NUMLOCALINTS, +- IOV_HOSTREG, +- IOV_DEVREG, +- IOV_DIVISOR, +- IOV_SDMODE, +- IOV_HISPEED, +- IOV_HCIREGS, +- IOV_POWER, +- IOV_CLOCK, +- IOV_RXCHAIN +-}; +- +-const bcm_iovar_t sdioh_iovars[] = { +- {"sd_msglevel", IOV_MSGLEVEL, 0, IOVT_UINT32, 0}, +- {"sd_blockmode", IOV_BLOCKMODE, 0, IOVT_BOOL, 0}, +- {"sd_blocksize", IOV_BLOCKSIZE, 0, IOVT_UINT32, 0},/* ((fn << 16) | +- size) */ +- {"sd_dma", IOV_DMA, 0, IOVT_BOOL, 0}, +- {"sd_ints", IOV_USEINTS, 0, IOVT_BOOL, 0}, +- {"sd_numints", IOV_NUMINTS, 0, IOVT_UINT32, 0}, +- {"sd_numlocalints", IOV_NUMLOCALINTS, 0, IOVT_UINT32, 0}, +- {"sd_hostreg", IOV_HOSTREG, 0, IOVT_BUFFER, sizeof(sdreg_t)} +- , +- {"sd_devreg", IOV_DEVREG, 0, IOVT_BUFFER, sizeof(sdreg_t)} +- , +- {"sd_divisor", IOV_DIVISOR, 0, IOVT_UINT32, 0} +- , +- {"sd_power", IOV_POWER, 0, IOVT_UINT32, 0} +- , +- {"sd_clock", IOV_CLOCK, 0, IOVT_UINT32, 0} +- , +- {"sd_mode", IOV_SDMODE, 0, IOVT_UINT32, 100} +- , +- {"sd_highspeed", IOV_HISPEED, 0, IOVT_UINT32, 0} +- , +- {"sd_rxchain", IOV_RXCHAIN, 0, IOVT_BOOL, 0} +- , +- {NULL, 0, 0, 0, 0} +-}; +- +-int +-sdioh_iovar_op(sdioh_info_t *si, const char *name, +- void *params, int plen, void *arg, int len, bool set) +-{ +- const bcm_iovar_t *vi = NULL; +- int bcmerror = 0; +- int val_size; +- s32 int_val = 0; +- bool bool_val; +- u32 actionid; +- +- ASSERT(name); +- ASSERT(len >= 0); +- +- /* Get must have return space; Set does not take qualifiers */ +- ASSERT(set || (arg && len)); +- ASSERT(!set || (!params && !plen)); +- +- sd_trace(("%s: Enter (%s %s)\n", __func__, (set ? "set" : "get"), +- name)); +- +- vi = bcm_iovar_lookup(sdioh_iovars, name); +- if (vi == NULL) { +- bcmerror = -ENOTSUPP; +- goto exit; +- } +- +- bcmerror = bcm_iovar_lencheck(vi, arg, len, set); +- if (bcmerror != 0) +- goto exit; +- +- /* Set up params so get and set can share the convenience variables */ +- if (params == NULL) { +- params = arg; +- plen = len; +- } +- +- if (vi->type == IOVT_VOID) +- val_size = 0; +- else if (vi->type == IOVT_BUFFER) +- val_size = len; +- else +- val_size = sizeof(int); +- +- if (plen >= (int)sizeof(int_val)) +- memcpy(&int_val, params, sizeof(int_val)); +- +- bool_val = (int_val != 0) ? true : false; +- +- actionid = set ? IOV_SVAL(vi->varid) : IOV_GVAL(vi->varid); +- switch (actionid) { +- case IOV_GVAL(IOV_MSGLEVEL): +- int_val = (s32) sd_msglevel; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_SVAL(IOV_MSGLEVEL): +- sd_msglevel = int_val; +- break; +- +- case IOV_GVAL(IOV_BLOCKMODE): +- int_val = (s32) si->sd_blockmode; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_SVAL(IOV_BLOCKMODE): +- si->sd_blockmode = (bool) int_val; +- /* Haven't figured out how to make non-block mode with DMA */ +- break; +- +- case IOV_GVAL(IOV_BLOCKSIZE): +- if ((u32) int_val > si->num_funcs) { +- bcmerror = -EINVAL; +- break; +- } +- int_val = (s32) si->client_block_size[int_val]; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_SVAL(IOV_BLOCKSIZE): +- { +- uint func = ((u32) int_val >> 16); +- uint blksize = (u16) int_val; +- uint maxsize; +- +- if (func > si->num_funcs) { +- bcmerror = -EINVAL; +- break; +- } +- +- switch (func) { +- case 0: +- maxsize = 32; +- break; +- case 1: +- maxsize = BLOCK_SIZE_4318; +- break; +- case 2: +- maxsize = BLOCK_SIZE_4328; +- break; +- default: +- maxsize = 0; +- } +- if (blksize > maxsize) { +- bcmerror = -EINVAL; +- break; +- } +- if (!blksize) +- blksize = maxsize; +- +- /* Now set it */ +- si->client_block_size[func] = blksize; +- +- break; +- } +- +- case IOV_GVAL(IOV_RXCHAIN): +- int_val = false; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_GVAL(IOV_DMA): +- int_val = (s32) si->sd_use_dma; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_SVAL(IOV_DMA): +- si->sd_use_dma = (bool) int_val; +- break; +- +- case IOV_GVAL(IOV_USEINTS): +- int_val = (s32) si->use_client_ints; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_SVAL(IOV_USEINTS): +- si->use_client_ints = (bool) int_val; +- if (si->use_client_ints) +- si->intmask |= CLIENT_INTR; +- else +- si->intmask &= ~CLIENT_INTR; +- +- break; +- +- case IOV_GVAL(IOV_DIVISOR): +- int_val = (u32) sd_divisor; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_SVAL(IOV_DIVISOR): +- sd_divisor = int_val; +- break; +- +- case IOV_GVAL(IOV_POWER): +- int_val = (u32) sd_power; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_SVAL(IOV_POWER): +- sd_power = int_val; +- break; +- +- case IOV_GVAL(IOV_CLOCK): +- int_val = (u32) sd_clock; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_SVAL(IOV_CLOCK): +- sd_clock = int_val; +- break; +- +- case IOV_GVAL(IOV_SDMODE): +- int_val = (u32) sd_sdmode; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_SVAL(IOV_SDMODE): +- sd_sdmode = int_val; +- break; +- +- case IOV_GVAL(IOV_HISPEED): +- int_val = (u32) sd_hiok; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_SVAL(IOV_HISPEED): +- sd_hiok = int_val; +- break; +- +- case IOV_GVAL(IOV_NUMINTS): +- int_val = (s32) si->intrcount; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_GVAL(IOV_NUMLOCALINTS): +- int_val = (s32) 0; +- memcpy(arg, &int_val, val_size); +- break; +- +- case IOV_GVAL(IOV_HOSTREG): +- { +- sdreg_t *sd_ptr = (sdreg_t *) params; +- +- if (sd_ptr->offset < SD_SysAddr +- || sd_ptr->offset > SD_MaxCurCap) { +- sd_err(("%s: bad offset 0x%x\n", __func__, +- sd_ptr->offset)); +- bcmerror = -EINVAL; +- break; +- } +- +- sd_trace(("%s: rreg%d at offset %d\n", __func__, +- (sd_ptr->offset & 1) ? 8 +- : ((sd_ptr->offset & 2) ? 16 : 32), +- sd_ptr->offset)); +- if (sd_ptr->offset & 1) +- int_val = 8; /* sdioh_sdmmc_rreg8(si, +- sd_ptr->offset); */ +- else if (sd_ptr->offset & 2) +- int_val = 16; /* sdioh_sdmmc_rreg16(si, +- sd_ptr->offset); */ +- else +- int_val = 32; /* sdioh_sdmmc_rreg(si, +- sd_ptr->offset); */ +- +- memcpy(arg, &int_val, sizeof(int_val)); +- break; +- } +- +- case IOV_SVAL(IOV_HOSTREG): +- { +- sdreg_t *sd_ptr = (sdreg_t *) params; +- +- if (sd_ptr->offset < SD_SysAddr +- || sd_ptr->offset > SD_MaxCurCap) { +- sd_err(("%s: bad offset 0x%x\n", __func__, +- sd_ptr->offset)); +- bcmerror = -EINVAL; +- break; +- } +- +- sd_trace(("%s: wreg%d value 0x%08x at offset %d\n", +- __func__, sd_ptr->value, +- (sd_ptr->offset & 1) ? 8 +- : ((sd_ptr->offset & 2) ? 16 : 32), +- sd_ptr->offset)); +- break; +- } +- +- case IOV_GVAL(IOV_DEVREG): +- { +- sdreg_t *sd_ptr = (sdreg_t *) params; +- u8 data = 0; +- +- if (sdioh_cfg_read +- (si, sd_ptr->func, sd_ptr->offset, &data)) { +- bcmerror = -EIO; +- break; +- } +- +- int_val = (int)data; +- memcpy(arg, &int_val, sizeof(int_val)); +- break; +- } +- +- case IOV_SVAL(IOV_DEVREG): +- { +- sdreg_t *sd_ptr = (sdreg_t *) params; +- u8 data = (u8) sd_ptr->value; +- +- if (sdioh_cfg_write +- (si, sd_ptr->func, sd_ptr->offset, &data)) { +- bcmerror = -EIO; +- break; +- } +- break; +- } +- +- default: +- bcmerror = -ENOTSUPP; +- break; +- } +-exit: +- +- return bcmerror; +-} +- +-#if defined(OOB_INTR_ONLY) && defined(HW_OOB) +- +-SDIOH_API_RC sdioh_enable_hw_oob_intr(sdioh_info_t *sd, bool enable) +-{ +- SDIOH_API_RC status; +- u8 data; +- +- if (enable) +- data = 3; /* enable hw oob interrupt */ +- else +- data = 4; /* disable hw oob interrupt */ +- data |= 4; /* Active HIGH */ +- +- status = sdioh_request_byte(sd, SDIOH_WRITE, 0, 0xf2, &data); +- return status; +-} +-#endif /* defined(OOB_INTR_ONLY) && defined(HW_OOB) */ +- +-extern SDIOH_API_RC +-sdioh_cfg_read(sdioh_info_t *sd, uint fnc_num, u32 addr, u8 *data) +-{ +- SDIOH_API_RC status; +- /* No lock needed since sdioh_request_byte does locking */ +- status = sdioh_request_byte(sd, SDIOH_READ, fnc_num, addr, data); +- return status; +-} +- +-extern SDIOH_API_RC +-sdioh_cfg_write(sdioh_info_t *sd, uint fnc_num, u32 addr, u8 *data) +-{ +- /* No lock needed since sdioh_request_byte does locking */ +- SDIOH_API_RC status; +- status = sdioh_request_byte(sd, SDIOH_WRITE, fnc_num, addr, data); +- return status; +-} +- +-static int sdioh_sdmmc_get_cisaddr(sdioh_info_t *sd, u32 regaddr) +-{ +- /* read 24 bits and return valid 17 bit addr */ +- int i; +- u32 scratch, regdata; +- u8 *ptr = (u8 *)&scratch; +- for (i = 0; i < 3; i++) { +- if ((sdioh_sdmmc_card_regread(sd, 0, regaddr, 1, ®data)) != +- SUCCESS) +- sd_err(("%s: Can't read!\n", __func__)); +- +- *ptr++ = (u8) regdata; +- regaddr++; +- } +- +- /* Only the lower 17-bits are valid */ +- scratch = le32_to_cpu(scratch); +- scratch &= 0x0001FFFF; +- return scratch; +-} +- +-extern SDIOH_API_RC +-sdioh_cis_read(sdioh_info_t *sd, uint func, u8 *cisd, u32 length) +-{ +- u32 count; +- int offset; +- u32 foo; +- u8 *cis = cisd; +- +- sd_trace(("%s: Func = %d\n", __func__, func)); +- +- if (!sd->func_cis_ptr[func]) { +- memset(cis, 0, length); +- sd_err(("%s: no func_cis_ptr[%d]\n", __func__, func)); +- return SDIOH_API_RC_FAIL; +- } +- +- sd_err(("%s: func_cis_ptr[%d]=0x%04x\n", __func__, func, +- sd->func_cis_ptr[func])); +- +- for (count = 0; count < length; count++) { +- offset = sd->func_cis_ptr[func] + count; +- if (sdioh_sdmmc_card_regread(sd, 0, offset, 1, &foo) < 0) { +- sd_err(("%s: regread failed: Can't read CIS\n", +- __func__)); +- return SDIOH_API_RC_FAIL; +- } +- +- *cis = (u8) (foo & 0xff); +- cis++; +- } +- +- return SDIOH_API_RC_SUCCESS; +-} +- +-extern SDIOH_API_RC +-sdioh_request_byte(sdioh_info_t *sd, uint rw, uint func, uint regaddr, +- u8 *byte) +-{ +- int err_ret; +- +- sd_info(("%s: rw=%d, func=%d, addr=0x%05x\n", __func__, rw, func, +- regaddr)); +- +- DHD_PM_RESUME_WAIT(sdioh_request_byte_wait); +- DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL); +- if (rw) { /* CMD52 Write */ +- if (func == 0) { +- /* Can only directly write to some F0 registers. +- * Handle F2 enable +- * as a special case. +- */ +- if (regaddr == SDIOD_CCCR_IOEN) { +- if (gInstance->func[2]) { +- sdio_claim_host(gInstance->func[2]); +- if (*byte & SDIO_FUNC_ENABLE_2) { +- /* Enable Function 2 */ +- err_ret = +- sdio_enable_func +- (gInstance->func[2]); +- if (err_ret) +- sd_err(("bcmsdh_sdmmc: enable F2 failed:%d", +- err_ret)); +- } else { +- /* Disable Function 2 */ +- err_ret = +- sdio_disable_func +- (gInstance->func[2]); +- if (err_ret) +- sd_err(("bcmsdh_sdmmc: Disab F2 failed:%d", +- err_ret)); +- } +- sdio_release_host(gInstance->func[2]); +- } +- } +-#if defined(MMC_SDIO_ABORT) +- /* to allow abort command through F1 */ +- else if (regaddr == SDIOD_CCCR_IOABORT) { +- sdio_claim_host(gInstance->func[func]); +- /* +- * this sdio_f0_writeb() can be replaced +- * with another api +- * depending upon MMC driver change. +- * As of this time, this is temporaray one +- */ +- sdio_writeb(gInstance->func[func], *byte, +- regaddr, &err_ret); +- sdio_release_host(gInstance->func[func]); +- } +-#endif /* MMC_SDIO_ABORT */ +- else if (regaddr < 0xF0) { +- sd_err(("bcmsdh_sdmmc: F0 Wr:0x%02x: write " +- "disallowed\n", regaddr)); +- } else { +- /* Claim host controller, perform F0 write, +- and release */ +- sdio_claim_host(gInstance->func[func]); +- sdio_f0_writeb(gInstance->func[func], *byte, +- regaddr, &err_ret); +- sdio_release_host(gInstance->func[func]); +- } +- } else { +- /* Claim host controller, perform Fn write, +- and release */ +- sdio_claim_host(gInstance->func[func]); +- sdio_writeb(gInstance->func[func], *byte, regaddr, +- &err_ret); +- sdio_release_host(gInstance->func[func]); +- } +- } else { /* CMD52 Read */ +- /* Claim host controller, perform Fn read, and release */ +- sdio_claim_host(gInstance->func[func]); +- +- if (func == 0) { +- *byte = +- sdio_f0_readb(gInstance->func[func], regaddr, +- &err_ret); +- } else { +- *byte = +- sdio_readb(gInstance->func[func], regaddr, +- &err_ret); +- } +- +- sdio_release_host(gInstance->func[func]); +- } +- +- if (err_ret) +- sd_err(("bcmsdh_sdmmc: Failed to %s byte F%d:@0x%05x=%02x, " +- "Err: %d\n", rw ? "Write" : "Read", func, regaddr, +- *byte, err_ret)); +- +- return ((err_ret == 0) ? SDIOH_API_RC_SUCCESS : SDIOH_API_RC_FAIL); +-} +- +-extern SDIOH_API_RC +-sdioh_request_word(sdioh_info_t *sd, uint cmd_type, uint rw, uint func, +- uint addr, u32 *word, uint nbytes) +-{ +- int err_ret = SDIOH_API_RC_FAIL; +- +- if (func == 0) { +- sd_err(("%s: Only CMD52 allowed to F0.\n", __func__)); +- return SDIOH_API_RC_FAIL; +- } +- +- sd_info(("%s: cmd_type=%d, rw=%d, func=%d, addr=0x%05x, nbytes=%d\n", +- __func__, cmd_type, rw, func, addr, nbytes)); +- +- DHD_PM_RESUME_WAIT(sdioh_request_word_wait); +- DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL); +- /* Claim host controller */ +- sdio_claim_host(gInstance->func[func]); +- +- if (rw) { /* CMD52 Write */ +- if (nbytes == 4) { +- sdio_writel(gInstance->func[func], *word, addr, +- &err_ret); +- } else if (nbytes == 2) { +- sdio_writew(gInstance->func[func], (*word & 0xFFFF), +- addr, &err_ret); +- } else { +- sd_err(("%s: Invalid nbytes: %d\n", __func__, nbytes)); +- } +- } else { /* CMD52 Read */ +- if (nbytes == 4) { +- *word = +- sdio_readl(gInstance->func[func], addr, &err_ret); +- } else if (nbytes == 2) { +- *word = +- sdio_readw(gInstance->func[func], addr, +- &err_ret) & 0xFFFF; +- } else { +- sd_err(("%s: Invalid nbytes: %d\n", __func__, nbytes)); +- } +- } +- +- /* Release host controller */ +- sdio_release_host(gInstance->func[func]); +- +- if (err_ret) { +- sd_err(("bcmsdh_sdmmc: Failed to %s word, Err: 0x%08x", +- rw ? "Write" : "Read", err_ret)); +- } +- +- return ((err_ret == 0) ? SDIOH_API_RC_SUCCESS : SDIOH_API_RC_FAIL); +-} +- +-static SDIOH_API_RC +-sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func, +- uint addr, struct sk_buff *pkt) +-{ +- bool fifo = (fix_inc == SDIOH_DATA_FIX); +- u32 SGCount = 0; +- int err_ret = 0; +- +- struct sk_buff *pnext; +- +- sd_trace(("%s: Enter\n", __func__)); +- +- ASSERT(pkt); +- DHD_PM_RESUME_WAIT(sdioh_request_packet_wait); +- DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL); +- +- /* Claim host controller */ +- sdio_claim_host(gInstance->func[func]); +- for (pnext = pkt; pnext; pnext = pnext->next) { +- uint pkt_len = pnext->len; +- pkt_len += 3; +- pkt_len &= 0xFFFFFFFC; +- +-#ifdef CONFIG_MMC_MSM7X00A +- if ((pkt_len % 64) == 32) { +- sd_trace(("%s: Rounding up TX packet +=32\n", +- __func__)); +- pkt_len += 32; +- } +-#endif /* CONFIG_MMC_MSM7X00A */ +- /* Make sure the packet is aligned properly. +- * If it isn't, then this +- * is the fault of sdioh_request_buffer() which +- * is supposed to give +- * us something we can work with. +- */ +- ASSERT(((u32) (pkt->data) & DMA_ALIGN_MASK) == 0); +- +- if ((write) && (!fifo)) { +- err_ret = sdio_memcpy_toio(gInstance->func[func], addr, +- ((u8 *) (pnext->data)), +- pkt_len); +- } else if (write) { +- err_ret = sdio_memcpy_toio(gInstance->func[func], addr, +- ((u8 *) (pnext->data)), +- pkt_len); +- } else if (fifo) { +- err_ret = sdio_readsb(gInstance->func[func], +- ((u8 *) (pnext->data)), +- addr, pkt_len); +- } else { +- err_ret = sdio_memcpy_fromio(gInstance->func[func], +- ((u8 *) (pnext->data)), +- addr, pkt_len); +- } +- +- if (err_ret) { +- sd_err(("%s: %s FAILED %p[%d], addr=0x%05x, pkt_len=%d," +- "ERR=0x%08x\n", __func__, +- (write) ? "TX" : "RX", +- pnext, SGCount, addr, pkt_len, err_ret)); +- } else { +- sd_trace(("%s: %s xfr'd %p[%d], addr=0x%05x, len=%d\n", +- __func__, +- (write) ? "TX" : "RX", +- pnext, SGCount, addr, pkt_len)); +- } +- +- if (!fifo) +- addr += pkt_len; +- SGCount++; +- +- } +- +- /* Release host controller */ +- sdio_release_host(gInstance->func[func]); +- +- sd_trace(("%s: Exit\n", __func__)); +- return ((err_ret == 0) ? SDIOH_API_RC_SUCCESS : SDIOH_API_RC_FAIL); +-} +- +-/* +- * This function takes a buffer or packet, and fixes everything up +- * so that in the end, a DMA-able packet is created. +- * +- * A buffer does not have an associated packet pointer, +- * and may or may not be aligned. +- * A packet may consist of a single packet, or a packet chain. +- * If it is a packet chain, then all the packets in the chain +- * must be properly aligned. +- * +- * If the packet data is not aligned, then there may only be +- * one packet, and in this case, it is copied to a new +- * aligned packet. +- * +- */ +-extern SDIOH_API_RC +-sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write, +- uint func, uint addr, uint reg_width, uint buflen_u, +- u8 *buffer, struct sk_buff *pkt) +-{ +- SDIOH_API_RC Status; +- struct sk_buff *mypkt = NULL; +- +- sd_trace(("%s: Enter\n", __func__)); +- +- DHD_PM_RESUME_WAIT(sdioh_request_buffer_wait); +- DHD_PM_RESUME_RETURN_ERROR(SDIOH_API_RC_FAIL); +- /* Case 1: we don't have a packet. */ +- if (pkt == NULL) { +- sd_data(("%s: Creating new %s Packet, len=%d\n", +- __func__, write ? "TX" : "RX", buflen_u)); +- mypkt = bcm_pkt_buf_get_skb(buflen_u); +- if (!mypkt) { +- sd_err(("%s: bcm_pkt_buf_get_skb failed: len %d\n", +- __func__, buflen_u)); +- return SDIOH_API_RC_FAIL; +- } +- +- /* For a write, copy the buffer data into the packet. */ +- if (write) +- memcpy(mypkt->data, buffer, buflen_u); +- +- Status = +- sdioh_request_packet(sd, fix_inc, write, func, addr, mypkt); +- +- /* For a read, copy the packet data back to the buffer. */ +- if (!write) +- memcpy(buffer, mypkt->data, buflen_u); +- +- bcm_pkt_buf_free_skb(mypkt); +- } else if (((u32) (pkt->data) & DMA_ALIGN_MASK) != 0) { +- /* Case 2: We have a packet, but it is unaligned. */ +- +- /* In this case, we cannot have a chain. */ +- ASSERT(pkt->next == NULL); +- +- sd_data(("%s: Creating aligned %s Packet, len=%d\n", +- __func__, write ? "TX" : "RX", pkt->len)); +- mypkt = bcm_pkt_buf_get_skb(pkt->len); +- if (!mypkt) { +- sd_err(("%s: bcm_pkt_buf_get_skb failed: len %d\n", +- __func__, pkt->len)); +- return SDIOH_API_RC_FAIL; +- } +- +- /* For a write, copy the buffer data into the packet. */ +- if (write) +- memcpy(mypkt->data, pkt->data, pkt->len); +- +- Status = +- sdioh_request_packet(sd, fix_inc, write, func, addr, mypkt); +- +- /* For a read, copy the packet data back to the buffer. */ +- if (!write) +- memcpy(pkt->data, mypkt->data, mypkt->len); +- +- bcm_pkt_buf_free_skb(mypkt); +- } else { /* case 3: We have a packet and +- it is aligned. */ +- sd_data(("%s: Aligned %s Packet, direct DMA\n", +- __func__, write ? "Tx" : "Rx")); +- Status = +- sdioh_request_packet(sd, fix_inc, write, func, addr, pkt); +- } +- +- return Status; +-} +- +-/* this function performs "abort" for both of host & device */ +-extern int sdioh_abort(sdioh_info_t *sd, uint func) +-{ +-#if defined(MMC_SDIO_ABORT) +- char t_func = (char)func; +-#endif /* defined(MMC_SDIO_ABORT) */ +- sd_trace(("%s: Enter\n", __func__)); +- +-#if defined(MMC_SDIO_ABORT) +- /* issue abort cmd52 command through F1 */ +- sdioh_request_byte(sd, SD_IO_OP_WRITE, SDIO_FUNC_0, SDIOD_CCCR_IOABORT, +- &t_func); +-#endif /* defined(MMC_SDIO_ABORT) */ +- +- sd_trace(("%s: Exit\n", __func__)); +- return SDIOH_API_RC_SUCCESS; +-} +- +-/* Reset and re-initialize the device */ +-int sdioh_sdio_reset(sdioh_info_t *si) +-{ +- sd_trace(("%s: Enter\n", __func__)); +- sd_trace(("%s: Exit\n", __func__)); +- return SDIOH_API_RC_SUCCESS; +-} +- +-/* Disable device interrupt */ +-void sdioh_sdmmc_devintr_off(sdioh_info_t *sd) +-{ +- sd_trace(("%s: %d\n", __func__, sd->use_client_ints)); +- sd->intmask &= ~CLIENT_INTR; +-} +- +-/* Enable device interrupt */ +-void sdioh_sdmmc_devintr_on(sdioh_info_t *sd) +-{ +- sd_trace(("%s: %d\n", __func__, sd->use_client_ints)); +- sd->intmask |= CLIENT_INTR; +-} +- +-/* Read client card reg */ +-int +-sdioh_sdmmc_card_regread(sdioh_info_t *sd, int func, u32 regaddr, +- int regsize, u32 *data) +-{ +- +- if ((func == 0) || (regsize == 1)) { +- u8 temp = 0; +- +- sdioh_request_byte(sd, SDIOH_READ, func, regaddr, &temp); +- *data = temp; +- *data &= 0xff; +- sd_data(("%s: byte read data=0x%02x\n", __func__, *data)); +- } else { +- sdioh_request_word(sd, 0, SDIOH_READ, func, regaddr, data, +- regsize); +- if (regsize == 2) +- *data &= 0xffff; +- +- sd_data(("%s: word read data=0x%08x\n", __func__, *data)); +- } +- +- return SUCCESS; +-} +- +-#if !defined(OOB_INTR_ONLY) +-/* bcmsdh_sdmmc interrupt handler */ +-static void IRQHandler(struct sdio_func *func) +-{ +- sdioh_info_t *sd; +- +- sd_trace(("bcmsdh_sdmmc: ***IRQHandler\n")); +- sd = gInstance->sd;
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.
Re: [meta-fsl-arm-extra][PATCH] linux-imx (3.0.35): remove staging driver for brcm80211
Quoted 5 lines · John Weber
Removes brcm80211 driver in
drivers/staging. This is meant to be applied with a patch to add a backported driver from kernel v3.5 which is loaded intodrivers/net/wireless.Signed-off-by John Weber <[email protected]>
Personally I think the removal and addition of new driver could do in a single shot in meta-fsl-arm-extra (so you'd still keep two patches to apply but both here).
Quoted 11 lines
--- ...mx-3.0.35-remove-brcm80211-staging-driver.patch |123141 ++++++++++++++++++++ 1 files changed, 123142 insertions(+) create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patchrecipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patch new file +0
-0
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patch line 5
Quoted 5 lines
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patch new file +5
-0@@ -0,0 +1,123141 @@ +From 748eb185cad62c456dcd316c941f9835520a946d Mon Sep 17 00:00:00 2001 +From: John Weber <[email protected]> +Date: Sat, 9 Mar 2013 09:23:58 -0600 +Subject: [meta-fsl-arm-extra][PATCH 1/2] linux-imx (3.0.35): remove brcm80211 + staging driver
The subject of internal patch is confusing as it is not for meta-fsl-arm-extra ;-)
One thing I noticed in this serie is that you didn't export the patches with the order (PATCH X/Y) which is important so we know the order to apply them.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Re: [meta-fsl-arm-extra][PATCH] linux-imx (3.0.35): remove staging driver for brcm80211
Sounds good. I'll do that in v2.
Quoted 36 lines · Otavio Salvador
Quoted 5 lines · John Weber
Removes brcm80211 driver in
drivers/staging. This is meant to be applied with a patch to add a backported driver from kernel v3.5 which is loaded intodrivers/net/wireless.Signed-off-by John Weber <[email protected]>Personally I think the removal and addition of new driver could do in a single shot in meta-fsl-arm-extra (so you'd still keep two patches to apply but both here).
Quoted 11 lines
--- ...mx-3.0.35-remove-brcm80211-staging-driver.patch |123141 ++++++++++++++++++++ 1 files changed, 123142 insertions(+)create mode 100644
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patchrecipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patch new file +0
-0recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patch line 5
Quoted 5 lines
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patch new file +5
-0@@ -0,0 +1,123141 @@ +From 748eb185cad62c456dcd316c941f9835520a946d Mon Sep 17 00:00:00 2001 +From: John Weber <[email protected]> +Date: Sat, 9 Mar 2013 09:23:58 -0600 +Subject: [meta-fsl-arm-extra][PATCH 1/2] linux-imx (3.0.35): remove brcm80211 + staging driverThe subject of internal patch is confusing as it is not for meta-fsl-arm-extra ;-)
One thing I noticed in this serie is that you didn't export the patches with the order (PATCH X/Y) which is important so we know the order to apply them.
PATCH 1/1 linux-imx (3.0.35): add brcm80211 driver backported from v3.5
In reply to John WeberAdds a backported driver from kernel v3.5 for brcm80211. Used with bcm4329 and other Broadcom Wifi devices.
--- ....0.35-Add-brcm80211-driver-backported-fro.patch |94038 ++++++++++++++++++++ 1 files changed, 94039 insertions(+) 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
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.
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 1/1 linux-imx (3.0.35): enable brcm wifi in wandboard dual defconfig
In reply to John WeberEnables Broadcom FullMAC driver in kernel defconfig for Wandboard Dual.
--- .../linux-imx-3.0.35/wandboard-dual/defconfig | 6 ++++++ 1 file changed, 6 insertions(+)
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/defconfig +6 -0
@@ -1024,6 +1024,12 @@ CONFIG_ATH_COMMON=m # CONFIG_ATH_DEBUG is not set CONFIG_ATH6KL=m # CONFIG_ATH6KL_DEBUG is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_SDIO=y +# CONFIG_BRCMFMAC_SDIO_OOB is not set +# CONFIG_BRCMFMAC_USB is not set +CONFIG_BRCMDBG=y CONFIG_HOSTAP=y # CONFIG_HOSTAP_FIRMWARE is not set # CONFIG_IWM is not set
Signature · 1 line
1.7.9.5
Re: [meta-fsl-arm-extra][PATCH] linux-imx (3.0.35): enable brcm wifi in wandboard dual defconfig
Quoted 3 lines · John Weber
Enables Broadcom FullMAC driver in kernel defconfig for Wandboard Dual.
Signed-off-by John Weber <[email protected]>
I'd prefer you to enable it with the patch which adds the backport.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH 1/1 linux-imx (3.0.35): wandboard: add brcm80211 support to bbappend
In reply to John WeberModifies bbappend to utilize the new brcm80211 patches and fixes.
--- recipes-kernel/linux/linux-imx_3.0.35.bbappend | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
recipes-kernel/linux/linux-imx_3.0.35.bbappend +4 -1
@@ -1,10 +1,13 @@ 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 \ + file://wandboard-dual/0003-linux-imx-3.0.35-Add-brcm80211-driver-backported-fro.patch \ + file://wandboard-dual/0003-linux-imx-3.0.35-remove-brcm80211-staging-driver.patch \ " # Add support for the Congatec qmx6 board SRC_URI_append_cgtqmx6 = " file://cgtqmx6/cgtqmx6.patch"
Signature · 1 line
1.7.9.5
Re: [meta-fsl-arm-extra][PATCH] linux-imx (3.0.35): wandboard: add brcm80211 support to bbappend
Quoted 3 lines · John Weber
Modifies bbappend to utilize the new brcm80211 patches and fixes.
Signed-off-by John Weber <[email protected]>
Please change the bbappend when adding the patch.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH 1/1 linux-firmware: add support for bcm4329
In reply to John WeberAdds linux-firmware bbappend recipe to provide support for the Broadcom BCM4329 Wifi device. Also adds a .txt file for nvram support.
--- .../linux-firmware/brcmfmac-sdio.txt | 70 ++++++++++++++++++++ .../linux-firmware/linux-firmware_git.bbappend | 28 ++++++++ 2 files changed, 98 insertions(+) create mode 100644 recipes-kernel/linux-firmware/linux-firmware/brcmfmac-sdio.txt create mode 100644 recipes-kernel/linux-firmware/linux-firmware_git.bbappend
recipes-kernel/linux-firmware/linux-firmware/brcmfmac-sdio.txt new file +70 -0
@@ -0,0 +1,70 @@ +# bcm4329 NVRAM file for Wandboard Dual +# $Copyright (C) 2008 Broadcom Corporation$ +# $id$ + +sromrev=3 +vendid=0x14e4 +devid=0x432f +boardtype=0x53e + +boardrev=0x41 + +#boardflags=0x1200 +boardflags=0x200 + +# Specify the xtalfreq if it is otherthan 38.4MHz +xtalfreq=37400 + +aa2g=3 +aa5g=0 + +ag0=255 +#tri2g=0x64 + +# 11g paparams +pa0b0=5542,5542,5542 +pa0b1=64244,64244,64244 +pa0b2=65202,65202,65202 + +pa0itssit=62 +pa0maxpwr=74 +opo=0 +mcs2gpo0=0x6666 +mcs2gpo1=0x6666 + +# 11g rssi params +rssismf2g=0xa,0xa,0xa +rssismc2g=0xb,0xb,0xb +rssisav2g=0x3,0x3,0x3 +bxa2g=0 + +# country code +ccode=ALL +cctl=0x0 +cckdigfilttype=0 +ofdmdigfilttype=1 + +rxpo2g=0 + +boardnum=1 +macaddr=00:90:4c:c5:00:34 + +# xtal pu and pd time control variable +# pu time is driver default (0x1501) +#r13t=0x1501 + +####### +nocrc=1 + +#for mfgc +otpimagesize=182 + +# sdio extra configs +hwhdr=0x05ffff031030031003100000 + +#This generates empty F1, F2 and F3 tuple chains, and may be used if the host SDIO stack does not require the standard tuples. +#RAW1=80 02 fe ff + +#This includes the standard FUNCID and FUNCE tuples in the F1, F2, F3 and common CIS. +RAW1=80 32 fe 21 02 0c 00 22 2a 01 01 00 00 c5 0 e6 00 00 00 00 00 40 00 00 ff ff 80 00 00 00 00 00 00 00 00 00 00 c8 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 20 04 D0 2 29 43 21 02 0c 00 22 04 00 20 00 5A +nvramver=4.218.214.0
recipes-kernel/linux-firmware/linux-firmware_git.bbappend new file +28 -0
@@ -0,0 +1,28 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}" + +PRINC := "${@int(PRINC) + 1}" + +SRC_URI_append = " \ + file://brcmfmac-sdio.txt \ +" +LIC_FILES_CHKSUM += "file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc\ +" + +do_install_append() { + # Broadcom BCM4329 SDIO + cp -r ${D}/lib/firmware/brcm/brcmfmac4329.bin \ + ${D}/lib/firmware/brcm/brcmfmac-sdio.bin + cp -r ${WORKDIR}/brcmfmac-sdio.txt \ + ${D}/lib/firmware/brcm + cp -r ${D}/lib/firmware/LICENCE.broadcom_bcm43xx \ + ${D}/lib/firmware/brcm +} + +PACKAGES =+ "${PN}-bcm4329" + +LICENSE_${PN}-bcm4329 = "Firmware-bcm4329" +FILES_${PN}-bcm4329 = " \ + /lib/firmware/brcm/brcmfmac-sdio.bin \ + /lib/firmware/brcm/brcmfmac-sdio.txt \ + /lib/firmware/brcm/LICENCE.broadcom_bcm43xx \ +"
Signature · 1 line
1.7.9.5
Re: [meta-fsl-arm-extra][PATCH] linux-firmware: add support for bcm4329
Quoted 4 lines · John Weber
Adds linux-firmware bbappend recipe to provide support for the Broadcom BCM4329 Wifi device. Also adds a .txt file for nvram support.
Signed-off-by John Weber <[email protected]>
Thinking about how it was done, I'd say you could do it:
* Make this to split the binaries but without renaming it
* Add a new recipe (let's say wandboard-wifi-support) which rdepends
on the binary package and installs the .txt file for nvram as well.
So we avoid to make linux-firmware machine specific. We cannot have more than one package with same contents in filesystem (without being different recipe name) so we'd need to complicate it a lot, using the extra recipe makes it easy.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Re: [meta-fsl-arm-extra][PATCH] linux-firmware: add support for bcm4329
Otavio -
I assume you mean this rename?
+do_install_append() {
+ # Broadcom BCM4329 SDIO
+ cp -r ${D}/lib/firmware/brcm/brcmfmac4329.bin \
+ ${D}/lib/firmware/brcm/brcmfmac-sdio.bin
+ cp -r ${WORKDIR}/brcmfmac-sdio.txt \
+ ${D}/lib/firmware/brcm
+ cp -r ${D}/lib/firmware/LICENCE.broadcom_bcm43xx \
+ ${D}/lib/firmware/brcm
+}
If I do not rename them, then the default kernel module for brcmfmac will not find the firmware files because it expects them to be named as above.
From the driver in the mainline kernel (and also the backported driver, so it hasn't changed):
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c, line 317-320
#define BRCMF_SDIO_FW_NAME "brcm/brcmfmac-sdio.bin"
#define BRCMF_SDIO_NV_NAME "brcm/brcmfmac-sdio.txt"MODULE_FIRMWARE(BRCMF_SDIO_FW_NAME);MODULE_FIRMWARE(BRCMF_SDIO_NV_NAME);
I'll create a recipe to populate the nvram file separately from the kernel firmware. I can also do the rename there - is that what you are suggesting? If that is the case, then everyone that wants to use the brcmfmac driver will need to create their own recipe to do the copy (or a patch to the kernel to rename the files that the driver expects).
In the end, I'll submit 2 patches instead of this 1 patch:
- linux-firmware_git.bbappend - which will split the binaries only.
- wandboard-wifi-support.bb - which will add the nvram file (.txt) and rename the binaries as the driver expects.
Then the image/machine/conf should only have to include the wandboard-wifi-support recipe. I really don't think that renaming the .bin file makes the linux-firmware recipe machine-specific, but I think it should be done in the packages-split step when it is filtering out the bcm4329-specific files for inclusion into the image. That way, the user through the selection of linux-firmware-bcm4329 definitely gets the bcm4329 firmware file.
John
Quoted 19 lines · Otavio Salvador
Quoted 4 lines · John Weber
Adds linux-firmware bbappend recipe to provide support for the Broadcom BCM4329 Wifi device. Also adds a .txt file for nvram support.
Signed-off-by John Weber <[email protected]>Thinking about how it was done, I'd say you could do it:
* Make this to split the binaries but without renaming it
* Add a new recipe (let's say wandboard-wifi-support) which rdepends
on the binary package and installs the .txt file for nvram as well.So we avoid to make linux-firmware machine specific. We cannot have more than one package with same contents in filesystem (without being different recipe name) so we'd need to complicate it a lot, using the extra recipe makes it easy.
PATCH 1/1 conf/machine: add firmware rrecomends to wandboard-dual
In reply to John WeberAdds a MACHINE_EXTRA_RRECOMMENDS line to wandboard-dual conf file to add firmware for BCM4329 wifi device to the rootfs image.
--- conf/machine/wandboard-dual.conf | 2 ++ 1 file changed, 2 insertions(+)
conf/machine/wandboard-dual.conf +2 -0
@@ -18,3 +18,5 @@ UBOOT_PADDING = "2" SERIAL_CONSOLE = "115200 ttymxc0" MACHINE_FEATURES += " pci wifi bluetooth" + +MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm4329"
Signature · 1 line
1.7.9.5
Quoted 34 lines · John Weber
Fixes esdhc platform data for wandboard dual. Without this fix, wandboard-dual is unable to load firmware from the filesystem into the kernel.
Signed-off-by John Weber <[email protected]>--- ...002-wandboard-dual-fix-sdhc-platform-data.patch | 53 ++++++++++++++++++++ 1 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patchrecipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch new file +18
-0@@ -0,0 +1,53 @@ +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
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch line 28
Quoted 10 lines
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch new file +10
-0+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, ++ .support_8bit = 0, ++ .delay_line = 0,
It seems you changed spaces here without need.
Quoted 32 lines
recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch new file +25
-1+ .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 + --1.7.9.5
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br