public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

iwlwifi: move all uCode load variables

Browse source 
All variables related to uCode loading (the
waitqueue and done indication) should be in
the PCI-E transport's private data as this
is transport specific. Move them there.

Signed-off-by: Johannes Berg <johannes.berg@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:
Johannes Berg 2012-03-06 13:31:00 -08:00 • committed by John W. Linville
parent 947a9407e3
commit 13df1aab4a
5 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -367,7 +367,7 @@ struct iwl_cfg {
* @nic: pointer to the nic data * @nic: pointer to the nic data
* @hw_params: see struct iwl_hw_params * @hw_params: see struct iwl_hw_params
* @lock: protect general shared data * @lock: protect general shared data
* @wait_command_queue: the wait_queue for SYNC host command nad uCode load * @wait_command_queue: the wait_queue for SYNC host commands
* @eeprom: pointer to the eeprom/OTP image * @eeprom: pointer to the eeprom/OTP image
* @ucode_type: indicator of loaded ucode image * @ucode_type: indicator of loaded ucode image
* @device_pointers: pointers to ucode event tables * @device_pointers: pointers to ucode event tables

6
drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
View file

@ -32,6 +32,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/wait.h>
#include <linux/pci.h> #include <linux/pci.h>
#include "iwl-fh.h" #include "iwl-fh.h"
@ -243,6 +244,8 @@ struct iwl_tx_queue {
* queue_stop_count: tracks what SW queue is stopped * queue_stop_count: tracks what SW queue is stopped
* @pci_dev: basic pci-network driver stuff * @pci_dev: basic pci-network driver stuff
* @hw_base: pci hardware address support * @hw_base: pci hardware address support
* @ucode_write_complete: indicates that the ucode has been copied.
* @ucode_write_waitq: wait queue for uCode load
*/ */
struct iwl_trans_pcie { struct iwl_trans_pcie {
struct iwl_rx_queue rxq; struct iwl_rx_queue rxq;
@ -279,6 +282,9 @@ struct iwl_trans_pcie {
/* PCI bus related data */ /* PCI bus related data */
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
void __iomem *hw_base; void __iomem *hw_base;
bool ucode_write_complete;
wait_queue_head_t ucode_write_waitq;
}; };
#define IWL_TRANS_GET_PCIE_TRANS(_iwl_trans) \ #define IWL_TRANS_GET_PCIE_TRANS(_iwl_trans) \

4
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
View file

@ -1114,8 +1114,8 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
isr_stats->tx++; isr_stats->tx++;
handled |= CSR_INT_BIT_FH_TX; handled |= CSR_INT_BIT_FH_TX;
/* Wake up uCode load routine, now that load is complete */ /* Wake up uCode load routine, now that load is complete */
trans->ucode_write_complete = 1; trans_pcie->ucode_write_complete = true;
wake_up(&trans->shrd->wait_command_queue); wake_up(&trans_pcie->ucode_write_waitq);
} }
if (inta & ~handled) { if (inta & ~handled) {

8
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
View file

@ -947,11 +947,12 @@ static const u8 iwlagn_pan_ac_to_queue[] = {
static int iwl_load_section(struct iwl_trans *trans, const char *name, static int iwl_load_section(struct iwl_trans *trans, const char *name,
const struct fw_desc *image, u32 dst_addr) const struct fw_desc *image, u32 dst_addr)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
dma_addr_t phy_addr = image->p_addr; dma_addr_t phy_addr = image->p_addr;
u32 byte_cnt = image->len; u32 byte_cnt = image->len;
int ret; int ret;
trans->ucode_write_complete = 0; trans_pcie->ucode_write_complete = false;
iwl_write_direct32(trans, iwl_write_direct32(trans,
FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL), FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),
@ -982,8 +983,8 @@ static int iwl_load_section(struct iwl_trans *trans, const char *name,
FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD); FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD);
IWL_DEBUG_FW(trans, "%s uCode section being loaded...\n", name); IWL_DEBUG_FW(trans, "%s uCode section being loaded...\n", name);
ret = wait_event_timeout(trans->shrd->wait_command_queue, ret = wait_event_timeout(trans_pcie->ucode_write_waitq,
trans->ucode_write_complete, 5 * HZ); trans_pcie->ucode_write_complete, 5 * HZ);
if (!ret) { if (!ret) {
IWL_ERR(trans, "Could not load the %s uCode section\n", IWL_ERR(trans, "Could not load the %s uCode section\n",
name); name);
@ -2255,6 +2256,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct iwl_shared *shrd,
trans->shrd = shrd; trans->shrd = shrd;
trans_pcie->trans = trans; trans_pcie->trans = trans;
spin_lock_init(&trans_pcie->irq_lock); spin_lock_init(&trans_pcie->irq_lock);
init_waitqueue_head(&trans_pcie->ucode_write_waitq);
/* W/A - seems to solve weird behavior. We need to remove this if we /* W/A - seems to solve weird behavior. We need to remove this if we
* don't want to stay in L1 all the time. This wastes a lot of power */ * don't want to stay in L1 all the time. This wastes a lot of power */

3
drivers/net/wireless/iwlwifi/iwl-trans.h
View file

@ -338,7 +338,6 @@ enum iwl_trans_state {
* @hw_id: a u32 with the ID of the device / subdevice. * @hw_id: a u32 with the ID of the device / subdevice.
* Set during transport allocation. * Set during transport allocation.
* @hw_id_str: a string with info about HW ID. Set during transport allocation. * @hw_id_str: a string with info about HW ID. Set during transport allocation.
* @ucode_write_complete: indicates that the ucode has been copied.
* @nvm_device_type: indicates OTP or eeprom * @nvm_device_type: indicates OTP or eeprom
* @pm_support: set to true in start_hw if link pm is supported * @pm_support: set to true in start_hw if link pm is supported
*/ */
@ -355,8 +354,6 @@ struct iwl_trans {
u32 hw_id; u32 hw_id;
char hw_id_str[52]; char hw_id_str[52];
u8 ucode_write_complete;
int nvm_device_type; int nvm_device_type;
bool pm_support; bool pm_support;