iwlwifi: create disable SCD Tx FIFOs handler

This patch moves disabeling Tx FIFOs in NIC SCD to seperate handlers
in 4965 and 5000 cards.

Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index bc988c3b6782df1011f9254fea6aee772b03018c..9e6f3e33ab6686a8b89798b1834313eae257b7d0 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -470,6 +470,27 @@ static void iwl4965_kw_free(struct iwl_priv *priv)
        }
 }
 
+static int iwl4965_disable_tx_fifo(struct iwl_priv *priv)
+{
+       unsigned long flags;
+       int ret;
+
+       spin_lock_irqsave(&priv->lock, flags);
+
+       ret = iwl_grab_nic_access(priv);
+       if (unlikely(ret)) {
+               IWL_ERROR("Tx fifo reset failed");
+               spin_unlock_irqrestore(&priv->lock, flags);
+               return ret;
+       }
+
+       iwl_write_prph(priv, IWL49_SCD_TXFACT, 0);
+       iwl_release_nic_access(priv);
+       spin_unlock_irqrestore(&priv->lock, flags);
+
+       return 0;
+}
+
 /**
  * iwl4965_txq_ctx_reset - Reset TX queue context
  * Destroys all DMA structures and initialise them again
@@ -481,7 +502,6 @@ static int iwl4965_txq_ctx_reset(struct iwl_priv *priv)
 {
        int rc = 0;
        int txq_id, slots_num;
-       unsigned long flags;
 
        iwl4965_kw_free(priv);
 
@@ -495,19 +515,10 @@ static int iwl4965_txq_ctx_reset(struct iwl_priv *priv)
                goto error_kw;
        }
 
-       spin_lock_irqsave(&priv->lock, flags);
-
-       rc = iwl_grab_nic_access(priv);
-       if (unlikely(rc)) {
-               IWL_ERROR("TX reset failed");
-               spin_unlock_irqrestore(&priv->lock, flags);
+       /* Turn off all Tx DMA fifos */
+       rc = priv->cfg->ops->lib->disable_tx_fifo(priv);
+       if (unlikely(rc))
                goto error_reset;
-       }
-
-       /* Turn off all Tx DMA channels */
-       iwl_write_prph(priv, IWL49_SCD_TXFACT, 0);
-       iwl_release_nic_access(priv);
-       spin_unlock_irqrestore(&priv->lock, flags);
 
        /* Tell 4965 where to find the keep-warm buffer */
        rc = iwl4965_kw_init(priv);
@@ -538,6 +549,7 @@ static int iwl4965_txq_ctx_reset(struct iwl_priv *priv)
  error_kw:
        return rc;
 }
+
 static int iwl4965_apm_init(struct iwl_priv *priv)
 {
        unsigned long flags;
@@ -621,7 +633,6 @@ static void iwl4965_nic_config(struct iwl_priv *priv)
        spin_unlock_irqrestore(&priv->lock, flags);
 }
 
-
 int iwl4965_hw_nic_init(struct iwl_priv *priv)
 {
        unsigned long flags;
@@ -4044,6 +4055,7 @@ static struct iwl_lib_ops iwl4965_lib = {
        .free_shared_mem = iwl4965_free_shared_mem,
        .txq_update_byte_cnt_tbl = iwl4965_txq_update_byte_cnt_tbl,
        .hw_nic_init = iwl4965_hw_nic_init,
+       .disable_tx_fifo = iwl4965_disable_tx_fifo,
        .rx_handler_setup = iwl4965_rx_handler_setup,
        .is_valid_rtc_data_addr = iwl4965_hw_valid_rtc_data_addr,
        .alive_notify = iwl4965_alive_notify,

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index f9c2274130867baa8c333efab19efa72bc1c4b7d..feffcafe1495f7cd84af4cf7c39da7ea9fa46e91 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -430,6 +430,27 @@ static u16 iwl5000_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data)
 }
 
 
+static int iwl5000_disable_tx_fifo(struct iwl_priv *priv)
+{
+       unsigned long flags;
+       int ret;
+
+       spin_lock_irqsave(&priv->lock, flags);
+
+       ret = iwl_grab_nic_access(priv);
+       if (unlikely(ret)) {
+               IWL_ERROR("Tx fifo reset failed");
+               spin_unlock_irqrestore(&priv->lock, flags);
+               return ret;
+       }
+
+       iwl_write_prph(priv, IWL50_SCD_TXFACT, 0);
+       iwl_release_nic_access(priv);
+       spin_unlock_irqrestore(&priv->lock, flags);
+
+       return 0;
+}
+
 static struct iwl_hcmd_ops iwl5000_hcmd = {
 };
 
@@ -446,6 +467,7 @@ static struct iwl_lib_ops iwl5000_lib = {
        .alloc_shared_mem = iwl5000_alloc_shared_mem,
        .free_shared_mem = iwl5000_free_shared_mem,
        .txq_update_byte_cnt_tbl = iwl5000_txq_update_byte_cnt_tbl,
+       .disable_tx_fifo = iwl5000_disable_tx_fifo,
        .apm_ops = {
                .init = iwl5000_apm_init,
                .config = iwl5000_nic_config,

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 12418061ab7fe60ade0063ee6c2d5a1092944aeb..c29f8b3471298dd52eb7036efe20b6eeacfde725 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -110,6 +110,8 @@ struct iwl_lib_ops {
        void (*rx_handler_setup)(struct iwl_priv *priv);
        /* nic init */
        int (*hw_nic_init)(struct iwl_priv *priv);
+       /* nic Tx fifo handling */
+       int (*disable_tx_fifo)(struct iwl_priv *priv);
        /* alive notification */
        int (*alive_notify)(struct iwl_priv *priv);
        /* check validity of rtc data address */