diff options
| author | Reinette Chatre | 2010-02-03 18:38:59 +0100 |
|---|---|---|
| committer | Reinette Chatre | 2010-02-11 19:26:55 +0100 |
| commit | 4843b5a731b31916d100cfc5ba4d03ae78462ed9 (patch) | |
| tree | 2a1ed65c58a8f582aef410acd2fc6c1fd1354ee2 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | iwlwifi: fix scan race (diff) | |
| download | kernel-qcow2-linux-4843b5a731b31916d100cfc5ba4d03ae78462ed9.tar.gz kernel-qcow2-linux-4843b5a731b31916d100cfc5ba4d03ae78462ed9.tar.xz kernel-qcow2-linux-4843b5a731b31916d100cfc5ba4d03ae78462ed9.zip | |
iwlwifi: reset card during probe
To ensure that card is in a sane state during probe we add a reset call.
This change was prompted by users of kdump who was not able to bring up the
wireless driver in the kdump kernel. The problem here was that the primary
kernel, which is not running at the time, left the wireless card up and
running. When the kdump kernel starts it is thus possible to immediately
receive interrupts from firmware after registering interrupt, but without
being ready to deal with interrupts from firmware yet.
Reported-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index c1eff4c5b448..31b156d58d7f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3540,6 +3540,14 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) */ spin_lock_init(&priv->reg_lock); spin_lock_init(&priv->lock); + + /* + * stop and reset the on-board processor just in case it is in a + * strange state ... like being left stranded by a primary kernel + * and this is now the kdump kernel trying to start up + */ + iwl_write32(priv, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET); + iwl_hw_detect(priv); IWL_INFO(priv, "Detected Intel Wireless WiFi Link %s REV=0x%X\n", priv->cfg->name, priv->hw_rev); |