Commit a232c8a1 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville

brcm80211: smac: INTROFF/INTRESTORE macros removed

The macros were used to assure that the correct core was accessed in
the ISR, but register access is now done giving the explicit core so
no need to change interrupt state.
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 291ed3dc
...@@ -940,14 +940,11 @@ uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val) ...@@ -940,14 +940,11 @@ uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val)
struct bcma_device *cc; struct bcma_device *cc;
uint origidx = 0; uint origidx = 0;
u32 w; u32 w;
uint intr_val = 0;
struct si_info *sii; struct si_info *sii;
sii = (struct si_info *)sih; sii = (struct si_info *)sih;
cc = sii->icbus->drv_cc.core; cc = sii->icbus->drv_cc.core;
INTR_OFF(sii, intr_val);
/* save current core index */ /* save current core index */
origidx = ai_coreidx(&sii->pub); origidx = ai_coreidx(&sii->pub);
...@@ -962,8 +959,6 @@ uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val) ...@@ -962,8 +959,6 @@ uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val)
/* restore core index */ /* restore core index */
ai_setcoreidx(&sii->pub, origidx); ai_setcoreidx(&sii->pub, origidx);
INTR_RESTORE(sii, intr_val);
return w; return w;
} }
...@@ -1086,13 +1081,10 @@ u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih) ...@@ -1086,13 +1081,10 @@ u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih)
struct bcma_device *cc; struct bcma_device *cc;
uint slowminfreq; uint slowminfreq;
u16 fpdelay; u16 fpdelay;
uint intr_val = 0;
sii = (struct si_info *)sih; sii = (struct si_info *)sih;
if (ai_get_cccaps(sih) & CC_CAP_PMU) { if (ai_get_cccaps(sih) & CC_CAP_PMU) {
INTR_OFF(sii, intr_val);
fpdelay = si_pmu_fast_pwrup_delay(sih); fpdelay = si_pmu_fast_pwrup_delay(sih);
INTR_RESTORE(sii, intr_val);
return fpdelay; return fpdelay;
} }
...@@ -1100,18 +1092,12 @@ u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih) ...@@ -1100,18 +1092,12 @@ u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih)
return 0; return 0;
fpdelay = 0; fpdelay = 0;
INTR_OFF(sii, intr_val);
cc = ai_findcore(sih, CC_CORE_ID, 0); cc = ai_findcore(sih, CC_CORE_ID, 0);
if (cc == NULL) if (cc) {
goto done; slowminfreq = ai_slowclk_freq(sih, false, cc);
fpdelay = (((bcma_read32(cc, CHIPCREGOFFS(pll_on_delay)) + 2)
* 1000000) + (slowminfreq - 1)) / slowminfreq;
slowminfreq = ai_slowclk_freq(sih, false, cc); }
fpdelay = (((bcma_read32(cc, CHIPCREGOFFS(pll_on_delay)) + 2) * 1000000)
+ (slowminfreq - 1)) / slowminfreq;
done:
INTR_RESTORE(sii, intr_val);
return fpdelay; return fpdelay;
} }
...@@ -1183,18 +1169,16 @@ static bool _ai_clkctl_cc(struct si_info *sii, uint mode) ...@@ -1183,18 +1169,16 @@ static bool _ai_clkctl_cc(struct si_info *sii, uint mode)
{ {
struct bcma_device *cc; struct bcma_device *cc;
u32 scc; u32 scc;
uint intr_val = 0;
/* chipcommon cores prior to rev6 don't support dynamic clock control */ /* chipcommon cores prior to rev6 don't support dynamic clock control */
if (ai_get_ccrev(&sii->pub) < 6) if (ai_get_ccrev(&sii->pub) < 6)
return false; return false;
INTR_OFF(sii, intr_val);
cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0); cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
if (!(ai_get_cccaps(&sii->pub) & CC_CAP_PWR_CTL) && if (!(ai_get_cccaps(&sii->pub) & CC_CAP_PWR_CTL) &&
(ai_get_ccrev(&sii->pub) < 20)) (ai_get_ccrev(&sii->pub) < 20))
goto done; return mode == CLK_FAST;
switch (mode) { switch (mode) {
case CLK_FAST: /* FORCEHT, fast (pll) clock */ case CLK_FAST: /* FORCEHT, fast (pll) clock */
...@@ -1248,8 +1232,6 @@ static bool _ai_clkctl_cc(struct si_info *sii, uint mode) ...@@ -1248,8 +1232,6 @@ static bool _ai_clkctl_cc(struct si_info *sii, uint mode)
break; break;
} }
done:
INTR_RESTORE(sii, intr_val);
return mode == CLK_FAST; return mode == CLK_FAST;
} }
......
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