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

Commit 86ddbf62 authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

iwl3945: calculate debugfs isr statistics 



This patch calculates interrupt statistics for debugfs.

Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a75fbe8d

drivers/net/wireless/iwlwifi/iwl3945-base.c

+16 −3
Original line number Diff line number Diff line
@@ -1543,6 +1543,7 @@ static void iwl3945_rx_handle(struct iwl_priv *priv) 
				"r = %d, i = %d, %s, 0x%02x\n", r, i,

				get_cmd_string(pkt->hdr.cmd), pkt->hdr.cmd);

			priv->rx_handlers[pkt->hdr.cmd] (priv, rxb);

			priv->isr_stats.rx_handlers[pkt->hdr.cmd]++;

		} else {

			/* No handling needed */

			IWL_DEBUG(priv, IWL_DL_HCMD | IWL_DL_RX | IWL_DL_ISR,
@@ -1845,6 +1846,7 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) 
		/* Tell the device to stop sending interrupts */

		iwl_disable_interrupts(priv);



		priv->isr_stats.hw++;

		iwl_irq_handle_error(priv);



		handled |= CSR_INT_BIT_HW_ERR;
@@ -1857,13 +1859,17 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) 
#ifdef CONFIG_IWLWIFI_DEBUG

	if (priv->debug_level & (IWL_DL_ISR)) {

		/* NIC fires this, but we don't use it, redundant with WAKEUP */

		if (inta & CSR_INT_BIT_SCD)

		if (inta & CSR_INT_BIT_SCD) {

			IWL_DEBUG_ISR(priv, "Scheduler finished to transmit "

				      "the frame/frames.\n");

			priv->isr_stats.sch++;

		}



		/* Alive notification via Rx interrupt will do the real work */

		if (inta & CSR_INT_BIT_ALIVE)

		if (inta & CSR_INT_BIT_ALIVE) {

			IWL_DEBUG_ISR(priv, "Alive interrupt\n");

			priv->isr_stats.alive++;

		}

	}

#endif

	/* Safely ignore these bits for debug checks below */
@@ -1873,6 +1879,8 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) 
	if (inta & CSR_INT_BIT_SW_ERR) {

		IWL_ERR(priv, "Microcode SW error detected. "

			"Restarting 0x%X.\n", inta);

		priv->isr_stats.sw++;

		priv->isr_stats.sw_err = inta;

		iwl_irq_handle_error(priv);

		handled |= CSR_INT_BIT_SW_ERR;

	}
@@ -1888,6 +1896,7 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) 
		iwl_txq_update_write_ptr(priv, &priv->txq[4]);

		iwl_txq_update_write_ptr(priv, &priv->txq[5]);



		priv->isr_stats.wakeup++;

		handled |= CSR_INT_BIT_WAKEUP;

	}
@@ -1896,11 +1905,13 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) 
	 * notifications from uCode come through here*/

	if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) {

		iwl3945_rx_handle(priv);

		priv->isr_stats.rx++;

		handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX);

	}



	if (inta & CSR_INT_BIT_FH_TX) {

		IWL_DEBUG_ISR(priv, "Tx interrupt\n");

		priv->isr_stats.tx++;



		iwl_write32(priv, CSR_FH_INT_STATUS, (1 << 6));

		if (!iwl_grab_nic_access(priv)) {
@@ -1911,8 +1922,10 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) 
		handled |= CSR_INT_BIT_FH_TX;

	}



	if (inta & ~handled)

	if (inta & ~handled) {

		IWL_ERR(priv, "Unhandled INTA bits 0x%08x\n", inta & ~handled);

		priv->isr_stats.unhandled++;

	}



	if (inta & ~CSR_INI_SET_MASK) {

		IWL_WARN(priv, "Disabled INTA bits 0x%08x were pending\n",