wifi: sv6160: clean up debug logging for production
- Demote verbose TX_DONE, bss_info_changed, channel, FW_PRIV logging from dev_info to dev_dbg - Move tx_frame hex dump to print_hex_dump_debug - Remove unused sv6160_fw_reg_access (DUMP_REG_INFO doesn't work — firmware generates CALIBRATION_DONE instead) - Remove unused variable in mac_config
This commit is contained in:
1 parent
a70f17b0ed
commit
0d1364aeb9
1 file changed
+12
-68
@@ -459,7 +459,7 @@ int sv6160_rpu_channel(struct sv6160_softc *sc, u32 channel, u32 freq_band)
|
||||
cmd.channel_bw = cpu_to_le32(RPU_CHAN_WIDTH_20_NOHT);
|
||||
cmd.freq_band = cpu_to_le32(freq_band);
|
||||
|
||||
dev_info(sc->dev, "Channel set: ch=%u band=%u\n", channel, freq_band);
|
||||
dev_dbg(sc->dev, "Channel set: ch=%u band=%u\n", channel, freq_band);
|
||||
reinit_completion(&sc->chan_prog_done);
|
||||
|
||||
/* RPU_CMD_CHANNEL (23) → firmware tier-2 LMAC processor.
|
||||
@@ -759,51 +759,6 @@ int sv6160_rpu_roc(struct sv6160_softc *sc, u32 ctrl, u32 channel,
|
||||
return sv6160_rpu_send_cmd(sc, &cmd, sizeof(cmd), RPU_CMD_ROC_CTRL);
|
||||
}
|
||||
|
||||
/*
|
||||
* Read/write firmware internal registers via DUMP_REG_INFO command.
|
||||
* Uses FW_PRIV_CMD with type=DUMP_REG_INFO (from gamely BSP).
|
||||
*/
|
||||
#define DUMP_REG_INFO 0x70616E63 /* "panc" — gamely BSP debug type */
|
||||
#define READ_REG 0
|
||||
#define WRITE_REG 1
|
||||
|
||||
static int sv6160_fw_reg_access(struct sv6160_softc *sc, u32 addr,
|
||||
u32 *val, int write)
|
||||
{
|
||||
struct {
|
||||
struct rpu_msg_hdr hdr;
|
||||
__le32 type;
|
||||
__le32 reg;
|
||||
__le32 val;
|
||||
__le32 len;
|
||||
__le32 rw;
|
||||
} __packed cmd;
|
||||
int ret, polls;
|
||||
|
||||
memset(&cmd, 0, sizeof(cmd));
|
||||
cmd.type = cpu_to_le32(DUMP_REG_INFO);
|
||||
cmd.reg = cpu_to_le32(addr);
|
||||
cmd.len = cpu_to_le32(4);
|
||||
cmd.rw = cpu_to_le32(write ? WRITE_REG : READ_REG);
|
||||
if (write)
|
||||
cmd.val = cpu_to_le32(*val);
|
||||
|
||||
reinit_completion(&sc->cmd_done);
|
||||
ret = sv6160_rpu_send_cmd(sc, &cmd, sizeof(cmd),
|
||||
FW_PKT_TYPE_HOST_CMD);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
polls = 30;
|
||||
while (polls-- > 0) {
|
||||
sv6160_trigger_rx(sc);
|
||||
if (wait_for_completion_timeout(&sc->cmd_done,
|
||||
msecs_to_jiffies(100)))
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* ===================================================================
|
||||
* RPU Event Processing
|
||||
*
|
||||
@@ -1059,8 +1014,8 @@ static void sv6160_process_tx_done(struct sv6160_softc *sc,
|
||||
tx_done = (struct rpu_event_tx_done *)skb->data;
|
||||
desc_id = le32_to_cpu(tx_done->descriptor_id);
|
||||
|
||||
dev_info(sc->dev,
|
||||
"TX_DONE: desc_id=%u queue=%u pdout=%u status=[%u,%u,%u,%u] retries=[%u,%u,%u,%u] rate=[%u,%u,%u,%u]\n",
|
||||
dev_dbg(sc->dev,
|
||||
"TX_DONE: desc_id=%u queue=%u pdout=%u status=[%u,%u,%u,%u] retries=[%u,%u,%u,%u] rate=[%u,%u,%u,%u]\n",
|
||||
desc_id, tx_done->queue, tx_done->pdout_voltage,
|
||||
tx_done->frm_status[0], tx_done->frm_status[1],
|
||||
tx_done->frm_status[2], tx_done->frm_status[3],
|
||||
@@ -1274,15 +1229,8 @@ void sv6160_rpu_process_event(struct sv6160_softc *sc, struct sk_buff *skb)
|
||||
case RPU_EVENT_CALIBRATION_DONE:
|
||||
case RPU_EVENT_COMMAND_PROC_DONE:
|
||||
case RPU_EVENT_FW_PRIV_CMD_DONE:
|
||||
dev_info(sc->dev, "RPU: FW_PRIV done (event %u, len=%u)\n",
|
||||
event, skb->len);
|
||||
if (skb->len > 28) {
|
||||
print_hex_dump(KERN_INFO, " fw_priv_rsp: ",
|
||||
DUMP_PREFIX_OFFSET, 16, 1,
|
||||
skb->data + 28,
|
||||
min_t(unsigned int, skb->len - 28, 64),
|
||||
true);
|
||||
}
|
||||
dev_dbg(sc->dev, "RPU: command done (event %u, len=%u)\n",
|
||||
event, skb->len);
|
||||
complete(&sc->cmd_done);
|
||||
dev_kfree_skb(skb);
|
||||
break;
|
||||
@@ -2023,11 +1971,8 @@ static int sv6160_mac_config(struct ieee80211_hw *hw, int radio_idx, u32 changed
|
||||
if (!sc->is_rpu_ready)
|
||||
return 0;
|
||||
|
||||
if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
|
||||
u32 ch = conf->chandef.chan->hw_value;
|
||||
|
||||
if (changed & IEEE80211_CONF_CHANGE_CHANNEL)
|
||||
sv6160_rpu_channel(sc, conf->chandef.chan->hw_value, 0);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -2070,11 +2015,9 @@ static void sv6160_mac_bss_info_changed(struct ieee80211_hw *hw,
|
||||
if (!sc->is_rpu_ready)
|
||||
return;
|
||||
|
||||
dev_info(sc->dev, "bss_info_changed: changed=0x%llx\n", changed);
|
||||
|
||||
if (changed & BSS_CHANGED_BSSID) {
|
||||
dev_info(sc->dev, "Setting BSSID %pM (pre-auth STA_CONN)\n",
|
||||
info->bssid);
|
||||
dev_dbg(sc->dev, "Setting BSSID %pM (STA_CONN)\n",
|
||||
info->bssid);
|
||||
/* Send BSSID + STA_CONN together — firmware needs to know
|
||||
* we're connecting BEFORE auth, otherwise it won't forward
|
||||
* auth/assoc response frames to the host. The gamely BSP
|
||||
@@ -2219,9 +2162,10 @@ static void sv6160_tx_worker(struct work_struct *work)
|
||||
RPU_CMD_TX, frame_len, hdrlen,
|
||||
ieee80211_is_mgmt(wh->frame_control) ?
|
||||
"mgmt" : "data", desc_id);
|
||||
print_hex_dump(KERN_INFO, " tx_frame: ",
|
||||
DUMP_PREFIX_OFFSET, 16, 1,
|
||||
skb->data, min_t(u32, frame_len, 64), true);
|
||||
print_hex_dump_debug(" tx_frame: ",
|
||||
DUMP_PREFIX_OFFSET, 16, 1,
|
||||
skb->data, min_t(u32, frame_len, 64),
|
||||
true);
|
||||
|
||||
/* Two separate SDIO writes (gamely BSP default non-SG path):
|
||||
* 1. cmd_tx_ctrl header (512 bytes)
|
||||
|
||||
Reference in new issue
Block a user