浏览代码

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>
Reinette Chatre 15 年之前
父节点
当前提交
4843b5a731
共有 2 个文件被更改,包括 15 次插入0 次删除
  1. 8 0
      drivers/net/wireless/iwlwifi/iwl-agn.c
  2. 7 0
      drivers/net/wireless/iwlwifi/iwl3945-base.c

+ 8 - 0
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->reg_lock);
 	spin_lock_init(&priv->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_hw_detect(priv);
 	IWL_INFO(priv, "Detected Intel Wireless WiFi Link %s REV=0x%X\n",
 	IWL_INFO(priv, "Detected Intel Wireless WiFi Link %s REV=0x%X\n",
 		priv->cfg->name, priv->hw_rev);
 		priv->cfg->name, priv->hw_rev);

+ 7 - 0
drivers/net/wireless/iwlwifi/iwl3945-base.c

@@ -4039,6 +4039,13 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 	spin_lock_init(&priv->reg_lock);
 	spin_lock_init(&priv->reg_lock);
 	spin_lock_init(&priv->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);
+
 	/***********************
 	/***********************
 	 * 4. Read EEPROM
 	 * 4. Read EEPROM
 	 * ********************/
 	 * ********************/