renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-19 19:14:01 +08:00
Code

brcmsmac: Use debug macros for general error and debug statements

Browse Source 
Convert most uses of wiphy_* and pr_* for general error and debug
messages to use the internal debug macros instead. Most code used only
for initialization still use wiphy_err(), as well as some locations
which are executed too early to use the debug macros. Some debug
messages which are redundant or not useful are removed.

Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Tested-by: Daniel Wagner <wagi@monom.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Seth Forshee 2012-11-15 08:08:03 -06:00 committed by John W. Linville
parent 269de12bf1
commit b353dda485
5 changed files with 221 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
View File

@ -21,6 +21,7 @@
#include "antsel.h" #include "antsel.h"
#include "main.h" #include "main.h"
#include "ampdu.h" #include "ampdu.h"
#include "debug.h"
/* max number of mpdus in an ampdu */ /* max number of mpdus in an ampdu */
#define AMPDU_MAX_MPDU 32 #define AMPDU_MAX_MPDU 32
@ -179,18 +180,19 @@ static bool brcms_c_ampdu_cap(struct ampdu_info *ampdu)
static int brcms_c_ampdu_set(struct ampdu_info *ampdu, bool on) static int brcms_c_ampdu_set(struct ampdu_info *ampdu, bool on)
{ {
struct brcms_c_info *wlc = ampdu->wlc; struct brcms_c_info *wlc = ampdu->wlc;
struct bcma_device *core = wlc->hw->d11core;
wlc->pub->_ampdu = false; wlc->pub->_ampdu = false;
if (on) { if (on) {
if (!(wlc->pub->_n_enab & SUPPORT_11N)) { if (!(wlc->pub->_n_enab & SUPPORT_11N)) {
wiphy_err(ampdu->wlc->wiphy, "wl%d: driver not " brcms_err(core, "wl%d: driver not nmode enabled\n",
"nmode enabled\n", wlc->pub->unit); wlc->pub->unit);
return -ENOTSUPP; return -ENOTSUPP;
} }
if (!brcms_c_ampdu_cap(ampdu)) { if (!brcms_c_ampdu_cap(ampdu)) {
wiphy_err(ampdu->wlc->wiphy, "wl%d: device not " brcms_err(core, "wl%d: device not ampdu capable\n",
"ampdu capable\n", wlc->pub->unit); wlc->pub->unit);
return -ENOTSUPP; return -ENOTSUPP;
} }
wlc->pub->_ampdu = on; wlc->pub->_ampdu = on;
@ -481,7 +483,7 @@ brcms_c_ampdu_tx_operational(struct brcms_c_info *wlc, u8 tid,
scb_ampdu = &scb->scb_ampdu; scb_ampdu = &scb->scb_ampdu;
if (!ampdu->ini_enable[tid]) { if (!ampdu->ini_enable[tid]) {
wiphy_err(ampdu->wlc->wiphy, "%s: Rejecting tid %d\n", brcms_err(wlc->hw->d11core, "%s: Rejecting tid %d\n",
__func__, tid); __func__, tid);
return; return;
} }
@ -896,13 +898,14 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
if (supr_status) { if (supr_status) {
update_rate = false; update_rate = false;
if (supr_status == TX_STATUS_SUPR_BADCH) { if (supr_status == TX_STATUS_SUPR_BADCH) {
wiphy_err(wiphy, brcms_err(wlc->hw->d11core,
"%s: Pkt tx suppressed, illegal channel possibly %d\n", "%s: Pkt tx suppressed, illegal channel possibly %d\n",
__func__, CHSPEC_CHANNEL( __func__, CHSPEC_CHANNEL(
wlc->default_bss->chanspec)); wlc->default_bss->chanspec));
} else { } else {
if (supr_status != TX_STATUS_SUPR_FRAG) if (supr_status != TX_STATUS_SUPR_FRAG)
wiphy_err(wiphy, "%s: supr_status 0x%x\n", brcms_err(wlc->hw->d11core,
"%s: supr_status 0x%x\n",
__func__, supr_status); __func__, supr_status);
} }
/* no need to retry for badch; will fail again */ /* no need to retry for badch; will fail again */
@ -923,7 +926,8 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
} }
} else if (txs->phyerr) { } else if (txs->phyerr) {
update_rate = false; update_rate = false;
wiphy_err(wiphy, "%s: ampdu tx phy error (0x%x)\n", brcms_err(wlc->hw->d11core,
"%s: ampdu tx phy error (0x%x)\n",
__func__, txs->phyerr); __func__, txs->phyerr);
if (brcm_msg_level & BRCM_DL_INFO) { if (brcm_msg_level & BRCM_DL_INFO) {

4
drivers/net/wireless/brcm80211/brcmsmac/antsel.c
View File

@ -21,6 +21,7 @@
#include "main.h" #include "main.h"
#include "phy_shim.h" #include "phy_shim.h"
#include "antsel.h" #include "antsel.h"
#include "debug.h"
#define ANT_SELCFG_AUTO 0x80 /* bit indicates antenna sel AUTO */ #define ANT_SELCFG_AUTO 0x80 /* bit indicates antenna sel AUTO */
#define ANT_SELCFG_MASK 0x33 /* antenna configuration mask */ #define ANT_SELCFG_MASK 0x33 /* antenna configuration mask */
@ -137,7 +138,8 @@ struct antsel_info *brcms_c_antsel_attach(struct brcms_c_info *wlc)
asi->antsel_avail = false; asi->antsel_avail = false;
} else { } else {
asi->antsel_avail = false; asi->antsel_avail = false;
wiphy_err(wlc->wiphy, "antsel_attach: 2o3 " brcms_err(wlc->hw->d11core,
"antsel_attach: 2o3 "
"board cfg invalid\n"); "board cfg invalid\n");
} }

10
drivers/net/wireless/brcm80211/brcmsmac/channel.c
View File

@ -26,6 +26,7 @@
#include "stf.h" #include "stf.h"
#include "channel.h" #include "channel.h"
#include "mac80211_if.h" #include "mac80211_if.h"
#include "debug.h"
/* QDB() macro takes a dB value and converts to a quarter dB value */ /* QDB() macro takes a dB value and converts to a quarter dB value */
#define QDB(n) ((n) * BRCMS_TXPWR_DB_FACTOR) #define QDB(n) ((n) * BRCMS_TXPWR_DB_FACTOR)
@ -336,8 +337,6 @@ struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc)
const char *ccode = sprom->alpha2; const char *ccode = sprom->alpha2;
int ccode_len = sizeof(sprom->alpha2); int ccode_len = sizeof(sprom->alpha2);
BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
wlc_cm = kzalloc(sizeof(struct brcms_cm_info), GFP_ATOMIC); wlc_cm = kzalloc(sizeof(struct brcms_cm_info), GFP_ATOMIC);
if (wlc_cm == NULL) if (wlc_cm == NULL)
return NULL; return NULL;
@ -615,8 +614,8 @@ brcms_c_valid_chanspec_ext(struct brcms_cm_info *wlc_cm, u16 chspec)
/* check the chanspec */ /* check the chanspec */
if (brcms_c_chspec_malformed(chspec)) { if (brcms_c_chspec_malformed(chspec)) {
wiphy_err(wlc->wiphy, "wl%d: malformed chanspec 0x%x\n", brcms_err(wlc->hw->d11core, "wl%d: malformed chanspec 0x%x\n",
wlc->pub->unit, chspec); wlc->pub->unit, chspec);
return false; return false;
} }
@ -738,7 +737,8 @@ static int brcms_reg_notifier(struct wiphy *wiphy,
mboolclr(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE); mboolclr(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
} else { } else {
mboolset(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE); mboolset(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
wiphy_err(wlc->wiphy, "wl%d: %s: no valid channel for \"%s\"\n", brcms_err(wlc->hw->d11core,
"wl%d: %s: no valid channel for \"%s\"\n",
wlc->pub->unit, __func__, request->alpha2); wlc->pub->unit, __func__, request->alpha2);
} }

107
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
View File

@ -33,6 +33,7 @@
#include "ucode_loader.h" #include "ucode_loader.h"
#include "mac80211_if.h" #include "mac80211_if.h"
#include "main.h" #include "main.h"
#include "debug.h"
#define N_TX_QUEUES 4 /* #tx queues on mac80211<->driver interface */ #define N_TX_QUEUES 4 /* #tx queues on mac80211<->driver interface */
@ -280,7 +281,7 @@ static void brcms_ops_tx(struct ieee80211_hw *hw,
spin_lock_bh(&wl->lock); spin_lock_bh(&wl->lock);
if (!wl->pub->up) { if (!wl->pub->up) {
wiphy_err(wl->wiphy, "ops->tx called while down\n"); brcms_err(wl->wlc->hw->d11core, "ops->tx called while down\n");
kfree_skb(skb); kfree_skb(skb);
goto done; goto done;
} }
@ -317,8 +318,8 @@ static int brcms_ops_start(struct ieee80211_hw *hw)
spin_unlock_bh(&wl->lock); spin_unlock_bh(&wl->lock);
if (err != 0) if (err != 0)
wiphy_err(hw->wiphy, "%s: brcms_up() returned %d\n", __func__, brcms_err(wl->wlc->hw->d11core, "%s: brcms_up() returned %d\n",
err); __func__, err);
return err; return err;
} }
@ -336,7 +337,7 @@ static void brcms_ops_stop(struct ieee80211_hw *hw)
status = brcms_c_chipmatch(wl->wlc->hw->d11core); status = brcms_c_chipmatch(wl->wlc->hw->d11core);
spin_unlock_bh(&wl->lock); spin_unlock_bh(&wl->lock);
if (!status) { if (!status) {
wiphy_err(wl->wiphy, brcms_err(wl->wlc->hw->d11core,
"wl: brcms_ops_stop: chipmatch failed\n"); "wl: brcms_ops_stop: chipmatch failed\n");
return; return;
} }
@ -354,8 +355,9 @@ brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
/* Just STA for now */ /* Just STA for now */
if (vif->type != NL80211_IFTYPE_STATION) { if (vif->type != NL80211_IFTYPE_STATION) {
wiphy_err(hw->wiphy, "%s: Attempt to add type %d, only" brcms_err(wl->wlc->hw->d11core,
" STA for now\n", __func__, vif->type); "%s: Attempt to add type %d, only STA for now\n",
__func__, vif->type);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@ -374,9 +376,9 @@ static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)
{ {
struct ieee80211_conf *conf = &hw->conf; struct ieee80211_conf *conf = &hw->conf;
struct brcms_info *wl = hw->priv; struct brcms_info *wl = hw->priv;
struct bcma_device *core = wl->wlc->hw->d11core;
int err = 0; int err = 0;
int new_int; int new_int;
struct wiphy *wiphy = hw->wiphy;
spin_lock_bh(&wl->lock); spin_lock_bh(&wl->lock);
if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) { if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {
@ -384,25 +386,26 @@ static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)
conf->listen_interval); conf->listen_interval);
} }
if (changed & IEEE80211_CONF_CHANGE_MONITOR) if (changed & IEEE80211_CONF_CHANGE_MONITOR)
wiphy_dbg(wiphy, "%s: change monitor mode: %s\n", brcms_dbg_info(core, "%s: change monitor mode: %s\n",
__func__, conf->flags & IEEE80211_CONF_MONITOR ? __func__, conf->flags & IEEE80211_CONF_MONITOR ?
"true" : "false"); "true" : "false");
if (changed & IEEE80211_CONF_CHANGE_PS) if (changed & IEEE80211_CONF_CHANGE_PS)
wiphy_err(wiphy, "%s: change power-save mode: %s (implement)\n", brcms_err(core, "%s: change power-save mode: %s (implement)\n",
__func__, conf->flags & IEEE80211_CONF_PS ? __func__, conf->flags & IEEE80211_CONF_PS ?
"true" : "false"); "true" : "false");
if (changed & IEEE80211_CONF_CHANGE_POWER) { if (changed & IEEE80211_CONF_CHANGE_POWER) {
err = brcms_c_set_tx_power(wl->wlc, conf->power_level); err = brcms_c_set_tx_power(wl->wlc, conf->power_level);
if (err < 0) { if (err < 0) {
wiphy_err(wiphy, "%s: Error setting power_level\n", brcms_err(core, "%s: Error setting power_level\n",
__func__); __func__);
goto config_out; goto config_out;
} }
new_int = brcms_c_get_tx_power(wl->wlc); new_int = brcms_c_get_tx_power(wl->wlc);
if (new_int != conf->power_level) if (new_int != conf->power_level)
wiphy_err(wiphy, "%s: Power level req != actual, %d %d" brcms_err(core,
"\n", __func__, conf->power_level, "%s: Power level req != actual, %d %d\n",
__func__, conf->power_level,
new_int); new_int);
} }
if (changed & IEEE80211_CONF_CHANGE_CHANNEL) { if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
@ -429,13 +432,13 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
struct ieee80211_bss_conf *info, u32 changed) struct ieee80211_bss_conf *info, u32 changed)
{ {
struct brcms_info *wl = hw->priv; struct brcms_info *wl = hw->priv;
struct wiphy *wiphy = hw->wiphy; struct bcma_device *core = wl->wlc->hw->d11core;
if (changed & BSS_CHANGED_ASSOC) { if (changed & BSS_CHANGED_ASSOC) {
/* association status changed (associated/disassociated) /* association status changed (associated/disassociated)
* also implies a change in the AID. * also implies a change in the AID.
*/ */
wiphy_err(wiphy, "%s: %s: %sassociated\n", KBUILD_MODNAME, brcms_err(core, "%s: %s: %sassociated\n", KBUILD_MODNAME,
__func__, info->assoc ? "" : "dis"); __func__, info->assoc ? "" : "dis");
spin_lock_bh(&wl->lock); spin_lock_bh(&wl->lock);
brcms_c_associate_upd(wl->wlc, info->assoc); brcms_c_associate_upd(wl->wlc, info->assoc);
@ -495,7 +498,7 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
error = brcms_c_set_rateset(wl->wlc, &rs); error = brcms_c_set_rateset(wl->wlc, &rs);
spin_unlock_bh(&wl->lock); spin_unlock_bh(&wl->lock);
if (error) if (error)
wiphy_err(wiphy, "changing basic rates failed: %d\n", brcms_err(core, "changing basic rates failed: %d\n",
error); error);
} }
if (changed & BSS_CHANGED_BEACON_INT) { if (changed & BSS_CHANGED_BEACON_INT) {
@ -512,30 +515,30 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
} }
if (changed & BSS_CHANGED_BEACON) if (changed & BSS_CHANGED_BEACON)
/* Beacon data changed, retrieve new beacon (beaconing modes) */ /* Beacon data changed, retrieve new beacon (beaconing modes) */
wiphy_err(wiphy, "%s: beacon changed\n", __func__); brcms_err(core, "%s: beacon changed\n", __func__);
if (changed & BSS_CHANGED_BEACON_ENABLED) { if (changed & BSS_CHANGED_BEACON_ENABLED) {
/* Beaconing should be enabled/disabled (beaconing modes) */ /* Beaconing should be enabled/disabled (beaconing modes) */
wiphy_err(wiphy, "%s: Beacon enabled: %s\n", __func__, brcms_err(core, "%s: Beacon enabled: %s\n", __func__,
info->enable_beacon ? "true" : "false"); info->enable_beacon ? "true" : "false");
} }
if (changed & BSS_CHANGED_CQM) { if (changed & BSS_CHANGED_CQM) {
/* Connection quality monitor config changed */ /* Connection quality monitor config changed */
wiphy_err(wiphy, "%s: cqm change: threshold %d, hys %d " brcms_err(core, "%s: cqm change: threshold %d, hys %d "
" (implement)\n", __func__, info->cqm_rssi_thold, " (implement)\n", __func__, info->cqm_rssi_thold,
info->cqm_rssi_hyst); info->cqm_rssi_hyst);
} }
if (changed & BSS_CHANGED_IBSS) { if (changed & BSS_CHANGED_IBSS) {
/* IBSS join status changed */ /* IBSS join status changed */
wiphy_err(wiphy, "%s: IBSS joined: %s (implement)\n", __func__, brcms_err(core, "%s: IBSS joined: %s (implement)\n",
info->ibss_joined ? "true" : "false"); __func__, info->ibss_joined ? "true" : "false");
} }
if (changed & BSS_CHANGED_ARP_FILTER) { if (changed & BSS_CHANGED_ARP_FILTER) {
/* Hardware ARP filter address list or state changed */ /* Hardware ARP filter address list or state changed */
wiphy_err(wiphy, "%s: arp filtering: enabled %s, count %d" brcms_err(core, "%s: arp filtering: enabled %s, count %d"
" (implement)\n", __func__, info->arp_filter_enabled ? " (implement)\n", __func__, info->arp_filter_enabled ?
"true" : "false", info->arp_addr_cnt); "true" : "false", info->arp_addr_cnt);
} }
@ -545,8 +548,8 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
* QoS for this association was enabled/disabled. * QoS for this association was enabled/disabled.
* Note that it is only ever disabled for station mode. * Note that it is only ever disabled for station mode.
*/ */
wiphy_err(wiphy, "%s: qos enabled: %s (implement)\n", __func__, brcms_err(core, "%s: qos enabled: %s (implement)\n",
info->qos ? "true" : "false"); __func__, info->qos ? "true" : "false");
} }
return; return;
} }
@ -557,25 +560,25 @@ brcms_ops_configure_filter(struct ieee80211_hw *hw,
unsigned int *total_flags, u64 multicast) unsigned int *total_flags, u64 multicast)
{ {
struct brcms_info *wl = hw->priv; struct brcms_info *wl = hw->priv;
struct wiphy *wiphy = hw->wiphy; struct bcma_device *core = wl->wlc->hw->d11core;
changed_flags &= MAC_FILTERS; changed_flags &= MAC_FILTERS;
*total_flags &= MAC_FILTERS; *total_flags &= MAC_FILTERS;
if (changed_flags & FIF_PROMISC_IN_BSS) if (changed_flags & FIF_PROMISC_IN_BSS)
wiphy_dbg(wiphy, "FIF_PROMISC_IN_BSS\n"); brcms_dbg_info(core, "FIF_PROMISC_IN_BSS\n");
if (changed_flags & FIF_ALLMULTI) if (changed_flags & FIF_ALLMULTI)
wiphy_dbg(wiphy, "FIF_ALLMULTI\n"); brcms_dbg_info(core, "FIF_ALLMULTI\n");
if (changed_flags & FIF_FCSFAIL) if (changed_flags & FIF_FCSFAIL)
wiphy_dbg(wiphy, "FIF_FCSFAIL\n"); brcms_dbg_info(core, 0, "FIF_FCSFAIL\n");
if (changed_flags & FIF_CONTROL) if (changed_flags & FIF_CONTROL)
wiphy_dbg(wiphy, "FIF_CONTROL\n"); brcms_dbg_info(core, "FIF_CONTROL\n");
if (changed_flags & FIF_OTHER_BSS) if (changed_flags & FIF_OTHER_BSS)
wiphy_dbg(wiphy, "FIF_OTHER_BSS\n"); brcms_dbg_info(core, "FIF_OTHER_BSS\n");
if (changed_flags & FIF_PSPOLL) if (changed_flags & FIF_PSPOLL)
wiphy_dbg(wiphy, "FIF_PSPOLL\n"); brcms_dbg_info(core, "FIF_PSPOLL\n");
if (changed_flags & FIF_BCN_PRBRESP_PROMISC) if (changed_flags & FIF_BCN_PRBRESP_PROMISC)
wiphy_dbg(wiphy, "FIF_BCN_PRBRESP_PROMISC\n"); brcms_dbg_info(core, "FIF_BCN_PRBRESP_PROMISC\n");
spin_lock_bh(&wl->lock); spin_lock_bh(&wl->lock);
brcms_c_mac_promisc(wl->wlc, *total_flags); brcms_c_mac_promisc(wl->wlc, *total_flags);
@ -657,8 +660,8 @@ brcms_ops_ampdu_action(struct ieee80211_hw *hw,
status = brcms_c_aggregatable(wl->wlc, tid); status = brcms_c_aggregatable(wl->wlc, tid);
spin_unlock_bh(&wl->lock); spin_unlock_bh(&wl->lock);
if (!status) { if (!status) {
wiphy_err(wl->wiphy, "START: tid %d is not agg\'able\n", brcms_err(wl->wlc->hw->d11core,
tid); "START: tid %d is not agg\'able\n", tid);
return -EINVAL; return -EINVAL;
} }
ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid); ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
@ -685,8 +688,8 @@ brcms_ops_ampdu_action(struct ieee80211_hw *hw,
/* Power save wakeup */ /* Power save wakeup */
break; break;
default: default:
wiphy_err(wl->wiphy, "%s: Invalid command, ignoring\n", brcms_err(wl->wlc->hw->d11core,
__func__); "%s: Invalid command, ignoring\n", __func__);
} }
return 0; return 0;
@ -1148,14 +1151,13 @@ static int brcms_suspend(struct bcma_device *pdev)
wl->pub->hw_up = false; wl->pub->hw_up = false;
spin_unlock_bh(&wl->lock); spin_unlock_bh(&wl->lock);
pr_debug("brcms_suspend ok\n"); brcms_dbg_info(wl->wlc->hw->d11core, "brcms_suspend ok\n");
return 0; return 0;
} }
static int brcms_resume(struct bcma_device *pdev) static int brcms_resume(struct bcma_device *pdev)
{ {
pr_debug("brcms_resume ok\n");
return 0; return 0;
} }
@ -1216,7 +1218,7 @@ module_exit(brcms_module_exit);
void brcms_txflowcontrol(struct brcms_info *wl, struct brcms_if *wlif, void brcms_txflowcontrol(struct brcms_info *wl, struct brcms_if *wlif,
bool state, int prio) bool state, int prio)
{ {
wiphy_err(wl->wiphy, "Shouldn't be here %s\n", __func__); brcms_err(wl->wlc->hw->d11core, "Shouldn't be here %s\n", __func__);
} }
/* /*
@ -1224,7 +1226,8 @@ void brcms_txflowcontrol(struct brcms_info *wl, struct brcms_if *wlif,
*/ */
void brcms_init(struct brcms_info *wl) void brcms_init(struct brcms_info *wl)
{ {
BCMMSG(wl->pub->ieee_hw->wiphy, "wl%d\n", wl->pub->unit); brcms_dbg_info(wl->wlc->hw->d11core, "Initializing wl%d\n",
wl->pub->unit);
brcms_reset(wl); brcms_reset(wl);
brcms_c_init(wl->wlc, wl->mute_tx); brcms_c_init(wl->wlc, wl->mute_tx);
} }
@ -1234,7 +1237,7 @@ void brcms_init(struct brcms_info *wl)
*/ */
uint brcms_reset(struct brcms_info *wl) uint brcms_reset(struct brcms_info *wl)
{ {
BCMMSG(wl->pub->ieee_hw->wiphy, "wl%d\n", wl->pub->unit); brcms_dbg_info(wl->wlc->hw->d11core, "Resetting wl%d\n", wl->pub->unit);
brcms_c_reset(wl->wlc); brcms_c_reset(wl->wlc);
/* dpc will not be rescheduled */ /* dpc will not be rescheduled */
@ -1248,7 +1251,7 @@ uint brcms_reset(struct brcms_info *wl)
void brcms_fatal_error(struct brcms_info *wl) void brcms_fatal_error(struct brcms_info *wl)
{ {
wiphy_err(wl->wlc->wiphy, "wl%d: fatal error, reinitializing\n", brcms_err(wl->wlc->hw->d11core, "wl%d: fatal error, reinitializing\n",
wl->wlc->pub->unit); wl->wlc->pub->unit);
brcms_reset(wl); brcms_reset(wl);
ieee80211_restart_hw(wl->pub->ieee_hw); ieee80211_restart_hw(wl->pub->ieee_hw);
@ -1396,8 +1399,9 @@ void brcms_add_timer(struct brcms_timer *t, uint ms, int periodic)
#ifdef DEBUG #ifdef DEBUG
if (t->set) if (t->set)
wiphy_err(hw->wiphy, "%s: Already set. Name: %s, per %d\n", brcms_dbg_info(t->wl->wlc->hw->d11core,
__func__, t->name, periodic); "%s: Already set. Name: %s, per %d\n",
__func__, t->name, periodic);
#endif #endif
t->ms = ms; t->ms = ms;
t->periodic = (bool) periodic; t->periodic = (bool) periodic;
@ -1486,8 +1490,8 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx)
} }
} }
} }
wiphy_err(wl->wiphy, "ERROR: ucode buf tag:%d can not be found!\n", brcms_err(wl->wlc->hw->d11core,
idx); "ERROR: ucode buf tag:%d can not be found!\n", idx);
*pbuf = NULL; *pbuf = NULL;
fail: fail:
return -ENODATA; return -ENODATA;
@ -1510,7 +1514,7 @@ int brcms_ucode_init_uint(struct brcms_info *wl, size_t *n_bytes, u32 idx)
pdata = wl->fw.fw_bin[i]->data + pdata = wl->fw.fw_bin[i]->data +
le32_to_cpu(hdr->offset); le32_to_cpu(hdr->offset);
if (le32_to_cpu(hdr->len) != 4) { if (le32_to_cpu(hdr->len) != 4) {
wiphy_err(wl->wiphy, brcms_err(wl->wlc->hw->d11core,
"ERROR: fw hdr len\n"); "ERROR: fw hdr len\n");
return -ENOMSG; return -ENOMSG;
} }
@ -1519,7 +1523,8 @@ int brcms_ucode_init_uint(struct brcms_info *wl, size_t *n_bytes, u32 idx)
} }
} }
} }
wiphy_err(wl->wiphy, "ERROR: ucode tag:%d can not be found!\n", idx); brcms_err(wl->wlc->hw->d11core,
"ERROR: ucode tag:%d can not be found!\n", idx);
return -ENOMSG; return -ENOMSG;
} }
@ -1560,8 +1565,8 @@ int brcms_check_firmwares(struct brcms_info *wl)
sizeof(struct firmware_hdr)); sizeof(struct firmware_hdr));
rc = -EBADF; rc = -EBADF;
} else if (fw->size < MIN_FW_SIZE || fw->size > MAX_FW_SIZE) { } else if (fw->size < MIN_FW_SIZE || fw->size > MAX_FW_SIZE) {
wiphy_err(wl->wiphy, "%s: out of bounds fw file size " wiphy_err(wl->wiphy, "%s: out of bounds fw file size %zu\n",
"%zu\n", __func__, fw->size); __func__, fw->size);
rc = -EBADF; rc = -EBADF;
} else { } else {
/* check if ucode section overruns firmware image */ /* check if ucode section overruns firmware image */

292
drivers/net/wireless/brcm80211/brcmsmac/main.c
View File

@ -35,6 +35,7 @@
#include "main.h" #include "main.h"
#include "soc.h" #include "soc.h"
#include "dma.h" #include "dma.h"
#include "debug.h"
/* watchdog timer, in unit of ms */ /* watchdog timer, in unit of ms */
#define TIMER_INTERVAL_WATCHDOG 1000 #define TIMER_INTERVAL_WATCHDOG 1000
@ -640,7 +641,7 @@ static uint brcms_c_calc_frame_time(struct brcms_c_info *wlc, u32 ratespec,
uint rate = rspec2rate(ratespec); uint rate = rspec2rate(ratespec);
if (rate == 0) { if (rate == 0) {
wiphy_err(wlc->wiphy, "wl%d: WAR: using rate of 1 mbps\n", brcms_err(wlc->hw->d11core, "wl%d: WAR: using rate of 1 mbps\n",
wlc->pub->unit); wlc->pub->unit);
rate = BRCM_RATE_1M; rate = BRCM_RATE_1M;
} }
@ -710,7 +711,7 @@ static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,
u16 size; u16 size;
u32 value; u32 value;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); brcms_dbg_info(wlc_hw->d11core, "wl%d\n", wlc_hw->unit);
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);
@ -739,7 +740,6 @@ 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 brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode; struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode;
/* init microcode host flags */ /* init microcode host flags */
@ -750,8 +750,9 @@ static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)
if (BRCMS_ISNPHY(wlc_hw->band)) if (BRCMS_ISNPHY(wlc_hw->band))
brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16); brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16);
else else
wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev" brcms_err(wlc_hw->d11core,
" %d\n", __func__, wlc_hw->unit, "%s: wl%d: unsupported phy in corerev %d\n",
__func__, wlc_hw->unit,
wlc_hw->corerev); wlc_hw->corerev);
} else { } else {
if (D11REV_IS(wlc_hw->corerev, 24)) { if (D11REV_IS(wlc_hw->corerev, 24)) {
@ -759,12 +760,14 @@ static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)
brcms_c_write_inits(wlc_hw, brcms_c_write_inits(wlc_hw,
ucode->d11lcn0bsinitvals24); ucode->d11lcn0bsinitvals24);
else else
wiphy_err(wiphy, "%s: wl%d: unsupported phy in" brcms_err(wlc_hw->d11core,
" core rev %d\n", __func__, "%s: wl%d: unsupported phy in core rev %d\n",
wlc_hw->unit, wlc_hw->corerev); __func__, wlc_hw->unit,
wlc_hw->corerev);
} else { } else {
wiphy_err(wiphy, "%s: wl%d: unsupported corerev %d\n", brcms_err(wlc_hw->d11core,
__func__, wlc_hw->unit, wlc_hw->corerev); "%s: wl%d: unsupported corerev %d\n",
__func__, wlc_hw->unit, wlc_hw->corerev);
} }
} }
} }
@ -779,7 +782,7 @@ static void brcms_b_core_ioctl(struct brcms_hardware *wlc_hw, u32 m, u32 v)
static void brcms_b_core_phy_clk(struct brcms_hardware *wlc_hw, bool clk) 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); brcms_dbg_info(wlc_hw->d11core, "wl%d: clk %d\n", wlc_hw->unit, clk);
wlc_hw->phyclk = clk; wlc_hw->phyclk = clk;
@ -898,7 +901,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
if (txs->phyerr) { if (txs->phyerr) {
if (brcm_msg_level & BRCM_DL_INFO) { if (brcm_msg_level & BRCM_DL_INFO) {
wiphy_err(wlc->wiphy, "phyerr 0x%x, rate 0x%x\n", brcms_err(wlc->hw->d11core, "phyerr 0x%x, rate 0x%x\n",
txs->phyerr, txh->MainRates); txs->phyerr, txh->MainRates);
brcms_c_print_txdesc(txh); brcms_c_print_txdesc(txh);
} }
@ -934,7 +937,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
lastframe = !ieee80211_has_morefrags(h->frame_control); lastframe = !ieee80211_has_morefrags(h->frame_control);
if (!lastframe) { if (!lastframe) {
wiphy_err(wlc->wiphy, "Not last frame!\n"); brcms_err(wlc->hw->d11core, "Not last frame!\n");
} else { } else {
/* /*
* Set information to be consumed by Minstrel ht. * Set information to be consumed by Minstrel ht.
@ -1006,8 +1009,9 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
skb_pull(p, D11_TXH_LEN); skb_pull(p, D11_TXH_LEN);
ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw, p); ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw, p);
} else { } else {
wiphy_err(wlc->wiphy, "%s: Not last frame => not calling " brcms_err(wlc->hw->d11core,
"tx_status\n", __func__); "%s: Not last frame => not calling tx_status\n",
__func__);
} }
fatal = false; fatal = false;
@ -1055,8 +1059,8 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
&& (s1 & TXS_V)) { && (s1 & TXS_V)) {
if (s1 == 0xffffffff) { if (s1 == 0xffffffff) {
wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", brcms_err(core, "wl%d: %s: dead chip\n", wlc_hw->unit,
wlc_hw->unit, __func__); __func__);
return morepending; return morepending;
} }
s2 = bcma_read32(core, D11REGOFFS(frmtxstatus2)); s2 = bcma_read32(core, D11REGOFFS(frmtxstatus2));
@ -1132,7 +1136,6 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
u16 pio_mhf2 = 0; u16 pio_mhf2 = 0;
struct brcms_hardware *wlc_hw = wlc->hw; struct brcms_hardware *wlc_hw = wlc->hw;
uint unit = wlc_hw->unit; uint unit = wlc_hw->unit;
struct wiphy *wiphy = wlc->wiphy;
/* name and offsets for dma_attach */ /* name and offsets for dma_attach */
snprintf(name, sizeof(name), "wl%d", unit); snprintf(name, sizeof(name), "wl%d", unit);
@ -1188,8 +1191,9 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
/* Cleaner to leave this as if with AP defined */ /* Cleaner to leave this as if with AP defined */
if (dma_attach_err) { if (dma_attach_err) {
wiphy_err(wiphy, "wl%d: wlc_attach: dma_attach failed" brcms_err(wlc_hw->d11core,
"\n", unit); "wl%d: wlc_attach: dma_attach failed\n",
unit);
return false; return false;
} }
@ -1547,7 +1551,7 @@ brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len,
__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); brcms_dbg_info(core, "wl%d\n", wlc_hw->unit);
bcma_write32(core, D11REGOFFS(tplatewrptr), offset); bcma_write32(core, D11REGOFFS(tplatewrptr), offset);
@ -1756,8 +1760,6 @@ static void brcms_b_bsinit(struct brcms_c_info *wlc, u16 chanspec)
/* Perform a soft reset of the PHY PLL */ /* Perform a soft reset of the PHY PLL */
void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw) void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw)
{ {
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
ai_cc_reg(wlc_hw->sih, offsetof(struct chipcregs, chipcontrol_addr), ai_cc_reg(wlc_hw->sih, offsetof(struct chipcregs, chipcontrol_addr),
~0, 0); ~0, 0);
udelay(1); udelay(1);
@ -1802,7 +1804,7 @@ void brcms_b_phy_reset(struct brcms_hardware *wlc_hw)
u32 phy_bw_clkbits; u32 phy_bw_clkbits;
bool phy_in_reset = false; bool phy_in_reset = false;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); brcms_dbg_info(wlc_hw->d11core, "wl%d: reset phy\n", wlc_hw->unit);
if (pih == NULL) if (pih == NULL)
return; return;
@ -1936,7 +1938,7 @@ static void brcms_c_get_macaddr(struct brcms_hardware *wlc_hw, u8 etheraddr[ETH_
/* power both the pll and external oscillator on/off */ /* power both the pll and external oscillator on/off */
static void brcms_b_xtal(struct brcms_hardware *wlc_hw, bool want) 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); brcms_dbg_info(wlc_hw->d11core, "wl%d: want %d\n", wlc_hw->unit, want);
/* /*
* dont power down if plldown is false or * dont power down if plldown is false or
@ -2025,7 +2027,7 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
if (flags == BRCMS_USE_COREFLAGS) if (flags == BRCMS_USE_COREFLAGS)
flags = (wlc_hw->band->pi ? wlc_hw->band->core_flags : 0); flags = (wlc_hw->band->pi ? wlc_hw->band->core_flags : 0);
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); brcms_dbg_info(wlc_hw->d11core, "wl%d: core reset\n", wlc_hw->unit);
/* request FAST clock if not on */ /* request FAST clock if not on */
fastclk = wlc_hw->forcefastclk; fastclk = wlc_hw->forcefastclk;
@ -2036,13 +2038,13 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
if (bcma_core_is_enabled(wlc_hw->d11core)) { if (bcma_core_is_enabled(wlc_hw->d11core)) {
for (i = 0; i < NFIFO; i++) for (i = 0; i < NFIFO; i++)
if ((wlc_hw->di[i]) && (!dma_txreset(wlc_hw->di[i]))) if ((wlc_hw->di[i]) && (!dma_txreset(wlc_hw->di[i])))
wiphy_err(wlc_hw->wlc->wiphy, "wl%d: %s: " brcms_err(wlc_hw->d11core, "wl%d: %s: "
"dma_txreset[%d]: cannot stop dma\n", "dma_txreset[%d]: cannot stop dma\n",
wlc_hw->unit, __func__, i); wlc_hw->unit, __func__, i);
if ((wlc_hw->di[RX_FIFO]) if ((wlc_hw->di[RX_FIFO])
&& (!wlc_dma_rxreset(wlc_hw, RX_FIFO))) && (!wlc_dma_rxreset(wlc_hw, RX_FIFO)))
wiphy_err(wlc_hw->wlc->wiphy, "wl%d: %s: dma_rxreset" brcms_err(wlc_hw->d11core, "wl%d: %s: dma_rxreset"
"[%d]: cannot stop dma\n", "[%d]: cannot stop dma\n",
wlc_hw->unit, __func__, RX_FIFO); wlc_hw->unit, __func__, RX_FIFO);
} }
@ -2255,7 +2257,7 @@ static void brcms_ucode_write(struct brcms_hardware *wlc_hw,
uint i; uint i;
uint count; uint count;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); brcms_dbg_info(wlc_hw->d11core, "wl%d\n", wlc_hw->unit);
count = (nbytes / sizeof(u32)); count = (nbytes / sizeof(u32));
@ -2283,8 +2285,8 @@ static void brcms_ucode_download(struct brcms_hardware *wlc_hw)
ucode->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 " brcms_err(wlc_hw->d11core,
"corerev %d\n", "%s: wl%d: unsupported phy in corerev %d\n",
__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)) {
@ -2292,8 +2294,8 @@ static void brcms_ucode_download(struct brcms_hardware *wlc_hw)
ucode->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 " brcms_err(wlc_hw->d11core,
"corerev %d\n", "%s: wl%d: unsupported phy in corerev %d\n",
__func__, wlc_hw->unit, wlc_hw->corerev); __func__, wlc_hw->unit, wlc_hw->corerev);
} }
} }
@ -2330,7 +2332,6 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
uint unit; uint unit;
uint intstatus, idx; uint intstatus, idx;
struct bcma_device *core = wlc_hw->d11core; struct bcma_device *core = wlc_hw->d11core;
struct wiphy *wiphy = wlc_hw->wlc->wiphy;
unit = wlc_hw->unit; unit = wlc_hw->unit;
@ -2347,35 +2348,35 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
unit, idx, intstatus); unit, idx, intstatus);
if (intstatus & I_RO) { if (intstatus & I_RO) {
wiphy_err(wiphy, "wl%d: fifo %d: receive fifo " brcms_err(core, "wl%d: fifo %d: receive fifo "
"overflow\n", unit, idx); "overflow\n", unit, idx);
fatal = true; fatal = true;
} }
if (intstatus & I_PC) { if (intstatus & I_PC) {
wiphy_err(wiphy, "wl%d: fifo %d: descriptor error\n", brcms_err(core, "wl%d: fifo %d: descriptor error\n",
unit, idx); unit, idx);
fatal = true; fatal = true;
} }
if (intstatus & I_PD) { if (intstatus & I_PD) {
wiphy_err(wiphy, "wl%d: fifo %d: data error\n", unit, brcms_err(core, "wl%d: fifo %d: data error\n", unit,
idx); idx);
fatal = true; fatal = true;
} }
if (intstatus & I_DE) { if (intstatus & I_DE) {
wiphy_err(wiphy, "wl%d: fifo %d: descriptor protocol " brcms_err(core, "wl%d: fifo %d: descriptor protocol "
"error\n", unit, idx); "error\n", unit, idx);
fatal = true; fatal = true;
} }
if (intstatus & I_RU) if (intstatus & I_RU)
wiphy_err(wiphy, "wl%d: fifo %d: receive descriptor " brcms_err(core, "wl%d: fifo %d: receive descriptor "
"underflow\n", idx, unit); "underflow\n", idx, unit);
if (intstatus & I_XU) { if (intstatus & I_XU) {
wiphy_err(wiphy, "wl%d: fifo %d: transmit fifo " brcms_err(core, "wl%d: fifo %d: transmit fifo "
"underflow\n", idx, unit); "underflow\n", idx, unit);
fatal = true; fatal = true;
} }
@ -2625,8 +2626,8 @@ bool brcms_c_isr(struct brcms_c_info *wlc, bool *wantdpc)
macintstatus = wlc_intstatus(wlc, true); macintstatus = wlc_intstatus(wlc, true);
if (macintstatus == 0xffffffff) if (macintstatus == 0xffffffff)
wiphy_err(wlc->wiphy, "DEVICEREMOVED detected in the ISR code" brcms_err(wlc_hw->d11core,
" path\n"); "DEVICEREMOVED detected in the ISR code path\n");
/* it is not for us */ /* it is not for us */
if (macintstatus == 0) if (macintstatus == 0)
@ -2646,7 +2647,6 @@ 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 bcma_device *core = wlc_hw->d11core; struct bcma_device *core = wlc_hw->d11core;
u32 mc, mi; u32 mc, mi;
struct wiphy *wiphy = wlc->wiphy;
BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit, BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
wlc_hw->band->bandunit); wlc_hw->band->bandunit);
@ -2664,7 +2664,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
mc = bcma_read32(core, D11REGOFFS(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, brcms_err(core, "wl%d: %s: dead chip\n", wlc_hw->unit,
__func__); __func__);
brcms_down(wlc->wl); brcms_down(wlc->wl);
return; return;
@ -2675,7 +2675,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
mi = bcma_read32(core, D11REGOFFS(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, brcms_err(core, "wl%d: %s: dead chip\n", wlc_hw->unit,
__func__); __func__);
brcms_down(wlc->wl); brcms_down(wlc->wl);
return; return;
@ -2688,10 +2688,10 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
BRCMS_MAX_MAC_SUSPEND); BRCMS_MAX_MAC_SUSPEND);
if (!(bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD)) { if (!(bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD)) {
wiphy_err(wiphy, "wl%d: wlc_suspend_mac_and_wait: waited %d uS" brcms_err(core, "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, " brcms_err(core, "wl%d: psmdebug 0x%08x, phydebug 0x%08x, "
"psm_brc 0x%04x\n", wlc_hw->unit, "psm_brc 0x%04x\n", wlc_hw->unit,
bcma_read32(core, D11REGOFFS(psmdebug)), bcma_read32(core, D11REGOFFS(psmdebug)),
bcma_read32(core, D11REGOFFS(phydebug)), bcma_read32(core, D11REGOFFS(phydebug)),
@ -2700,7 +2700,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
mc = bcma_read32(core, D11REGOFFS(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, brcms_err(core, "wl%d: %s: dead chip\n", wlc_hw->unit,
__func__); __func__);
brcms_down(wlc->wl); brcms_down(wlc->wl);
return; return;
@ -2760,8 +2760,6 @@ static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw)
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);
/* Validate dchip register access */ /* Validate dchip register access */
bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0); bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
@ -2822,7 +2820,7 @@ void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
struct bcma_device *core = wlc_hw->d11core; struct bcma_device *core = wlc_hw->d11core;
u32 tmp; u32 tmp;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); brcms_dbg_info(core, "wl%d\n", wlc_hw->unit);
tmp = 0; tmp = 0;
@ -2838,8 +2836,8 @@ void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
tmp = bcma_read32(core, D11REGOFFS(clk_ctl_st)); tmp = bcma_read32(core, D11REGOFFS(clk_ctl_st));
if ((tmp & CCS_ERSRC_AVAIL_HT) != CCS_ERSRC_AVAIL_HT) if ((tmp & CCS_ERSRC_AVAIL_HT) != CCS_ERSRC_AVAIL_HT)
wiphy_err(wlc_hw->wlc->wiphy, "%s: turn on PHY" brcms_err(core, "%s: turn on PHY PLL failed\n",
" PLL failed\n", __func__); __func__);
} else { } else {
bcma_set32(core, D11REGOFFS(clk_ctl_st), bcma_set32(core, D11REGOFFS(clk_ctl_st),
tmp | CCS_ERSRC_REQ_D11PLL | tmp | CCS_ERSRC_REQ_D11PLL |
@ -2855,8 +2853,8 @@ void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
(CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL)) (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL))
!= !=
(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 " brcms_err(core, "%s: turn on PHY PLL failed\n",
"PHY PLL failed\n", __func__); __func__);
} }
} else { } else {
/* /*
@ -2874,7 +2872,7 @@ static void brcms_c_coredisable(struct brcms_hardware *wlc_hw)
{ {
bool dev_gone; bool dev_gone;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); brcms_dbg_info(wlc_hw->d11core, "wl%d: disable core\n", wlc_hw->unit);
dev_gone = brcms_deviceremoved(wlc_hw->wlc); dev_gone = brcms_deviceremoved(wlc_hw->wlc);
@ -3131,7 +3129,7 @@ static void brcms_c_statsupd(struct brcms_c_info *wlc)
/* check for rx fifo 0 overflow */ /* check for rx fifo 0 overflow */
delta = (u16) (wlc->core->macstat_snapshot->rxf0ovfl - rxf0ovfl); delta = (u16) (wlc->core->macstat_snapshot->rxf0ovfl - rxf0ovfl);
if (delta) if (delta)
wiphy_err(wlc->wiphy, "wl%d: %u rx fifo 0 overflows!\n", brcms_err(wlc->hw->d11core, "wl%d: %u rx fifo 0 overflows!\n",
wlc->pub->unit, delta); wlc->pub->unit, delta);
/* check for tx fifo underflows */ /* check for tx fifo underflows */
@ -3140,8 +3138,9 @@ static void brcms_c_statsupd(struct brcms_c_info *wlc)
(u16) (wlc->core->macstat_snapshot->txfunfl[i] - (u16) (wlc->core->macstat_snapshot->txfunfl[i] -
txfunfl[i]); txfunfl[i]);
if (delta) if (delta)
wiphy_err(wlc->wiphy, "wl%d: %u tx fifo %d underflows!" brcms_err(wlc->hw->d11core,
"\n", wlc->pub->unit, delta, i); "wl%d: %u tx fifo %d underflows!\n",
wlc->pub->unit, delta, i);
} }
#endif /* DEBUG */ #endif /* DEBUG */
@ -3154,8 +3153,6 @@ static void brcms_c_statsupd(struct brcms_c_info *wlc)
static void brcms_b_reset(struct brcms_hardware *wlc_hw) static void brcms_b_reset(struct brcms_hardware *wlc_hw)
{ {
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
/* reset the core */ /* reset the core */
if (!brcms_deviceremoved(wlc_hw->wlc)) if (!brcms_deviceremoved(wlc_hw->wlc))
brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS); brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
@ -3166,7 +3163,7 @@ static void brcms_b_reset(struct brcms_hardware *wlc_hw)
void brcms_c_reset(struct brcms_c_info *wlc) void brcms_c_reset(struct brcms_c_info *wlc)
{ {
BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit); brcms_dbg_info(wlc->hw->d11core, "wl%d\n", wlc->pub->unit);
/* slurp up hw mac counters before core reset */ /* slurp up hw mac counters before core reset */
brcms_c_statsupd(wlc); brcms_c_statsupd(wlc);
@ -3211,10 +3208,9 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
bool fifosz_fixup = false; bool fifosz_fixup = false;
int err = 0; int err = 0;
u16 buf[NFIFO]; u16 buf[NFIFO];
struct wiphy *wiphy = wlc->wiphy;
struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode; struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode;
BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit); brcms_dbg_info(core, "wl%d: core init\n", wlc_hw->unit);
/* reset PSM */ /* reset PSM */
brcms_b_mctrl(wlc_hw, ~0, (MCTL_IHR_EN | MCTL_PSM_JMP_0 | MCTL_WAKE)); brcms_b_mctrl(wlc_hw, ~0, (MCTL_IHR_EN | MCTL_PSM_JMP_0 | MCTL_WAKE));
@ -3234,7 +3230,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
SPINWAIT(((bcma_read32(core, D11REGOFFS(macintstatus)) & SPINWAIT(((bcma_read32(core, D11REGOFFS(macintstatus)) &
MI_MACSSPNDD) == 0), 1000 * 1000); MI_MACSSPNDD) == 0), 1000 * 1000);
if ((bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD) == 0) if ((bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD) == 0)
wiphy_err(wiphy, "wl%d: wlc_coreinit: ucode did not self-" brcms_err(core, "wl%d: wlc_coreinit: ucode did not self-"
"suspend!\n", wlc_hw->unit); "suspend!\n", wlc_hw->unit);
brcms_c_gpio_init(wlc); brcms_c_gpio_init(wlc);
@ -3245,18 +3241,18 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
if (BRCMS_ISNPHY(wlc_hw->band)) if (BRCMS_ISNPHY(wlc_hw->band))
brcms_c_write_inits(wlc_hw, ucode->d11n0initvals16); brcms_c_write_inits(wlc_hw, ucode->d11n0initvals16);
else else
wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev" brcms_err(core, "%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, ucode->d11lcn0initvals24); brcms_c_write_inits(wlc_hw, ucode->d11lcn0initvals24);
else else
wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev" brcms_err(core, "%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 { } else {
wiphy_err(wiphy, "%s: wl%d: unsupported corerev %d\n", brcms_err(core, "%s: wl%d: unsupported corerev %d\n",
__func__, wlc_hw->unit, wlc_hw->corerev); __func__, wlc_hw->unit, wlc_hw->corerev);
} }
@ -3298,7 +3294,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
err = -1; err = -1;
} }
if (err != 0) if (err != 0)
wiphy_err(wiphy, "wlc_coreinit: txfifo mismatch: ucode size %d" brcms_err(core, "wlc_coreinit: txfifo mismatch: ucode size %d"
" driver size %d index %d\n", buf[i], " driver size %d index %d\n", buf[i],
wlc_hw->xmtfifo_sz[i], i); wlc_hw->xmtfifo_sz[i], i);
@ -3381,8 +3377,6 @@ static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec) {
bool fastclk; bool fastclk;
struct brcms_c_info *wlc = wlc_hw->wlc; 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 */ /* request FAST clock if not on */
fastclk = wlc_hw->forcefastclk; fastclk = wlc_hw->forcefastclk;
if (!fastclk) if (!fastclk)
@ -3475,7 +3469,7 @@ static void brcms_c_rate_lookup_init(struct brcms_c_info *wlc,
rate = (rateset->rates[i] & BRCMS_RATE_MASK); rate = (rateset->rates[i] & BRCMS_RATE_MASK);
if (rate > BRCM_MAXRATE) { if (rate > BRCM_MAXRATE) {
wiphy_err(wlc->wiphy, "brcms_c_rate_lookup_init: " brcms_err(wlc->hw->d11core, "brcms_c_rate_lookup_init: "
"invalid rate 0x%X in rate set\n", "invalid rate 0x%X in rate set\n",
rateset->rates[i]); rateset->rates[i]);
continue; continue;
@ -3551,7 +3545,6 @@ static void brcms_c_bandinit_ordered(struct brcms_c_info *wlc,
uint parkband; uint parkband;
uint i, band_order[2]; uint i, band_order[2];
BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
/* /*
* We might have been bandlocked during down and the chip * We might have been bandlocked during down and the chip
* power-cycled (hibernate). Figure out the right band to park on * power-cycled (hibernate). Figure out the right band to park on
@ -3732,8 +3725,8 @@ static void brcms_c_set_ratetable(struct brcms_c_info *wlc)
/* band-specific init */ /* band-specific init */
static void brcms_c_bsinit(struct brcms_c_info *wlc) static void brcms_c_bsinit(struct brcms_c_info *wlc)
{ {
BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", brcms_dbg_info(wlc->hw->d11core, "wl%d: bandunit %d\n",
wlc->pub->unit, wlc->band->bandunit); wlc->pub->unit, wlc->band->bandunit);
/* write ucode ACK/CTS rate table */ /* write ucode ACK/CTS rate table */
brcms_c_set_ratetable(wlc); brcms_c_set_ratetable(wlc);
@ -3756,7 +3749,8 @@ brcms_c_duty_cycle_set(struct brcms_c_info *wlc, int duty_cycle, bool isOFDM,
isOFDM ? M_TX_IDLE_BUSY_RATIO_X_16_OFDM : isOFDM ? M_TX_IDLE_BUSY_RATIO_X_16_OFDM :
M_TX_IDLE_BUSY_RATIO_X_16_CCK; M_TX_IDLE_BUSY_RATIO_X_16_CCK;
if (duty_cycle > 100 || duty_cycle < 0) { if (duty_cycle > 100 || duty_cycle < 0) {
wiphy_err(wlc->wiphy, "wl%d: duty cycle value off limit\n", brcms_err(wlc->hw->d11core,
"wl%d: duty cycle value off limit\n",
wlc->pub->unit); wlc->pub->unit);
return -EINVAL; return -EINVAL;
} }
@ -3930,7 +3924,7 @@ static void brcms_c_set_chanspec(struct brcms_c_info *wlc, u16 chanspec)
u16 old_chanspec = wlc->chanspec; u16 old_chanspec = wlc->chanspec;
if (!brcms_c_valid_chanspec_db(wlc->cmi, chanspec)) { if (!brcms_c_valid_chanspec_db(wlc->cmi, chanspec)) {
wiphy_err(wlc->wiphy, "wl%d: %s: Bad channel %d\n", brcms_err(wlc->hw->d11core, "wl%d: %s: Bad channel %d\n",
wlc->pub->unit, __func__, CHSPEC_CHANNEL(chanspec)); wlc->pub->unit, __func__, CHSPEC_CHANNEL(chanspec));
return; return;
} }
@ -3941,8 +3935,8 @@ static void brcms_c_set_chanspec(struct brcms_c_info *wlc, u16 chanspec)
if (wlc->band->bandunit != bandunit || wlc->bandinit_pending) { if (wlc->band->bandunit != bandunit || wlc->bandinit_pending) {
switchband = true; switchband = true;
if (wlc->bandlocked) { if (wlc->bandlocked) {
wiphy_err(wlc->wiphy, "wl%d: %s: chspec %d " brcms_err(wlc->hw->d11core,
"band is locked!\n", "wl%d: %s: chspec %d band is locked!\n",
wlc->pub->unit, __func__, wlc->pub->unit, __func__,
CHSPEC_CHANNEL(chanspec)); CHSPEC_CHANNEL(chanspec));
return; return;
@ -4006,6 +4000,10 @@ void brcms_c_beacon_phytxctl_txant_upd(struct brcms_c_info *wlc,
*/ */
void brcms_c_protection_upd(struct brcms_c_info *wlc, uint idx, int val) void brcms_c_protection_upd(struct brcms_c_info *wlc, uint idx, int val)
{ {
/*
* Cannot use brcms_dbg_* here because this function is called
* before wlc is sufficiently initialized.
*/
BCMMSG(wlc->wiphy, "idx %d, val %d\n", idx, val); BCMMSG(wlc->wiphy, "idx %d, val %d\n", idx, val);
switch (idx) { switch (idx) {
@ -4078,8 +4076,8 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,
/* Only apply params if the core is out of reset and has clocks */ /* Only apply params if the core is out of reset and has clocks */
if (!wlc->clk) { if (!wlc->clk) {
wiphy_err(wlc->wiphy, "wl%d: %s : no-clock\n", wlc->pub->unit, brcms_err(wlc->hw->d11core, "wl%d: %s : no-clock\n",
__func__); wlc->pub->unit, __func__);
return; return;
} }
@ -4097,7 +4095,7 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,
if (acp_shm.aifs < EDCF_AIFSN_MIN if (acp_shm.aifs < EDCF_AIFSN_MIN
|| acp_shm.aifs > EDCF_AIFSN_MAX) { || acp_shm.aifs > EDCF_AIFSN_MAX) {
wiphy_err(wlc->wiphy, "wl%d: edcf_setparams: bad " brcms_err(wlc->hw->d11core, "wl%d: edcf_setparams: bad "
"aifs %d\n", wlc->pub->unit, acp_shm.aifs); "aifs %d\n", wlc->pub->unit, acp_shm.aifs);
} else { } else {
acp_shm.cwmin = params->cw_min; acp_shm.cwmin = params->cw_min;
@ -4212,8 +4210,8 @@ static void brcms_c_radio_timer(void *arg)
struct brcms_c_info *wlc = (struct brcms_c_info *) arg; struct brcms_c_info *wlc = (struct brcms_c_info *) arg;
if (brcms_deviceremoved(wlc)) { if (brcms_deviceremoved(wlc)) {
wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", wlc->pub->unit, brcms_err(wlc->hw->d11core, "wl%d: %s: dead chip\n",
__func__); wlc->pub->unit, __func__);
brcms_down(wlc->wl); brcms_down(wlc->wl);
return; return;
} }
@ -4226,8 +4224,6 @@ static void brcms_b_watchdog(struct brcms_c_info *wlc)
{ {
struct brcms_hardware *wlc_hw = wlc->hw; struct brcms_hardware *wlc_hw = wlc->hw;
BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
if (!wlc_hw->up) if (!wlc_hw->up)
return; return;
@ -4246,14 +4242,14 @@ static void brcms_b_watchdog(struct brcms_c_info *wlc)
/* common watchdog code */ /* common watchdog code */
static void brcms_c_watchdog(struct brcms_c_info *wlc) static void brcms_c_watchdog(struct brcms_c_info *wlc)
{ {
BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit); brcms_dbg_info(wlc->hw->d11core, "wl%d\n", wlc->pub->unit);
if (!wlc->pub->up) if (!wlc->pub->up)
return; return;
if (brcms_deviceremoved(wlc)) { if (brcms_deviceremoved(wlc)) {
wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", wlc->pub->unit, brcms_err(wlc->hw->d11core, "wl%d: %s: dead chip\n",
__func__); wlc->pub->unit, __func__);
brcms_down(wlc->wl); brcms_down(wlc->wl);
return; return;
} }
@ -4425,13 +4421,13 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,
struct ssb_sprom *sprom = &core->bus->sprom; struct ssb_sprom *sprom = &core->bus->sprom;
if (core->bus->hosttype == BCMA_HOSTTYPE_PCI) if (core->bus->hosttype == BCMA_HOSTTYPE_PCI)
BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit, brcms_dbg_info(core, "wl%d: vendor 0x%x device 0x%x\n", unit,
pcidev->vendor, pcidev->vendor,
pcidev->device); pcidev->device);
else else
BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit, brcms_dbg_info(core, "wl%d: vendor 0x%x device 0x%x\n", unit,
core->bus->boardinfo.vendor, core->bus->boardinfo.vendor,
core->bus->boardinfo.type); core->bus->boardinfo.type);
wme = true; wme = true;
@ -4703,8 +4699,9 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,
goto fail; goto fail;
} }
BCMMSG(wlc->wiphy, "deviceid 0x%x nbands %d board 0x%x\n", brcms_dbg_info(wlc_hw->d11core, "deviceid 0x%x nbands %d board 0x%x\n",
wlc_hw->deviceid, wlc_hw->_nbands, ai_get_boardtype(wlc_hw->sih)); wlc_hw->deviceid, wlc_hw->_nbands,
ai_get_boardtype(wlc_hw->sih));
return err; return err;
@ -4960,7 +4957,7 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw)
if (wlc_hw->wlc->pub->hw_up) if (wlc_hw->wlc->pub->hw_up)
return; return;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); brcms_dbg_info(wlc_hw->d11core, "wl%d\n", wlc_hw->unit);
/* /*
* Enable pll and xtal, initialize the power control registers, * Enable pll and xtal, initialize the power control registers,
@ -4997,7 +4994,7 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw)
static int brcms_b_up_prep(struct brcms_hardware *wlc_hw) static int brcms_b_up_prep(struct brcms_hardware *wlc_hw)
{ {
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit); brcms_dbg_info(wlc_hw->d11core, "wl%d\n", wlc_hw->unit);
/* /*
* Enable pll and xtal, initialize the power control registers, * Enable pll and xtal, initialize the power control registers,
@ -5036,8 +5033,6 @@ static int brcms_b_up_prep(struct brcms_hardware *wlc_hw)
static int brcms_b_up_finish(struct brcms_hardware *wlc_hw) static 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_hw->up = true;
wlc_phy_hw_state_upd(wlc_hw->band->pi, true); wlc_phy_hw_state_upd(wlc_hw->band->pi, true);
@ -5069,7 +5064,7 @@ int brcms_c_up(struct brcms_c_info *wlc)
{ {
struct ieee80211_channel *ch; struct ieee80211_channel *ch;
BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit); brcms_dbg_info(wlc->hw->d11core, "wl%d\n", wlc->pub->unit);
/* HW is turned off so don't try to access it */ /* HW is turned off so don't try to access it */
if (wlc->pub->hw_off || brcms_deviceremoved(wlc)) if (wlc->pub->hw_off || brcms_deviceremoved(wlc))
@ -5110,8 +5105,8 @@ int brcms_c_up(struct brcms_c_info *wlc)
WL_RADIO_HW_DISABLE); WL_RADIO_HW_DISABLE);
if (bsscfg->enable && bsscfg->BSS) if (bsscfg->enable && bsscfg->BSS)
wiphy_err(wlc->wiphy, "wl%d: up" brcms_err(wlc->hw->d11core,
": rfdisable -> " "wl%d: up: rfdisable -> "
"bsscfg_disable()\n", "bsscfg_disable()\n",
wlc->pub->unit); wlc->pub->unit);
} }
@ -5171,8 +5166,6 @@ static int brcms_b_bmac_down_prep(struct brcms_hardware *wlc_hw)
bool dev_gone; bool dev_gone;
uint callbacks = 0; uint callbacks = 0;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
if (!wlc_hw->up) if (!wlc_hw->up)
return callbacks; return callbacks;
@ -5199,8 +5192,6 @@ static int brcms_b_down_finish(struct brcms_hardware *wlc_hw)
uint callbacks = 0; uint callbacks = 0;
bool dev_gone; bool dev_gone;
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
if (!wlc_hw->up) if (!wlc_hw->up)
return callbacks; return callbacks;
@ -5249,12 +5240,13 @@ uint brcms_c_down(struct brcms_c_info *wlc)
int i; int i;
bool dev_gone = false; bool dev_gone = false;
BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit); brcms_dbg_info(wlc->hw->d11core, "wl%d\n", wlc->pub->unit);
/* check if we are already in the going down path */ /* check if we are already in the going down path */
if (wlc->going_down) { if (wlc->going_down) {
wiphy_err(wlc->wiphy, "wl%d: %s: Driver going down so return" brcms_err(wlc->hw->d11core,
"\n", wlc->pub->unit, __func__); "wl%d: %s: Driver going down so return\n",
wlc->pub->unit, __func__);
return 0; return 0;
} }
if (!wlc->pub->up) if (!wlc->pub->up)
@ -5367,7 +5359,7 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
default: default:
/* Error */ /* Error */
wiphy_err(wlc->wiphy, "wl%d: %s: invalid gmode %d\n", brcms_err(wlc->hw->d11core, "wl%d: %s: invalid gmode %d\n",
wlc->pub->unit, __func__, gmode); wlc->pub->unit, __func__, gmode);
return -ENOTSUPP; return -ENOTSUPP;
} }
@ -6015,7 +6007,7 @@ brcms_c_calc_ba_time(struct brcms_c_info *wlc, u32 rspec,
u8 preamble_type) u8 preamble_type)
{ {
BCMMSG(wlc->wiphy, "wl%d: rspec 0x%x, " BCMMSG(wlc->wiphy, "wl%d: rspec 0x%x, "
"preamble_type %d\n", wlc->pub->unit, rspec, preamble_type); "preamble_type %d\n", wlc->pub->unit, rspec, preamble_type);
/* /*
* Spec 9.6: ack rate is the highest rate in BSSBasicRateSet that * Spec 9.6: ack rate is the highest rate in BSSBasicRateSet that
* is less than or equal to the rate of the immediately previous * is less than or equal to the rate of the immediately previous
@ -6138,7 +6130,7 @@ static bool brcms_c_valid_rate(struct brcms_c_info *wlc, u32 rspec, int band,
return true; return true;
error: error:
if (verbose) if (verbose)
wiphy_err(wlc->wiphy, "wl%d: valid_rate: rate spec 0x%x " brcms_err(wlc->hw->d11core, "wl%d: valid_rate: rate spec 0x%x "
"not in hw_rateset\n", wlc->pub->unit, rspec); "not in hw_rateset\n", wlc->pub->unit, rspec);
return false; return false;
@ -6148,6 +6140,7 @@ static u32
mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band, mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band,
u32 int_val) u32 int_val)
{ {
struct bcma_device *core = wlc->hw->d11core;
u8 stf = (int_val & NRATE_STF_MASK) >> NRATE_STF_SHIFT; u8 stf = (int_val & NRATE_STF_MASK) >> NRATE_STF_SHIFT;
u8 rate = int_val & NRATE_RATE_MASK; u8 rate = int_val & NRATE_RATE_MASK;
u32 rspec; u32 rspec;
@ -6164,7 +6157,7 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band,
if ((wlc->pub->_n_enab & SUPPORT_11N) && ismcs) { if ((wlc->pub->_n_enab & SUPPORT_11N) && ismcs) {
/* mcs only allowed when nmode */ /* mcs only allowed when nmode */
if (stf > PHY_TXC1_MODE_SDM) { if (stf > PHY_TXC1_MODE_SDM) {
wiphy_err(wlc->wiphy, "wl%d: %s: Invalid stf\n", brcms_err(core, "wl%d: %s: Invalid stf\n",
wlc->pub->unit, __func__); wlc->pub->unit, __func__);
bcmerror = -EINVAL; bcmerror = -EINVAL;
goto done; goto done;
@ -6175,8 +6168,8 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band,
if (!CHSPEC_IS40(wlc->home_chanspec) || if (!CHSPEC_IS40(wlc->home_chanspec) ||
((stf != PHY_TXC1_MODE_SISO) ((stf != PHY_TXC1_MODE_SISO)
&& (stf != PHY_TXC1_MODE_CDD))) { && (stf != PHY_TXC1_MODE_CDD))) {
wiphy_err(wlc->wiphy, "wl%d: %s: Invalid mcs " brcms_err(core, "wl%d: %s: Invalid mcs 32\n",
"32\n", wlc->pub->unit, __func__); wlc->pub->unit, __func__);
bcmerror = -EINVAL; bcmerror = -EINVAL;
goto done; goto done;
} }
@ -6197,15 +6190,15 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band,
if ((stf > PHY_TXC1_MODE_STBC) || if ((stf > PHY_TXC1_MODE_STBC) ||
(!BRCMS_STBC_CAP_PHY(wlc) (!BRCMS_STBC_CAP_PHY(wlc)
&& (stf == PHY_TXC1_MODE_STBC))) { && (stf == PHY_TXC1_MODE_STBC))) {
wiphy_err(wlc->wiphy, "wl%d: %s: Invalid STBC" brcms_err(core, "wl%d: %s: Invalid STBC\n",
"\n", wlc->pub->unit, __func__); wlc->pub->unit, __func__);
bcmerror = -EINVAL; bcmerror = -EINVAL;
goto done; goto done;
} }
} }
} else if (is_ofdm_rate(rate)) { } else if (is_ofdm_rate(rate)) {
if ((stf != PHY_TXC1_MODE_CDD) && (stf != PHY_TXC1_MODE_SISO)) { if ((stf != PHY_TXC1_MODE_CDD) && (stf != PHY_TXC1_MODE_SISO)) {
wiphy_err(wlc->wiphy, "wl%d: %s: Invalid OFDM\n", brcms_err(core, "wl%d: %s: Invalid OFDM\n",
wlc->pub->unit, __func__); wlc->pub->unit, __func__);
bcmerror = -EINVAL; bcmerror = -EINVAL;
goto done; goto done;
@ -6213,20 +6206,20 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band,
} else if (is_cck_rate(rate)) { } else if (is_cck_rate(rate)) {
if ((cur_band->bandtype != BRCM_BAND_2G) if ((cur_band->bandtype != BRCM_BAND_2G)
|| (stf != PHY_TXC1_MODE_SISO)) { || (stf != PHY_TXC1_MODE_SISO)) {
wiphy_err(wlc->wiphy, "wl%d: %s: Invalid CCK\n", brcms_err(core, "wl%d: %s: Invalid CCK\n",
wlc->pub->unit, __func__); wlc->pub->unit, __func__);
bcmerror = -EINVAL; bcmerror = -EINVAL;
goto done; goto done;
} }
} else { } else {
wiphy_err(wlc->wiphy, "wl%d: %s: Unknown rate type\n", brcms_err(core, "wl%d: %s: Unknown rate type\n",
wlc->pub->unit, __func__); wlc->pub->unit, __func__);
bcmerror = -EINVAL; bcmerror = -EINVAL;
goto done; goto done;
} }
/* make sure multiple antennae are available for non-siso rates */ /* make sure multiple antennae are available for non-siso rates */
if ((stf != PHY_TXC1_MODE_SISO) && (wlc->stf->txstreams == 1)) { if ((stf != PHY_TXC1_MODE_SISO) && (wlc->stf->txstreams == 1)) {
wiphy_err(wlc->wiphy, "wl%d: %s: SISO antenna but !SISO " brcms_err(core, "wl%d: %s: SISO antenna but !SISO "
"request\n", wlc->pub->unit, __func__); "request\n", wlc->pub->unit, __func__);
bcmerror = -EINVAL; bcmerror = -EINVAL;
goto done; goto done;
@ -6295,7 +6288,7 @@ static void brcms_c_cck_plcp_set(struct brcms_c_info *wlc, int rate_500,
break; break;
default: default:
wiphy_err(wlc->wiphy, brcms_err(wlc->hw->d11core,
"brcms_c_cck_plcp_set: unsupported rate %d\n", "brcms_c_cck_plcp_set: unsupported rate %d\n",
rate_500); rate_500);
rate_500 = BRCM_RATE_1M; rate_500 = BRCM_RATE_1M;
@ -6428,7 +6421,7 @@ static u16 brcms_c_phytxctl1_calc(struct brcms_c_info *wlc, u32 rspec)
bw = rspec_get_bw(rspec); bw = rspec_get_bw(rspec);
/* 10Mhz is not supported yet */ /* 10Mhz is not supported yet */
if (bw < PHY_TXC1_BW_20MHZ) { if (bw < PHY_TXC1_BW_20MHZ) {
wiphy_err(wlc->wiphy, "phytxctl1_calc: bw %d is " brcms_err(wlc->hw->d11core, "phytxctl1_calc: bw %d is "
"not supported yet, set to 20L\n", bw); "not supported yet, set to 20L\n", bw);
bw = PHY_TXC1_BW_20MHZ; bw = PHY_TXC1_BW_20MHZ;
} }
@ -6455,7 +6448,7 @@ static u16 brcms_c_phytxctl1_calc(struct brcms_c_info *wlc, u32 rspec)
/* get the phyctl byte from rate phycfg table */ /* get the phyctl byte from rate phycfg table */
phycfg = brcms_c_rate_legacy_phyctl(rspec2rate(rspec)); phycfg = brcms_c_rate_legacy_phyctl(rspec2rate(rspec));
if (phycfg == -1) { if (phycfg == -1) {
wiphy_err(wlc->wiphy, "phytxctl1_calc: wrong " brcms_err(wlc->hw->d11core, "phytxctl1_calc: wrong "
"legacy OFDM/CCK rate\n"); "legacy OFDM/CCK rate\n");
phycfg = 0; phycfg = 0;
} }
@ -6535,8 +6528,9 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw,
if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
/* non-AP STA should never use BCMC queue */ /* non-AP STA should never use BCMC queue */
if (queue == TX_BCMC_FIFO) { if (queue == TX_BCMC_FIFO) {
wiphy_err(wlc->wiphy, "wl%d: %s: ASSERT queue == " brcms_err(wlc->hw->d11core,
"TX_BCMC!\n", wlc->pub->unit, __func__); "wl%d: %s: ASSERT queue == TX_BCMC!\n",
wlc->pub->unit, __func__);
frameid = bcmc_fid_generate(wlc, NULL, txh); frameid = bcmc_fid_generate(wlc, NULL, txh);
} else { } else {
/* Increment the counter for first fragment */ /* Increment the counter for first fragment */
@ -6706,7 +6700,8 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw,
if ((txrate[k]->flags & IEEE80211_TX_RC_MCS) if ((txrate[k]->flags & IEEE80211_TX_RC_MCS)
&& (!is_mcs_rate(rspec[k]))) { && (!is_mcs_rate(rspec[k]))) {
wiphy_err(wlc->wiphy, "wl%d: %s: IEEE80211_TX_" brcms_err(wlc->hw->d11core,
"wl%d: %s: IEEE80211_TX_"
"RC_MCS != is_mcs_rate(rspec)\n", "RC_MCS != is_mcs_rate(rspec)\n",
wlc->pub->unit, __func__); wlc->pub->unit, __func__);
} }
@ -7100,14 +7095,16 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw,
wlc->fragthresh[queue] = wlc->fragthresh[queue] =
(u16) newfragthresh; (u16) newfragthresh;
} else { } else {
wiphy_err(wlc->wiphy, "wl%d: %s txop invalid " brcms_err(wlc->hw->d11core,
"wl%d: %s txop invalid "
"for rate %d\n", "for rate %d\n",
wlc->pub->unit, fifo_names[queue], wlc->pub->unit, fifo_names[queue],
rspec2rate(rspec[0])); rspec2rate(rspec[0]));
} }
if (dur > wlc->edcf_txop[ac]) if (dur > wlc->edcf_txop[ac])
wiphy_err(wlc->wiphy, "wl%d: %s: %s txop " brcms_err(wlc->hw->d11core,
"wl%d: %s: %s txop "
"exceeded phylen %d/%d dur %d/%d\n", "exceeded phylen %d/%d dur %d/%d\n",
wlc->pub->unit, __func__, wlc->pub->unit, __func__,
fifo_names[queue], fifo_names[queue],
@ -7140,7 +7137,7 @@ static int brcms_c_tx(struct brcms_c_info *wlc, struct sk_buff *skb)
* in the tx ring and the tx queue isn't stopped then * in the tx ring and the tx queue isn't stopped then
* we've really got a bug; warn loudly if that happens. * we've really got a bug; warn loudly if that happens.
*/ */
wiphy_warn(wlc->wiphy, brcms_warn(wlc->hw->d11core,
"Received frame for tx with no space in DMA ring\n"); "Received frame for tx with no space in DMA ring\n");
WARN_ON(!ieee80211_queue_stopped(wlc->pub->ieee_hw, WARN_ON(!ieee80211_queue_stopped(wlc->pub->ieee_hw,
skb_get_queue_mapping(skb))); skb_get_queue_mapping(skb)));
@ -7392,7 +7389,8 @@ prep_mac80211_status(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
rx_status->rate_idx = 11; rx_status->rate_idx = 11;
break; break;
default: default:
wiphy_err(wlc->wiphy, "%s: Unknown rate\n", __func__); brcms_err(wlc->hw->d11core,
"%s: Unknown rate\n", __func__);
} }
/* /*
@ -7411,7 +7409,7 @@ prep_mac80211_status(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
} else if (is_ofdm_rate(rspec)) { } else if (is_ofdm_rate(rspec)) {
rx_status->flag |= RX_FLAG_SHORTPRE; rx_status->flag |= RX_FLAG_SHORTPRE;
} else { } else {
wiphy_err(wlc->wiphy, "%s: Unknown modulation\n", brcms_err(wlc->hw->d11core, "%s: Unknown modulation\n",
__func__); __func__);
} }
} }
@ -7421,12 +7419,12 @@ prep_mac80211_status(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
if (rxh->RxStatus1 & RXS_DECERR) { if (rxh->RxStatus1 & RXS_DECERR) {
rx_status->flag |= RX_FLAG_FAILED_PLCP_CRC; rx_status->flag |= RX_FLAG_FAILED_PLCP_CRC;
wiphy_err(wlc->wiphy, "%s: RX_FLAG_FAILED_PLCP_CRC\n", brcms_err(wlc->hw->d11core, "%s: RX_FLAG_FAILED_PLCP_CRC\n",
__func__); __func__);
} }
if (rxh->RxStatus1 & RXS_FCSERR) { if (rxh->RxStatus1 & RXS_FCSERR) {
rx_status->flag |= RX_FLAG_FAILED_FCS_CRC; rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
wiphy_err(wlc->wiphy, "%s: RX_FLAG_FAILED_FCS_CRC\n", brcms_err(wlc->hw->d11core, "%s: RX_FLAG_FAILED_FCS_CRC\n",
__func__); __func__);
} }
} }
@ -7837,8 +7835,9 @@ static void brcms_c_recv(struct brcms_c_info *wlc, struct sk_buff *p)
/* MAC inserts 2 pad bytes for a4 headers or QoS or A-MSDU subframes */ /* MAC inserts 2 pad bytes for a4 headers or QoS or A-MSDU subframes */
if (rxh->RxStatus1 & RXS_PBPRES) { if (rxh->RxStatus1 & RXS_PBPRES) {
if (p->len < 2) { if (p->len < 2) {
wiphy_err(wlc->wiphy, "wl%d: recv: rcvd runt of " brcms_err(wlc->hw->d11core,
"len %d\n", wlc->pub->unit, p->len); "wl%d: recv: rcvd runt of len %d\n",
wlc->pub->unit, p->len);
goto toss; goto toss;
} }
skb_pull(p, 2); skb_pull(p, 2);
@ -7934,10 +7933,9 @@ 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 bcma_device *core = wlc_hw->d11core; struct bcma_device *core = wlc_hw->d11core;
struct wiphy *wiphy = wlc->wiphy;
if (brcms_deviceremoved(wlc)) { if (brcms_deviceremoved(wlc)) {
wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit, brcms_err(core, "wl%d: %s: dead chip\n", wlc_hw->unit,
__func__); __func__);
brcms_down(wlc->wl); brcms_down(wlc->wl);
return false; return false;
@ -7958,7 +7956,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
if (brcms_b_txstatus(wlc->hw, bounded, &fatal)) if (brcms_b_txstatus(wlc->hw, bounded, &fatal))
wlc->macintstatus |= MI_TFS; wlc->macintstatus |= MI_TFS;
if (fatal) { if (fatal) {
wiphy_err(wiphy, "MI_TFS: fatal\n"); brcms_err(core, "MI_TFS: fatal\n");
goto fatal; goto fatal;
} }
} }
@ -7968,7 +7966,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"); brcms_dbg_info(core, "end of ATIM window\n");
bcma_set32(core, D11REGOFFS(maccommand), wlc->qvalid); bcma_set32(core, D11REGOFFS(maccommand), wlc->qvalid);
wlc->qvalid = 0; wlc->qvalid = 0;
} }
@ -7986,7 +7984,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
wlc_phy_noise_sample_intr(wlc_hw->band->pi); wlc_phy_noise_sample_intr(wlc_hw->band->pi);
if (macintstatus & MI_GP0) { if (macintstatus & MI_GP0) {
wiphy_err(wiphy, "wl%d: PSM microcode watchdog fired at %d " brcms_err(core, "wl%d: PSM microcode watchdog fired at %d "
"(seconds). Resetting.\n", wlc_hw->unit, wlc_hw->now); "(seconds). Resetting.\n", wlc_hw->unit, wlc_hw->now);
printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n", printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",
@ -8000,8 +7998,8 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
bcma_write32(core, D11REGOFFS(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" brcms_dbg_info(core, "wl%d: BMAC Detected a change on the"
" RF Disable Input\n", wlc_hw->unit); " RF Disable Input\n", wlc_hw->unit);
brcms_rfkill_set_hw_state(wlc->wl); brcms_rfkill_set_hw_state(wlc->wl);
} }
@ -8019,7 +8017,7 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel; struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
u16 chanspec; u16 chanspec;
BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit); brcms_dbg_info(core, "wl%d\n", wlc->pub->unit);
chanspec = ch20mhz_chspec(ch->hw_value); chanspec = ch20mhz_chspec(ch->hw_value);