Skip to content

Commit

Permalink
brcmsmac: remove ai_findcore()
Browse files Browse the repository at this point in the history 
bcma also stores a pointer to the chipcommon core in its struct,
brcmsmac should use it and not search for the core by its own.

Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Hauke Mehrtens authored and John W. Linville committed Jul 10, 2012
1 parent ed1dd81 commit 40bd94c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 31 deletions.
31 changes: 6 additions & 25 deletions drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -590,27 +590,6 @@ void ai_detach(struct si_pub *sih)
kfree(sii);
}

/* return index of coreid or BADIDX if not found */
struct bcma_device *ai_findcore(struct si_pub *sih, u16 coreid, u16 coreunit)
{
struct bcma_device *core;
struct si_info *sii;
uint found;

sii = container_of(sih, struct si_info, pub);

found = 0;

list_for_each_entry(core, &sii->icbus->cores, list)
if (core->id.id == coreid) {
if (found == coreunit)
return core;
found++;
}

return NULL;
}

/*
* read/modify chipcommon core register.
*/
Expand Down Expand Up @@ -686,12 +665,13 @@ ai_clkctl_setdelay(struct si_pub *sih, struct bcma_device *cc)
/* initialize power control delay registers */
void ai_clkctl_init(struct si_pub *sih)
{
struct si_info *sii = container_of(sih, struct si_info, pub);
struct bcma_device *cc;

if (!(ai_get_cccaps(sih) & CC_CAP_PWR_CTL))
return;

cc = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
cc = sii->icbus->drv_cc.core;
if (cc == NULL)
return;

Expand Down Expand Up @@ -723,7 +703,7 @@ u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih)
return 0;

fpdelay = 0;
cc = ai_findcore(sih, CC_CORE_ID, 0);
cc = sii->icbus->drv_cc.core;
if (cc) {
slowminfreq = ai_slowclk_freq(sih, false, cc);
fpdelay = (((bcma_read32(cc, CHIPCREGOFFS(pll_on_delay)) + 2)
Expand All @@ -747,7 +727,7 @@ bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode)

sii = container_of(sih, struct si_info, pub);

cc = ai_findcore(&sii->pub, BCMA_CORE_CHIPCOMMON, 0);
cc = sii->icbus->drv_cc.core;
bcma_core_set_clockmode(cc, mode);
return mode == BCMA_CLKMODE_FAST;
}
Expand Down Expand Up @@ -776,9 +756,10 @@ void ai_pci_down(struct si_pub *sih)
/* Enable BT-COEX & Ex-PA for 4313 */
void ai_epa_4313war(struct si_pub *sih)
{
struct si_info *sii = container_of(sih, struct si_info, pub);
struct bcma_device *cc;

cc = ai_findcore(sih, CC_CORE_ID, 0);
cc = sii->icbus->drv_cc.core;

/* EPA Fix */
bcma_set32(cc, CHIPCREGOFFS(gpiocontrol), GPIO_CTRL_EPA_EN_MASK);
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,6 @@ struct si_info {


/* AMBA Interconnect exported externs */
extern struct bcma_device *ai_findcore(struct si_pub *sih,
u16 coreid, u16 coreunit);
extern u32 ai_core_cflags(struct bcma_device *core, u32 mask, u32 val);

/* === exported functions === */
Expand Down
12 changes: 8 additions & 4 deletions drivers/net/wireless/brcm80211/brcmsmac/pmu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,11 @@ static void si_pmu_res_masks(struct si_pub *sih, u32 * pmin, u32 * pmax)
void si_pmu_spuravoid_pllupdate(struct si_pub *sih, u8 spuravoid)
{
u32 tmp = 0;
struct si_info *sii = container_of(sih, struct si_info, pub);
struct bcma_device *core;

/* switch to chipc */
core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
core = sii->icbus->drv_cc.core;

switch (ai_get_chip_id(sih)) {
case BCM43224_CHIP_ID:
Expand Down Expand Up @@ -286,10 +287,11 @@ u32 si_pmu_alp_clock(struct si_pub *sih)
/* initialize PMU */
void si_pmu_init(struct si_pub *sih)
{
struct si_info *sii = container_of(sih, struct si_info, pub);
struct bcma_device *core;

/* select chipc */
core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
core = sii->icbus->drv_cc.core;

if (ai_get_pmurev(sih) == 1)
bcma_mask32(core, CHIPCREGOFFS(pmucontrol),
Expand All @@ -301,11 +303,12 @@ void si_pmu_init(struct si_pub *sih)
/* initialize PMU resources */
void si_pmu_res_init(struct si_pub *sih)
{
struct si_info *sii = container_of(sih, struct si_info, pub);
struct bcma_device *core;
u32 min_mask = 0, max_mask = 0;

/* select to chipc */
core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
core = sii->icbus->drv_cc.core;

/* Determine min/max rsrc masks */
si_pmu_res_masks(sih, &min_mask, &max_mask);
Expand All @@ -328,14 +331,15 @@ void si_pmu_res_init(struct si_pub *sih)

u32 si_pmu_measure_alpclk(struct si_pub *sih)
{
struct si_info *sii = container_of(sih, struct si_info, pub);
struct bcma_device *core;
u32 alp_khz;

if (ai_get_pmurev(sih) < 10)
return 0;

/* Remember original core before switch to chipc */
core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
core = sii->icbus->drv_cc.core;

if (bcma_read32(core, CHIPCREGOFFS(pmustatus)) & PST_EXTLPOAVAIL) {
u32 ilp_ctr, alp_hz;
Expand Down

0 comments on commit 40bd94c

Please sign in to comment.