staging: brcm80211: merged bmac.c into main.c
authorRoland Vossen <rvossen@broadcom.com>
Mon, 8 Aug 2011 13:57:47 +0000 (15:57 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 23 Aug 2011 19:59:50 +0000 (12:59 -0700)
Future goal is to merge the bmac layer in the driver with the 'common' layer.
A step towards this goal is to have one file containing both bmac and common
code. Header files (bmac.h, main.h) were also merged.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmsmac/Makefile
drivers/staging/brcm80211/brcmsmac/antsel.c
drivers/staging/brcm80211/brcmsmac/bmac.c [deleted file]
drivers/staging/brcm80211/brcmsmac/bmac.h [deleted file]
drivers/staging/brcm80211/brcmsmac/channel.c
drivers/staging/brcm80211/brcmsmac/main.c
drivers/staging/brcm80211/brcmsmac/main.h
drivers/staging/brcm80211/brcmsmac/phy_shim.c
drivers/staging/brcm80211/brcmsmac/stf.c

index 1ea3e0c48f3e7985ccde1bc2bf949d2061d7b318..3147c487188fb479257c32dfe099331244c05a75 100644 (file)
@@ -33,7 +33,6 @@ BRCMSMAC_OFILES := \
        alloc.o \
        ampdu.o \
        antsel.o \
-       bmac.o \
        channel.o \
        main.o \
        phy_shim.o \
index c4e76c093ae9e939b0b4035e5d2a90599c0ae3ad..1d6c3984bc75ced4beaa3438bf837aa0fe5e6640 100644 (file)
@@ -18,7 +18,6 @@
 #include <net/mac80211.h>
 
 #include "types.h"
-#include "bmac.h"
 #include "main.h"
 #include "phy_shim.h"
 #include "antsel.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/bmac.c b/drivers/staging/brcm80211/brcmsmac/bmac.c
deleted file mode 100644 (file)
index b25c517..0000000
+++ /dev/null
@@ -1,3593 +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/pci.h>
-#include <net/mac80211.h>
-
-#include <brcm_hw_ids.h>
-#include <aiutils.h>
-#include <chipcommon.h>
-#include "types.h"
-#include "rate.h"
-#include "phy/phy_hal.h"
-#include "channel.h"
-#include "main.h"
-#include "ucode_loader.h"
-#include "mac80211_if.h"
-#include "bmac.h"
-
-#define        TIMER_INTERVAL_WATCHDOG_BMAC    1000    /* watchdog timer, in unit of ms */
-
-#define        SYNTHPU_DLY_APHY_US     3700    /* a phy synthpu_dly time in us */
-#define        SYNTHPU_DLY_BPHY_US     1050    /* b/g phy synthpu_dly time in us, default */
-#define        SYNTHPU_DLY_NPHY_US     2048    /* n phy REV3 synthpu_dly time in us, default */
-#define        SYNTHPU_DLY_LPPHY_US    300     /* lpphy synthpu_dly time in us */
-
-#define        SYNTHPU_DLY_PHY_US_QT   100     /* QT synthpu_dly time in us */
-
-#ifndef BMAC_DUP_TO_REMOVE
-
-#define        ANTCNT                  10      /* vanilla M_MAX_ANTCNT value */
-
-#endif                         /* BMAC_DUP_TO_REMOVE */
-
-#define DMAREG(wlc_hw, direction, fifonum) \
-       ((direction == DMA_TX) ? \
-               (void *)&(wlc_hw->regs->fifo64regs[fifonum].dmaxmt) : \
-               (void *)&(wlc_hw->regs->fifo64regs[fifonum].dmarcv))
-
-#define APHY_SLOT_TIME         9
-#define BPHY_SLOT_TIME         20
-
-/*
- * The following table lists the buffer memory allocated to xmt fifos in HW.
- * the size is in units of 256bytes(one block), total size is HW dependent
- * ucode has default fifo partition, sw can overwrite if necessary
- *
- * This is documented in twiki under the topic UcodeTxFifo. Please ensure
- * the twiki is updated before making changes.
- */
-
-#define XMTFIFOTBL_STARTREV    20      /* Starting corerev for the fifo size table */
-
-static u16 xmtfifo_sz[][NFIFO] = {
-       {20, 192, 192, 21, 17, 5},      /* corerev 20: 5120, 49152, 49152, 5376, 4352, 1280 */
-       {9, 58, 22, 14, 14, 5}, /* corerev 21: 2304, 14848, 5632, 3584, 3584, 1280 */
-       {20, 192, 192, 21, 17, 5},      /* corerev 22: 5120, 49152, 49152, 5376, 4352, 1280 */
-       {20, 192, 192, 21, 17, 5},      /* corerev 23: 5120, 49152, 49152, 5376, 4352, 1280 */
-       {9, 58, 22, 14, 14, 5}, /* corerev 24: 2304, 14848, 5632, 3584, 3584, 1280 */
-};
-
-static void brcms_b_clkctl_clk(struct brcms_hardware *wlc, uint mode);
-static void brcms_b_coreinit(struct brcms_c_info *wlc);
-
-/* used by wlc_wakeucode_init() */
-static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,
-                           const struct d11init *inits);
-static void brcms_ucode_write(struct brcms_hardware *wlc_hw, const u32 ucode[],
-                           const uint nbytes);
-static void brcms_ucode_download(struct brcms_hardware *wlc);
-static void brcms_c_ucode_txant_set(struct brcms_hardware *wlc_hw);
-
-/* used by brcms_c_dpc() */
-static bool brcms_b_dotxstatus(struct brcms_hardware *wlc,
-                              struct tx_status *txs, u32 s2);
-static bool brcms_b_txstatus(struct brcms_hardware *wlc, bool bound,
-                            bool *fatal);
-static bool brcms_b_recv(struct brcms_hardware *wlc_hw, uint fifo, bool bound);
-
-/* used by brcms_c_down() */
-static void brcms_c_flushqueues(struct brcms_c_info *wlc);
-
-static void brcms_c_write_mhf(struct brcms_hardware *wlc_hw, u16 *mhfs);
-static void brcms_c_mctrl_reset(struct brcms_hardware *wlc_hw);
-static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw);
-static bool brcms_b_tx_fifo_suspended(struct brcms_hardware *wlc_hw,
-                                      uint tx_fifo);
-static void brcms_b_tx_fifo_suspend(struct brcms_hardware *wlc_hw,
-                                   uint tx_fifo);
-static void brcms_b_tx_fifo_resume(struct brcms_hardware *wlc_hw,
-                                  uint tx_fifo);
-
-/* Low Level Prototypes */
-static int brcms_b_bandtype(struct brcms_hardware *wlc_hw);
-static void brcms_b_info_init(struct brcms_hardware *wlc_hw);
-static void brcms_b_xtal(struct brcms_hardware *wlc_hw, bool want);
-static u16 brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset,
-                                  u32 sel);
-static void brcms_b_write_objmem(struct brcms_hardware *wlc_hw, uint offset,
-                                 u16 v, u32 sel);
-static void brcms_b_core_phy_clk(struct brcms_hardware *wlc_hw, bool clk);
-static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme);
-static void brcms_b_detach_dmapio(struct brcms_hardware *wlc_hw);
-static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw);
-static bool brcms_c_validboardtype(struct brcms_hardware *wlc);
-static bool brcms_c_isgoodchip(struct brcms_hardware *wlc_hw);
-static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw);
-static char *brcms_c_get_macaddr(struct brcms_hardware *wlc_hw);
-static void brcms_c_mhfdef(struct brcms_c_info *wlc, u16 *mhfs, u16 mhf2_init);
-static void brcms_c_mctrl_write(struct brcms_hardware *wlc_hw);
-static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool want,
-                        mbool flags);
-static void brcms_c_ucode_mute_override_set(struct brcms_hardware *wlc_hw);
-static void brcms_c_ucode_mute_override_clear(struct brcms_hardware *wlc_hw);
-static u32 brcms_c_wlintrsoff(struct brcms_c_info *wlc);
-static void brcms_c_wlintrsrestore(struct brcms_c_info *wlc, u32 macintmask);
-static void brcms_c_gpio_init(struct brcms_c_info *wlc);
-static void brcms_c_write_hw_bcntemplate0(struct brcms_hardware *wlc_hw,
-                                         void *bcn, int len);
-static void brcms_c_write_hw_bcntemplate1(struct brcms_hardware *wlc_hw,
-                                         void *bcn, int len);
-static void brcms_b_bsinit(struct brcms_c_info *wlc, chanspec_t chanspec);
-static u32 brcms_c_setband_inact(struct brcms_c_info *wlc, uint bandunit);
-static void brcms_b_setband(struct brcms_hardware *wlc_hw, uint bandunit,
-                            chanspec_t chanspec);
-static void brcms_b_update_slot_timing(struct brcms_hardware *wlc_hw,
-                                       bool shortslot);
-static void brcms_upd_ofdm_pctl1_table(struct brcms_hardware *wlc_hw);
-static u16 brcms_b_ofdm_ratetable_offset(struct brcms_hardware *wlc_hw,
-                                            u8 rate);
-
-/* === Low Level functions === */
-
-void brcms_b_set_shortslot(struct brcms_hardware *wlc_hw, bool shortslot)
-{
-       wlc_hw->shortslot = shortslot;
-
-       if (BAND_2G(brcms_b_bandtype(wlc_hw)) && wlc_hw->up) {
-               brcms_c_suspend_mac_and_wait(wlc_hw->wlc);
-               brcms_b_update_slot_timing(wlc_hw, shortslot);
-               brcms_c_enable_mac(wlc_hw->wlc);
-       }
-}
-
-/*
- * Update the slot timing for standard 11b/g (20us slots)
- * or shortslot 11g (9us slots)
- * The PSM needs to be suspended for this call.
- */
-static void brcms_b_update_slot_timing(struct brcms_hardware *wlc_hw,
-                                       bool shortslot)
-{
-       d11regs_t *regs;
-
-       regs = wlc_hw->regs;
-
-       if (shortslot) {
-               /* 11g short slot: 11a timing */
-               W_REG(&regs->ifs_slot, 0x0207); /* APHY_SLOT_TIME */
-               brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, APHY_SLOT_TIME);
-       } else {
-               /* 11g long slot: 11b timing */
-               W_REG(&regs->ifs_slot, 0x0212); /* BPHY_SLOT_TIME */
-               brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, BPHY_SLOT_TIME);
-       }
-}
-
-static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)
-{
-       struct wiphy *wiphy = wlc_hw->wlc->wiphy;
-
-       /* init microcode host flags */
-       brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs);
-
-       /* do band-specific ucode IHR, SHM, and SCR inits */
-       if (D11REV_IS(wlc_hw->corerev, 23)) {
-               if (BRCMS_ISNPHY(wlc_hw->band)) {
-                       brcms_c_write_inits(wlc_hw, d11n0bsinitvals16);
-               } else {
-                       wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
-                                 " %d\n", __func__, wlc_hw->unit,
-                                 wlc_hw->corerev);
-               }
-       } else {
-               if (D11REV_IS(wlc_hw->corerev, 24)) {
-                       if (BRCMS_ISLCNPHY(wlc_hw->band)) {
-                               brcms_c_write_inits(wlc_hw,
-                                                   d11lcn0bsinitvals24);
-                       } else
-                               wiphy_err(wiphy, "%s: wl%d: unsupported phy in"
-                                         " core rev %d\n", __func__,
-                                         wlc_hw->unit, wlc_hw->corerev);
-               } else {
-                       wiphy_err(wiphy, "%s: wl%d: unsupported corerev %d\n",
-                               __func__, wlc_hw->unit, wlc_hw->corerev);
-               }
-       }
-}
-
-/* switch to new band but leave it inactive */
-static u32 brcms_c_setband_inact(struct brcms_c_info *wlc,
-                                           uint bandunit)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       u32 macintmask;
-
-       BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       WARN_ON((R_REG(&wlc_hw->regs->maccontrol) & MCTL_EN_MAC) != 0);
-
-       /* disable interrupts */
-       macintmask = brcms_intrsoff(wlc->wl);
-
-       /* radio off */
-       wlc_phy_switch_radio(wlc_hw->band->pi, OFF);
-
-       brcms_b_core_phy_clk(wlc_hw, OFF);
-
-       brcms_c_setxband(wlc_hw, bandunit);
-
-       return macintmask;
-}
-
-/* Process received frames */
-/*
- * Return true if more frames need to be processed. false otherwise.
- * Param 'bound' indicates max. # frames to process before break out.
- */
-static bool
-brcms_b_recv(struct brcms_hardware *wlc_hw, uint fifo, bool bound)
-{
-       struct sk_buff *p;
-       struct sk_buff *head = NULL;
-       struct sk_buff *tail = NULL;
-       uint n = 0;
-       uint bound_limit = bound ? wlc_hw->wlc->pub->tunables->rxbnd : -1;
-       struct brcms_d11rxhdr *wlc_rxhdr = NULL;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-       /* gather received frames */
-       while ((p = dma_rx(wlc_hw->di[fifo]))) {
-
-               if (!tail)
-                       head = tail = p;
-               else {
-                       tail->prev = p;
-                       tail = p;
-               }
-
-               /* !give others some time to run! */
-               if (++n >= bound_limit)
-                       break;
-       }
-
-       /* post more rbufs */
-       dma_rxfill(wlc_hw->di[fifo]);
-
-       /* process each frame */
-       while ((p = head) != NULL) {
-               head = head->prev;
-               p->prev = NULL;
-
-               wlc_rxhdr = (struct brcms_d11rxhdr *) p->data;
-
-               /* compute the RSSI from d11rxhdr and record it in wlc_rxd11hr */
-               wlc_phy_rssi_compute(wlc_hw->band->pi, wlc_rxhdr);
-
-               brcms_c_recv(wlc_hw->wlc, p);
-       }
-
-       return n >= bound_limit;
-}
-
-/* second-level interrupt processing
- *   Return true if another dpc needs to be re-scheduled. false otherwise.
- *   Param 'bounded' indicates if applicable loops should be bounded.
- */
-bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
-{
-       u32 macintstatus;
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       d11regs_t *regs = wlc_hw->regs;
-       bool fatal = false;
-       struct wiphy *wiphy = wlc->wiphy;
-
-       if (DEVICEREMOVED(wlc)) {
-               wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
-                         __func__);
-               brcms_down(wlc->wl);
-               return false;
-       }
-
-       /* grab and clear the saved software intstatus bits */
-       macintstatus = wlc->macintstatus;
-       wlc->macintstatus = 0;
-
-       BCMMSG(wlc->wiphy, "wl%d: macintstatus 0x%x\n",
-              wlc_hw->unit, macintstatus);
-
-       WARN_ON(macintstatus & MI_PRQ); /* PRQ Interrupt in non-MBSS */
-
-       /* BCN template is available */
-       /* ZZZ: Use AP_ACTIVE ? */
-       if (AP_ENAB(wlc->pub) && (!APSTA_ENAB(wlc->pub))
-           && (macintstatus & MI_BCNTPL)) {
-               brcms_c_update_beacon(wlc);
-       }
-
-       /* tx status */
-       if (macintstatus & MI_TFS) {
-               if (brcms_b_txstatus(wlc->hw, bounded, &fatal))
-                       wlc->macintstatus |= MI_TFS;
-               if (fatal) {
-                       wiphy_err(wiphy, "MI_TFS: fatal\n");
-                       goto fatal;
-               }
-       }
-
-       if (macintstatus & (MI_TBTT | MI_DTIM_TBTT))
-               brcms_c_tbtt(wlc);
-
-       /* ATIM window end */
-       if (macintstatus & MI_ATIMWINEND) {
-               BCMMSG(wlc->wiphy, "end of ATIM window\n");
-               OR_REG(&regs->maccommand, wlc->qvalid);
-               wlc->qvalid = 0;
-       }
-
-       /* received data or control frame, MI_DMAINT is indication of RX_FIFO interrupt */
-       if (macintstatus & MI_DMAINT)
-               if (brcms_b_recv(wlc_hw, RX_FIFO, bounded))
-                       wlc->macintstatus |= MI_DMAINT;
-
-       /* TX FIFO suspend/flush completion */
-       if (macintstatus & MI_TXSTOP)
-               brcms_b_tx_fifo_suspended(wlc_hw, TX_DATA_FIFO);
-
-       /* noise sample collected */
-       if (macintstatus & MI_BG_NOISE) {
-               wlc_phy_noise_sample_intr(wlc_hw->band->pi);
-       }
-
-       if (macintstatus & MI_GP0) {
-               wiphy_err(wiphy, "wl%d: PSM microcode watchdog fired at %d "
-                       "(seconds). Resetting.\n", wlc_hw->unit, wlc_hw->now);
-
-               printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",
-                                       __func__, wlc_hw->sih->chip,
-                                       wlc_hw->sih->chiprev);
-               /* big hammer */
-               brcms_init(wlc->wl);
-       }
-
-       /* gptimer timeout */
-       if (macintstatus & MI_TO) {
-               W_REG(&regs->gptimer, 0);
-       }
-
-       if (macintstatus & MI_RFDISABLE) {
-               BCMMSG(wlc->wiphy, "wl%d: BMAC Detected a change on the"
-                      " RF Disable Input\n", wlc_hw->unit);
-               brcms_rfkill_set_hw_state(wlc->wl);
-       }
-
-       /* send any enq'd tx packets. Just makes sure to jump start tx */
-       if (!pktq_empty(&wlc->pkt_queue->q))
-               brcms_c_send_q(wlc);
-
-       /* it isn't done and needs to be resched if macintstatus is non-zero */
-       return wlc->macintstatus != 0;
-
- fatal:
-       brcms_init(wlc->wl);
-       return wlc->macintstatus != 0;
-}
-
-/* common low-level watchdog code */
-void brcms_b_watchdog(void *arg)
-{
-       struct brcms_c_info *wlc = (struct brcms_c_info *) arg;
-       struct brcms_hardware *wlc_hw = wlc->hw;
-
-       BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       if (!wlc_hw->up)
-               return;
-
-       /* increment second count */
-       wlc_hw->now++;
-
-       /* Check for FIFO error interrupts */
-       brcms_b_fifoerrors(wlc_hw);
-
-       /* make sure RX dma has buffers */
-       dma_rxfill(wlc->hw->di[RX_FIFO]);
-
-       wlc_phy_watchdog(wlc_hw->band->pi);
-}
-
-void
-brcms_b_set_chanspec(struct brcms_hardware *wlc_hw, chanspec_t chanspec,
-                     bool mute, struct txpwr_limits *txpwr)
-{
-       uint bandunit;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d: 0x%x\n", wlc_hw->unit, chanspec);
-
-       wlc_hw->chanspec = chanspec;
-
-       /* Switch bands if necessary */
-       if (NBANDS_HW(wlc_hw) > 1) {
-               bandunit = CHSPEC_BANDUNIT(chanspec);
-               if (wlc_hw->band->bandunit != bandunit) {
-                       /* brcms_b_setband disables other bandunit,
-                        *  use light band switch if not up yet
-                        */
-                       if (wlc_hw->up) {
-                               wlc_phy_chanspec_radio_set(wlc_hw->
-                                                          bandstate[bandunit]->
-                                                          pi, chanspec);
-                               brcms_b_setband(wlc_hw, bandunit, chanspec);
-                       } else {
-                               brcms_c_setxband(wlc_hw, bandunit);
-                       }
-               }
-       }
-
-       wlc_phy_initcal_enable(wlc_hw->band->pi, !mute);
-
-       if (!wlc_hw->up) {
-               if (wlc_hw->clk)
-                       wlc_phy_txpower_limit_set(wlc_hw->band->pi, txpwr,
-                                                 chanspec);
-               wlc_phy_chanspec_radio_set(wlc_hw->band->pi, chanspec);
-       } else {
-               wlc_phy_chanspec_set(wlc_hw->band->pi, chanspec);
-               wlc_phy_txpower_limit_set(wlc_hw->band->pi, txpwr, chanspec);
-
-               /* Update muting of the channel */
-               brcms_b_mute(wlc_hw, mute, 0);
-       }
-}
-
-int brcms_b_state_get(struct brcms_hardware *wlc_hw,
-                     struct brcms_b_state *state)
-{
-       state->machwcap = wlc_hw->machwcap;
-
-       return 0;
-}
-
-static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
-{
-       uint i;
-       char name[8];
-       /* ucode host flag 2 needed for pio mode, independent of band and fifo */
-       u16 pio_mhf2 = 0;
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       uint unit = wlc_hw->unit;
-       struct brcms_tunables *tune = wlc->pub->tunables;
-       struct wiphy *wiphy = wlc->wiphy;
-
-       /* name and offsets for dma_attach */
-       snprintf(name, sizeof(name), "wl%d", unit);
-
-       if (wlc_hw->di[0] == 0) {       /* Init FIFOs */
-               uint addrwidth;
-               int dma_attach_err = 0;
-               /* Find out the DMA addressing capability and let OS know
-                * All the channels within one DMA core have 'common-minimum' same
-                * capability
-                */
-               addrwidth =
-                   dma_addrwidth(wlc_hw->sih, DMAREG(wlc_hw, DMA_TX, 0));
-
-               if (!wl_alloc_dma_resources(wlc_hw->wlc->wl, addrwidth)) {
-                       wiphy_err(wiphy, "wl%d: wlc_attach: alloc_dma_"
-                                 "resources failed\n", unit);
-                       return false;
-               }
-
-               /*
-                * FIFO 0
-                * TX: TX_AC_BK_FIFO (TX AC Background data packets)
-                * RX: RX_FIFO (RX data packets)
-                */
-               wlc_hw->di[0] = dma_attach(name, wlc_hw->sih,
-                                          (wme ? DMAREG(wlc_hw, DMA_TX, 0) :
-                                           NULL), DMAREG(wlc_hw, DMA_RX, 0),
-                                          (wme ? tune->ntxd : 0), tune->nrxd,
-                                          tune->rxbufsz, -1, tune->nrxbufpost,
-                                          BRCMS_HWRXOFF, &brcm_msg_level);
-               dma_attach_err |= (NULL == wlc_hw->di[0]);
-
-               /*
-                * FIFO 1
-                * TX: TX_AC_BE_FIFO (TX AC Best-Effort data packets)
-                *   (legacy) TX_DATA_FIFO (TX data packets)
-                * RX: UNUSED
-                */
-               wlc_hw->di[1] = dma_attach(name, wlc_hw->sih,
-                                          DMAREG(wlc_hw, DMA_TX, 1), NULL,
-                                          tune->ntxd, 0, 0, -1, 0, 0,
-                                          &brcm_msg_level);
-               dma_attach_err |= (NULL == wlc_hw->di[1]);
-
-               /*
-                * FIFO 2
-                * TX: TX_AC_VI_FIFO (TX AC Video data packets)
-                * RX: UNUSED
-                */
-               wlc_hw->di[2] = dma_attach(name, wlc_hw->sih,
-                                          DMAREG(wlc_hw, DMA_TX, 2), NULL,
-                                          tune->ntxd, 0, 0, -1, 0, 0,
-                                          &brcm_msg_level);
-               dma_attach_err |= (NULL == wlc_hw->di[2]);
-               /*
-                * FIFO 3
-                * TX: TX_AC_VO_FIFO (TX AC Voice data packets)
-                *   (legacy) TX_CTL_FIFO (TX control & mgmt packets)
-                */
-               wlc_hw->di[3] = dma_attach(name, wlc_hw->sih,
-                                          DMAREG(wlc_hw, DMA_TX, 3),
-                                          NULL, tune->ntxd, 0, 0, -1,
-                                          0, 0, &brcm_msg_level);
-               dma_attach_err |= (NULL == wlc_hw->di[3]);
-/* Cleaner to leave this as if with AP defined */
-
-               if (dma_attach_err) {
-                       wiphy_err(wiphy, "wl%d: wlc_attach: dma_attach failed"
-                                 "\n", unit);
-                       return false;
-               }
-
-               /* get pointer to dma engine tx flow control variable */
-               for (i = 0; i < NFIFO; i++)
-                       if (wlc_hw->di[i])
-                               wlc_hw->txavail[i] =
-                                   (uint *) dma_getvar(wlc_hw->di[i],
-                                                       "&txavail");
-       }
-
-       /* initial ucode host flags */
-       brcms_c_mhfdef(wlc, wlc_hw->band->mhfs, pio_mhf2);
-
-       return true;
-}
-
-static void brcms_b_detach_dmapio(struct brcms_hardware *wlc_hw)
-{
-       uint j;
-
-       for (j = 0; j < NFIFO; j++) {
-               if (wlc_hw->di[j]) {
-                       dma_detach(wlc_hw->di[j]);
-                       wlc_hw->di[j] = NULL;
-               }
-       }
-}
-
-/* low level attach
- *    run backplane attach, init nvram
- *    run phy attach
- *    initialize software state for each core and band
- *    put the whole chip in reset(driver down state), no clock
- */
-int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device, uint unit,
-                   bool piomode, void *regsva, uint bustype, void *btparam)
-{
-       struct brcms_hardware *wlc_hw;
-       d11regs_t *regs;
-       char *macaddr = NULL;
-       char *vars;
-       uint err = 0;
-       uint j;
-       bool wme = false;
-       struct shared_phy_params sha_params;
-       struct wiphy *wiphy = wlc->wiphy;
-
-       BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit, vendor,
-               device);
-
-       wme = true;
-
-       wlc_hw = wlc->hw;
-       wlc_hw->wlc = wlc;
-       wlc_hw->unit = unit;
-       wlc_hw->band = wlc_hw->bandstate[0];
-       wlc_hw->_piomode = piomode;
-
-       /* populate struct brcms_hardware with default values  */
-       brcms_b_info_init(wlc_hw);
-
-       /*
-        * Do the hardware portion of the attach.
-        * Also initialize software state that depends on the particular hardware
-        * we are running.
-        */
-       wlc_hw->sih = ai_attach(regsva, bustype, btparam,
-                               &wlc_hw->vars, &wlc_hw->vars_size);
-       if (wlc_hw->sih == NULL) {
-               wiphy_err(wiphy, "wl%d: brcms_b_attach: si_attach failed\n",
-                         unit);
-               err = 11;
-               goto fail;
-       }
-       vars = wlc_hw->vars;
-
-       /*
-        * Get vendid/devid nvram overwrites, which could be different
-        * than those the BIOS recognizes for devices on PCMCIA_BUS,
-        * SDIO_BUS, and SROMless devices on PCI_BUS.
-        */
-#ifdef BCMBUSTYPE
-       bustype = BCMBUSTYPE;
-#endif
-       if (bustype != SI_BUS) {
-               char *var;
-
-               var = getvar(vars, "vendid");
-               if (var) {
-                       vendor = (u16) simple_strtoul(var, NULL, 0);
-                       wiphy_err(wiphy, "Overriding vendor id = 0x%x\n",
-                                 vendor);
-               }
-               var = getvar(vars, "devid");
-               if (var) {
-                       u16 devid = (u16) simple_strtoul(var, NULL, 0);
-                       if (devid != 0xffff) {
-                               device = devid;
-                               wiphy_err(wiphy, "Overriding device id = 0x%x"
-                                         "\n", device);
-                       }
-               }
-
-               /* verify again the device is supported */
-               if (!brcms_c_chipmatch(vendor, device)) {
-                       wiphy_err(wiphy, "wl%d: brcms_b_attach: Unsupported "
-                               "vendor/device (0x%x/0x%x)\n",
-                                unit, vendor, device);
-                       err = 12;
-                       goto fail;
-               }
-       }
-
-       wlc_hw->vendorid = vendor;
-       wlc_hw->deviceid = device;
-
-       /* set bar0 window to point at D11 core */
-       wlc_hw->regs = (d11regs_t *) ai_setcore(wlc_hw->sih, D11_CORE_ID, 0);
-       wlc_hw->corerev = ai_corerev(wlc_hw->sih);
-
-       regs = wlc_hw->regs;
-
-       wlc->regs = wlc_hw->regs;
-
-       /* validate chip, chiprev and corerev */
-       if (!brcms_c_isgoodchip(wlc_hw)) {
-               err = 13;
-               goto fail;
-       }
-
-       /* initialize power control registers */
-       ai_clkctl_init(wlc_hw->sih);
-
-       /* request fastclock and force fastclock for the rest of attach
-        * bring the d11 core out of reset.
-        *   For PMU chips, the first wlc_clkctl_clk is no-op since core-clk is still false;
-        *   But it will be called again inside wlc_corereset, after d11 is out of reset.
-        */
-       brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
-       brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
-
-       if (!brcms_b_validate_chip_access(wlc_hw)) {
-               wiphy_err(wiphy, "wl%d: brcms_b_attach: validate_chip_access "
-                       "failed\n", unit);
-               err = 14;
-               goto fail;
-       }
-
-       /* get the board rev, used just below */
-       j = getintvar(vars, "boardrev");
-       /* promote srom boardrev of 0xFF to 1 */
-       if (j == BOARDREV_PROMOTABLE)
-               j = BOARDREV_PROMOTED;
-       wlc_hw->boardrev = (u16) j;
-       if (!brcms_c_validboardtype(wlc_hw)) {
-               wiphy_err(wiphy, "wl%d: brcms_b_attach: Unsupported Broadcom "
-                       "board type (0x%x)" " or revision level (0x%x)\n",
-                        unit, wlc_hw->sih->boardtype, wlc_hw->boardrev);
-               err = 15;
-               goto fail;
-       }
-       wlc_hw->sromrev = (u8) getintvar(vars, "sromrev");
-       wlc_hw->boardflags = (u32) getintvar(vars, "boardflags");
-       wlc_hw->boardflags2 = (u32) getintvar(vars, "boardflags2");
-
-       if (wlc_hw->boardflags & BFL_NOPLLDOWN)
-               brcms_b_pllreq(wlc_hw, true, BRCMS_PLLREQ_SHARED);
-
-       if ((wlc_hw->sih->bustype == PCI_BUS)
-           && (ai_pci_war16165(wlc_hw->sih)))
-               wlc->war16165 = true;
-
-       /* check device id(srom, nvram etc.) to set bands */
-       if (wlc_hw->deviceid == BCM43224_D11N_ID ||
-           wlc_hw->deviceid == BCM43224_D11N_ID_VEN1) {
-               /* Dualband boards */
-               wlc_hw->_nbands = 2;
-       } else
-               wlc_hw->_nbands = 1;
-
-       if ((wlc_hw->sih->chip == BCM43225_CHIP_ID))
-               wlc_hw->_nbands = 1;
-
-       /* BMAC_NOTE: remove init of pub values when brcms_c_attach()
-        * unconditionally does the init of these values
-        */
-       wlc->vendorid = wlc_hw->vendorid;
-       wlc->deviceid = wlc_hw->deviceid;
-       wlc->pub->sih = wlc_hw->sih;
-       wlc->pub->corerev = wlc_hw->corerev;
-       wlc->pub->sromrev = wlc_hw->sromrev;
-       wlc->pub->boardrev = wlc_hw->boardrev;
-       wlc->pub->boardflags = wlc_hw->boardflags;
-       wlc->pub->boardflags2 = wlc_hw->boardflags2;
-       wlc->pub->_nbands = wlc_hw->_nbands;
-
-       wlc_hw->physhim = wlc_phy_shim_attach(wlc_hw, wlc->wl, wlc);
-
-       if (wlc_hw->physhim == NULL) {
-               wiphy_err(wiphy, "wl%d: brcms_b_attach: wlc_phy_shim_attach "
-                       "failed\n", unit);
-               err = 25;
-               goto fail;
-       }
-
-       /* pass all the parameters to wlc_phy_shared_attach in one struct */
-       sha_params.sih = wlc_hw->sih;
-       sha_params.physhim = wlc_hw->physhim;
-       sha_params.unit = unit;
-       sha_params.corerev = wlc_hw->corerev;
-       sha_params.vars = vars;
-       sha_params.vid = wlc_hw->vendorid;
-       sha_params.did = wlc_hw->deviceid;
-       sha_params.chip = wlc_hw->sih->chip;
-       sha_params.chiprev = wlc_hw->sih->chiprev;
-       sha_params.chippkg = wlc_hw->sih->chippkg;
-       sha_params.sromrev = wlc_hw->sromrev;
-       sha_params.boardtype = wlc_hw->sih->boardtype;
-       sha_params.boardrev = wlc_hw->boardrev;
-       sha_params.boardvendor = wlc_hw->sih->boardvendor;
-       sha_params.boardflags = wlc_hw->boardflags;
-       sha_params.boardflags2 = wlc_hw->boardflags2;
-       sha_params.bustype = wlc_hw->sih->bustype;
-       sha_params.buscorerev = wlc_hw->sih->buscorerev;
-
-       /* alloc and save pointer to shared phy state area */
-       wlc_hw->phy_sh = wlc_phy_shared_attach(&sha_params);
-       if (!wlc_hw->phy_sh) {
-               err = 16;
-               goto fail;
-       }
-
-       /* initialize software state for each core and band */
-       for (j = 0; j < NBANDS_HW(wlc_hw); j++) {
-               /*
-                * band0 is always 2.4Ghz
-                * band1, if present, is 5Ghz
-                */
-
-               /* So if this is a single band 11a card, use band 1 */
-               if (IS_SINGLEBAND_5G(wlc_hw->deviceid))
-                       j = BAND_5G_INDEX;
-
-               brcms_c_setxband(wlc_hw, j);
-
-               wlc_hw->band->bandunit = j;
-               wlc_hw->band->bandtype = j ? BRCM_BAND_5G : BRCM_BAND_2G;
-               wlc->band->bandunit = j;
-               wlc->band->bandtype = j ? BRCM_BAND_5G : BRCM_BAND_2G;
-               wlc->core->coreidx = ai_coreidx(wlc_hw->sih);
-
-               wlc_hw->machwcap = R_REG(&regs->machwcap);
-               wlc_hw->machwcap_backup = wlc_hw->machwcap;
-
-               /* init tx fifo size */
-               wlc_hw->xmtfifo_sz =
-                   xmtfifo_sz[(wlc_hw->corerev - XMTFIFOTBL_STARTREV)];
-
-               /* Get a phy for this band */
-               wlc_hw->band->pi = wlc_phy_attach(wlc_hw->phy_sh,
-                       (void *)regs, brcms_b_bandtype(wlc_hw), vars,
-                       wlc->wiphy);
-               if (wlc_hw->band->pi == NULL) {
-                       wiphy_err(wiphy, "wl%d: brcms_b_attach: wlc_phy_"
-                                 "attach failed\n", unit);
-                       err = 17;
-                       goto fail;
-               }
-
-               wlc_phy_machwcap_set(wlc_hw->band->pi, wlc_hw->machwcap);
-
-               wlc_phy_get_phyversion(wlc_hw->band->pi, &wlc_hw->band->phytype,
-                                      &wlc_hw->band->phyrev,
-                                      &wlc_hw->band->radioid,
-                                      &wlc_hw->band->radiorev);
-               wlc_hw->band->abgphy_encore =
-                   wlc_phy_get_encore(wlc_hw->band->pi);
-               wlc->band->abgphy_encore = wlc_phy_get_encore(wlc_hw->band->pi);
-               wlc_hw->band->core_flags =
-                   wlc_phy_get_coreflags(wlc_hw->band->pi);
-
-               /* verify good phy_type & supported phy revision */
-               if (BRCMS_ISNPHY(wlc_hw->band)) {
-                       if (NCONF_HAS(wlc_hw->band->phyrev))
-                               goto good_phy;
-                       else
-                               goto bad_phy;
-               } else if (BRCMS_ISLCNPHY(wlc_hw->band)) {
-                       if (LCNCONF_HAS(wlc_hw->band->phyrev))
-                               goto good_phy;
-                       else
-                               goto bad_phy;
-               } else {
- bad_phy:
-                       wiphy_err(wiphy, "wl%d: brcms_b_attach: unsupported "
-                                 "phy type/rev (%d/%d)\n", unit,
-                                 wlc_hw->band->phytype, wlc_hw->band->phyrev);
-                       err = 18;
-                       goto fail;
-               }
-
- good_phy:
-               /* BMAC_NOTE: wlc->band->pi should not be set below and should be done in the
-                * high level attach. However we can not make that change until all low level access
-                * is changed to wlc_hw->band->pi. Instead do the wlc->band->pi init below, keeping
-                * wlc_hw->band->pi as well for incremental update of low level fns, and cut over
-                * low only init when all fns updated.
-                */
-               wlc->band->pi = wlc_hw->band->pi;
-               wlc->band->phytype = wlc_hw->band->phytype;
-               wlc->band->phyrev = wlc_hw->band->phyrev;
-               wlc->band->radioid = wlc_hw->band->radioid;
-               wlc->band->radiorev = wlc_hw->band->radiorev;
-
-               /* default contention windows size limits */
-               wlc_hw->band->CWmin = APHY_CWMIN;
-               wlc_hw->band->CWmax = PHY_CWMAX;
-
-               if (!brcms_b_attach_dmapio(wlc, j, wme)) {
-                       err = 19;
-                       goto fail;
-               }
-       }
-
-       /* disable core to match driver "down" state */
-       brcms_c_coredisable(wlc_hw);
-
-       /* Match driver "down" state */
-       if (wlc_hw->sih->bustype == PCI_BUS)
-               ai_pci_down(wlc_hw->sih);
-
-       /* register sb interrupt callback functions */
-       ai_register_intr_callback(wlc_hw->sih, (void *)brcms_c_wlintrsoff,
-                                 (void *)brcms_c_wlintrsrestore, NULL, wlc);
-
-       /* turn off pll and xtal to match driver "down" state */
-       brcms_b_xtal(wlc_hw, OFF);
-
-       /* *********************************************************************
-        * The hardware is in the DOWN state at this point. D11 core
-        * or cores are in reset with clocks off, and the board PLLs
-        * are off if possible.
-        *
-        * Beyond this point, wlc->sbclk == false and chip registers
-        * should not be touched.
-        *********************************************************************
-        */
-
-       /* init etheraddr state variables */
-       macaddr = brcms_c_get_macaddr(wlc_hw);
-       if (macaddr == NULL) {
-               wiphy_err(wiphy, "wl%d: brcms_b_attach: macaddr not found\n",
-                         unit);
-               err = 21;
-               goto fail;
-       }
-       brcmu_ether_atoe(macaddr, wlc_hw->etheraddr);
-       if (is_broadcast_ether_addr(wlc_hw->etheraddr) ||
-           is_zero_ether_addr(wlc_hw->etheraddr)) {
-               wiphy_err(wiphy, "wl%d: brcms_b_attach: bad macaddr %s\n",
-                         unit, macaddr);
-               err = 22;
-               goto fail;
-       }
-
-       BCMMSG(wlc->wiphy,
-                "deviceid 0x%x nbands %d board 0x%x macaddr: %s\n",
-                wlc_hw->deviceid, wlc_hw->_nbands,
-                wlc_hw->sih->boardtype, macaddr);
-
-       return err;
-
- fail:
-       wiphy_err(wiphy, "wl%d: brcms_b_attach: failed with err %d\n", unit,
-                 err);
-       return err;
-}
-
-/*
- * Initialize brcms_c_info default values ...
- * may get overrides later in this function
- *  BMAC_NOTES, move low out and resolve the dangling ones
- */
-static void brcms_b_info_init(struct brcms_hardware *wlc_hw)
-{
-       struct brcms_c_info *wlc = wlc_hw->wlc;
-
-       /* set default sw macintmask value */
-       wlc->defmacintmask = DEF_MACINTMASK;
-
-       /* various 802.11g modes */
-       wlc_hw->shortslot = false;
-
-       wlc_hw->SFBL = RETRY_SHORT_FB;
-       wlc_hw->LFBL = RETRY_LONG_FB;
-
-       /* default mac retry limits */
-       wlc_hw->SRL = RETRY_SHORT_DEF;
-       wlc_hw->LRL = RETRY_LONG_DEF;
-       wlc_hw->chanspec = CH20MHZ_CHSPEC(1);
-}
-
-/*
- * low level detach
- */
-int brcms_b_detach(struct brcms_c_info *wlc)
-{
-       uint i;
-       struct brcms_hw_band *band;
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       int callbacks;
-
-       callbacks = 0;
-
-       if (wlc_hw->sih) {
-               /* detach interrupt sync mechanism since interrupt is disabled and per-port
-                * interrupt object may has been freed. this must be done before sb core switch
-                */
-               ai_deregister_intr_callback(wlc_hw->sih);
-
-               if (wlc_hw->sih->bustype == PCI_BUS)
-                       ai_pci_sleep(wlc_hw->sih);
-       }
-
-       brcms_b_detach_dmapio(wlc_hw);
-
-       band = wlc_hw->band;
-       for (i = 0; i < NBANDS_HW(wlc_hw); i++) {
-               if (band->pi) {
-                       /* Detach this band's phy */
-                       wlc_phy_detach(band->pi);
-                       band->pi = NULL;
-               }
-               band = wlc_hw->bandstate[OTHERBANDUNIT(wlc)];
-       }
-
-       /* Free shared phy state */
-       kfree(wlc_hw->phy_sh);
-
-       wlc_phy_shim_detach(wlc_hw->physhim);
-
-       /* free vars */
-       kfree(wlc_hw->vars);
-       wlc_hw->vars = NULL;
-
-       if (wlc_hw->sih) {
-               ai_detach(wlc_hw->sih);
-               wlc_hw->sih = NULL;
-       }
-
-       return callbacks;
-
-}
-
-void brcms_b_reset(struct brcms_hardware *wlc_hw)
-{
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       /* reset the core */
-       if (!DEVICEREMOVED(wlc_hw->wlc))
-               brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
-
-       /* purge the dma rings */
-       brcms_c_flushqueues(wlc_hw->wlc);
-
-       brcms_c_reset_bmac_done(wlc_hw->wlc);
-}
-
-void
-brcms_b_init(struct brcms_hardware *wlc_hw, chanspec_t chanspec,
-                         bool mute) {
-       u32 macintmask;
-       bool fastclk;
-       struct brcms_c_info *wlc = wlc_hw->wlc;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       /* request FAST clock if not on */
-       fastclk = wlc_hw->forcefastclk;
-       if (!fastclk)
-               brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
-
-       /* disable interrupts */
-       macintmask = brcms_intrsoff(wlc->wl);
-
-       /* set up the specified band and chanspec */
-       brcms_c_setxband(wlc_hw, CHSPEC_BANDUNIT(chanspec));
-       wlc_phy_chanspec_radio_set(wlc_hw->band->pi, chanspec);
-
-       /* do one-time phy inits and calibration */
-       wlc_phy_cal_init(wlc_hw->band->pi);
-
-       /* core-specific initialization */
-       brcms_b_coreinit(wlc);
-
-       /* suspend the tx fifos and mute the phy for preism cac time */
-       if (mute)
-               brcms_b_mute(wlc_hw, ON, PHY_MUTE_FOR_PREISM);
-
-       /* band-specific inits */
-       brcms_b_bsinit(wlc, chanspec);
-
-       /* restore macintmask */
-       brcms_intrsrestore(wlc->wl, macintmask);
-
-       /* seed wake_override with BRCMS_WAKE_OVERRIDE_MACSUSPEND since the mac
-        * is suspended and brcms_c_enable_mac() will clear this override bit.
-        */
-       mboolset(wlc_hw->wake_override, BRCMS_WAKE_OVERRIDE_MACSUSPEND);
-
-       /*
-        * initialize mac_suspend_depth to 1 to match ucode initial suspended state
-        */
-       wlc_hw->mac_suspend_depth = 1;
-
-       /* restore the clk */
-       if (!fastclk)
-               brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
-}
-
-int brcms_b_up_prep(struct brcms_hardware *wlc_hw)
-{
-       uint coremask;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       /*
-        * Enable pll and xtal, initialize the power control registers,
-        * and force fastclock for the remainder of brcms_c_up().
-        */
-       brcms_b_xtal(wlc_hw, ON);
-       ai_clkctl_init(wlc_hw->sih);
-       brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
-
-       /*
-        * Configure pci/pcmcia here instead of in brcms_c_attach()
-        * to allow mfg hotswap:  down, hotswap (chip power cycle), up.
-        */
-       coremask = (1 << wlc_hw->wlc->core->coreidx);
-
-       if (wlc_hw->sih->bustype == PCI_BUS)
-               ai_pci_setup(wlc_hw->sih, coremask);
-
-       /*
-        * Need to read the hwradio status here to cover the case where the system
-        * is loaded with the hw radio disabled. We do not want to bring the driver up in this case.
-        */
-       if (brcms_b_radio_read_hwdisabled(wlc_hw)) {
-               /* put SB PCI in down state again */
-               if (wlc_hw->sih->bustype == PCI_BUS)
-                       ai_pci_down(wlc_hw->sih);
-               brcms_b_xtal(wlc_hw, OFF);
-               return -ENOMEDIUM;
-       }
-
-       if (wlc_hw->sih->bustype == PCI_BUS)
-               ai_pci_up(wlc_hw->sih);
-
-       /* reset the d11 core */
-       brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
-
-       return 0;
-}
-
-int brcms_b_up_finish(struct brcms_hardware *wlc_hw)
-{
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       wlc_hw->up = true;
-       wlc_phy_hw_state_upd(wlc_hw->band->pi, true);
-
-       /* FULLY enable dynamic power control and d11 core interrupt */
-       brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
-       brcms_intrson(wlc_hw->wlc->wl);
-       return 0;
-}
-
-int brcms_b_bmac_down_prep(struct brcms_hardware *wlc_hw)
-{
-       bool dev_gone;
-       uint callbacks = 0;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       if (!wlc_hw->up)
-               return callbacks;
-
-       dev_gone = DEVICEREMOVED(wlc_hw->wlc);
-
-       /* disable interrupts */
-       if (dev_gone)
-               wlc_hw->wlc->macintmask = 0;
-       else {
-               /* now disable interrupts */
-               brcms_intrsoff(wlc_hw->wlc->wl);
-
-               /* ensure we're running on the pll clock again */
-               brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
-       }
-       /* down phy at the last of this stage */
-       callbacks += wlc_phy_down(wlc_hw->band->pi);
-
-       return callbacks;
-}
-
-int brcms_b_down_finish(struct brcms_hardware *wlc_hw)
-{
-       uint callbacks = 0;
-       bool dev_gone;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       if (!wlc_hw->up)
-               return callbacks;
-
-       wlc_hw->up = false;
-       wlc_phy_hw_state_upd(wlc_hw->band->pi, false);
-
-       dev_gone = DEVICEREMOVED(wlc_hw->wlc);
-
-       if (dev_gone) {
-               wlc_hw->sbclk = false;
-               wlc_hw->clk = false;
-               wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, false);
-
-               /* reclaim any posted packets */
-               brcms_c_flushqueues(wlc_hw->wlc);
-       } else {
-
-               /* Reset and disable the core */
-               if (ai_iscoreup(wlc_hw->sih)) {
-                       if (R_REG(&wlc_hw->regs->maccontrol) &
-                           MCTL_EN_MAC)
-                               brcms_c_suspend_mac_and_wait(wlc_hw->wlc);
-                       callbacks += brcms_reset(wlc_hw->wlc->wl);
-                       brcms_c_coredisable(wlc_hw);
-               }
-
-               /* turn off primary xtal and pll */
-               if (!wlc_hw->noreset) {
-                       if (wlc_hw->sih->bustype == PCI_BUS)
-                               ai_pci_down(wlc_hw->sih);
-                       brcms_b_xtal(wlc_hw, OFF);
-               }
-       }
-
-       return callbacks;
-}
-
-void brcms_b_wait_for_wake(struct brcms_hardware *wlc_hw)
-{
-       /* delay before first read of ucode state */
-       udelay(40);
-
-       /* wait until ucode is no longer asleep */
-       SPINWAIT((brcms_b_read_shm(wlc_hw, M_UCODE_DBGST) ==
-                 DBGST_ASLEEP), wlc_hw->wlc->fastpwrup_dly);
-}
-
-void brcms_b_hw_etheraddr(struct brcms_hardware *wlc_hw, u8 *ea)
-{
-       memcpy(ea, wlc_hw->etheraddr, ETH_ALEN);
-}
-
-static int brcms_b_bandtype(struct brcms_hardware *wlc_hw)
-{
-       return wlc_hw->band->bandtype;
-}
-
-/* control chip clock to save power, enable dynamic clock or force fast clock */
-static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode)
-{
-       if (PMUCTL_ENAB(wlc_hw->sih)) {
-               /* new chips with PMU, CCS_FORCEHT will distribute the HT clock on backplane,
-                *  but mac core will still run on ALP(not HT) when it enters powersave mode,
-                *      which means the FCA bit may not be set.
-                *      should wakeup mac if driver wants it to run on HT.
-                */
-
-               if (wlc_hw->clk) {
-                       if (mode == CLK_FAST) {
-                               OR_REG(&wlc_hw->regs->clk_ctl_st,
-                                      CCS_FORCEHT);
-
-                               udelay(64);
-
-                               SPINWAIT(((R_REG
-                                          (&wlc_hw->regs->
-                                           clk_ctl_st) & CCS_HTAVAIL) == 0),
-                                        PMU_MAX_TRANSITION_DLY);
-                               WARN_ON(!(R_REG
-                                         (&wlc_hw->regs->
-                                          clk_ctl_st) & CCS_HTAVAIL));
-                       } else {
-                               if ((wlc_hw->sih->pmurev == 0) &&
-                                   (R_REG
-                                    (&wlc_hw->regs->
-                                     clk_ctl_st) & (CCS_FORCEHT | CCS_HTAREQ)))
-                                       SPINWAIT(((R_REG
-                                                  (&wlc_hw->regs->
-                                                   clk_ctl_st) & CCS_HTAVAIL)
-                                                 == 0),
-                                                PMU_MAX_TRANSITION_DLY);
-                               AND_REG(&wlc_hw->regs->clk_ctl_st,
-                                       ~CCS_FORCEHT);
-                       }
-               }
-               wlc_hw->forcefastclk = (mode == CLK_FAST);
-       } else {
-
-               /* old chips w/o PMU, force HT through cc,
-                * then use FCA to verify mac is running fast clock
-                */
-
-               wlc_hw->forcefastclk = ai_clkctl_cc(wlc_hw->sih, mode);
-
-               /* check fast clock is available (if core is not in reset) */
-               if (wlc_hw->forcefastclk && wlc_hw->clk)
-                       WARN_ON(!(ai_core_sflags(wlc_hw->sih, 0, 0) &
-                                 SISF_FCLKA));
-
-               /* keep the ucode wake bit on if forcefastclk is on
-                * since we do not want ucode to put us back to slow clock
-                * when it dozes for PM mode.
-                * Code below matches the wake override bit with current forcefastclk state
-                * Only setting bit in wake_override instead of waking ucode immediately
-                * since old code (wlc.c 1.4499) had this behavior. Older code set
-                * wlc->forcefastclk but only had the wake happen if the wakup_ucode work
-                * (protected by an up check) was executed just below.
-                */
-               if (wlc_hw->forcefastclk)
-                       mboolset(wlc_hw->wake_override,
-                                BRCMS_WAKE_OVERRIDE_FORCEFAST);
-               else
-                       mboolclr(wlc_hw->wake_override,
-                                BRCMS_WAKE_OVERRIDE_FORCEFAST);
-       }
-}
-
-/* set initial host flags value */
-static void
-brcms_c_mhfdef(struct brcms_c_info *wlc, u16 *mhfs, u16 mhf2_init)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-
-       memset(mhfs, 0, MHFMAX * sizeof(u16));
-
-       mhfs[MHF2] |= mhf2_init;
-
-       /* prohibit use of slowclock on multifunction boards */
-       if (wlc_hw->boardflags & BFL_NOPLLDOWN)
-               mhfs[MHF1] |= MHF1_FORCEFASTCLK;
-
-       if (BRCMS_ISNPHY(wlc_hw->band) && NREV_LT(wlc_hw->band->phyrev, 2)) {
-               mhfs[MHF2] |= MHF2_NPHY40MHZ_WAR;
-               mhfs[MHF1] |= MHF1_IQSWAP_WAR;
-       }
-}
-
-/* set or clear ucode host flag bits
- * it has an optimization for no-change write
- * it only writes through shared memory when the core has clock;
- * pre-CLK changes should use wlc_write_mhf to get around the optimization
- *
- *
- * bands values are: BRCM_BAND_AUTO <--- Current band only
- *                   BRCM_BAND_5G   <--- 5G band only
- *                   BRCM_BAND_2G   <--- 2G band only
- *                   BRCM_BAND_ALL  <--- All bands
- */
-void
-brcms_b_mhf(struct brcms_hardware *wlc_hw, u8 idx, u16 mask, u16 val,
-            int bands)
-{
-       u16 save;
-       u16 addr[MHFMAX] = {
-               M_HOST_FLAGS1, M_HOST_FLAGS2, M_HOST_FLAGS3, M_HOST_FLAGS4,
-               M_HOST_FLAGS5
-       };
-       struct brcms_hw_band *band;
-
-       if ((val & ~mask) || idx >= MHFMAX)
-               return; /* error condition */
-
-       switch (bands) {
-               /* Current band only or all bands,
-                * then set the band to current band
-                */
-       case BRCM_BAND_AUTO:
-       case BRCM_BAND_ALL:
-               band = wlc_hw->band;
-               break;
-       case BRCM_BAND_5G:
-               band = wlc_hw->bandstate[BAND_5G_INDEX];
-               break;
-       case BRCM_BAND_2G:
-               band = wlc_hw->bandstate[BAND_2G_INDEX];
-               break;
-       default:
-               band = NULL;    /* error condition */
-       }
-
-       if (band) {
-               save = band->mhfs[idx];
-               band->mhfs[idx] = (band->mhfs[idx] & ~mask) | val;
-
-               /* optimization: only write through if changed, and
-                * changed band is the current band
-                */
-               if (wlc_hw->clk && (band->mhfs[idx] != save)
-                   && (band == wlc_hw->band))
-                       brcms_b_write_shm(wlc_hw, addr[idx],
-                                          (u16) band->mhfs[idx]);
-       }
-
-       if (bands == BRCM_BAND_ALL) {
-               wlc_hw->bandstate[0]->mhfs[idx] =
-                   (wlc_hw->bandstate[0]->mhfs[idx] & ~mask) | val;
-               wlc_hw->bandstate[1]->mhfs[idx] =
-                   (wlc_hw->bandstate[1]->mhfs[idx] & ~mask) | val;
-       }
-}
-
-u16 brcms_b_mhf_get(struct brcms_hardware *wlc_hw, u8 idx, int bands)
-{
-       struct brcms_hw_band *band;
-
-       if (idx >= MHFMAX)
-               return 0; /* error condition */
-       switch (bands) {
-       case BRCM_BAND_AUTO:
-               band = wlc_hw->band;
-               break;
-       case BRCM_BAND_5G:
-               band = wlc_hw->bandstate[BAND_5G_INDEX];
-               break;
-       case BRCM_BAND_2G:
-               band = wlc_hw->bandstate[BAND_2G_INDEX];
-               break;
-       default:
-               band = NULL;            /* error condition */
-       }
-
-       if (!band)
-               return 0;
-
-       return band->mhfs[idx];
-}
-
-static void brcms_c_write_mhf(struct brcms_hardware *wlc_hw, u16 *mhfs)
-{
-       u8 idx;
-       u16 addr[] = {
-               M_HOST_FLAGS1, M_HOST_FLAGS2, M_HOST_FLAGS3, M_HOST_FLAGS4,
-               M_HOST_FLAGS5
-       };
-
-       for (idx = 0; idx < MHFMAX; idx++) {
-               brcms_b_write_shm(wlc_hw, addr[idx], mhfs[idx]);
-       }
-}
-
-/* set the maccontrol register to desired reset state and
- * initialize the sw cache of the register
- */
-static void brcms_c_mctrl_reset(struct brcms_hardware *wlc_hw)
-{
-       /* IHR accesses are always enabled, PSM disabled, HPS off and WAKE on */
-       wlc_hw->maccontrol = 0;
-       wlc_hw->suspended_fifos = 0;
-       wlc_hw->wake_override = 0;
-       wlc_hw->mute_override = 0;
-       brcms_b_mctrl(wlc_hw, ~0, MCTL_IHR_EN | MCTL_WAKE);
-}
-
-/* set or clear maccontrol bits */
-void brcms_b_mctrl(struct brcms_hardware *wlc_hw, u32 mask, u32 val)
-{
-       u32 maccontrol;
-       u32 new_maccontrol;
-
-       if (val & ~mask)
-               return; /* error condition */
-       maccontrol = wlc_hw->maccontrol;
-       new_maccontrol = (maccontrol & ~mask) | val;
-
-       /* if the new maccontrol value is the same as the old, nothing to do */
-       if (new_maccontrol == maccontrol)
-               return;
-
-       /* something changed, cache the new value */
-       wlc_hw->maccontrol = new_maccontrol;
-
-       /* write the new values with overrides applied */
-       brcms_c_mctrl_write(wlc_hw);
-}
-
-/* write the software state of maccontrol and overrides to the maccontrol register */
-static void brcms_c_mctrl_write(struct brcms_hardware *wlc_hw)
-{
-       u32 maccontrol = wlc_hw->maccontrol;
-
-       /* OR in the wake bit if overridden */
-       if (wlc_hw->wake_override)
-               maccontrol |= MCTL_WAKE;
-
-       /* set AP and INFRA bits for mute if needed */
-       if (wlc_hw->mute_override) {
-               maccontrol &= ~(MCTL_AP);
-               maccontrol |= MCTL_INFRA;
-       }
-
-       W_REG(&wlc_hw->regs->maccontrol, maccontrol);
-}
-
-void brcms_c_ucode_wake_override_set(struct brcms_hardware *wlc_hw,
-                                u32 override_bit)
-{
-       if (wlc_hw->wake_override || (wlc_hw->maccontrol & MCTL_WAKE)) {
-               mboolset(wlc_hw->wake_override, override_bit);
-               return;
-       }
-
-       mboolset(wlc_hw->wake_override, override_bit);
-
-       brcms_c_mctrl_write(wlc_hw);
-       brcms_b_wait_for_wake(wlc_hw);
-
-       return;
-}
-
-void brcms_c_ucode_wake_override_clear(struct brcms_hardware *wlc_hw,
-                                  u32 override_bit)
-{
-       mboolclr(wlc_hw->wake_override, override_bit);
-
-       if (wlc_hw->wake_override || (wlc_hw->maccontrol & MCTL_WAKE))
-               return;
-
-       brcms_c_mctrl_write(wlc_hw);
-
-       return;
-}
-
-/* When driver needs ucode to stop beaconing, it has to make sure that
- * MCTL_AP is clear and MCTL_INFRA is set
- * Mode           MCTL_AP        MCTL_INFRA
- * AP                1              1
- * STA               0              1 <--- This will ensure no beacons
- * IBSS              0              0
- */
-static void brcms_c_ucode_mute_override_set(struct brcms_hardware *wlc_hw)
-{
-       wlc_hw->mute_override = 1;
-
-       /* if maccontrol already has AP == 0 and INFRA == 1 without this
-        * override, then there is no change to write
-        */
-       if ((wlc_hw->maccontrol & (MCTL_AP | MCTL_INFRA)) == MCTL_INFRA)
-               return;
-
-       brcms_c_mctrl_write(wlc_hw);
-
-       return;
-}
-
-/* Clear the override on AP and INFRA bits */
-static void brcms_c_ucode_mute_override_clear(struct brcms_hardware *wlc_hw)
-{
-       if (wlc_hw->mute_override == 0)
-               return;
-
-       wlc_hw->mute_override = 0;
-
-       /* if maccontrol already has AP == 0 and INFRA == 1 without this
-        * override, then there is no change to write
-        */
-       if ((wlc_hw->maccontrol & (MCTL_AP | MCTL_INFRA)) == MCTL_INFRA)
-               return;
-
-       brcms_c_mctrl_write(wlc_hw);
-}
-
-/*
- * Write a MAC address to the given match reg offset in the RXE match engine.
- */
-void
-brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw, int match_reg_offset,
-                      const u8 *addr)
-{
-       d11regs_t *regs;
-       u16 mac_l;
-       u16 mac_m;
-       u16 mac_h;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d: brcms_b_set_addrmatch\n",
-                wlc_hw->unit);
-
-       regs = wlc_hw->regs;
-       mac_l = addr[0] | (addr[1] << 8);
-       mac_m = addr[2] | (addr[3] << 8);
-       mac_h = addr[4] | (addr[5] << 8);
-
-       /* enter the MAC addr into the RXE match registers */
-       W_REG(&regs->rcm_ctl, RCM_INC_DATA | match_reg_offset);
-       W_REG(&regs->rcm_mat_data, mac_l);
-       W_REG(&regs->rcm_mat_data, mac_m);
-       W_REG(&regs->rcm_mat_data, mac_h);
-
-}
-
-void
-brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len,
-                           void *buf)
-{
-       d11regs_t *regs;
-       u32 word;
-       bool be_bit;
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       regs = wlc_hw->regs;
-       W_REG(&regs->tplatewrptr, offset);
-
-       /* if MCTL_BIGEND bit set in mac control register,
-        * the chip swaps data in fifo, as well as data in
-        * template ram
-        */
-       be_bit = (R_REG(&regs->maccontrol) & MCTL_BIGEND) != 0;
-
-       while (len > 0) {
-               memcpy(&word, buf, sizeof(u32));
-
-               if (be_bit)
-                       word = cpu_to_be32(word);
-               else
-                       word = cpu_to_le32(word);
-
-               W_REG(&regs->tplatewrdata, word);
-
-               buf = (u8 *) buf + sizeof(u32);
-               len -= sizeof(u32);
-       }
-}
-
-void brcms_b_set_cwmin(struct brcms_hardware *wlc_hw, u16 newmin)
-{
-       wlc_hw->band->CWmin = newmin;
-
-       W_REG(&wlc_hw->regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_CWMIN);
-       (void)R_REG(&wlc_hw->regs->objaddr);
-       W_REG(&wlc_hw->regs->objdata, newmin);
-}
-
-void brcms_b_set_cwmax(struct brcms_hardware *wlc_hw, u16 newmax)
-{
-       wlc_hw->band->CWmax = newmax;
-
-       W_REG(&wlc_hw->regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_CWMAX);
-       (void)R_REG(&wlc_hw->regs->objaddr);
-       W_REG(&wlc_hw->regs->objdata, newmax);
-}
-
-void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw)
-{
-       bool fastclk;
-
-       /* request FAST clock if not on */
-       fastclk = wlc_hw->forcefastclk;
-       if (!fastclk)
-               brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
-
-       wlc_phy_bw_state_set(wlc_hw->band->pi, bw);
-
-       brcms_b_phy_reset(wlc_hw);
-       wlc_phy_init(wlc_hw->band->pi, wlc_phy_chanspec_get(wlc_hw->band->pi));
-
-       /* restore the clk */
-       if (!fastclk)
-               brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
-}
-
-static void
-brcms_c_write_hw_bcntemplate0(struct brcms_hardware *wlc_hw, void *bcn,
-                             int len)
-{
-       d11regs_t *regs = wlc_hw->regs;
-
-       brcms_b_write_template_ram(wlc_hw, T_BCN0_TPL_BASE, (len + 3) & ~3,
-                                   bcn);
-       /* write beacon length to SCR */
-       brcms_b_write_shm(wlc_hw, M_BCN0_FRM_BYTESZ, (u16) len);
-       /* mark beacon0 valid */
-       OR_REG(&regs->maccommand, MCMD_BCN0VLD);
-}
-
-static void
-brcms_c_write_hw_bcntemplate1(struct brcms_hardware *wlc_hw, void *bcn,
-                             int len)
-{
-       d11regs_t *regs = wlc_hw->regs;
-
-       brcms_b_write_template_ram(wlc_hw, T_BCN1_TPL_BASE, (len + 3) & ~3,
-                                   bcn);
-       /* write beacon length to SCR */
-       brcms_b_write_shm(wlc_hw, M_BCN1_FRM_BYTESZ, (u16) len);
-       /* mark beacon1 valid */
-       OR_REG(&regs->maccommand, MCMD_BCN1VLD);
-}
-
-/* mac is assumed to be suspended at this point */
-void
-brcms_b_write_hw_bcntemplates(struct brcms_hardware *wlc_hw, void *bcn,
-                             int len, bool both)
-{
-       d11regs_t *regs = wlc_hw->regs;
-
-       if (both) {
-               brcms_c_write_hw_bcntemplate0(wlc_hw, bcn, len);
-               brcms_c_write_hw_bcntemplate1(wlc_hw, bcn, len);
-       } else {
-               /* bcn 0 */
-               if (!(R_REG(&regs->maccommand) & MCMD_BCN0VLD))
-                       brcms_c_write_hw_bcntemplate0(wlc_hw, bcn, len);
-               /* bcn 1 */
-               else if (!
-                        (R_REG(&regs->maccommand) & MCMD_BCN1VLD))
-                       brcms_c_write_hw_bcntemplate1(wlc_hw, bcn, len);
-       }
-}
-
-static void brcms_b_upd_synthpu(struct brcms_hardware *wlc_hw)
-{
-       u16 v;
-       struct brcms_c_info *wlc = wlc_hw->wlc;
-       /* update SYNTHPU_DLY */
-
-       if (BRCMS_ISLCNPHY(wlc->band)) {
-               v = SYNTHPU_DLY_LPPHY_US;
-       } else if (BRCMS_ISNPHY(wlc->band) && (NREV_GE(wlc->band->phyrev, 3))) {
-               v = SYNTHPU_DLY_NPHY_US;
-       } else {
-               v = SYNTHPU_DLY_BPHY_US;
-       }
-
-       brcms_b_write_shm(wlc_hw, M_SYNTHPU_DLY, v);
-}
-
-/* band-specific init */
-static void
-brcms_b_bsinit(struct brcms_c_info *wlc, chanspec_t chanspec)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-
-       BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
-               wlc_hw->band->bandunit);
-
-       brcms_c_ucode_bsinit(wlc_hw);
-
-       wlc_phy_init(wlc_hw->band->pi, chanspec);
-
-       brcms_c_ucode_txant_set(wlc_hw);
-
-       /* cwmin is band-specific, update hardware with value for current band */
-       brcms_b_set_cwmin(wlc_hw, wlc_hw->band->CWmin);
-       brcms_b_set_cwmax(wlc_hw, wlc_hw->band->CWmax);
-
-       brcms_b_update_slot_timing(wlc_hw,
-                                   BAND_5G(wlc_hw->band->
-                                           bandtype) ? true : wlc_hw->
-                                   shortslot);
-
-       /* write phytype and phyvers */
-       brcms_b_write_shm(wlc_hw, M_PHYTYPE, (u16) wlc_hw->band->phytype);
-       brcms_b_write_shm(wlc_hw, M_PHYVER, (u16) wlc_hw->band->phyrev);
-
-       /* initialize the txphyctl1 rate table since shmem is shared between bands */
-       brcms_upd_ofdm_pctl1_table(wlc_hw);
-
-       brcms_b_upd_synthpu(wlc_hw);
-}
-
-static void brcms_b_core_phy_clk(struct brcms_hardware *wlc_hw, bool clk)
-{
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d: clk %d\n", wlc_hw->unit, clk);
-
-       wlc_hw->phyclk = clk;
-
-       if (OFF == clk) {       /* clear gmode bit, put phy into reset */
-
-               ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_FGC | SICF_GMODE),
-                              (SICF_PRST | SICF_FGC));
-               udelay(1);
-               ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_FGC), SICF_PRST);
-               udelay(1);
-
-       } else {                /* take phy out of reset */
-
-               ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_FGC), SICF_FGC);
-               udelay(1);
-               ai_core_cflags(wlc_hw->sih, (SICF_FGC), 0);
-               udelay(1);
-
-       }
-}
-
-/* Perform a soft reset of the PHY PLL */
-void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw)
-{
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                  offsetof(chipcregs_t, chipcontrol_addr), ~0, 0);
-       udelay(1);
-       ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                  offsetof(chipcregs_t, chipcontrol_data), 0x4, 0);
-       udelay(1);
-       ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                  offsetof(chipcregs_t, chipcontrol_data), 0x4, 4);
-       udelay(1);
-       ai_corereg(wlc_hw->sih, SI_CC_IDX,
-                  offsetof(chipcregs_t, chipcontrol_data), 0x4, 0);
-       udelay(1);
-}
-
-/* light way to turn on phy clock without reset for NPHY only
- *  refer to brcms_b_core_phy_clk for full version
- */
-void brcms_b_phyclk_fgc(struct brcms_hardware *wlc_hw, bool clk)
-{
-       /* support(necessary for NPHY and HYPHY) only */
-       if (!BRCMS_ISNPHY(wlc_hw->band))
-               return;
-
-       if (ON == clk)
-               ai_core_cflags(wlc_hw->sih, SICF_FGC, SICF_FGC);
-       else
-               ai_core_cflags(wlc_hw->sih, SICF_FGC, 0);
-
-}
-
-void brcms_b_macphyclk_set(struct brcms_hardware *wlc_hw, bool clk)
-{
-       if (ON == clk)
-               ai_core_cflags(wlc_hw->sih, SICF_MPCLKE, SICF_MPCLKE);
-       else
-               ai_core_cflags(wlc_hw->sih, SICF_MPCLKE, 0);
-}
-
-void brcms_b_phy_reset(struct brcms_hardware *wlc_hw)
-{
-       struct brcms_phy_pub *pih = wlc_hw->band->pi;
-       u32 phy_bw_clkbits;
-       bool phy_in_reset = false;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       if (pih == NULL)
-               return;
-
-       phy_bw_clkbits = wlc_phy_clk_bwbits(wlc_hw->band->pi);
-
-       /* Specific reset sequence required for NPHY rev 3 and 4 */
-       if (BRCMS_ISNPHY(wlc_hw->band) && NREV_GE(wlc_hw->band->phyrev, 3) &&
-           NREV_LE(wlc_hw->band->phyrev, 4)) {
-               /* Set the PHY bandwidth */
-               ai_core_cflags(wlc_hw->sih, SICF_BWMASK, phy_bw_clkbits);
-
-               udelay(1);
-
-               /* Perform a soft reset of the PHY PLL */
-               brcms_b_core_phypll_reset(wlc_hw);
-
-               /* reset the PHY */
-               ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_PCLKE),
-                              (SICF_PRST | SICF_PCLKE));
-               phy_in_reset = true;
-       } else {
-
-               ai_core_cflags(wlc_hw->sih,
-                              (SICF_PRST | SICF_PCLKE | SICF_BWMASK),
-                              (SICF_PRST | SICF_PCLKE | phy_bw_clkbits));
-       }
-
-       udelay(2);
-       brcms_b_core_phy_clk(wlc_hw, ON);
-
-       if (pih)
-               wlc_phy_anacore(pih, ON);
-}
-
-/* switch to and initialize new band */
-static void
-brcms_b_setband(struct brcms_hardware *wlc_hw, uint bandunit,
-                               chanspec_t chanspec) {
-       struct brcms_c_info *wlc = wlc_hw->wlc;
-       u32 macintmask;
-
-       /* Enable the d11 core before accessing it */
-       if (!ai_iscoreup(wlc_hw->sih)) {
-               ai_core_reset(wlc_hw->sih, 0, 0);
-               brcms_c_mctrl_reset(wlc_hw);
-       }
-
-       macintmask = brcms_c_setband_inact(wlc, bandunit);
-
-       if (!wlc_hw->up)
-               return;
-
-       brcms_b_core_phy_clk(wlc_hw, ON);
-
-       /* band-specific initializations */
-       brcms_b_bsinit(wlc, chanspec);
-
-       /*
-        * If there are any pending software interrupt bits,
-        * then replace these with a harmless nonzero value
-        * so brcms_c_dpc() will re-enable interrupts when done.
-        */
-       if (wlc->macintstatus)
-               wlc->macintstatus = MI_DMAINT;
-
-       /* restore macintmask */
-       brcms_intrsrestore(wlc->wl, macintmask);
-
-       /* ucode should still be suspended.. */
-       WARN_ON((R_REG(&wlc_hw->regs->maccontrol) & MCTL_EN_MAC) != 0);
-}
-
-/* low-level band switch utility routine */
-void brcms_c_setxband(struct brcms_hardware *wlc_hw,
-                                    uint bandunit)
-{
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
-               bandunit);
-
-       wlc_hw->band = wlc_hw->bandstate[bandunit];
-
-       /* BMAC_NOTE: until we eliminate need for wlc->band refs in low level code */
-       wlc_hw->wlc->band = wlc_hw->wlc->bandstate[bandunit];
-
-       /* set gmode core flag */
-       if (wlc_hw->sbclk && !wlc_hw->noreset) {
-               ai_core_cflags(wlc_hw->sih, SICF_GMODE,
-                              ((bandunit == 0) ? SICF_GMODE : 0));
-       }
-}
-
-static bool brcms_c_isgoodchip(struct brcms_hardware *wlc_hw)
-{
-
-       /* reject unsupported corerev */
-       if (!VALID_COREREV(wlc_hw->corerev)) {
-               wiphy_err(wlc_hw->wlc->wiphy, "unsupported core rev %d\n",
-                         wlc_hw->corerev);
-               return false;
-       }
-
-       return true;
-}
-
-/* Validate some board info parameters */
-static bool brcms_c_validboardtype(struct brcms_hardware *wlc_hw)
-{
-       uint boardrev = wlc_hw->boardrev;
-
-       /* 4 bits each for board type, major, minor, and tiny version */
-       uint brt = (boardrev & 0xf000) >> 12;
-       uint b0 = (boardrev & 0xf00) >> 8;
-       uint b1 = (boardrev & 0xf0) >> 4;
-       uint b2 = boardrev & 0xf;
-
-       /* voards from other vendors are always considered valid */
-       if (wlc_hw->sih->boardvendor != PCI_VENDOR_ID_BROADCOM)
-               return true;
-
-       /* do some boardrev sanity checks when boardvendor is Broadcom */
-       if (boardrev == 0)
-               return false;
-
-       if (boardrev <= 0xff)
-               return true;
-
-       if ((brt > 2) || (brt == 0) || (b0 > 9) || (b0 == 0) || (b1 > 9)
-               || (b2 > 9))
-               return false;
-
-       return true;
-}
-
-static char *brcms_c_get_macaddr(struct brcms_hardware *wlc_hw)
-{
-       const char *varname = "macaddr";
-       char *macaddr;
-
-       /* If macaddr exists, use it (Sromrev4, CIS, ...). */
-       macaddr = getvar(wlc_hw->vars, varname);
-       if (macaddr != NULL)
-               return macaddr;
-
-       if (NBANDS_HW(wlc_hw) > 1)
-               varname = "et1macaddr";
-       else
-               varname = "il0macaddr";
-
-       macaddr = getvar(wlc_hw->vars, varname);
-       if (macaddr == NULL) {
-               wiphy_err(wlc_hw->wlc->wiphy, "wl%d: wlc_get_macaddr: macaddr "
-                         "getvar(%s) not found\n", wlc_hw->unit, varname);
-       }
-
-       return macaddr;
-}
-
-/*
- * Return true if radio is disabled, otherwise false.
- * hw radio disable signal is an external pin, users activate it asynchronously
- * this function could be called when driver is down and w/o clock
- * it operates on different registers depending on corerev and boardflag.
- */
-bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw)
-{
-       bool v, clk, xtal;
-       u32 resetbits = 0, flags = 0;
-
-       xtal = wlc_hw->sbclk;
-       if (!xtal)
-               brcms_b_xtal(wlc_hw, ON);
-
-       /* may need to take core out of reset first */
-       clk = wlc_hw->clk;
-       if (!clk) {
-               /*
-                * mac no longer enables phyclk automatically when driver
-                * accesses phyreg throughput mac. This can be skipped since
-                * only mac reg is accessed below
-                */
-               flags |= SICF_PCLKE;
-
-               /* AI chip doesn't restore bar0win2 on hibernation/resume, need sw fixup */
-               if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
-                   (wlc_hw->sih->chip == BCM43225_CHIP_ID))
-                       wlc_hw->regs =
-                           (d11regs_t *) ai_setcore(wlc_hw->sih, D11_CORE_ID,
-                                                    0);
-               ai_core_reset(wlc_hw->sih, flags, resetbits);
-               brcms_c_mctrl_reset(wlc_hw);
-       }
-
-       v = ((R_REG(&wlc_hw->regs->phydebug) & PDBG_RFD) != 0);
-
-       /* put core back into reset */
-       if (!clk)
-               ai_core_disable(wlc_hw->sih, 0);
-
-       if (!xtal)
-               brcms_b_xtal(wlc_hw, OFF);
-
-       return v;
-}
-
-/* Initialize just the hardware when coming out of POR or S3/S5 system states */
-void brcms_b_hw_up(struct brcms_hardware *wlc_hw)
-{
-       if (wlc_hw->wlc->pub->hw_up)
-               return;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       /*
-        * Enable pll and xtal, initialize the power control registers,
-        * and force fastclock for the remainder of brcms_c_up().
-        */
-       brcms_b_xtal(wlc_hw, ON);
-       ai_clkctl_init(wlc_hw->sih);
-       brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
-
-       if (wlc_hw->sih->bustype == PCI_BUS) {
-               ai_pci_fixcfg(wlc_hw->sih);
-
-               /* AI chip doesn't restore bar0win2 on hibernation/resume, need sw fixup */
-               if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
-                   (wlc_hw->sih->chip == BCM43225_CHIP_ID))
-                       wlc_hw->regs =
-                           (d11regs_t *) ai_setcore(wlc_hw->sih, D11_CORE_ID,
-                                                    0);
-       }
-
-       /* Inform phy that a POR reset has occurred so it does a complete phy init */
-       wlc_phy_por_inform(wlc_hw->band->pi);
-
-       wlc_hw->ucode_loaded = false;
-       wlc_hw->wlc->pub->hw_up = true;
-
-       if ((wlc_hw->boardflags & BFL_FEM)
-           && (wlc_hw->sih->chip == BCM4313_CHIP_ID)) {
-               if (!
-                   (wlc_hw->boardrev >= 0x1250
-                    && (wlc_hw->boardflags & BFL_FEM_BT)))
-                       ai_epa_4313war(wlc_hw->sih);
-       }
-}
-
-static bool wlc_dma_rxreset(struct brcms_hardware *wlc_hw, uint fifo)
-{
-       struct dma_pub *di = wlc_hw->di[fifo];
-       return dma_rxreset(di);
-}
-
-/* d11 core reset
- *   ensure fask clock during reset
- *   reset dma
- *   reset d11(out of reset)
- *   reset phy(out of reset)
- *   clear software macintstatus for fresh new start
- * one testing hack wlc_hw->noreset will bypass the d11/phy reset
- */
-void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
-{
-       d11regs_t *regs;
-       uint i;
-       bool fastclk;
-       u32 resetbits = 0;
-
-       if (flags == BRCMS_USE_COREFLAGS)
-               flags = (wlc_hw->band->pi ? wlc_hw->band->core_flags : 0);
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       regs = wlc_hw->regs;
-
-       /* request FAST clock if not on  */
-       fastclk = wlc_hw->forcefastclk;
-       if (!fastclk)
-               brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
-
-       /* reset the dma engines except first time thru */
-       if (ai_iscoreup(wlc_hw->sih)) {
-               for (i = 0; i < NFIFO; i++)
-                       if ((wlc_hw->di[i]) && (!dma_txreset(wlc_hw->di[i]))) {
-                               wiphy_err(wlc_hw->wlc->wiphy, "wl%d: %s: "
-                                         "dma_txreset[%d]: cannot stop dma\n",
-                                          wlc_hw->unit, __func__, i);
-                       }
-
-               if ((wlc_hw->di[RX_FIFO])
-                   && (!wlc_dma_rxreset(wlc_hw, RX_FIFO))) {
-                       wiphy_err(wlc_hw->wlc->wiphy, "wl%d: %s: dma_rxreset"
-                                 "[%d]: cannot stop dma\n",
-                                 wlc_hw->unit, __func__, RX_FIFO);
-               }
-       }
-       /* if noreset, just stop the psm and return */
-       if (wlc_hw->noreset) {
-               wlc_hw->wlc->macintstatus = 0;  /* skip wl_dpc after down */
-               brcms_b_mctrl(wlc_hw, MCTL_PSM_RUN | MCTL_EN_MAC, 0);
-               return;
-       }
-
-       /*
-        * mac no longer enables phyclk automatically when driver accesses
-        * phyreg throughput mac, AND phy_reset is skipped at early stage when
-        * band->pi is invalid. need to enable PHY CLK
-        */
-       flags |= SICF_PCLKE;
-
-       /* reset the core
-        * In chips with PMU, the fastclk request goes through d11 core reg 0x1e0, which
-        *  is cleared by the core_reset. have to re-request it.
-        *  This adds some delay and we can optimize it by also requesting fastclk through
-        *  chipcommon during this period if necessary. But that has to work coordinate
-        *  with other driver like mips/arm since they may touch chipcommon as well.
-        */
-       wlc_hw->clk = false;
-       ai_core_reset(wlc_hw->sih, flags, resetbits);
-       wlc_hw->clk = true;
-       if (wlc_hw->band && wlc_hw->band->pi)
-               wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, true);
-
-       brcms_c_mctrl_reset(wlc_hw);
-
-       if (PMUCTL_ENAB(wlc_hw->sih))
-               brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
-
-       brcms_b_phy_reset(wlc_hw);
-
-       /* turn on PHY_PLL */
-       brcms_b_core_phypll_ctl(wlc_hw, true);
-
-       /* clear sw intstatus */
-       wlc_hw->wlc->macintstatus = 0;
-
-       /* restore the clk setting */
-       if (!fastclk)
-               brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
-}
-
-/* txfifo sizes needs to be modified(increased) since the newer cores
- * have more memory.
- */
-static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw)
-{
-       d11regs_t *regs = wlc_hw->regs;
-       u16 fifo_nu;
-       u16 txfifo_startblk = TXFIFO_START_BLK, txfifo_endblk;
-       u16 txfifo_def, txfifo_def1;
-       u16 txfifo_cmd;
-
-       /* tx fifos start at TXFIFO_START_BLK from the Base address */
-       txfifo_startblk = TXFIFO_START_BLK;
-
-       /* sequence of operations:  reset fifo, set fifo size, reset fifo */
-       for (fifo_nu = 0; fifo_nu < NFIFO; fifo_nu++) {
-
-               txfifo_endblk = txfifo_startblk + wlc_hw->xmtfifo_sz[fifo_nu];
-               txfifo_def = (txfifo_startblk & 0xff) |
-                   (((txfifo_endblk - 1) & 0xff) << TXFIFO_FIFOTOP_SHIFT);
-               txfifo_def1 = ((txfifo_startblk >> 8) & 0x1) |
-                   ((((txfifo_endblk -
-                       1) >> 8) & 0x1) << TXFIFO_FIFOTOP_SHIFT);
-               txfifo_cmd =
-                   TXFIFOCMD_RESET_MASK | (fifo_nu << TXFIFOCMD_FIFOSEL_SHIFT);
-
-               W_REG(&regs->xmtfifocmd, txfifo_cmd);
-               W_REG(&regs->xmtfifodef, txfifo_def);
-               W_REG(&regs->xmtfifodef1, txfifo_def1);
-
-               W_REG(&regs->xmtfifocmd, txfifo_cmd);
-
-               txfifo_startblk += wlc_hw->xmtfifo_sz[fifo_nu];
-       }
-       /*
-        * need to propagate to shm location to be in sync since ucode/hw won't
-        * do this
-        */
-       brcms_b_write_shm(wlc_hw, M_FIFOSIZE0,
-                          wlc_hw->xmtfifo_sz[TX_AC_BE_FIFO]);
-       brcms_b_write_shm(wlc_hw, M_FIFOSIZE1,
-                          wlc_hw->xmtfifo_sz[TX_AC_VI_FIFO]);
-       brcms_b_write_shm(wlc_hw, M_FIFOSIZE2,
-                          ((wlc_hw->xmtfifo_sz[TX_AC_VO_FIFO] << 8) | wlc_hw->
-                           xmtfifo_sz[TX_AC_BK_FIFO]));
-       brcms_b_write_shm(wlc_hw, M_FIFOSIZE3,
-                          ((wlc_hw->xmtfifo_sz[TX_ATIM_FIFO] << 8) | wlc_hw->
-                           xmtfifo_sz[TX_BCMC_FIFO]));
-}
-
-/* d11 core init
- *   reset PSM
- *   download ucode/PCM
- *   let ucode run to suspended
- *   download ucode inits
- *   config other core registers
- *   init dma
- */
-static void brcms_b_coreinit(struct brcms_c_info *wlc)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       d11regs_t *regs;
-       u32 sflags;
-       uint bcnint_us;
-       uint i = 0;
-       bool fifosz_fixup = false;
-       int err = 0;
-       u16 buf[NFIFO];
-       struct wiphy *wiphy = wlc->wiphy;
-
-       regs = wlc_hw->regs;
-
-       BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       /* reset PSM */
-       brcms_b_mctrl(wlc_hw, ~0, (MCTL_IHR_EN | MCTL_PSM_JMP_0 | MCTL_WAKE));
-
-       brcms_ucode_download(wlc_hw);
-       /*
-        * FIFOSZ fixup. driver wants to controls the fifo allocation.
-        */
-       fifosz_fixup = true;
-
-       /* let the PSM run to the suspended state, set mode to BSS STA */
-       W_REG(&regs->macintstatus, -1);
-       brcms_b_mctrl(wlc_hw, ~0,
-                      (MCTL_IHR_EN | MCTL_INFRA | MCTL_PSM_RUN | MCTL_WAKE));
-
-       /* wait for ucode to self-suspend after auto-init */
-       SPINWAIT(((R_REG(&regs->macintstatus) & MI_MACSSPNDD) == 0),
-                1000 * 1000);
-       if ((R_REG(&regs->macintstatus) & MI_MACSSPNDD) == 0)
-               wiphy_err(wiphy, "wl%d: wlc_coreinit: ucode did not self-"
-                         "suspend!\n", wlc_hw->unit);
-
-       brcms_c_gpio_init(wlc);
-
-       sflags = ai_core_sflags(wlc_hw->sih, 0, 0);
-
-       if (D11REV_IS(wlc_hw->corerev, 23)) {
-               if (BRCMS_ISNPHY(wlc_hw->band))
-                       brcms_c_write_inits(wlc_hw, d11n0initvals16);
-               else
-                       wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
-                                 " %d\n", __func__, wlc_hw->unit,
-                                 wlc_hw->corerev);
-       } else if (D11REV_IS(wlc_hw->corerev, 24)) {
-               if (BRCMS_ISLCNPHY(wlc_hw->band)) {
-                       brcms_c_write_inits(wlc_hw, d11lcn0initvals24);
-               } else {
-                       wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
-                                 " %d\n", __func__, wlc_hw->unit,
-                                 wlc_hw->corerev);
-               }
-       } else {
-               wiphy_err(wiphy, "%s: wl%d: unsupported corerev %d\n",
-                         __func__, wlc_hw->unit, wlc_hw->corerev);
-       }
-
-       /* For old ucode, txfifo sizes needs to be modified(increased) */
-       if (fifosz_fixup == true) {
-               brcms_b_corerev_fifofixup(wlc_hw);
-       }
-
-       /* check txfifo allocations match between ucode and driver */
-       buf[TX_AC_BE_FIFO] = brcms_b_read_shm(wlc_hw, M_FIFOSIZE0);
-       if (buf[TX_AC_BE_FIFO] != wlc_hw->xmtfifo_sz[TX_AC_BE_FIFO]) {
-               i = TX_AC_BE_FIFO;
-               err = -1;
-       }
-       buf[TX_AC_VI_FIFO] = brcms_b_read_shm(wlc_hw, M_FIFOSIZE1);
-       if (buf[TX_AC_VI_FIFO] != wlc_hw->xmtfifo_sz[TX_AC_VI_FIFO]) {
-               i = TX_AC_VI_FIFO;
-               err = -1;
-       }
-       buf[TX_AC_BK_FIFO] = brcms_b_read_shm(wlc_hw, M_FIFOSIZE2);
-       buf[TX_AC_VO_FIFO] = (buf[TX_AC_BK_FIFO] >> 8) & 0xff;
-       buf[TX_AC_BK_FIFO] &= 0xff;
-       if (buf[TX_AC_BK_FIFO] != wlc_hw->xmtfifo_sz[TX_AC_BK_FIFO]) {
-               i = TX_AC_BK_FIFO;
-               err = -1;
-       }
-       if (buf[TX_AC_VO_FIFO] != wlc_hw->xmtfifo_sz[TX_AC_VO_FIFO]) {
-               i = TX_AC_VO_FIFO;
-               err = -1;
-       }
-       buf[TX_BCMC_FIFO] = brcms_b_read_shm(wlc_hw, M_FIFOSIZE3);
-       buf[TX_ATIM_FIFO] = (buf[TX_BCMC_FIFO] >> 8) & 0xff;
-       buf[TX_BCMC_FIFO] &= 0xff;
-       if (buf[TX_BCMC_FIFO] != wlc_hw->xmtfifo_sz[TX_BCMC_FIFO]) {
-               i = TX_BCMC_FIFO;
-               err = -1;
-       }
-       if (buf[TX_ATIM_FIFO] != wlc_hw->xmtfifo_sz[TX_ATIM_FIFO]) {
-               i = TX_ATIM_FIFO;
-               err = -1;
-       }
-       if (err != 0) {
-               wiphy_err(wiphy, "wlc_coreinit: txfifo mismatch: ucode size %d"
-                         " driver size %d index %d\n", buf[i],
-                         wlc_hw->xmtfifo_sz[i], i);
-       }
-
-       /* make sure we can still talk to the mac */
-       WARN_ON(R_REG(&regs->maccontrol) == 0xffffffff);
-
-       /* band-specific inits done by wlc_bsinit() */
-
-       /* Set up frame burst size and antenna swap threshold init values */
-       brcms_b_write_shm(wlc_hw, M_MBURST_SIZE, MAXTXFRAMEBURST);
-       brcms_b_write_shm(wlc_hw, M_MAX_ANTCNT, ANTCNT);
-
-       /* enable one rx interrupt per received frame */
-       W_REG(&regs->intrcvlazy[0], (1 << IRL_FC_SHIFT));
-
-       /* set the station mode (BSS STA) */
-       brcms_b_mctrl(wlc_hw,
-                      (MCTL_INFRA | MCTL_DISCARD_PMQ | MCTL_AP),
-                      (MCTL_INFRA | MCTL_DISCARD_PMQ));
-
-       /* set up Beacon interval */
-       bcnint_us = 0x8000 << 10;
-       W_REG(&regs->tsf_cfprep, (bcnint_us << CFPREP_CBI_SHIFT));
-       W_REG(&regs->tsf_cfpstart, bcnint_us);
-       W_REG(&regs->macintstatus, MI_GP1);
-
-       /* write interrupt mask */
-       W_REG(&regs->intctrlregs[RX_FIFO].intmask, DEF_RXINTMASK);
-
-       /* allow the MAC to control the PHY clock (dynamic on/off) */
-       brcms_b_macphyclk_set(wlc_hw, ON);
-
-       /* program dynamic clock control fast powerup delay register */
-       wlc->fastpwrup_dly = ai_clkctl_fast_pwrup_delay(wlc_hw->sih);
-       W_REG(&regs->scc_fastpwrup_dly, wlc->fastpwrup_dly);
-
-       /* tell the ucode the corerev */
-       brcms_b_write_shm(wlc_hw, M_MACHW_VER, (u16) wlc_hw->corerev);
-
-       /* tell the ucode MAC capabilities */
-       brcms_b_write_shm(wlc_hw, M_MACHW_CAP_L,
-                          (u16) (wlc_hw->machwcap & 0xffff));
-       brcms_b_write_shm(wlc_hw, M_MACHW_CAP_H,
-                          (u16) ((wlc_hw->
-                                     machwcap >> 16) & 0xffff));
-
-       /* write retry limits to SCR, this done after PSM init */
-       W_REG(&regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);
-       (void)R_REG(&regs->objaddr);
-       W_REG(&regs->objdata, wlc_hw->SRL);
-       W_REG(&regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);
-       (void)R_REG(&regs->objaddr);
-       W_REG(&regs->objdata, wlc_hw->LRL);
-
-       /* write rate fallback retry limits */
-       brcms_b_write_shm(wlc_hw, M_SFRMTXCNTFBRTHSD, wlc_hw->SFBL);
-       brcms_b_write_shm(wlc_hw, M_LFRMTXCNTFBRTHSD, wlc_hw->LFBL);
-
-       AND_REG(&regs->ifs_ctl, 0x0FFF);
-       W_REG(&regs->ifs_aifsn, EDCF_AIFSN_MIN);
-
-       /* dma initializations */
-       wlc->txpend16165war = 0;
-
-       /* init the tx dma engines */
-       for (i = 0; i < NFIFO; i++) {
-               if (wlc_hw->di[i])
-                       dma_txinit(wlc_hw->di[i]);
-       }
-
-       /* init the rx dma engine(s) and post receive buffers */
-       dma_rxinit(wlc_hw->di[RX_FIFO]);
-       dma_rxfill(wlc_hw->di[RX_FIFO]);
-}
-
-/* This function is used for changing the tsf frac register
- * If spur avoidance mode is off, the mac freq will be 80/120/160Mhz
- * If spur avoidance mode is on1, the mac freq will be 82/123/164Mhz
- * If spur avoidance mode is on2, the mac freq will be 84/126/168Mhz
- * HTPHY Formula is 2^26/freq(MHz) e.g.
- * For spuron2 - 126MHz -> 2^26/126 = 532610.0
- *  - 532610 = 0x82082 => tsf_clk_frac_h = 0x8, tsf_clk_frac_l = 0x2082
- * For spuron: 123MHz -> 2^26/123    = 545600.5
- *  - 545601 = 0x85341 => tsf_clk_frac_h = 0x8, tsf_clk_frac_l = 0x5341
- * For spur off: 120MHz -> 2^26/120    = 559240.5
- *  - 559241 = 0x88889 => tsf_clk_frac_h = 0x8, tsf_clk_frac_l = 0x8889
- */
-
-void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode)
-{
-       d11regs_t *regs;
-       regs = wlc_hw->regs;
-
-       if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
-           (wlc_hw->sih->chip == BCM43225_CHIP_ID)) {
-               if (spurmode == WL_SPURAVOID_ON2) {     /* 126Mhz */
-                       W_REG(&regs->tsf_clk_frac_l, 0x2082);
-                       W_REG(&regs->tsf_clk_frac_h, 0x8);
-               } else if (spurmode == WL_SPURAVOID_ON1) {      /* 123Mhz */
-                       W_REG(&regs->tsf_clk_frac_l, 0x5341);
-                       W_REG(&regs->tsf_clk_frac_h, 0x8);
-               } else {        /* 120Mhz */
-                       W_REG(&regs->tsf_clk_frac_l, 0x8889);
-                       W_REG(&regs->tsf_clk_frac_h, 0x8);
-               }
-       } else if (BRCMS_ISLCNPHY(wlc_hw->band)) {
-               if (spurmode == WL_SPURAVOID_ON1) {     /* 82Mhz */
-                       W_REG(&regs->tsf_clk_frac_l, 0x7CE0);
-                       W_REG(&regs->tsf_clk_frac_h, 0xC);
-               } else {        /* 80Mhz */
-                       W_REG(&regs->tsf_clk_frac_l, 0xCCCD);
-                       W_REG(&regs->tsf_clk_frac_h, 0xC);
-               }
-       }
-}
-
-/* Initialize GPIOs that are controlled by D11 core */
-static void brcms_c_gpio_init(struct brcms_c_info *wlc)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       d11regs_t *regs;
-       u32 gc, gm;
-
-       regs = wlc_hw->regs;
-
-       /* use GPIO select 0 to get all gpio signals from the gpio out reg */
-       brcms_b_mctrl(wlc_hw, MCTL_GPOUT_SEL_MASK, 0);
-
-       /*
-        * Common GPIO setup:
-        *      G0 = LED 0 = WLAN Activity
-        *      G1 = LED 1 = WLAN 2.4 GHz Radio State
-        *      G2 = LED 2 = WLAN 5 GHz Radio State
-        *      G4 = radio disable input (HI enabled, LO disabled)
-        */
-
-       gc = gm = 0;
-
-       /* Allocate GPIOs for mimo antenna diversity feature */
-       if (wlc_hw->antsel_type == ANTSEL_2x3) {
-               /* Enable antenna diversity, use 2x3 mode */
-               brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_EN,
-                            MHF3_ANTSEL_EN, BRCM_BAND_ALL);
-               brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_MODE,
-                            MHF3_ANTSEL_MODE, BRCM_BAND_ALL);
-
-               /* init superswitch control */
-               wlc_phy_antsel_init(wlc_hw->band->pi, false);
-
-       } else if (wlc_hw->antsel_type == ANTSEL_2x4) {
-               gm |= gc |= (BOARD_GPIO_12 | BOARD_GPIO_13);
-               /*
-                * The board itself is powered by these GPIOs
-                * (when not sending pattern) so set them high
-                */
-               OR_REG(&regs->psm_gpio_oe,
-                      (BOARD_GPIO_12 | BOARD_GPIO_13));
-               OR_REG(&regs->psm_gpio_out,
-                      (BOARD_GPIO_12 | BOARD_GPIO_13));
-
-               /* Enable antenna diversity, use 2x4 mode */
-               brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_EN,
-                            MHF3_ANTSEL_EN, BRCM_BAND_ALL);
-               brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_MODE, 0,
-                            BRCM_BAND_ALL);
-
-               /* Configure the desired clock to be 4Mhz */
-               brcms_b_write_shm(wlc_hw, M_ANTSEL_CLKDIV,
-                                  ANTSEL_CLKDIV_4MHZ);
-       }
-
-       /* gpio 9 controls the PA.  ucode is responsible for wiggling out and oe */
-       if (wlc_hw->boardflags & BFL_PACTRL)
-               gm |= gc |= BOARD_GPIO_PACTRL;
-
-       /* apply to gpiocontrol register */
-       ai_gpiocontrol(wlc_hw->sih, gm, gc, GPIO_DRV_PRIORITY);
-}
-
-static void brcms_ucode_download(struct brcms_hardware *wlc_hw)
-{
-       struct brcms_c_info *wlc;
-       wlc = wlc_hw->wlc;
-
-       if (wlc_hw->ucode_loaded)
-               return;
-
-       if (D11REV_IS(wlc_hw->corerev, 23)) {
-               if (BRCMS_ISNPHY(wlc_hw->band)) {
-                       brcms_ucode_write(wlc_hw, bcm43xx_16_mimo,
-                                       bcm43xx_16_mimosz);
-                       wlc_hw->ucode_loaded = true;
-               } else
-                       wiphy_err(wlc->wiphy, "%s: wl%d: unsupported phy in "
-                                 "corerev %d\n",
-                                 __func__, wlc_hw->unit, wlc_hw->corerev);
-       } else if (D11REV_IS(wlc_hw->corerev, 24)) {
-               if (BRCMS_ISLCNPHY(wlc_hw->band)) {
-                       brcms_ucode_write(wlc_hw, bcm43xx_24_lcn,
-                                       bcm43xx_24_lcnsz);
-                       wlc_hw->ucode_loaded = true;
-               } else {
-                       wiphy_err(wlc->wiphy, "%s: wl%d: unsupported phy in "
-                                 "corerev %d\n",
-                                 __func__, wlc_hw->unit, wlc_hw->corerev);
-               }
-       }
-}
-
-static void brcms_ucode_write(struct brcms_hardware *wlc_hw, const u32 ucode[],
-                             const uint nbytes) {
-       d11regs_t *regs = wlc_hw->regs;
-       uint i;
-       uint count;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       count = (nbytes / sizeof(u32));
-
-       W_REG(&regs->objaddr, (OBJADDR_AUTO_INC | OBJADDR_UCM_SEL));
-       (void)R_REG(&regs->objaddr);
-       for (i = 0; i < count; i++)
-               W_REG(&regs->objdata, ucode[i]);
-}
-
-static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,
-                           const struct d11init *inits)
-{
-       int i;
-       volatile u8 *base;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       base = (volatile u8 *)wlc_hw->regs;
-
-       for (i = 0; inits[i].addr != 0xffff; i++) {
-               if (inits[i].size == 2)
-                       W_REG((u16 *)(base + inits[i].addr),
-                             inits[i].value);
-               else if (inits[i].size == 4)
-                       W_REG((u32 *)(base + inits[i].addr),
-                             inits[i].value);
-       }
-}
-
-static void brcms_c_ucode_txant_set(struct brcms_hardware *wlc_hw)
-{
-       u16 phyctl;
-       u16 phytxant = wlc_hw->bmac_phytxant;
-       u16 mask = PHY_TXC_ANT_MASK;
-
-       /* set the Probe Response frame phy control word */
-       phyctl = brcms_b_read_shm(wlc_hw, M_CTXPRS_BLK + C_CTX_PCTLWD_POS);
-       phyctl = (phyctl & ~mask) | phytxant;
-       brcms_b_write_shm(wlc_hw, M_CTXPRS_BLK + C_CTX_PCTLWD_POS, phyctl);
-
-       /* set the Response (ACK/CTS) frame phy control word */
-       phyctl = brcms_b_read_shm(wlc_hw, M_RSP_PCTLWD);
-       phyctl = (phyctl & ~mask) | phytxant;
-       brcms_b_write_shm(wlc_hw, M_RSP_PCTLWD, phyctl);
-}
-
-void brcms_b_txant_set(struct brcms_hardware *wlc_hw, u16 phytxant)
-{
-       /* update sw state */
-       wlc_hw->bmac_phytxant = phytxant;
-
-       /* push to ucode if up */
-       if (!wlc_hw->up)
-               return;
-       brcms_c_ucode_txant_set(wlc_hw);
-
-}
-
-u16 brcms_b_get_txant(struct brcms_hardware *wlc_hw)
-{
-       return (u16) wlc_hw->wlc->stf->txant;
-}
-
-void brcms_b_antsel_type_set(struct brcms_hardware *wlc_hw, u8 antsel_type)
-{
-       wlc_hw->antsel_type = antsel_type;
-
-       /* Update the antsel type for phy module to use */
-       wlc_phy_antsel_type_set(wlc_hw->band->pi, antsel_type);
-}
-
-void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
-{
-       bool fatal = false;
-       uint unit;
-       uint intstatus, idx;
-       d11regs_t *regs = wlc_hw->regs;
-       struct wiphy *wiphy = wlc_hw->wlc->wiphy;
-
-       unit = wlc_hw->unit;
-
-       for (idx = 0; idx < NFIFO; idx++) {
-               /* read intstatus register and ignore any non-error bits */
-               intstatus =
-                   R_REG(&regs->intctrlregs[idx].intstatus) & I_ERRORS;
-               if (!intstatus)
-                       continue;
-
-               BCMMSG(wlc_hw->wlc->wiphy, "wl%d: intstatus%d 0x%x\n",
-                       unit, idx, intstatus);
-
-               if (intstatus & I_RO) {
-                       wiphy_err(wiphy, "wl%d: fifo %d: receive fifo "
-                                 "overflow\n", unit, idx);
-                       fatal = true;
-               }
-
-               if (intstatus & I_PC) {
-                       wiphy_err(wiphy, "wl%d: fifo %d: descriptor error\n",
-                                unit, idx);
-                       fatal = true;
-               }
-
-               if (intstatus & I_PD) {
-                       wiphy_err(wiphy, "wl%d: fifo %d: data error\n", unit,
-                                 idx);
-                       fatal = true;
-               }
-
-               if (intstatus & I_DE) {
-                       wiphy_err(wiphy, "wl%d: fifo %d: descriptor protocol "
-                                 "error\n", unit, idx);
-                       fatal = true;
-               }
-
-               if (intstatus & I_RU) {
-                       wiphy_err(wiphy, "wl%d: fifo %d: receive descriptor "
-                                 "underflow\n", idx, unit);
-               }
-
-               if (intstatus & I_XU) {
-                       wiphy_err(wiphy, "wl%d: fifo %d: transmit fifo "
-                                 "underflow\n", idx, unit);
-                       fatal = true;
-               }
-
-               if (fatal) {
-                       brcms_c_fatal_error(wlc_hw->wlc);       /* big hammer */
-                       break;
-               } else
-                       W_REG(&regs->intctrlregs[idx].intstatus,
-                             intstatus);
-       }
-}
-
-void brcms_c_intrson(struct brcms_c_info *wlc)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       wlc->macintmask = wlc->defmacintmask;
-       W_REG(&wlc_hw->regs->macintmask, wlc->macintmask);
-}
-
-/* callback for siutils.c, which has only wlc handler, no wl
- * they both check up, not only because there is no need to off/restore d11 interrupt
- *  but also because per-port code may require sync with valid interrupt.
- */
-
-static u32 brcms_c_wlintrsoff(struct brcms_c_info *wlc)
-{
-       if (!wlc->hw->up)
-               return 0;
-
-       return brcms_intrsoff(wlc->wl);
-}
-
-static void brcms_c_wlintrsrestore(struct brcms_c_info *wlc, u32 macintmask)
-{
-       if (!wlc->hw->up)
-               return;
-
-       brcms_intrsrestore(wlc->wl, macintmask);
-}
-
-u32 brcms_c_intrsoff(struct brcms_c_info *wlc)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       u32 macintmask;
-
-       if (!wlc_hw->clk)
-               return 0;
-
-       macintmask = wlc->macintmask;   /* isr can still happen */
-
-       W_REG(&wlc_hw->regs->macintmask, 0);
-       (void)R_REG(&wlc_hw->regs->macintmask); /* sync readback */
-       udelay(1);              /* ensure int line is no longer driven */
-       wlc->macintmask = 0;
-
-       /* return previous macintmask; resolve race between us and our isr */
-       return wlc->macintstatus ? 0 : macintmask;
-}
-
-void brcms_c_intrsrestore(struct brcms_c_info *wlc, u32 macintmask)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       if (!wlc_hw->clk)
-               return;
-
-       wlc->macintmask = macintmask;
-       W_REG(&wlc_hw->regs->macintmask, wlc->macintmask);
-}
-
-static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool on, mbool flags)
-{
-       u8 null_ether_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
-
-       if (on) {
-               /* suspend tx fifos */
-               brcms_b_tx_fifo_suspend(wlc_hw, TX_DATA_FIFO);
-               brcms_b_tx_fifo_suspend(wlc_hw, TX_CTL_FIFO);
-               brcms_b_tx_fifo_suspend(wlc_hw, TX_AC_BK_FIFO);
-               brcms_b_tx_fifo_suspend(wlc_hw, TX_AC_VI_FIFO);
-
-               /* zero the address match register so we do not send ACKs */
-               brcms_b_set_addrmatch(wlc_hw, RCM_MAC_OFFSET,
-                                      null_ether_addr);
-       } else {
-               /* resume tx fifos */
-               if (!wlc_hw->wlc->tx_suspended) {
-                       brcms_b_tx_fifo_resume(wlc_hw, TX_DATA_FIFO);
-               }
-               brcms_b_tx_fifo_resume(wlc_hw, TX_CTL_FIFO);
-               brcms_b_tx_fifo_resume(wlc_hw, TX_AC_BK_FIFO);
-               brcms_b_tx_fifo_resume(wlc_hw, TX_AC_VI_FIFO);
-
-               /* Restore address */
-               brcms_b_set_addrmatch(wlc_hw, RCM_MAC_OFFSET,
-                                      wlc_hw->etheraddr);
-       }
-
-       wlc_phy_mute_upd(wlc_hw->band->pi, on, flags);
-
-       if (on)
-               brcms_c_ucode_mute_override_set(wlc_hw);
-       else
-               brcms_c_ucode_mute_override_clear(wlc_hw);
-}
-
-int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,
-                          uint *blocks)
-{
-       if (fifo >= NFIFO)
-               return -EINVAL;
-
-       *blocks = wlc_hw->xmtfifo_sz[fifo];
-
-       return 0;
-}
-
-/* brcms_b_tx_fifo_suspended:
- * Check the MAC's tx suspend status for a tx fifo.
- *
- * When the MAC acknowledges a tx suspend, it indicates that no more
- * packets will be transmitted out the radio. This is independent of
- * DMA channel suspension---the DMA may have finished suspending, or may still
- * be pulling data into a tx fifo, by the time the MAC acks the suspend
- * request.
- */
-static bool brcms_b_tx_fifo_suspended(struct brcms_hardware *wlc_hw,
-                                     uint tx_fifo)
-{
-       /* check that a suspend has been requested and is no longer pending */
-
-       /*
-        * for DMA mode, the suspend request is set in xmtcontrol of the DMA engine,
-        * and the tx fifo suspend at the lower end of the MAC is acknowledged in the
-        * chnstatus register.
-        * The tx fifo suspend completion is independent of the DMA suspend completion and
-        *   may be acked before or after the DMA is suspended.
-        */
-       if (dma_txsuspended(wlc_hw->di[tx_fifo]) &&
-           (R_REG(&wlc_hw->regs->chnstatus) &
-            (1 << tx_fifo)) == 0)
-               return true;
-
-       return false;
-}
-
-static void brcms_b_tx_fifo_suspend(struct brcms_hardware *wlc_hw,
-                                   uint tx_fifo)
-{
-       u8 fifo = 1 << tx_fifo;
-
-       /* Two clients of this code, 11h Quiet period and scanning. */
-
-       /* only suspend if not already suspended */
-       if ((wlc_hw->suspended_fifos & fifo) == fifo)
-               return;
-
-       /* force the core awake only if not already */
-       if (wlc_hw->suspended_fifos == 0)
-               brcms_c_ucode_wake_override_set(wlc_hw,
-                                               BRCMS_WAKE_OVERRIDE_TXFIFO);
-
-       wlc_hw->suspended_fifos |= fifo;
-
-       if (wlc_hw->di[tx_fifo]) {
-               /* Suspending AMPDU transmissions in the middle can cause underflow
-                * which may result in mismatch between ucode and driver
-                * so suspend the mac before suspending the FIFO
-                */
-               if (BRCMS_PHY_11N_CAP(wlc_hw->band))
-                       brcms_c_suspend_mac_and_wait(wlc_hw->wlc);
-
-               dma_txsuspend(wlc_hw->di[tx_fifo]);
-
-               if (BRCMS_PHY_11N_CAP(wlc_hw->band))
-                       brcms_c_enable_mac(wlc_hw->wlc);
-       }
-}
-
-static void brcms_b_tx_fifo_resume(struct brcms_hardware *wlc_hw,
-                                  uint tx_fifo)
-{
-       /* BMAC_NOTE: BRCMS_TX_FIFO_ENAB is done in brcms_c_dpc() for DMA case
-        * but need to be done here for PIO otherwise the watchdog will catch
-        * the inconsistency and fire
-        */
-       /* Two clients of this code, 11h Quiet period and scanning. */
-       if (wlc_hw->di[tx_fifo])
-               dma_txresume(wlc_hw->di[tx_fifo]);
-
-       /* allow core to sleep again */
-       if (wlc_hw->suspended_fifos == 0)
-               return;
-       else {
-               wlc_hw->suspended_fifos &= ~(1 << tx_fifo);
-               if (wlc_hw->suspended_fifos == 0)
-                       brcms_c_ucode_wake_override_clear(wlc_hw,
-                                               BRCMS_WAKE_OVERRIDE_TXFIFO);
-       }
-}
-
-/*
- * Read and clear macintmask and macintstatus and intstatus registers.
- * This routine should be called with interrupts off
- * Return:
- *   -1 if DEVICEREMOVED(wlc) evaluates to true;
- *   0 if the interrupt is not for us, or we are in some special cases;
- *   device interrupt status bits otherwise.
- */
-static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       d11regs_t *regs = wlc_hw->regs;
-       u32 macintstatus;
-
-       /* macintstatus includes a DMA interrupt summary bit */
-       macintstatus = R_REG(&regs->macintstatus);
-
-       BCMMSG(wlc->wiphy, "wl%d: macintstatus: 0x%x\n", wlc_hw->unit,
-                macintstatus);
-
-       /* detect cardbus removed, in power down(suspend) and in reset */
-       if (DEVICEREMOVED(wlc))
-               return -1;
-
-       /* DEVICEREMOVED succeeds even when the core is still resetting,
-        * handle that case here.
-        */
-       if (macintstatus == 0xffffffff)
-               return 0;
-
-       /* defer unsolicited interrupts */
-       macintstatus &= (in_isr ? wlc->macintmask : wlc->defmacintmask);
-
-       /* if not for us */
-       if (macintstatus == 0)
-               return 0;
-
-       /* interrupts are already turned off for CFE build
-        * Caution: For CFE Turning off the interrupts again has some undesired
-        * consequences
-        */
-       /* turn off the interrupts */
-       W_REG(&regs->macintmask, 0);
-       (void)R_REG(&regs->macintmask); /* sync readback */
-       wlc->macintmask = 0;
-
-       /* clear device interrupts */
-       W_REG(&regs->macintstatus, macintstatus);
-
-       /* MI_DMAINT is indication of non-zero intstatus */
-       if (macintstatus & MI_DMAINT) {
-               /*
-                * only fifo interrupt enabled is I_RI in
-                * RX_FIFO. If MI_DMAINT is set, assume it
-                * is set and clear the interrupt.
-                */
-               W_REG(&regs->intctrlregs[RX_FIFO].intstatus,
-                     DEF_RXINTMASK);
-       }
-
-       return macintstatus;
-}
-
-/* Update wlc->macintstatus and wlc->intstatus[]. */
-/* Return true if they are updated successfully. false otherwise */
-bool brcms_c_intrsupd(struct brcms_c_info *wlc)
-{
-       u32 macintstatus;
-
-       /* read and clear macintstatus and intstatus registers */
-       macintstatus = wlc_intstatus(wlc, false);
-
-       /* device is removed */
-       if (macintstatus == 0xffffffff)
-               return false;
-
-       /* update interrupt status in software */
-       wlc->macintstatus |= macintstatus;
-
-       return true;
-}
-
-/*
- * First-level interrupt processing.
- * Return true if this was our interrupt, false otherwise.
- * *wantdpc will be set to true if further brcms_c_dpc() processing is required,
- * false otherwise.
- */
-bool brcms_c_isr(struct brcms_c_info *wlc, bool *wantdpc)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       u32 macintstatus;
-
-       *wantdpc = false;
-
-       if (!wlc_hw->up || !wlc->macintmask)
-               return false;
-
-       /* read and clear macintstatus and intstatus registers */
-       macintstatus = wlc_intstatus(wlc, true);
-
-       if (macintstatus == 0xffffffff)
-               wiphy_err(wlc->wiphy, "DEVICEREMOVED detected in the ISR code"
-                         " path\n");
-
-       /* it is not for us */
-       if (macintstatus == 0)
-               return false;
-
-       *wantdpc = true;
-
-       /* save interrupt status bits */
-       wlc->macintstatus = macintstatus;
-
-       return true;
-
-}
-
-static bool
-brcms_b_dotxstatus(struct brcms_hardware *wlc_hw, struct tx_status *txs,
-                  u32 s2)
-{
-       /* discard intermediate indications for ucode with one legitimate case:
-        *   e.g. if "useRTS" is set. ucode did a successful rts/cts exchange, but the subsequent
-        *   tx of DATA failed. so it will start rts/cts from the beginning (resetting the rts
-        *   transmission count)
-        */
-       if (!(txs->status & TX_STATUS_AMPDU)
-           && (txs->status & TX_STATUS_INTERMEDIATE)) {
-               return false;
-       }
-
-       return brcms_c_dotxstatus(wlc_hw->wlc, txs, s2);
-}
-
-/* process tx completion events in BMAC
- * Return true if more tx status need to be processed. false otherwise.
- */
-static bool
-brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
-{
-       bool morepending = false;
-       struct brcms_c_info *wlc = wlc_hw->wlc;
-       d11regs_t *regs;
-       struct tx_status txstatus, *txs;
-       u32 s1, s2;
-       uint n = 0;
-       /*
-        * Param 'max_tx_num' indicates max. # tx status to process before
-        * break out.
-        */
-       uint max_tx_num = bound ? wlc->pub->tunables->txsbnd : -1;
-
-       BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       txs = &txstatus;
-       regs = wlc_hw->regs;
-       while (!(*fatal)
-              && (s1 = R_REG(&regs->frmtxstatus)) & TXS_V) {
-
-               if (s1 == 0xffffffff) {
-                       wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n",
-                               wlc_hw->unit, __func__);
-                       return morepending;
-               }
-
-                       s2 = R_REG(&regs->frmtxstatus2);
-
-               txs->status = s1 & TXS_STATUS_MASK;
-               txs->frameid = (s1 & TXS_FID_MASK) >> TXS_FID_SHIFT;
-               txs->sequence = s2 & TXS_SEQ_MASK;
-               txs->phyerr = (s2 & TXS_PTX_MASK) >> TXS_PTX_SHIFT;
-               txs->lasttxtime = 0;
-
-               *fatal = brcms_b_dotxstatus(wlc_hw, txs, s2);
-
-               /* !give others some time to run! */
-               if (++n >= max_tx_num)
-                       break;
-       }
-
-       if (*fatal)
-               return 0;
-
-       if (n >= max_tx_num)
-               morepending = true;
-
-       if (!pktq_empty(&wlc->pkt_queue->q))
-               brcms_c_send_q(wlc);
-
-       return morepending;
-}
-
-void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       d11regs_t *regs = wlc_hw->regs;
-       u32 mc, mi;
-       struct wiphy *wiphy = wlc->wiphy;
-
-       BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
-               wlc_hw->band->bandunit);
-
-       /*
-        * Track overlapping suspend requests
-        */
-       wlc_hw->mac_suspend_depth++;
-       if (wlc_hw->mac_suspend_depth > 1)
-               return;
-
-       /* force the core awake */
-       brcms_c_ucode_wake_override_set(wlc_hw, BRCMS_WAKE_OVERRIDE_MACSUSPEND);
-
-       mc = R_REG(&regs->maccontrol);
-
-       if (mc == 0xffffffff) {
-               wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
-                         __func__);
-               brcms_down(wlc->wl);
-               return;
-       }
-       WARN_ON(mc & MCTL_PSM_JMP_0);
-       WARN_ON(!(mc & MCTL_PSM_RUN));
-       WARN_ON(!(mc & MCTL_EN_MAC));
-
-       mi = R_REG(&regs->macintstatus);
-       if (mi == 0xffffffff) {
-               wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
-                         __func__);
-               brcms_down(wlc->wl);
-               return;
-       }
-       WARN_ON(mi & MI_MACSSPNDD);
-
-       brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, 0);
-
-       SPINWAIT(!(R_REG(&regs->macintstatus) & MI_MACSSPNDD),
-                BRCMS_MAX_MAC_SUSPEND);
-
-       if (!(R_REG(&regs->macintstatus) & MI_MACSSPNDD)) {
-               wiphy_err(wiphy, "wl%d: wlc_suspend_mac_and_wait: waited %d uS"
-                         " and MI_MACSSPNDD is still not on.\n",
-                         wlc_hw->unit, BRCMS_MAX_MAC_SUSPEND);
-               wiphy_err(wiphy, "wl%d: psmdebug 0x%08x, phydebug 0x%08x, "
-                         "psm_brc 0x%04x\n", wlc_hw->unit,
-                         R_REG(&regs->psmdebug),
-                         R_REG(&regs->phydebug),
-                         R_REG(&regs->psm_brc));
-       }
-
-       mc = R_REG(&regs->maccontrol);
-       if (mc == 0xffffffff) {
-               wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
-                         __func__);
-               brcms_down(wlc->wl);
-               return;
-       }
-       WARN_ON(mc & MCTL_PSM_JMP_0);
-       WARN_ON(!(mc & MCTL_PSM_RUN));
-       WARN_ON(mc & MCTL_EN_MAC);
-}
-
-void brcms_c_enable_mac(struct brcms_c_info *wlc)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       d11regs_t *regs = wlc_hw->regs;
-       u32 mc, mi;
-
-       BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
-               wlc->band->bandunit);
-
-       /*
-        * Track overlapping suspend requests
-        */
-       wlc_hw->mac_suspend_depth--;
-       if (wlc_hw->mac_suspend_depth > 0)
-               return;
-
-       mc = R_REG(&regs->maccontrol);
-       WARN_ON(mc & MCTL_PSM_JMP_0);
-       WARN_ON(mc & MCTL_EN_MAC);
-       WARN_ON(!(mc & MCTL_PSM_RUN));
-
-       brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, MCTL_EN_MAC);
-       W_REG(&regs->macintstatus, MI_MACSSPNDD);
-
-       mc = R_REG(&regs->maccontrol);
-       WARN_ON(mc & MCTL_PSM_JMP_0);
-       WARN_ON(!(mc & MCTL_EN_MAC));
-       WARN_ON(!(mc & MCTL_PSM_RUN));
-
-       mi = R_REG(&regs->macintstatus);
-       WARN_ON(mi & MI_MACSSPNDD);
-
-       brcms_c_ucode_wake_override_clear(wlc_hw,
-                                         BRCMS_WAKE_OVERRIDE_MACSUSPEND);
-}
-
-static void brcms_upd_ofdm_pctl1_table(struct brcms_hardware *wlc_hw)
-{
-       u8 rate;
-       u8 rates[8] = {
-               BRCM_RATE_6M, BRCM_RATE_9M, BRCM_RATE_12M, BRCM_RATE_18M,
-               BRCM_RATE_24M, BRCM_RATE_36M, BRCM_RATE_48M, BRCM_RATE_54M
-       };
-       u16 entry_ptr;
-       u16 pctl1;
-       uint i;
-
-       if (!BRCMS_PHY_11N_CAP(wlc_hw->band))
-               return;
-
-       /* walk the phy rate table and update the entries */
-       for (i = 0; i < ARRAY_SIZE(rates); i++) {
-               rate = rates[i];
-
-               entry_ptr = brcms_b_ofdm_ratetable_offset(wlc_hw, rate);
-
-               /* read the SHM Rate Table entry OFDM PCTL1 values */
-               pctl1 =
-                   brcms_b_read_shm(wlc_hw, entry_ptr + M_RT_OFDM_PCTL1_POS);
-
-               /* modify the value */
-               pctl1 &= ~PHY_TXC1_MODE_MASK;
-               pctl1 |= (wlc_hw->hw_stf_ss_opmode << PHY_TXC1_MODE_SHIFT);
-
-               /* Update the SHM Rate Table entry OFDM PCTL1 values */
-               brcms_b_write_shm(wlc_hw, entry_ptr + M_RT_OFDM_PCTL1_POS,
-                                  pctl1);
-       }
-}
-
-static u16 brcms_b_ofdm_ratetable_offset(struct brcms_hardware *wlc_hw,
-                                        u8 rate)
-{
-       uint i;
-       u8 plcp_rate = 0;
-       struct plcp_signal_rate_lookup {
-               u8 rate;
-               u8 signal_rate;
-       };
-       /* OFDM RATE sub-field of PLCP SIGNAL field, per 802.11 sec 17.3.4.1 */
-       const struct plcp_signal_rate_lookup rate_lookup[] = {
-               {BRCM_RATE_6M, 0xB},
-               {BRCM_RATE_9M, 0xF},
-               {BRCM_RATE_12M, 0xA},
-               {BRCM_RATE_18M, 0xE},
-               {BRCM_RATE_24M, 0x9},
-               {BRCM_RATE_36M, 0xD},
-               {BRCM_RATE_48M, 0x8},
-               {BRCM_RATE_54M, 0xC}
-       };
-
-       for (i = 0; i < ARRAY_SIZE(rate_lookup); i++) {
-               if (rate == rate_lookup[i].rate) {
-                       plcp_rate = rate_lookup[i].signal_rate;
-                       break;
-               }
-       }
-
-       /* Find the SHM pointer to the rate table entry by looking in the
-        * Direct-map Table
-        */
-       return 2 * brcms_b_read_shm(wlc_hw, M_RT_DIRMAP_A + (plcp_rate * 2));
-}
-
-void brcms_b_band_stf_ss_set(struct brcms_hardware *wlc_hw, u8 stf_mode)
-{
-       wlc_hw->hw_stf_ss_opmode = stf_mode;
-
-       if (wlc_hw->clk)
-               brcms_upd_ofdm_pctl1_table(wlc_hw);
-}
-
-void
-brcms_b_read_tsf(struct brcms_hardware *wlc_hw, u32 *tsf_l_ptr,
-                 u32 *tsf_h_ptr)
-{
-       d11regs_t *regs = wlc_hw->regs;
-
-       /* read the tsf timer low, then high to get an atomic read */
-       *tsf_l_ptr = R_REG(&regs->tsf_timerlow);
-       *tsf_h_ptr = R_REG(&regs->tsf_timerhigh);
-
-       return;
-}
-
-static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw)
-{
-       d11regs_t *regs;
-       u32 w, val;
-       struct wiphy *wiphy = wlc_hw->wlc->wiphy;
-
-       BCMMSG(wiphy, "wl%d\n", wlc_hw->unit);
-
-       regs = wlc_hw->regs;
-
-       /* Validate dchip register access */
-
-       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-       (void)R_REG(&regs->objaddr);
-       w = R_REG(&regs->objdata);
-
-       /* Can we write and read back a 32bit register? */
-       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-       (void)R_REG(&regs->objaddr);
-       W_REG(&regs->objdata, (u32) 0xaa5555aa);
-
-       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-       (void)R_REG(&regs->objaddr);
-       val = R_REG(&regs->objdata);
-       if (val != (u32) 0xaa5555aa) {
-               wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, "
-                         "expected 0xaa5555aa\n", wlc_hw->unit, val);
-               return false;
-       }
-
-       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-       (void)R_REG(&regs->objaddr);
-       W_REG(&regs->objdata, (u32) 0x55aaaa55);
-
-       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-       (void)R_REG(&regs->objaddr);
-       val = R_REG(&regs->objdata);
-       if (val != (u32) 0x55aaaa55) {
-               wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, "
-                         "expected 0x55aaaa55\n", wlc_hw->unit, val);
-               return false;
-       }
-
-       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
-       (void)R_REG(&regs->objaddr);
-       W_REG(&regs->objdata, w);
-
-       /* clear CFPStart */
-       W_REG(&regs->tsf_cfpstart, 0);
-
-       w = R_REG(&regs->maccontrol);
-       if ((w != (MCTL_IHR_EN | MCTL_WAKE)) &&
-           (w != (MCTL_IHR_EN | MCTL_GMODE | MCTL_WAKE))) {
-               wiphy_err(wiphy, "wl%d: validate_chip_access: maccontrol = "
-                         "0x%x, expected 0x%x or 0x%x\n", wlc_hw->unit, w,
-                         (MCTL_IHR_EN | MCTL_WAKE),
-                         (MCTL_IHR_EN | MCTL_GMODE | MCTL_WAKE));
-               return false;
-       }
-
-       return true;
-}
-
-#define PHYPLL_WAIT_US 100000
-
-void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
-{
-       d11regs_t *regs;
-       u32 tmp;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       tmp = 0;
-       regs = wlc_hw->regs;
-
-       if (on) {
-               if ((wlc_hw->sih->chip == BCM4313_CHIP_ID)) {
-                       OR_REG(&regs->clk_ctl_st,
-                              (CCS_ERSRC_REQ_HT | CCS_ERSRC_REQ_D11PLL |
-                               CCS_ERSRC_REQ_PHYPLL));
-                       SPINWAIT((R_REG(&regs->clk_ctl_st) &
-                                 (CCS_ERSRC_AVAIL_HT)) != (CCS_ERSRC_AVAIL_HT),
-                                PHYPLL_WAIT_US);
-
-                       tmp = R_REG(&regs->clk_ctl_st);
-                       if ((tmp & (CCS_ERSRC_AVAIL_HT)) !=
-                           (CCS_ERSRC_AVAIL_HT)) {
-                               wiphy_err(wlc_hw->wlc->wiphy, "%s: turn on PHY"
-                                         " PLL failed\n", __func__);
-                       }
-               } else {
-                       OR_REG(&regs->clk_ctl_st,
-                              (CCS_ERSRC_REQ_D11PLL | CCS_ERSRC_REQ_PHYPLL));
-                       SPINWAIT((R_REG(&regs->clk_ctl_st) &
-                                 (CCS_ERSRC_AVAIL_D11PLL |
-                                  CCS_ERSRC_AVAIL_PHYPLL)) !=
-                                (CCS_ERSRC_AVAIL_D11PLL |
-                                 CCS_ERSRC_AVAIL_PHYPLL), PHYPLL_WAIT_US);
-
-                       tmp = R_REG(&regs->clk_ctl_st);
-                       if ((tmp &
-                            (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL))
-                           !=
-                           (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL)) {
-                               wiphy_err(wlc_hw->wlc->wiphy, "%s: turn on "
-                                         "PHY PLL failed\n", __func__);
-                       }
-               }
-       } else {
-               /* Since the PLL may be shared, other cores can still be requesting it;
-                * so we'll deassert the request but not wait for status to comply.
-                */
-               AND_REG(&regs->clk_ctl_st, ~CCS_ERSRC_REQ_PHYPLL);
-               tmp = R_REG(&regs->clk_ctl_st);
-       }
-}
-
-void brcms_c_coredisable(struct brcms_hardware *wlc_hw)
-{
-       bool dev_gone;
-
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
-       dev_gone = DEVICEREMOVED(wlc_hw->wlc);
-
-       if (dev_gone)
-               return;
-
-       if (wlc_hw->noreset)
-               return;
-
-       /* radio off */
-       wlc_phy_switch_radio(wlc_hw->band->pi, OFF);
-
-       /* turn off analog core */
-       wlc_phy_anacore(wlc_hw->band->pi, OFF);
-
-       /* turn off PHYPLL to save power */
-       brcms_b_core_phypll_ctl(wlc_hw, false);
-
-       /* No need to set wlc->pub->radio_active = OFF
-        * because this function needs down capability and
-        * radio_active is designed for BCMNODOWN.
-        */
-
-       /* remove gpio controls */
-       if (wlc_hw->ucode_dbgsel)
-               ai_gpiocontrol(wlc_hw->sih, ~0, 0, GPIO_DRV_PRIORITY);
-
-       wlc_hw->clk = false;
-       ai_core_disable(wlc_hw->sih, 0);
-       wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, false);
-}
-
-/* power both the pll and external oscillator on/off */
-static void brcms_b_xtal(struct brcms_hardware *wlc_hw, bool want)
-{
-       BCMMSG(wlc_hw->wlc->wiphy, "wl%d: want %d\n", wlc_hw->unit, want);
-
-       /* dont power down if plldown is false or we must poll hw radio disable */
-       if (!want && wlc_hw->pllreq)
-               return;
-
-       if (wlc_hw->sih)
-               ai_clkctl_xtal(wlc_hw->sih, XTAL | PLL, want);
-
-       wlc_hw->sbclk = want;
-       if (!wlc_hw->sbclk) {
-               wlc_hw->clk = false;
-               if (wlc_hw->band && wlc_hw->band->pi)
-                       wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, false);
-       }
-}
-
-static void brcms_c_flushqueues(struct brcms_c_info *wlc)
-{
-       struct brcms_hardware *wlc_hw = wlc->hw;
-       uint i;
-
-       wlc->txpend16165war = 0;
-
-       /* free any posted tx packets */
-       for (i = 0; i < NFIFO; i++)
-               if (wlc_hw->di[i]) {
-                       dma_txreclaim(wlc_hw->di[i], DMA_RANGE_ALL);
-                       TXPKTPENDCLR(wlc, i);
-                       BCMMSG(wlc->wiphy, "pktpend fifo %d clrd\n", i);
-               }
-
-       /* free any posted rx packets */
-       dma_rxreclaim(wlc_hw->di[RX_FIFO]);
-}
-
-u16 brcms_b_read_shm(struct brcms_hardware *wlc_hw, uint offset)
-{
-       return brcms_b_read_objmem(wlc_hw, offset, OBJADDR_SHM_SEL);
-}
-
-void brcms_b_write_shm(struct brcms_hardware *wlc_hw, uint offset, u16 v)
-{
-       brcms_b_write_objmem(wlc_hw, offset, v, OBJADDR_SHM_SEL);
-}
-
-static u16
-brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset, u32 sel)
-{
-       d11regs_t *regs = wlc_hw->regs;
-       volatile u16 *objdata_lo = (volatile u16 *)&regs->objdata;
-       volatile u16 *objdata_hi = objdata_lo + 1;
-       u16 v;
-
-       W_REG(&regs->objaddr, sel | (offset >> 2));
-       (void)R_REG(&regs->objaddr);
-       if (offset & 2) {
-               v = R_REG(objdata_hi);
-       } else {
-               v = R_REG(objdata_lo);
-       }
-
-       return v;
-}
-
-static void
-brcms_b_write_objmem(struct brcms_hardware *wlc_hw, uint offset, u16 v,
-                    u32 sel)
-{
-       d11regs_t *regs = wlc_hw->regs;
-       volatile u16 *objdata_lo = (volatile u16 *)&regs->objdata;
-       volatile u16 *objdata_hi = objdata_lo + 1;
-
-       W_REG(&regs->objaddr, sel | (offset >> 2));
-       (void)R_REG(&regs->objaddr);
-       if (offset & 2) {
-               W_REG(objdata_hi, v);
-       } else {
-               W_REG(objdata_lo, v);
-       }
-}
-
-/* Copy a buffer to shared memory of specified type .
- * SHM 'offset' needs to be an even address and
- * Buffer length 'len' must be an even number of bytes
- * 'sel' selects the type of memory
- */
-void
-brcms_b_copyto_objmem(struct brcms_hardware *wlc_hw, uint offset,
-                     const void *buf, int len, u32 sel)
-{
-       u16 v;
-       const u8 *p = (const u8 *)buf;
-       int i;
-
-       if (len <= 0 || (offset & 1) || (len & 1))
-               return;
-
-       for (i = 0; i < len; i += 2) {
-               v = p[i] | (p[i + 1] << 8);
-               brcms_b_write_objmem(wlc_hw, offset + i, v, sel);
-       }
-}
-
-/* Copy a piece of shared memory of specified type to a buffer .
- * SHM 'offset' needs to be an even address and
- * Buffer length 'len' must be an even number of bytes
- * 'sel' selects the type of memory
- */
-void
-brcms_b_copyfrom_objmem(struct brcms_hardware *wlc_hw, uint offset, void *buf,
-                        int len, u32 sel)
-{
-       u16 v;
-       u8 *p = (u8 *) buf;
-       int i;
-
-       if (len <= 0 || (offset & 1) || (len & 1))
-               return;
-
-       for (i = 0; i < len; i += 2) {
-               v = brcms_b_read_objmem(wlc_hw, offset + i, sel);
-               p[i] = v & 0xFF;
-               p[i + 1] = (v >> 8) & 0xFF;
-       }
-}
-
-void brcms_b_copyfrom_vars(struct brcms_hardware *wlc_hw, char **buf,
-                          uint *len)
-{
-       BCMMSG(wlc_hw->wlc->wiphy, "nvram vars totlen=%d\n",
-               wlc_hw->vars_size);
-
-       *buf = wlc_hw->vars;
-       *len = wlc_hw->vars_size;
-}
-
-void brcms_b_retrylimit_upd(struct brcms_hardware *wlc_hw, u16 SRL, u16 LRL)
-{
-       wlc_hw->SRL = SRL;
-       wlc_hw->LRL = LRL;
-
-       /* write retry limit to SCR, shouldn't need to suspend */
-       if (wlc_hw->up) {
-               W_REG(&wlc_hw->regs->objaddr,
-                     OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);
-               (void)R_REG(&wlc_hw->regs->objaddr);
-               W_REG(&wlc_hw->regs->objdata, wlc_hw->SRL);
-               W_REG(&wlc_hw->regs->objaddr,
-                     OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);
-               (void)R_REG(&wlc_hw->regs->objaddr);
-               W_REG(&wlc_hw->regs->objdata, wlc_hw->LRL);
-       }
-}
-
-void brcms_b_pllreq(struct brcms_hardware *wlc_hw, bool set, mbool req_bit)
-{
-       if (set) {
-               if (mboolisset(wlc_hw->pllreq, req_bit))
-                       return;
-
-               mboolset(wlc_hw->pllreq, req_bit);
-
-               if (mboolisset(wlc_hw->pllreq, BRCMS_PLLREQ_FLIP)) {
-                       if (!wlc_hw->sbclk) {
-                               brcms_b_xtal(wlc_hw, ON);
-                       }
-               }
-       } else {
-               if (!mboolisset(wlc_hw->pllreq, req_bit))
-                       return;
-
-               mboolclr(wlc_hw->pllreq, req_bit);
-
-               if (mboolisset(wlc_hw->pllreq, BRCMS_PLLREQ_FLIP)) {
-                       if (wlc_hw->sbclk) {
-                               brcms_b_xtal(wlc_hw, OFF);
-                       }
-               }
-       }
-
-       return;
-}
-
-u16 brcms_b_rate_shm_offset(struct brcms_hardware *wlc_hw, u8 rate)
-{
-       u16 table_ptr;
-       u8 phy_rate, index;
-
-       /* get the phy specific rate encoding for the PLCP SIGNAL field */
-       if (IS_OFDM(rate))
-               table_ptr = M_RT_DIRMAP_A;
-       else
-               table_ptr = M_RT_DIRMAP_B;
-
-       /* for a given rate, the LS-nibble of the PLCP SIGNAL field is
-        * the index into the rate table.
-        */
-       phy_rate = rate_info[rate] & BRCMS_RATE_MASK;
-       index = phy_rate & 0xf;
-
-       /* Find the SHM pointer to the rate table entry by looking in the
-        * Direct-map Table
-        */
-       return 2 * brcms_b_read_shm(wlc_hw, table_ptr + (index * 2));
-}
-
-void brcms_b_antsel_set(struct brcms_hardware *wlc_hw, u32 antsel_avail)
-{
-       wlc_hw->antsel_avail = antsel_avail;
-}
diff --git a/drivers/staging/brcm80211/brcmsmac/bmac.h b/drivers/staging/brcm80211/brcmsmac/bmac.h
deleted file mode 100644 (file)
index 3c9ad4f..0000000
+++ /dev/null
@@ -1,174 +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 _BRCM_BOTTOM_MAC_H_
-#define _BRCM_BOTTOM_MAC_H_
-
-#include <brcmu_wifi.h>
-#include "types.h"
-
-/* dup state between BMAC(struct brcms_hardware) and HIGH(struct brcms_c_info)
-   driver */
-struct brcms_b_state {
-       u32 machwcap;   /* mac hw capibility */
-       u32 preamble_ovr;       /* preamble override */
-};
-
-enum {
-       IOV_BMAC_DIAG,
-       IOV_BMAC_SBGPIOTIMERVAL,
-       IOV_BMAC_SBGPIOOUT,
-       IOV_BMAC_CCGPIOCTRL,    /* CC GPIOCTRL REG */
-       IOV_BMAC_CCGPIOOUT,     /* CC GPIOOUT REG */
-       IOV_BMAC_CCGPIOOUTEN,   /* CC GPIOOUTEN REG */
-       IOV_BMAC_CCGPIOIN,      /* CC GPIOIN REG */
-       IOV_BMAC_WPSGPIO,       /* WPS push button GPIO pin */
-       IOV_BMAC_OTPDUMP,
-       IOV_BMAC_OTPSTAT,
-       IOV_BMAC_PCIEASPM,      /* obfuscation clkreq/aspm control */
-       IOV_BMAC_PCIEADVCORRMASK,       /* advanced correctable error mask */
-       IOV_BMAC_PCIECLKREQ,    /* PCIE 1.1 clockreq enab support */
-       IOV_BMAC_PCIELCREG,     /* PCIE LCREG */
-       IOV_BMAC_SBGPIOTIMERMASK,
-       IOV_BMAC_RFDISABLEDLY,
-       IOV_BMAC_PCIEREG,       /* PCIE REG */
-       IOV_BMAC_PCICFGREG,     /* PCI Config register */
-       IOV_BMAC_PCIESERDESREG, /* PCIE SERDES REG (dev, 0}offset) */
-       IOV_BMAC_PCIEGPIOOUT,   /* PCIEOUT REG */
-       IOV_BMAC_PCIEGPIOOUTEN, /* PCIEOUTEN REG */
-       IOV_BMAC_PCIECLKREQENCTRL,      /* clkreqenctrl REG (PCIE REV > 6.0 */
-       IOV_BMAC_DMALPBK,
-       IOV_BMAC_CCREG,
-       IOV_BMAC_COREREG,
-       IOV_BMAC_SDCIS,
-       IOV_BMAC_SDIO_DRIVE,
-       IOV_BMAC_OTPW,
-       IOV_BMAC_NVOTPW,
-       IOV_BMAC_SROM,
-       IOV_BMAC_SRCRC,
-       IOV_BMAC_CIS_SOURCE,
-       IOV_BMAC_CISVAR,
-       IOV_BMAC_OTPLOCK,
-       IOV_BMAC_OTP_CHIPID,
-       IOV_BMAC_CUSTOMVAR1,
-       IOV_BMAC_BOARDFLAGS,
-       IOV_BMAC_BOARDFLAGS2,
-       IOV_BMAC_WPSLED,
-       IOV_BMAC_NVRAM_SOURCE,
-       IOV_BMAC_OTP_RAW_READ,
-       IOV_BMAC_LAST
-};
-
-extern int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
-                          uint unit, bool piomode, void *regsva, uint bustype,
-                          void *btparam);
-extern int brcms_b_detach(struct brcms_c_info *wlc);
-extern void brcms_b_watchdog(void *arg);
-
-/* up/down, reset, clk */
-extern void brcms_b_copyto_objmem(struct brcms_hardware *wlc_hw,
-                                  uint offset, const void *buf, int len,
-                                  u32 sel);
-extern void brcms_b_copyfrom_objmem(struct brcms_hardware *wlc_hw, uint offset,
-                                    void *buf, int len, u32 sel);
-#define brcms_b_copyfrom_shm(wlc_hw, offset, buf, len)                 \
-       brcms_b_copyfrom_objmem(wlc_hw, offset, buf, len, OBJADDR_SHM_SEL)
-#define brcms_b_copyto_shm(wlc_hw, offset, buf, len)                   \
-       brcms_b_copyto_objmem(wlc_hw, offset, buf, len, OBJADDR_SHM_SEL)
-
-extern void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw);
-extern void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on);
-extern void brcms_b_phyclk_fgc(struct brcms_hardware *wlc_hw, bool clk);
-extern void brcms_b_macphyclk_set(struct brcms_hardware *wlc_hw, bool clk);
-extern void brcms_b_phy_reset(struct brcms_hardware *wlc_hw);
-extern void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags);
-extern void brcms_b_reset(struct brcms_hardware *wlc_hw);
-extern void brcms_b_init(struct brcms_hardware *wlc_hw, chanspec_t chanspec,
-                         bool mute);
-extern int brcms_b_up_prep(struct brcms_hardware *wlc_hw);
-extern int brcms_b_up_finish(struct brcms_hardware *wlc_hw);
-extern int brcms_b_bmac_down_prep(struct brcms_hardware *wlc_hw);
-extern int brcms_b_down_finish(struct brcms_hardware *wlc_hw);
-extern void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode);
-
-/* chanspec, ucode interface */
-extern void brcms_b_set_chanspec(struct brcms_hardware *wlc_hw,
-                                 chanspec_t chanspec,
-                                 bool mute, struct txpwr_limits *txpwr);
-
-extern int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,
-                                  uint *blocks);
-extern void brcms_b_mhf(struct brcms_hardware *wlc_hw, u8 idx, u16 mask,
-                        u16 val, int bands);
-extern void brcms_b_mctrl(struct brcms_hardware *wlc_hw, u32 mask, u32 val);
-extern u16 brcms_b_mhf_get(struct brcms_hardware *wlc_hw, u8 idx, int bands);
-extern void brcms_b_txant_set(struct brcms_hardware *wlc_hw, u16 phytxant);
-extern u16 brcms_b_get_txant(struct brcms_hardware *wlc_hw);
-extern void brcms_b_antsel_type_set(struct brcms_hardware *wlc_hw,
-                                    u8 antsel_type);
-extern int brcms_b_state_get(struct brcms_hardware *wlc_hw,
-                             struct brcms_b_state *state);
-extern void brcms_b_write_shm(struct brcms_hardware *wlc_hw, uint offset,
-                             u16 v);
-extern u16 brcms_b_read_shm(struct brcms_hardware *wlc_hw, uint offset);
-extern void brcms_b_write_template_ram(struct brcms_hardware *wlc_hw,
-                                      int offset, int len, void *buf);
-extern void brcms_b_copyfrom_vars(struct brcms_hardware *wlc_hw, char **buf,
-                                  uint *len);
-
-extern void brcms_b_hw_etheraddr(struct brcms_hardware *wlc_hw,
-                                 u8 *ea);
-
-extern bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw);
-extern void brcms_b_set_shortslot(struct brcms_hardware *wlc_hw,
-                                 bool shortslot);
-extern void brcms_b_band_stf_ss_set(struct brcms_hardware *wlc_hw,
-                                   u8 stf_mode);
-
-extern void brcms_b_wait_for_wake(struct brcms_hardware *wlc_hw);
-
-extern void brcms_c_ucode_wake_override_set(struct brcms_hardware *wlc_hw,
-                                       u32 override_bit);
-extern void brcms_c_ucode_wake_override_clear(struct brcms_hardware *wlc_hw,
-                                         u32 override_bit);
-
-extern void brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw,
-                                  int match_reg_offset,
-                                  const u8 *addr);
-extern void brcms_b_write_hw_bcntemplates(struct brcms_hardware *wlc_hw,
-                                          void *bcn, int len, bool both);
-
-extern void brcms_b_read_tsf(struct brcms_hardware *wlc_hw, u32 *tsf_l_ptr,
-                             u32 *tsf_h_ptr);
-extern void brcms_b_set_cwmin(struct brcms_hardware *wlc_hw, u16 newmin);
-extern void brcms_b_set_cwmax(struct brcms_hardware *wlc_hw, u16 newmax);
-
-extern void brcms_b_retrylimit_upd(struct brcms_hardware *wlc_hw, u16 SRL,
-                                   u16 LRL);
-
-extern void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw);
-
-
-/* API for BMAC driver (e.g. wlc_phy.c etc) */
-
-extern void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw);
-extern void brcms_b_pllreq(struct brcms_hardware *wlc_hw, bool set,
-                           mbool req_bit);
-extern void brcms_b_hw_up(struct brcms_hardware *wlc_hw);
-extern u16 brcms_b_rate_shm_offset(struct brcms_hardware *wlc_hw, u8 rate);
-extern void brcms_b_antsel_set(struct brcms_hardware *wlc_hw,
-                              u32 antsel_avail);
-
-#endif /* _BRCM_BOTTOM_MAC_H_ */
index f59693e1d8a238704d6a08a28156c966d2305514..eb61713125b69537f1d1aaec0bfed273e251d8f3 100644 (file)
@@ -20,7 +20,6 @@
 #include <defs.h>
 #include "pub.h"
 #include "phy/phy_hal.h"
-#include "bmac.h"
 #include "main.h"
 #include "stf.h"
 #include "channel.h"
index 1763c4535cd2636a984af93f4b252674500d7914..8399bf308eba37939711f45185906b83fe372b7e 100644 (file)
 
 #include <linux/pci_ids.h>
 #include <net/mac80211.h>
-
 #include <brcm_hw_ids.h>
 #include <aiutils.h>
+#include <chipcommon.h>
 #include "rate.h"
 #include "scb.h"
 #include "phy/phy_hal.h"
 #include "channel.h"
-#include "bmac.h"
 #include "antsel.h"
 #include "stf.h"
 #include "ampdu.h"
 #include "alloc.h"
 #include "mac80211_if.h"
+#include "ucode_loader.h"
 #include "main.h"
 
+
 /*
  * WPA(2) definitions
  */
 #define BRCMS_WAR16165(wlc) (wlc->pub->sih->bustype == PCI_BUS && \
                                (!AP_ENAB(wlc->pub)) && (wlc->war16165))
 
-/* debug/trace */
-uint brcm_msg_level =
-#if defined(BCMDBG)
-       LOG_ERROR_VAL;
-#else
-       0;
-#endif                         /* BCMDBG */
-
 /* Find basic rate for a given rate */
 #define BRCMS_BASIC_RATE(wlc, rspec)   (IS_MCS(rspec) ? \
                        (wlc)->band->basic_rate[mcs_table[rspec & RSPEC_RATE_MASK].leg_ofdm] : \
@@ -196,22 +189,6 @@ uint brcm_msg_level =
 
 #define EPI_VERSION_NUM                0x054b0b00
 
-#ifdef BCMDBG
-/* pointer to most recently allocated wl/wlc */
-static struct brcms_c_info *wlc_info_dbg = (struct brcms_c_info *) (NULL);
-#endif
-
-const u8 prio2fifo[NUMPRIO] = {
-       TX_AC_BE_FIFO,          /* 0    BE      AC_BE   Best Effort */
-       TX_AC_BK_FIFO,          /* 1    BK      AC_BK   Background */
-       TX_AC_BK_FIFO,          /* 2    --      AC_BK   Background */
-       TX_AC_BE_FIFO,          /* 3    EE      AC_BE   Best Effort */
-       TX_AC_VI_FIFO,          /* 4    CL      AC_VI   Video */
-       TX_AC_VI_FIFO,          /* 5    VI      AC_VI   Video */
-       TX_AC_VO_FIFO,          /* 6    VO      AC_VO   Voice */
-       TX_AC_VO_FIFO           /* 7    NC      AC_VO   Voice */
-};
-
 /* precedences numbers for wlc queues. These are twice as may levels as
  * 802.1D priorities.
  * Odd numbers are used for HI priority traffic at same precedence levels
@@ -238,17 +215,35 @@ const u8 prio2fifo[NUMPRIO] = {
 #define MBSS_PRB_ENAB(cfg)       0
 #define SOFTBCN_ENAB(pub)    (0)
 
-/* 802.1D Priority to precedence queue mapping */
-const u8 wlc_prio2prec_map[] = {
-       _BRCMS_PREC_BE,         /* 0 BE - Best-effort */
-       _BRCMS_PREC_BK,         /* 1 BK - Background */
-       _BRCMS_PREC_NONE,               /* 2 None = - */
-       _BRCMS_PREC_EE,         /* 3 EE - Excellent-effort */
-       _BRCMS_PREC_CL,         /* 4 CL - Controlled Load */
-       _BRCMS_PREC_VI,         /* 5 Vi - Video */
-       _BRCMS_PREC_VO,         /* 6 Vo - Voice */
-       _BRCMS_PREC_NC,         /* 7 NC - Network Control */
-};
+#define        TIMER_INTERVAL_WATCHDOG_BMAC    1000    /* watchdog timer, in unit of ms */
+
+#define        SYNTHPU_DLY_APHY_US     3700    /* a phy synthpu_dly time in us */
+#define        SYNTHPU_DLY_BPHY_US     1050    /* b/g phy synthpu_dly time in us, default */
+#define        SYNTHPU_DLY_NPHY_US     2048    /* n phy REV3 synthpu_dly time in us, default */
+#define        SYNTHPU_DLY_LPPHY_US    300     /* lpphy synthpu_dly time in us */
+
+#define        SYNTHPU_DLY_PHY_US_QT   100     /* QT synthpu_dly time in us */
+
+#define        ANTCNT                  10      /* vanilla M_MAX_ANTCNT value */
+
+#define DMAREG(wlc_hw, direction, fifonum) \
+       ((direction == DMA_TX) ? \
+               (void *)&(wlc_hw->regs->fifo64regs[fifonum].dmaxmt) : \
+               (void *)&(wlc_hw->regs->fifo64regs[fifonum].dmarcv))
+
+#define APHY_SLOT_TIME         9
+#define BPHY_SLOT_TIME         20
+
+/*
+ * The following table lists the buffer memory allocated to xmt fifos in HW.
+ * the size is in units of 256bytes(one block), total size is HW dependent
+ * ucode has default fifo partition, sw can overwrite if necessary
+ *
+ * This is documented in twiki under the topic UcodeTxFifo. Please ensure
+ * the twiki is updated before making changes.
+ */
+
+#define XMTFIFOTBL_STARTREV    20      /* Starting corerev for the fifo size table */
 
 /* Check if a particular BSS config is AP or STA */
 #define BSSCFG_AP(cfg)         (0)
@@ -260,36 +255,154 @@ const u8 wlc_prio2prec_map[] = {
        for (idx = 0; (int) idx < BRCMS_MAXBSSCFG; idx++) \
                if ((cfg = (wlc)->bsscfg[idx]))
 
-/* TX FIFO number to WME/802.1E Access Category */
-const u8 wme_fifo2ac[] = { AC_BK, AC_BE, AC_VI, AC_VO, AC_BE, AC_BE };
-
-/* WME/802.1E Access Category to TX FIFO number */
-static const u8 wme_ac2fifo[] = { 1, 0, 2, 3 };
-
-static bool in_send_q;
-
 /* Shared memory location index for various AC params */
 #define wme_shmemacindex(ac)   wme_ac2fifo[ac]
 
-#ifdef BCMDBG
-static const char * const fifo_names[] = {
-       "AC_BK", "AC_BE", "AC_VI", "AC_VO", "BCMC", "ATIM" };
-#else
-static const char fifo_names[6][0];
-#endif
-
-static const u8 acbitmap2maxprio[] = {
-       PRIO_8021D_BE, PRIO_8021D_BE, PRIO_8021D_BK, PRIO_8021D_BK,
-       PRIO_8021D_VI, PRIO_8021D_VI, PRIO_8021D_VI, PRIO_8021D_VI,
-       PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO,
-       PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO
-};
-
 /* currently the best mechanism for determining SIFS is the band in use */
 #define SIFS(band) ((band)->bandtype == BRCM_BAND_5G ? APHY_SIFS_TIME : \
                                                       BPHY_SIFS_TIME);
 
+/* dup state between BMAC(struct brcms_hardware) and HIGH(struct brcms_c_info)
+   driver */
+struct brcms_b_state {
+       u32 machwcap;   /* mac hw capibility */
+       u32 preamble_ovr;       /* preamble override */
+};
+
 /* local prototypes */
+static void brcms_b_clkctl_clk(struct brcms_hardware *wlc, uint mode);
+static void brcms_b_coreinit(struct brcms_c_info *wlc);
+
+/* used by wlc_wakeucode_init() */
+static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,
+                           const struct d11init *inits);
+static void brcms_ucode_write(struct brcms_hardware *wlc_hw, const u32 ucode[],
+                           const uint nbytes);
+static void brcms_ucode_download(struct brcms_hardware *wlc);
+static void brcms_c_ucode_txant_set(struct brcms_hardware *wlc_hw);
+
+/* used by brcms_c_dpc() */
+static bool brcms_b_dotxstatus(struct brcms_hardware *wlc,
+                              struct tx_status *txs, u32 s2);
+static bool brcms_b_txstatus(struct brcms_hardware *wlc, bool bound,
+                            bool *fatal);
+static bool brcms_b_recv(struct brcms_hardware *wlc_hw, uint fifo, bool bound);
+
+/* used by brcms_c_down() */
+static void brcms_c_flushqueues(struct brcms_c_info *wlc);
+
+static void brcms_c_write_mhf(struct brcms_hardware *wlc_hw, u16 *mhfs);
+static void brcms_c_mctrl_reset(struct brcms_hardware *wlc_hw);
+static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw);
+static bool brcms_b_tx_fifo_suspended(struct brcms_hardware *wlc_hw,
+                                      uint tx_fifo);
+static void brcms_b_tx_fifo_suspend(struct brcms_hardware *wlc_hw,
+                                   uint tx_fifo);
+static void brcms_b_tx_fifo_resume(struct brcms_hardware *wlc_hw,
+                                  uint tx_fifo);
+
+/* Low Level Prototypes */
+
+struct brcms_b_state;
+
+extern int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device,
+                          uint unit, bool piomode, void *regsva, uint bustype,
+                          void *btparam);
+extern int brcms_b_detach(struct brcms_c_info *wlc);
+extern void brcms_b_watchdog(void *arg);
+
+/* up/down, reset, clk */
+extern void brcms_b_reset(struct brcms_hardware *wlc_hw);
+extern void brcms_b_init(struct brcms_hardware *wlc_hw, chanspec_t chanspec,
+                         bool mute);
+extern int brcms_b_up_prep(struct brcms_hardware *wlc_hw);
+extern int brcms_b_up_finish(struct brcms_hardware *wlc_hw);
+extern int brcms_b_bmac_down_prep(struct brcms_hardware *wlc_hw);
+extern int brcms_b_down_finish(struct brcms_hardware *wlc_hw);
+
+extern int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,
+                                  uint *blocks);
+extern u16 brcms_b_mhf_get(struct brcms_hardware *wlc_hw, u8 idx, int bands);
+extern int brcms_b_state_get(struct brcms_hardware *wlc_hw,
+                             struct brcms_b_state *state);
+extern void brcms_b_copyfrom_vars(struct brcms_hardware *wlc_hw, char **buf,
+                                  uint *len);
+
+extern void brcms_b_hw_etheraddr(struct brcms_hardware *wlc_hw,
+                                 u8 *ea);
+
+extern bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw);
+extern void brcms_b_set_shortslot(struct brcms_hardware *wlc_hw,
+                                 bool shortslot);
+
+extern void brcms_b_wait_for_wake(struct brcms_hardware *wlc_hw);
+
+extern void brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw,
+                                  int match_reg_offset,
+                                  const u8 *addr);
+extern void brcms_b_write_hw_bcntemplates(struct brcms_hardware *wlc_hw,
+                                          void *bcn, int len, bool both);
+
+extern void brcms_b_read_tsf(struct brcms_hardware *wlc_hw, u32 *tsf_l_ptr,
+                             u32 *tsf_h_ptr);
+extern void brcms_b_set_cwmin(struct brcms_hardware *wlc_hw, u16 newmin);
+extern void brcms_b_set_cwmax(struct brcms_hardware *wlc_hw, u16 newmax);
+
+extern void brcms_b_retrylimit_upd(struct brcms_hardware *wlc_hw, u16 SRL,
+                                   u16 LRL);
+
+extern void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw);
+
+
+/* API for BMAC driver (e.g. wlc_phy.c etc) */
+
+extern void brcms_b_pllreq(struct brcms_hardware *wlc_hw, bool set,
+                           mbool req_bit);
+extern void brcms_b_hw_up(struct brcms_hardware *wlc_hw);
+extern void brcms_b_antsel_set(struct brcms_hardware *wlc_hw,
+                              u32 antsel_avail);
+
+
+
+
+static int brcms_b_bandtype(struct brcms_hardware *wlc_hw);
+static void brcms_b_info_init(struct brcms_hardware *wlc_hw);
+static void brcms_b_xtal(struct brcms_hardware *wlc_hw, bool want);
+static u16 brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset,
+                                  u32 sel);
+static void brcms_b_write_objmem(struct brcms_hardware *wlc_hw, uint offset,
+                                 u16 v, u32 sel);
+static void brcms_b_core_phy_clk(struct brcms_hardware *wlc_hw, bool clk);
+static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme);
+static void brcms_b_detach_dmapio(struct brcms_hardware *wlc_hw);
+static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw);
+static bool brcms_c_validboardtype(struct brcms_hardware *wlc);
+static bool brcms_c_isgoodchip(struct brcms_hardware *wlc_hw);
+static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw);
+static char *brcms_c_get_macaddr(struct brcms_hardware *wlc_hw);
+static void brcms_c_mhfdef(struct brcms_c_info *wlc, u16 *mhfs, u16 mhf2_init);
+static void brcms_c_mctrl_write(struct brcms_hardware *wlc_hw);
+static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool want,
+                        mbool flags);
+static void brcms_c_ucode_mute_override_set(struct brcms_hardware *wlc_hw);
+static void brcms_c_ucode_mute_override_clear(struct brcms_hardware *wlc_hw);
+static u32 brcms_c_wlintrsoff(struct brcms_c_info *wlc);
+static void brcms_c_wlintrsrestore(struct brcms_c_info *wlc, u32 macintmask);
+static void brcms_c_gpio_init(struct brcms_c_info *wlc);
+static void brcms_c_write_hw_bcntemplate0(struct brcms_hardware *wlc_hw,
+                                         void *bcn, int len);
+static void brcms_c_write_hw_bcntemplate1(struct brcms_hardware *wlc_hw,
+                                         void *bcn, int len);
+static void brcms_b_bsinit(struct brcms_c_info *wlc, chanspec_t chanspec);
+static u32 brcms_c_setband_inact(struct brcms_c_info *wlc, uint bandunit);
+static void brcms_b_setband(struct brcms_hardware *wlc_hw, uint bandunit,
+                            chanspec_t chanspec);
+static void brcms_b_update_slot_timing(struct brcms_hardware *wlc_hw,
+                                       bool shortslot);
+static void brcms_upd_ofdm_pctl1_table(struct brcms_hardware *wlc_hw);
+static u16 brcms_b_ofdm_ratetable_offset(struct brcms_hardware *wlc_hw,
+                                            u8 rate);
+
 static u16 brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc,
                                               struct ieee80211_hw *hw,
                                               struct sk_buff *p,
@@ -367,6 +480,3520 @@ static void brcms_c_ofdm_rateset_war(struct brcms_c_info *wlc);
 static int _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
                      struct brcms_c_if *wlcif);
 
+const u8 prio2fifo[NUMPRIO] = {
+       TX_AC_BE_FIFO,          /* 0    BE      AC_BE   Best Effort */
+       TX_AC_BK_FIFO,          /* 1    BK      AC_BK   Background */
+       TX_AC_BK_FIFO,          /* 2    --      AC_BK   Background */
+       TX_AC_BE_FIFO,          /* 3    EE      AC_BE   Best Effort */
+       TX_AC_VI_FIFO,          /* 4    CL      AC_VI   Video */
+       TX_AC_VI_FIFO,          /* 5    VI      AC_VI   Video */
+       TX_AC_VO_FIFO,          /* 6    VO      AC_VO   Voice */
+       TX_AC_VO_FIFO           /* 7    NC      AC_VO   Voice */
+};
+
+/* debug/trace */
+uint brcm_msg_level =
+#if defined(BCMDBG)
+       LOG_ERROR_VAL;
+#else
+       0;
+#endif                         /* BCMDBG */
+
+/* TX FIFO number to WME/802.1E Access Category */
+const u8 wme_fifo2ac[] = { AC_BK, AC_BE, AC_VI, AC_VO, AC_BE, AC_BE };
+
+/* WME/802.1E Access Category to TX FIFO number */
+static const u8 wme_ac2fifo[] = { 1, 0, 2, 3 };
+
+static bool in_send_q;
+
+/* 802.1D Priority to precedence queue mapping */
+const u8 wlc_prio2prec_map[] = {
+       _BRCMS_PREC_BE,         /* 0 BE - Best-effort */
+       _BRCMS_PREC_BK,         /* 1 BK - Background */
+       _BRCMS_PREC_NONE,               /* 2 None = - */
+       _BRCMS_PREC_EE,         /* 3 EE - Excellent-effort */
+       _BRCMS_PREC_CL,         /* 4 CL - Controlled Load */
+       _BRCMS_PREC_VI,         /* 5 Vi - Video */
+       _BRCMS_PREC_VO,         /* 6 Vo - Voice */
+       _BRCMS_PREC_NC,         /* 7 NC - Network Control */
+};
+
+static u16 xmtfifo_sz[][NFIFO] = {
+       {20, 192, 192, 21, 17, 5},      /* corerev 20: 5120, 49152, 49152, 5376, 4352, 1280 */
+       {9, 58, 22, 14, 14, 5}, /* corerev 21: 2304, 14848, 5632, 3584, 3584, 1280 */
+       {20, 192, 192, 21, 17, 5},      /* corerev 22: 5120, 49152, 49152, 5376, 4352, 1280 */
+       {20, 192, 192, 21, 17, 5},      /* corerev 23: 5120, 49152, 49152, 5376, 4352, 1280 */
+       {9, 58, 22, 14, 14, 5}, /* corerev 24: 2304, 14848, 5632, 3584, 3584, 1280 */
+};
+
+static const u8 acbitmap2maxprio[] = {
+       PRIO_8021D_BE, PRIO_8021D_BE, PRIO_8021D_BK, PRIO_8021D_BK,
+       PRIO_8021D_VI, PRIO_8021D_VI, PRIO_8021D_VI, PRIO_8021D_VI,
+       PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO,
+       PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO, PRIO_8021D_VO
+};
+
+#ifdef BCMDBG
+static const char * const fifo_names[] = {
+       "AC_BK", "AC_BE", "AC_VI", "AC_VO", "BCMC", "ATIM" };
+#else
+static const char fifo_names[6][0];
+#endif
+
+#ifdef BCMDBG
+/* pointer to most recently allocated wl/wlc */
+static struct brcms_c_info *wlc_info_dbg = (struct brcms_c_info *) (NULL);
+#endif
+
+/* === Low Level functions === */
+
+void brcms_b_set_shortslot(struct brcms_hardware *wlc_hw, bool shortslot)
+{
+       wlc_hw->shortslot = shortslot;
+
+       if (BAND_2G(brcms_b_bandtype(wlc_hw)) && wlc_hw->up) {
+               brcms_c_suspend_mac_and_wait(wlc_hw->wlc);
+               brcms_b_update_slot_timing(wlc_hw, shortslot);
+               brcms_c_enable_mac(wlc_hw->wlc);
+       }
+}
+
+/*
+ * Update the slot timing for standard 11b/g (20us slots)
+ * or shortslot 11g (9us slots)
+ * The PSM needs to be suspended for this call.
+ */
+static void brcms_b_update_slot_timing(struct brcms_hardware *wlc_hw,
+                                       bool shortslot)
+{
+       d11regs_t *regs;
+
+       regs = wlc_hw->regs;
+
+       if (shortslot) {
+               /* 11g short slot: 11a timing */
+               W_REG(&regs->ifs_slot, 0x0207); /* APHY_SLOT_TIME */
+               brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, APHY_SLOT_TIME);
+       } else {
+               /* 11g long slot: 11b timing */
+               W_REG(&regs->ifs_slot, 0x0212); /* BPHY_SLOT_TIME */
+               brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, BPHY_SLOT_TIME);
+       }
+}
+
+static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)
+{
+       struct wiphy *wiphy = wlc_hw->wlc->wiphy;
+
+       /* init microcode host flags */
+       brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs);
+
+       /* do band-specific ucode IHR, SHM, and SCR inits */
+       if (D11REV_IS(wlc_hw->corerev, 23)) {
+               if (BRCMS_ISNPHY(wlc_hw->band)) {
+                       brcms_c_write_inits(wlc_hw, d11n0bsinitvals16);
+               } else {
+                       wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
+                                 " %d\n", __func__, wlc_hw->unit,
+                                 wlc_hw->corerev);
+               }
+       } else {
+               if (D11REV_IS(wlc_hw->corerev, 24)) {
+                       if (BRCMS_ISLCNPHY(wlc_hw->band)) {
+                               brcms_c_write_inits(wlc_hw,
+                                                   d11lcn0bsinitvals24);
+                       } else
+                               wiphy_err(wiphy, "%s: wl%d: unsupported phy in"
+                                         " core rev %d\n", __func__,
+                                         wlc_hw->unit, wlc_hw->corerev);
+               } else {
+                       wiphy_err(wiphy, "%s: wl%d: unsupported corerev %d\n",
+                               __func__, wlc_hw->unit, wlc_hw->corerev);
+               }
+       }
+}
+
+/* switch to new band but leave it inactive */
+static u32 brcms_c_setband_inact(struct brcms_c_info *wlc, uint bandunit)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       u32 macintmask;
+
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       WARN_ON((R_REG(&wlc_hw->regs->maccontrol) & MCTL_EN_MAC) != 0);
+
+       /* disable interrupts */
+       macintmask = brcms_intrsoff(wlc->wl);
+
+       /* radio off */
+       wlc_phy_switch_radio(wlc_hw->band->pi, OFF);
+
+       brcms_b_core_phy_clk(wlc_hw, OFF);
+
+       brcms_c_setxband(wlc_hw, bandunit);
+
+       return macintmask;
+}
+
+/* Process received frames */
+/*
+ * Return true if more frames need to be processed. false otherwise.
+ * Param 'bound' indicates max. # frames to process before break out.
+ */
+static bool
+brcms_b_recv(struct brcms_hardware *wlc_hw, uint fifo, bool bound)
+{
+       struct sk_buff *p;
+       struct sk_buff *head = NULL;
+       struct sk_buff *tail = NULL;
+       uint n = 0;
+       uint bound_limit = bound ? wlc_hw->wlc->pub->tunables->rxbnd : -1;
+       struct brcms_d11rxhdr *wlc_rxhdr = NULL;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+       /* gather received frames */
+       while ((p = dma_rx(wlc_hw->di[fifo]))) {
+
+               if (!tail)
+                       head = tail = p;
+               else {
+                       tail->prev = p;
+                       tail = p;
+               }
+
+               /* !give others some time to run! */
+               if (++n >= bound_limit)
+                       break;
+       }
+
+       /* post more rbufs */
+       dma_rxfill(wlc_hw->di[fifo]);
+
+       /* process each frame */
+       while ((p = head) != NULL) {
+               head = head->prev;
+               p->prev = NULL;
+
+               wlc_rxhdr = (struct brcms_d11rxhdr *) p->data;
+
+               /* compute the RSSI from d11rxhdr and record it in wlc_rxd11hr */
+               wlc_phy_rssi_compute(wlc_hw->band->pi, wlc_rxhdr);
+
+               brcms_c_recv(wlc_hw->wlc, p);
+       }
+
+       return n >= bound_limit;
+}
+
+/* second-level interrupt processing
+ *   Return true if another dpc needs to be re-scheduled. false otherwise.
+ *   Param 'bounded' indicates if applicable loops should be bounded.
+ */
+bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
+{
+       u32 macintstatus;
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       d11regs_t *regs = wlc_hw->regs;
+       bool fatal = false;
+       struct wiphy *wiphy = wlc->wiphy;
+
+       if (DEVICEREMOVED(wlc)) {
+               wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
+                         __func__);
+               brcms_down(wlc->wl);
+               return false;
+       }
+
+       /* grab and clear the saved software intstatus bits */
+       macintstatus = wlc->macintstatus;
+       wlc->macintstatus = 0;
+
+       BCMMSG(wlc->wiphy, "wl%d: macintstatus 0x%x\n",
+              wlc_hw->unit, macintstatus);
+
+       WARN_ON(macintstatus & MI_PRQ); /* PRQ Interrupt in non-MBSS */
+
+       /* BCN template is available */
+       /* ZZZ: Use AP_ACTIVE ? */
+       if (AP_ENAB(wlc->pub) && (!APSTA_ENAB(wlc->pub))
+           && (macintstatus & MI_BCNTPL)) {
+               brcms_c_update_beacon(wlc);
+       }
+
+       /* tx status */
+       if (macintstatus & MI_TFS) {
+               if (brcms_b_txstatus(wlc->hw, bounded, &fatal))
+                       wlc->macintstatus |= MI_TFS;
+               if (fatal) {
+                       wiphy_err(wiphy, "MI_TFS: fatal\n");
+                       goto fatal;
+               }
+       }
+
+       if (macintstatus & (MI_TBTT | MI_DTIM_TBTT))
+               brcms_c_tbtt(wlc);
+
+       /* ATIM window end */
+       if (macintstatus & MI_ATIMWINEND) {
+               BCMMSG(wlc->wiphy, "end of ATIM window\n");
+               OR_REG(&regs->maccommand, wlc->qvalid);
+               wlc->qvalid = 0;
+       }
+
+       /* received data or control frame, MI_DMAINT is indication of RX_FIFO interrupt */
+       if (macintstatus & MI_DMAINT)
+               if (brcms_b_recv(wlc_hw, RX_FIFO, bounded))
+                       wlc->macintstatus |= MI_DMAINT;
+
+       /* TX FIFO suspend/flush completion */
+       if (macintstatus & MI_TXSTOP)
+               brcms_b_tx_fifo_suspended(wlc_hw, TX_DATA_FIFO);
+
+       /* noise sample collected */
+       if (macintstatus & MI_BG_NOISE) {
+               wlc_phy_noise_sample_intr(wlc_hw->band->pi);
+       }
+
+       if (macintstatus & MI_GP0) {
+               wiphy_err(wiphy, "wl%d: PSM microcode watchdog fired at %d "
+                       "(seconds). Resetting.\n", wlc_hw->unit, wlc_hw->now);
+
+               printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",
+                                       __func__, wlc_hw->sih->chip,
+                                       wlc_hw->sih->chiprev);
+               /* big hammer */
+               brcms_init(wlc->wl);
+       }
+
+       /* gptimer timeout */
+       if (macintstatus & MI_TO) {
+               W_REG(&regs->gptimer, 0);
+       }
+
+       if (macintstatus & MI_RFDISABLE) {
+               BCMMSG(wlc->wiphy, "wl%d: BMAC Detected a change on the"
+                      " RF Disable Input\n", wlc_hw->unit);
+               brcms_rfkill_set_hw_state(wlc->wl);
+       }
+
+       /* send any enq'd tx packets. Just makes sure to jump start tx */
+       if (!pktq_empty(&wlc->pkt_queue->q))
+               brcms_c_send_q(wlc);
+
+       /* it isn't done and needs to be resched if macintstatus is non-zero */
+       return wlc->macintstatus != 0;
+
+ fatal:
+       brcms_init(wlc->wl);
+       return wlc->macintstatus != 0;
+}
+
+/* common low-level watchdog code */
+void brcms_b_watchdog(void *arg)
+{
+       struct brcms_c_info *wlc = (struct brcms_c_info *) arg;
+       struct brcms_hardware *wlc_hw = wlc->hw;
+
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       if (!wlc_hw->up)
+               return;
+
+       /* increment second count */
+       wlc_hw->now++;
+
+       /* Check for FIFO error interrupts */
+       brcms_b_fifoerrors(wlc_hw);
+
+       /* make sure RX dma has buffers */
+       dma_rxfill(wlc->hw->di[RX_FIFO]);
+
+       wlc_phy_watchdog(wlc_hw->band->pi);
+}
+
+void
+brcms_b_set_chanspec(struct brcms_hardware *wlc_hw, chanspec_t chanspec,
+                     bool mute, struct txpwr_limits *txpwr)
+{
+       uint bandunit;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d: 0x%x\n", wlc_hw->unit, chanspec);
+
+       wlc_hw->chanspec = chanspec;
+
+       /* Switch bands if necessary */
+       if (NBANDS_HW(wlc_hw) > 1) {
+               bandunit = CHSPEC_BANDUNIT(chanspec);
+               if (wlc_hw->band->bandunit != bandunit) {
+                       /* brcms_b_setband disables other bandunit,
+                        *  use light band switch if not up yet
+                        */
+                       if (wlc_hw->up) {
+                               wlc_phy_chanspec_radio_set(wlc_hw->
+                                                          bandstate[bandunit]->
+                                                          pi, chanspec);
+                               brcms_b_setband(wlc_hw, bandunit, chanspec);
+                       } else {
+                               brcms_c_setxband(wlc_hw, bandunit);
+                       }
+               }
+       }
+
+       wlc_phy_initcal_enable(wlc_hw->band->pi, !mute);
+
+       if (!wlc_hw->up) {
+               if (wlc_hw->clk)
+                       wlc_phy_txpower_limit_set(wlc_hw->band->pi, txpwr,
+                                                 chanspec);
+               wlc_phy_chanspec_radio_set(wlc_hw->band->pi, chanspec);
+       } else {
+               wlc_phy_chanspec_set(wlc_hw->band->pi, chanspec);
+               wlc_phy_txpower_limit_set(wlc_hw->band->pi, txpwr, chanspec);
+
+               /* Update muting of the channel */
+               brcms_b_mute(wlc_hw, mute, 0);
+       }
+}
+
+int brcms_b_state_get(struct brcms_hardware *wlc_hw,
+                     struct brcms_b_state *state)
+{
+       state->machwcap = wlc_hw->machwcap;
+
+       return 0;
+}
+
+static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
+{
+       uint i;
+       char name[8];
+       /* ucode host flag 2 needed for pio mode, independent of band and fifo */
+       u16 pio_mhf2 = 0;
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       uint unit = wlc_hw->unit;
+       struct brcms_tunables *tune = wlc->pub->tunables;
+       struct wiphy *wiphy = wlc->wiphy;
+
+       /* name and offsets for dma_attach */
+       snprintf(name, sizeof(name), "wl%d", unit);
+
+       if (wlc_hw->di[0] == 0) {       /* Init FIFOs */
+               uint addrwidth;
+               int dma_attach_err = 0;
+               /* Find out the DMA addressing capability and let OS know
+                * All the channels within one DMA core have 'common-minimum' same
+                * capability
+                */
+               addrwidth =
+                   dma_addrwidth(wlc_hw->sih, DMAREG(wlc_hw, DMA_TX, 0));
+
+               if (!wl_alloc_dma_resources(wlc_hw->wlc->wl, addrwidth)) {
+                       wiphy_err(wiphy, "wl%d: wlc_attach: alloc_dma_"
+                                 "resources failed\n", unit);
+                       return false;
+               }
+
+               /*
+                * FIFO 0
+                * TX: TX_AC_BK_FIFO (TX AC Background data packets)
+                * RX: RX_FIFO (RX data packets)
+                */
+               wlc_hw->di[0] = dma_attach(name, wlc_hw->sih,
+                                          (wme ? DMAREG(wlc_hw, DMA_TX, 0) :
+                                           NULL), DMAREG(wlc_hw, DMA_RX, 0),
+                                          (wme ? tune->ntxd : 0), tune->nrxd,
+                                          tune->rxbufsz, -1, tune->nrxbufpost,
+                                          BRCMS_HWRXOFF, &brcm_msg_level);
+               dma_attach_err |= (NULL == wlc_hw->di[0]);
+
+               /*
+                * FIFO 1
+                * TX: TX_AC_BE_FIFO (TX AC Best-Effort data packets)
+                *   (legacy) TX_DATA_FIFO (TX data packets)
+                * RX: UNUSED
+                */
+               wlc_hw->di[1] = dma_attach(name, wlc_hw->sih,
+                                          DMAREG(wlc_hw, DMA_TX, 1), NULL,
+                                          tune->ntxd, 0, 0, -1, 0, 0,
+                                          &brcm_msg_level);
+               dma_attach_err |= (NULL == wlc_hw->di[1]);
+
+               /*
+                * FIFO 2
+                * TX: TX_AC_VI_FIFO (TX AC Video data packets)
+                * RX: UNUSED
+                */
+               wlc_hw->di[2] = dma_attach(name, wlc_hw->sih,
+                                          DMAREG(wlc_hw, DMA_TX, 2), NULL,
+                                          tune->ntxd, 0, 0, -1, 0, 0,
+                                          &brcm_msg_level);
+               dma_attach_err |= (NULL == wlc_hw->di[2]);
+               /*
+                * FIFO 3
+                * TX: TX_AC_VO_FIFO (TX AC Voice data packets)
+                *   (legacy) TX_CTL_FIFO (TX control & mgmt packets)
+                */
+               wlc_hw->di[3] = dma_attach(name, wlc_hw->sih,
+                                          DMAREG(wlc_hw, DMA_TX, 3),
+                                          NULL, tune->ntxd, 0, 0, -1,
+                                          0, 0, &brcm_msg_level);
+               dma_attach_err |= (NULL == wlc_hw->di[3]);
+/* Cleaner to leave this as if with AP defined */
+
+               if (dma_attach_err) {
+                       wiphy_err(wiphy, "wl%d: wlc_attach: dma_attach failed"
+                                 "\n", unit);
+                       return false;
+               }
+
+               /* get pointer to dma engine tx flow control variable */
+               for (i = 0; i < NFIFO; i++)
+                       if (wlc_hw->di[i])
+                               wlc_hw->txavail[i] =
+                                   (uint *) dma_getvar(wlc_hw->di[i],
+                                                       "&txavail");
+       }
+
+       /* initial ucode host flags */
+       brcms_c_mhfdef(wlc, wlc_hw->band->mhfs, pio_mhf2);
+
+       return true;
+}
+
+static void brcms_b_detach_dmapio(struct brcms_hardware *wlc_hw)
+{
+       uint j;
+
+       for (j = 0; j < NFIFO; j++) {
+               if (wlc_hw->di[j]) {
+                       dma_detach(wlc_hw->di[j]);
+                       wlc_hw->di[j] = NULL;
+               }
+       }
+}
+
+/* low level attach
+ *    run backplane attach, init nvram
+ *    run phy attach
+ *    initialize software state for each core and band
+ *    put the whole chip in reset(driver down state), no clock
+ */
+int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device, uint unit,
+                   bool piomode, void *regsva, uint bustype, void *btparam)
+{
+       struct brcms_hardware *wlc_hw;
+       d11regs_t *regs;
+       char *macaddr = NULL;
+       char *vars;
+       uint err = 0;
+       uint j;
+       bool wme = false;
+       struct shared_phy_params sha_params;
+       struct wiphy *wiphy = wlc->wiphy;
+
+       BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit, vendor,
+               device);
+
+       wme = true;
+
+       wlc_hw = wlc->hw;
+       wlc_hw->wlc = wlc;
+       wlc_hw->unit = unit;
+       wlc_hw->band = wlc_hw->bandstate[0];
+       wlc_hw->_piomode = piomode;
+
+       /* populate struct brcms_hardware with default values  */
+       brcms_b_info_init(wlc_hw);
+
+       /*
+        * Do the hardware portion of the attach.
+        * Also initialize software state that depends on the particular hardware
+        * we are running.
+        */
+       wlc_hw->sih = ai_attach(regsva, bustype, btparam,
+                               &wlc_hw->vars, &wlc_hw->vars_size);
+       if (wlc_hw->sih == NULL) {
+               wiphy_err(wiphy, "wl%d: brcms_b_attach: si_attach failed\n",
+                         unit);
+               err = 11;
+               goto fail;
+       }
+       vars = wlc_hw->vars;
+
+       /*
+        * Get vendid/devid nvram overwrites, which could be different
+        * than those the BIOS recognizes for devices on PCMCIA_BUS,
+        * SDIO_BUS, and SROMless devices on PCI_BUS.
+        */
+#ifdef BCMBUSTYPE
+       bustype = BCMBUSTYPE;
+#endif
+       if (bustype != SI_BUS) {
+               char *var;
+
+               var = getvar(vars, "vendid");
+               if (var) {
+                       vendor = (u16) simple_strtoul(var, NULL, 0);
+                       wiphy_err(wiphy, "Overriding vendor id = 0x%x\n",
+                                 vendor);
+               }
+               var = getvar(vars, "devid");
+               if (var) {
+                       u16 devid = (u16) simple_strtoul(var, NULL, 0);
+                       if (devid != 0xffff) {
+                               device = devid;
+                               wiphy_err(wiphy, "Overriding device id = 0x%x"
+                                         "\n", device);
+                       }
+               }
+
+               /* verify again the device is supported */
+               if (!brcms_c_chipmatch(vendor, device)) {
+                       wiphy_err(wiphy, "wl%d: brcms_b_attach: Unsupported "
+                               "vendor/device (0x%x/0x%x)\n",
+                                unit, vendor, device);
+                       err = 12;
+                       goto fail;
+               }
+       }
+
+       wlc_hw->vendorid = vendor;
+       wlc_hw->deviceid = device;
+
+       /* set bar0 window to point at D11 core */
+       wlc_hw->regs = (d11regs_t *) ai_setcore(wlc_hw->sih, D11_CORE_ID, 0);
+       wlc_hw->corerev = ai_corerev(wlc_hw->sih);
+
+       regs = wlc_hw->regs;
+
+       wlc->regs = wlc_hw->regs;
+
+       /* validate chip, chiprev and corerev */
+       if (!brcms_c_isgoodchip(wlc_hw)) {
+               err = 13;
+               goto fail;
+       }
+
+       /* initialize power control registers */
+       ai_clkctl_init(wlc_hw->sih);
+
+       /* request fastclock and force fastclock for the rest of attach
+        * bring the d11 core out of reset.
+        *   For PMU chips, the first wlc_clkctl_clk is no-op since core-clk is still false;
+        *   But it will be called again inside wlc_corereset, after d11 is out of reset.
+        */
+       brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
+       brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
+
+       if (!brcms_b_validate_chip_access(wlc_hw)) {
+               wiphy_err(wiphy, "wl%d: brcms_b_attach: validate_chip_access "
+                       "failed\n", unit);
+               err = 14;
+               goto fail;
+       }
+
+       /* get the board rev, used just below */
+       j = getintvar(vars, "boardrev");
+       /* promote srom boardrev of 0xFF to 1 */
+       if (j == BOARDREV_PROMOTABLE)
+               j = BOARDREV_PROMOTED;
+       wlc_hw->boardrev = (u16) j;
+       if (!brcms_c_validboardtype(wlc_hw)) {
+               wiphy_err(wiphy, "wl%d: brcms_b_attach: Unsupported Broadcom "
+                       "board type (0x%x)" " or revision level (0x%x)\n",
+                        unit, wlc_hw->sih->boardtype, wlc_hw->boardrev);
+               err = 15;
+               goto fail;
+       }
+       wlc_hw->sromrev = (u8) getintvar(vars, "sromrev");
+       wlc_hw->boardflags = (u32) getintvar(vars, "boardflags");
+       wlc_hw->boardflags2 = (u32) getintvar(vars, "boardflags2");
+
+       if (wlc_hw->boardflags & BFL_NOPLLDOWN)
+               brcms_b_pllreq(wlc_hw, true, BRCMS_PLLREQ_SHARED);
+
+       if ((wlc_hw->sih->bustype == PCI_BUS)
+           && (ai_pci_war16165(wlc_hw->sih)))
+               wlc->war16165 = true;
+
+       /* check device id(srom, nvram etc.) to set bands */
+       if (wlc_hw->deviceid == BCM43224_D11N_ID ||
+           wlc_hw->deviceid == BCM43224_D11N_ID_VEN1) {
+               /* Dualband boards */
+               wlc_hw->_nbands = 2;
+       } else
+               wlc_hw->_nbands = 1;
+
+       if ((wlc_hw->sih->chip == BCM43225_CHIP_ID))
+               wlc_hw->_nbands = 1;
+
+       /* BMAC_NOTE: remove init of pub values when brcms_c_attach()
+        * unconditionally does the init of these values
+        */
+       wlc->vendorid = wlc_hw->vendorid;
+       wlc->deviceid = wlc_hw->deviceid;
+       wlc->pub->sih = wlc_hw->sih;
+       wlc->pub->corerev = wlc_hw->corerev;
+       wlc->pub->sromrev = wlc_hw->sromrev;
+       wlc->pub->boardrev = wlc_hw->boardrev;
+       wlc->pub->boardflags = wlc_hw->boardflags;
+       wlc->pub->boardflags2 = wlc_hw->boardflags2;
+       wlc->pub->_nbands = wlc_hw->_nbands;
+
+       wlc_hw->physhim = wlc_phy_shim_attach(wlc_hw, wlc->wl, wlc);
+
+       if (wlc_hw->physhim == NULL) {
+               wiphy_err(wiphy, "wl%d: brcms_b_attach: wlc_phy_shim_attach "
+                       "failed\n", unit);
+               err = 25;
+               goto fail;
+       }
+
+       /* pass all the parameters to wlc_phy_shared_attach in one struct */
+       sha_params.sih = wlc_hw->sih;
+       sha_params.physhim = wlc_hw->physhim;
+       sha_params.unit = unit;
+       sha_params.corerev = wlc_hw->corerev;
+       sha_params.vars = vars;
+       sha_params.vid = wlc_hw->vendorid;
+       sha_params.did = wlc_hw->deviceid;
+       sha_params.chip = wlc_hw->sih->chip;
+       sha_params.chiprev = wlc_hw->sih->chiprev;
+       sha_params.chippkg = wlc_hw->sih->chippkg;
+       sha_params.sromrev = wlc_hw->sromrev;
+       sha_params.boardtype = wlc_hw->sih->boardtype;
+       sha_params.boardrev = wlc_hw->boardrev;
+       sha_params.boardvendor = wlc_hw->sih->boardvendor;
+       sha_params.boardflags = wlc_hw->boardflags;
+       sha_params.boardflags2 = wlc_hw->boardflags2;
+       sha_params.bustype = wlc_hw->sih->bustype;
+       sha_params.buscorerev = wlc_hw->sih->buscorerev;
+
+       /* alloc and save pointer to shared phy state area */
+       wlc_hw->phy_sh = wlc_phy_shared_attach(&sha_params);
+       if (!wlc_hw->phy_sh) {
+               err = 16;
+               goto fail;
+       }
+
+       /* initialize software state for each core and band */
+       for (j = 0; j < NBANDS_HW(wlc_hw); j++) {
+               /*
+                * band0 is always 2.4Ghz
+                * band1, if present, is 5Ghz
+                */
+
+               /* So if this is a single band 11a card, use band 1 */
+               if (IS_SINGLEBAND_5G(wlc_hw->deviceid))
+                       j = BAND_5G_INDEX;
+
+               brcms_c_setxband(wlc_hw, j);
+
+               wlc_hw->band->bandunit = j;
+               wlc_hw->band->bandtype = j ? BRCM_BAND_5G : BRCM_BAND_2G;
+               wlc->band->bandunit = j;
+               wlc->band->bandtype = j ? BRCM_BAND_5G : BRCM_BAND_2G;
+               wlc->core->coreidx = ai_coreidx(wlc_hw->sih);
+
+               wlc_hw->machwcap = R_REG(&regs->machwcap);
+               wlc_hw->machwcap_backup = wlc_hw->machwcap;
+
+               /* init tx fifo size */
+               wlc_hw->xmtfifo_sz =
+                   xmtfifo_sz[(wlc_hw->corerev - XMTFIFOTBL_STARTREV)];
+
+               /* Get a phy for this band */
+               wlc_hw->band->pi = wlc_phy_attach(wlc_hw->phy_sh,
+                       (void *)regs, brcms_b_bandtype(wlc_hw), vars,
+                       wlc->wiphy);
+               if (wlc_hw->band->pi == NULL) {
+                       wiphy_err(wiphy, "wl%d: brcms_b_attach: wlc_phy_"
+                                 "attach failed\n", unit);
+                       err = 17;
+                       goto fail;
+               }
+
+               wlc_phy_machwcap_set(wlc_hw->band->pi, wlc_hw->machwcap);
+
+               wlc_phy_get_phyversion(wlc_hw->band->pi, &wlc_hw->band->phytype,
+                                      &wlc_hw->band->phyrev,
+                                      &wlc_hw->band->radioid,
+                                      &wlc_hw->band->radiorev);
+               wlc_hw->band->abgphy_encore =
+                   wlc_phy_get_encore(wlc_hw->band->pi);
+               wlc->band->abgphy_encore = wlc_phy_get_encore(wlc_hw->band->pi);
+               wlc_hw->band->core_flags =
+                   wlc_phy_get_coreflags(wlc_hw->band->pi);
+
+               /* verify good phy_type & supported phy revision */
+               if (BRCMS_ISNPHY(wlc_hw->band)) {
+                       if (NCONF_HAS(wlc_hw->band->phyrev))
+                               goto good_phy;
+                       else
+                               goto bad_phy;
+               } else if (BRCMS_ISLCNPHY(wlc_hw->band)) {
+                       if (LCNCONF_HAS(wlc_hw->band->phyrev))
+                               goto good_phy;
+                       else
+                               goto bad_phy;
+               } else {
+ bad_phy:
+                       wiphy_err(wiphy, "wl%d: brcms_b_attach: unsupported "
+                                 "phy type/rev (%d/%d)\n", unit,
+                                 wlc_hw->band->phytype, wlc_hw->band->phyrev);
+                       err = 18;
+                       goto fail;
+               }
+
+ good_phy:
+               /* BMAC_NOTE: wlc->band->pi should not be set below and should be done in the
+                * high level attach. However we can not make that change until all low level access
+                * is changed to wlc_hw->band->pi. Instead do the wlc->band->pi init below, keeping
+                * wlc_hw->band->pi as well for incremental update of low level fns, and cut over
+                * low only init when all fns updated.
+                */
+               wlc->band->pi = wlc_hw->band->pi;
+               wlc->band->phytype = wlc_hw->band->phytype;
+               wlc->band->phyrev = wlc_hw->band->phyrev;
+               wlc->band->radioid = wlc_hw->band->radioid;
+               wlc->band->radiorev = wlc_hw->band->radiorev;
+
+               /* default contention windows size limits */
+               wlc_hw->band->CWmin = APHY_CWMIN;
+               wlc_hw->band->CWmax = PHY_CWMAX;
+
+               if (!brcms_b_attach_dmapio(wlc, j, wme)) {
+                       err = 19;
+                       goto fail;
+               }
+       }
+
+       /* disable core to match driver "down" state */
+       brcms_c_coredisable(wlc_hw);
+
+       /* Match driver "down" state */
+       if (wlc_hw->sih->bustype == PCI_BUS)
+               ai_pci_down(wlc_hw->sih);
+
+       /* register sb interrupt callback functions */
+       ai_register_intr_callback(wlc_hw->sih, (void *)brcms_c_wlintrsoff,
+                                 (void *)brcms_c_wlintrsrestore, NULL, wlc);
+
+       /* turn off pll and xtal to match driver "down" state */
+       brcms_b_xtal(wlc_hw, OFF);
+
+       /* *********************************************************************
+        * The hardware is in the DOWN state at this point. D11 core
+        * or cores are in reset with clocks off, and the board PLLs
+        * are off if possible.
+        *
+        * Beyond this point, wlc->sbclk == false and chip registers
+        * should not be touched.
+        *********************************************************************
+        */
+
+       /* init etheraddr state variables */
+       macaddr = brcms_c_get_macaddr(wlc_hw);
+       if (macaddr == NULL) {
+               wiphy_err(wiphy, "wl%d: brcms_b_attach: macaddr not found\n",
+                         unit);
+               err = 21;
+               goto fail;
+       }
+       brcmu_ether_atoe(macaddr, wlc_hw->etheraddr);
+       if (is_broadcast_ether_addr(wlc_hw->etheraddr) ||
+           is_zero_ether_addr(wlc_hw->etheraddr)) {
+               wiphy_err(wiphy, "wl%d: brcms_b_attach: bad macaddr %s\n",
+                         unit, macaddr);
+               err = 22;
+               goto fail;
+       }
+
+       BCMMSG(wlc->wiphy,
+                "deviceid 0x%x nbands %d board 0x%x macaddr: %s\n",
+                wlc_hw->deviceid, wlc_hw->_nbands,
+                wlc_hw->sih->boardtype, macaddr);
+
+       return err;
+
+ fail:
+       wiphy_err(wiphy, "wl%d: brcms_b_attach: failed with err %d\n", unit,
+                 err);
+       return err;
+}
+
+/*
+ * Initialize brcms_c_info default values ...
+ * may get overrides later in this function
+ *  BMAC_NOTES, move low out and resolve the dangling ones
+ */
+static void brcms_b_info_init(struct brcms_hardware *wlc_hw)
+{
+       struct brcms_c_info *wlc = wlc_hw->wlc;
+
+       /* set default sw macintmask value */
+       wlc->defmacintmask = DEF_MACINTMASK;
+
+       /* various 802.11g modes */
+       wlc_hw->shortslot = false;
+
+       wlc_hw->SFBL = RETRY_SHORT_FB;
+       wlc_hw->LFBL = RETRY_LONG_FB;
+
+       /* default mac retry limits */
+       wlc_hw->SRL = RETRY_SHORT_DEF;
+       wlc_hw->LRL = RETRY_LONG_DEF;
+       wlc_hw->chanspec = CH20MHZ_CHSPEC(1);
+}
+
+/*
+ * low level detach
+ */
+int brcms_b_detach(struct brcms_c_info *wlc)
+{
+       uint i;
+       struct brcms_hw_band *band;
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       int callbacks;
+
+       callbacks = 0;
+
+       if (wlc_hw->sih) {
+               /* detach interrupt sync mechanism since interrupt is disabled and per-port
+                * interrupt object may has been freed. this must be done before sb core switch
+                */
+               ai_deregister_intr_callback(wlc_hw->sih);
+
+               if (wlc_hw->sih->bustype == PCI_BUS)
+                       ai_pci_sleep(wlc_hw->sih);
+       }
+
+       brcms_b_detach_dmapio(wlc_hw);
+
+       band = wlc_hw->band;
+       for (i = 0; i < NBANDS_HW(wlc_hw); i++) {
+               if (band->pi) {
+                       /* Detach this band's phy */
+                       wlc_phy_detach(band->pi);
+                       band->pi = NULL;
+               }
+               band = wlc_hw->bandstate[OTHERBANDUNIT(wlc)];
+       }
+
+       /* Free shared phy state */
+       kfree(wlc_hw->phy_sh);
+
+       wlc_phy_shim_detach(wlc_hw->physhim);
+
+       /* free vars */
+       kfree(wlc_hw->vars);
+       wlc_hw->vars = NULL;
+
+       if (wlc_hw->sih) {
+               ai_detach(wlc_hw->sih);
+               wlc_hw->sih = NULL;
+       }
+
+       return callbacks;
+
+}
+
+void brcms_b_reset(struct brcms_hardware *wlc_hw)
+{
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       /* reset the core */
+       if (!DEVICEREMOVED(wlc_hw->wlc))
+               brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
+
+       /* purge the dma rings */
+       brcms_c_flushqueues(wlc_hw->wlc);
+
+       brcms_c_reset_bmac_done(wlc_hw->wlc);
+}
+
+void
+brcms_b_init(struct brcms_hardware *wlc_hw, chanspec_t chanspec,
+                         bool mute) {
+       u32 macintmask;
+       bool fastclk;
+       struct brcms_c_info *wlc = wlc_hw->wlc;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       /* request FAST clock if not on */
+       fastclk = wlc_hw->forcefastclk;
+       if (!fastclk)
+               brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
+
+       /* disable interrupts */
+       macintmask = brcms_intrsoff(wlc->wl);
+
+       /* set up the specified band and chanspec */
+       brcms_c_setxband(wlc_hw, CHSPEC_BANDUNIT(chanspec));
+       wlc_phy_chanspec_radio_set(wlc_hw->band->pi, chanspec);
+
+       /* do one-time phy inits and calibration */
+       wlc_phy_cal_init(wlc_hw->band->pi);
+
+       /* core-specific initialization */
+       brcms_b_coreinit(wlc);
+
+       /* suspend the tx fifos and mute the phy for preism cac time */
+       if (mute)
+               brcms_b_mute(wlc_hw, ON, PHY_MUTE_FOR_PREISM);
+
+       /* band-specific inits */
+       brcms_b_bsinit(wlc, chanspec);
+
+       /* restore macintmask */
+       brcms_intrsrestore(wlc->wl, macintmask);
+
+       /* seed wake_override with BRCMS_WAKE_OVERRIDE_MACSUSPEND since the mac
+        * is suspended and brcms_c_enable_mac() will clear this override bit.
+        */
+       mboolset(wlc_hw->wake_override, BRCMS_WAKE_OVERRIDE_MACSUSPEND);
+
+       /*
+        * initialize mac_suspend_depth to 1 to match ucode initial suspended state
+        */
+       wlc_hw->mac_suspend_depth = 1;
+
+       /* restore the clk */
+       if (!fastclk)
+               brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
+}
+
+int brcms_b_up_prep(struct brcms_hardware *wlc_hw)
+{
+       uint coremask;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       /*
+        * Enable pll and xtal, initialize the power control registers,
+        * and force fastclock for the remainder of brcms_c_up().
+        */
+       brcms_b_xtal(wlc_hw, ON);
+       ai_clkctl_init(wlc_hw->sih);
+       brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
+
+       /*
+        * Configure pci/pcmcia here instead of in brcms_c_attach()
+        * to allow mfg hotswap:  down, hotswap (chip power cycle), up.
+        */
+       coremask = (1 << wlc_hw->wlc->core->coreidx);
+
+       if (wlc_hw->sih->bustype == PCI_BUS)
+               ai_pci_setup(wlc_hw->sih, coremask);
+
+       /*
+        * Need to read the hwradio status here to cover the case where the system
+        * is loaded with the hw radio disabled. We do not want to bring the driver up in this case.
+        */
+       if (brcms_b_radio_read_hwdisabled(wlc_hw)) {
+               /* put SB PCI in down state again */
+               if (wlc_hw->sih->bustype == PCI_BUS)
+                       ai_pci_down(wlc_hw->sih);
+               brcms_b_xtal(wlc_hw, OFF);
+               return -ENOMEDIUM;
+       }
+
+       if (wlc_hw->sih->bustype == PCI_BUS)
+               ai_pci_up(wlc_hw->sih);
+
+       /* reset the d11 core */
+       brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
+
+       return 0;
+}
+
+int brcms_b_up_finish(struct brcms_hardware *wlc_hw)
+{
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       wlc_hw->up = true;
+       wlc_phy_hw_state_upd(wlc_hw->band->pi, true);
+
+       /* FULLY enable dynamic power control and d11 core interrupt */
+       brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
+       brcms_intrson(wlc_hw->wlc->wl);
+       return 0;
+}
+
+int brcms_b_bmac_down_prep(struct brcms_hardware *wlc_hw)
+{
+       bool dev_gone;
+       uint callbacks = 0;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       if (!wlc_hw->up)
+               return callbacks;
+
+       dev_gone = DEVICEREMOVED(wlc_hw->wlc);
+
+       /* disable interrupts */
+       if (dev_gone)
+               wlc_hw->wlc->macintmask = 0;
+       else {
+               /* now disable interrupts */
+               brcms_intrsoff(wlc_hw->wlc->wl);
+
+               /* ensure we're running on the pll clock again */
+               brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
+       }
+       /* down phy at the last of this stage */
+       callbacks += wlc_phy_down(wlc_hw->band->pi);
+
+       return callbacks;
+}
+
+int brcms_b_down_finish(struct brcms_hardware *wlc_hw)
+{
+       uint callbacks = 0;
+       bool dev_gone;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       if (!wlc_hw->up)
+               return callbacks;
+
+       wlc_hw->up = false;
+       wlc_phy_hw_state_upd(wlc_hw->band->pi, false);
+
+       dev_gone = DEVICEREMOVED(wlc_hw->wlc);
+
+       if (dev_gone) {
+               wlc_hw->sbclk = false;
+               wlc_hw->clk = false;
+               wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, false);
+
+               /* reclaim any posted packets */
+               brcms_c_flushqueues(wlc_hw->wlc);
+       } else {
+
+               /* Reset and disable the core */
+               if (ai_iscoreup(wlc_hw->sih)) {
+                       if (R_REG(&wlc_hw->regs->maccontrol) &
+                           MCTL_EN_MAC)
+                               brcms_c_suspend_mac_and_wait(wlc_hw->wlc);
+                       callbacks += brcms_reset(wlc_hw->wlc->wl);
+                       brcms_c_coredisable(wlc_hw);
+               }
+
+               /* turn off primary xtal and pll */
+               if (!wlc_hw->noreset) {
+                       if (wlc_hw->sih->bustype == PCI_BUS)
+                               ai_pci_down(wlc_hw->sih);
+                       brcms_b_xtal(wlc_hw, OFF);
+               }
+       }
+
+       return callbacks;
+}
+
+void brcms_b_wait_for_wake(struct brcms_hardware *wlc_hw)
+{
+       /* delay before first read of ucode state */
+       udelay(40);
+
+       /* wait until ucode is no longer asleep */
+       SPINWAIT((brcms_b_read_shm(wlc_hw, M_UCODE_DBGST) ==
+                 DBGST_ASLEEP), wlc_hw->wlc->fastpwrup_dly);
+}
+
+void brcms_b_hw_etheraddr(struct brcms_hardware *wlc_hw, u8 *ea)
+{
+       memcpy(ea, wlc_hw->etheraddr, ETH_ALEN);
+}
+
+static int brcms_b_bandtype(struct brcms_hardware *wlc_hw)
+{
+       return wlc_hw->band->bandtype;
+}
+
+/* control chip clock to save power, enable dynamic clock or force fast clock */
+static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode)
+{
+       if (PMUCTL_ENAB(wlc_hw->sih)) {
+               /* new chips with PMU, CCS_FORCEHT will distribute the HT clock on backplane,
+                *  but mac core will still run on ALP(not HT) when it enters powersave mode,
+                *      which means the FCA bit may not be set.
+                *      should wakeup mac if driver wants it to run on HT.
+                */
+
+               if (wlc_hw->clk) {
+                       if (mode == CLK_FAST) {
+                               OR_REG(&wlc_hw->regs->clk_ctl_st,
+                                      CCS_FORCEHT);
+
+                               udelay(64);
+
+                               SPINWAIT(((R_REG
+                                          (&wlc_hw->regs->
+                                           clk_ctl_st) & CCS_HTAVAIL) == 0),
+                                        PMU_MAX_TRANSITION_DLY);
+                               WARN_ON(!(R_REG
+                                         (&wlc_hw->regs->
+                                          clk_ctl_st) & CCS_HTAVAIL));
+                       } else {
+                               if ((wlc_hw->sih->pmurev == 0) &&
+                                   (R_REG
+                                    (&wlc_hw->regs->
+                                     clk_ctl_st) & (CCS_FORCEHT | CCS_HTAREQ)))
+                                       SPINWAIT(((R_REG
+                                                  (&wlc_hw->regs->
+                                                   clk_ctl_st) & CCS_HTAVAIL)
+                                                 == 0),
+                                                PMU_MAX_TRANSITION_DLY);
+                               AND_REG(&wlc_hw->regs->clk_ctl_st,
+                                       ~CCS_FORCEHT);
+                       }
+               }
+               wlc_hw->forcefastclk = (mode == CLK_FAST);
+       } else {
+
+               /* old chips w/o PMU, force HT through cc,
+                * then use FCA to verify mac is running fast clock
+                */
+
+               wlc_hw->forcefastclk = ai_clkctl_cc(wlc_hw->sih, mode);
+
+               /* check fast clock is available (if core is not in reset) */
+               if (wlc_hw->forcefastclk && wlc_hw->clk)
+                       WARN_ON(!(ai_core_sflags(wlc_hw->sih, 0, 0) &
+                                 SISF_FCLKA));
+
+               /* keep the ucode wake bit on if forcefastclk is on
+                * since we do not want ucode to put us back to slow clock
+                * when it dozes for PM mode.
+                * Code below matches the wake override bit with current forcefastclk state
+                * Only setting bit in wake_override instead of waking ucode immediately
+                * since old code (wlc.c 1.4499) had this behavior. Older code set
+                * wlc->forcefastclk but only had the wake happen if the wakup_ucode work
+                * (protected by an up check) was executed just below.
+                */
+               if (wlc_hw->forcefastclk)
+                       mboolset(wlc_hw->wake_override,
+                                BRCMS_WAKE_OVERRIDE_FORCEFAST);
+               else
+                       mboolclr(wlc_hw->wake_override,
+                                BRCMS_WAKE_OVERRIDE_FORCEFAST);
+       }
+}
+
+/* set initial host flags value */
+static void
+brcms_c_mhfdef(struct brcms_c_info *wlc, u16 *mhfs, u16 mhf2_init)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+
+       memset(mhfs, 0, MHFMAX * sizeof(u16));
+
+       mhfs[MHF2] |= mhf2_init;
+
+       /* prohibit use of slowclock on multifunction boards */
+       if (wlc_hw->boardflags & BFL_NOPLLDOWN)
+               mhfs[MHF1] |= MHF1_FORCEFASTCLK;
+
+       if (BRCMS_ISNPHY(wlc_hw->band) && NREV_LT(wlc_hw->band->phyrev, 2)) {
+               mhfs[MHF2] |= MHF2_NPHY40MHZ_WAR;
+               mhfs[MHF1] |= MHF1_IQSWAP_WAR;
+       }
+}
+
+/* set or clear ucode host flag bits
+ * it has an optimization for no-change write
+ * it only writes through shared memory when the core has clock;
+ * pre-CLK changes should use wlc_write_mhf to get around the optimization
+ *
+ *
+ * bands values are: BRCM_BAND_AUTO <--- Current band only
+ *                   BRCM_BAND_5G   <--- 5G band only
+ *                   BRCM_BAND_2G   <--- 2G band only
+ *                   BRCM_BAND_ALL  <--- All bands
+ */
+void
+brcms_b_mhf(struct brcms_hardware *wlc_hw, u8 idx, u16 mask, u16 val,
+            int bands)
+{
+       u16 save;
+       u16 addr[MHFMAX] = {
+               M_HOST_FLAGS1, M_HOST_FLAGS2, M_HOST_FLAGS3, M_HOST_FLAGS4,
+               M_HOST_FLAGS5
+       };
+       struct brcms_hw_band *band;
+
+       if ((val & ~mask) || idx >= MHFMAX)
+               return; /* error condition */
+
+       switch (bands) {
+               /* Current band only or all bands,
+                * then set the band to current band
+                */
+       case BRCM_BAND_AUTO:
+       case BRCM_BAND_ALL:
+               band = wlc_hw->band;
+               break;
+       case BRCM_BAND_5G:
+               band = wlc_hw->bandstate[BAND_5G_INDEX];
+               break;
+       case BRCM_BAND_2G:
+               band = wlc_hw->bandstate[BAND_2G_INDEX];
+               break;
+       default:
+               band = NULL;    /* error condition */
+       }
+
+       if (band) {
+               save = band->mhfs[idx];
+               band->mhfs[idx] = (band->mhfs[idx] & ~mask) | val;
+
+               /* optimization: only write through if changed, and
+                * changed band is the current band
+                */
+               if (wlc_hw->clk && (band->mhfs[idx] != save)
+                   && (band == wlc_hw->band))
+                       brcms_b_write_shm(wlc_hw, addr[idx],
+                                          (u16) band->mhfs[idx]);
+       }
+
+       if (bands == BRCM_BAND_ALL) {
+               wlc_hw->bandstate[0]->mhfs[idx] =
+                   (wlc_hw->bandstate[0]->mhfs[idx] & ~mask) | val;
+               wlc_hw->bandstate[1]->mhfs[idx] =
+                   (wlc_hw->bandstate[1]->mhfs[idx] & ~mask) | val;
+       }
+}
+
+u16 brcms_b_mhf_get(struct brcms_hardware *wlc_hw, u8 idx, int bands)
+{
+       struct brcms_hw_band *band;
+
+       if (idx >= MHFMAX)
+               return 0; /* error condition */
+       switch (bands) {
+       case BRCM_BAND_AUTO:
+               band = wlc_hw->band;
+               break;
+       case BRCM_BAND_5G:
+               band = wlc_hw->bandstate[BAND_5G_INDEX];
+               break;
+       case BRCM_BAND_2G:
+               band = wlc_hw->bandstate[BAND_2G_INDEX];
+               break;
+       default:
+               band = NULL;            /* error condition */
+       }
+
+       if (!band)
+               return 0;
+
+       return band->mhfs[idx];
+}
+
+static void brcms_c_write_mhf(struct brcms_hardware *wlc_hw, u16 *mhfs)
+{
+       u8 idx;
+       u16 addr[] = {
+               M_HOST_FLAGS1, M_HOST_FLAGS2, M_HOST_FLAGS3, M_HOST_FLAGS4,
+               M_HOST_FLAGS5
+       };
+
+       for (idx = 0; idx < MHFMAX; idx++) {
+               brcms_b_write_shm(wlc_hw, addr[idx], mhfs[idx]);
+       }
+}
+
+/* set the maccontrol register to desired reset state and
+ * initialize the sw cache of the register
+ */
+static void brcms_c_mctrl_reset(struct brcms_hardware *wlc_hw)
+{
+       /* IHR accesses are always enabled, PSM disabled, HPS off and WAKE on */
+       wlc_hw->maccontrol = 0;
+       wlc_hw->suspended_fifos = 0;
+       wlc_hw->wake_override = 0;
+       wlc_hw->mute_override = 0;
+       brcms_b_mctrl(wlc_hw, ~0, MCTL_IHR_EN | MCTL_WAKE);
+}
+
+/* set or clear maccontrol bits */
+void brcms_b_mctrl(struct brcms_hardware *wlc_hw, u32 mask, u32 val)
+{
+       u32 maccontrol;
+       u32 new_maccontrol;
+
+       if (val & ~mask)
+               return; /* error condition */
+       maccontrol = wlc_hw->maccontrol;
+       new_maccontrol = (maccontrol & ~mask) | val;
+
+       /* if the new maccontrol value is the same as the old, nothing to do */
+       if (new_maccontrol == maccontrol)
+               return;
+
+       /* something changed, cache the new value */
+       wlc_hw->maccontrol = new_maccontrol;
+
+       /* write the new values with overrides applied */
+       brcms_c_mctrl_write(wlc_hw);
+}
+
+/* write the software state of maccontrol and overrides to the maccontrol register */
+static void brcms_c_mctrl_write(struct brcms_hardware *wlc_hw)
+{
+       u32 maccontrol = wlc_hw->maccontrol;
+
+       /* OR in the wake bit if overridden */
+       if (wlc_hw->wake_override)
+               maccontrol |= MCTL_WAKE;
+
+       /* set AP and INFRA bits for mute if needed */
+       if (wlc_hw->mute_override) {
+               maccontrol &= ~(MCTL_AP);
+               maccontrol |= MCTL_INFRA;
+       }
+
+       W_REG(&wlc_hw->regs->maccontrol, maccontrol);
+}
+
+void brcms_c_ucode_wake_override_set(struct brcms_hardware *wlc_hw,
+                                u32 override_bit)
+{
+       if (wlc_hw->wake_override || (wlc_hw->maccontrol & MCTL_WAKE)) {
+               mboolset(wlc_hw->wake_override, override_bit);
+               return;
+       }
+
+       mboolset(wlc_hw->wake_override, override_bit);
+
+       brcms_c_mctrl_write(wlc_hw);
+       brcms_b_wait_for_wake(wlc_hw);
+
+       return;
+}
+
+void brcms_c_ucode_wake_override_clear(struct brcms_hardware *wlc_hw,
+                                  u32 override_bit)
+{
+       mboolclr(wlc_hw->wake_override, override_bit);
+
+       if (wlc_hw->wake_override || (wlc_hw->maccontrol & MCTL_WAKE))
+               return;
+
+       brcms_c_mctrl_write(wlc_hw);
+
+       return;
+}
+
+/* When driver needs ucode to stop beaconing, it has to make sure that
+ * MCTL_AP is clear and MCTL_INFRA is set
+ * Mode           MCTL_AP        MCTL_INFRA
+ * AP                1              1
+ * STA               0              1 <--- This will ensure no beacons
+ * IBSS              0              0
+ */
+static void brcms_c_ucode_mute_override_set(struct brcms_hardware *wlc_hw)
+{
+       wlc_hw->mute_override = 1;
+
+       /* if maccontrol already has AP == 0 and INFRA == 1 without this
+        * override, then there is no change to write
+        */
+       if ((wlc_hw->maccontrol & (MCTL_AP | MCTL_INFRA)) == MCTL_INFRA)
+               return;
+
+       brcms_c_mctrl_write(wlc_hw);
+
+       return;
+}
+
+/* Clear the override on AP and INFRA bits */
+static void brcms_c_ucode_mute_override_clear(struct brcms_hardware *wlc_hw)
+{
+       if (wlc_hw->mute_override == 0)
+               return;
+
+       wlc_hw->mute_override = 0;
+
+       /* if maccontrol already has AP == 0 and INFRA == 1 without this
+        * override, then there is no change to write
+        */
+       if ((wlc_hw->maccontrol & (MCTL_AP | MCTL_INFRA)) == MCTL_INFRA)
+               return;
+
+       brcms_c_mctrl_write(wlc_hw);
+}
+
+/*
+ * Write a MAC address to the given match reg offset in the RXE match engine.
+ */
+void
+brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw, int match_reg_offset,
+                      const u8 *addr)
+{
+       d11regs_t *regs;
+       u16 mac_l;
+       u16 mac_m;
+       u16 mac_h;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d: brcms_b_set_addrmatch\n",
+                wlc_hw->unit);
+
+       regs = wlc_hw->regs;
+       mac_l = addr[0] | (addr[1] << 8);
+       mac_m = addr[2] | (addr[3] << 8);
+       mac_h = addr[4] | (addr[5] << 8);
+
+       /* enter the MAC addr into the RXE match registers */
+       W_REG(&regs->rcm_ctl, RCM_INC_DATA | match_reg_offset);
+       W_REG(&regs->rcm_mat_data, mac_l);
+       W_REG(&regs->rcm_mat_data, mac_m);
+       W_REG(&regs->rcm_mat_data, mac_h);
+
+}
+
+void
+brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len,
+                           void *buf)
+{
+       d11regs_t *regs;
+       u32 word;
+       bool be_bit;
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       regs = wlc_hw->regs;
+       W_REG(&regs->tplatewrptr, offset);
+
+       /* if MCTL_BIGEND bit set in mac control register,
+        * the chip swaps data in fifo, as well as data in
+        * template ram
+        */
+       be_bit = (R_REG(&regs->maccontrol) & MCTL_BIGEND) != 0;
+
+       while (len > 0) {
+               memcpy(&word, buf, sizeof(u32));
+
+               if (be_bit)
+                       word = cpu_to_be32(word);
+               else
+                       word = cpu_to_le32(word);
+
+               W_REG(&regs->tplatewrdata, word);
+
+               buf = (u8 *) buf + sizeof(u32);
+               len -= sizeof(u32);
+       }
+}
+
+void brcms_b_set_cwmin(struct brcms_hardware *wlc_hw, u16 newmin)
+{
+       wlc_hw->band->CWmin = newmin;
+
+       W_REG(&wlc_hw->regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_CWMIN);
+       (void)R_REG(&wlc_hw->regs->objaddr);
+       W_REG(&wlc_hw->regs->objdata, newmin);
+}
+
+void brcms_b_set_cwmax(struct brcms_hardware *wlc_hw, u16 newmax)
+{
+       wlc_hw->band->CWmax = newmax;
+
+       W_REG(&wlc_hw->regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_CWMAX);
+       (void)R_REG(&wlc_hw->regs->objaddr);
+       W_REG(&wlc_hw->regs->objdata, newmax);
+}
+
+void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw)
+{
+       bool fastclk;
+
+       /* request FAST clock if not on */
+       fastclk = wlc_hw->forcefastclk;
+       if (!fastclk)
+               brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
+
+       wlc_phy_bw_state_set(wlc_hw->band->pi, bw);
+
+       brcms_b_phy_reset(wlc_hw);
+       wlc_phy_init(wlc_hw->band->pi, wlc_phy_chanspec_get(wlc_hw->band->pi));
+
+       /* restore the clk */
+       if (!fastclk)
+               brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
+}
+
+static void
+brcms_c_write_hw_bcntemplate0(struct brcms_hardware *wlc_hw, void *bcn,
+                             int len)
+{
+       d11regs_t *regs = wlc_hw->regs;
+
+       brcms_b_write_template_ram(wlc_hw, T_BCN0_TPL_BASE, (len + 3) & ~3,
+                                   bcn);
+       /* write beacon length to SCR */
+       brcms_b_write_shm(wlc_hw, M_BCN0_FRM_BYTESZ, (u16) len);
+       /* mark beacon0 valid */
+       OR_REG(&regs->maccommand, MCMD_BCN0VLD);
+}
+
+static void
+brcms_c_write_hw_bcntemplate1(struct brcms_hardware *wlc_hw, void *bcn,
+                             int len)
+{
+       d11regs_t *regs = wlc_hw->regs;
+
+       brcms_b_write_template_ram(wlc_hw, T_BCN1_TPL_BASE, (len + 3) & ~3,
+                                   bcn);
+       /* write beacon length to SCR */
+       brcms_b_write_shm(wlc_hw, M_BCN1_FRM_BYTESZ, (u16) len);
+       /* mark beacon1 valid */
+       OR_REG(&regs->maccommand, MCMD_BCN1VLD);
+}
+
+/* mac is assumed to be suspended at this point */
+void
+brcms_b_write_hw_bcntemplates(struct brcms_hardware *wlc_hw, void *bcn,
+                             int len, bool both)
+{
+       d11regs_t *regs = wlc_hw->regs;
+
+       if (both) {
+               brcms_c_write_hw_bcntemplate0(wlc_hw, bcn, len);
+               brcms_c_write_hw_bcntemplate1(wlc_hw, bcn, len);
+       } else {
+               /* bcn 0 */
+               if (!(R_REG(&regs->maccommand) & MCMD_BCN0VLD))
+                       brcms_c_write_hw_bcntemplate0(wlc_hw, bcn, len);
+               /* bcn 1 */
+               else if (!
+                        (R_REG(&regs->maccommand) & MCMD_BCN1VLD))
+                       brcms_c_write_hw_bcntemplate1(wlc_hw, bcn, len);
+       }
+}
+
+static void brcms_b_upd_synthpu(struct brcms_hardware *wlc_hw)
+{
+       u16 v;
+       struct brcms_c_info *wlc = wlc_hw->wlc;
+       /* update SYNTHPU_DLY */
+
+       if (BRCMS_ISLCNPHY(wlc->band)) {
+               v = SYNTHPU_DLY_LPPHY_US;
+       } else if (BRCMS_ISNPHY(wlc->band) && (NREV_GE(wlc->band->phyrev, 3))) {
+               v = SYNTHPU_DLY_NPHY_US;
+       } else {
+               v = SYNTHPU_DLY_BPHY_US;
+       }
+
+       brcms_b_write_shm(wlc_hw, M_SYNTHPU_DLY, v);
+}
+
+/* band-specific init */
+static void brcms_b_bsinit(struct brcms_c_info *wlc, chanspec_t chanspec)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+
+       BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
+               wlc_hw->band->bandunit);
+
+       brcms_c_ucode_bsinit(wlc_hw);
+
+       wlc_phy_init(wlc_hw->band->pi, chanspec);
+
+       brcms_c_ucode_txant_set(wlc_hw);
+
+       /* cwmin is band-specific, update hardware with value for current band */
+       brcms_b_set_cwmin(wlc_hw, wlc_hw->band->CWmin);
+       brcms_b_set_cwmax(wlc_hw, wlc_hw->band->CWmax);
+
+       brcms_b_update_slot_timing(wlc_hw,
+                                   BAND_5G(wlc_hw->band->
+                                           bandtype) ? true : wlc_hw->
+                                   shortslot);
+
+       /* write phytype and phyvers */
+       brcms_b_write_shm(wlc_hw, M_PHYTYPE, (u16) wlc_hw->band->phytype);
+       brcms_b_write_shm(wlc_hw, M_PHYVER, (u16) wlc_hw->band->phyrev);
+
+       /* initialize the txphyctl1 rate table since shmem is shared between bands */
+       brcms_upd_ofdm_pctl1_table(wlc_hw);
+
+       brcms_b_upd_synthpu(wlc_hw);
+}
+
+static void brcms_b_core_phy_clk(struct brcms_hardware *wlc_hw, bool clk)
+{
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d: clk %d\n", wlc_hw->unit, clk);
+
+       wlc_hw->phyclk = clk;
+
+       if (OFF == clk) {       /* clear gmode bit, put phy into reset */
+
+               ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_FGC | SICF_GMODE),
+                              (SICF_PRST | SICF_FGC));
+               udelay(1);
+               ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_FGC), SICF_PRST);
+               udelay(1);
+
+       } else {                /* take phy out of reset */
+
+               ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_FGC), SICF_FGC);
+               udelay(1);
+               ai_core_cflags(wlc_hw->sih, (SICF_FGC), 0);
+               udelay(1);
+
+       }
+}
+
+/* Perform a soft reset of the PHY PLL */
+void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw)
+{
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       ai_corereg(wlc_hw->sih, SI_CC_IDX,
+                  offsetof(chipcregs_t, chipcontrol_addr), ~0, 0);
+       udelay(1);
+       ai_corereg(wlc_hw->sih, SI_CC_IDX,
+                  offsetof(chipcregs_t, chipcontrol_data), 0x4, 0);
+       udelay(1);
+       ai_corereg(wlc_hw->sih, SI_CC_IDX,
+                  offsetof(chipcregs_t, chipcontrol_data), 0x4, 4);
+       udelay(1);
+       ai_corereg(wlc_hw->sih, SI_CC_IDX,
+                  offsetof(chipcregs_t, chipcontrol_data), 0x4, 0);
+       udelay(1);
+}
+
+/* light way to turn on phy clock without reset for NPHY only
+ *  refer to brcms_b_core_phy_clk for full version
+ */
+void brcms_b_phyclk_fgc(struct brcms_hardware *wlc_hw, bool clk)
+{
+       /* support(necessary for NPHY and HYPHY) only */
+       if (!BRCMS_ISNPHY(wlc_hw->band))
+               return;
+
+       if (ON == clk)
+               ai_core_cflags(wlc_hw->sih, SICF_FGC, SICF_FGC);
+       else
+               ai_core_cflags(wlc_hw->sih, SICF_FGC, 0);
+
+}
+
+void brcms_b_macphyclk_set(struct brcms_hardware *wlc_hw, bool clk)
+{
+       if (ON == clk)
+               ai_core_cflags(wlc_hw->sih, SICF_MPCLKE, SICF_MPCLKE);
+       else
+               ai_core_cflags(wlc_hw->sih, SICF_MPCLKE, 0);
+}
+
+void brcms_b_phy_reset(struct brcms_hardware *wlc_hw)
+{
+       struct brcms_phy_pub *pih = wlc_hw->band->pi;
+       u32 phy_bw_clkbits;
+       bool phy_in_reset = false;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       if (pih == NULL)
+               return;
+
+       phy_bw_clkbits = wlc_phy_clk_bwbits(wlc_hw->band->pi);
+
+       /* Specific reset sequence required for NPHY rev 3 and 4 */
+       if (BRCMS_ISNPHY(wlc_hw->band) && NREV_GE(wlc_hw->band->phyrev, 3) &&
+           NREV_LE(wlc_hw->band->phyrev, 4)) {
+               /* Set the PHY bandwidth */
+               ai_core_cflags(wlc_hw->sih, SICF_BWMASK, phy_bw_clkbits);
+
+               udelay(1);
+
+               /* Perform a soft reset of the PHY PLL */
+               brcms_b_core_phypll_reset(wlc_hw);
+
+               /* reset the PHY */
+               ai_core_cflags(wlc_hw->sih, (SICF_PRST | SICF_PCLKE),
+                              (SICF_PRST | SICF_PCLKE));
+               phy_in_reset = true;
+       } else {
+
+               ai_core_cflags(wlc_hw->sih,
+                              (SICF_PRST | SICF_PCLKE | SICF_BWMASK),
+                              (SICF_PRST | SICF_PCLKE | phy_bw_clkbits));
+       }
+
+       udelay(2);
+       brcms_b_core_phy_clk(wlc_hw, ON);
+
+       if (pih)
+               wlc_phy_anacore(pih, ON);
+}
+
+/* switch to and initialize new band */
+static void brcms_b_setband(struct brcms_hardware *wlc_hw, uint bandunit,
+                           chanspec_t chanspec) {
+       struct brcms_c_info *wlc = wlc_hw->wlc;
+       u32 macintmask;
+
+       /* Enable the d11 core before accessing it */
+       if (!ai_iscoreup(wlc_hw->sih)) {
+               ai_core_reset(wlc_hw->sih, 0, 0);
+               brcms_c_mctrl_reset(wlc_hw);
+       }
+
+       macintmask = brcms_c_setband_inact(wlc, bandunit);
+
+       if (!wlc_hw->up)
+               return;
+
+       brcms_b_core_phy_clk(wlc_hw, ON);
+
+       /* band-specific initializations */
+       brcms_b_bsinit(wlc, chanspec);
+
+       /*
+        * If there are any pending software interrupt bits,
+        * then replace these with a harmless nonzero value
+        * so brcms_c_dpc() will re-enable interrupts when done.
+        */
+       if (wlc->macintstatus)
+               wlc->macintstatus = MI_DMAINT;
+
+       /* restore macintmask */
+       brcms_intrsrestore(wlc->wl, macintmask);
+
+       /* ucode should still be suspended.. */
+       WARN_ON((R_REG(&wlc_hw->regs->maccontrol) & MCTL_EN_MAC) != 0);
+}
+
+/* low-level band switch utility routine */
+void brcms_c_setxband(struct brcms_hardware *wlc_hw, uint bandunit)
+{
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
+               bandunit);
+
+       wlc_hw->band = wlc_hw->bandstate[bandunit];
+
+       /* BMAC_NOTE: until we eliminate need for wlc->band refs in low level code */
+       wlc_hw->wlc->band = wlc_hw->wlc->bandstate[bandunit];
+
+       /* set gmode core flag */
+       if (wlc_hw->sbclk && !wlc_hw->noreset) {
+               ai_core_cflags(wlc_hw->sih, SICF_GMODE,
+                              ((bandunit == 0) ? SICF_GMODE : 0));
+       }
+}
+
+static bool brcms_c_isgoodchip(struct brcms_hardware *wlc_hw)
+{
+
+       /* reject unsupported corerev */
+       if (!VALID_COREREV(wlc_hw->corerev)) {
+               wiphy_err(wlc_hw->wlc->wiphy, "unsupported core rev %d\n",
+                         wlc_hw->corerev);
+               return false;
+       }
+
+       return true;
+}
+
+/* Validate some board info parameters */
+static bool brcms_c_validboardtype(struct brcms_hardware *wlc_hw)
+{
+       uint boardrev = wlc_hw->boardrev;
+
+       /* 4 bits each for board type, major, minor, and tiny version */
+       uint brt = (boardrev & 0xf000) >> 12;
+       uint b0 = (boardrev & 0xf00) >> 8;
+       uint b1 = (boardrev & 0xf0) >> 4;
+       uint b2 = boardrev & 0xf;
+
+       /* voards from other vendors are always considered valid */
+       if (wlc_hw->sih->boardvendor != PCI_VENDOR_ID_BROADCOM)
+               return true;
+
+       /* do some boardrev sanity checks when boardvendor is Broadcom */
+       if (boardrev == 0)
+               return false;
+
+       if (boardrev <= 0xff)
+               return true;
+
+       if ((brt > 2) || (brt == 0) || (b0 > 9) || (b0 == 0) || (b1 > 9)
+               || (b2 > 9))
+               return false;
+
+       return true;
+}
+
+static char *brcms_c_get_macaddr(struct brcms_hardware *wlc_hw)
+{
+       const char *varname = "macaddr";
+       char *macaddr;
+
+       /* If macaddr exists, use it (Sromrev4, CIS, ...). */
+       macaddr = getvar(wlc_hw->vars, varname);
+       if (macaddr != NULL)
+               return macaddr;
+
+       if (NBANDS_HW(wlc_hw) > 1)
+               varname = "et1macaddr";
+       else
+               varname = "il0macaddr";
+
+       macaddr = getvar(wlc_hw->vars, varname);
+       if (macaddr == NULL) {
+               wiphy_err(wlc_hw->wlc->wiphy, "wl%d: wlc_get_macaddr: macaddr "
+                         "getvar(%s) not found\n", wlc_hw->unit, varname);
+       }
+
+       return macaddr;
+}
+
+/*
+ * Return true if radio is disabled, otherwise false.
+ * hw radio disable signal is an external pin, users activate it asynchronously
+ * this function could be called when driver is down and w/o clock
+ * it operates on different registers depending on corerev and boardflag.
+ */
+bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw)
+{
+       bool v, clk, xtal;
+       u32 resetbits = 0, flags = 0;
+
+       xtal = wlc_hw->sbclk;
+       if (!xtal)
+               brcms_b_xtal(wlc_hw, ON);
+
+       /* may need to take core out of reset first */
+       clk = wlc_hw->clk;
+       if (!clk) {
+               /*
+                * mac no longer enables phyclk automatically when driver
+                * accesses phyreg throughput mac. This can be skipped since
+                * only mac reg is accessed below
+                */
+               flags |= SICF_PCLKE;
+
+               /* AI chip doesn't restore bar0win2 on hibernation/resume, need sw fixup */
+               if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
+                   (wlc_hw->sih->chip == BCM43225_CHIP_ID))
+                       wlc_hw->regs =
+                           (d11regs_t *) ai_setcore(wlc_hw->sih, D11_CORE_ID,
+                                                    0);
+               ai_core_reset(wlc_hw->sih, flags, resetbits);
+               brcms_c_mctrl_reset(wlc_hw);
+       }
+
+       v = ((R_REG(&wlc_hw->regs->phydebug) & PDBG_RFD) != 0);
+
+       /* put core back into reset */
+       if (!clk)
+               ai_core_disable(wlc_hw->sih, 0);
+
+       if (!xtal)
+               brcms_b_xtal(wlc_hw, OFF);
+
+       return v;
+}
+
+/* Initialize just the hardware when coming out of POR or S3/S5 system states */
+void brcms_b_hw_up(struct brcms_hardware *wlc_hw)
+{
+       if (wlc_hw->wlc->pub->hw_up)
+               return;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       /*
+        * Enable pll and xtal, initialize the power control registers,
+        * and force fastclock for the remainder of brcms_c_up().
+        */
+       brcms_b_xtal(wlc_hw, ON);
+       ai_clkctl_init(wlc_hw->sih);
+       brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
+
+       if (wlc_hw->sih->bustype == PCI_BUS) {
+               ai_pci_fixcfg(wlc_hw->sih);
+
+               /* AI chip doesn't restore bar0win2 on hibernation/resume, need sw fixup */
+               if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
+                   (wlc_hw->sih->chip == BCM43225_CHIP_ID))
+                       wlc_hw->regs =
+                           (d11regs_t *) ai_setcore(wlc_hw->sih, D11_CORE_ID,
+                                                    0);
+       }
+
+       /* Inform phy that a POR reset has occurred so it does a complete phy init */
+       wlc_phy_por_inform(wlc_hw->band->pi);
+
+       wlc_hw->ucode_loaded = false;
+       wlc_hw->wlc->pub->hw_up = true;
+
+       if ((wlc_hw->boardflags & BFL_FEM)
+           && (wlc_hw->sih->chip == BCM4313_CHIP_ID)) {
+               if (!
+                   (wlc_hw->boardrev >= 0x1250
+                    && (wlc_hw->boardflags & BFL_FEM_BT)))
+                       ai_epa_4313war(wlc_hw->sih);
+       }
+}
+
+static bool wlc_dma_rxreset(struct brcms_hardware *wlc_hw, uint fifo)
+{
+       struct dma_pub *di = wlc_hw->di[fifo];
+       return dma_rxreset(di);
+}
+
+/* d11 core reset
+ *   ensure fask clock during reset
+ *   reset dma
+ *   reset d11(out of reset)
+ *   reset phy(out of reset)
+ *   clear software macintstatus for fresh new start
+ * one testing hack wlc_hw->noreset will bypass the d11/phy reset
+ */
+void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
+{
+       d11regs_t *regs;
+       uint i;
+       bool fastclk;
+       u32 resetbits = 0;
+
+       if (flags == BRCMS_USE_COREFLAGS)
+               flags = (wlc_hw->band->pi ? wlc_hw->band->core_flags : 0);
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       regs = wlc_hw->regs;
+
+       /* request FAST clock if not on  */
+       fastclk = wlc_hw->forcefastclk;
+       if (!fastclk)
+               brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
+
+       /* reset the dma engines except first time thru */
+       if (ai_iscoreup(wlc_hw->sih)) {
+               for (i = 0; i < NFIFO; i++)
+                       if ((wlc_hw->di[i]) && (!dma_txreset(wlc_hw->di[i]))) {
+                               wiphy_err(wlc_hw->wlc->wiphy, "wl%d: %s: "
+                                         "dma_txreset[%d]: cannot stop dma\n",
+                                          wlc_hw->unit, __func__, i);
+                       }
+
+               if ((wlc_hw->di[RX_FIFO])
+                   && (!wlc_dma_rxreset(wlc_hw, RX_FIFO))) {
+                       wiphy_err(wlc_hw->wlc->wiphy, "wl%d: %s: dma_rxreset"
+                                 "[%d]: cannot stop dma\n",
+                                 wlc_hw->unit, __func__, RX_FIFO);
+               }
+       }
+       /* if noreset, just stop the psm and return */
+       if (wlc_hw->noreset) {
+               wlc_hw->wlc->macintstatus = 0;  /* skip wl_dpc after down */
+               brcms_b_mctrl(wlc_hw, MCTL_PSM_RUN | MCTL_EN_MAC, 0);
+               return;
+       }
+
+       /*
+        * mac no longer enables phyclk automatically when driver accesses
+        * phyreg throughput mac, AND phy_reset is skipped at early stage when
+        * band->pi is invalid. need to enable PHY CLK
+        */
+       flags |= SICF_PCLKE;
+
+       /* reset the core
+        * In chips with PMU, the fastclk request goes through d11 core reg 0x1e0, which
+        *  is cleared by the core_reset. have to re-request it.
+        *  This adds some delay and we can optimize it by also requesting fastclk through
+        *  chipcommon during this period if necessary. But that has to work coordinate
+        *  with other driver like mips/arm since they may touch chipcommon as well.
+        */
+       wlc_hw->clk = false;
+       ai_core_reset(wlc_hw->sih, flags, resetbits);
+       wlc_hw->clk = true;
+       if (wlc_hw->band && wlc_hw->band->pi)
+               wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, true);
+
+       brcms_c_mctrl_reset(wlc_hw);
+
+       if (PMUCTL_ENAB(wlc_hw->sih))
+               brcms_b_clkctl_clk(wlc_hw, CLK_FAST);
+
+       brcms_b_phy_reset(wlc_hw);
+
+       /* turn on PHY_PLL */
+       brcms_b_core_phypll_ctl(wlc_hw, true);
+
+       /* clear sw intstatus */
+       wlc_hw->wlc->macintstatus = 0;
+
+       /* restore the clk setting */
+       if (!fastclk)
+               brcms_b_clkctl_clk(wlc_hw, CLK_DYNAMIC);
+}
+
+/* txfifo sizes needs to be modified(increased) since the newer cores
+ * have more memory.
+ */
+static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw)
+{
+       d11regs_t *regs = wlc_hw->regs;
+       u16 fifo_nu;
+       u16 txfifo_startblk = TXFIFO_START_BLK, txfifo_endblk;
+       u16 txfifo_def, txfifo_def1;
+       u16 txfifo_cmd;
+
+       /* tx fifos start at TXFIFO_START_BLK from the Base address */
+       txfifo_startblk = TXFIFO_START_BLK;
+
+       /* sequence of operations:  reset fifo, set fifo size, reset fifo */
+       for (fifo_nu = 0; fifo_nu < NFIFO; fifo_nu++) {
+
+               txfifo_endblk = txfifo_startblk + wlc_hw->xmtfifo_sz[fifo_nu];
+               txfifo_def = (txfifo_startblk & 0xff) |
+                   (((txfifo_endblk - 1) & 0xff) << TXFIFO_FIFOTOP_SHIFT);
+               txfifo_def1 = ((txfifo_startblk >> 8) & 0x1) |
+                   ((((txfifo_endblk -
+                       1) >> 8) & 0x1) << TXFIFO_FIFOTOP_SHIFT);
+               txfifo_cmd =
+                   TXFIFOCMD_RESET_MASK | (fifo_nu << TXFIFOCMD_FIFOSEL_SHIFT);
+
+               W_REG(&regs->xmtfifocmd, txfifo_cmd);
+               W_REG(&regs->xmtfifodef, txfifo_def);
+               W_REG(&regs->xmtfifodef1, txfifo_def1);
+
+               W_REG(&regs->xmtfifocmd, txfifo_cmd);
+
+               txfifo_startblk += wlc_hw->xmtfifo_sz[fifo_nu];
+       }
+       /*
+        * need to propagate to shm location to be in sync since ucode/hw won't
+        * do this
+        */
+       brcms_b_write_shm(wlc_hw, M_FIFOSIZE0,
+                          wlc_hw->xmtfifo_sz[TX_AC_BE_FIFO]);
+       brcms_b_write_shm(wlc_hw, M_FIFOSIZE1,
+                          wlc_hw->xmtfifo_sz[TX_AC_VI_FIFO]);
+       brcms_b_write_shm(wlc_hw, M_FIFOSIZE2,
+                          ((wlc_hw->xmtfifo_sz[TX_AC_VO_FIFO] << 8) | wlc_hw->
+                           xmtfifo_sz[TX_AC_BK_FIFO]));
+       brcms_b_write_shm(wlc_hw, M_FIFOSIZE3,
+                          ((wlc_hw->xmtfifo_sz[TX_ATIM_FIFO] << 8) | wlc_hw->
+                           xmtfifo_sz[TX_BCMC_FIFO]));
+}
+
+/* d11 core init
+ *   reset PSM
+ *   download ucode/PCM
+ *   let ucode run to suspended
+ *   download ucode inits
+ *   config other core registers
+ *   init dma
+ */
+static void brcms_b_coreinit(struct brcms_c_info *wlc)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       d11regs_t *regs;
+       u32 sflags;
+       uint bcnint_us;
+       uint i = 0;
+       bool fifosz_fixup = false;
+       int err = 0;
+       u16 buf[NFIFO];
+       struct wiphy *wiphy = wlc->wiphy;
+
+       regs = wlc_hw->regs;
+
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       /* reset PSM */
+       brcms_b_mctrl(wlc_hw, ~0, (MCTL_IHR_EN | MCTL_PSM_JMP_0 | MCTL_WAKE));
+
+       brcms_ucode_download(wlc_hw);
+       /*
+        * FIFOSZ fixup. driver wants to controls the fifo allocation.
+        */
+       fifosz_fixup = true;
+
+       /* let the PSM run to the suspended state, set mode to BSS STA */
+       W_REG(&regs->macintstatus, -1);
+       brcms_b_mctrl(wlc_hw, ~0,
+                      (MCTL_IHR_EN | MCTL_INFRA | MCTL_PSM_RUN | MCTL_WAKE));
+
+       /* wait for ucode to self-suspend after auto-init */
+       SPINWAIT(((R_REG(&regs->macintstatus) & MI_MACSSPNDD) == 0),
+                1000 * 1000);
+       if ((R_REG(&regs->macintstatus) & MI_MACSSPNDD) == 0)
+               wiphy_err(wiphy, "wl%d: wlc_coreinit: ucode did not self-"
+                         "suspend!\n", wlc_hw->unit);
+
+       brcms_c_gpio_init(wlc);
+
+       sflags = ai_core_sflags(wlc_hw->sih, 0, 0);
+
+       if (D11REV_IS(wlc_hw->corerev, 23)) {
+               if (BRCMS_ISNPHY(wlc_hw->band))
+                       brcms_c_write_inits(wlc_hw, d11n0initvals16);
+               else
+                       wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
+                                 " %d\n", __func__, wlc_hw->unit,
+                                 wlc_hw->corerev);
+       } else if (D11REV_IS(wlc_hw->corerev, 24)) {
+               if (BRCMS_ISLCNPHY(wlc_hw->band)) {
+                       brcms_c_write_inits(wlc_hw, d11lcn0initvals24);
+               } else {
+                       wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
+                                 " %d\n", __func__, wlc_hw->unit,
+                                 wlc_hw->corerev);
+               }
+       } else {
+               wiphy_err(wiphy, "%s: wl%d: unsupported corerev %d\n",
+                         __func__, wlc_hw->unit, wlc_hw->corerev);
+       }
+
+       /* For old ucode, txfifo sizes needs to be modified(increased) */
+       if (fifosz_fixup == true) {
+               brcms_b_corerev_fifofixup(wlc_hw);
+       }
+
+       /* check txfifo allocations match between ucode and driver */
+       buf[TX_AC_BE_FIFO] = brcms_b_read_shm(wlc_hw, M_FIFOSIZE0);
+       if (buf[TX_AC_BE_FIFO] != wlc_hw->xmtfifo_sz[TX_AC_BE_FIFO]) {
+               i = TX_AC_BE_FIFO;
+               err = -1;
+       }
+       buf[TX_AC_VI_FIFO] = brcms_b_read_shm(wlc_hw, M_FIFOSIZE1);
+       if (buf[TX_AC_VI_FIFO] != wlc_hw->xmtfifo_sz[TX_AC_VI_FIFO]) {
+               i = TX_AC_VI_FIFO;
+               err = -1;
+       }
+       buf[TX_AC_BK_FIFO] = brcms_b_read_shm(wlc_hw, M_FIFOSIZE2);
+       buf[TX_AC_VO_FIFO] = (buf[TX_AC_BK_FIFO] >> 8) & 0xff;
+       buf[TX_AC_BK_FIFO] &= 0xff;
+       if (buf[TX_AC_BK_FIFO] != wlc_hw->xmtfifo_sz[TX_AC_BK_FIFO]) {
+               i = TX_AC_BK_FIFO;
+               err = -1;
+       }
+       if (buf[TX_AC_VO_FIFO] != wlc_hw->xmtfifo_sz[TX_AC_VO_FIFO]) {
+               i = TX_AC_VO_FIFO;
+               err = -1;
+       }
+       buf[TX_BCMC_FIFO] = brcms_b_read_shm(wlc_hw, M_FIFOSIZE3);
+       buf[TX_ATIM_FIFO] = (buf[TX_BCMC_FIFO] >> 8) & 0xff;
+       buf[TX_BCMC_FIFO] &= 0xff;
+       if (buf[TX_BCMC_FIFO] != wlc_hw->xmtfifo_sz[TX_BCMC_FIFO]) {
+               i = TX_BCMC_FIFO;
+               err = -1;
+       }
+       if (buf[TX_ATIM_FIFO] != wlc_hw->xmtfifo_sz[TX_ATIM_FIFO]) {
+               i = TX_ATIM_FIFO;
+               err = -1;
+       }
+       if (err != 0) {
+               wiphy_err(wiphy, "wlc_coreinit: txfifo mismatch: ucode size %d"
+                         " driver size %d index %d\n", buf[i],
+                         wlc_hw->xmtfifo_sz[i], i);
+       }
+
+       /* make sure we can still talk to the mac */
+       WARN_ON(R_REG(&regs->maccontrol) == 0xffffffff);
+
+       /* band-specific inits done by wlc_bsinit() */
+
+       /* Set up frame burst size and antenna swap threshold init values */
+       brcms_b_write_shm(wlc_hw, M_MBURST_SIZE, MAXTXFRAMEBURST);
+       brcms_b_write_shm(wlc_hw, M_MAX_ANTCNT, ANTCNT);
+
+       /* enable one rx interrupt per received frame */
+       W_REG(&regs->intrcvlazy[0], (1 << IRL_FC_SHIFT));
+
+       /* set the station mode (BSS STA) */
+       brcms_b_mctrl(wlc_hw,
+                      (MCTL_INFRA | MCTL_DISCARD_PMQ | MCTL_AP),
+                      (MCTL_INFRA | MCTL_DISCARD_PMQ));
+
+       /* set up Beacon interval */
+       bcnint_us = 0x8000 << 10;
+       W_REG(&regs->tsf_cfprep, (bcnint_us << CFPREP_CBI_SHIFT));
+       W_REG(&regs->tsf_cfpstart, bcnint_us);
+       W_REG(&regs->macintstatus, MI_GP1);
+
+       /* write interrupt mask */
+       W_REG(&regs->intctrlregs[RX_FIFO].intmask, DEF_RXINTMASK);
+
+       /* allow the MAC to control the PHY clock (dynamic on/off) */
+       brcms_b_macphyclk_set(wlc_hw, ON);
+
+       /* program dynamic clock control fast powerup delay register */
+       wlc->fastpwrup_dly = ai_clkctl_fast_pwrup_delay(wlc_hw->sih);
+       W_REG(&regs->scc_fastpwrup_dly, wlc->fastpwrup_dly);
+
+       /* tell the ucode the corerev */
+       brcms_b_write_shm(wlc_hw, M_MACHW_VER, (u16) wlc_hw->corerev);
+
+       /* tell the ucode MAC capabilities */
+       brcms_b_write_shm(wlc_hw, M_MACHW_CAP_L,
+                          (u16) (wlc_hw->machwcap & 0xffff));
+       brcms_b_write_shm(wlc_hw, M_MACHW_CAP_H,
+                          (u16) ((wlc_hw->
+                                     machwcap >> 16) & 0xffff));
+
+       /* write retry limits to SCR, this done after PSM init */
+       W_REG(&regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);
+       (void)R_REG(&regs->objaddr);
+       W_REG(&regs->objdata, wlc_hw->SRL);
+       W_REG(&regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);
+       (void)R_REG(&regs->objaddr);
+       W_REG(&regs->objdata, wlc_hw->LRL);
+
+       /* write rate fallback retry limits */
+       brcms_b_write_shm(wlc_hw, M_SFRMTXCNTFBRTHSD, wlc_hw->SFBL);
+       brcms_b_write_shm(wlc_hw, M_LFRMTXCNTFBRTHSD, wlc_hw->LFBL);
+
+       AND_REG(&regs->ifs_ctl, 0x0FFF);
+       W_REG(&regs->ifs_aifsn, EDCF_AIFSN_MIN);
+
+       /* dma initializations */
+       wlc->txpend16165war = 0;
+
+       /* init the tx dma engines */
+       for (i = 0; i < NFIFO; i++) {
+               if (wlc_hw->di[i])
+                       dma_txinit(wlc_hw->di[i]);
+       }
+
+       /* init the rx dma engine(s) and post receive buffers */
+       dma_rxinit(wlc_hw->di[RX_FIFO]);
+       dma_rxfill(wlc_hw->di[RX_FIFO]);
+}
+
+/* This function is used for changing the tsf frac register
+ * If spur avoidance mode is off, the mac freq will be 80/120/160Mhz
+ * If spur avoidance mode is on1, the mac freq will be 82/123/164Mhz
+ * If spur avoidance mode is on2, the mac freq will be 84/126/168Mhz
+ * HTPHY Formula is 2^26/freq(MHz) e.g.
+ * For spuron2 - 126MHz -> 2^26/126 = 532610.0
+ *  - 532610 = 0x82082 => tsf_clk_frac_h = 0x8, tsf_clk_frac_l = 0x2082
+ * For spuron: 123MHz -> 2^26/123    = 545600.5
+ *  - 545601 = 0x85341 => tsf_clk_frac_h = 0x8, tsf_clk_frac_l = 0x5341
+ * For spur off: 120MHz -> 2^26/120    = 559240.5
+ *  - 559241 = 0x88889 => tsf_clk_frac_h = 0x8, tsf_clk_frac_l = 0x8889
+ */
+
+void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode)
+{
+       d11regs_t *regs;
+       regs = wlc_hw->regs;
+
+       if ((wlc_hw->sih->chip == BCM43224_CHIP_ID) ||
+           (wlc_hw->sih->chip == BCM43225_CHIP_ID)) {
+               if (spurmode == WL_SPURAVOID_ON2) {     /* 126Mhz */
+                       W_REG(&regs->tsf_clk_frac_l, 0x2082);
+                       W_REG(&regs->tsf_clk_frac_h, 0x8);
+               } else if (spurmode == WL_SPURAVOID_ON1) {      /* 123Mhz */
+                       W_REG(&regs->tsf_clk_frac_l, 0x5341);
+                       W_REG(&regs->tsf_clk_frac_h, 0x8);
+               } else {        /* 120Mhz */
+                       W_REG(&regs->tsf_clk_frac_l, 0x8889);
+                       W_REG(&regs->tsf_clk_frac_h, 0x8);
+               }
+       } else if (BRCMS_ISLCNPHY(wlc_hw->band)) {
+               if (spurmode == WL_SPURAVOID_ON1) {     /* 82Mhz */
+                       W_REG(&regs->tsf_clk_frac_l, 0x7CE0);
+                       W_REG(&regs->tsf_clk_frac_h, 0xC);
+               } else {        /* 80Mhz */
+                       W_REG(&regs->tsf_clk_frac_l, 0xCCCD);
+                       W_REG(&regs->tsf_clk_frac_h, 0xC);
+               }
+       }
+}
+
+/* Initialize GPIOs that are controlled by D11 core */
+static void brcms_c_gpio_init(struct brcms_c_info *wlc)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       d11regs_t *regs;
+       u32 gc, gm;
+
+       regs = wlc_hw->regs;
+
+       /* use GPIO select 0 to get all gpio signals from the gpio out reg */
+       brcms_b_mctrl(wlc_hw, MCTL_GPOUT_SEL_MASK, 0);
+
+       /*
+        * Common GPIO setup:
+        *      G0 = LED 0 = WLAN Activity
+        *      G1 = LED 1 = WLAN 2.4 GHz Radio State
+        *      G2 = LED 2 = WLAN 5 GHz Radio State
+        *      G4 = radio disable input (HI enabled, LO disabled)
+        */
+
+       gc = gm = 0;
+
+       /* Allocate GPIOs for mimo antenna diversity feature */
+       if (wlc_hw->antsel_type == ANTSEL_2x3) {
+               /* Enable antenna diversity, use 2x3 mode */
+               brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_EN,
+                            MHF3_ANTSEL_EN, BRCM_BAND_ALL);
+               brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_MODE,
+                            MHF3_ANTSEL_MODE, BRCM_BAND_ALL);
+
+               /* init superswitch control */
+               wlc_phy_antsel_init(wlc_hw->band->pi, false);
+
+       } else if (wlc_hw->antsel_type == ANTSEL_2x4) {
+               gm |= gc |= (BOARD_GPIO_12 | BOARD_GPIO_13);
+               /*
+                * The board itself is powered by these GPIOs
+                * (when not sending pattern) so set them high
+                */
+               OR_REG(&regs->psm_gpio_oe,
+                      (BOARD_GPIO_12 | BOARD_GPIO_13));
+               OR_REG(&regs->psm_gpio_out,
+                      (BOARD_GPIO_12 | BOARD_GPIO_13));
+
+               /* Enable antenna diversity, use 2x4 mode */
+               brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_EN,
+                            MHF3_ANTSEL_EN, BRCM_BAND_ALL);
+               brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_MODE, 0,
+                            BRCM_BAND_ALL);
+
+               /* Configure the desired clock to be 4Mhz */
+               brcms_b_write_shm(wlc_hw, M_ANTSEL_CLKDIV,
+                                  ANTSEL_CLKDIV_4MHZ);
+       }
+
+       /* gpio 9 controls the PA.  ucode is responsible for wiggling out and oe */
+       if (wlc_hw->boardflags & BFL_PACTRL)
+               gm |= gc |= BOARD_GPIO_PACTRL;
+
+       /* apply to gpiocontrol register */
+       ai_gpiocontrol(wlc_hw->sih, gm, gc, GPIO_DRV_PRIORITY);
+}
+
+static void brcms_ucode_download(struct brcms_hardware *wlc_hw)
+{
+       struct brcms_c_info *wlc;
+       wlc = wlc_hw->wlc;
+
+       if (wlc_hw->ucode_loaded)
+               return;
+
+       if (D11REV_IS(wlc_hw->corerev, 23)) {
+               if (BRCMS_ISNPHY(wlc_hw->band)) {
+                       brcms_ucode_write(wlc_hw, bcm43xx_16_mimo,
+                                       bcm43xx_16_mimosz);
+                       wlc_hw->ucode_loaded = true;
+               } else
+                       wiphy_err(wlc->wiphy, "%s: wl%d: unsupported phy in "
+                                 "corerev %d\n",
+                                 __func__, wlc_hw->unit, wlc_hw->corerev);
+       } else if (D11REV_IS(wlc_hw->corerev, 24)) {
+               if (BRCMS_ISLCNPHY(wlc_hw->band)) {
+                       brcms_ucode_write(wlc_hw, bcm43xx_24_lcn,
+                                       bcm43xx_24_lcnsz);
+                       wlc_hw->ucode_loaded = true;
+               } else {
+                       wiphy_err(wlc->wiphy, "%s: wl%d: unsupported phy in "
+                                 "corerev %d\n",
+                                 __func__, wlc_hw->unit, wlc_hw->corerev);
+               }
+       }
+}
+
+static void brcms_ucode_write(struct brcms_hardware *wlc_hw, const u32 ucode[],
+                             const uint nbytes) {
+       d11regs_t *regs = wlc_hw->regs;
+       uint i;
+       uint count;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       count = (nbytes / sizeof(u32));
+
+       W_REG(&regs->objaddr, (OBJADDR_AUTO_INC | OBJADDR_UCM_SEL));
+       (void)R_REG(&regs->objaddr);
+       for (i = 0; i < count; i++)
+               W_REG(&regs->objdata, ucode[i]);
+}
+
+static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,
+                           const struct d11init *inits)
+{
+       int i;
+       volatile u8 *base;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       base = (volatile u8 *)wlc_hw->regs;
+
+       for (i = 0; inits[i].addr != 0xffff; i++) {
+               if (inits[i].size == 2)
+                       W_REG((u16 *)(base + inits[i].addr),
+                             inits[i].value);
+               else if (inits[i].size == 4)
+                       W_REG((u32 *)(base + inits[i].addr),
+                             inits[i].value);
+       }
+}
+
+static void brcms_c_ucode_txant_set(struct brcms_hardware *wlc_hw)
+{
+       u16 phyctl;
+       u16 phytxant = wlc_hw->bmac_phytxant;
+       u16 mask = PHY_TXC_ANT_MASK;
+
+       /* set the Probe Response frame phy control word */
+       phyctl = brcms_b_read_shm(wlc_hw, M_CTXPRS_BLK + C_CTX_PCTLWD_POS);
+       phyctl = (phyctl & ~mask) | phytxant;
+       brcms_b_write_shm(wlc_hw, M_CTXPRS_BLK + C_CTX_PCTLWD_POS, phyctl);
+
+       /* set the Response (ACK/CTS) frame phy control word */
+       phyctl = brcms_b_read_shm(wlc_hw, M_RSP_PCTLWD);
+       phyctl = (phyctl & ~mask) | phytxant;
+       brcms_b_write_shm(wlc_hw, M_RSP_PCTLWD, phyctl);
+}
+
+void brcms_b_txant_set(struct brcms_hardware *wlc_hw, u16 phytxant)
+{
+       /* update sw state */
+       wlc_hw->bmac_phytxant = phytxant;
+
+       /* push to ucode if up */
+       if (!wlc_hw->up)
+               return;
+       brcms_c_ucode_txant_set(wlc_hw);
+
+}
+
+u16 brcms_b_get_txant(struct brcms_hardware *wlc_hw)
+{
+       return (u16) wlc_hw->wlc->stf->txant;
+}
+
+void brcms_b_antsel_type_set(struct brcms_hardware *wlc_hw, u8 antsel_type)
+{
+       wlc_hw->antsel_type = antsel_type;
+
+       /* Update the antsel type for phy module to use */
+       wlc_phy_antsel_type_set(wlc_hw->band->pi, antsel_type);
+}
+
+void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
+{
+       bool fatal = false;
+       uint unit;
+       uint intstatus, idx;
+       d11regs_t *regs = wlc_hw->regs;
+       struct wiphy *wiphy = wlc_hw->wlc->wiphy;
+
+       unit = wlc_hw->unit;
+
+       for (idx = 0; idx < NFIFO; idx++) {
+               /* read intstatus register and ignore any non-error bits */
+               intstatus =
+                   R_REG(&regs->intctrlregs[idx].intstatus) & I_ERRORS;
+               if (!intstatus)
+                       continue;
+
+               BCMMSG(wlc_hw->wlc->wiphy, "wl%d: intstatus%d 0x%x\n",
+                       unit, idx, intstatus);
+
+               if (intstatus & I_RO) {
+                       wiphy_err(wiphy, "wl%d: fifo %d: receive fifo "
+                                 "overflow\n", unit, idx);
+                       fatal = true;
+               }
+
+               if (intstatus & I_PC) {
+                       wiphy_err(wiphy, "wl%d: fifo %d: descriptor error\n",
+                                unit, idx);
+                       fatal = true;
+               }
+
+               if (intstatus & I_PD) {
+                       wiphy_err(wiphy, "wl%d: fifo %d: data error\n", unit,
+                                 idx);
+                       fatal = true;
+               }
+
+               if (intstatus & I_DE) {
+                       wiphy_err(wiphy, "wl%d: fifo %d: descriptor protocol "
+                                 "error\n", unit, idx);
+                       fatal = true;
+               }
+
+               if (intstatus & I_RU) {
+                       wiphy_err(wiphy, "wl%d: fifo %d: receive descriptor "
+                                 "underflow\n", idx, unit);
+               }
+
+               if (intstatus & I_XU) {
+                       wiphy_err(wiphy, "wl%d: fifo %d: transmit fifo "
+                                 "underflow\n", idx, unit);
+                       fatal = true;
+               }
+
+               if (fatal) {
+                       brcms_c_fatal_error(wlc_hw->wlc);       /* big hammer */
+                       break;
+               } else
+                       W_REG(&regs->intctrlregs[idx].intstatus,
+                             intstatus);
+       }
+}
+
+void brcms_c_intrson(struct brcms_c_info *wlc)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       wlc->macintmask = wlc->defmacintmask;
+       W_REG(&wlc_hw->regs->macintmask, wlc->macintmask);
+}
+
+/* callback for siutils.c, which has only wlc handler, no wl
+ * they both check up, not only because there is no need to off/restore d11 interrupt
+ *  but also because per-port code may require sync with valid interrupt.
+ */
+
+static u32 brcms_c_wlintrsoff(struct brcms_c_info *wlc)
+{
+       if (!wlc->hw->up)
+               return 0;
+
+       return brcms_intrsoff(wlc->wl);
+}
+
+static void brcms_c_wlintrsrestore(struct brcms_c_info *wlc, u32 macintmask)
+{
+       if (!wlc->hw->up)
+               return;
+
+       brcms_intrsrestore(wlc->wl, macintmask);
+}
+
+u32 brcms_c_intrsoff(struct brcms_c_info *wlc)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       u32 macintmask;
+
+       if (!wlc_hw->clk)
+               return 0;
+
+       macintmask = wlc->macintmask;   /* isr can still happen */
+
+       W_REG(&wlc_hw->regs->macintmask, 0);
+       (void)R_REG(&wlc_hw->regs->macintmask); /* sync readback */
+       udelay(1);              /* ensure int line is no longer driven */
+       wlc->macintmask = 0;
+
+       /* return previous macintmask; resolve race between us and our isr */
+       return wlc->macintstatus ? 0 : macintmask;
+}
+
+void brcms_c_intrsrestore(struct brcms_c_info *wlc, u32 macintmask)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       if (!wlc_hw->clk)
+               return;
+
+       wlc->macintmask = macintmask;
+       W_REG(&wlc_hw->regs->macintmask, wlc->macintmask);
+}
+
+static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool on, mbool flags)
+{
+       u8 null_ether_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
+
+       if (on) {
+               /* suspend tx fifos */
+               brcms_b_tx_fifo_suspend(wlc_hw, TX_DATA_FIFO);
+               brcms_b_tx_fifo_suspend(wlc_hw, TX_CTL_FIFO);
+               brcms_b_tx_fifo_suspend(wlc_hw, TX_AC_BK_FIFO);
+               brcms_b_tx_fifo_suspend(wlc_hw, TX_AC_VI_FIFO);
+
+               /* zero the address match register so we do not send ACKs */
+               brcms_b_set_addrmatch(wlc_hw, RCM_MAC_OFFSET,
+                                      null_ether_addr);
+       } else {
+               /* resume tx fifos */
+               if (!wlc_hw->wlc->tx_suspended) {
+                       brcms_b_tx_fifo_resume(wlc_hw, TX_DATA_FIFO);
+               }
+               brcms_b_tx_fifo_resume(wlc_hw, TX_CTL_FIFO);
+               brcms_b_tx_fifo_resume(wlc_hw, TX_AC_BK_FIFO);
+               brcms_b_tx_fifo_resume(wlc_hw, TX_AC_VI_FIFO);
+
+               /* Restore address */
+               brcms_b_set_addrmatch(wlc_hw, RCM_MAC_OFFSET,
+                                      wlc_hw->etheraddr);
+       }
+
+       wlc_phy_mute_upd(wlc_hw->band->pi, on, flags);
+
+       if (on)
+               brcms_c_ucode_mute_override_set(wlc_hw);
+       else
+               brcms_c_ucode_mute_override_clear(wlc_hw);
+}
+
+int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,
+                          uint *blocks)
+{
+       if (fifo >= NFIFO)
+               return -EINVAL;
+
+       *blocks = wlc_hw->xmtfifo_sz[fifo];
+
+       return 0;
+}
+
+/* brcms_b_tx_fifo_suspended:
+ * Check the MAC's tx suspend status for a tx fifo.
+ *
+ * When the MAC acknowledges a tx suspend, it indicates that no more
+ * packets will be transmitted out the radio. This is independent of
+ * DMA channel suspension---the DMA may have finished suspending, or may still
+ * be pulling data into a tx fifo, by the time the MAC acks the suspend
+ * request.
+ */
+static bool brcms_b_tx_fifo_suspended(struct brcms_hardware *wlc_hw,
+                                     uint tx_fifo)
+{
+       /* check that a suspend has been requested and is no longer pending */
+
+       /*
+        * for DMA mode, the suspend request is set in xmtcontrol of the DMA engine,
+        * and the tx fifo suspend at the lower end of the MAC is acknowledged in the
+        * chnstatus register.
+        * The tx fifo suspend completion is independent of the DMA suspend completion and
+        *   may be acked before or after the DMA is suspended.
+        */
+       if (dma_txsuspended(wlc_hw->di[tx_fifo]) &&
+           (R_REG(&wlc_hw->regs->chnstatus) &
+            (1 << tx_fifo)) == 0)
+               return true;
+
+       return false;
+}
+
+static void brcms_b_tx_fifo_suspend(struct brcms_hardware *wlc_hw,
+                                   uint tx_fifo)
+{
+       u8 fifo = 1 << tx_fifo;
+
+       /* Two clients of this code, 11h Quiet period and scanning. */
+
+       /* only suspend if not already suspended */
+       if ((wlc_hw->suspended_fifos & fifo) == fifo)
+               return;
+
+       /* force the core awake only if not already */
+       if (wlc_hw->suspended_fifos == 0)
+               brcms_c_ucode_wake_override_set(wlc_hw,
+                                               BRCMS_WAKE_OVERRIDE_TXFIFO);
+
+       wlc_hw->suspended_fifos |= fifo;
+
+       if (wlc_hw->di[tx_fifo]) {
+               /* Suspending AMPDU transmissions in the middle can cause underflow
+                * which may result in mismatch between ucode and driver
+                * so suspend the mac before suspending the FIFO
+                */
+               if (BRCMS_PHY_11N_CAP(wlc_hw->band))
+                       brcms_c_suspend_mac_and_wait(wlc_hw->wlc);
+
+               dma_txsuspend(wlc_hw->di[tx_fifo]);
+
+               if (BRCMS_PHY_11N_CAP(wlc_hw->band))
+                       brcms_c_enable_mac(wlc_hw->wlc);
+       }
+}
+
+static void brcms_b_tx_fifo_resume(struct brcms_hardware *wlc_hw,
+                                  uint tx_fifo)
+{
+       /* BMAC_NOTE: BRCMS_TX_FIFO_ENAB is done in brcms_c_dpc() for DMA case
+        * but need to be done here for PIO otherwise the watchdog will catch
+        * the inconsistency and fire
+        */
+       /* Two clients of this code, 11h Quiet period and scanning. */
+       if (wlc_hw->di[tx_fifo])
+               dma_txresume(wlc_hw->di[tx_fifo]);
+
+       /* allow core to sleep again */
+       if (wlc_hw->suspended_fifos == 0)
+               return;
+       else {
+               wlc_hw->suspended_fifos &= ~(1 << tx_fifo);
+               if (wlc_hw->suspended_fifos == 0)
+                       brcms_c_ucode_wake_override_clear(wlc_hw,
+                                               BRCMS_WAKE_OVERRIDE_TXFIFO);
+       }
+}
+
+/*
+ * Read and clear macintmask and macintstatus and intstatus registers.
+ * This routine should be called with interrupts off
+ * Return:
+ *   -1 if DEVICEREMOVED(wlc) evaluates to true;
+ *   0 if the interrupt is not for us, or we are in some special cases;
+ *   device interrupt status bits otherwise.
+ */
+static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       d11regs_t *regs = wlc_hw->regs;
+       u32 macintstatus;
+
+       /* macintstatus includes a DMA interrupt summary bit */
+       macintstatus = R_REG(&regs->macintstatus);
+
+       BCMMSG(wlc->wiphy, "wl%d: macintstatus: 0x%x\n", wlc_hw->unit,
+                macintstatus);
+
+       /* detect cardbus removed, in power down(suspend) and in reset */
+       if (DEVICEREMOVED(wlc))
+               return -1;
+
+       /* DEVICEREMOVED succeeds even when the core is still resetting,
+        * handle that case here.
+        */
+       if (macintstatus == 0xffffffff)
+               return 0;
+
+       /* defer unsolicited interrupts */
+       macintstatus &= (in_isr ? wlc->macintmask : wlc->defmacintmask);
+
+       /* if not for us */
+       if (macintstatus == 0)
+               return 0;
+
+       /* interrupts are already turned off for CFE build
+        * Caution: For CFE Turning off the interrupts again has some undesired
+        * consequences
+        */
+       /* turn off the interrupts */
+       W_REG(&regs->macintmask, 0);
+       (void)R_REG(&regs->macintmask); /* sync readback */
+       wlc->macintmask = 0;
+
+       /* clear device interrupts */
+       W_REG(&regs->macintstatus, macintstatus);
+
+       /* MI_DMAINT is indication of non-zero intstatus */
+       if (macintstatus & MI_DMAINT) {
+               /*
+                * only fifo interrupt enabled is I_RI in
+                * RX_FIFO. If MI_DMAINT is set, assume it
+                * is set and clear the interrupt.
+                */
+               W_REG(&regs->intctrlregs[RX_FIFO].intstatus,
+                     DEF_RXINTMASK);
+       }
+
+       return macintstatus;
+}
+
+/* Update wlc->macintstatus and wlc->intstatus[]. */
+/* Return true if they are updated successfully. false otherwise */
+bool brcms_c_intrsupd(struct brcms_c_info *wlc)
+{
+       u32 macintstatus;
+
+       /* read and clear macintstatus and intstatus registers */
+       macintstatus = wlc_intstatus(wlc, false);
+
+       /* device is removed */
+       if (macintstatus == 0xffffffff)
+               return false;
+
+       /* update interrupt status in software */
+       wlc->macintstatus |= macintstatus;
+
+       return true;
+}
+
+/*
+ * First-level interrupt processing.
+ * Return true if this was our interrupt, false otherwise.
+ * *wantdpc will be set to true if further brcms_c_dpc() processing is required,
+ * false otherwise.
+ */
+bool brcms_c_isr(struct brcms_c_info *wlc, bool *wantdpc)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       u32 macintstatus;
+
+       *wantdpc = false;
+
+       if (!wlc_hw->up || !wlc->macintmask)
+               return false;
+
+       /* read and clear macintstatus and intstatus registers */
+       macintstatus = wlc_intstatus(wlc, true);
+
+       if (macintstatus == 0xffffffff)
+               wiphy_err(wlc->wiphy, "DEVICEREMOVED detected in the ISR code"
+                         " path\n");
+
+       /* it is not for us */
+       if (macintstatus == 0)
+               return false;
+
+       *wantdpc = true;
+
+       /* save interrupt status bits */
+       wlc->macintstatus = macintstatus;
+
+       return true;
+
+}
+
+static bool
+brcms_b_dotxstatus(struct brcms_hardware *wlc_hw, struct tx_status *txs,
+                  u32 s2)
+{
+       /* discard intermediate indications for ucode with one legitimate case:
+        *   e.g. if "useRTS" is set. ucode did a successful rts/cts exchange, but the subsequent
+        *   tx of DATA failed. so it will start rts/cts from the beginning (resetting the rts
+        *   transmission count)
+        */
+       if (!(txs->status & TX_STATUS_AMPDU)
+           && (txs->status & TX_STATUS_INTERMEDIATE)) {
+               return false;
+       }
+
+       return brcms_c_dotxstatus(wlc_hw->wlc, txs, s2);
+}
+
+/* process tx completion events in BMAC
+ * Return true if more tx status need to be processed. false otherwise.
+ */
+static bool
+brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
+{
+       bool morepending = false;
+       struct brcms_c_info *wlc = wlc_hw->wlc;
+       d11regs_t *regs;
+       struct tx_status txstatus, *txs;
+       u32 s1, s2;
+       uint n = 0;
+       /*
+        * Param 'max_tx_num' indicates max. # tx status to process before
+        * break out.
+        */
+       uint max_tx_num = bound ? wlc->pub->tunables->txsbnd : -1;
+
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       txs = &txstatus;
+       regs = wlc_hw->regs;
+       while (!(*fatal)
+              && (s1 = R_REG(&regs->frmtxstatus)) & TXS_V) {
+
+               if (s1 == 0xffffffff) {
+                       wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n",
+                               wlc_hw->unit, __func__);
+                       return morepending;
+               }
+
+                       s2 = R_REG(&regs->frmtxstatus2);
+
+               txs->status = s1 & TXS_STATUS_MASK;
+               txs->frameid = (s1 & TXS_FID_MASK) >> TXS_FID_SHIFT;
+               txs->sequence = s2 & TXS_SEQ_MASK;
+               txs->phyerr = (s2 & TXS_PTX_MASK) >> TXS_PTX_SHIFT;
+               txs->lasttxtime = 0;
+
+               *fatal = brcms_b_dotxstatus(wlc_hw, txs, s2);
+
+               /* !give others some time to run! */
+               if (++n >= max_tx_num)
+                       break;
+       }
+
+       if (*fatal)
+               return 0;
+
+       if (n >= max_tx_num)
+               morepending = true;
+
+       if (!pktq_empty(&wlc->pkt_queue->q))
+               brcms_c_send_q(wlc);
+
+       return morepending;
+}
+
+void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       d11regs_t *regs = wlc_hw->regs;
+       u32 mc, mi;
+       struct wiphy *wiphy = wlc->wiphy;
+
+       BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
+               wlc_hw->band->bandunit);
+
+       /*
+        * Track overlapping suspend requests
+        */
+       wlc_hw->mac_suspend_depth++;
+       if (wlc_hw->mac_suspend_depth > 1)
+               return;
+
+       /* force the core awake */
+       brcms_c_ucode_wake_override_set(wlc_hw, BRCMS_WAKE_OVERRIDE_MACSUSPEND);
+
+       mc = R_REG(&regs->maccontrol);
+
+       if (mc == 0xffffffff) {
+               wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
+                         __func__);
+               brcms_down(wlc->wl);
+               return;
+       }
+       WARN_ON(mc & MCTL_PSM_JMP_0);
+       WARN_ON(!(mc & MCTL_PSM_RUN));
+       WARN_ON(!(mc & MCTL_EN_MAC));
+
+       mi = R_REG(&regs->macintstatus);
+       if (mi == 0xffffffff) {
+               wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
+                         __func__);
+               brcms_down(wlc->wl);
+               return;
+       }
+       WARN_ON(mi & MI_MACSSPNDD);
+
+       brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, 0);
+
+       SPINWAIT(!(R_REG(&regs->macintstatus) & MI_MACSSPNDD),
+                BRCMS_MAX_MAC_SUSPEND);
+
+       if (!(R_REG(&regs->macintstatus) & MI_MACSSPNDD)) {
+               wiphy_err(wiphy, "wl%d: wlc_suspend_mac_and_wait: waited %d uS"
+                         " and MI_MACSSPNDD is still not on.\n",
+                         wlc_hw->unit, BRCMS_MAX_MAC_SUSPEND);
+               wiphy_err(wiphy, "wl%d: psmdebug 0x%08x, phydebug 0x%08x, "
+                         "psm_brc 0x%04x\n", wlc_hw->unit,
+                         R_REG(&regs->psmdebug),
+                         R_REG(&regs->phydebug),
+                         R_REG(&regs->psm_brc));
+       }
+
+       mc = R_REG(&regs->maccontrol);
+       if (mc == 0xffffffff) {
+               wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
+                         __func__);
+               brcms_down(wlc->wl);
+               return;
+       }
+       WARN_ON(mc & MCTL_PSM_JMP_0);
+       WARN_ON(!(mc & MCTL_PSM_RUN));
+       WARN_ON(mc & MCTL_EN_MAC);
+}
+
+void brcms_c_enable_mac(struct brcms_c_info *wlc)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       d11regs_t *regs = wlc_hw->regs;
+       u32 mc, mi;
+
+       BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
+               wlc->band->bandunit);
+
+       /*
+        * Track overlapping suspend requests
+        */
+       wlc_hw->mac_suspend_depth--;
+       if (wlc_hw->mac_suspend_depth > 0)
+               return;
+
+       mc = R_REG(&regs->maccontrol);
+       WARN_ON(mc & MCTL_PSM_JMP_0);
+       WARN_ON(mc & MCTL_EN_MAC);
+       WARN_ON(!(mc & MCTL_PSM_RUN));
+
+       brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, MCTL_EN_MAC);
+       W_REG(&regs->macintstatus, MI_MACSSPNDD);
+
+       mc = R_REG(&regs->maccontrol);
+       WARN_ON(mc & MCTL_PSM_JMP_0);
+       WARN_ON(!(mc & MCTL_EN_MAC));
+       WARN_ON(!(mc & MCTL_PSM_RUN));
+
+       mi = R_REG(&regs->macintstatus);
+       WARN_ON(mi & MI_MACSSPNDD);
+
+       brcms_c_ucode_wake_override_clear(wlc_hw,
+                                         BRCMS_WAKE_OVERRIDE_MACSUSPEND);
+}
+
+static void brcms_upd_ofdm_pctl1_table(struct brcms_hardware *wlc_hw)
+{
+       u8 rate;
+       u8 rates[8] = {
+               BRCM_RATE_6M, BRCM_RATE_9M, BRCM_RATE_12M, BRCM_RATE_18M,
+               BRCM_RATE_24M, BRCM_RATE_36M, BRCM_RATE_48M, BRCM_RATE_54M
+       };
+       u16 entry_ptr;
+       u16 pctl1;
+       uint i;
+
+       if (!BRCMS_PHY_11N_CAP(wlc_hw->band))
+               return;
+
+       /* walk the phy rate table and update the entries */
+       for (i = 0; i < ARRAY_SIZE(rates); i++) {
+               rate = rates[i];
+
+               entry_ptr = brcms_b_ofdm_ratetable_offset(wlc_hw, rate);
+
+               /* read the SHM Rate Table entry OFDM PCTL1 values */
+               pctl1 =
+                   brcms_b_read_shm(wlc_hw, entry_ptr + M_RT_OFDM_PCTL1_POS);
+
+               /* modify the value */
+               pctl1 &= ~PHY_TXC1_MODE_MASK;
+               pctl1 |= (wlc_hw->hw_stf_ss_opmode << PHY_TXC1_MODE_SHIFT);
+
+               /* Update the SHM Rate Table entry OFDM PCTL1 values */
+               brcms_b_write_shm(wlc_hw, entry_ptr + M_RT_OFDM_PCTL1_POS,
+                                  pctl1);
+       }
+}
+
+static u16 brcms_b_ofdm_ratetable_offset(struct brcms_hardware *wlc_hw,
+                                        u8 rate)
+{
+       uint i;
+       u8 plcp_rate = 0;
+       struct plcp_signal_rate_lookup {
+               u8 rate;
+               u8 signal_rate;
+       };
+       /* OFDM RATE sub-field of PLCP SIGNAL field, per 802.11 sec 17.3.4.1 */
+       const struct plcp_signal_rate_lookup rate_lookup[] = {
+               {BRCM_RATE_6M, 0xB},
+               {BRCM_RATE_9M, 0xF},
+               {BRCM_RATE_12M, 0xA},
+               {BRCM_RATE_18M, 0xE},
+               {BRCM_RATE_24M, 0x9},
+               {BRCM_RATE_36M, 0xD},
+               {BRCM_RATE_48M, 0x8},
+               {BRCM_RATE_54M, 0xC}
+       };
+
+       for (i = 0; i < ARRAY_SIZE(rate_lookup); i++) {
+               if (rate == rate_lookup[i].rate) {
+                       plcp_rate = rate_lookup[i].signal_rate;
+                       break;
+               }
+       }
+
+       /* Find the SHM pointer to the rate table entry by looking in the
+        * Direct-map Table
+        */
+       return 2 * brcms_b_read_shm(wlc_hw, M_RT_DIRMAP_A + (plcp_rate * 2));
+}
+
+void brcms_b_band_stf_ss_set(struct brcms_hardware *wlc_hw, u8 stf_mode)
+{
+       wlc_hw->hw_stf_ss_opmode = stf_mode;
+
+       if (wlc_hw->clk)
+               brcms_upd_ofdm_pctl1_table(wlc_hw);
+}
+
+void
+brcms_b_read_tsf(struct brcms_hardware *wlc_hw, u32 *tsf_l_ptr,
+                 u32 *tsf_h_ptr)
+{
+       d11regs_t *regs = wlc_hw->regs;
+
+       /* read the tsf timer low, then high to get an atomic read */
+       *tsf_l_ptr = R_REG(&regs->tsf_timerlow);
+       *tsf_h_ptr = R_REG(&regs->tsf_timerhigh);
+
+       return;
+}
+
+static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw)
+{
+       d11regs_t *regs;
+       u32 w, val;
+       struct wiphy *wiphy = wlc_hw->wlc->wiphy;
+
+       BCMMSG(wiphy, "wl%d\n", wlc_hw->unit);
+
+       regs = wlc_hw->regs;
+
+       /* Validate dchip register access */
+
+       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
+       (void)R_REG(&regs->objaddr);
+       w = R_REG(&regs->objdata);
+
+       /* Can we write and read back a 32bit register? */
+       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
+       (void)R_REG(&regs->objaddr);
+       W_REG(&regs->objdata, (u32) 0xaa5555aa);
+
+       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
+       (void)R_REG(&regs->objaddr);
+       val = R_REG(&regs->objdata);
+       if (val != (u32) 0xaa5555aa) {
+               wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, "
+                         "expected 0xaa5555aa\n", wlc_hw->unit, val);
+               return false;
+       }
+
+       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
+       (void)R_REG(&regs->objaddr);
+       W_REG(&regs->objdata, (u32) 0x55aaaa55);
+
+       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
+       (void)R_REG(&regs->objaddr);
+       val = R_REG(&regs->objdata);
+       if (val != (u32) 0x55aaaa55) {
+               wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, "
+                         "expected 0x55aaaa55\n", wlc_hw->unit, val);
+               return false;
+       }
+
+       W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0);
+       (void)R_REG(&regs->objaddr);
+       W_REG(&regs->objdata, w);
+
+       /* clear CFPStart */
+       W_REG(&regs->tsf_cfpstart, 0);
+
+       w = R_REG(&regs->maccontrol);
+       if ((w != (MCTL_IHR_EN | MCTL_WAKE)) &&
+           (w != (MCTL_IHR_EN | MCTL_GMODE | MCTL_WAKE))) {
+               wiphy_err(wiphy, "wl%d: validate_chip_access: maccontrol = "
+                         "0x%x, expected 0x%x or 0x%x\n", wlc_hw->unit, w,
+                         (MCTL_IHR_EN | MCTL_WAKE),
+                         (MCTL_IHR_EN | MCTL_GMODE | MCTL_WAKE));
+               return false;
+       }
+
+       return true;
+}
+
+#define PHYPLL_WAIT_US 100000
+
+void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
+{
+       d11regs_t *regs;
+       u32 tmp;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       tmp = 0;
+       regs = wlc_hw->regs;
+
+       if (on) {
+               if ((wlc_hw->sih->chip == BCM4313_CHIP_ID)) {
+                       OR_REG(&regs->clk_ctl_st,
+                              (CCS_ERSRC_REQ_HT | CCS_ERSRC_REQ_D11PLL |
+                               CCS_ERSRC_REQ_PHYPLL));
+                       SPINWAIT((R_REG(&regs->clk_ctl_st) &
+                                 (CCS_ERSRC_AVAIL_HT)) != (CCS_ERSRC_AVAIL_HT),
+                                PHYPLL_WAIT_US);
+
+                       tmp = R_REG(&regs->clk_ctl_st);
+                       if ((tmp & (CCS_ERSRC_AVAIL_HT)) !=
+                           (CCS_ERSRC_AVAIL_HT)) {
+                               wiphy_err(wlc_hw->wlc->wiphy, "%s: turn on PHY"
+                                         " PLL failed\n", __func__);
+                       }
+               } else {
+                       OR_REG(&regs->clk_ctl_st,
+                              (CCS_ERSRC_REQ_D11PLL | CCS_ERSRC_REQ_PHYPLL));
+                       SPINWAIT((R_REG(&regs->clk_ctl_st) &
+                                 (CCS_ERSRC_AVAIL_D11PLL |
+                                  CCS_ERSRC_AVAIL_PHYPLL)) !=
+                                (CCS_ERSRC_AVAIL_D11PLL |
+                                 CCS_ERSRC_AVAIL_PHYPLL), PHYPLL_WAIT_US);
+
+                       tmp = R_REG(&regs->clk_ctl_st);
+                       if ((tmp &
+                            (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL))
+                           !=
+                           (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL)) {
+                               wiphy_err(wlc_hw->wlc->wiphy, "%s: turn on "
+                                         "PHY PLL failed\n", __func__);
+                       }
+               }
+       } else {
+               /* Since the PLL may be shared, other cores can still be requesting it;
+                * so we'll deassert the request but not wait for status to comply.
+                */
+               AND_REG(&regs->clk_ctl_st, ~CCS_ERSRC_REQ_PHYPLL);
+               tmp = R_REG(&regs->clk_ctl_st);
+       }
+}
+
+void brcms_c_coredisable(struct brcms_hardware *wlc_hw)
+{
+       bool dev_gone;
+
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+
+       dev_gone = DEVICEREMOVED(wlc_hw->wlc);
+
+       if (dev_gone)
+               return;
+
+       if (wlc_hw->noreset)
+               return;
+
+       /* radio off */
+       wlc_phy_switch_radio(wlc_hw->band->pi, OFF);
+
+       /* turn off analog core */
+       wlc_phy_anacore(wlc_hw->band->pi, OFF);
+
+       /* turn off PHYPLL to save power */
+       brcms_b_core_phypll_ctl(wlc_hw, false);
+
+       /* No need to set wlc->pub->radio_active = OFF
+        * because this function needs down capability and
+        * radio_active is designed for BCMNODOWN.
+        */
+
+       /* remove gpio controls */
+       if (wlc_hw->ucode_dbgsel)
+               ai_gpiocontrol(wlc_hw->sih, ~0, 0, GPIO_DRV_PRIORITY);
+
+       wlc_hw->clk = false;
+       ai_core_disable(wlc_hw->sih, 0);
+       wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, false);
+}
+
+/* power both the pll and external oscillator on/off */
+static void brcms_b_xtal(struct brcms_hardware *wlc_hw, bool want)
+{
+       BCMMSG(wlc_hw->wlc->wiphy, "wl%d: want %d\n", wlc_hw->unit, want);
+
+       /* dont power down if plldown is false or we must poll hw radio disable */
+       if (!want && wlc_hw->pllreq)
+               return;
+
+       if (wlc_hw->sih)
+               ai_clkctl_xtal(wlc_hw->sih, XTAL | PLL, want);
+
+       wlc_hw->sbclk = want;
+       if (!wlc_hw->sbclk) {
+               wlc_hw->clk = false;
+               if (wlc_hw->band && wlc_hw->band->pi)
+                       wlc_phy_hw_clk_state_upd(wlc_hw->band->pi, false);
+       }
+}
+
+static void brcms_c_flushqueues(struct brcms_c_info *wlc)
+{
+       struct brcms_hardware *wlc_hw = wlc->hw;
+       uint i;
+
+       wlc->txpend16165war = 0;
+
+       /* free any posted tx packets */
+       for (i = 0; i < NFIFO; i++)
+               if (wlc_hw->di[i]) {
+                       dma_txreclaim(wlc_hw->di[i], DMA_RANGE_ALL);
+                       TXPKTPENDCLR(wlc, i);
+                       BCMMSG(wlc->wiphy, "pktpend fifo %d clrd\n", i);
+               }
+
+       /* free any posted rx packets */
+       dma_rxreclaim(wlc_hw->di[RX_FIFO]);
+}
+
+u16 brcms_b_read_shm(struct brcms_hardware *wlc_hw, uint offset)
+{
+       return brcms_b_read_objmem(wlc_hw, offset, OBJADDR_SHM_SEL);
+}
+
+void brcms_b_write_shm(struct brcms_hardware *wlc_hw, uint offset, u16 v)
+{
+       brcms_b_write_objmem(wlc_hw, offset, v, OBJADDR_SHM_SEL);
+}
+
+static u16
+brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset, u32 sel)
+{
+       d11regs_t *regs = wlc_hw->regs;
+       volatile u16 *objdata_lo = (volatile u16 *)&regs->objdata;
+       volatile u16 *objdata_hi = objdata_lo + 1;
+       u16 v;
+
+       W_REG(&regs->objaddr, sel | (offset >> 2));
+       (void)R_REG(&regs->objaddr);
+       if (offset & 2) {
+               v = R_REG(objdata_hi);
+       } else {
+               v = R_REG(objdata_lo);
+       }
+
+       return v;
+}
+
+static void
+brcms_b_write_objmem(struct brcms_hardware *wlc_hw, uint offset, u16 v,
+                    u32 sel)
+{
+       d11regs_t *regs = wlc_hw->regs;
+       volatile u16 *objdata_lo = (volatile u16 *)&regs->objdata;
+       volatile u16 *objdata_hi = objdata_lo + 1;
+
+       W_REG(&regs->objaddr, sel | (offset >> 2));
+       (void)R_REG(&regs->objaddr);
+       if (offset & 2) {
+               W_REG(objdata_hi, v);
+       } else {
+               W_REG(objdata_lo, v);
+       }
+}
+
+/* Copy a buffer to shared memory of specified type .
+ * SHM 'offset' needs to be an even address and
+ * Buffer length 'len' must be an even number of bytes
+ * 'sel' selects the type of memory
+ */
+void
+brcms_b_copyto_objmem(struct brcms_hardware *wlc_hw, uint offset,
+                     const void *buf, int len, u32 sel)
+{
+       u16 v;
+       const u8 *p = (const u8 *)buf;
+       int i;
+
+       if (len <= 0 || (offset & 1) || (len & 1))
+               return;
+
+       for (i = 0; i < len; i += 2) {
+               v = p[i] | (p[i + 1] << 8);
+               brcms_b_write_objmem(wlc_hw, offset + i, v, sel);
+       }
+}
+
+/* Copy a piece of shared memory of specified type to a buffer .
+ * SHM 'offset' needs to be an even address and
+ * Buffer length 'len' must be an even number of bytes
+ * 'sel' selects the type of memory
+ */
+void
+brcms_b_copyfrom_objmem(struct brcms_hardware *wlc_hw, uint offset, void *buf,
+                        int len, u32 sel)
+{
+       u16 v;
+       u8 *p = (u8 *) buf;
+       int i;
+
+       if (len <= 0 || (offset & 1) || (len & 1))
+               return;
+
+       for (i = 0; i < len; i += 2) {
+               v = brcms_b_read_objmem(wlc_hw, offset + i, sel);
+               p[i] = v & 0xFF;
+               p[i + 1] = (v >> 8) & 0xFF;
+       }
+}
+
+void brcms_b_copyfrom_vars(struct brcms_hardware *wlc_hw, char **buf,
+                          uint *len)
+{
+       BCMMSG(wlc_hw->wlc->wiphy, "nvram vars totlen=%d\n",
+               wlc_hw->vars_size);
+
+       *buf = wlc_hw->vars;
+       *len = wlc_hw->vars_size;
+}
+
+void brcms_b_retrylimit_upd(struct brcms_hardware *wlc_hw, u16 SRL, u16 LRL)
+{
+       wlc_hw->SRL = SRL;
+       wlc_hw->LRL = LRL;
+
+       /* write retry limit to SCR, shouldn't need to suspend */
+       if (wlc_hw->up) {
+               W_REG(&wlc_hw->regs->objaddr,
+                     OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);
+               (void)R_REG(&wlc_hw->regs->objaddr);
+               W_REG(&wlc_hw->regs->objdata, wlc_hw->SRL);
+               W_REG(&wlc_hw->regs->objaddr,
+                     OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);
+               (void)R_REG(&wlc_hw->regs->objaddr);
+               W_REG(&wlc_hw->regs->objdata, wlc_hw->LRL);
+       }
+}
+
+void brcms_b_pllreq(struct brcms_hardware *wlc_hw, bool set, mbool req_bit)
+{
+       if (set) {
+               if (mboolisset(wlc_hw->pllreq, req_bit))
+                       return;
+
+               mboolset(wlc_hw->pllreq, req_bit);
+
+               if (mboolisset(wlc_hw->pllreq, BRCMS_PLLREQ_FLIP)) {
+                       if (!wlc_hw->sbclk) {
+                               brcms_b_xtal(wlc_hw, ON);
+                       }
+               }
+       } else {
+               if (!mboolisset(wlc_hw->pllreq, req_bit))
+                       return;
+
+               mboolclr(wlc_hw->pllreq, req_bit);
+
+               if (mboolisset(wlc_hw->pllreq, BRCMS_PLLREQ_FLIP)) {
+                       if (wlc_hw->sbclk) {
+                               brcms_b_xtal(wlc_hw, OFF);
+                       }
+               }
+       }
+
+       return;
+}
+
+u16 brcms_b_rate_shm_offset(struct brcms_hardware *wlc_hw, u8 rate)
+{
+       u16 table_ptr;
+       u8 phy_rate, index;
+
+       /* get the phy specific rate encoding for the PLCP SIGNAL field */
+       if (IS_OFDM(rate))
+               table_ptr = M_RT_DIRMAP_A;
+       else
+               table_ptr = M_RT_DIRMAP_B;
+
+       /* for a given rate, the LS-nibble of the PLCP SIGNAL field is
+        * the index into the rate table.
+        */
+       phy_rate = rate_info[rate] & BRCMS_RATE_MASK;
+       index = phy_rate & 0xf;
+
+       /* Find the SHM pointer to the rate table entry by looking in the
+        * Direct-map Table
+        */
+       return 2 * brcms_b_read_shm(wlc_hw, table_ptr + (index * 2));
+}
+
+void brcms_b_antsel_set(struct brcms_hardware *wlc_hw, u32 antsel_avail)
+{
+       wlc_hw->antsel_avail = antsel_avail;
+}
+
 /* conditions under which the PM bit should be set in outgoing frames and STAY_AWAKE is meaningful
  */
 bool brcms_c_ps_allowed(struct brcms_c_info *wlc)
@@ -1303,7 +4930,7 @@ void brcms_c_info_init(struct brcms_c_info *wlc, int unit)
 
 static bool brcms_c_state_bmac_sync(struct brcms_c_info *wlc)
 {
-       struct brcms_b_state state_bmac;
+       struct brcms_b_state state_bmac = {0};
 
        if (brcms_b_state_get(wlc->hw, &state_bmac) != 0)
                return false;
index f204b1f47475ea53db8353a38cff47c7af8f38c0..bf36f10998c0b508e1a97cf8f1e40c8ebf8e1963 100644 (file)
@@ -242,6 +242,12 @@ extern const u8 prio2fifo[];
 
 #define BRCMS_UNIT(wlc)                ((wlc)->pub->unit)
 
+#define brcms_b_copyfrom_shm(wlc_hw, offset, buf, len)                 \
+       brcms_b_copyfrom_objmem(wlc_hw, offset, buf, len, OBJADDR_SHM_SEL)
+
+#define brcms_b_copyto_shm(wlc_hw, offset, buf, len)                   \
+       brcms_b_copyto_objmem(wlc_hw, offset, buf, len, OBJADDR_SHM_SEL)
+
 struct brcms_protection {
        bool _g;                /* use g spec protection, driver internal */
        s8 g_override;  /* override for use of g spec protection */
@@ -1022,4 +1028,47 @@ extern bool brcms_c_stay_awake(struct brcms_c_info *wlc);
 extern void brcms_c_wme_initparams_sta(struct brcms_c_info *wlc,
                                       struct wme_param_ie *pe);
 
+extern void brcms_b_antsel_type_set(struct brcms_hardware *wlc_hw,
+                                    u8 antsel_type);
+
+/* chanspec, ucode interface */
+extern void brcms_b_set_chanspec(struct brcms_hardware *wlc_hw,
+                                 chanspec_t chanspec,
+                                 bool mute, struct txpwr_limits *txpwr);
+
+extern void brcms_b_write_shm(struct brcms_hardware *wlc_hw, uint offset,
+                             u16 v);
+extern u16 brcms_b_read_shm(struct brcms_hardware *wlc_hw, uint offset);
+
+extern void brcms_b_mhf(struct brcms_hardware *wlc_hw, u8 idx, u16 mask,
+                       u16 val, int bands);
+
+extern void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags);
+
+extern void brcms_b_mctrl(struct brcms_hardware *wlc_hw, u32 mask, u32 val);
+
+extern void brcms_b_phy_reset(struct brcms_hardware *wlc_hw);
+extern void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw);
+extern void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw);
+extern void brcms_c_ucode_wake_override_set(struct brcms_hardware *wlc_hw,
+                                       u32 override_bit);
+extern void brcms_c_ucode_wake_override_clear(struct brcms_hardware *wlc_hw,
+                                         u32 override_bit);
+extern void brcms_b_write_template_ram(struct brcms_hardware *wlc_hw,
+                                      int offset, int len, void *buf);
+extern u16 brcms_b_rate_shm_offset(struct brcms_hardware *wlc_hw, u8 rate);
+extern void brcms_b_copyto_objmem(struct brcms_hardware *wlc_hw,
+                                  uint offset, const void *buf, int len,
+                                  u32 sel);
+extern void brcms_b_copyfrom_objmem(struct brcms_hardware *wlc_hw, uint offset,
+                                    void *buf, int len, u32 sel);
+extern void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode);
+extern u16 brcms_b_get_txant(struct brcms_hardware *wlc_hw);
+extern void brcms_b_phyclk_fgc(struct brcms_hardware *wlc_hw, bool clk);
+extern void brcms_b_macphyclk_set(struct brcms_hardware *wlc_hw, bool clk);
+extern void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on);
+extern void brcms_b_txant_set(struct brcms_hardware *wlc_hw, u16 phytxant);
+extern void brcms_b_band_stf_ss_set(struct brcms_hardware *wlc_hw,
+                                   u8 stf_mode);
+
 #endif                         /* _BRCM_MAIN_H_ */
index 82ecdcda271f2bb3b66cda36313967bf6688aff1..56824f43605d8f20fac1f6344f127f1cb61d3744 100644 (file)
@@ -23,7 +23,6 @@
 #include <linux/slab.h>
 #include <net/mac80211.h>
 
-#include "bmac.h"
 #include "main.h"
 #include "mac80211_if.h"
 #include "phy_shim.h"
index a55ff0101782288209e57edcf45d5f9d40e92194..84fca47438c52a3883cdf3bd72941ecdd9f9d154 100644 (file)
@@ -22,7 +22,6 @@
 #include "phy/phy_hal.h"
 #include "channel.h"
 #include "main.h"
-#include "bmac.h"
 #include "stf.h"
 
 #define MIN_SPATIAL_EXPANSION  0