iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iwlagn: priv->lock moves to iwl_shared

Browse Source 
Since it is used by all the layers, it needs to move to iwl_shared.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Emmanuel Grumbach
2011-08-25 23:10:43 -07:00
committed by John W. Linville
parent 63013ae301
commit 10b15e6f67
13 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/iwl-5000.c
View File

@ -69,7 +69,7 @@ static void iwl5000_nic_config(struct iwl_priv *priv)
iwl_rf_config(priv); iwl_rf_config(priv);
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
/* W/A : NIC is stuck in a reset state after Early PCIe power off /* W/A : NIC is stuck in a reset state after Early PCIe power off
* (PCIe power is lost before PERST# is asserted), * (PCIe power is lost before PERST# is asserted),
@ -80,7 +80,7 @@ static void iwl5000_nic_config(struct iwl_priv *priv)
~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS); ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
} }
static struct iwl_sensitivity_ranges iwl5000_sensitivity = { static struct iwl_sensitivity_ranges iwl5000_sensitivity = {

14
drivers/net/wireless/iwlwifi/iwl-agn-calib.c
View File

@ -658,13 +658,13 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv)
return; return;
} }
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
rx_info = &priv->statistics.rx_non_phy; rx_info = &priv->statistics.rx_non_phy;
ofdm = &priv->statistics.rx_ofdm; ofdm = &priv->statistics.rx_ofdm;
cck = &priv->statistics.rx_cck; cck = &priv->statistics.rx_cck;
if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) { if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {
IWL_DEBUG_CALIB(priv, "<< invalid data.\n"); IWL_DEBUG_CALIB(priv, "<< invalid data.\n");
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
return; return;
} }
@ -688,7 +688,7 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv)
statis.beacon_energy_c = statis.beacon_energy_c =
le32_to_cpu(rx_info->beacon_energy_c); le32_to_cpu(rx_info->beacon_energy_c);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
IWL_DEBUG_CALIB(priv, "rx_enable_time = %u usecs\n", rx_enable_time); IWL_DEBUG_CALIB(priv, "rx_enable_time = %u usecs\n", rx_enable_time);
@ -976,13 +976,13 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
return; return;
} }
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
rx_info = &priv->statistics.rx_non_phy; rx_info = &priv->statistics.rx_non_phy;
if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) { if (rx_info->interference_data_flag != INTERFERENCE_DATA_AVAILABLE) {
IWL_DEBUG_CALIB(priv, " << Interference data unavailable\n"); IWL_DEBUG_CALIB(priv, " << Interference data unavailable\n");
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
return; return;
} }
@ -997,7 +997,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
if ((rxon_chnum != stat_chnum) || (rxon_band24 != stat_band24)) { if ((rxon_chnum != stat_chnum) || (rxon_band24 != stat_band24)) {
IWL_DEBUG_CALIB(priv, "Stats not from chan=%d, band24=%d\n", IWL_DEBUG_CALIB(priv, "Stats not from chan=%d, band24=%d\n",
rxon_chnum, rxon_band24); rxon_chnum, rxon_band24);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
return; return;
} }
@ -1016,7 +1016,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
chain_sig_b = le32_to_cpu(rx_info->beacon_rssi_b) & IN_BAND_FILTER; chain_sig_b = le32_to_cpu(rx_info->beacon_rssi_b) & IN_BAND_FILTER;
chain_sig_c = le32_to_cpu(rx_info->beacon_rssi_c) & IN_BAND_FILTER; chain_sig_c = le32_to_cpu(rx_info->beacon_rssi_c) & IN_BAND_FILTER;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
data->beacon_count++; data->beacon_count++;

4
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
View File

@ -1673,9 +1673,9 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,
/* FIXME: based on notification, adjust the prio_boost */ /* FIXME: based on notification, adjust the prio_boost */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
priv->bt_ci_compliance = coex->bt_ci_compliance; priv->bt_ci_compliance = coex->bt_ci_compliance;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
} }
void iwlagn_bt_rx_handler_setup(struct iwl_priv *priv) void iwlagn_bt_rx_handler_setup(struct iwl_priv *priv)

4
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
View File

@ -877,12 +877,12 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
* Is there a need to switch between * Is there a need to switch between
* full concurrency and 3-wire? * full concurrency and 3-wire?
*/ */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
if (priv->bt_ci_compliance && priv->bt_ant_couple_ok) if (priv->bt_ci_compliance && priv->bt_ant_couple_ok)
full_concurrent = true; full_concurrent = true;
else else
full_concurrent = false; full_concurrent = false;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
} }
if ((priv->bt_traffic_load != priv->last_bt_traffic_load) || if ((priv->bt_traffic_load != priv->last_bt_traffic_load) ||
(priv->bt_full_concurrent != full_concurrent)) { (priv->bt_full_concurrent != full_concurrent)) {

4
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
View File

@ -576,7 +576,7 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
goto out; goto out;
} }
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
for_each_context(priv, ctx) { for_each_context(priv, ctx) {
/* Configure HT40 channels */ /* Configure HT40 channels */
@ -620,7 +620,7 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
ctx->vif); ctx->vif);
} }
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
iwl_update_bcast_stations(priv); iwl_update_bcast_stations(priv);

12
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
View File

@ -336,7 +336,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
if (info->control.vif) if (info->control.vif)
ctx = iwl_rxon_ctx_from_vif(info->control.vif); ctx = iwl_rxon_ctx_from_vif(info->control.vif);
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
if (iwl_is_rfkill(priv)) { if (iwl_is_rfkill(priv)) {
IWL_DEBUG_DROP(priv, "Dropping - RF KILL\n"); IWL_DEBUG_DROP(priv, "Dropping - RF KILL\n");
goto drop_unlock_priv; goto drop_unlock_priv;
@ -404,7 +404,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
else else
txq_id = ctx->ac_to_queue[skb_get_queue_mapping(skb)]; txq_id = ctx->ac_to_queue[skb_get_queue_mapping(skb)];
/* irqs already disabled/saved above when locking priv->lock */ /* irqs already disabled/saved above when locking priv->shrd->lock */
spin_lock(&priv->sta_lock); spin_lock(&priv->sta_lock);
if (ieee80211_is_data_qos(fc)) { if (ieee80211_is_data_qos(fc)) {
@ -461,7 +461,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
} }
spin_unlock(&priv->sta_lock); spin_unlock(&priv->sta_lock);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
/* /*
* Avoid atomic ops if it isn't an associated client. * Avoid atomic ops if it isn't an associated client.
@ -478,7 +478,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
drop_unlock_sta: drop_unlock_sta:
spin_unlock(&priv->sta_lock); spin_unlock(&priv->sta_lock);
drop_unlock_priv: drop_unlock_priv:
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
return -1; return -1;
} }
@ -620,7 +620,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
/* do not restore/save irqs */ /* do not restore/save irqs */
spin_unlock(&priv->sta_lock); spin_unlock(&priv->sta_lock);
spin_lock(&priv->lock); spin_lock(&priv->shrd->lock);
/* /*
* the only reason this call can fail is queue number out of range, * the only reason this call can fail is queue number out of range,
@ -630,7 +630,7 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
* mac80211 to clean up it own data. * mac80211 to clean up it own data.
*/ */
trans_txq_agg_disable(&priv->trans, txq_id, ssn, tx_fifo_id); trans_txq_agg_disable(&priv->trans, txq_id, ssn, tx_fifo_id);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid); ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);

14
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@ -1673,10 +1673,10 @@ static void iwl_rf_kill_ct_config(struct iwl_priv *priv)
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR, iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,
CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT); CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
priv->thermal_throttle.ct_kill_toggle = false; priv->thermal_throttle.ct_kill_toggle = false;
if (priv->cfg->base_params->support_ct_kill_exit) { if (priv->cfg->base_params->support_ct_kill_exit) {
@ -3083,7 +3083,7 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
goto out; goto out;
} }
spin_lock_irq(&priv->lock); spin_lock_irq(&priv->shrd->lock);
priv->current_ht_config.smps = conf->smps_mode; priv->current_ht_config.smps = conf->smps_mode;
@ -3113,7 +3113,7 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
iwl_set_rxon_ht(priv, ht_conf); iwl_set_rxon_ht(priv, ht_conf);
iwl_set_flags_for_band(priv, ctx, channel->band, ctx->vif); iwl_set_flags_for_band(priv, ctx, channel->band, ctx->vif);
spin_unlock_irq(&priv->lock); spin_unlock_irq(&priv->shrd->lock);
iwl_set_rate(priv); iwl_set_rate(priv);
/* /*
@ -3640,7 +3640,7 @@ int iwl_probe(struct iwl_bus *bus, struct iwl_cfg *cfg)
* we should init now * we should init now
*/ */
spin_lock_init(&priv->reg_lock); spin_lock_init(&priv->reg_lock);
spin_lock_init(&priv->lock); spin_lock_init(&priv->shrd->lock);
/* /*
* stop and reset the on-board processor just in case it is in a * stop and reset the on-board processor just in case it is in a
@ -3796,9 +3796,9 @@ void __devexit iwl_remove(struct iwl_priv * priv)
/* make sure we flush any pending irq or /* make sure we flush any pending irq or
* tasklet for the driver * tasklet for the driver
*/ */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
iwl_disable_interrupts(priv); iwl_disable_interrupts(priv);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
trans_sync_irq(&priv->trans); trans_sync_irq(&priv->trans);

4
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@ -1186,7 +1186,7 @@ int iwl_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
q = AC_NUM - 1 - queue; q = AC_NUM - 1 - queue;
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
/* /*
* MULTI-FIXME * MULTI-FIXME
@ -1204,7 +1204,7 @@ int iwl_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
ctx->qos_data.def_qos_parm.ac[q].reserved1 = 0; ctx->qos_data.def_qos_parm.ac[q].reserved1 = 0;
} }
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
IWL_DEBUG_MAC80211(priv, "leave\n"); IWL_DEBUG_MAC80211(priv, "leave\n");
return 0; return 0;

1
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@ -1226,7 +1226,6 @@ struct iwl_priv {
u8 mgmt_tx_ant; u8 mgmt_tx_ant;
/* spinlock */ /* spinlock */
spinlock_t lock; /* protect general shared data */
spinlock_t hcmd_lock; /* protect hcmd */ spinlock_t hcmd_lock; /* protect hcmd */
spinlock_t reg_lock; /* protect hw register access */ spinlock_t reg_lock; /* protect hw register access */
struct mutex mutex; struct mutex mutex;

2
drivers/net/wireless/iwlwifi/iwl-shared.h
View File

@ -149,6 +149,7 @@ struct iwl_hw_params {
* @priv: pointer to the upper layer data * @priv: pointer to the upper layer data
* @hw_params: see struct iwl_hw_params * @hw_params: see struct iwl_hw_params
* @workqueue: the workqueue used by all the layers of the driver * @workqueue: the workqueue used by all the layers of the driver
* @lock: protect general shared data
*/ */
struct iwl_shared { struct iwl_shared {
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
@ -163,6 +164,7 @@ struct iwl_shared {
struct iwl_hw_params hw_params; struct iwl_hw_params hw_params;
struct workqueue_struct *workqueue; struct workqueue_struct *workqueue;
spinlock_t lock;
}; };
/*Whatever _m is (iwl_trans, iwl_priv, iwl_bus, these macros will work */ /*Whatever _m is (iwl_trans, iwl_priv, iwl_bus, these macros will work */

28
drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
View File

@ -329,9 +329,9 @@ void iwlagn_rx_replenish(struct iwl_priv *priv)
iwlagn_rx_allocate(priv, GFP_KERNEL); iwlagn_rx_allocate(priv, GFP_KERNEL);
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
iwlagn_rx_queue_restock(priv); iwlagn_rx_queue_restock(priv);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
} }
static void iwlagn_rx_replenish_now(struct iwl_priv *priv) static void iwlagn_rx_replenish_now(struct iwl_priv *priv)
@ -499,7 +499,7 @@ void iwl_irq_tasklet(struct iwl_priv *priv)
u32 inta_mask; u32 inta_mask;
#endif #endif
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
/* Ack/clear/reset pending uCode interrupts. /* Ack/clear/reset pending uCode interrupts.
* Note: Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS, * Note: Some bits in CSR_INT are "OR" of bits in CSR_FH_INT_STATUS,
@ -525,7 +525,7 @@ void iwl_irq_tasklet(struct iwl_priv *priv)
} }
#endif #endif
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
/* saved interrupt in inta variable now we can reset priv->inta */ /* saved interrupt in inta variable now we can reset priv->inta */
priv->inta = 0; priv->inta = 0;
@ -774,7 +774,7 @@ int iwl_reset_ict(struct iwl_priv *priv)
if (!priv->ict_tbl_vir) if (!priv->ict_tbl_vir)
return 0; return 0;
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
iwl_disable_interrupts(priv); iwl_disable_interrupts(priv);
memset(&priv->ict_tbl[0], 0, sizeof(u32) * ICT_COUNT); memset(&priv->ict_tbl[0], 0, sizeof(u32) * ICT_COUNT);
@ -794,7 +794,7 @@ int iwl_reset_ict(struct iwl_priv *priv)
priv->ict_index = 0; priv->ict_index = 0;
iwl_write32(priv, CSR_INT, priv->inta_mask); iwl_write32(priv, CSR_INT, priv->inta_mask);
iwl_enable_interrupts(priv); iwl_enable_interrupts(priv);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
return 0; return 0;
} }
@ -804,9 +804,9 @@ void iwl_disable_ict(struct iwl_priv *priv)
{ {
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
priv->use_ict = false; priv->use_ict = false;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
} }
static irqreturn_t iwl_isr(int irq, void *data) static irqreturn_t iwl_isr(int irq, void *data)
@ -820,7 +820,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
if (!priv) if (!priv)
return IRQ_NONE; return IRQ_NONE;
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
/* Disable (but don't clear!) interrupts here to avoid /* Disable (but don't clear!) interrupts here to avoid
* back-to-back ISRs and sporadic interrupts from our NIC. * back-to-back ISRs and sporadic interrupts from our NIC.
@ -864,7 +864,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
iwl_enable_interrupts(priv); iwl_enable_interrupts(priv);
unplugged: unplugged:
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
return IRQ_HANDLED; return IRQ_HANDLED;
none: none:
@ -873,7 +873,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
if (test_bit(STATUS_INT_ENABLED, &priv->shrd->status) && !priv->inta) if (test_bit(STATUS_INT_ENABLED, &priv->shrd->status) && !priv->inta)
iwl_enable_interrupts(priv); iwl_enable_interrupts(priv);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
return IRQ_NONE; return IRQ_NONE;
} }
@ -901,7 +901,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
if (!priv->use_ict) if (!priv->use_ict)
return iwl_isr(irq, data); return iwl_isr(irq, data);
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
/* Disable (but don't clear!) interrupts here to avoid /* Disable (but don't clear!) interrupts here to avoid
* back-to-back ISRs and sporadic interrupts from our NIC. * back-to-back ISRs and sporadic interrupts from our NIC.
@ -967,7 +967,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
iwl_enable_interrupts(priv); iwl_enable_interrupts(priv);
} }
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
return IRQ_HANDLED; return IRQ_HANDLED;
none: none:
@ -977,6 +977,6 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
if (test_bit(STATUS_INT_ENABLED, &priv->shrd->status) && !priv->inta) if (test_bit(STATUS_INT_ENABLED, &priv->shrd->status) && !priv->inta)
iwl_enable_interrupts(priv); iwl_enable_interrupts(priv);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
return IRQ_NONE; return IRQ_NONE;
} }

4
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
View File

@ -444,7 +444,7 @@ void iwl_trans_txq_agg_setup(struct iwl_priv *priv, int sta_id, int tid,
ra_tid = BUILD_RAxTID(sta_id, tid); ra_tid = BUILD_RAxTID(sta_id, tid);
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
/* Stop this Tx queue before configuring it */ /* Stop this Tx queue before configuring it */
iwlagn_tx_queue_stop_scheduler(priv, txq_id); iwlagn_tx_queue_stop_scheduler(priv, txq_id);
@ -480,7 +480,7 @@ void iwl_trans_txq_agg_setup(struct iwl_priv *priv, int sta_id, int tid,
/* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */ /* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */
iwl_trans_tx_queue_set_status(priv, &priv->txq[txq_id], tx_fifo, 1); iwl_trans_tx_queue_set_status(priv, &priv->txq[txq_id], tx_fifo, 1);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
} }
int iwl_trans_txq_agg_disable(struct iwl_priv *priv, u16 txq_id, int iwl_trans_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,

26
drivers/net/wireless/iwlwifi/iwl-trans.c
View File

@ -210,10 +210,10 @@ static int iwl_rx_init(struct iwl_priv *priv)
iwl_trans_rx_hw_init(priv, rxq); iwl_trans_rx_hw_init(priv, rxq);
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
rxq->need_update = 1; rxq->need_update = 1;
iwl_rx_queue_update_write_ptr(priv, rxq); iwl_rx_queue_update_write_ptr(priv, rxq);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
return 0; return 0;
} }
@ -546,7 +546,7 @@ static int iwl_tx_init(struct iwl_priv *priv)
alloc = true; alloc = true;
} }
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
/* Turn off all Tx DMA fifos */ /* Turn off all Tx DMA fifos */
iwl_write_prph(priv, SCD_TXFACT, 0); iwl_write_prph(priv, SCD_TXFACT, 0);
@ -554,7 +554,7 @@ static int iwl_tx_init(struct iwl_priv *priv)
/* Tell NIC where to find the "keep warm" buffer */ /* Tell NIC where to find the "keep warm" buffer */
iwl_write_direct32(priv, FH_KW_MEM_ADDR_REG, priv->kw.dma >> 4); iwl_write_direct32(priv, FH_KW_MEM_ADDR_REG, priv->kw.dma >> 4);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
/* Alloc and init all Tx queues, including the command queue (#4/#9) */ /* Alloc and init all Tx queues, including the command queue (#4/#9) */
for (txq_id = 0; txq_id < hw_params(priv).max_txq_num; txq_id++) { for (txq_id = 0; txq_id < hw_params(priv).max_txq_num; txq_id++) {
@ -598,13 +598,13 @@ static int iwl_nic_init(struct iwl_priv *priv)
unsigned long flags; unsigned long flags;
/* nic_init */ /* nic_init */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
iwl_apm_init(priv); iwl_apm_init(priv);
/* Set interrupt coalescing calibration timer to default (512 usecs) */ /* Set interrupt coalescing calibration timer to default (512 usecs) */
iwl_write8(priv, CSR_INT_COALESCING, IWL_HOST_INT_CALIB_TIMEOUT_DEF); iwl_write8(priv, CSR_INT_COALESCING, IWL_HOST_INT_CALIB_TIMEOUT_DEF);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
iwl_set_pwr_vmain(priv); iwl_set_pwr_vmain(priv);
@ -728,7 +728,7 @@ static int iwl_trans_start_device(struct iwl_priv *priv)
/* /*
* Activate/Deactivate Tx DMA/FIFO channels according tx fifos mask * Activate/Deactivate Tx DMA/FIFO channels according tx fifos mask
* must be called under priv->lock and mac access * must be called under priv->shrd->lock and mac access
*/ */
static void iwl_trans_txq_set_sched(struct iwl_priv *priv, u32 mask) static void iwl_trans_txq_set_sched(struct iwl_priv *priv, u32 mask)
{ {
@ -777,7 +777,7 @@ static void iwl_trans_tx_start(struct iwl_priv *priv)
int i, chan; int i, chan;
u32 reg_val; u32 reg_val;
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
priv->scd_base_addr = iwl_read_prph(priv, SCD_SRAM_BASE_ADDR); priv->scd_base_addr = iwl_read_prph(priv, SCD_SRAM_BASE_ADDR);
a = priv->scd_base_addr + SCD_CONTEXT_MEM_LOWER_BOUND; a = priv->scd_base_addr + SCD_CONTEXT_MEM_LOWER_BOUND;
@ -872,7 +872,7 @@ static void iwl_trans_tx_start(struct iwl_priv *priv)
iwl_trans_tx_queue_set_status(priv, &priv->txq[i], fifo, 0); iwl_trans_tx_queue_set_status(priv, &priv->txq[i], fifo, 0);
} }
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
/* Enable L1-Active */ /* Enable L1-Active */
iwl_clear_bits_prph(priv, APMG_PCIDEV_STT_REG, iwl_clear_bits_prph(priv, APMG_PCIDEV_STT_REG,
@ -888,7 +888,7 @@ static int iwl_trans_tx_stop(struct iwl_priv *priv)
unsigned long flags; unsigned long flags;
/* Turn off all Tx DMA fifos */ /* Turn off all Tx DMA fifos */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
iwl_trans_txq_set_sched(priv, 0); iwl_trans_txq_set_sched(priv, 0);
@ -902,7 +902,7 @@ static int iwl_trans_tx_stop(struct iwl_priv *priv)
" DMA channel %d [0x%08x]", ch, " DMA channel %d [0x%08x]", ch,
iwl_read_direct32(priv, FH_TSSR_TX_STATUS_REG)); iwl_read_direct32(priv, FH_TSSR_TX_STATUS_REG));
} }
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
if (!priv->txq) { if (!priv->txq) {
IWL_WARN(priv, "Stopping tx queues that aren't allocated..."); IWL_WARN(priv, "Stopping tx queues that aren't allocated...");
@ -924,9 +924,9 @@ static void iwl_trans_stop_device(struct iwl_priv *priv)
iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET); iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
/* tell the device to stop sending interrupts */ /* tell the device to stop sending interrupts */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->shrd->lock, flags);
iwl_disable_interrupts(priv); iwl_disable_interrupts(priv);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->shrd->lock, flags);
trans_sync_irq(&priv->trans); trans_sync_irq(&priv->trans);
/* device going down, Stop using ICT table */ /* device going down, Stop using ICT table */