Skip to content

L
linux
Commit bce42cf3 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files
Options

staging: brcm80211: removed global vars in softmac ucode handling 

Moved global vars into a per-device structure.
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0805095d
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 95 deletions
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
View file @ bce42cf3
...@@ -894,7 +894,7 @@ static int brcms_request_fw(struct brcms_info *wl, struct pci_dev *pdev) ...@@ -894,7 +894,7 @@ static int brcms_request_fw(struct brcms_info *wl, struct pci_dev *pdev)
wl->fw.fw_hdr[i]->size / (sizeof(struct firmware_hdr)); wl->fw.fw_hdr[i]->size / (sizeof(struct firmware_hdr));
} }
wl->fw.fw_cnt = i; wl->fw.fw_cnt = i;
return brcms_ucode_data_init(wl); return brcms_ucode_data_init(wl, &wl->ucode);
} }
/* /*
...@@ -925,7 +925,7 @@ static void brcms_free(struct brcms_info *wl) ...@@ -925,7 +925,7 @@ static void brcms_free(struct brcms_info *wl)
/* free ucode data */ /* free ucode data */
if (wl->fw.fw_cnt) if (wl->fw.fw_cnt)
brcms_ucode_data_free(); brcms_ucode_data_free(&wl->ucode);
if (wl->irq) if (wl->irq)
free_irq(wl->irq, wl); free_irq(wl->irq, wl);
......
drivers/staging/brcm80211/brcmsmac/mac80211_if.h
View file @ bce42cf3
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include "ucode_loader.h"
/* /*
* Starting index for 5G rates in the * Starting index for 5G rates in the
* legacy rate table. * legacy rate table.
...@@ -77,6 +77,7 @@ struct brcms_info { ...@@ -77,6 +77,7 @@ struct brcms_info {
bool resched; /* dpc needs to be and is rescheduled */ bool resched; /* dpc needs to be and is rescheduled */
struct brcms_firmware fw; struct brcms_firmware fw;
struct wiphy *wiphy; struct wiphy *wiphy;
struct brcms_ucode ucode;
}; };
/* misc callbacks */ /* misc callbacks */
......
drivers/staging/brcm80211/brcmsmac/main.c
View file @ bce42cf3
...@@ -342,6 +342,12 @@ static u16 frametype(u32 rspec, u8 mimoframe) ...@@ -342,6 +342,12 @@ static u16 frametype(u32 rspec, u8 mimoframe)
/* Starting corerev for the fifo size table */ /* Starting corerev for the fifo size table */
#define XMTFIFOTBL_STARTREV 20 #define XMTFIFOTBL_STARTREV 20
struct d11init {
u16 addr;
u16 size;
u32 value;
};
/* currently the best mechanism for determining SIFS is the band in use */ /* currently the best mechanism for determining SIFS is the band in use */
static u16 get_sifs(struct brcms_band *band) static u16 get_sifs(struct brcms_band *band)
{ {
...@@ -349,6 +355,7 @@ static u16 get_sifs(struct brcms_band *band) ...@@ -349,6 +355,7 @@ static u16 get_sifs(struct brcms_band *band)
BPHY_SIFS_TIME; BPHY_SIFS_TIME;
} }
/* /*
* Detect Card removed. * Detect Card removed.
* Even checking an sbconfig register read will not false trigger when the core * Even checking an sbconfig register read will not false trigger when the core
...@@ -694,6 +701,7 @@ static void brcms_c_write_mhf(struct brcms_hardware *wlc_hw, u16 *mhfs) ...@@ -694,6 +701,7 @@ static void brcms_c_write_mhf(struct brcms_hardware *wlc_hw, u16 *mhfs)
static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw) static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)
{ {
struct wiphy *wiphy = wlc_hw->wlc->wiphy; struct wiphy *wiphy = wlc_hw->wlc->wiphy;
struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode;
/* init microcode host flags */ /* init microcode host flags */
brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs); brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs);
...@@ -701,7 +709,7 @@ static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw) ...@@ -701,7 +709,7 @@ static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)
/* do band-specific ucode IHR, SHM, and SCR inits */ /* do band-specific ucode IHR, SHM, and SCR inits */
if (D11REV_IS(wlc_hw->corerev, 23)) { if (D11REV_IS(wlc_hw->corerev, 23)) {
if (BRCMS_ISNPHY(wlc_hw->band)) if (BRCMS_ISNPHY(wlc_hw->band))
brcms_c_write_inits(wlc_hw, d11n0bsinitvals16); brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16);
else else
wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev" wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
" %d\n", __func__, wlc_hw->unit, " %d\n", __func__, wlc_hw->unit,
...@@ -710,7 +718,7 @@ static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw) ...@@ -710,7 +718,7 @@ static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)
if (D11REV_IS(wlc_hw->corerev, 24)) { if (D11REV_IS(wlc_hw->corerev, 24)) {
if (BRCMS_ISLCNPHY(wlc_hw->band)) if (BRCMS_ISLCNPHY(wlc_hw->band))
brcms_c_write_inits(wlc_hw, brcms_c_write_inits(wlc_hw,
d11lcn0bsinitvals24); ucode->d11lcn0bsinitvals24);
else else
wiphy_err(wiphy, "%s: wl%d: unsupported phy in" wiphy_err(wiphy, "%s: wl%d: unsupported phy in"
" core rev %d\n", __func__, " core rev %d\n", __func__,
...@@ -2457,6 +2465,8 @@ static void brcms_ucode_write(struct brcms_hardware *wlc_hw, const u32 ucode[], ...@@ -2457,6 +2465,8 @@ static void brcms_ucode_write(struct brcms_hardware *wlc_hw, const u32 ucode[],
static void brcms_ucode_download(struct brcms_hardware *wlc_hw) static void brcms_ucode_download(struct brcms_hardware *wlc_hw)
{ {
struct brcms_c_info *wlc; struct brcms_c_info *wlc;
struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode;
wlc = wlc_hw->wlc; wlc = wlc_hw->wlc;
if (wlc_hw->ucode_loaded) if (wlc_hw->ucode_loaded)
...@@ -2464,8 +2474,8 @@ static void brcms_ucode_download(struct brcms_hardware *wlc_hw) ...@@ -2464,8 +2474,8 @@ static void brcms_ucode_download(struct brcms_hardware *wlc_hw)
if (D11REV_IS(wlc_hw->corerev, 23)) { if (D11REV_IS(wlc_hw->corerev, 23)) {
if (BRCMS_ISNPHY(wlc_hw->band)) { if (BRCMS_ISNPHY(wlc_hw->band)) {
brcms_ucode_write(wlc_hw, bcm43xx_16_mimo, brcms_ucode_write(wlc_hw, ucode->bcm43xx_16_mimo,
bcm43xx_16_mimosz); ucode->bcm43xx_16_mimosz);
wlc_hw->ucode_loaded = true; wlc_hw->ucode_loaded = true;
} else } else
wiphy_err(wlc->wiphy, "%s: wl%d: unsupported phy in " wiphy_err(wlc->wiphy, "%s: wl%d: unsupported phy in "
...@@ -2473,8 +2483,8 @@ static void brcms_ucode_download(struct brcms_hardware *wlc_hw) ...@@ -2473,8 +2483,8 @@ static void brcms_ucode_download(struct brcms_hardware *wlc_hw)
__func__, wlc_hw->unit, wlc_hw->corerev); __func__, wlc_hw->unit, wlc_hw->corerev);
} else if (D11REV_IS(wlc_hw->corerev, 24)) { } else if (D11REV_IS(wlc_hw->corerev, 24)) {
if (BRCMS_ISLCNPHY(wlc_hw->band)) { if (BRCMS_ISLCNPHY(wlc_hw->band)) {
brcms_ucode_write(wlc_hw, bcm43xx_24_lcn, brcms_ucode_write(wlc_hw, ucode->bcm43xx_24_lcn,
bcm43xx_24_lcnsz); ucode->bcm43xx_24_lcnsz);
wlc_hw->ucode_loaded = true; wlc_hw->ucode_loaded = true;
} else { } else {
wiphy_err(wlc->wiphy, "%s: wl%d: unsupported phy in " wiphy_err(wlc->wiphy, "%s: wl%d: unsupported phy in "
...@@ -3372,6 +3382,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) ...@@ -3372,6 +3382,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
int err = 0; int err = 0;
u16 buf[NFIFO]; u16 buf[NFIFO];
struct wiphy *wiphy = wlc->wiphy; struct wiphy *wiphy = wlc->wiphy;
struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode;
regs = wlc_hw->regs; regs = wlc_hw->regs;
...@@ -3404,14 +3415,14 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) ...@@ -3404,14 +3415,14 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
if (D11REV_IS(wlc_hw->corerev, 23)) { if (D11REV_IS(wlc_hw->corerev, 23)) {
if (BRCMS_ISNPHY(wlc_hw->band)) if (BRCMS_ISNPHY(wlc_hw->band))
brcms_c_write_inits(wlc_hw, d11n0initvals16); brcms_c_write_inits(wlc_hw, ucode->d11n0initvals16);
else else
wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev" wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
" %d\n", __func__, wlc_hw->unit, " %d\n", __func__, wlc_hw->unit,
wlc_hw->corerev); wlc_hw->corerev);
} else if (D11REV_IS(wlc_hw->corerev, 24)) { } else if (D11REV_IS(wlc_hw->corerev, 24)) {
if (BRCMS_ISLCNPHY(wlc_hw->band)) if (BRCMS_ISLCNPHY(wlc_hw->band))
brcms_c_write_inits(wlc_hw, d11lcn0initvals24); brcms_c_write_inits(wlc_hw, ucode->d11lcn0initvals24);
else else
wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev" wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
" %d\n", __func__, wlc_hw->unit, " %d\n", __func__, wlc_hw->unit,
......
drivers/staging/brcm80211/brcmsmac/ucode_loader.c
View file @ bce42cf3
...@@ -37,80 +37,73 @@ enum { ...@@ -37,80 +37,73 @@ enum {
D11UCODE_OVERSIGHT_BOMMINOR D11UCODE_OVERSIGHT_BOMMINOR
}; };
struct d11init *d11lcn0bsinitvals24; int brcms_ucode_data_init(struct brcms_info *wl, struct brcms_ucode *ucode)
struct d11init *d11lcn0initvals24;
struct d11init *d11lcn1bsinitvals24;
struct d11init *d11lcn1initvals24;
struct d11init *d11lcn2bsinitvals24;
struct d11init *d11lcn2initvals24;
struct d11init *d11n0absinitvals16;
struct d11init *d11n0bsinitvals16;
struct d11init *d11n0initvals16;
u32 *bcm43xx_16_mimo;
u32 bcm43xx_16_mimosz;
u32 *bcm43xx_24_lcn;
u32 bcm43xx_24_lcnsz;
static u32 *bcm43xx_bommajor;
static u32 *bcm43xx_bomminor;
int brcms_ucode_data_init(struct brcms_info *wl)
{ {
int rc; int rc;
rc = brcms_check_firmwares(wl); rc = brcms_check_firmwares(wl);
rc = rc < 0 ? rc : rc = rc < 0 ? rc :
brcms_ucode_init_buf(wl, (void **)&d11lcn0bsinitvals24, brcms_ucode_init_buf(wl, (void **)&ucode->d11lcn0bsinitvals24,
D11LCN0BSINITVALS24); D11LCN0BSINITVALS24);
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn0initvals24, rc = rc < 0 ?
rc : brcms_ucode_init_buf(wl, (void **)&ucode->d11lcn0initvals24,
D11LCN0INITVALS24); D11LCN0INITVALS24);
rc = rc < 0 ? rc : rc = rc < 0 ?
brcms_ucode_init_buf(wl, (void **)&d11lcn1bsinitvals24, rc : brcms_ucode_init_buf(wl, (void **)&ucode->d11lcn1bsinitvals24,
D11LCN1BSINITVALS24); D11LCN1BSINITVALS24);
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn1initvals24, rc = rc < 0 ?
rc : brcms_ucode_init_buf(wl, (void **)&ucode->d11lcn1initvals24,
D11LCN1INITVALS24); D11LCN1INITVALS24);
rc = rc < 0 ? rc : rc = rc < 0 ? rc :
brcms_ucode_init_buf(wl, (void **)&d11lcn2bsinitvals24, brcms_ucode_init_buf(wl, (void **)&ucode->d11lcn2bsinitvals24,
D11LCN2BSINITVALS24); D11LCN2BSINITVALS24);
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn2initvals24, rc = rc < 0 ?
rc : brcms_ucode_init_buf(wl, (void **)&ucode->d11lcn2initvals24,
D11LCN2INITVALS24); D11LCN2INITVALS24);
rc = rc < 0 ? rc : rc = rc < 0 ?
brcms_ucode_init_buf(wl, (void **)&d11n0absinitvals16, rc : brcms_ucode_init_buf(wl, (void **)&ucode->d11n0absinitvals16,
D11N0ABSINITVALS16); D11N0ABSINITVALS16);
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11n0bsinitvals16, rc = rc < 0 ?
rc : brcms_ucode_init_buf(wl, (void **)&ucode->d11n0bsinitvals16,
D11N0BSINITVALS16); D11N0BSINITVALS16);
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11n0initvals16, rc = rc < 0 ?
rc : brcms_ucode_init_buf(wl, (void **)&ucode->d11n0initvals16,
D11N0INITVALS16); D11N0INITVALS16);
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_16_mimo, rc = rc < 0 ?
rc : brcms_ucode_init_buf(wl, (void **)&ucode->bcm43xx_16_mimo,
D11UCODE_OVERSIGHT16_MIMO); D11UCODE_OVERSIGHT16_MIMO);
rc = rc < 0 ? rc : brcms_ucode_init_uint(wl, &bcm43xx_16_mimosz, rc = rc < 0 ?
rc : brcms_ucode_init_uint(wl, &ucode->bcm43xx_16_mimosz,
D11UCODE_OVERSIGHT16_MIMOSZ); D11UCODE_OVERSIGHT16_MIMOSZ);
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_24_lcn, rc = rc < 0 ?
rc : brcms_ucode_init_buf(wl, (void **)&ucode->bcm43xx_24_lcn,
D11UCODE_OVERSIGHT24_LCN); D11UCODE_OVERSIGHT24_LCN);
rc = rc < 0 ? rc : brcms_ucode_init_uint(wl, &bcm43xx_24_lcnsz, rc = rc < 0 ?
rc : brcms_ucode_init_uint(wl, &ucode->bcm43xx_24_lcnsz,
D11UCODE_OVERSIGHT24_LCNSZ); D11UCODE_OVERSIGHT24_LCNSZ);
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_bommajor, rc = rc < 0 ?
rc : brcms_ucode_init_buf(wl, (void **)&ucode->bcm43xx_bommajor,
D11UCODE_OVERSIGHT_BOMMAJOR); D11UCODE_OVERSIGHT_BOMMAJOR);
rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_bomminor, rc = rc < 0 ?
rc : brcms_ucode_init_buf(wl, (void **)&ucode->bcm43xx_bomminor,
D11UCODE_OVERSIGHT_BOMMINOR); D11UCODE_OVERSIGHT_BOMMINOR);
return rc; return rc;
} }
void brcms_ucode_data_free(void) void brcms_ucode_data_free(struct brcms_ucode *ucode)
{ {
brcms_ucode_free_buf((void *)d11lcn0bsinitvals24); brcms_ucode_free_buf((void *)ucode->d11lcn0bsinitvals24);
brcms_ucode_free_buf((void *)d11lcn0initvals24); brcms_ucode_free_buf((void *)ucode->d11lcn0initvals24);
brcms_ucode_free_buf((void *)d11lcn1bsinitvals24); brcms_ucode_free_buf((void *)ucode->d11lcn1bsinitvals24);
brcms_ucode_free_buf((void *)d11lcn1initvals24); brcms_ucode_free_buf((void *)ucode->d11lcn1initvals24);
brcms_ucode_free_buf((void *)d11lcn2bsinitvals24); brcms_ucode_free_buf((void *)ucode->d11lcn2bsinitvals24);
brcms_ucode_free_buf((void *)d11lcn2initvals24); brcms_ucode_free_buf((void *)ucode->d11lcn2initvals24);
brcms_ucode_free_buf((void *)d11n0absinitvals16); brcms_ucode_free_buf((void *)ucode->d11n0absinitvals16);
brcms_ucode_free_buf((void *)d11n0bsinitvals16); brcms_ucode_free_buf((void *)ucode->d11n0bsinitvals16);
brcms_ucode_free_buf((void *)d11n0initvals16); brcms_ucode_free_buf((void *)ucode->d11n0initvals16);
brcms_ucode_free_buf((void *)bcm43xx_16_mimo); brcms_ucode_free_buf((void *)ucode->bcm43xx_16_mimo);
brcms_ucode_free_buf((void *)bcm43xx_24_lcn); brcms_ucode_free_buf((void *)ucode->bcm43xx_24_lcn);
brcms_ucode_free_buf((void *)bcm43xx_bommajor); brcms_ucode_free_buf((void *)ucode->bcm43xx_bommajor);
brcms_ucode_free_buf((void *)bcm43xx_bomminor); brcms_ucode_free_buf((void *)ucode->bcm43xx_bomminor);
return;
} }
drivers/staging/brcm80211/brcmsmac/ucode_loader.h
View file @ bce42cf3
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifndef _BRCM_UCODE_H_
#define _BRCM_UCODE_H_
#include "types.h" /* forward structure declarations */ #include "types.h" /* forward structure declarations */
...@@ -21,28 +23,30 @@ ...@@ -21,28 +23,30 @@
#define UCODE_LOADER_API_VER 0 #define UCODE_LOADER_API_VER 0
struct d11init { struct d11init;
u16 addr;
u16 size; struct brcms_ucode {
u32 value; struct d11init *d11lcn0bsinitvals24;
struct d11init *d11lcn0initvals24;
struct d11init *d11lcn1bsinitvals24;
struct d11init *d11lcn1initvals24;
struct d11init *d11lcn2bsinitvals24;
struct d11init *d11lcn2initvals24;
struct d11init *d11n0absinitvals16;
struct d11init *d11n0bsinitvals16;
struct d11init *d11n0initvals16;
u32 *bcm43xx_16_mimo;
u32 bcm43xx_16_mimosz;
u32 *bcm43xx_24_lcn;
u32 bcm43xx_24_lcnsz;
u32 *bcm43xx_bommajor;
u32 *bcm43xx_bomminor;
}; };
extern struct d11init *d11lcn0bsinitvals24; extern int
extern struct d11init *d11lcn0initvals24; brcms_ucode_data_init(struct brcms_info *wl, struct brcms_ucode *ucode);
extern struct d11init *d11lcn1bsinitvals24;
extern struct d11init *d11lcn1initvals24; extern void brcms_ucode_data_free(struct brcms_ucode *ucode);
extern struct d11init *d11lcn2bsinitvals24;
extern struct d11init *d11lcn2initvals24;
extern struct d11init *d11n0absinitvals16;
extern struct d11init *d11n0bsinitvals16;
extern struct d11init *d11n0initvals16;
extern u32 *bcm43xx_16_mimo;
extern u32 bcm43xx_16_mimosz;
extern u32 *bcm43xx_24_lcn;
extern u32 bcm43xx_24_lcnsz;
extern int brcms_ucode_data_init(struct brcms_info *wl);
extern void brcms_ucode_data_free(void);
extern int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, extern int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf,
unsigned int idx); unsigned int idx);
...@@ -50,3 +54,5 @@ extern int brcms_ucode_init_uint(struct brcms_info *wl, unsigned *data, ...@@ -50,3 +54,5 @@ extern int brcms_ucode_init_uint(struct brcms_info *wl, unsigned *data,
unsigned int idx); unsigned int idx);
extern void brcms_ucode_free_buf(void *); extern void brcms_ucode_free_buf(void *);
extern int brcms_check_firmwares(struct brcms_info *wl); extern int brcms_check_firmwares(struct brcms_info *wl);
#endif /* _BRCM_UCODE_H_ */
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