Skip to content

L
linux
Commit 16d2812e authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files
Options

brcm80211: smac: use bcma core register access functions for 802.11 core 

The driver now uses the bcma register access functions to read and
write the registers on the 802.11 core. The dma and phy code need
to be modified next and access to the other cores. That will be done
in coming patches.
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5204563a
Hide whitespace changes
Inline Side-by-side
Showing with 274 additions and 267 deletions
drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
View file @ 16d2812e
...@@ -504,6 +504,17 @@ static void ai_scan(struct si_pub *sih, struct bcma_bus *bus) ...@@ -504,6 +504,17 @@ static void ai_scan(struct si_pub *sih, struct bcma_bus *bus)
} }
} }
static struct bcma_device *ai_find_bcma_core(struct si_pub *sih, uint coreidx)
{
struct si_info *sii = (struct si_info *)sih;
struct bcma_device *core;
list_for_each_entry(core, &sii->icbus->cores, list) {
if (core->core_index == coreidx)
return core;
}
return NULL;
}
/* /*
* This function changes the logical "focus" to the indicated core. * This function changes the logical "focus" to the indicated core.
* Return the current core's virtual address. Since each core starts with the * Return the current core's virtual address. Since each core starts with the
...@@ -514,18 +525,16 @@ static void ai_scan(struct si_pub *sih, struct bcma_bus *bus) ...@@ -514,18 +525,16 @@ static void ai_scan(struct si_pub *sih, struct bcma_bus *bus)
void __iomem *ai_setcoreidx(struct si_pub *sih, uint coreidx) void __iomem *ai_setcoreidx(struct si_pub *sih, uint coreidx)
{ {
struct si_info *sii = (struct si_info *)sih; struct si_info *sii = (struct si_info *)sih;
u32 addr = sii->coresba[coreidx]; struct bcma_device *core;
u32 wrap = sii->wrapba[coreidx];
if (coreidx >= sii->numcores)
return NULL;
/* point bar0 window */ if (sii->curidx != coreidx) {
pci_write_config_dword(sii->pcibus, PCI_BAR0_WIN, addr); core = ai_find_bcma_core(sih, coreidx);
/* point bar0 2nd 4KB window */ if (core == NULL)
pci_write_config_dword(sii->pcibus, PCI_BAR0_WIN2, wrap); return NULL;
sii->curidx = coreidx;
(void)bcma_aread32(core, BCMA_IOST);
sii->curidx = coreidx;
}
return sii->curmap; return sii->curmap;
} }
...@@ -811,8 +820,6 @@ static struct si_info *ai_doattach(struct si_info *sii, ...@@ -811,8 +820,6 @@ static struct si_info *ai_doattach(struct si_info *sii,
uint socitype; uint socitype;
uint origidx; uint origidx;
/* assume the window is looking at chipcommon */
WARN_ON(pbus->mapped_core->id.id != BCMA_CORE_CHIPCOMMON);
memset((unsigned char *) sii, 0, sizeof(struct si_info)); memset((unsigned char *) sii, 0, sizeof(struct si_info));
savewin = 0; savewin = 0;
...@@ -823,13 +830,10 @@ static struct si_info *ai_doattach(struct si_info *sii, ...@@ -823,13 +830,10 @@ static struct si_info *ai_doattach(struct si_info *sii,
sii->curmap = regs; sii->curmap = regs;
sii->curwrap = sii->curmap + SI_CORE_SIZE; sii->curwrap = sii->curmap + SI_CORE_SIZE;
/* find Chipcommon address */ /* switch to Chipcommon core */
pci_read_config_dword(sii->pcibus, PCI_BAR0_WIN, &savewin); bcma_read32(pbus->drv_cc.core, 0);
if (!GOODCOREADDR(savewin, SI_ENUM_BASE)) savewin = SI_ENUM_BASE;
savewin = SI_ENUM_BASE;
pci_write_config_dword(sii->pcibus, PCI_BAR0_WIN,
SI_ENUM_BASE);
cc = (struct chipcregs __iomem *) regs; cc = (struct chipcregs __iomem *) regs;
/* bus/core/clk setup for register access */ /* bus/core/clk setup for register access */
...@@ -1036,18 +1040,18 @@ bool ai_backplane64(struct si_pub *sih) ...@@ -1036,18 +1040,18 @@ bool ai_backplane64(struct si_pub *sih)
/* return index of coreid or BADIDX if not found */ /* return index of coreid or BADIDX if not found */
uint ai_findcoreidx(struct si_pub *sih, uint coreid, uint coreunit) uint ai_findcoreidx(struct si_pub *sih, uint coreid, uint coreunit)
{ {
struct bcma_device *core;
struct si_info *sii; struct si_info *sii;
uint found; uint found;
uint i;
sii = (struct si_info *)sih; sii = (struct si_info *)sih;
found = 0; found = 0;
for (i = 0; i < sii->numcores; i++) list_for_each_entry(core, &sii->icbus->cores, list)
if (sii->coreid[i] == coreid) { if (core->id.id == coreid) {
if (found == coreunit) if (found == coreunit)
return i; return core->core_index;
found++; found++;
} }
......
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
View file @ 16d2812e
...@@ -1118,14 +1118,17 @@ brcms_c_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb, ...@@ -1118,14 +1118,17 @@ brcms_c_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,
u8 status_delay = 0; u8 status_delay = 0;
/* wait till the next 8 bytes of txstatus is available */ /* wait till the next 8 bytes of txstatus is available */
while (((s1 = R_REG(&wlc->regs->frmtxstatus)) & TXS_V) == 0) { s1 = bcma_read32(wlc->hw->d11core, D11REGOFFS(frmtxstatus));
while ((s1 & TXS_V) == 0) {
udelay(1); udelay(1);
status_delay++; status_delay++;
if (status_delay > 10) if (status_delay > 10)
return; /* error condition */ return; /* error condition */
s1 = bcma_read32(wlc->hw->d11core,
D11REGOFFS(frmtxstatus));
} }
s2 = R_REG(&wlc->regs->frmtxstatus2); s2 = bcma_read32(wlc->hw->d11core, D11REGOFFS(frmtxstatus2));
} }
if (scb) { if (scb) {
......
drivers/net/wireless/brcm80211/brcmsmac/d11.h
View file @ 16d2812e
...@@ -430,6 +430,9 @@ struct d11regs { ...@@ -430,6 +430,9 @@ struct d11regs {
u16 PAD[0x380]; /* 0x800 - 0xEFE */ u16 PAD[0x380]; /* 0x800 - 0xEFE */
}; };
/* d11 register field offset */
#define D11REGOFFS(field) offsetof(struct d11regs, field)
#define PIHR_BASE 0x0400 /* byte address of packed IHR region */ #define PIHR_BASE 0x0400 /* byte address of packed IHR region */
/* biststatus */ /* biststatus */
......
drivers/net/wireless/brcm80211/brcmsmac/main.c
View file @ 16d2812e
...@@ -388,10 +388,13 @@ static u16 get_sifs(struct brcms_band *band) ...@@ -388,10 +388,13 @@ static u16 get_sifs(struct brcms_band *band)
*/ */
static bool brcms_deviceremoved(struct brcms_c_info *wlc) static bool brcms_deviceremoved(struct brcms_c_info *wlc)
{ {
u32 macctrl;
if (!wlc->hw->clk) if (!wlc->hw->clk)
return ai_deviceremoved(wlc->hw->sih); return ai_deviceremoved(wlc->hw->sih);
return (R_REG(&wlc->hw->regs->maccontrol) & macctrl = bcma_read32(wlc->hw->d11core,
(MCTL_PSM_JMP_0 | MCTL_IHR_EN)) != MCTL_IHR_EN; D11REGOFFS(maccontrol));
return (macctrl & (MCTL_PSM_JMP_0 | MCTL_IHR_EN)) != MCTL_IHR_EN;
} }
/* sum the individual fifo tx pending packet counts */ /* sum the individual fifo tx pending packet counts */
...@@ -582,17 +585,15 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid) ...@@ -582,17 +585,15 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)
static void brcms_b_update_slot_timing(struct brcms_hardware *wlc_hw, static void brcms_b_update_slot_timing(struct brcms_hardware *wlc_hw,
bool shortslot) bool shortslot)
{ {
struct d11regs __iomem *regs; struct bcma_device *core = wlc_hw->d11core;
regs = wlc_hw->regs;
if (shortslot) { if (shortslot) {
/* 11g short slot: 11a timing */ /* 11g short slot: 11a timing */
W_REG(&regs->ifs_slot, 0x0207); /* APHY_SLOT_TIME */ bcma_write16(core, D11REGOFFS(ifs_slot), 0x0207);
brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, APHY_SLOT_TIME); brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, APHY_SLOT_TIME);
} else { } else {
/* 11g long slot: 11b timing */ /* 11g long slot: 11b timing */
W_REG(&regs->ifs_slot, 0x0212); /* BPHY_SLOT_TIME */ bcma_write16(core, D11REGOFFS(ifs_slot), 0x0212);
brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, BPHY_SLOT_TIME); brcms_b_write_shm(wlc_hw, M_DOT11_SLOT, BPHY_SLOT_TIME);
} }
} }
...@@ -672,24 +673,22 @@ static uint brcms_c_calc_frame_time(struct brcms_c_info *wlc, u32 ratespec, ...@@ -672,24 +673,22 @@ static uint brcms_c_calc_frame_time(struct brcms_c_info *wlc, u32 ratespec,
static void brcms_c_write_inits(struct brcms_hardware *wlc_hw, static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,
const struct d11init *inits) const struct d11init *inits)
{ {
struct bcma_device *core = wlc_hw->d11core;
int i; int i;
u8 __iomem *base; uint offset;
u8 __iomem *addr;
u16 size; u16 size;
u32 value; u32 value;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
base = (u8 __iomem *)wlc_hw->regs;
for (i = 0; inits[i].addr != cpu_to_le16(0xffff); i++) { for (i = 0; inits[i].addr != cpu_to_le16(0xffff); i++) {
size = le16_to_cpu(inits[i].size); size = le16_to_cpu(inits[i].size);
addr = base + le16_to_cpu(inits[i].addr); offset = le16_to_cpu(inits[i].addr);
value = le32_to_cpu(inits[i].value); value = le32_to_cpu(inits[i].value);
if (size == 2) if (size == 2)
W_REG((u16 __iomem *)addr, value); bcma_write16(core, offset, value);
else if (size == 4) else if (size == 4)
W_REG((u32 __iomem *)addr, value); bcma_write32(core, offset, value);
else else
break; break;
} }
...@@ -788,10 +787,12 @@ static u32 brcms_c_setband_inact(struct brcms_c_info *wlc, uint bandunit) ...@@ -788,10 +787,12 @@ static u32 brcms_c_setband_inact(struct brcms_c_info *wlc, uint bandunit)
{ {
struct brcms_hardware *wlc_hw = wlc->hw; struct brcms_hardware *wlc_hw = wlc->hw;
u32 macintmask; u32 macintmask;
u32 macctrl;
BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit); BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
macctrl = bcma_read32(wlc_hw->d11core,
WARN_ON((R_REG(&wlc_hw->regs->maccontrol) & MCTL_EN_MAC) != 0); D11REGOFFS(maccontrol));
WARN_ON((macctrl & MCTL_EN_MAC) != 0);
/* disable interrupts */ /* disable interrupts */
macintmask = brcms_intrsoff(wlc->wl); macintmask = brcms_intrsoff(wlc->wl);
...@@ -982,7 +983,7 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal) ...@@ -982,7 +983,7 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
{ {
bool morepending = false; bool morepending = false;
struct brcms_c_info *wlc = wlc_hw->wlc; struct brcms_c_info *wlc = wlc_hw->wlc;
struct d11regs __iomem *regs; struct bcma_device *core;
struct tx_status txstatus, *txs; struct tx_status txstatus, *txs;
u32 s1, s2; u32 s1, s2;
uint n = 0; uint n = 0;
...@@ -995,18 +996,18 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal) ...@@ -995,18 +996,18 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit); BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
txs = &txstatus; txs = &txstatus;
regs = wlc_hw->regs; core = wlc_hw->d11core;
*fatal = false; *fatal = false;
s1 = bcma_read32(core, D11REGOFFS(frmtxstatus));
while (!(*fatal) while (!(*fatal)
&& (s1 = R_REG(&regs->frmtxstatus)) & TXS_V) { && (s1 & TXS_V)) {
if (s1 == 0xffffffff) { if (s1 == 0xffffffff) {
wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n",
wlc_hw->unit, __func__); wlc_hw->unit, __func__);
return morepending; return morepending;
} }
s2 = bcma_read32(core, D11REGOFFS(frmtxstatus2));
s2 = R_REG(&regs->frmtxstatus2);
txs->status = s1 & TXS_STATUS_MASK; txs->status = s1 & TXS_STATUS_MASK;
txs->frameid = (s1 & TXS_FID_MASK) >> TXS_FID_SHIFT; txs->frameid = (s1 & TXS_FID_MASK) >> TXS_FID_SHIFT;
...@@ -1019,6 +1020,7 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal) ...@@ -1019,6 +1020,7 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
/* !give others some time to run! */ /* !give others some time to run! */
if (++n >= max_tx_num) if (++n >= max_tx_num)
break; break;
s1 = bcma_read32(core, D11REGOFFS(frmtxstatus));
} }
if (*fatal) if (*fatal)
...@@ -1066,9 +1068,11 @@ brcms_c_mhfdef(struct brcms_c_info *wlc, u16 *mhfs, u16 mhf2_init) ...@@ -1066,9 +1068,11 @@ brcms_c_mhfdef(struct brcms_c_info *wlc, u16 *mhfs, u16 mhf2_init)
static struct dma64regs __iomem * static struct dma64regs __iomem *
dmareg(struct brcms_hardware *hw, uint direction, uint fifonum) dmareg(struct brcms_hardware *hw, uint direction, uint fifonum)
{ {
struct d11regs __iomem *regs = hw->d11core->bus->mmio;
if (direction == DMA_TX) if (direction == DMA_TX)
return &(hw->regs->fifo64regs[fifonum].dmaxmt); return &(regs->fifo64regs[fifonum].dmaxmt);
return &(hw->regs->fifo64regs[fifonum].dmarcv); return &(regs->fifo64regs[fifonum].dmarcv);
} }
static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme) static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
...@@ -1214,29 +1218,33 @@ static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode) ...@@ -1214,29 +1218,33 @@ static void brcms_b_clkctl_clk(struct brcms_hardware *wlc_hw, uint mode)
if (wlc_hw->clk) { if (wlc_hw->clk) {
if (mode == CLK_FAST) { if (mode == CLK_FAST) {
OR_REG(&wlc_hw->regs->clk_ctl_st, bcma_set32(wlc_hw->d11core,
CCS_FORCEHT); D11REGOFFS(clk_ctl_st),
CCS_FORCEHT);
udelay(64); udelay(64);
SPINWAIT(((R_REG SPINWAIT(
(&wlc_hw->regs-> ((bcma_read32(wlc_hw->d11core,
clk_ctl_st) & CCS_HTAVAIL) == 0), D11REGOFFS(clk_ctl_st)) &
PMU_MAX_TRANSITION_DLY); CCS_HTAVAIL) == 0),
WARN_ON(!(R_REG PMU_MAX_TRANSITION_DLY);
(&wlc_hw->regs-> WARN_ON(!(bcma_read32(wlc_hw->d11core,
clk_ctl_st) & CCS_HTAVAIL)); D11REGOFFS(clk_ctl_st)) &
CCS_HTAVAIL));
} else { } else {
if ((ai_get_pmurev(wlc_hw->sih) == 0) && if ((ai_get_pmurev(wlc_hw->sih) == 0) &&
(R_REG (bcma_read32(wlc_hw->d11core,
(&wlc_hw->regs-> D11REGOFFS(clk_ctl_st)) &
clk_ctl_st) & (CCS_FORCEHT | CCS_HTAREQ))) (CCS_FORCEHT | CCS_HTAREQ)))
SPINWAIT(((R_REG SPINWAIT(
(&wlc_hw->regs-> ((bcma_read32(wlc_hw->d11core,
clk_ctl_st) & CCS_HTAVAIL) offsetof(struct d11regs,
== 0), clk_ctl_st)) &
PMU_MAX_TRANSITION_DLY); CCS_HTAVAIL) == 0),
AND_REG(&wlc_hw->regs->clk_ctl_st, PMU_MAX_TRANSITION_DLY);
bcma_mask32(wlc_hw->d11core,
D11REGOFFS(clk_ctl_st),
~CCS_FORCEHT); ~CCS_FORCEHT);
} }
} }
...@@ -1368,7 +1376,8 @@ static void brcms_c_mctrl_write(struct brcms_hardware *wlc_hw) ...@@ -1368,7 +1376,8 @@ static void brcms_c_mctrl_write(struct brcms_hardware *wlc_hw)
maccontrol |= MCTL_INFRA; maccontrol |= MCTL_INFRA;
} }
W_REG(&wlc_hw->regs->maccontrol, maccontrol); bcma_write32(wlc_hw->d11core, D11REGOFFS(maccontrol),
maccontrol);
} }
/* set or clear maccontrol bits */ /* set or clear maccontrol bits */
...@@ -1462,7 +1471,7 @@ static void ...@@ -1462,7 +1471,7 @@ static void
brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw, int match_reg_offset, brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw, int match_reg_offset,
const u8 *addr) const u8 *addr)
{ {
struct d11regs __iomem *regs; struct bcma_device *core = wlc_hw->d11core;
u16 mac_l; u16 mac_l;
u16 mac_m; u16 mac_m;
u16 mac_h; u16 mac_h;
...@@ -1470,38 +1479,36 @@ brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw, int match_reg_offset, ...@@ -1470,38 +1479,36 @@ brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw, int match_reg_offset,
BCMMSG(wlc_hw->wlc->wiphy, "wl%d: brcms_b_set_addrmatch\n", BCMMSG(wlc_hw->wlc->wiphy, "wl%d: brcms_b_set_addrmatch\n",
wlc_hw->unit); wlc_hw->unit);
regs = wlc_hw->regs;
mac_l = addr[0] | (addr[1] << 8); mac_l = addr[0] | (addr[1] << 8);
mac_m = addr[2] | (addr[3] << 8); mac_m = addr[2] | (addr[3] << 8);
mac_h = addr[4] | (addr[5] << 8); mac_h = addr[4] | (addr[5] << 8);
/* enter the MAC addr into the RXE match registers */ /* enter the MAC addr into the RXE match registers */
W_REG(&regs->rcm_ctl, RCM_INC_DATA | match_reg_offset); bcma_write16(core, D11REGOFFS(rcm_ctl),
W_REG(&regs->rcm_mat_data, mac_l); RCM_INC_DATA | match_reg_offset);
W_REG(&regs->rcm_mat_data, mac_m); bcma_write16(core, D11REGOFFS(rcm_mat_data), mac_l);
W_REG(&regs->rcm_mat_data, mac_h); bcma_write16(core, D11REGOFFS(rcm_mat_data), mac_m);
bcma_write16(core, D11REGOFFS(rcm_mat_data), mac_h);
} }
void void
brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len, brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len,
void *buf) void *buf)
{ {
struct d11regs __iomem *regs; struct bcma_device *core = wlc_hw->d11core;
u32 word; u32 word;
__le32 word_le; __le32 word_le;
__be32 word_be; __be32 word_be;
bool be_bit; bool be_bit;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
regs = wlc_hw->regs; bcma_write32(core, D11REGOFFS(tplatewrptr), offset);
W_REG(&regs->tplatewrptr, offset);
/* if MCTL_BIGEND bit set in mac control register, /* if MCTL_BIGEND bit set in mac control register,
* the chip swaps data in fifo, as well as data in * the chip swaps data in fifo, as well as data in
* template ram * template ram
*/ */
be_bit = (R_REG(&regs->maccontrol) & MCTL_BIGEND) != 0; be_bit = (bcma_read32(core, D11REGOFFS(maccontrol)) & MCTL_BIGEND) != 0;
while (len > 0) { while (len > 0) {
memcpy(&word, buf, sizeof(u32)); memcpy(&word, buf, sizeof(u32));
...@@ -1514,7 +1521,7 @@ brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len, ...@@ -1514,7 +1521,7 @@ brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len,
word = *(u32 *)&word_le; word = *(u32 *)&word_le;
} }
W_REG(&regs->tplatewrdata, word); bcma_write32(core, D11REGOFFS(tplatewrdata), word);
buf = (u8 *) buf + sizeof(u32); buf = (u8 *) buf + sizeof(u32);
len -= sizeof(u32); len -= sizeof(u32);
...@@ -1525,18 +1532,20 @@ static void brcms_b_set_cwmin(struct brcms_hardware *wlc_hw, u16 newmin) ...@@ -1525,18 +1532,20 @@ static void brcms_b_set_cwmin(struct brcms_hardware *wlc_hw, u16 newmin)
{ {
wlc_hw->band->CWmin = newmin; wlc_hw->band->CWmin = newmin;
W_REG(&wlc_hw->regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_CWMIN); bcma_write32(wlc_hw->d11core, D11REGOFFS(objaddr),
(void)R_REG(&wlc_hw->regs->objaddr); OBJADDR_SCR_SEL | S_DOT11_CWMIN);
W_REG(&wlc_hw->regs->objdata, newmin); (void)bcma_read32(wlc_hw->d11core, D11REGOFFS(objaddr));
bcma_write32(wlc_hw->d11core, D11REGOFFS(objdata), newmin);
} }
static void brcms_b_set_cwmax(struct brcms_hardware *wlc_hw, u16 newmax) static void brcms_b_set_cwmax(struct brcms_hardware *wlc_hw, u16 newmax)
{ {
wlc_hw->band->CWmax = newmax; wlc_hw->band->CWmax = newmax;
W_REG(&wlc_hw->regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_CWMAX); bcma_write32(wlc_hw->d11core, D11REGOFFS(objaddr),
(void)R_REG(&wlc_hw->regs->objaddr); OBJADDR_SCR_SEL | S_DOT11_CWMAX);
W_REG(&wlc_hw->regs->objdata, newmax); (void)bcma_read32(wlc_hw->d11core, D11REGOFFS(objaddr));
bcma_write32(wlc_hw->d11core, D11REGOFFS(objdata), newmax);
} }
void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw) void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw)
...@@ -1815,7 +1824,8 @@ static void brcms_b_setband(struct brcms_hardware *wlc_hw, uint bandunit, ...@@ -1815,7 +1824,8 @@ static void brcms_b_setband(struct brcms_hardware *wlc_hw, uint bandunit,
brcms_intrsrestore(wlc->wl, macintmask); brcms_intrsrestore(wlc->wl, macintmask);
/* ucode should still be suspended.. */ /* ucode should still be suspended.. */
WARN_ON((R_REG(&wlc_hw->regs->maccontrol) & MCTL_EN_MAC) != 0); WARN_ON((bcma_read32(wlc_hw->d11core, D11REGOFFS(maccontrol)) &
MCTL_EN_MAC) != 0);
} }
static bool brcms_c_isgoodchip(struct brcms_hardware *wlc_hw) static bool brcms_c_isgoodchip(struct brcms_hardware *wlc_hw)
...@@ -1937,13 +1947,14 @@ static bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw) ...@@ -1937,13 +1947,14 @@ static bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw)
*/ */
if ((ai_get_chip_id(wlc_hw->sih) == BCM43224_CHIP_ID) || if ((ai_get_chip_id(wlc_hw->sih) == BCM43224_CHIP_ID) ||
(ai_get_chip_id(wlc_hw->sih) == BCM43225_CHIP_ID)) (ai_get_chip_id(wlc_hw->sih) == BCM43225_CHIP_ID))
wlc_hw->regs = (struct d11regs __iomem *) (void)ai_setcore(wlc_hw->sih, D11_CORE_ID, 0);
ai_setcore(wlc_hw->sih, D11_CORE_ID, 0);
ai_core_reset(wlc_hw->sih, flags, resetbits); ai_core_reset(wlc_hw->sih, flags, resetbits);
brcms_c_mctrl_reset(wlc_hw); brcms_c_mctrl_reset(wlc_hw);
} }
v = ((R_REG(&wlc_hw->regs->phydebug) & PDBG_RFD) != 0); v = ((bcma_read32(wlc_hw->d11core,
D11REGOFFS(phydebug)) & PDBG_RFD) != 0);
/* put core back into reset */ /* put core back into reset */
if (!clk) if (!clk)
...@@ -1971,7 +1982,6 @@ static bool wlc_dma_rxreset(struct brcms_hardware *wlc_hw, uint fifo) ...@@ -1971,7 +1982,6 @@ static bool wlc_dma_rxreset(struct brcms_hardware *wlc_hw, uint fifo)
*/ */
void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags) void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
{ {
struct d11regs __iomem *regs;
uint i; uint i;
bool fastclk; bool fastclk;
u32 resetbits = 0; u32 resetbits = 0;
...@@ -1981,8 +1991,6 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags) ...@@ -1981,8 +1991,6 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
regs = wlc_hw->regs;
/* request FAST clock if not on */ /* request FAST clock if not on */
fastclk = wlc_hw->forcefastclk; fastclk = wlc_hw->forcefastclk;
if (!fastclk) if (!fastclk)
...@@ -2055,7 +2063,7 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags) ...@@ -2055,7 +2063,7 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
*/ */
static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw) static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw)
{ {
struct d11regs __iomem *regs = wlc_hw->regs; struct bcma_device *core = wlc_hw->d11core;
u16 fifo_nu; u16 fifo_nu;
u16 txfifo_startblk = TXFIFO_START_BLK, txfifo_endblk; u16 txfifo_startblk = TXFIFO_START_BLK, txfifo_endblk;
u16 txfifo_def, txfifo_def1; u16 txfifo_def, txfifo_def1;
...@@ -2076,11 +2084,11 @@ static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw) ...@@ -2076,11 +2084,11 @@ static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw)
txfifo_cmd = txfifo_cmd =
TXFIFOCMD_RESET_MASK | (fifo_nu << TXFIFOCMD_FIFOSEL_SHIFT); TXFIFOCMD_RESET_MASK | (fifo_nu << TXFIFOCMD_FIFOSEL_SHIFT);
W_REG(&regs->xmtfifocmd, txfifo_cmd); bcma_write16(core, D11REGOFFS(xmtfifocmd), txfifo_cmd);
W_REG(&regs->xmtfifodef, txfifo_def); bcma_write16(core, D11REGOFFS(xmtfifodef), txfifo_def);
W_REG(&regs->xmtfifodef1, txfifo_def1); bcma_write16(core, D11REGOFFS(xmtfifodef1), txfifo_def1);
W_REG(&regs->xmtfifocmd, txfifo_cmd); bcma_write16(core, D11REGOFFS(xmtfifocmd), txfifo_cmd);
txfifo_startblk += wlc_hw->xmtfifo_sz[fifo_nu]; txfifo_startblk += wlc_hw->xmtfifo_sz[fifo_nu];
} }
...@@ -2115,27 +2123,27 @@ static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw) ...@@ -2115,27 +2123,27 @@ static void brcms_b_corerev_fifofixup(struct brcms_hardware *wlc_hw)
void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode) void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode)
{ {
struct d11regs __iomem *regs = wlc_hw->regs; struct bcma_device *core = wlc_hw->d11core;
if ((ai_get_chip_id(wlc_hw->sih) == BCM43224_CHIP_ID) || if ((ai_get_chip_id(wlc_hw->sih) == BCM43224_CHIP_ID) ||
(ai_get_chip_id(wlc_hw->sih) == BCM43225_CHIP_ID)) { (ai_get_chip_id(wlc_hw->sih) == BCM43225_CHIP_ID)) {
if (spurmode == WL_SPURAVOID_ON2) { /* 126Mhz */ if (spurmode == WL_SPURAVOID_ON2) { /* 126Mhz */
W_REG(&regs->tsf_clk_frac_l, 0x2082); bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x2082);
W_REG(&regs->tsf_clk_frac_h, 0x8); bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0x8);
} else if (spurmode == WL_SPURAVOID_ON1) { /* 123Mhz */ } else if (spurmode == WL_SPURAVOID_ON1) { /* 123Mhz */
W_REG(&regs->tsf_clk_frac_l, 0x5341); bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x5341);
W_REG(&regs->tsf_clk_frac_h, 0x8); bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0x8);
} else { /* 120Mhz */ } else { /* 120Mhz */
W_REG(&regs->tsf_clk_frac_l, 0x8889); bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x8889);
W_REG(&regs->tsf_clk_frac_h, 0x8); bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0x8);
} }
} else if (BRCMS_ISLCNPHY(wlc_hw->band)) { } else if (BRCMS_ISLCNPHY(wlc_hw->band)) {
if (spurmode == WL_SPURAVOID_ON1) { /* 82Mhz */ if (spurmode == WL_SPURAVOID_ON1) { /* 82Mhz */
W_REG(&regs->tsf_clk_frac_l, 0x7CE0); bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0x7CE0);
W_REG(&regs->tsf_clk_frac_h, 0xC); bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0xC);
} else { /* 80Mhz */ } else { /* 80Mhz */
W_REG(&regs->tsf_clk_frac_l, 0xCCCD); bcma_write16(core, D11REGOFFS(tsf_clk_frac_l), 0xCCCD);
W_REG(&regs->tsf_clk_frac_h, 0xC); bcma_write16(core, D11REGOFFS(tsf_clk_frac_h), 0xC);
} }
} }
} }
...@@ -2144,11 +2152,8 @@ void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode) ...@@ -2144,11 +2152,8 @@ void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode)
static void brcms_c_gpio_init(struct brcms_c_info *wlc) static void brcms_c_gpio_init(struct brcms_c_info *wlc)
{ {
struct brcms_hardware *wlc_hw = wlc->hw; struct brcms_hardware *wlc_hw = wlc->hw;
struct d11regs __iomem *regs;
u32 gc, gm; u32 gc, gm;
regs = wlc_hw->regs;
/* use GPIO select 0 to get all gpio signals from the gpio out reg */ /* use GPIO select 0 to get all gpio signals from the gpio out reg */
brcms_b_mctrl(wlc_hw, MCTL_GPOUT_SEL_MASK, 0); brcms_b_mctrl(wlc_hw, MCTL_GPOUT_SEL_MASK, 0);
...@@ -2179,10 +2184,10 @@ static void brcms_c_gpio_init(struct brcms_c_info *wlc) ...@@ -2179,10 +2184,10 @@ static void brcms_c_gpio_init(struct brcms_c_info *wlc)
* The board itself is powered by these GPIOs * The board itself is powered by these GPIOs
* (when not sending pattern) so set them high * (when not sending pattern) so set them high
*/ */
OR_REG(&regs->psm_gpio_oe, bcma_set16(wlc_hw->d11core, D11REGOFFS(psm_gpio_oe),
(BOARD_GPIO_12 | BOARD_GPIO_13)); (BOARD_GPIO_12 | BOARD_GPIO_13));
OR_REG(&regs->psm_gpio_out, bcma_set16(wlc_hw->d11core, D11REGOFFS(psm_gpio_out),
(BOARD_GPIO_12 | BOARD_GPIO_13)); (BOARD_GPIO_12 | BOARD_GPIO_13));
/* Enable antenna diversity, use 2x4 mode */ /* Enable antenna diversity, use 2x4 mode */
brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_EN, brcms_b_mhf(wlc_hw, MHF3, MHF3_ANTSEL_EN,
...@@ -2209,7 +2214,7 @@ static void brcms_c_gpio_init(struct brcms_c_info *wlc) ...@@ -2209,7 +2214,7 @@ static void brcms_c_gpio_init(struct brcms_c_info *wlc)
static void brcms_ucode_write(struct brcms_hardware *wlc_hw, static void brcms_ucode_write(struct brcms_hardware *wlc_hw,
const __le32 ucode[], const size_t nbytes) const __le32 ucode[], const size_t nbytes)
{ {
struct d11regs __iomem *regs = wlc_hw->regs; struct bcma_device *core = wlc_hw->d11core;
uint i; uint i;
uint count; uint count;
...@@ -2217,10 +2222,11 @@ static void brcms_ucode_write(struct brcms_hardware *wlc_hw, ...@@ -2217,10 +2222,11 @@ static void brcms_ucode_write(struct brcms_hardware *wlc_hw,
count = (nbytes / sizeof(u32)); count = (nbytes / sizeof(u32));
W_REG(&regs->objaddr, (OBJADDR_AUTO_INC | OBJADDR_UCM_SEL)); bcma_write32(core, D11REGOFFS(objaddr),
(void)R_REG(&regs->objaddr); OBJADDR_AUTO_INC | OBJADDR_UCM_SEL);
(void)bcma_read32(core, D11REGOFFS(objaddr));
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
W_REG(&regs->objdata, le32_to_cpu(ucode[i])); bcma_write32(core, D11REGOFFS(objdata), le32_to_cpu(ucode[i]));
} }
...@@ -2286,7 +2292,7 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw) ...@@ -2286,7 +2292,7 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
bool fatal = false; bool fatal = false;
uint unit; uint unit;
uint intstatus, idx; uint intstatus, idx;
struct d11regs __iomem *regs = wlc_hw->regs; struct bcma_device *core = wlc_hw->d11core;
struct wiphy *wiphy = wlc_hw->wlc->wiphy; struct wiphy *wiphy = wlc_hw->wlc->wiphy;
unit = wlc_hw->unit; unit = wlc_hw->unit;
...@@ -2294,7 +2300,9 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw) ...@@ -2294,7 +2300,9 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
for (idx = 0; idx < NFIFO; idx++) { for (idx = 0; idx < NFIFO; idx++) {
/* read intstatus register and ignore any non-error bits */ /* read intstatus register and ignore any non-error bits */
intstatus = intstatus =
R_REG(&regs->intctrlregs[idx].intstatus) & I_ERRORS; bcma_read32(core,
D11REGOFFS(intctrlregs[idx].intstatus)) &
I_ERRORS;
if (!intstatus) if (!intstatus)
continue; continue;
...@@ -2339,8 +2347,9 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw) ...@@ -2339,8 +2347,9 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
brcms_fatal_error(wlc_hw->wlc->wl); /* big hammer */ brcms_fatal_error(wlc_hw->wlc->wl); /* big hammer */
break; break;
} else } else
W_REG(&regs->intctrlregs[idx].intstatus, bcma_write32(core,
intstatus); D11REGOFFS(intctrlregs[idx].intstatus),
intstatus);
} }
} }
...@@ -2348,7 +2357,7 @@ void brcms_c_intrson(struct brcms_c_info *wlc) ...@@ -2348,7 +2357,7 @@ void brcms_c_intrson(struct brcms_c_info *wlc)
{ {
struct brcms_hardware *wlc_hw = wlc->hw; struct brcms_hardware *wlc_hw = wlc->hw;
wlc->macintmask = wlc->defmacintmask; wlc->macintmask = wlc->defmacintmask;
W_REG(&wlc_hw->regs->macintmask, wlc->macintmask); bcma_write32(wlc_hw->d11core, D11REGOFFS(macintmask), wlc->macintmask);
} }
/* /*
...@@ -2382,8 +2391,8 @@ u32 brcms_c_intrsoff(struct brcms_c_info *wlc) ...@@ -2382,8 +2391,8 @@ u32 brcms_c_intrsoff(struct brcms_c_info *wlc)
macintmask = wlc->macintmask; /* isr can still happen */ macintmask = wlc->macintmask; /* isr can still happen */
W_REG(&wlc_hw->regs->macintmask, 0); bcma_write32(wlc_hw->d11core, D11REGOFFS(macintmask), 0);
(void)R_REG(&wlc_hw->regs->macintmask); /* sync readback */ (void)bcma_read32(wlc_hw->d11core, D11REGOFFS(macintmask));
udelay(1); /* ensure int line is no longer driven */ udelay(1); /* ensure int line is no longer driven */
wlc->macintmask = 0; wlc->macintmask = 0;
...@@ -2398,7 +2407,7 @@ void brcms_c_intrsrestore(struct brcms_c_info *wlc, u32 macintmask) ...@@ -2398,7 +2407,7 @@ void brcms_c_intrsrestore(struct brcms_c_info *wlc, u32 macintmask)
return; return;
wlc->macintmask = macintmask; wlc->macintmask = macintmask;
W_REG(&wlc_hw->regs->macintmask, wlc->macintmask); bcma_write32(wlc_hw->d11core, D11REGOFFS(macintmask), wlc->macintmask);
} }
/* assumes that the d11 MAC is enabled */ /* assumes that the d11 MAC is enabled */
...@@ -2510,11 +2519,11 @@ brcms_c_mute(struct brcms_c_info *wlc, bool mute_tx) ...@@ -2510,11 +2519,11 @@ brcms_c_mute(struct brcms_c_info *wlc, bool mute_tx)
static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr) static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)
{ {
struct brcms_hardware *wlc_hw = wlc->hw; struct brcms_hardware *wlc_hw = wlc->hw;
struct d11regs __iomem *regs = wlc_hw->regs; struct bcma_device *core = wlc_hw->d11core;
u32 macintstatus; u32 macintstatus;
/* macintstatus includes a DMA interrupt summary bit */ /* macintstatus includes a DMA interrupt summary bit */
macintstatus = R_REG(&regs->macintstatus); macintstatus = bcma_read32(core, D11REGOFFS(macintstatus));
BCMMSG(wlc->wiphy, "wl%d: macintstatus: 0x%x\n", wlc_hw->unit, BCMMSG(wlc->wiphy, "wl%d: macintstatus: 0x%x\n", wlc_hw->unit,
macintstatus); macintstatus);
...@@ -2541,12 +2550,12 @@ static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr) ...@@ -2541,12 +2550,12 @@ static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)
* consequences * consequences
*/ */
/* turn off the interrupts */ /* turn off the interrupts */
W_REG(&regs->macintmask, 0); bcma_write32(core, D11REGOFFS(macintmask), 0);
(void)R_REG(&regs->macintmask); /* sync readback */ (void)bcma_read32(core, D11REGOFFS(macintmask));
wlc->macintmask = 0; wlc->macintmask = 0;
/* clear device interrupts */ /* clear device interrupts */
W_REG(&regs->macintstatus, macintstatus); bcma_write32(core, D11REGOFFS(macintstatus), macintstatus);
/* MI_DMAINT is indication of non-zero intstatus */ /* MI_DMAINT is indication of non-zero intstatus */
if (macintstatus & MI_DMAINT) if (macintstatus & MI_DMAINT)
...@@ -2555,8 +2564,8 @@ static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr) ...@@ -2555,8 +2564,8 @@ static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)
* RX_FIFO. If MI_DMAINT is set, assume it * RX_FIFO. If MI_DMAINT is set, assume it
* is set and clear the interrupt. * is set and clear the interrupt.
*/ */
W_REG(&regs->intctrlregs[RX_FIFO].intstatus, bcma_write32(core, D11REGOFFS(intctrlregs[RX_FIFO].intstatus),
DEF_RXINTMASK); DEF_RXINTMASK);
return macintstatus; return macintstatus;
} }
...@@ -2619,7 +2628,7 @@ bool brcms_c_isr(struct brcms_c_info *wlc, bool *wantdpc) ...@@ -2619,7 +2628,7 @@ bool brcms_c_isr(struct brcms_c_info *wlc, bool *wantdpc)
void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc) void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
{ {
struct brcms_hardware *wlc_hw = wlc->hw; struct brcms_hardware *wlc_hw = wlc->hw;
struct d11regs __iomem *regs = wlc_hw->regs; struct bcma_device *core = wlc_hw->d11core;
u32 mc, mi; u32 mc, mi;
struct wiphy *wiphy = wlc->wiphy; struct wiphy *wiphy = wlc->wiphy;
...@@ -2636,7 +2645,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc) ...@@ -2636,7 +2645,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
/* force the core awake */ /* force the core awake */
brcms_c_ucode_wake_override_set(wlc_hw, BRCMS_WAKE_OVERRIDE_MACSUSPEND); brcms_c_ucode_wake_override_set(wlc_hw, BRCMS_WAKE_OVERRIDE_MACSUSPEND);
mc = R_REG(&regs->maccontrol); mc = bcma_read32(core, D11REGOFFS(maccontrol));
if (mc == 0xffffffff) { if (mc == 0xffffffff) {
wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit, wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
...@@ -2648,7 +2657,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc) ...@@ -2648,7 +2657,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
WARN_ON(!(mc & MCTL_PSM_RUN)); WARN_ON(!(mc & MCTL_PSM_RUN));
WARN_ON(!(mc & MCTL_EN_MAC)); WARN_ON(!(mc & MCTL_EN_MAC));
mi = R_REG(&regs->macintstatus); mi = bcma_read32(core, D11REGOFFS(macintstatus));
if (mi == 0xffffffff) { if (mi == 0xffffffff) {
wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit, wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
__func__); __func__);
...@@ -2659,21 +2668,21 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc) ...@@ -2659,21 +2668,21 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, 0); brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, 0);
SPINWAIT(!(R_REG(&regs->macintstatus) & MI_MACSSPNDD), SPINWAIT(!(bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD),
BRCMS_MAX_MAC_SUSPEND); BRCMS_MAX_MAC_SUSPEND);
if (!(R_REG(&regs->macintstatus) & MI_MACSSPNDD)) { if (!(bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD)) {
wiphy_err(wiphy, "wl%d: wlc_suspend_mac_and_wait: waited %d uS" wiphy_err(wiphy, "wl%d: wlc_suspend_mac_and_wait: waited %d uS"
" and MI_MACSSPNDD is still not on.\n", " and MI_MACSSPNDD is still not on.\n",
wlc_hw->unit, BRCMS_MAX_MAC_SUSPEND); wlc_hw->unit, BRCMS_MAX_MAC_SUSPEND);
wiphy_err(wiphy, "wl%d: psmdebug 0x%08x, phydebug 0x%08x, " wiphy_err(wiphy, "wl%d: psmdebug 0x%08x, phydebug 0x%08x, "
"psm_brc 0x%04x\n", wlc_hw->unit, "psm_brc 0x%04x\n", wlc_hw->unit,
R_REG(&regs->psmdebug), bcma_read32(core, D11REGOFFS(psmdebug)),
R_REG(&regs->phydebug), bcma_read32(core, D11REGOFFS(phydebug)),
R_REG(&regs->psm_brc)); bcma_read16(core, D11REGOFFS(psm_brc)));
} }
mc = R_REG(&regs->maccontrol); mc = bcma_read32(core, D11REGOFFS(maccontrol));
if (mc == 0xffffffff) { if (mc == 0xffffffff) {
wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit, wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
__func__); __func__);
...@@ -2688,7 +2697,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc) ...@@ -2688,7 +2697,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
void brcms_c_enable_mac(struct brcms_c_info *wlc) void brcms_c_enable_mac(struct brcms_c_info *wlc)
{ {
struct brcms_hardware *wlc_hw = wlc->hw; struct brcms_hardware *wlc_hw = wlc->hw;
struct d11regs __iomem *regs = wlc_hw->regs; struct bcma_device *core = wlc_hw->d11core;
u32 mc, mi; u32 mc, mi;
BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit, BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
...@@ -2701,20 +2710,20 @@ void brcms_c_enable_mac(struct brcms_c_info *wlc) ...@@ -2701,20 +2710,20 @@ void brcms_c_enable_mac(struct brcms_c_info *wlc)
if (wlc_hw->mac_suspend_depth > 0) if (wlc_hw->mac_suspend_depth > 0)
return; return;
mc = R_REG(&regs->maccontrol); mc = bcma_read32(core, D11REGOFFS(maccontrol));
WARN_ON(mc & MCTL_PSM_JMP_0); WARN_ON(mc & MCTL_PSM_JMP_0);
WARN_ON(mc & MCTL_EN_MAC); WARN_ON(mc & MCTL_EN_MAC);
WARN_ON(!(mc & MCTL_PSM_RUN)); WARN_ON(!(mc & MCTL_PSM_RUN));
brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, MCTL_EN_MAC); brcms_b_mctrl(wlc_hw, MCTL_EN_MAC, MCTL_EN_MAC);
W_REG(&regs->macintstatus, MI_MACSSPNDD); bcma_write32(core, D11REGOFFS(macintstatus), MI_MACSSPNDD);
mc = R_REG(&regs->maccontrol); mc = bcma_read32(core, D11REGOFFS(maccontrol));
WARN_ON(mc & MCTL_PSM_JMP_0); WARN_ON(mc & MCTL_PSM_JMP_0);
WARN_ON(!(mc & MCTL_EN_MAC)); WARN_ON(!(mc & MCTL_EN_MAC));
WARN_ON(!(mc & MCTL_PSM_RUN)); WARN_ON(!(mc & MCTL_PSM_RUN));
mi = R_REG(&regs->macintstatus); mi = bcma_read32(core, D11REGOFFS(macintstatus));
WARN_ON(mi & MI_MACSSPNDD); WARN_ON(mi & MI_MACSSPNDD);
brcms_c_ucode_wake_override_clear(wlc_hw, brcms_c_ucode_wake_override_clear(wlc_hw,
...@@ -2731,55 +2740,53 @@ void brcms_b_band_stf_ss_set(struct brcms_hardware *wlc_hw, u8 stf_mode) ...@@ -2731,55 +2740,53 @@ void brcms_b_band_stf_ss_set(struct brcms_hardware *wlc_hw, u8 stf_mode)
static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw) static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw)
{ {
struct d11regs __iomem *regs; struct bcma_device *core = wlc_hw->d11core;
u32 w, val; u32 w, val;
struct wiphy *wiphy = wlc_hw->wlc->wiphy; struct wiphy *wiphy = wlc_hw->wlc->wiphy;
BCMMSG(wiphy, "wl%d\n", wlc_hw->unit); BCMMSG(wiphy, "wl%d\n", wlc_hw->unit);
regs = wlc_hw->regs;
/* Validate dchip register access */ /* Validate dchip register access */
W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0); bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
(void)R_REG(&regs->objaddr); (void)bcma_read32(core, D11REGOFFS(objaddr));
w = R_REG(&regs->objdata); w = bcma_read32(core, D11REGOFFS(objdata));
/* Can we write and read back a 32bit register? */ /* Can we write and read back a 32bit register? */
W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0); bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
(void)R_REG(&regs->objaddr); (void)bcma_read32(core, D11REGOFFS(objaddr));
W_REG(&regs->objdata, (u32) 0xaa5555aa); bcma_write32(core, D11REGOFFS(objdata), (u32) 0xaa5555aa);
W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0); bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
(void)R_REG(&regs->objaddr); (void)bcma_read32(core, D11REGOFFS(objaddr));
val = R_REG(&regs->objdata); val = bcma_read32(core, D11REGOFFS(objdata));
if (val != (u32) 0xaa5555aa) { if (val != (u32) 0xaa5555aa) {
wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, " wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, "
"expected 0xaa5555aa\n", wlc_hw->unit, val); "expected 0xaa5555aa\n", wlc_hw->unit, val);
return false; return false;
} }
W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0); bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
(void)R_REG(&regs->objaddr); (void)bcma_read32(core, D11REGOFFS(objaddr));
W_REG(&regs->objdata, (u32) 0x55aaaa55); bcma_write32(core, D11REGOFFS(objdata), (u32) 0x55aaaa55);
W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0); bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
(void)R_REG(&regs->objaddr); (void)bcma_read32(core, D11REGOFFS(objaddr));
val = R_REG(&regs->objdata); val = bcma_read32(core, D11REGOFFS(objdata));
if (val != (u32) 0x55aaaa55) { if (val != (u32) 0x55aaaa55) {
wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, " wiphy_err(wiphy, "wl%d: validate_chip_access: SHM = 0x%x, "
"expected 0x55aaaa55\n", wlc_hw->unit, val); "expected 0x55aaaa55\n", wlc_hw->unit, val);
return false; return false;
} }
W_REG(&regs->objaddr, OBJADDR_SHM_SEL | 0); bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
(void)R_REG(&regs->objaddr); (void)bcma_read32(core, D11REGOFFS(objaddr));
W_REG(&regs->objdata, w); bcma_write32(core, D11REGOFFS(objdata), w);
/* clear CFPStart */ /* clear CFPStart */
W_REG(&regs->tsf_cfpstart, 0); bcma_write32(core, D11REGOFFS(tsf_cfpstart), 0);
w = R_REG(&regs->maccontrol); w = bcma_read32(core, D11REGOFFS(maccontrol));
if ((w != (MCTL_IHR_EN | MCTL_WAKE)) && if ((w != (MCTL_IHR_EN | MCTL_WAKE)) &&
(w != (MCTL_IHR_EN | MCTL_GMODE | MCTL_WAKE))) { (w != (MCTL_IHR_EN | MCTL_GMODE | MCTL_WAKE))) {
wiphy_err(wiphy, "wl%d: validate_chip_access: maccontrol = " wiphy_err(wiphy, "wl%d: validate_chip_access: maccontrol = "
...@@ -2796,38 +2803,38 @@ static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw) ...@@ -2796,38 +2803,38 @@ static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw)
void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on) void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
{ {
struct d11regs __iomem *regs; struct bcma_device *core = wlc_hw->d11core;
u32 tmp; u32 tmp;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
tmp = 0; tmp = 0;
regs = wlc_hw->regs;
if (on) { if (on) {
if ((ai_get_chip_id(wlc_hw->sih) == BCM4313_CHIP_ID)) { if ((ai_get_chip_id(wlc_hw->sih) == BCM4313_CHIP_ID)) {
OR_REG(&regs->clk_ctl_st, bcma_set32(core, D11REGOFFS(clk_ctl_st),
(CCS_ERSRC_REQ_HT | CCS_ERSRC_REQ_D11PLL | CCS_ERSRC_REQ_HT |
CCS_ERSRC_REQ_PHYPLL)); CCS_ERSRC_REQ_D11PLL |
SPINWAIT((R_REG(&regs->clk_ctl_st) & CCS_ERSRC_REQ_PHYPLL);
(CCS_ERSRC_AVAIL_HT)) != (CCS_ERSRC_AVAIL_HT), SPINWAIT((bcma_read32(core, D11REGOFFS(clk_ctl_st)) &
CCS_ERSRC_AVAIL_HT) != CCS_ERSRC_AVAIL_HT,
PHYPLL_WAIT_US); PHYPLL_WAIT_US);
tmp = R_REG(&regs->clk_ctl_st); tmp = bcma_read32(core, D11REGOFFS(clk_ctl_st));
if ((tmp & (CCS_ERSRC_AVAIL_HT)) != if ((tmp & CCS_ERSRC_AVAIL_HT) != CCS_ERSRC_AVAIL_HT)
(CCS_ERSRC_AVAIL_HT))
wiphy_err(wlc_hw->wlc->wiphy, "%s: turn on PHY" wiphy_err(wlc_hw->wlc->wiphy, "%s: turn on PHY"
" PLL failed\n", __func__); " PLL failed\n", __func__);
} else { } else {
OR_REG(&regs->clk_ctl_st, bcma_set32(core, D11REGOFFS(clk_ctl_st),
(CCS_ERSRC_REQ_D11PLL | CCS_ERSRC_REQ_PHYPLL)); tmp | CCS_ERSRC_REQ_D11PLL |
SPINWAIT((R_REG(&regs->clk_ctl_st) & CCS_ERSRC_REQ_PHYPLL);
SPINWAIT((bcma_read32(core, D11REGOFFS(clk_ctl_st)) &
(CCS_ERSRC_AVAIL_D11PLL | (CCS_ERSRC_AVAIL_D11PLL |
CCS_ERSRC_AVAIL_PHYPLL)) != CCS_ERSRC_AVAIL_PHYPLL)) !=
(CCS_ERSRC_AVAIL_D11PLL | (CCS_ERSRC_AVAIL_D11PLL |
CCS_ERSRC_AVAIL_PHYPLL), PHYPLL_WAIT_US); CCS_ERSRC_AVAIL_PHYPLL), PHYPLL_WAIT_US);
tmp = R_REG(&regs->clk_ctl_st); tmp = bcma_read32(core, D11REGOFFS(clk_ctl_st));
if ((tmp & if ((tmp &
(CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL)) (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL))
!= !=
...@@ -2841,8 +2848,9 @@ void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on) ...@@ -2841,8 +2848,9 @@ void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
* be requesting it; so we'll deassert the request but * be requesting it; so we'll deassert the request but
* not wait for status to comply. * not wait for status to comply.
*/ */
AND_REG(&regs->clk_ctl_st, ~CCS_ERSRC_REQ_PHYPLL); bcma_mask32(core, D11REGOFFS(clk_ctl_st),
tmp = R_REG(&regs->clk_ctl_st); ~CCS_ERSRC_REQ_PHYPLL);
(void)bcma_read32(core, D11REGOFFS(clk_ctl_st));
} }
} }
...@@ -2894,35 +2902,31 @@ static void brcms_c_flushqueues(struct brcms_c_info *wlc) ...@@ -2894,35 +2902,31 @@ static void brcms_c_flushqueues(struct brcms_c_info *wlc)
static u16 static u16
brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset, u32 sel) brcms_b_read_objmem(struct brcms_hardware *wlc_hw, uint offset, u32 sel)
{ {
struct d11regs __iomem *regs = wlc_hw->regs; struct bcma_device *core = wlc_hw->d11core;
u16 __iomem *objdata_lo = (u16 __iomem *)&regs->objdata; u16 objoff = D11REGOFFS(objdata);
u16 __iomem *objdata_hi = objdata_lo + 1;
u16 v;
W_REG(&regs->objaddr, sel | (offset >> 2)); bcma_write32(core, D11REGOFFS(objaddr), sel | (offset >> 2));
(void)R_REG(&regs->objaddr); (void)bcma_read32(core, D11REGOFFS(objaddr));
if (offset & 2) if (offset & 2)
v = R_REG(objdata_hi); objoff += 2;
else
v = R_REG(objdata_lo);
return v; return bcma_read16(core, objoff);
;
} }
static void static void
brcms_b_write_objmem(struct brcms_hardware *wlc_hw, uint offset, u16 v, brcms_b_write_objmem(struct brcms_hardware *wlc_hw, uint offset, u16 v,
u32 sel) u32 sel)
{ {
struct d11regs __iomem *regs = wlc_hw->regs; struct bcma_device *core = wlc_hw->d11core;
u16 __iomem *objdata_lo = (u16 __iomem *)&regs->objdata; u16 objoff = D11REGOFFS(objdata);
u16 __iomem *objdata_hi = objdata_lo + 1;
W_REG(&regs->objaddr, sel | (offset >> 2)); bcma_write32(core, D11REGOFFS(objaddr), sel | (offset >> 2));
(void)R_REG(&regs->objaddr); (void)bcma_read32(core, D11REGOFFS(objaddr));
if (offset & 2) if (offset & 2)
W_REG(objdata_hi, v); objoff += 2;
else
W_REG(objdata_lo, v); bcma_write16(core, objoff, v);
} }
/* /*
...@@ -3008,14 +3012,14 @@ static void brcms_b_retrylimit_upd(struct brcms_hardware *wlc_hw, ...@@ -3008,14 +3012,14 @@ static void brcms_b_retrylimit_upd(struct brcms_hardware *wlc_hw,
/* write retry limit to SCR, shouldn't need to suspend */ /* write retry limit to SCR, shouldn't need to suspend */
if (wlc_hw->up) { if (wlc_hw->up) {
W_REG(&wlc_hw->regs->objaddr, bcma_write32(wlc_hw->d11core, D11REGOFFS(objaddr),
OBJADDR_SCR_SEL | S_DOT11_SRC_LMT); OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);
(void)R_REG(&wlc_hw->regs->objaddr); (void)bcma_read32(wlc_hw->d11core, D11REGOFFS(objaddr));
W_REG(&wlc_hw->regs->objdata, wlc_hw->SRL); bcma_write32(wlc_hw->d11core, D11REGOFFS(objdata), wlc_hw->SRL);
W_REG(&wlc_hw->regs->objaddr, bcma_write32(wlc_hw->d11core, D11REGOFFS(objaddr),
OBJADDR_SCR_SEL | S_DOT11_LRC_LMT); OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);
(void)R_REG(&wlc_hw->regs->objaddr); (void)bcma_read32(wlc_hw->d11core, D11REGOFFS(objaddr));
W_REG(&wlc_hw->regs->objdata, wlc_hw->LRL); bcma_write32(wlc_hw->d11core, D11REGOFFS(objdata), wlc_hw->LRL);
} }
} }
...@@ -3197,9 +3201,9 @@ void brcms_c_init_scb(struct scb *scb) ...@@ -3197,9 +3201,9 @@ void brcms_c_init_scb(struct scb *scb)
static void brcms_b_coreinit(struct brcms_c_info *wlc) static void brcms_b_coreinit(struct brcms_c_info *wlc)
{ {
struct brcms_hardware *wlc_hw = wlc->hw; struct brcms_hardware *wlc_hw = wlc->hw;
struct d11regs __iomem *regs; struct bcma_device *core = wlc_hw->d11core;
u32 sflags; u32 sflags;
uint bcnint_us; u32 bcnint_us;
uint i = 0; uint i = 0;
bool fifosz_fixup = false; bool fifosz_fixup = false;
int err = 0; int err = 0;
...@@ -3207,8 +3211,6 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) ...@@ -3207,8 +3211,6 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
struct wiphy *wiphy = wlc->wiphy; struct wiphy *wiphy = wlc->wiphy;
struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode; struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode;
regs = wlc_hw->regs;
BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit); BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
/* reset PSM */ /* reset PSM */
...@@ -3221,14 +3223,14 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) ...@@ -3221,14 +3223,14 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
fifosz_fixup = true; fifosz_fixup = true;
/* let the PSM run to the suspended state, set mode to BSS STA */ /* let the PSM run to the suspended state, set mode to BSS STA */
W_REG(&regs->macintstatus, -1); bcma_write32(core, D11REGOFFS(macintstatus), -1);
brcms_b_mctrl(wlc_hw, ~0, brcms_b_mctrl(wlc_hw, ~0,
(MCTL_IHR_EN | MCTL_INFRA | MCTL_PSM_RUN | MCTL_WAKE)); (MCTL_IHR_EN | MCTL_INFRA | MCTL_PSM_RUN | MCTL_WAKE));
/* wait for ucode to self-suspend after auto-init */ /* wait for ucode to self-suspend after auto-init */
SPINWAIT(((R_REG(&regs->macintstatus) & MI_MACSSPNDD) == 0), SPINWAIT(((bcma_read32(core, D11REGOFFS(macintstatus)) &
1000 * 1000); MI_MACSSPNDD) == 0), 1000 * 1000);
if ((R_REG(&regs->macintstatus) & MI_MACSSPNDD) == 0) if ((bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD) == 0)
wiphy_err(wiphy, "wl%d: wlc_coreinit: ucode did not self-" wiphy_err(wiphy, "wl%d: wlc_coreinit: ucode did not self-"
"suspend!\n", wlc_hw->unit); "suspend!\n", wlc_hw->unit);
...@@ -3298,7 +3300,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) ...@@ -3298,7 +3300,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
wlc_hw->xmtfifo_sz[i], i); wlc_hw->xmtfifo_sz[i], i);
/* make sure we can still talk to the mac */ /* make sure we can still talk to the mac */
WARN_ON(R_REG(&regs->maccontrol) == 0xffffffff); WARN_ON(bcma_read32(core, D11REGOFFS(maccontrol)) == 0xffffffff);
/* band-specific inits done by wlc_bsinit() */ /* band-specific inits done by wlc_bsinit() */
...@@ -3307,7 +3309,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) ...@@ -3307,7 +3309,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
brcms_b_write_shm(wlc_hw, M_MAX_ANTCNT, ANTCNT); brcms_b_write_shm(wlc_hw, M_MAX_ANTCNT, ANTCNT);
/* enable one rx interrupt per received frame */ /* enable one rx interrupt per received frame */
W_REG(&regs->intrcvlazy[0], (1 << IRL_FC_SHIFT)); bcma_write32(core, D11REGOFFS(intrcvlazy[0]), (1 << IRL_FC_SHIFT));
/* set the station mode (BSS STA) */ /* set the station mode (BSS STA) */
brcms_b_mctrl(wlc_hw, brcms_b_mctrl(wlc_hw,
...@@ -3316,19 +3318,21 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) ...@@ -3316,19 +3318,21 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
/* set up Beacon interval */ /* set up Beacon interval */
bcnint_us = 0x8000 << 10; bcnint_us = 0x8000 << 10;
W_REG(&regs->tsf_cfprep, (bcnint_us << CFPREP_CBI_SHIFT)); bcma_write32(core, D11REGOFFS(tsf_cfprep),
W_REG(&regs->tsf_cfpstart, bcnint_us); (bcnint_us << CFPREP_CBI_SHIFT));
W_REG(&regs->macintstatus, MI_GP1); bcma_write32(core, D11REGOFFS(tsf_cfpstart), bcnint_us);
bcma_write32(core, D11REGOFFS(macintstatus), MI_GP1);
/* write interrupt mask */ /* write interrupt mask */
W_REG(&regs->intctrlregs[RX_FIFO].intmask, DEF_RXINTMASK); bcma_write32(core, D11REGOFFS(intctrlregs[RX_FIFO].intmask),
DEF_RXINTMASK);
/* allow the MAC to control the PHY clock (dynamic on/off) */ /* allow the MAC to control the PHY clock (dynamic on/off) */
brcms_b_macphyclk_set(wlc_hw, ON); brcms_b_macphyclk_set(wlc_hw, ON);
/* program dynamic clock control fast powerup delay register */ /* program dynamic clock control fast powerup delay register */
wlc->fastpwrup_dly = ai_clkctl_fast_pwrup_delay(wlc_hw->sih); wlc->fastpwrup_dly = ai_clkctl_fast_pwrup_delay(wlc_hw->sih);
W_REG(&regs->scc_fastpwrup_dly, wlc->fastpwrup_dly); bcma_write16(core, D11REGOFFS(scc_fastpwrup_dly), wlc->fastpwrup_dly);
/* tell the ucode the corerev */ /* tell the ucode the corerev */
brcms_b_write_shm(wlc_hw, M_MACHW_VER, (u16) wlc_hw->corerev); brcms_b_write_shm(wlc_hw, M_MACHW_VER, (u16) wlc_hw->corerev);
...@@ -3341,19 +3345,21 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) ...@@ -3341,19 +3345,21 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
machwcap >> 16) & 0xffff)); machwcap >> 16) & 0xffff));
/* write retry limits to SCR, this done after PSM init */ /* write retry limits to SCR, this done after PSM init */
W_REG(&regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_SRC_LMT); bcma_write32(core, D11REGOFFS(objaddr),
(void)R_REG(&regs->objaddr); OBJADDR_SCR_SEL | S_DOT11_SRC_LMT);
W_REG(&regs->objdata, wlc_hw->SRL); (void)bcma_read32(core, D11REGOFFS(objaddr));
W_REG(&regs->objaddr, OBJADDR_SCR_SEL | S_DOT11_LRC_LMT); bcma_write32(core, D11REGOFFS(objdata), wlc_hw->SRL);
(void)R_REG(&regs->objaddr); bcma_write32(core, D11REGOFFS(objaddr),
W_REG(&regs->objdata, wlc_hw->LRL); OBJADDR_SCR_SEL | S_DOT11_LRC_LMT);
(void)bcma_read32(core, D11REGOFFS(objaddr));
bcma_write32(core, D11REGOFFS(objdata), wlc_hw->LRL);
/* write rate fallback retry limits */ /* write rate fallback retry limits */
brcms_b_write_shm(wlc_hw, M_SFRMTXCNTFBRTHSD, wlc_hw->SFBL); brcms_b_write_shm(wlc_hw, M_SFRMTXCNTFBRTHSD, wlc_hw->SFBL);
brcms_b_write_shm(wlc_hw, M_LFRMTXCNTFBRTHSD, wlc_hw->LFBL); brcms_b_write_shm(wlc_hw, M_LFRMTXCNTFBRTHSD, wlc_hw->LFBL);
AND_REG(&regs->ifs_ctl, 0x0FFF); bcma_mask16(core, D11REGOFFS(ifs_ctl), 0x0FFF);
W_REG(&regs->ifs_aifsn, EDCF_AIFSN_MIN); bcma_write16(core, D11REGOFFS(ifs_aifsn), EDCF_AIFSN_MIN);
/* init the tx dma engines */ /* init the tx dma engines */
for (i = 0; i < NFIFO; i++) { for (i = 0; i < NFIFO; i++) {
...@@ -3810,7 +3816,7 @@ static void brcms_c_set_ps_ctrl(struct brcms_c_info *wlc) ...@@ -3810,7 +3816,7 @@ static void brcms_c_set_ps_ctrl(struct brcms_c_info *wlc)
BCMMSG(wlc->wiphy, "wl%d: hps %d\n", wlc->pub->unit, hps); BCMMSG(wlc->wiphy, "wl%d: hps %d\n", wlc->pub->unit, hps);
v1 = R_REG(&wlc->regs->maccontrol); v1 = bcma_read32(wlc->hw->d11core, D11REGOFFS(maccontrol));
v2 = MCTL_WAKE; v2 = MCTL_WAKE;
if (hps) if (hps)
v2 |= MCTL_HPS; v2 |= MCTL_HPS;
...@@ -4129,7 +4135,8 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci, ...@@ -4129,7 +4135,8 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,
acp_shm.cwmax = params->cw_max; acp_shm.cwmax = params->cw_max;
acp_shm.cwcur = acp_shm.cwmin; acp_shm.cwcur = acp_shm.cwmin;
acp_shm.bslots = acp_shm.bslots =
R_REG(&wlc->regs->tsf_random) & acp_shm.cwcur; bcma_read16(wlc->hw->d11core, D11REGOFFS(tsf_random)) &
acp_shm.cwcur;
acp_shm.reggap = acp_shm.bslots + acp_shm.aifs; acp_shm.reggap = acp_shm.bslots + acp_shm.aifs;
/* Indicate the new params to the ucode */ /* Indicate the new params to the ucode */
acp_shm.status = brcms_b_read_shm(wlc->hw, (M_EDCF_QINFO + acp_shm.status = brcms_b_read_shm(wlc->hw, (M_EDCF_QINFO +
...@@ -4441,7 +4448,6 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core, ...@@ -4441,7 +4448,6 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,
uint unit, bool piomode) uint unit, bool piomode)
{ {
struct brcms_hardware *wlc_hw; struct brcms_hardware *wlc_hw;
struct d11regs __iomem *regs;
char *macaddr = NULL; char *macaddr = NULL;
uint err = 0; uint err = 0;
uint j; uint j;
...@@ -4490,13 +4496,9 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core, ...@@ -4490,13 +4496,9 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,
wlc_hw->deviceid = pcidev->device; wlc_hw->deviceid = pcidev->device;
/* set bar0 window to point at D11 core */ /* set bar0 window to point at D11 core */
wlc_hw->regs = (struct d11regs __iomem *) (void)ai_setcore(wlc_hw->sih, D11_CORE_ID, 0);
ai_setcore(wlc_hw->sih, D11_CORE_ID, 0); wlc_hw->d11core = core;
wlc_hw->corerev = ai_corerev(wlc_hw->sih); wlc_hw->corerev = core->id.rev;
regs = wlc_hw->regs;
wlc->regs = wlc_hw->regs;
/* validate chip, chiprev and corerev */ /* validate chip, chiprev and corerev */
if (!brcms_c_isgoodchip(wlc_hw)) { if (!brcms_c_isgoodchip(wlc_hw)) {
...@@ -4617,7 +4619,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core, ...@@ -4617,7 +4619,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,
wlc->band->bandtype = j ? BRCM_BAND_5G : BRCM_BAND_2G; wlc->band->bandtype = j ? BRCM_BAND_5G : BRCM_BAND_2G;
wlc->core->coreidx = ai_coreidx(wlc_hw->sih); wlc->core->coreidx = ai_coreidx(wlc_hw->sih);
wlc_hw->machwcap = R_REG(&regs->machwcap); wlc_hw->machwcap = bcma_read32(core, D11REGOFFS(machwcap));
wlc_hw->machwcap_backup = wlc_hw->machwcap; wlc_hw->machwcap_backup = wlc_hw->machwcap;
/* init tx fifo size */ /* init tx fifo size */
...@@ -4626,7 +4628,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core, ...@@ -4626,7 +4628,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,
/* Get a phy for this band */ /* Get a phy for this band */
wlc_hw->band->pi = wlc_hw->band->pi =
wlc_phy_attach(wlc_hw->phy_sh, regs, wlc_phy_attach(wlc_hw->phy_sh, core->bus->mmio,
wlc_hw->band->bandtype, wlc_hw->band->bandtype,
wlc->wiphy); wlc->wiphy);
if (wlc_hw->band->pi == NULL) { if (wlc_hw->band->pi == NULL) {
...@@ -5074,8 +5076,7 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw) ...@@ -5074,8 +5076,7 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw)
*/ */
if ((ai_get_chip_id(wlc_hw->sih) == BCM43224_CHIP_ID) || if ((ai_get_chip_id(wlc_hw->sih) == BCM43224_CHIP_ID) ||
(ai_get_chip_id(wlc_hw->sih) == BCM43225_CHIP_ID)) (ai_get_chip_id(wlc_hw->sih) == BCM43225_CHIP_ID))
wlc_hw->regs = (struct d11regs __iomem *) (void)ai_setcore(wlc_hw->sih, D11_CORE_ID, 0);
ai_setcore(wlc_hw->sih, D11_CORE_ID, 0);
/* /*
* Inform phy that a POR reset has occurred so * Inform phy that a POR reset has occurred so
...@@ -5320,8 +5321,8 @@ static int brcms_b_down_finish(struct brcms_hardware *wlc_hw) ...@@ -5320,8 +5321,8 @@ static int brcms_b_down_finish(struct brcms_hardware *wlc_hw)
/* Reset and disable the core */ /* Reset and disable the core */
if (ai_iscoreup(wlc_hw->sih)) { if (ai_iscoreup(wlc_hw->sih)) {
if (R_REG(&wlc_hw->regs->maccontrol) & if (bcma_read32(wlc_hw->d11core,
MCTL_EN_MAC) D11REGOFFS(maccontrol)) & MCTL_EN_MAC)
brcms_c_suspend_mac_and_wait(wlc_hw->wlc); brcms_c_suspend_mac_and_wait(wlc_hw->wlc);
callbacks += brcms_reset(wlc_hw->wlc->wl); callbacks += brcms_reset(wlc_hw->wlc->wl);
brcms_c_coredisable(wlc_hw); brcms_c_coredisable(wlc_hw);
...@@ -7478,11 +7479,11 @@ static void ...@@ -7478,11 +7479,11 @@ static void
brcms_b_read_tsf(struct brcms_hardware *wlc_hw, u32 *tsf_l_ptr, brcms_b_read_tsf(struct brcms_hardware *wlc_hw, u32 *tsf_l_ptr,
u32 *tsf_h_ptr) u32 *tsf_h_ptr)
{ {
struct d11regs __iomem *regs = wlc_hw->regs; struct bcma_device *core = wlc_hw->d11core;
/* read the tsf timer low, then high to get an atomic read */ /* read the tsf timer low, then high to get an atomic read */
*tsf_l_ptr = R_REG(&regs->tsf_timerlow); *tsf_l_ptr = bcma_read32(core, D11REGOFFS(tsf_timerlow));
*tsf_h_ptr = R_REG(&regs->tsf_timerhigh); *tsf_h_ptr = bcma_read32(core, D11REGOFFS(tsf_timerhigh));
} }
/* /*
...@@ -8155,7 +8156,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded) ...@@ -8155,7 +8156,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
{ {
u32 macintstatus; u32 macintstatus;
struct brcms_hardware *wlc_hw = wlc->hw; struct brcms_hardware *wlc_hw = wlc->hw;
struct d11regs __iomem *regs = wlc_hw->regs; struct bcma_device *core = wlc_hw->d11core;
struct wiphy *wiphy = wlc->wiphy; struct wiphy *wiphy = wlc->wiphy;
if (brcms_deviceremoved(wlc)) { if (brcms_deviceremoved(wlc)) {
...@@ -8191,7 +8192,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded) ...@@ -8191,7 +8192,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
/* ATIM window end */ /* ATIM window end */
if (macintstatus & MI_ATIMWINEND) { if (macintstatus & MI_ATIMWINEND) {
BCMMSG(wlc->wiphy, "end of ATIM window\n"); BCMMSG(wlc->wiphy, "end of ATIM window\n");
OR_REG(&regs->maccommand, wlc->qvalid); bcma_set32(core, D11REGOFFS(maccommand), wlc->qvalid);
wlc->qvalid = 0; wlc->qvalid = 0;
} }
...@@ -8219,7 +8220,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded) ...@@ -8219,7 +8220,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
/* gptimer timeout */ /* gptimer timeout */
if (macintstatus & MI_TO) if (macintstatus & MI_TO)
W_REG(&regs->gptimer, 0); bcma_write32(core, D11REGOFFS(gptimer), 0);
if (macintstatus & MI_RFDISABLE) { if (macintstatus & MI_RFDISABLE) {
BCMMSG(wlc->wiphy, "wl%d: BMAC Detected a change on the" BCMMSG(wlc->wiphy, "wl%d: BMAC Detected a change on the"
...@@ -8241,13 +8242,11 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded) ...@@ -8241,13 +8242,11 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx) void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
{ {
struct d11regs __iomem *regs; struct bcma_device *core = wlc->hw->d11core;
u16 chanspec; u16 chanspec;
BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit); BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
regs = wlc->regs;
/* /*
* This will happen if a big-hammer was executed. In * This will happen if a big-hammer was executed. In
* that case, we want to go back to the channel that * that case, we want to go back to the channel that
...@@ -8277,8 +8276,8 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx) ...@@ -8277,8 +8276,8 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
* update since init path would reset * update since init path would reset
* to default value * to default value
*/ */
W_REG(&regs->tsf_cfprep, bcma_write32(core, D11REGOFFS(tsf_cfprep),
(bi << CFPREP_CBI_SHIFT)); bi << CFPREP_CBI_SHIFT);
/* Update maccontrol PM related bits */ /* Update maccontrol PM related bits */
brcms_c_set_ps_ctrl(wlc); brcms_c_set_ps_ctrl(wlc);
...@@ -8308,7 +8307,7 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx) ...@@ -8308,7 +8307,7 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
brcms_c_bsinit(wlc); brcms_c_bsinit(wlc);
/* Enable EDCF mode (while the MAC is suspended) */ /* Enable EDCF mode (while the MAC is suspended) */
OR_REG(&regs->ifs_ctl, IFS_USEEDCF); bcma_set16(core, D11REGOFFS(ifs_ctl), IFS_USEEDCF);
brcms_c_edcf_setparams(wlc, false); brcms_c_edcf_setparams(wlc, false);
/* Init precedence maps for empty FIFOs */ /* Init precedence maps for empty FIFOs */
...@@ -8332,7 +8331,7 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx) ...@@ -8332,7 +8331,7 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
brcms_c_txflowcontrol_reset(wlc); brcms_c_txflowcontrol_reset(wlc);
/* enable the RF Disable Delay timer */ /* enable the RF Disable Delay timer */
W_REG(&wlc->regs->rfdisabledly, RFDISABLE_DEFAULT); bcma_write32(core, D11REGOFFS(rfdisabledly), RFDISABLE_DEFAULT);
/* /*
* Initialize WME parameters; if they haven't been set by some other * Initialize WME parameters; if they haven't been set by some other
......
drivers/net/wireless/brcm80211/brcmsmac/main.h
View file @ 16d2812e
...@@ -334,7 +334,7 @@ struct brcms_hardware { ...@@ -334,7 +334,7 @@ struct brcms_hardware {
u32 machwcap_backup; /* backup of machwcap */ u32 machwcap_backup; /* backup of machwcap */
struct si_pub *sih; /* SI handle (cookie for siutils calls) */ struct si_pub *sih; /* SI handle (cookie for siutils calls) */
struct d11regs __iomem *regs; /* pointer to device registers */ struct bcma_device *d11core; /* pointer to 802.11 core */
struct phy_shim_info *physhim; /* phy shim layer handler */ struct phy_shim_info *physhim; /* phy shim layer handler */
struct shared_phy *phy_sh; /* pointer to shared phy state */ struct shared_phy *phy_sh; /* pointer to shared phy state */
struct brcms_hw_band *band;/* pointer to active per-band state */ struct brcms_hw_band *band;/* pointer to active per-band state */
...@@ -400,7 +400,6 @@ struct brcms_txq_info { ...@@ -400,7 +400,6 @@ struct brcms_txq_info {
* *
* pub: pointer to driver public state. * pub: pointer to driver public state.
* wl: pointer to specific private state. * wl: pointer to specific private state.
* regs: pointer to device registers.
* hw: HW related state. * hw: HW related state.
* clkreq_override: setting for clkreq for PCIE : Auto, 0, 1. * clkreq_override: setting for clkreq for PCIE : Auto, 0, 1.
* fastpwrup_dly: time in us needed to bring up d11 fast clock. * fastpwrup_dly: time in us needed to bring up d11 fast clock.
...@@ -477,7 +476,6 @@ struct brcms_txq_info { ...@@ -477,7 +476,6 @@ struct brcms_txq_info {
struct brcms_c_info { struct brcms_c_info {
struct brcms_pub *pub; struct brcms_pub *pub;
struct brcms_info *wl; struct brcms_info *wl;
struct d11regs __iomem *regs;
struct brcms_hardware *hw; struct brcms_hardware *hw;
/* clock */ /* clock */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7