net: wireless: bcmdhd: Update to Version 5.90.195.22

- Disable Ad-hoc support for cfg80211
- dhd_linux.c: Fix incorrect pid check
- Merge Android changes from Android tree

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_linux.c b/drivers/net/wireless/bcmdhd/bcmsdh_linux.c
index 5abfecc2cf1ec992e3392d5dd722bd264fa91cef..e01b6f8a2d4fba233de0774f3874b961ccef25f8 100644 (file)
--- a/drivers/net/wireless/bcmdhd/bcmsdh_linux.c
+++ b/drivers/net/wireless/bcmdhd/bcmsdh_linux.c
@@ -21,7 +21,7 @@
  * software in any way with any other Broadcom software provided under a license
  * other than the GPL, without Broadcom's express prior written consent.
  *
- * $Id: bcmsdh_linux.c 294990 2011-11-09 00:13:10Z $
+ * $Id: bcmsdh_linux.c 308641 2012-01-17 02:18:02Z $
  */
 
 /**
@@ -146,17 +146,6 @@ static int __devinit bcmsdh_probe(struct device *dev);
 static int __devexit bcmsdh_remove(struct device *dev);
 #endif /* BCMLXSDMMC */
 
-#ifndef BCMLXSDMMC
-static struct device_driver bcmsdh_driver = {
-       .name           = "pxa2xx-mci",
-       .bus            = &platform_bus_type,
-       .probe          = bcmsdh_probe,
-       .remove         = bcmsdh_remove,
-       .suspend        = NULL,
-       .resume         = NULL,
-       };
-#endif /* BCMLXSDMMC */
-
 #ifndef BCMLXSDMMC
 static
 #endif /* BCMLXSDMMC */
@@ -531,13 +520,8 @@ bcmsdh_register(bcmsdh_driver_t *driver)
        drvinfo = *driver;
 
 #if defined(BCMPLATFORM_BUS)
-#if defined(BCMLXSDMMC)
        SDLX_MSG(("Linux Kernel SDIO/MMC Driver\n"));
        error = sdio_function_init();
-#else
-       SDLX_MSG(("Intel PXA270 SDIO Driver\n"));
-       error = driver_register(&bcmsdh_driver);
-#endif /* defined(BCMLXSDMMC) */
        return error;
 #endif /* defined(BCMPLATFORM_BUS) */
 
@@ -565,14 +549,12 @@ bcmsdh_unregister(void)
        if (bcmsdh_pci_driver.node.next)
 #endif
 
-#if defined(BCMPLATFORM_BUS) && !defined(BCMLXSDMMC)
-               driver_unregister(&bcmsdh_driver);
-#endif
 #if defined(BCMLXSDMMC)
        sdio_function_cleanup();
 #endif /* BCMLXSDMMC */
+
 #if !defined(BCMPLATFORM_BUS) && !defined(BCMLXSDMMC)
-               pci_unregister_driver(&bcmsdh_pci_driver);
+       pci_unregister_driver(&bcmsdh_pci_driver);
 #endif /* BCMPLATFORM_BUS */
 }
 

diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
index e19c2fd5028c3fb6962c4c5c9c004600f1332c5f..83f4d3df671fd56c70c3ed160f2316d99a084b71 100644 (file)
--- a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
+++ b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
@@ -21,7 +21,7 @@
  * software in any way with any other Broadcom software provided under a license
  * other than the GPL, without Broadcom's express prior written consent.
  *
- * $Id: bcmsdh_sdmmc_linux.c 300908 2011-12-06 10:32:01Z $
+ * $Id: bcmsdh_sdmmc_linux.c 308645 2012-01-17 02:33:26Z $
  */
 
 #include <typedefs.h>
@@ -58,6 +58,12 @@
 #if !defined(SDIO_DEVICE_ID_BROADCOM_4330)
 #define SDIO_DEVICE_ID_BROADCOM_4330   0x4330
 #endif /* !defined(SDIO_DEVICE_ID_BROADCOM_4330) */
+#if !defined(SDIO_DEVICE_ID_BROADCOM_4334)
+#define SDIO_DEVICE_ID_BROADCOM_4334    0x4334
+#endif /* !defined(SDIO_DEVICE_ID_BROADCOM_4334) */
+#if !defined(SDIO_DEVICE_ID_BROADCOM_43239)
+#define SDIO_DEVICE_ID_BROADCOM_43239    43239
+#endif /* !defined(SDIO_DEVICE_ID_BROADCOM_43239) */
 
 #include <bcmsdh_sdmmc.h>
 
@@ -157,9 +163,9 @@ static const struct sdio_device_id bcmsdh_sdmmc_ids[] = {
        { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329) },
        { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4319) },
        { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330) },
-#ifndef BOARD_PANDA
+       { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4334) },
+       { SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_43239) },
        { SDIO_DEVICE_CLASS(SDIO_CLASS_NONE)            },
-#endif
        { /* end: all zeroes */                         },
 };
 
@@ -172,11 +178,14 @@ static int bcmsdh_sdmmc_suspend(struct device *pdev)
 
        if (func->num != 2)
                return 0;
+
+       sd_trace(("%s Enter\n", __FUNCTION__));
+
        if (dhd_os_check_wakelock(bcmsdh_get_drvdata()))
                return -EBUSY;
 #if defined(OOB_INTR_ONLY)
        bcmsdh_oob_intr_set(0);
-#endif
+#endif /* defined(OOB_INTR_ONLY) */
        dhd_mmc_suspend = TRUE;
        smp_mb();
 
@@ -187,11 +196,13 @@ static int bcmsdh_sdmmc_resume(struct device *pdev)
 {
        struct sdio_func *func = dev_to_sdio_func(pdev);
 
+       sd_trace(("%s Enter\n", __FUNCTION__));
        dhd_mmc_suspend = FALSE;
 #if defined(OOB_INTR_ONLY)
        if ((func->num == 2) && dhd_os_check_if_up(bcmsdh_get_drvdata()))
                bcmsdh_oob_intr_set(1);
-#endif
+#endif /* (OOB_INTR_ONLY) */
+
        smp_mb();
        return 0;
 }
@@ -200,7 +211,7 @@ static const struct dev_pm_ops bcmsdh_sdmmc_pm_ops = {
        .suspend        = bcmsdh_sdmmc_suspend,
        .resume         = bcmsdh_sdmmc_resume,
 };
-#endif
+#endif  /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) && defined(CONFIG_PM) */
 
 static struct sdio_driver bcmsdh_sdmmc_driver = {
        .probe          = bcmsdh_sdmmc_probe,
@@ -211,7 +222,7 @@ static struct sdio_driver bcmsdh_sdmmc_driver = {
        .drv = {
                .pm     = &bcmsdh_sdmmc_pm_ops,
        },
-#endif
+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) && defined(CONFIG_PM) */
 };
 
 struct sdos_info {

diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c
index 07d8430ea1876669621847d2944a4799270a5d8f..29bd8930f24b9ce3fa13bb8f1c78dd70188e3b24 100644 (file)
--- a/drivers/net/wireless/bcmdhd/dhd_linux.c
+++ b/drivers/net/wireless/bcmdhd/dhd_linux.c
@@ -1148,7 +1148,7 @@ dhd_set_mac_address(struct net_device *dev, void *addr)
        if (ifidx == DHD_BAD_IF)
                return -1;
 
-       ASSERT(&dhd->thr_sysioc_ctl.thr_pid >= 0);
+       ASSERT(dhd->thr_sysioc_ctl.thr_pid >= 0);
        memcpy(&dhd->macvalue, sa->sa_data, ETHER_ADDR_LEN);
        dhd->set_macaddress = TRUE;
        up(&dhd->thr_sysioc_ctl.sema);
@@ -1166,7 +1166,7 @@ dhd_set_multicast_list(struct net_device *dev)
        if (ifidx == DHD_BAD_IF)
                return;
 
-       ASSERT(&dhd->thr_sysioc_ctl.thr_pid >= 0);
+       ASSERT(dhd->thr_sysioc_ctl.thr_pid >= 0);
        dhd->iflist[ifidx]->set_multicast = TRUE;
        up(&dhd->thr_sysioc_ctl.sema);
 }
@@ -2508,7 +2508,7 @@ dhd_add_if(dhd_info_t *dhd, int ifidx, void *handle, char *name,
                ifp->state = DHD_IF_ADD;
                ifp->idx = ifidx;
                ifp->bssidx = bssidx;
-               ASSERT(&dhd->thr_sysioc_ctl.thr_pid >= 0);
+               ASSERT(dhd->thr_sysioc_ctl.thr_pid >= 0);
                up(&dhd->thr_sysioc_ctl.sema);
        } else
                ifp->net = (struct net_device *)handle;
@@ -2532,7 +2532,7 @@ dhd_del_if(dhd_info_t *dhd, int ifidx)
 
        ifp->state = DHD_IF_DEL;
        ifp->idx = ifidx;
-       ASSERT(&dhd->thr_sysioc_ctl.thr_pid >= 0);
+       ASSERT(dhd->thr_sysioc_ctl.thr_pid >= 0);
        up(&dhd->thr_sysioc_ctl.sema);
 }
 
@@ -3588,7 +3588,7 @@ void dhd_detach(dhd_pub_t *dhdp)
        }
 #endif /* defined(CONFIG_WIRELESS_EXT) */
 
-       if (&dhd->thr_sysioc_ctl.thr_pid >= 0) {
+       if (dhd->thr_sysioc_ctl.thr_pid >= 0) {
                PROC_STOP(&dhd->thr_sysioc_ctl);
        }
 

diff --git a/drivers/net/wireless/bcmdhd/dhd_sdio.c b/drivers/net/wireless/bcmdhd/dhd_sdio.c
index e19ec6b9c7e47255d5196e70ad44992b8cbb38c5..80ee7d56cb2a6245e2be7417b72cbf3f041f01c9 100644 (file)
--- a/drivers/net/wireless/bcmdhd/dhd_sdio.c
+++ b/drivers/net/wireless/bcmdhd/dhd_sdio.c
@@ -21,7 +21,7 @@
  * software in any way with any other Broadcom software provided under a license
  * other than the GPL, without Broadcom's express prior written consent.
  *
- * $Id: dhd_sdio.c 303389 2011-12-16 09:30:48Z $
+ * $Id: dhd_sdio.c 308574 2012-01-16 22:56:40Z $
  */
 
 #include <typedefs.h>
@@ -851,8 +851,10 @@ dhdsdio_bussleep(dhd_bus_t *bus, bool sleep)
                                 SBSDIO_FORCE_HW_CLKREQ_OFF, NULL);
 
                /* Isolate the bus */
-               bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL,
-                                SBSDIO_DEVCTL_PADS_ISO, NULL);
+               if (bus->sih->chip != BCM4329_CHIP_ID && bus->sih->chip != BCM4319_CHIP_ID) {
+                       bcmsdh_cfg_write(sdh, SDIO_FUNC_1, SBSDIO_DEVICE_CTL,
+                               SBSDIO_DEVCTL_PADS_ISO, NULL);
+               }
 
                /* Change state */
                bus->sleeping = TRUE;
@@ -5191,6 +5193,9 @@ dhdsdio_chipmatch(uint16 chipid)
                return TRUE;
        if (chipid == BCM4330_CHIP_ID)
                return TRUE;
+       if (chipid == BCM43239_CHIP_ID)
+               return TRUE;
+
        return FALSE;
 }
 

diff --git a/drivers/net/wireless/bcmdhd/hndpmu.c b/drivers/net/wireless/bcmdhd/hndpmu.c
index 111b5be9cbf9aa7321fc9eeaa7af1eca85cc79aa..0e493343c8069467e44cd648a6f6db06aad3152f 100644 (file)
--- a/drivers/net/wireless/bcmdhd/hndpmu.c
+++ b/drivers/net/wireless/bcmdhd/hndpmu.c
@@ -140,11 +140,27 @@ si_sdiod_drive_strength_init(si_t *sih, osl_t *osh, uint32 drivestrength)
                str_mask = 0x00003800;
                str_shift = 11;
                break;
+       case SDIOD_DRVSTR_KEY(BCM4336_CHIP_ID, 8):
+       case SDIOD_DRVSTR_KEY(BCM4336_CHIP_ID, 11):
+               if (sih->pmurev == 8) {
+                       str_tab = (sdiod_drive_str_t *)&sdiod_drive_strength_tab3;
+               }
+               else if (sih->pmurev == 11) {
+                       str_tab = (sdiod_drive_str_t *)&sdiod_drive_strength_tab4_1v8;
+               }
+               str_mask = 0x00003800;
+               str_shift = 11;
+               break;
        case SDIOD_DRVSTR_KEY(BCM4330_CHIP_ID, 12):
                str_tab = (sdiod_drive_str_t *)&sdiod_drive_strength_tab4_1v8;
                str_mask = 0x00003800;
                str_shift = 11;
                break;
+       case SDIOD_DRVSTR_KEY(BCM43362_CHIP_ID, 13):
+               str_tab = (sdiod_drive_str_t *)&sdiod_drive_strength_tab5_1v8;
+               str_mask = 0x00003800;
+               str_shift = 11;
+               break;
        default:
                PMU_MSG(("No SDIO Drive strength init done for chip %s rev %d pmurev %d\n",
                         bcm_chipname(sih->chip, chn, 8), sih->chiprev, sih->pmurev));

diff --git a/drivers/net/wireless/bcmdhd/include/bcmdevs.h b/drivers/net/wireless/bcmdhd/include/bcmdevs.h
index f0542f2ac11b6ee83bd79b51a3c8e42c57158345..ee01d8b45675b5532888e653a71efc5123c0c597 100644 (file)
--- a/drivers/net/wireless/bcmdhd/include/bcmdevs.h
+++ b/drivers/net/wireless/bcmdhd/include/bcmdevs.h
@@ -57,8 +57,10 @@
 #define BCM_DNGL_BL_PID_4328   0xbd12
 #define BCM_DNGL_BL_PID_4322   0xbd13
 #define BCM_DNGL_BL_PID_4319    0xbd16
+#define BCM_DNGL_BL_PID_43236   0xbd17
 #define BCM_DNGL_BL_PID_4332   0xbd18
 #define BCM_DNGL_BL_PID_4330   0xbd19
+#define BCM_DNGL_BL_PID_43239   0xbd1b
 #define BCM_DNGL_BDC_PID       0x0bdc
 #define BCM_DNGL_JTAG_PID      0x4a44
 

diff --git a/drivers/net/wireless/bcmdhd/include/epivers.h b/drivers/net/wireless/bcmdhd/include/epivers.h
index a0e9ed12b88e73c85b54b097135bf6e6c6b8b065..f82ee10257495231bda14085aad3c68422a1b729 100644 (file)
--- a/drivers/net/wireless/bcmdhd/include/epivers.h
+++ b/drivers/net/wireless/bcmdhd/include/epivers.h
@@ -33,17 +33,17 @@
 
 #define        EPI_RC_NUMBER           195
 
-#define        EPI_INCREMENTAL_NUMBER  19
+#define        EPI_INCREMENTAL_NUMBER  22
 
 #define        EPI_BUILD_NUMBER        0
 
-#define        EPI_VERSION             5, 90, 195, 19
+#define        EPI_VERSION             5, 90, 195, 22
 
-#define        EPI_VERSION_NUM         0x055ac313
+#define        EPI_VERSION_NUM         0x055ac316
 
 #define EPI_VERSION_DEV                5.90.195
 
 
-#define        EPI_VERSION_STR         "5.90.195.19"
+#define        EPI_VERSION_STR         "5.90.195.22"
 
 #endif 

diff --git a/drivers/net/wireless/bcmdhd/siutils.c b/drivers/net/wireless/bcmdhd/siutils.c
index 4b71563035538ceebeb021563585a4cb271ca753..1cc977f51ee3c6af60076941c50f226b027b630e 100644 (file)
--- a/drivers/net/wireless/bcmdhd/siutils.c
+++ b/drivers/net/wireless/bcmdhd/siutils.c
@@ -1901,6 +1901,9 @@ si_is_sprom_available(si_t *sih)
                return (sih->chipst & CST4330_SPROM_PRESENT) != 0;
        case BCM4313_CHIP_ID:
                return (sih->chipst & CST4313_SPROM_PRESENT) != 0;
+       case BCM43239_CHIP_ID:
+               return ((sih->chipst & CST43239_SPROM_MASK) &&
+                       !(sih->chipst & CST43239_SFLASH_MASK));
        default:
                return TRUE;
        }

diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index 2312e0d2443243944cc68d36bf16285eeef75eb9..7bab18d6d4a314172986101a538e2451233f4744 100644 (file)
--- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
@@ -4213,8 +4213,8 @@ static s32 wl_setup_wiphy(struct wireless_dev *wdev, struct device *sdiofunc_dev
        wdev->wiphy->max_scan_ssids = WL_SCAN_PARAMS_SSID_MAX;
        wdev->wiphy->max_num_pmkids = WL_NUM_PMKIDS_MAX;
        wdev->wiphy->interface_modes =
-           BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC)
-           | BIT(NL80211_IFTYPE_AP) | BIT(NL80211_IFTYPE_MONITOR);
+               BIT(NL80211_IFTYPE_STATION)
+               | BIT(NL80211_IFTYPE_AP) | BIT(NL80211_IFTYPE_MONITOR);
 
        wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;
        wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &__wl_band_5ghz_a;
@@ -5612,6 +5612,13 @@ static s32 wl_escan_handler(struct wl_priv *wl,
                        goto exit;
                }
 
+               if (!(wl_to_wiphy(wl)->interface_modes & BIT(NL80211_IFTYPE_ADHOC))) {
+                       if (dtoh16(bi->capability) & DOT11_CAP_IBSS) {
+                               WL_ERR(("Ignoring IBSS result\n"));
+                               goto exit;
+                       }
+               }
+
                if (wl_get_drv_status_all(wl, SENDING_ACT_FRM)) {
                        p2p_dev_addr = wl_cfgp2p_retreive_p2p_dev_addr(bi, bi_length);
                        if (p2p_dev_addr && !memcmp(p2p_dev_addr,