staging: brcm80211: unifdef -UWLC_HIGH_ONLY
authorBrett Rudley <brudley@broadcom.com>
Fri, 19 Nov 2010 22:30:52 +0000 (14:30 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 20 Nov 2010 01:09:03 +0000 (17:09 -0800)
Part of BMAC removal.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/phy/wlc_phy_hal.h
drivers/staging/brcm80211/sys/wl_mac80211.c
drivers/staging/brcm80211/sys/wl_mac80211.h
drivers/staging/brcm80211/sys/wlc_alloc.c
drivers/staging/brcm80211/sys/wlc_ampdu.c
drivers/staging/brcm80211/sys/wlc_ampdu.h
drivers/staging/brcm80211/sys/wlc_bmac.h
drivers/staging/brcm80211/sys/wlc_mac80211.c
drivers/staging/brcm80211/sys/wlc_mac80211.h
drivers/staging/brcm80211/sys/wlc_rpctx.h

index 52260b2..c462387 100644 (file)
@@ -122,11 +122,7 @@ typedef struct shared_phy shared_phy_t;
 
 struct phy_pub;
 
-#ifdef WLC_HIGH_ONLY
-typedef struct wlc_rpc_phy wlc_phy_t;
-#else
 typedef struct phy_pub wlc_phy_t;
-#endif
 
 typedef struct shared_phy_params {
        void *osh;
index af6d7de..e336fef 100644 (file)
@@ -29,9 +29,7 @@
 
 #include <wlc_cfg.h>
 #include <net/mac80211.h>
-#ifndef WLC_HIGH_ONLY
 #include <phy_version.h>
-#endif
 #include <bcmutils.h>
 #include <pcicfg.h>
 #include <wlioctl.h>
 #include <bcmsdh.h>
 #endif
 #include <wl_export.h>
-#ifdef WLC_HIGH_ONLY
-#include "dbus.h"
-#include "bcm_rpc_tp.h"
-#include "bcm_rpc.h"
-#include "bcm_xdr.h"
-#include "wlc_rpc.h"
-#endif
 
 #include <wl_mac80211.h>
 #include <linux/firmware.h>
-#ifndef WLC_HIGH_ONLY
 #include <wl_ucode.h>
 #include <d11ucode_ext.h>
-#endif
 
 #ifdef BCMSDIO
 extern struct device *sdiommc_dev;
@@ -75,21 +64,6 @@ void wlc_set_addrmatch(wlc_info_t *wlc, int match_reg_offset,
 static void wl_timer(unsigned long data);
 static void _wl_timer(wl_timer_t *t);
 
-#ifdef WLC_HIGH_ONLY
-#define RPCQ_LOCK(_wl, _flags) spin_lock_irqsave(&(_wl)->rpcq_lock, (_flags))
-#define RPCQ_UNLOCK(_wl, _flags)  spin_unlock_irqrestore(&(_wl)->rpcq_lock, (_flags))
-#define TXQ_LOCK(_wl, _flags) spin_lock_irqsave(&(_wl)->txq_lock, (_flags))
-#define TXQ_UNLOCK(_wl, _flags)  spin_unlock_irqrestore(&(_wl)->txq_lock, (_flags))
-static void wl_rpc_down(void *wlh);
-static void wl_rpcq_free(wl_info_t *wl);
-static void wl_rpcq_dispatch(struct wl_task *task);
-static void wl_rpc_dispatch_schedule(void *ctx, struct rpc_buf *buf);
-static void wl_start_txqwork(struct wl_task *task);
-static void wl_txq_free(wl_info_t *wl);
-static void wl_timer_task(wl_task_t *task);
-static int wl_schedule_task(wl_info_t *wl, void (*fn) (struct wl_task *),
-                           void *context);
-#endif                         /* WLC_HIGH_ONLY */
 
 static int ieee_hw_init(struct ieee80211_hw *hw);
 static int ieee_hw_rate_init(struct ieee80211_hw *hw);
@@ -137,12 +111,10 @@ struct ieee80211_tkip_data {
        u8 rx_hdr[16], tx_hdr[16];
 };
 
-#ifndef WLC_HIGH_ONLY
 #define WL_DEV_IF(dev)         ((wl_if_t *)netdev_priv(dev))
 #define        WL_INFO(dev)            ((wl_info_t *)(WL_DEV_IF(dev)->wl))     /* points to wl */
 static int wl_request_fw(wl_info_t *wl, struct pci_dev *pdev);
 static void wl_release_fw(wl_info_t *wl);
-#endif
 
 /* local prototypes */
 static int wl_start(struct sk_buff *skb, wl_info_t *wl);
@@ -176,19 +148,13 @@ module_param(sd_drivestrength, uint, 0);
 #ifdef BCMDBG
 static int msglevel = 0xdeadbeef;
 module_param(msglevel, int, 0);
-#ifndef WLC_HIGH_ONLY
 static int phymsglevel = 0xdeadbeef;
 module_param(phymsglevel, int, 0);
-#endif                         /* WLC_HIGH_ONLY */
 #endif                         /* BCMDBG */
 
 #define HW_TO_WL(hw)    (hw->priv)
 #define WL_TO_HW(wl)     (wl->pub->ieee_hw)
-#ifdef WLC_HIGH_ONLY
-static int wl_ops_tx_nl(struct ieee80211_hw *hw, struct sk_buff *skb);
-#else
 static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
-#endif
 static int wl_ops_start(struct ieee80211_hw *hw);
 static void wl_ops_stop(struct ieee80211_hw *hw);
 static int wl_ops_add_interface(struct ieee80211_hw *hw,
@@ -226,21 +192,6 @@ static int wl_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                           enum ieee80211_ampdu_mlme_action action,
                           struct ieee80211_sta *sta, u16 tid, u16 *ssn);
 
-#ifdef WLC_HIGH_ONLY
-static int wl_ops_tx_nl(struct ieee80211_hw *hw, struct sk_buff *skb)
-{
-       int status;
-       wl_info_t *wl = hw->priv;
-       if (!wl->pub->up) {
-               WL_ERROR(("ops->tx called while down\n"));
-               status = -ENETDOWN;
-               goto done;
-       }
-       status = wl_start(skb, wl);
- done:
-       return status;
-}
-#else
 static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
        int status;
@@ -256,7 +207,6 @@ static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
        WL_UNLOCK(wl);
        return status;
 }
-#endif                         /* WLC_HIGH_ONLY */
 
 static int wl_ops_start(struct ieee80211_hw *hw)
 {
@@ -415,9 +365,6 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw,
        wl_info_t *wl = HW_TO_WL(hw);
        int val;
 
-#ifdef WLC_HIGH_ONLY
-       WL_LOCK(wl);
-#endif
 
        if (changed & BSS_CHANGED_ASSOC) {
                WL_ERROR(("Associated:\t%s\n", info->assoc ? "True" : "False"));
@@ -477,9 +424,6 @@ wl_ops_bss_info_changed(struct ieee80211_hw *hw,
                          info->enable_beacon ? "True" : "False"));
                /* Beaconing should be enabled/disabled (beaconing modes) */
        }
-#ifdef WLC_HIGH_ONLY
-       WL_UNLOCK(wl);
-#endif
        return;
 }
 
@@ -488,9 +432,7 @@ wl_ops_configure_filter(struct ieee80211_hw *hw,
                        unsigned int changed_flags,
                        unsigned int *total_flags, u64 multicast)
 {
-#ifndef WLC_HIGH_ONLY
        wl_info_t *wl = hw->priv;
-#endif
 
        changed_flags &= MAC_FILTERS;
        *total_flags &= MAC_FILTERS;
@@ -508,7 +450,6 @@ wl_ops_configure_filter(struct ieee80211_hw *hw,
                WL_ERROR(("FIF_OTHER_BSS\n"));
        if (changed_flags & FIF_BCN_PRBRESP_PROMISC) {
                WL_NONE(("FIF_BCN_PRBRESP_PROMISC\n"));
-#ifndef WLC_HIGH_ONLY
                WL_LOCK(wl);
                if (*total_flags & FIF_BCN_PRBRESP_PROMISC) {
                        wl->pub->mac80211_state |= MAC80211_PROMISC_BCNS;
@@ -518,7 +459,6 @@ wl_ops_configure_filter(struct ieee80211_hw *hw,
                        wl->pub->mac80211_state &= ~MAC80211_PROMISC_BCNS;
                }
                WL_UNLOCK(wl);
-#endif
        }
        return;
 }
@@ -618,20 +558,12 @@ wl_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        wl->pub->global_scb = scb;
        wl->pub->global_ampdu = &(scb->scb_ampdu);
        wl->pub->global_ampdu->scb = scb;
-#ifdef WLC_HIGH_ONLY
-       wl->pub->global_ampdu->max_pdu = AMPDU_NUM_MPDU;
-#else
        wl->pub->global_ampdu->max_pdu = 16;
-#endif
        pktq_init(&scb->scb_ampdu.txq, AMPDU_MAX_SCB_TID,
                  AMPDU_MAX_SCB_TID * PKTQ_LEN_DEFAULT);
 
        sta->ht_cap.ht_supported = true;
-#ifdef WLC_HIGH_ONLY
-       sta->ht_cap.ampdu_factor = AMPDU_RX_FACTOR_16K;
-#else
        sta->ht_cap.ampdu_factor = AMPDU_RX_FACTOR_64K;
-#endif
        sta->ht_cap.ampdu_density = AMPDU_DEF_MPDU_DENSITY;
        sta->ht_cap.cap = IEEE80211_HT_CAP_GRN_FLD |
            IEEE80211_HT_CAP_SGI_20 |
@@ -695,11 +627,7 @@ wl_ampdu_action(struct ieee80211_hw *hw,
 }
 
 static const struct ieee80211_ops wl_ops = {
-#ifdef WLC_HIGH_ONLY
-       .tx = wl_ops_tx_nl,
-#else
        .tx = wl_ops_tx,
-#endif
        .start = wl_ops_start,
        .stop = wl_ops_stop,
        .add_interface = wl_ops_add_interface,
@@ -761,20 +689,9 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
        osh = osl_attach(btparam, bustype);
        ASSERT(osh);
 
-#ifdef WLC_HIGH_ONLY
-       hw = ieee80211_alloc_hw(sizeof(wl_info_t), &wl_ops);
-       if (!hw) {
-               WL_ERROR(("%s: ieee80211_alloc_hw failed\n", __func__));
-               ASSERT(0);
-       }
-
-       bzero(hw->priv, sizeof(*wl));
-       wl = hw->priv;
-#else
        /* allocate private info */
        hw = pci_get_drvdata(btparam);  /* btparam == pdev */
        wl = hw->priv;
-#endif
        ASSERT(wl);
 
        wl->osh = osh;
@@ -783,25 +700,6 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
        /* setup the bottom half handler */
        tasklet_init(&wl->tasklet, wl_dpc, (unsigned long) wl);
 
-#ifdef WLC_HIGH_ONLY
-       wl->rpc_th = bcm_rpc_tp_attach(osh, NULL);
-       if (wl->rpc_th == NULL) {
-               WL_ERROR(("wl%d: %s: bcm_rpc_tp_attach failed!\n", unit,
-                         __func__));
-               goto fail;
-       }
-
-       wl->rpc = bcm_rpc_attach(NULL, osh, wl->rpc_th);
-       if (wl->rpc == NULL) {
-               WL_ERROR(("wl%d: %s: bcm_rpc_attach failed!\n", unit,
-                         __func__));
-               goto fail;
-       }
-
-       /* init tx work queue for wl_start/send pkt; no need to destroy workitem  */
-       INIT_WORK(&wl->txq_task.work, (work_func_t) wl_start_txqwork);
-       wl->txq_task.context = wl;
-#endif                         /* WLC_HIGH_ONLY */
 
 #ifdef BCMSDIO
        SET_IEEE80211_DEV(hw, sdiommc_dev);
@@ -819,28 +717,14 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
        }
        wl->bcm_bustype = bustype;
 
-#ifdef WLC_HIGH_ONLY
-       if (wl->bcm_bustype == RPC_BUS) {
-               wl->regsva = (void *)0;
-               btparam = wl->rpc;
-       } else
-#endif
        wl->regsva = ioremap_nocache(base_addr, PCI_BAR0_WINSZ);
        if (wl->regsva == NULL) {
                WL_ERROR(("wl%d: ioremap() failed\n", unit));
                goto fail;
        }
-#ifdef WLC_HIGH_ONLY
-       spin_lock_init(&wl->rpcq_lock);
-       spin_lock_init(&wl->txq_lock);
-
-       sema_init(&wl->sem, 1);
-#else
        spin_lock_init(&wl->lock);
        spin_lock_init(&wl->isr_lock);
-#endif
 
-#ifndef WLC_HIGH_ONLY
        /* prepare ucode */
        if (wl_request_fw(wl, (struct pci_dev *)btparam)) {
                printf("%s: Failed to find firmware usually in %s\n",
@@ -849,14 +733,11 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
                wl_remove((struct pci_dev *)btparam);
                goto fail1;
        }
-#endif
 
        /* common load-time initialization */
        wl->wlc = wlc_attach((void *)wl, vendor, device, unit, wl->piomode, osh,
                             wl->regsva, wl->bcm_bustype, btparam, &err);
-#ifndef WLC_HIGH_ONLY
        wl_release_fw(wl);
-#endif
        if (!wl->wlc) {
                printf("%s: wlc_attach() failed with code %d\n",
                        KBUILD_MODNAME, err);
@@ -868,14 +749,6 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
        ASSERT(wl->pub->ieee_hw);
        ASSERT(wl->pub->ieee_hw->priv == wl);
 
-#ifdef WLC_HIGH_ONLY
-       REGOPSSET(osh, (osl_rreg_fn_t) wlc_reg_read,
-                 (osl_wreg_fn_t) wlc_reg_write, wl->wlc);
-       wl->rpc_dispatch_ctx.rpc = wl->rpc;
-       wl->rpc_dispatch_ctx.wlc = wl->wlc;
-       bcm_rpc_rxcb_init(wl->rpc, wl, wl_rpc_dispatch_schedule, wl,
-                         wl_rpc_down, NULL, NULL);
-#endif                         /* WLC_HIGH_ONLY */
 
        if (wlc_iovar_setint(wl->wlc, "mpc", 0)) {
                WL_ERROR(("wl%d: Error setting MPC variable to 0\n",
@@ -922,13 +795,8 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
                WL_ERROR(("%s: regulatory_hint failed, status %d\n", __func__,
                          err));
        }
-#ifndef WLC_HIGH_ONLY
        WL_ERROR(("wl%d: Broadcom BCM43xx 802.11 MAC80211 Driver "
                  " (" PHY_VERSION_STR ")", unit));
-#else
-       WL_ERROR(("wl%d: Broadcom BCM43xx 802.11 Splitmac MAC80211 Driver "
-                 , unit));
-#endif
 
 #ifdef BCMDBG
        printf(" (Compiled at " __TIME__ " on " __DATE__ ")");
@@ -944,54 +812,6 @@ fail1:
        return NULL;
 }
 
-#ifdef WLC_HIGH_ONLY
-static void *wl_dbus_probe_cb(void *arg, const char *desc, u32 bustype,
-                             u32 hdrlen)
-{
-       wl_info_t *wl;
-       WL_ERROR(("%s:\n", __func__));
-
-       wl = wl_attach(BCM_DNGL_VID, BCM_DNGL_BDC_PID, (unsigned long) NULL, RPC_BUS,
-               NULL, 0);
-       if (!wl) {
-               WL_ERROR(("%s: wl_attach failed\n", __func__));
-       }
-
-       /* This is later passed to wl_dbus_disconnect_cb */
-       return wl;
-}
-
-static void wl_dbus_disconnect_cb(void *arg)
-{
-       wl_info_t *wl = arg;
-
-       WL_ERROR(("%s:\n", __func__));
-
-       if (wl) {
-#ifdef WLC_HIGH_ONLY
-               if (wl->pub->ieee_hw) {
-                       ieee80211_unregister_hw(wl->pub->ieee_hw);
-                       WL_ERROR(("%s: Back from down\n", __func__));
-               }
-               wlc_device_removed(wl->wlc);
-               wlc_bmac_dngl_reboot(wl->rpc);
-               bcm_rpc_down(wl->rpc);
-#endif
-               WL_LOCK(wl);
-               wl_down(wl);
-               WL_UNLOCK(wl);
-#ifdef WLC_HIGH_ONLY
-               if (wl->pub->ieee_hw) {
-                       ieee80211_free_hw(wl->pub->ieee_hw);
-                       WL_ERROR(("%s: Back from ieee80211_free_hw\n",
-                                 __func__));
-                       wl->pub->ieee_hw = NULL;
-               }
-#endif
-               wl_free(wl);
-       }
-}
-#endif                         /* WLC_HIGH_ONLY */
 
 
 #define CHAN2GHZ(channel, freqency, chflags)  { \
@@ -1129,29 +949,13 @@ static struct ieee80211_supported_band wl_band_2GHz_nphy = {
                   .cap = IEEE80211_HT_CAP_GRN_FLD |
                   IEEE80211_HT_CAP_SGI_20 |
                   IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT,
-#ifdef WLC_HIGH_ONLY
-                  .ht_supported = true,
-                  .ampdu_factor = AMPDU_RX_FACTOR_16K,
-#else
                   .ht_supported = true,
                   .ampdu_factor = AMPDU_RX_FACTOR_64K,
-#endif
                   .ampdu_density = AMPDU_DEF_MPDU_DENSITY,
                   .mcs = {
                           /* placeholders for now */
-#ifdef WLC_HIGH_ONLY
-                          /*
-                           * rx_mask[0] = 0xff by default
-                           * rx_mask[1] = 0xff if number of rx chain >=2
-                           * rx_mask[2] = 0xff if number of rx chain >=3
-                           * rx_mask[4] = 1 if 40Mhz is supported
-                           */
-                          .rx_mask = {0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-                          .rx_highest = 72,    /* max rate of single stream */
-#else
                           .rx_mask = {0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0},
                           .rx_highest = 500,
-#endif
                           .tx_params = IEEE80211_HT_MCS_TX_DEFINED}
                   }
 };
@@ -1192,16 +996,12 @@ static int ieee_hw_rate_init(struct ieee80211_hw *hw)
        }
        WL_NONE(("%s: phylist = %c\n", __func__, phy_list[0]));
 
-#ifndef WLC_HIGH_ONLY
        if (phy_list[0] == 'n' || phy_list[0] == 'c') {
                if (phy_list[0] == 'c') {
                        /* Single stream */
                        wl_band_2GHz_nphy.ht_cap.mcs.rx_mask[1] = 0;
                        wl_band_2GHz_nphy.ht_cap.mcs.rx_highest = 72;
                }
-#else
-       if (phy_list[0] == 's') {
-#endif
                hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &wl_band_2GHz_nphy;
        } else {
                BUG();
@@ -1211,11 +1011,7 @@ static int ieee_hw_rate_init(struct ieee80211_hw *hw)
        /* Assume all bands use the same phy.  True for 11n devices. */
        if (NBANDS_PUB(wl->pub) > 1) {
                has_5g++;
-#ifndef WLC_HIGH_ONLY
                if (phy_list[0] == 'n' || phy_list[0] == 'c') {
-#else
-               if (phy_list[0] == 's') {
-#endif
                        hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
                            &wl_band_5GHz_nphy;
                } else {
@@ -1446,7 +1242,6 @@ static int __init wl_module_init(void)
                if (var)
                        wl_msg_level = simple_strtoul(var, NULL, 0);
        }
-#ifndef WLC_HIGH_ONLY
        {
                extern u32 phyhal_msg_level;
 
@@ -1458,7 +1253,6 @@ static int __init wl_module_init(void)
                                phyhal_msg_level = simple_strtoul(var, NULL, 0);
                }
        }
-#endif                         /* WLC_HIGH_ONLY */
 #endif                         /* BCMDBG */
 
 #ifndef BCMSDIO
@@ -1468,15 +1262,6 @@ static int __init wl_module_init(void)
 
 #endif                         /* !BCMSDIO */
 
-#ifdef WLC_HIGH_ONLY
-       /* BMAC_NOTE: define hardcode number, why NODEVICE is ok ? */
-       error =
-           dbus_register(BCM_DNGL_VID, 0, wl_dbus_probe_cb,
-                         wl_dbus_disconnect_cb, NULL, NULL, NULL);
-       if (error == DBUS_ERR_NODEVICE) {
-               error = DBUS_OK;
-       }
-#endif                         /* WLC_HIGH_ONLY */
 
        return error;
 }
@@ -1494,9 +1279,6 @@ static void __exit wl_module_exit(void)
        pci_unregister_driver(&wl_pci_driver);
 #endif                         /* !BCMSDIO */
 
-#ifdef WLC_HIGH_ONLY
-       dbus_deregister();
-#endif                         /* WLC_HIGH_ONLY */
 }
 
 module_init(wl_module_init);
@@ -1515,13 +1297,11 @@ void wl_free(wl_info_t *wl)
        struct osl_info *osh;
 
        ASSERT(wl);
-#ifndef WLC_HIGH_ONLY
        /* free ucode data */
        if (wl->fw.fw_cnt)
                wl_ucode_data_free();
        if (wl->irq)
                free_irq(wl->irq, wl);
-#endif
 
        /* kill dpc */
        tasklet_kill(&wl->tasklet);
@@ -1565,21 +1345,6 @@ void wl_free(wl_info_t *wl)
        }
        wl->regsva = NULL;
 
-#ifdef WLC_HIGH_ONLY
-       wl_rpcq_free(wl);
-
-       wl_txq_free(wl);
-
-       if (wl->rpc) {
-               bcm_rpc_detach(wl->rpc);
-               wl->rpc = NULL;
-       }
-
-       if (wl->rpc_th) {
-               bcm_rpc_tp_detach(wl->rpc_th);
-               wl->rpc_th = NULL;
-       }
-#endif                         /* WLC_HIGH_ONLY */
 
        osl_detach(osh);
 }
@@ -1598,13 +1363,7 @@ static int BCMFASTPATH wl_start(struct sk_buff *skb, wl_info_t *wl)
 static int BCMFASTPATH
 wl_start_int(wl_info_t *wl, struct ieee80211_hw *hw, struct sk_buff *skb)
 {
-#ifdef WLC_HIGH_ONLY
-       WL_LOCK(wl);
-#endif
        wlc_sendpkt_mac80211(wl->wlc, skb, hw);
-#ifdef WLC_HIGH_ONLY
-       WL_UNLOCK(wl);
-#endif
        return NETDEV_TX_OK;
 }
 
@@ -1613,36 +1372,6 @@ void wl_txflowcontrol(wl_info_t *wl, struct wl_if *wlif, bool state, int prio)
        WL_ERROR(("Shouldn't be here %s\n", __func__));
 }
 
-#if defined(WLC_HIGH_ONLY)
-/* Schedule a completion handler to run at safe time */
-static int
-wl_schedule_task(wl_info_t *wl, void (*fn) (struct wl_task *task),
-                void *context)
-{
-       wl_task_t *task;
-
-       WL_TRACE(("wl%d: wl_schedule_task\n", wl->pub->unit));
-
-       task = kmalloc(sizeof(wl_task_t), GFP_ATOMIC);
-       if (!task) {
-               WL_ERROR(("wl%d: wl_schedule_task: out of memory\n", wl->pub->unit));
-               return -ENOMEM;
-       }
-
-       INIT_WORK(&task->work, (work_func_t) fn);
-       task->context = context;
-
-       if (!schedule_work(&task->work)) {
-               WL_ERROR(("wl%d: schedule_work() failed\n", wl->pub->unit));
-               kfree(task);
-               return -ENOMEM;
-       }
-
-       atomic_inc(&wl->callbacks);
-
-       return 0;
-}
-#endif                         /* defined(WLC_HIGH_ONLY) */
 
 void wl_init(wl_info_t *wl)
 {
@@ -1734,12 +1463,10 @@ void wl_down(wl_info_t *wl)
        /* wait for down callbacks to complete */
        WL_UNLOCK(wl);
 
-#ifndef WLC_HIGH_ONLY
        /* For HIGH_only driver, it's important to actually schedule other work,
         * not just spin wait since everything runs at schedule level
         */
        SPINWAIT((atomic_read(&wl->callbacks) > callbacks), 100 * 1000);
-#endif                         /* WLC_HIGH_ONLY */
 
        WL_LOCK(wl);
 }
@@ -1843,12 +1570,7 @@ void wl_event(wl_info_t *wl, char *ifname, wlc_event_t *e)
 
 static void wl_timer(unsigned long data)
 {
-#ifndef WLC_HIGH_ONLY
        _wl_timer((wl_timer_t *) data);
-#else
-       wl_timer_t *t = (wl_timer_t *) data;
-       wl_schedule_task(t->wl, wl_timer_task, t);
-#endif                         /* WLC_HIGH_ONLY */
 }
 
 static void _wl_timer(wl_timer_t *t)
@@ -2015,226 +1737,7 @@ struct wl_fw_hdr {
        u32 idx;
 };
 
-#ifdef WLC_HIGH_ONLY
-static void wl_rpc_down(void *wlh)
-{
-       wl_info_t *wl = (wl_info_t *) (wlh);
-
-       wlc_device_removed(wl->wlc);
-
-       wl_rpcq_free(wl);
-}
-
-static int BCMFASTPATH wl_start(struct sk_buff *skb, wl_info_t *wl)
-{
-
-       unsigned long flags;
-
-       skb->prev = NULL;
-
-       /* Lock the queue as tasklet could be running at this time */
-       TXQ_LOCK(wl, flags);
-       if (wl->txq_head == NULL)
-               wl->txq_head = skb;
-       else {
-               wl->txq_tail->prev = skb;
-       }
-       wl->txq_tail = skb;
-
-       if (wl->txq_dispatched == false) {
-               wl->txq_dispatched = true;
-
-               if (schedule_work(&wl->txq_task.work)) {
-                       atomic_inc(&wl->callbacks);
-               } else {
-                       WL_ERROR(("wl%d: wl_start/schedule_work failed\n",
-                                 wl->pub->unit));
-               }
-       }
-
-       TXQ_UNLOCK(wl, flags);
-
-       return 0;
-
-}
-
-static void wl_start_txqwork(struct wl_task *task)
-{
-       wl_info_t *wl = (wl_info_t *) task->context;
-       struct sk_buff *skb;
-       unsigned long flags;
-       uint count = 0;
-
-       WL_TRACE(("wl%d: wl_start_txqwork\n", wl->pub->unit));
-
-       /* First remove an entry then go for execution */
-       TXQ_LOCK(wl, flags);
-       while (wl->txq_head) {
-               skb = wl->txq_head;
-               wl->txq_head = skb->prev;
-               skb->prev = NULL;
-               if (wl->txq_head == NULL)
-                       wl->txq_tail = NULL;
-               TXQ_UNLOCK(wl, flags);
-
-               /* it has WL_LOCK/WL_UNLOCK inside */
-               wl_start_int(wl, WL_TO_HW(wl), skb);
-
-               /* bounded our execution, reshedule ourself next */
-               if (++count >= 10)
-                       break;
-
-               TXQ_LOCK(wl, flags);
-       }
-
-       if (count >= 10) {
-               if (!schedule_work(&wl->txq_task.work)) {
-                       WL_ERROR(("wl%d: wl_start/schedule_work failed\n",
-                                 wl->pub->unit));
-                       atomic_dec(&wl->callbacks);
-               }
-       } else {
-               wl->txq_dispatched = false;
-               TXQ_UNLOCK(wl, flags);
-               atomic_dec(&wl->callbacks);
-       }
-
-       return;
-}
-
-static void wl_txq_free(wl_info_t *wl)
-{
-       struct sk_buff *skb;
-
-       if (wl->txq_head == NULL) {
-               ASSERT(wl->txq_tail == NULL);
-               return;
-       }
-
-       while (wl->txq_head) {
-               skb = wl->txq_head;
-               wl->txq_head = skb->prev;
-               PKTFREE(wl->osh, skb, true);
-       }
-
-       wl->txq_tail = NULL;
-}
-
-static void wl_rpcq_free(wl_info_t *wl)
-{
-       rpc_buf_t *buf;
-
-       if (wl->rpcq_head == NULL) {
-               ASSERT(wl->rpcq_tail == NULL);
-               return;
-       }
-
-       while (wl->rpcq_head) {
-               buf = wl->rpcq_head;
-               wl->rpcq_head = bcm_rpc_buf_next_get(wl->rpc_th, buf);
-               bcm_rpc_buf_free(wl->rpc_dispatch_ctx.rpc, buf);
-       }
-
-       wl->rpcq_tail = NULL;
-}
-
-static void wl_rpcq_dispatch(struct wl_task *task)
-{
-       wl_info_t *wl = (wl_info_t *) task->context;
-       rpc_buf_t *buf;
-       unsigned long flags;
-
-       /* First remove an entry then go for execution */
-       RPCQ_LOCK(wl, flags);
-       while (wl->rpcq_head) {
-               buf = wl->rpcq_head;
-               wl->rpcq_head = bcm_rpc_buf_next_get(wl->rpc_th, buf);
-
-               if (wl->rpcq_head == NULL)
-                       wl->rpcq_tail = NULL;
-               RPCQ_UNLOCK(wl, flags);
-
-               WL_LOCK(wl);
-               wlc_rpc_high_dispatch(&wl->rpc_dispatch_ctx, buf);
-               WL_UNLOCK(wl);
-
-               RPCQ_LOCK(wl, flags);
-       }
-
-       wl->rpcq_dispatched = false;
-
-       RPCQ_UNLOCK(wl, flags);
-
-       kfree(task);
-       atomic_dec(&wl->callbacks);
-}
-
-static void wl_rpcq_add(wl_info_t *wl, rpc_buf_t *buf)
-{
-       unsigned long flags;
-
-       bcm_rpc_buf_next_set(wl->rpc_th, buf, NULL);
-
-       /* Lock the queue as tasklet could be running at this time */
-       RPCQ_LOCK(wl, flags);
-       if (wl->rpcq_head == NULL)
-               wl->rpcq_head = buf;
-       else
-               bcm_rpc_buf_next_set(wl->rpc_th, wl->rpcq_tail, buf);
-
-       wl->rpcq_tail = buf;
-
-       if (wl->rpcq_dispatched == false) {
-               wl->rpcq_dispatched = true;
-               wl_schedule_task(wl, wl_rpcq_dispatch, wl);
-       }
-
-       RPCQ_UNLOCK(wl, flags);
-}
-
-#if defined(BCMDBG)
-static const struct name_entry rpc_name_tbl[] = RPC_ID_TABLE;
-#endif                         /* BCMDBG */
-
-/* dongle-side rpc dispatch routine */
-static void wl_rpc_dispatch_schedule(void *ctx, struct rpc_buf *buf)
-{
-       bcm_xdr_buf_t b;
-       wl_info_t *wl = (wl_info_t *) ctx;
-       wlc_rpc_id_t rpc_id;
-       int err;
-
-       bcm_xdr_buf_init(&b, bcm_rpc_buf_data(wl->rpc_th, buf),
-                        bcm_rpc_buf_len_get(wl->rpc_th, buf));
-
-       err = bcm_xdr_unpack_u32(&b, &rpc_id);
-       ASSERT(!err);
-       WL_TRACE(("%s: Dispatch id %s\n", __func__,
-                 WLC_RPC_ID_LOOKUP(rpc_name_tbl, rpc_id)));
-
-       /* Handle few emergency ones */
-       switch (rpc_id) {
-       default:
-               wl_rpcq_add(wl, buf);
-               break;
-       }
-}
-
-static void wl_timer_task(wl_task_t *task)
-{
-       wl_timer_t *t = (wl_timer_t *) task->context;
-
-       _wl_timer(t);
-       kfree(task);
-
-       /* This dec is for the task_schedule. The timer related
-        * callback is decremented in _wl_timer
-        */
-       atomic_dec(&t->wl->callbacks);
-}
-#endif                         /* WLC_HIGH_ONLY */
 
-#ifndef WLC_HIGH_ONLY
 char *wl_firmwares[WL_MAX_FW] = {
        "brcm/bcm43xx",
        NULL
@@ -2345,4 +1848,3 @@ static void wl_release_fw(wl_info_t *wl)
                release_firmware(wl->fw.fw_hdr[i]);
        }
 }
-#endif                         /* WLC_HIGH_ONLY */
index 54bbb15..ba9d48c 100644 (file)
@@ -67,12 +67,8 @@ struct wl_info {
 
        int irq;
 
-#ifdef WLC_HIGH_ONLY
-       struct semaphore sem;   /* use semaphore to allow sleep */
-#else
        spinlock_t lock;        /* per-device perimeter lock */
        spinlock_t isr_lock;    /* per-device ISR synchronization lock */
-#endif
        uint bcm_bustype;       /* bus type */
        bool piomode;           /* set from insmod argument */
        void *regsva;           /* opaque chip registers virtual address */
@@ -88,30 +84,12 @@ struct wl_info {
        u32 pci_psstate[16];    /* pci ps-state save/restore */
 #endif
        /* RPC, handle, lock, txq, workitem */
-#ifdef WLC_HIGH_ONLY
-       rpc_info_t *rpc;        /* RPC handle */
-       rpc_tp_info_t *rpc_th;  /* RPC transport handle */
-       wlc_rpc_ctx_t rpc_dispatch_ctx;
-
-       bool rpcq_dispatched;   /* Avoid scheduling multiple tasks */
-       spinlock_t rpcq_lock;   /* Lock for the queue */
-       rpc_buf_t *rpcq_head;   /* RPC Q */
-       rpc_buf_t *rpcq_tail;   /* Points to the last buf */
-
-       bool txq_dispatched;    /* Avoid scheduling multiple tasks */
-       spinlock_t txq_lock;    /* Lock for the queue */
-       struct sk_buff *txq_head;       /* TX Q */
-       struct sk_buff *txq_tail;       /* Points to the last buf */
-
-       wl_task_t txq_task;     /* work queue for wl_start() */
-#endif                         /* WLC_HIGH_ONLY */
        uint stats_id;          /* the current set of stats */
        /* ping-pong stats counters updated by Linux watchdog */
        struct net_device_stats stats_watchdog[2];
        struct wl_firmware fw;
 };
 
-#ifndef WLC_HIGH_ONLY
 #define WL_LOCK(wl)    spin_lock_bh(&(wl)->lock)
 #define WL_UNLOCK(wl)  spin_unlock_bh(&(wl)->lock)
 
@@ -122,14 +100,6 @@ struct wl_info {
 /* locking under WL_LOCK() to synchronize with wl_isr */
 #define INT_LOCK(wl, flags)    spin_lock_irqsave(&(wl)->isr_lock, flags)
 #define INT_UNLOCK(wl, flags)  spin_unlock_irqrestore(&(wl)->isr_lock, flags)
-#else                          /* BCMSDIO */
-
-#define WL_LOCK(wl)    down(&(wl)->sem)
-#define WL_UNLOCK(wl)  up(&(wl)->sem)
-
-#define WL_ISRLOCK(wl)
-#define WL_ISRUNLOCK(wl)
-#endif                         /* WLC_HIGH_ONLY */
 
 /* handle forward declaration */
 typedef struct wl_info wl_info_t;
index 1fb9976..e863a81 100644 (file)
@@ -63,11 +63,6 @@ void wlc_tunables_init(wlc_tunables_t *tunables, uint devid)
        tunables->ampdudatahiwat = WLC_AMPDUDATAHIWAT;
        tunables->rxbnd = RXBND;
        tunables->txsbnd = TXSBND;
-#if defined(WLC_HIGH_ONLY) && defined(NTXD_USB_4319)
-       if (devid == BCM4319_CHIP_ID) {
-               tunables->ntxd = NTXD_USB_4319;
-       }
-#endif                         /* WLC_HIGH_ONLY */
 }
 
 static wlc_pub_t *wlc_pub_malloc(struct osl_info *osh, uint unit, uint *err,
index dc32702..ab883ba 100644 (file)
 #include <wl_export.h>
 #include <wl_dbg.h>
 
-#ifdef WLC_HIGH_ONLY
-#include <bcm_rpc_tp.h>
-#include <wlc_rpctx.h>
-#endif
 
 #define AMPDU_MAX_MPDU         32      /* max number of mpdus in an ampdu */
 #define AMPDU_NUM_MPDU_LEGACY  16      /* max number of mpdus in an ampdu to a legacy */
@@ -126,11 +122,6 @@ struct ampdu_info {
                                 */
        wlc_fifo_info_t fifo_tb[NUM_FFPLD_FIFO];        /* table of fifo infos  */
 
-#ifdef WLC_HIGH_ONLY
-       void *p;
-       tx_status_t txs;
-       bool waiting_status;    /* To help sanity checks */
-#endif
 };
 
 #define AMPDU_CLEANUPFLAG_RX   (0x1)
@@ -210,10 +201,6 @@ ampdu_info_t *wlc_ampdu_attach(wlc_info_t *wlc)
                ampdu->rx_factor = AMPDU_RX_FACTOR_32K;
        else
                ampdu->rx_factor = AMPDU_RX_FACTOR_64K;
-#ifdef WLC_HIGH_ONLY
-       /* Restrict to smaller rcv size for BMAC dongle */
-       ampdu->rx_factor = AMPDU_RX_FACTOR_32K;
-#endif
        ampdu->retry_limit = AMPDU_DEF_RETRY_LIMIT;
        ampdu->rr_retry_limit = AMPDU_DEF_RR_RETRY_LIMIT;
 
@@ -887,19 +874,9 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
                if (frameid & TXFID_RATE_PROBE_MASK) {
                        WL_ERROR(("%s: XXX what to do with TXFID_RATE_PROBE_MASK!?\n", __func__));
                }
-#ifdef WLC_HIGH_ONLY
-               if (wlc->rpc_agg & BCM_RPC_TP_HOST_AGG_AMPDU)
-                       bcm_rpc_tp_agg_set(bcm_rpc_tp_get(wlc->rpc),
-                                          BCM_RPC_TP_HOST_AGG_AMPDU, true);
-#endif
                for (i = 0; i < count; i++)
                        wlc_txfifo(wlc, fifo, pkt[i], i == (count - 1),
                                   ampdu->txpkt_weight);
-#ifdef WLC_HIGH_ONLY
-               if (wlc->rpc_agg & BCM_RPC_TP_HOST_AGG_AMPDU)
-                       bcm_rpc_tp_agg_set(bcm_rpc_tp_get(wlc->rpc),
-                                          BCM_RPC_TP_HOST_AGG_AMPDU, false);
-#endif
 
        }
        /* endif (count) */
@@ -967,31 +944,6 @@ wlc_ampdu_dotxstatus(ampdu_info_t *ampdu, struct scb *scb, void *p,
        wlc_ampdu_txflowcontrol(wlc, scb_ampdu, ini);
 }
 
-#ifdef WLC_HIGH_ONLY
-void wlc_ampdu_txstatus_complete(ampdu_info_t *ampdu, u32 s1, u32 s2)
-{
-       WL_AMPDU_TX(("wl%d: wlc_ampdu_txstatus_complete: High Recvd 0x%x 0x%x p:%p\n", ampdu->wlc->pub->unit, s1, s2, ampdu->p));
-
-       ASSERT(ampdu->waiting_status);
-
-       /* The packet may have been freed if the SCB went away, if so, then still free the
-        * DMA chain
-        */
-       if (ampdu->p) {
-               struct ieee80211_tx_info *tx_info;
-               struct scb *scb;
-
-               tx_info = IEEE80211_SKB_CB(ampdu->p);
-               scb = (struct scb *)tx_info->control.sta->drv_priv;
-
-               wlc_ampdu_dotxstatus_complete(ampdu, scb, ampdu->p, &ampdu->txs,
-                                             s1, s2);
-               ampdu->p = NULL;
-       }
-
-       ampdu->waiting_status = false;
-}
-#endif                         /* WLC_HIGH_ONLY */
 void rate_status(wlc_info_t *wlc, struct ieee80211_tx_info *tx_info,
                 tx_status_t *txs, u8 mcs);
 
@@ -1117,11 +1069,6 @@ wlc_ampdu_dotxstatus_complete(ampdu_info_t *ampdu, struct scb *scb, void *p,
                                if (wlc_ffpld_check_txfunfl(wlc, prio2fifo[tid])
                                    > 0) {
                                        tx_error = true;
-#ifdef WLC_HIGH_ONLY
-                                       /* With BMAC, TX Underflows should not happen */
-                                       WL_ERROR(("wl%d: BMAC TX Underflow?",
-                                                 wlc->pub->unit));
-#endif
                                }
                        }
                } else if (txs->phyerr) {
index c721b16..939cae0 100644 (file)
@@ -32,9 +32,5 @@ extern void wlc_ampdu_shm_upd(ampdu_info_t *ampdu);
 extern u8 wlc_ampdu_null_delim_cnt(ampdu_info_t *ampdu, struct scb *scb,
                                      ratespec_t rspec, int phylen);
 extern void scb_ampdu_cleanup(ampdu_info_t *ampdu, struct scb *scb);
-#ifdef WLC_HIGH_ONLY
-extern void wlc_ampdu_txstatus_complete(ampdu_info_t *ampdu, u32 s1,
-                                       u32 s2);
-#endif
 
 #endif                         /* _wlc_ampdu_h_ */
index 4cc41f9..c3d251a 100644 (file)
@@ -242,16 +242,6 @@ extern void wlc_bmac_retrylimit_upd(wlc_hw_info_t *wlc_hw, u16 SRL,
 
 extern void wlc_bmac_fifoerrors(wlc_hw_info_t *wlc_hw);
 
-#ifdef WLC_HIGH_ONLY
-extern void wlc_bmac_dngl_reboot(rpc_info_t *);
-extern void wlc_bmac_dngl_rpc_agg(rpc_info_t *, u16 agg);
-extern void wlc_bmac_dngl_rpc_msglevel(rpc_info_t *, u16 level);
-extern void wlc_bmac_dngl_rpc_txq_wm_set(rpc_info_t *rpc, u32 wm);
-extern void wlc_bmac_dngl_rpc_txq_wm_get(rpc_info_t *rpc, u32 *wm);
-extern void wlc_bmac_dngl_rpc_agg_limit_set(rpc_info_t *rpc, u32 val);
-extern void wlc_bmac_dngl_rpc_agg_limit_get(rpc_info_t *rpc, u32 *pval);
-extern int wlc_bmac_debug_template(wlc_hw_info_t *wlc_hw);
-#endif
 
 /* API for BMAC driver (e.g. wlc_phy.c etc) */
 
index 513e4d9..c270d3f 100644 (file)
 #else
 #include "d11ucode_ext.h"
 #endif
-#ifdef WLC_HIGH_ONLY
-#include <bcm_rpc_tp.h>
-#include <bcm_rpc.h>
-#include <bcm_xdr.h>
-#include <wlc_rpc.h>
-#include <wlc_rpctx.h>
-#endif                         /* WLC_HIGH_ONLY */
 #include <wlc_alloc.h>
 #include <net/mac80211.h>
 #include <wl_dbg.h>
 
-#ifdef WLC_HIGH_ONLY
-#undef R_REG
-#undef W_REG
-#define R_REG(osh, r) RPC_READ_REG(osh, r)
-#define W_REG(osh, r, v) RPC_WRITE_REG(osh, r, v)
-#endif
 
 /*
  * buffer length needed for wlc_format_ssid
 /* To inform the ucode of the last mcast frame posted so that it can clear moredata bit */
 #define BCMCFID(wlc, fid) wlc_bmac_write_shm((wlc)->hw, M_BCMC_FID, (fid))
 
-#ifndef WLC_HIGH_ONLY
 #define WLC_WAR16165(wlc) (BUSTYPE(wlc->pub->sih->bustype) == PCI_BUS && \
                                (!AP_ENAB(wlc->pub)) && (wlc->war16165))
-#else
-#define WLC_WAR16165(wlc) (false)
-#endif                         /* WLC_HIGH_ONLY */
 
 /* debug/trace */
 uint wl_msg_level =
@@ -401,22 +384,6 @@ void wlc_reset(wlc_info_t *wlc)
        wlc_ampdu_reset(wlc->ampdu);
        wlc->txretried = 0;
 
-#ifdef WLC_HIGH_ONLY
-       /* Need to set a flag(to be cleared asynchronously by BMAC driver with high call)
-        *  in order to prevent wlc_rpctx_txreclaim() from screwing wlc_rpctx_getnexttxp(),
-        *  which could be invoked by already QUEUED high call(s) from BMAC driver before
-        *  wlc_bmac_reset() finishes.
-        * It's not needed before in monolithic driver model because d11core interrupts would
-        *  have been cleared instantly in wlc_bmac_reset() and no txstatus interrupt
-        *  will come to driver to fetch those flushed dma pkt pointers.
-        */
-       wlc->reset_bmac_pending = true;
-
-       wlc_rpctx_txreclaim(wlc->rpctx);
-
-       wlc_stf_phy_txant_upd(wlc);
-       wlc_phy_ant_rxdiv_set(wlc->band->pi, wlc->stf->ant_rx_ovr);
-#endif
 }
 
 void wlc_fatal_error(wlc_info_t *wlc)
@@ -1858,10 +1825,6 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
        /* propagate *vars* from BMAC driver to high driver */
        wlc_bmac_copyfrom_vars(wlc->hw, &pub->vars, &wlc->vars_size);
 
-#ifdef WLC_HIGH_ONLY
-       WL_TRACE(("nvram : vars %p , vars_size %d\n", pub->vars,
-                 wlc->vars_size));
-#endif
 
        /* set maximum allowed duty cycle */
        wlc->tx_duty_cycle_ofdm =
@@ -2139,134 +2102,6 @@ static bool wlc_attach_stf_ant_init(wlc_info_t *wlc)
        return true;
 }
 
-#ifdef WLC_HIGH_ONLY
-/* HIGH_ONLY bmac_attach, which sync over LOW_ONLY bmac_attach states */
-int wlc_bmac_attach(wlc_info_t *wlc, u16 vendor, u16 device, uint unit,
-                   bool piomode, struct osl_info *osh, void *regsva,
-                   uint bustype, void *btparam)
-{
-       wlc_bmac_revinfo_t revinfo;
-       uint idx = 0;
-       rpc_info_t *rpc = (rpc_info_t *) btparam;
-
-       ASSERT(bustype == RPC_BUS);
-
-       /* install the rpc handle in the various state structures used by stub RPC functions */
-       wlc->rpc = rpc;
-       wlc->hw->rpc = rpc;
-       wlc->hw->osh = osh;
-
-       wlc->regs = 0;
-
-       wlc->rpctx = wlc_rpctx_attach(wlc->pub, wlc);
-       if (wlc->rpctx == NULL)
-               return -1;
-
-       /*
-        * FIFO 0
-        * TX: TX_AC_BK_FIFO (TX AC Background data packets)
-        */
-       /* Always initialized */
-       ASSERT(NRPCTXBUFPOST <= NTXD);
-       wlc_rpctx_fifoinit(wlc->rpctx, TX_DATA_FIFO, NRPCTXBUFPOST);
-       wlc_rpctx_fifoinit(wlc->rpctx, TX_CTL_FIFO, NRPCTXBUFPOST);
-       wlc_rpctx_fifoinit(wlc->rpctx, TX_BCMC_FIFO, NRPCTXBUFPOST);
-
-       /* VI and BK inited only if WME */
-       if (WME_ENAB(wlc->pub)) {
-               wlc_rpctx_fifoinit(wlc->rpctx, TX_AC_BK_FIFO, NRPCTXBUFPOST);
-               wlc_rpctx_fifoinit(wlc->rpctx, TX_AC_VI_FIFO, NRPCTXBUFPOST);
-       }
-
-       /* Allocate SB handle */
-       wlc->pub->sih = osl_malloc(wlc->osh, sizeof(si_t));
-       if (!wlc->pub->sih)
-               return -1;
-       bzero(wlc->pub->sih, sizeof(si_t));
-
-       /* sync up revinfo with BMAC */
-       bzero(&revinfo, sizeof(wlc_bmac_revinfo_t));
-       if (wlc_bmac_revinfo_get(wlc->hw, &revinfo) != 0)
-               return -1;
-       wlc->vendorid = (u16) revinfo.vendorid;
-       wlc->deviceid = (u16) revinfo.deviceid;
-
-       wlc->pub->boardrev = (u16) revinfo.boardrev;
-       wlc->pub->corerev = revinfo.corerev;
-       wlc->pub->sromrev = (u8) revinfo.sromrev;
-       wlc->pub->sih->chiprev = revinfo.chiprev;
-       wlc->pub->sih->chip = revinfo.chip;
-       wlc->pub->sih->chippkg = revinfo.chippkg;
-       wlc->pub->sih->boardtype = revinfo.boardtype;
-       wlc->pub->sih->boardvendor = revinfo.boardvendor;
-       wlc->pub->sih->bustype = revinfo.bustype;
-       wlc->pub->sih->buscoretype = revinfo.buscoretype;
-       wlc->pub->sih->buscorerev = revinfo.buscorerev;
-       wlc->pub->sih->issim = (bool) revinfo.issim;
-       wlc->pub->sih->rpc = rpc;
-
-       if (revinfo.nbands == 0 || revinfo.nbands > 2)
-               return -1;
-       wlc->pub->_nbands = revinfo.nbands;
-
-       for (idx = 0; idx < wlc->pub->_nbands; idx++) {
-               uint bandunit, bandtype;        /* To access bandstate */
-               wlc_phy_t *pi = osl_malloc(wlc->osh, sizeof(wlc_phy_t));
-
-               if (!pi)
-                       return -1;
-               bzero(pi, sizeof(wlc_phy_t));
-               pi->rpc = rpc;
-
-               bandunit = revinfo.band[idx].bandunit;
-               bandtype = revinfo.band[idx].bandtype;
-               wlc->bandstate[bandunit]->radiorev =
-                   (u8) revinfo.band[idx].radiorev;
-               wlc->bandstate[bandunit]->phytype =
-                   (u16) revinfo.band[idx].phytype;
-               wlc->bandstate[bandunit]->phyrev =
-                   (u16) revinfo.band[idx].phyrev;
-               wlc->bandstate[bandunit]->radioid =
-                   (u16) revinfo.band[idx].radioid;
-               wlc->bandstate[bandunit]->abgphy_encore =
-                   revinfo.band[idx].abgphy_encore;
-
-               wlc->bandstate[bandunit]->pi = pi;
-               wlc->bandstate[bandunit]->bandunit = bandunit;
-               wlc->bandstate[bandunit]->bandtype = bandtype;
-       }
-
-       /* misc stuff */
-
-       return 0;
-}
-
-/* Free the convenience handles */
-int wlc_bmac_detach(wlc_info_t *wlc)
-{
-       uint idx;
-
-       if (wlc->pub->sih) {
-               osl_mfree(wlc->osh, (void *)wlc->pub->sih, sizeof(si_t));
-               wlc->pub->sih = NULL;
-       }
-
-       for (idx = 0; idx < MAXBANDS; idx++)
-               if (wlc->bandstate[idx]->pi) {
-                       kfree(wlc->bandstate[idx]->pi);
-                       wlc->bandstate[idx]->pi = NULL;
-               }
-
-       if (wlc->rpctx) {
-               wlc_rpctx_detach(wlc->rpctx);
-               wlc->rpctx = NULL;
-       }
-
-       return 0;
-
-}
-
-#endif                         /* WLC_HIGH_ONLY */
 
 static void wlc_timers_deinit(wlc_info_t *wlc)
 {
@@ -2335,15 +2170,6 @@ uint wlc_detach(wlc_info_t *wlc)
 
        /* free other state */
 
-#ifdef WLC_HIGH_ONLY
-       /* High-Only driver has an allocated copy of vars, monolithic just
-        * references the wlc->hw->vars which is freed in wlc_bmac_detach()
-        */
-       if (wlc->pub->vars) {
-               kfree(wlc->pub->vars);
-               wlc->pub->vars = NULL;
-       }
-#endif
 
 #ifdef BCMDBG
        if (wlc->country_ie_override) {
@@ -2677,10 +2503,6 @@ static void wlc_watchdog(void *arg)
 #ifdef WLC_LOW
        wlc_bmac_watchdog(wlc);
 #endif
-#ifdef WLC_HIGH_ONLY
-       /* maintenance */
-       wlc_bmac_rpc_watchdog(wlc);
-#endif
 
        /* occasionally sample mac stat counters to detect 16-bit counter wrap */
        if ((WLC_UPDATE_STATS(wlc))
@@ -2929,9 +2751,6 @@ uint wlc_down(wlc_info_t *wlc)
        /* wlc_bmac_down_finish has done wlc_coredisable(). so clk is off */
        wlc->clk = false;
 
-#ifdef WLC_HIGH_ONLY
-       wlc_rpctx_txreclaim(wlc->rpctx);
-#endif
 
        /* Verify all packets are flushed from the driver */
        if (PKTALLOCED(wlc->osh) != 0) {
@@ -3395,10 +3214,6 @@ _wlc_ioctl(wlc_info_t *wlc, int cmd, void *arg, int len, struct wlc_if *wlcif)
                                wlc_set_chanspec(wlc, chspec);
                                wlc_enable_mac(wlc);
                        }
-#ifdef WLC_HIGH_ONLY
-                       /* delay for channel change */
-                       msleep(50);
-#endif
                        break;
                }
 
@@ -4629,11 +4444,6 @@ wlc_iovar_op(wlc_info_t *wlc, const char *name,
        /* iovar name not found */
        if (i >= WLC_MAXMODULES) {
                err = BCME_UNSUPPORTED;
-#ifdef WLC_HIGH_ONLY
-               err =
-                   bcmsdh_iovar_op(wlc->btparam, name, params, p_len, arg, len,
-                                   set);
-#endif
                goto exit;
        }
 
@@ -5195,14 +5005,6 @@ u16 wlc_rate_shm_offset(wlc_info_t *wlc, u8 rate)
 }
 
 /* Callback for device removed */
-#if defined(WLC_HIGH_ONLY)
-void wlc_device_removed(void *arg)
-{
-       wlc_info_t *wlc = (wlc_info_t *) arg;
-
-       wlc->device_present = false;
-}
-#endif                         /* WLC_HIGH_ONLY */
 
 /*
  * Attempts to queue a packet onto a multiple-precedence queue,
@@ -5467,13 +5269,6 @@ wlc_txfifo(wlc_info_t *wlc, uint fifo, void *p, bool commit, s8 txpktpend)
        if (WLC_WAR16165(wlc))
                wlc_war16165(wlc, true);
 
-#ifdef WLC_HIGH_ONLY
-       if (RPCTX_ENAB(wlc->pub)) {
-               (void)wlc_rpctx_tx(wlc->rpctx, fifo, p, commit, frameid,
-                                  txpktpend);
-               return;
-       }
-#else
 
        /* Bump up pending count for if not using rpc. If rpc is used, this will be handled
         * in wlc_bmac_txfifo()
@@ -5491,7 +5286,6 @@ wlc_txfifo(wlc_info_t *wlc, uint fifo, void *p, bool commit, s8 txpktpend)
        if (dma_txfast(wlc->hw->di[fifo], p, commit) < 0) {
                WL_ERROR(("wlc_txfifo: fatal, toss frames !!!\n"));
        }
-#endif                         /* WLC_HIGH_ONLY */
 }
 
 static u16
@@ -5805,9 +5599,7 @@ u16 BCMFASTPATH wlc_phytxctl1_calc(wlc_info_t *wlc, ratespec_t rspec)
        /* phy clock must support 40Mhz if tx descriptor uses it */
        if ((phyctl1 & PHY_TXC1_BW_MASK) >= PHY_TXC1_BW_40MHZ) {
                ASSERT(CHSPEC_WLC_BW(wlc->chanspec) == WLC_40_MHZ);
-#ifndef WLC_HIGH_ONLY
                ASSERT(wlc->chanspec == wlc_phy_chanspec_get(wlc->band->pi));
-#endif
        }
 #endif                         /* BCMDBG */
        return phyctl1;
@@ -5988,13 +5780,6 @@ wlc_d11hdrs_mac80211(wlc_info_t *wlc, struct ieee80211_hw *hw,
        if (txrate[1]->idx < 0) {
                txrate[1] = txrate[0];
        }
-#ifdef WLC_HIGH_ONLY
-       /* Double protection , just in case */
-       if (txrate[0]->idx > HIGHEST_SINGLE_STREAM_MCS)
-               txrate[0]->idx = HIGHEST_SINGLE_STREAM_MCS;
-       if (txrate[1]->idx > HIGHEST_SINGLE_STREAM_MCS)
-               txrate[1]->idx = HIGHEST_SINGLE_STREAM_MCS;
-#endif
 
        for (k = 0; k < hw->max_rates; k++) {
                is_mcs[k] =
@@ -6693,9 +6478,7 @@ void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus)
        if (!pktq_empty(&wlc->active_queue->q))
                wlc_send_q(wlc, wlc->active_queue);
 
-#ifndef WLC_HIGH_ONLY
        ASSERT(wlc_ps_check(wlc));
-#endif
 }
 
 static void *wlc_15420war(wlc_info_t *wlc, uint queue)
@@ -6906,12 +6689,6 @@ wlc_dotxstatus(wlc_info_t *wlc, tx_status_t *txs, u32 frm_tx2)
        if (p)
                PKTFREE(osh, p, true);
 
-#ifdef WLC_HIGH_ONLY
-       /* If this is a split driver, do the big-hammer here.
-        * If this is a monolithic driver, wlc_bmac.c:wlc_dpc() will do the big-hammer.
-        */
-       wl_init(wlc->wl);
-#endif
        return true;
 
 }
@@ -8483,9 +8260,6 @@ void wlc_pllreq(wlc_info_t *wlc, bool set, mbool req_bit)
 
 void wlc_reset_bmac_done(wlc_info_t *wlc)
 {
-#ifdef WLC_HIGH_ONLY
-       wlc->reset_bmac_pending = false;
-#endif
 }
 
 void wlc_ht_mimops_cap_update(wlc_info_t *wlc, u8 mimops_mode)
index ee0081b..cb14210 100644 (file)
@@ -214,15 +214,11 @@ extern const u8 prio2fifo[];
  * (some platforms return all 0).
  * If clocks are present, call the sb routine which will figure out if the device is removed.
  */
-#ifdef WLC_HIGH_ONLY
-#define DEVICEREMOVED(wlc)     (!wlc->device_present)
-#else
 #define DEVICEREMOVED(wlc)      \
        ((wlc->hw->clk) ?   \
        ((R_REG(wlc->hw->osh, &wlc->hw->regs->maccontrol) & \
        (MCTL_PSM_JMP_0 | MCTL_IHR_EN)) != MCTL_IHR_EN) : \
        (si_deviceremoved(wlc->hw->sih)))
-#endif                         /* WLC_HIGH_ONLY */
 
 #define WLCWLUNIT(wlc)         ((wlc)->pub->unit)
 
@@ -578,12 +574,6 @@ struct wlc_info {
        s8 txpwr_local_max;     /* regulatory local txpwr max */
        u8 txpwr_local_constraint;      /* local power contraint in dB */
 
-#ifdef WLC_HIGH_ONLY
-       rpctx_info_t *rpctx;    /* RPC TX module */
-       bool reset_bmac_pending;        /* bmac reset is in progressing */
-       u32 rpc_agg;            /* host agg: bit 16-31, bmac agg: bit 0-15 */
-       u32 rpc_msglevel;       /* host rpc: bit 16-31, bmac rpc: bit 0-15 */
-#endif
 
        ampdu_info_t *ampdu;    /* ampdu module handler */
        antsel_info_t *asi;     /* antsel module handler */
@@ -843,16 +833,6 @@ struct antsel_info {
 #endif
 
 /* sum the individual fifo tx pending packet counts */
-#if defined(WLC_HIGH_ONLY)
-#define TXPKTPENDTOT(wlc)              (wlc_rpctx_txpktpend((wlc)->rpctx, 0, true))
-#define TXPKTPENDGET(wlc, fifo)                (wlc_rpctx_txpktpend((wlc)->rpctx, (fifo), false))
-#define TXPKTPENDINC(wlc, fifo, val)   (wlc_rpctx_txpktpendinc((wlc)->rpctx, (fifo), (val)))
-#define TXPKTPENDDEC(wlc, fifo, val)   (wlc_rpctx_txpktpenddec((wlc)->rpctx, (fifo), (val)))
-#define TXPKTPENDCLR(wlc, fifo)                (wlc_rpctx_txpktpendclr((wlc)->rpctx, (fifo)))
-#define TXAVAIL(wlc, fifo)             (wlc_rpctx_txavail((wlc)->rpctx, (fifo)))
-#define GETNEXTTXP(wlc, _queue)                (wlc_rpctx_getnexttxp((wlc)->rpctx, (_queue)))
-
-#else
 #define        TXPKTPENDTOT(wlc) ((wlc)->core->txpktpend[0] + (wlc)->core->txpktpend[1] + \
        (wlc)->core->txpktpend[2] + (wlc)->core->txpktpend[3])
 #define TXPKTPENDGET(wlc, fifo)                ((wlc)->core->txpktpend[(fifo)])
@@ -862,7 +842,6 @@ struct antsel_info {
 #define TXAVAIL(wlc, fifo)             (*(wlc)->core->txavail[(fifo)])
 #define GETNEXTTXP(wlc, _queue)                                                                \
                dma_getnexttxp((wlc)->hw->di[(_queue)], HNDDMA_RANGE_TRANSMITTED)
-#endif                         /* WLC_HIGH_ONLY */
 
 #define WLC_IS_MATCH_SSID(wlc, ssid1, ssid2, len1, len2) \
        ((len1 == len2) && !bcmp(ssid1, ssid2, len1))
index 7427154..58ce543 100644 (file)
@@ -28,29 +28,6 @@ struct wlc_info;
 #define NRPCTXBUFPOST NTXD
 #endif
 
-#if defined(WLC_HIGH_ONLY)
-
-struct wlc_rpc_phy {
-       struct rpc_info *rpc;
-};
-
-#define RPCTX_ENAB(pub)                (true)
-extern rpctx_info_t *wlc_rpctx_attach(wlc_pub_t *pub, struct wlc_info *wlc);
-extern int wlc_rpctx_fifoinit(rpctx_info_t *rpctx, uint fifo, uint ntxd);
-extern void wlc_rpctx_detach(rpctx_info_t *rpctx);
-extern int wlc_rpctx_dump(rpctx_info_t *rpctx, struct bcmstrbuf *b);
-extern void *wlc_rpctx_getnexttxp(rpctx_info_t *rpctx, uint fifo);
-extern void wlc_rpctx_txreclaim(rpctx_info_t *rpctx);
-extern uint wlc_rpctx_txavail(rpctx_info_t *rpctx, uint fifo);
-extern int wlc_rpctx_pkteng(rpctx_info_t *rpctx, uint fifo, void *p);
-extern int wlc_rpctx_tx(rpctx_info_t *rpctx, uint fifo, void *p, bool commit,
-                       u16 frameid, u8 txpktpend);
-extern void wlc_rpctx_txpktpendinc(rpctx_info_t *rpctx, uint fifo, u8 val);
-extern void wlc_rpctx_txpktpenddec(rpctx_info_t *rpctx, uint fifo, u8 val);
-extern void wlc_rpctx_txpktpendclr(rpctx_info_t *rpctx, uint fifo);
-extern int wlc_rpctx_txpktpend(rpctx_info_t *rpctx, uint fifo, bool all);
-
-#else
 #define        RPCTX_ENAB(pub)                 (false)
 #define        wlc_rpctx_attach(pub, wlc)      (NULL)
 #define        wlc_rpctx_fifoinit(rpctx, fifo, ntxd) (0)
@@ -66,6 +43,5 @@ extern int wlc_rpctx_txpktpend(rpctx_info_t *rpctx, uint fifo, bool all);
 #define        wlc_rpctx_txpktpendclr(rpctx, f)        do { } while (0)
 #define        wlc_rpctx_txpktpend(rpctx, f, all)      (0)
 
-#endif                         /* WLC_HIGH */
 
 #endif                         /* _wlc_rpctx_h_ */