Skip to content

L
linux
Commit 2057ebb2 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by John W. Linville
Browse files
Options

wil6210: remove raw wil_dbg() calls 

Introduce debug category "MISC", convert all raw wil_dbg() to this category.
This improves dynamic debug manageability
Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4789d728
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 24 deletions
drivers/net/wireless/ath/wil6210/cfg80211.c
View file @ 2057ebb2
...@@ -228,8 +228,8 @@ static int wil_cfg80211_scan(struct wiphy *wiphy, ...@@ -228,8 +228,8 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,
} }
/* 0-based channel indexes */ /* 0-based channel indexes */
cmd.cmd.channel_list[cmd.cmd.num_channels++].channel = ch - 1; cmd.cmd.channel_list[cmd.cmd.num_channels++].channel = ch - 1;
wil_dbg(wil, "Scan for ch %d : %d MHz\n", ch, wil_dbg_MISC(wil, "Scan for ch %d : %d MHz\n", ch,
request->channels[i]->center_freq); request->channels[i]->center_freq);
} }
return wmi_send(wil, WMI_START_SCAN_CMDID, &cmd, sizeof(cmd.cmd) + return wmi_send(wil, WMI_START_SCAN_CMDID, &cmd, sizeof(cmd.cmd) +
...@@ -425,8 +425,8 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy, ...@@ -425,8 +425,8 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy,
return -EINVAL; return -EINVAL;
} }
wil_dbg(wil, "AP on Channel %d %d MHz, %s\n", channel->hw_value, wil_dbg_MISC(wil, "AP on Channel %d %d MHz, %s\n", channel->hw_value,
channel->center_freq, info->privacy ? "secure" : "open"); channel->center_freq, info->privacy ? "secure" : "open");
print_hex_dump_bytes("SSID ", DUMP_PREFIX_OFFSET, print_hex_dump_bytes("SSID ", DUMP_PREFIX_OFFSET,
info->ssid, info->ssid_len); info->ssid, info->ssid_len);
......
drivers/net/wireless/ath/wil6210/main.c
View file @ 2057ebb2
...@@ -64,7 +64,7 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid) ...@@ -64,7 +64,7 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid)
struct net_device *ndev = wil_to_ndev(wil); struct net_device *ndev = wil_to_ndev(wil);
struct wireless_dev *wdev = wil->wdev; struct wireless_dev *wdev = wil->wdev;
wil_dbg(wil, "%s()\n", __func__); wil_dbg_MISC(wil, "%s()\n", __func__);
wil_link_off(wil); wil_link_off(wil);
clear_bit(wil_status_fwconnected, &wil->status); clear_bit(wil_status_fwconnected, &wil->status);
...@@ -99,7 +99,7 @@ static void wil_connect_timer_fn(ulong x) ...@@ -99,7 +99,7 @@ static void wil_connect_timer_fn(ulong x)
{ {
struct wil6210_priv *wil = (void *)x; struct wil6210_priv *wil = (void *)x;
wil_dbg(wil, "Connect timeout\n"); wil_dbg_MISC(wil, "Connect timeout\n");
/* reschedule to thread context - disconnect won't /* reschedule to thread context - disconnect won't
* run from atomic context * run from atomic context
...@@ -109,7 +109,7 @@ static void wil_connect_timer_fn(ulong x) ...@@ -109,7 +109,7 @@ static void wil_connect_timer_fn(ulong x)
int wil_priv_init(struct wil6210_priv *wil) int wil_priv_init(struct wil6210_priv *wil)
{ {
wil_dbg(wil, "%s()\n", __func__); wil_dbg_MISC(wil, "%s()\n", __func__);
mutex_init(&wil->mutex); mutex_init(&wil->mutex);
mutex_init(&wil->wmi_mutex); mutex_init(&wil->wmi_mutex);
...@@ -162,7 +162,7 @@ void wil_priv_deinit(struct wil6210_priv *wil) ...@@ -162,7 +162,7 @@ void wil_priv_deinit(struct wil6210_priv *wil)
static void wil_target_reset(struct wil6210_priv *wil) static void wil_target_reset(struct wil6210_priv *wil)
{ {
wil_dbg(wil, "Resetting...\n"); wil_dbg_MISC(wil, "Resetting...\n");
/* register write */ /* register write */
#define W(a, v) iowrite32(v, wil->csr + HOSTADDR(a)) #define W(a, v) iowrite32(v, wil->csr + HOSTADDR(a))
...@@ -202,7 +202,7 @@ static void wil_target_reset(struct wil6210_priv *wil) ...@@ -202,7 +202,7 @@ static void wil_target_reset(struct wil6210_priv *wil)
msleep(2000); msleep(2000);
wil_dbg(wil, "Reset completed\n"); wil_dbg_MISC(wil, "Reset completed\n");
#undef W #undef W
#undef S #undef S
...@@ -225,8 +225,8 @@ static int wil_wait_for_fw_ready(struct wil6210_priv *wil) ...@@ -225,8 +225,8 @@ static int wil_wait_for_fw_ready(struct wil6210_priv *wil)
wil_err(wil, "Firmware not ready\n"); wil_err(wil, "Firmware not ready\n");
return -ETIME; return -ETIME;
} else { } else {
wil_dbg(wil, "FW ready after %d ms\n", wil_dbg_MISC(wil, "FW ready after %d ms\n",
jiffies_to_msecs(to-left)); jiffies_to_msecs(to-left));
} }
return 0; return 0;
} }
...@@ -278,7 +278,7 @@ void wil_link_on(struct wil6210_priv *wil) ...@@ -278,7 +278,7 @@ void wil_link_on(struct wil6210_priv *wil)
{ {
struct net_device *ndev = wil_to_ndev(wil); struct net_device *ndev = wil_to_ndev(wil);
wil_dbg(wil, "%s()\n", __func__); wil_dbg_MISC(wil, "%s()\n", __func__);
netif_carrier_on(ndev); netif_carrier_on(ndev);
netif_tx_wake_all_queues(ndev); netif_tx_wake_all_queues(ndev);
...@@ -288,7 +288,7 @@ void wil_link_off(struct wil6210_priv *wil) ...@@ -288,7 +288,7 @@ void wil_link_off(struct wil6210_priv *wil)
{ {
struct net_device *ndev = wil_to_ndev(wil); struct net_device *ndev = wil_to_ndev(wil);
wil_dbg(wil, "%s()\n", __func__); wil_dbg_MISC(wil, "%s()\n", __func__);
netif_tx_stop_all_queues(ndev); netif_tx_stop_all_queues(ndev);
netif_carrier_off(ndev); netif_carrier_off(ndev);
...@@ -311,27 +311,27 @@ static int __wil_up(struct wil6210_priv *wil) ...@@ -311,27 +311,27 @@ static int __wil_up(struct wil6210_priv *wil)
wmi_nettype = wil_iftype_nl2wmi(NL80211_IFTYPE_ADHOC); wmi_nettype = wil_iftype_nl2wmi(NL80211_IFTYPE_ADHOC);
switch (wdev->iftype) { switch (wdev->iftype) {
case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_STATION:
wil_dbg(wil, "type: STATION\n"); wil_dbg_MISC(wil, "type: STATION\n");
bi = 0; bi = 0;
ndev->type = ARPHRD_ETHER; ndev->type = ARPHRD_ETHER;
break; break;
case NL80211_IFTYPE_AP: case NL80211_IFTYPE_AP:
wil_dbg(wil, "type: AP\n"); wil_dbg_MISC(wil, "type: AP\n");
bi = 100; bi = 100;
ndev->type = ARPHRD_ETHER; ndev->type = ARPHRD_ETHER;
break; break;
case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_P2P_CLIENT:
wil_dbg(wil, "type: P2P_CLIENT\n"); wil_dbg_MISC(wil, "type: P2P_CLIENT\n");
bi = 0; bi = 0;
ndev->type = ARPHRD_ETHER; ndev->type = ARPHRD_ETHER;
break; break;
case NL80211_IFTYPE_P2P_GO: case NL80211_IFTYPE_P2P_GO:
wil_dbg(wil, "type: P2P_GO\n"); wil_dbg_MISC(wil, "type: P2P_GO\n");
bi = 100; bi = 100;
ndev->type = ARPHRD_ETHER; ndev->type = ARPHRD_ETHER;
break; break;
case NL80211_IFTYPE_MONITOR: case NL80211_IFTYPE_MONITOR:
wil_dbg(wil, "type: Monitor\n"); wil_dbg_MISC(wil, "type: Monitor\n");
bi = 0; bi = 0;
ndev->type = ARPHRD_IEEE80211_RADIOTAP; ndev->type = ARPHRD_IEEE80211_RADIOTAP;
/* ARPHRD_IEEE80211 or ARPHRD_IEEE80211_RADIOTAP ? */ /* ARPHRD_IEEE80211 or ARPHRD_IEEE80211_RADIOTAP ? */
......
drivers/net/wireless/ath/wil6210/pcie_bus.c
View file @ 2057ebb2
...@@ -53,7 +53,7 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil) ...@@ -53,7 +53,7 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil)
} }
wil->n_msi = use_msi; wil->n_msi = use_msi;
if (wil->n_msi) { if (wil->n_msi) {
wil_dbg(wil, "Setup %d MSI interrupts\n", use_msi); wil_dbg_MISC(wil, "Setup %d MSI interrupts\n", use_msi);
rc = pci_enable_msi_block(pdev, wil->n_msi); rc = pci_enable_msi_block(pdev, wil->n_msi);
if (rc && (wil->n_msi == 3)) { if (rc && (wil->n_msi == 3)) {
wil_err(wil, "3 MSI mode failed, try 1 MSI\n"); wil_err(wil, "3 MSI mode failed, try 1 MSI\n");
...@@ -65,7 +65,7 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil) ...@@ -65,7 +65,7 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil)
wil->n_msi = 0; wil->n_msi = 0;
} }
} else { } else {
wil_dbg(wil, "MSI interrupts disabled, use INTx\n"); wil_dbg_MISC(wil, "MSI interrupts disabled, use INTx\n");
} }
rc = wil6210_init_irq(wil, pdev->irq); rc = wil6210_init_irq(wil, pdev->irq);
......
drivers/net/wireless/ath/wil6210/txrx.c
View file @ 2057ebb2
...@@ -100,8 +100,8 @@ static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring) ...@@ -100,8 +100,8 @@ static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring)
d->dma.status = TX_DMA_STATUS_DU; d->dma.status = TX_DMA_STATUS_DU;
} }
wil_dbg(wil, "vring[%d] 0x%p:0x%016llx 0x%p\n", vring->size, wil_dbg_MISC(wil, "vring[%d] 0x%p:0x%016llx 0x%p\n", vring->size,
vring->va, (unsigned long long)vring->pa, vring->ctx); vring->va, (unsigned long long)vring->pa, vring->ctx);
return 0; return 0;
} }
...@@ -528,8 +528,8 @@ int wil_rx_init(struct wil6210_priv *wil) ...@@ -528,8 +528,8 @@ int wil_rx_init(struct wil6210_priv *wil)
vring->hwtail = le32_to_cpu(evt.evt.rx_ring_tail_ptr); vring->hwtail = le32_to_cpu(evt.evt.rx_ring_tail_ptr);
wil_dbg(wil, "Rx init: status %d tail 0x%08x\n", wil_dbg_MISC(wil, "Rx init: status %d tail 0x%08x\n",
le32_to_cpu(evt.evt.status), vring->hwtail); le32_to_cpu(evt.evt.status), vring->hwtail);
rc = wil_rx_refill(wil, vring->size); rc = wil_rx_refill(wil, vring->size);
if (rc) if (rc)
......
drivers/net/wireless/ath/wil6210/wil6210.h
View file @ 2057ebb2
...@@ -275,6 +275,7 @@ struct wil6210_priv { ...@@ -275,6 +275,7 @@ struct wil6210_priv {
#define wil_dbg_IRQ(wil, fmt, arg...) wil_dbg(wil, "DBG[ IRQ]" fmt, ##arg) #define wil_dbg_IRQ(wil, fmt, arg...) wil_dbg(wil, "DBG[ IRQ]" fmt, ##arg)
#define wil_dbg_TXRX(wil, fmt, arg...) wil_dbg(wil, "DBG[TXRX]" fmt, ##arg) #define wil_dbg_TXRX(wil, fmt, arg...) wil_dbg(wil, "DBG[TXRX]" fmt, ##arg)
#define wil_dbg_WMI(wil, fmt, arg...) wil_dbg(wil, "DBG[ WMI]" fmt, ##arg) #define wil_dbg_WMI(wil, fmt, arg...) wil_dbg(wil, "DBG[ WMI]" fmt, ##arg)
#define wil_dbg_MISC(wil, fmt, arg...) wil_dbg(wil, "DBG[MISC]" fmt, ##arg)
#define wil_hex_dump_TXRX(prefix_str, prefix_type, rowsize, \ #define wil_hex_dump_TXRX(prefix_str, prefix_type, rowsize, \
groupsize, buf, len, ascii) \ groupsize, buf, len, ascii) \
......
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