Skip to contentSkip to conversation

iwl3945: Fix oops at module load

PATCH In review Andi Kleen 3 participants 5 messages Nov 8, 2010 – Nov 9, 2010 Networking drivers (wireless)

lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

PATCH 1/1 iwl3945: Fix oops at module load

From: Andi Kleen <[email protected]>

On my laptop the iwl3945 driver oopsed at boot with 2.6.37-rc1 in __dev_printk.

The problem is that for some reason it prints the sw scan warning, but does that before the pci device is initialized in the driver private structure. This leads to an oops in the warning print code.

Move the warning after the device has been initialized.

---
 drivers/net/wireless/iwlwifi/iwl3945-base.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/wireless/iwlwifi/iwl3945-base.c +5 -6
index 8f8c4b7..3910ec2 100644
@@ -3995,6 +3995,11 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 	priv->contexts[IWL_RXON_CTX_BSS].station_devtype = RXON_DEV_TYPE_ESS;
 	priv->contexts[IWL_RXON_CTX_BSS].unused_devtype = RXON_DEV_TYPE_ESS;
 
+	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
+	priv->cfg = cfg;
+	priv->pci_dev = pdev;
+	priv->inta_mask = CSR_INI_SET_MASK;
+
 	/*
 	 * Disabling hardware scan means that mac80211 will perform scans
 	 * "the hard way", rather than using device's scan.
@@ -4004,12 +4009,6 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 		iwl3945_hw_ops.hw_scan = NULL;
 	}
 
-
-	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
-	priv->cfg = cfg;
-	priv->pci_dev = pdev;
-	priv->inta_mask = CSR_INI_SET_MASK;
-
 	if (iwl_alloc_traffic_mem(priv))
 		IWL_ERR(priv, "Not enough memory to generate traffic log\n");
 
Signature · 1 line
1.7.1
#1 lore raw
Quoted 11 lines

From: Andi Kleen <[email protected]>

On my laptop the iwl3945 driver oopsed at boot with 2.6.37-rc1 in __dev_printk.

The problem is that for some reason it prints the sw scan warning, but does that before the pci device is initialized in the driver private structure. This leads to an oops in the warning print code.

Move the warning after the device has been initialized.

Yup, something like this is needed, sorry about this! I believe we have a fix for this in the pipeline somewhere.

johannes
--------------------------------------------------------------------------------------
Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen, Deutschland
Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Douglas Lusk, Peter Gleissner, Hannes Schwaderer
Registergericht: Muenchen HRB 47456
Ust.-IdNr./VAT Registration No.: DE129385895
Citibank Frankfurt a.M. (BLZ 502 109 00) 600119052

#2 lore raw
In reply to Andi Kleen

Hi Andi,

Quoted 37 lines · Andi Kleen

From: Andi Kleen <[email protected]>

On my laptop the iwl3945 driver oopsed at boot with 2.6.37-rc1 in __dev_printk.

The problem is that for some reason it prints the sw scan warning, but does that before the pci device is initialized in the driver private structure. This leads to an oops in the warning print code.

Move the warning after the device has been initialized.

---
 drivers/net/wireless/iwlwifi/iwl3945-base.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/wireless/iwlwifi/iwl3945-base.c +5 -0
index 8f8c4b7..3910ec2 100644
@@ -3995,6 +3995,11 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 	priv->contexts[IWL_RXON_CTX_BSS].station_devtype = RXON_DEV_TYPE_ESS;
 	priv->contexts[IWL_RXON_CTX_BSS].unused_devtype = RXON_DEV_TYPE_ESS;
 
+	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
+	priv->cfg = cfg;
+	priv->pci_dev = pdev;
+	priv->inta_mask = CSR_INI_SET_MASK;
+
 	/*
 	 * Disabling hardware scan means that mac80211 will perform scans
 	 * "the hard way", rather than using device's scan.
@@ -4004,12 +4009,6 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 		iwl3945_hw_ops.hw_scan = NULL;
 	}

drivers/net/wireless/iwlwifi/iwl3945-base.c static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e · line 4014

Quoted 10 lines
drivers/net/wireless/iwlwifi/iwl3945-base.c +0 -6
 
-
-	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
-	priv->cfg = cfg;
-	priv->pci_dev = pdev;
-	priv->inta_mask = CSR_INI_SET_MASK;
-
 	if (iwl_alloc_traffic_mem(priv))
 		IWL_ERR(priv, "Not enough memory to generate traffic log\n");
 

I believe the fix already in
http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=summary
commit#6e0922e0781884ff4eb3638f10a91b63b6120207

Thanks
Wey