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

Commit 81baf6ec authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: Legacy isr only used by legacy devices 



Move iwl_isr_legacy function to iwl_legacy.c since it only used
by legacy devices.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ae79d23d

drivers/net/wireless/iwlwifi/iwl-3945.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "iwl-led.h"

#include "iwl-led.h"

#include "iwl-3945-led.h"

#include "iwl-3945-led.h"

#include "iwl-3945-debugfs.h"

#include "iwl-3945-debugfs.h"

#include "iwl-legacy.h"





#define IWL_DECLARE_RATE_INFO(r, ip, in, rp, rn, pp, np)    \

#define IWL_DECLARE_RATE_INFO(r, ip, in, rp, rn, pp, np)    \

	[IWL_RATE_##r##M_INDEX] = { IWL_RATE_##r##M_PLCP,   \

	[IWL_RATE_##r##M_INDEX] = { IWL_RATE_##r##M_PLCP,   \

drivers/net/wireless/iwlwifi/iwl-core.c

+0 −60
Original line number Original line Diff line number Diff line
@@ -1227,66 +1227,6 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) 
}

}

EXPORT_SYMBOL(iwl_set_tx_power);

EXPORT_SYMBOL(iwl_set_tx_power);





irqreturn_t iwl_isr_legacy(int irq, void *data)

{

	struct iwl_priv *priv = data;

	u32 inta, inta_mask;

	u32 inta_fh;

	unsigned long flags;

	if (!priv)

		return IRQ_NONE;



	spin_lock_irqsave(&priv->lock, flags);



	/* Disable (but don't clear!) interrupts here to avoid

	 *    back-to-back ISRs and sporadic interrupts from our NIC.

	 * If we have something to service, the tasklet will re-enable ints.

	 * If we *don't* have something, we'll re-enable before leaving here. */

	inta_mask = iwl_read32(priv, CSR_INT_MASK);  /* just for debug */

	iwl_write32(priv, CSR_INT_MASK, 0x00000000);



	/* Discover which interrupts are active/pending */

	inta = iwl_read32(priv, CSR_INT);

	inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);



	/* Ignore interrupt if there's nothing in NIC to service.

	 * This may be due to IRQ shared with another device,

	 * or due to sporadic interrupts thrown from our NIC. */

	if (!inta && !inta_fh) {

		IWL_DEBUG_ISR(priv, "Ignore interrupt, inta == 0, inta_fh == 0\n");

		goto none;

	}



	if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {

		/* Hardware disappeared. It might have already raised

		 * an interrupt */

		IWL_WARN(priv, "HARDWARE GONE?? INTA == 0x%08x\n", inta);

		goto unplugged;

	}



	IWL_DEBUG_ISR(priv, "ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",

		      inta, inta_mask, inta_fh);



	inta &= ~CSR_INT_BIT_SCD;



	/* iwl_irq_tasklet() will service interrupts and re-enable them */

	if (likely(inta || inta_fh))

		tasklet_schedule(&priv->irq_tasklet);



 unplugged:

	spin_unlock_irqrestore(&priv->lock, flags);

	return IRQ_HANDLED;



 none:

	/* re-enable interrupts here since we don't have anything to service. */

	/* only Re-enable if diabled by irq */

	if (test_bit(STATUS_INT_ENABLED, &priv->status))

		iwl_enable_interrupts(priv);

	spin_unlock_irqrestore(&priv->lock, flags);

	return IRQ_NONE;

}

EXPORT_SYMBOL(iwl_isr_legacy);



void iwl_send_bt_config(struct iwl_priv *priv)

void iwl_send_bt_config(struct iwl_priv *priv)

{

{

	struct iwl_bt_cmd bt_cmd = {

	struct iwl_bt_cmd bt_cmd = {

drivers/net/wireless/iwlwifi/iwl-core.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -596,7 +596,6 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd); 
/*****************************************************

/*****************************************************

 * PCI						     *

 * PCI						     *

 *****************************************************/

 *****************************************************/

irqreturn_t iwl_isr_legacy(int irq, void *data);





static inline u16 iwl_pcie_link_ctl(struct iwl_priv *priv)

static inline u16 iwl_pcie_link_ctl(struct iwl_priv *priv)

{

{

drivers/net/wireless/iwlwifi/iwl-legacy.c

+62 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ 




#include "iwl-dev.h"

#include "iwl-dev.h"

#include "iwl-core.h"

#include "iwl-core.h"

#include "iwl-helpers.h"

#include "iwl-legacy.h"

#include "iwl-legacy.h"





/**

/**
@@ -558,3 +559,64 @@ void iwl_legacy_mac_bss_info_changed(struct ieee80211_hw *hw, 
	IWL_DEBUG_MAC80211(priv, "leave\n");

	IWL_DEBUG_MAC80211(priv, "leave\n");

}

}

EXPORT_SYMBOL(iwl_legacy_mac_bss_info_changed);

EXPORT_SYMBOL(iwl_legacy_mac_bss_info_changed);



irqreturn_t iwl_isr_legacy(int irq, void *data)

{

	struct iwl_priv *priv = data;

	u32 inta, inta_mask;

	u32 inta_fh;

	unsigned long flags;

	if (!priv)

		return IRQ_NONE;



	spin_lock_irqsave(&priv->lock, flags);



	/* Disable (but don't clear!) interrupts here to avoid

	 *    back-to-back ISRs and sporadic interrupts from our NIC.

	 * If we have something to service, the tasklet will re-enable ints.

	 * If we *don't* have something, we'll re-enable before leaving here. */

	inta_mask = iwl_read32(priv, CSR_INT_MASK);  /* just for debug */

	iwl_write32(priv, CSR_INT_MASK, 0x00000000);



	/* Discover which interrupts are active/pending */

	inta = iwl_read32(priv, CSR_INT);

	inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);



	/* Ignore interrupt if there's nothing in NIC to service.

	 * This may be due to IRQ shared with another device,

	 * or due to sporadic interrupts thrown from our NIC. */

	if (!inta && !inta_fh) {

		IWL_DEBUG_ISR(priv,

			"Ignore interrupt, inta == 0, inta_fh == 0\n");

		goto none;

	}



	if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {

		/* Hardware disappeared. It might have already raised

		 * an interrupt */

		IWL_WARN(priv, "HARDWARE GONE?? INTA == 0x%08x\n", inta);

		goto unplugged;

	}



	IWL_DEBUG_ISR(priv, "ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",

		      inta, inta_mask, inta_fh);



	inta &= ~CSR_INT_BIT_SCD;



	/* iwl_irq_tasklet() will service interrupts and re-enable them */

	if (likely(inta || inta_fh))

		tasklet_schedule(&priv->irq_tasklet);



unplugged:

	spin_unlock_irqrestore(&priv->lock, flags);

	return IRQ_HANDLED;



none:

	/* re-enable interrupts here since we don't have anything to service. */

	/* only Re-enable if diabled by irq */

	if (test_bit(STATUS_INT_ENABLED, &priv->status))

		iwl_enable_interrupts(priv);

	spin_unlock_irqrestore(&priv->lock, flags);

	return IRQ_NONE;

}

EXPORT_SYMBOL(iwl_isr_legacy);

drivers/net/wireless/iwlwifi/iwl-legacy.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -71,4 +71,6 @@ void iwl_legacy_mac_bss_info_changed(struct ieee80211_hw *hw, 
				     struct ieee80211_bss_conf *bss_conf,

				     struct ieee80211_bss_conf *bss_conf,

				     u32 changes);

				     u32 changes);





irqreturn_t iwl_isr_legacy(int irq, void *data);



#endif /* __iwl_legacy_h__ */
 
#endif /* __iwl_legacy_h__ */