Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/ath/wil6210/cfg80211.c

+4 −4
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int wil_cfg80211_scan(struct wiphy *wiphy, 
		}

		/* 0-based channel indexes */

		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);

	}
@@ -425,7 +425,7 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy, 
		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");

	print_hex_dump_bytes("SSID ", DUMP_PREFIX_OFFSET,

			     info->ssid, info->ssid_len);

drivers/net/wireless/ath/wil6210/main.c

+14 −14
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid) 
	struct net_device *ndev = wil_to_ndev(wil);

	struct wireless_dev *wdev = wil->wdev;



	wil_dbg(wil, "%s()\n", __func__);

	wil_dbg_MISC(wil, "%s()\n", __func__);



	wil_link_off(wil);

	clear_bit(wil_status_fwconnected, &wil->status);
@@ -99,7 +99,7 @@ static void wil_connect_timer_fn(ulong 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

	 * run from atomic context
@@ -109,7 +109,7 @@ static void wil_connect_timer_fn(ulong x) 


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->wmi_mutex);
@@ -162,7 +162,7 @@ void wil_priv_deinit(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 */

#define W(a, v) iowrite32(v, wil->csr + HOSTADDR(a))
@@ -202,7 +202,7 @@ static void wil_target_reset(struct wil6210_priv *wil) 


	msleep(2000);



	wil_dbg(wil, "Reset completed\n");

	wil_dbg_MISC(wil, "Reset completed\n");



#undef W

#undef S
@@ -225,7 +225,7 @@ static int wil_wait_for_fw_ready(struct wil6210_priv *wil) 
		wil_err(wil, "Firmware not ready\n");

		return -ETIME;

	} 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));

	}

	return 0;
@@ -278,7 +278,7 @@ void wil_link_on(struct wil6210_priv *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_tx_wake_all_queues(ndev);
@@ -288,7 +288,7 @@ void wil_link_off(struct wil6210_priv *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_carrier_off(ndev);
@@ -311,27 +311,27 @@ static int __wil_up(struct wil6210_priv *wil) 
	wmi_nettype = wil_iftype_nl2wmi(NL80211_IFTYPE_ADHOC);

	switch (wdev->iftype) {

	case NL80211_IFTYPE_STATION:

		wil_dbg(wil, "type: STATION\n");

		wil_dbg_MISC(wil, "type: STATION\n");

		bi = 0;

		ndev->type = ARPHRD_ETHER;

		break;

	case NL80211_IFTYPE_AP:

		wil_dbg(wil, "type: AP\n");

		wil_dbg_MISC(wil, "type: AP\n");

		bi = 100;

		ndev->type = ARPHRD_ETHER;

		break;

	case NL80211_IFTYPE_P2P_CLIENT:

		wil_dbg(wil, "type: P2P_CLIENT\n");

		wil_dbg_MISC(wil, "type: P2P_CLIENT\n");

		bi = 0;

		ndev->type = ARPHRD_ETHER;

		break;

	case NL80211_IFTYPE_P2P_GO:

		wil_dbg(wil, "type: P2P_GO\n");

		wil_dbg_MISC(wil, "type: P2P_GO\n");

		bi = 100;

		ndev->type = ARPHRD_ETHER;

		break;

	case NL80211_IFTYPE_MONITOR:

		wil_dbg(wil, "type: Monitor\n");

		wil_dbg_MISC(wil, "type: Monitor\n");

		bi = 0;

		ndev->type = ARPHRD_IEEE80211_RADIOTAP;

		/* ARPHRD_IEEE80211 or ARPHRD_IEEE80211_RADIOTAP ? */

drivers/net/wireless/ath/wil6210/pcie_bus.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil) 
	}

	wil->n_msi = use_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);

		if (rc && (wil->n_msi == 3)) {

			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) 
			wil->n_msi = 0;

		}

	} 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);

drivers/net/wireless/ath/wil6210/txrx.c

+4 −4
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring) 
		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);



	return 0;
@@ -528,7 +528,7 @@ int wil_rx_init(struct wil6210_priv *wil) 


	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);



	rc = wil_rx_refill(wil, vring->size);

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ struct wil6210_priv { 
#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_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,	\

			  groupsize, buf, len, ascii)		\