2013-07-15 17:30:50

by John Greene

Subject: [PATCH v3] brcmsmac: Further reduce log spam from tx phy messages

Relegate 2 phy messages to debug status as they create excessive
log spam, noted in multiple bugzillas for brcmsmac v3.8 and up.
This is a follow on to net-next 99e94940697adec4f84758adb2db71f4a82c7ba5:
brcmsmac: Reduce log spam in heavy tx, make err print in debug

brcmsmac bcma0:0: phyerr 0x10, rate 0x14
brcmsmac bcma0:0: brcms_c_ampdu_dotxstatus_complete:
ampdu tx phy error (0x10)

Signed-off-by: John Greene <[email protected]>

ver 2: Two trivial whitespace fixes.
ver 3: My ver 2 comment in wrong place.
---
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 6 +++---
drivers/net/wireless/brcm80211/brcmsmac/main.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index bd98285..fa391e4 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -928,9 +928,9 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
}
} else if (txs->phyerr) {
update_rate = false;
- brcms_err(wlc->hw->d11core,
- "%s: ampdu tx phy error (0x%x)\n",
- __func__, txs->phyerr);
+ brcms_dbg_ht(wlc->hw->d11core,
+ "%s: ampdu tx phy error (0x%x)\n",
+ __func__, txs->phyerr);
}
}

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 9fd6f2f..7ca10bf 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -882,8 +882,8 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
mcl = le16_to_cpu(txh->MacTxControlLow);

if (txs->phyerr)
- brcms_err(wlc->hw->d11core, "phyerr 0x%x, rate 0x%x\n",
- txs->phyerr, txh->MainRates);
+ brcms_dbg_tx(wlc->hw->d11core, "phyerr 0x%x, rate 0x%x\n",
+ txs->phyerr, txh->MainRates);

if (txs->frameid != le16_to_cpu(txh->TxFrameID)) {
brcms_err(wlc->hw->d11core, "frameid != txh->TxFrameID\n");
--
1.7.11.7

2013-07-15 18:00:14

by John W. Linville

Subject: Re: [PATCH v3] brcmsmac: Further reduce log spam from tx phy messages

On Mon, Jul 15, 2013 at 01:30:35PM -0400, John Greene wrote:
> Relegate 2 phy messages to debug status as they create excessive
> log spam, noted in multiple bugzillas for brcmsmac v3.8 and up.
> This is a follow on to net-next 99e94940697adec4f84758adb2db71f4a82c7ba5:
> brcmsmac: Reduce log spam in heavy tx, make err print in debug
>
> brcmsmac bcma0:0: phyerr 0x10, rate 0x14
> brcmsmac bcma0:0: brcms_c_ampdu_dotxstatus_complete:
> ampdu tx phy error (0x10)
>
> Signed-off-by: John Greene <[email protected]>
>
> ver 2: Two trivial whitespace fixes.
> ver 3: My ver 2 comment in wrong place.

These lines...

> ---

Should go here, after the "---" line...

> drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 6 +++---
> drivers/net/wireless/brcm80211/brcmsmac/main.c | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
> index bd98285..fa391e4 100644
> --- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
> +++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
> @@ -928,9 +928,9 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
> }
> } else if (txs->phyerr) {
> update_rate = false;
> - brcms_err(wlc->hw->d11core,
> - "%s: ampdu tx phy error (0x%x)\n",
> - __func__, txs->phyerr);
> + brcms_dbg_ht(wlc->hw->d11core,
> + "%s: ampdu tx phy error (0x%x)\n",
> + __func__, txs->phyerr);
> }
> }
>
> diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
> index 9fd6f2f..7ca10bf 100644
> --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
> +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
> @@ -882,8 +882,8 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
> mcl = le16_to_cpu(txh->MacTxControlLow);
>
> if (txs->phyerr)
> - brcms_err(wlc->hw->d11core, "phyerr 0x%x, rate 0x%x\n",
> - txs->phyerr, txh->MainRates);
> + brcms_dbg_tx(wlc->hw->d11core, "phyerr 0x%x, rate 0x%x\n",
> + txs->phyerr, txh->MainRates);
>
> if (txs->frameid != le16_to_cpu(txh->TxFrameID)) {
> brcms_err(wlc->hw->d11core, "frameid != txh->TxFrameID\n");
> --
> 1.7.11.7
>
>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.