WAN pc300too.c: Fix PC300-X.21 detection
pc300too driver works around a bug in PCI9050 bridge. Unfortunately
it was doing that too late.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index ac8b0a2..f247e5d 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -319,6 +319,35 @@
}
pci_set_drvdata(pdev, card);
+ if (pci_resource_len(pdev, 0) != PC300_PLX_SIZE ||
+ pci_resource_len(pdev, 2) != PC300_SCA_SIZE ||
+ pci_resource_len(pdev, 3) < 16384) {
+ printk(KERN_ERR "pc300: invalid card EEPROM parameters\n");
+ pc300_pci_remove_one(pdev);
+ return -EFAULT;
+ }
+
+ plxphys = pci_resource_start(pdev, 0) & PCI_BASE_ADDRESS_MEM_MASK;
+ card->plxbase = ioremap(plxphys, PC300_PLX_SIZE);
+
+ scaphys = pci_resource_start(pdev, 2) & PCI_BASE_ADDRESS_MEM_MASK;
+ card->scabase = ioremap(scaphys, PC300_SCA_SIZE);
+
+ ramphys = pci_resource_start(pdev, 3) & PCI_BASE_ADDRESS_MEM_MASK;
+ card->rambase = pci_ioremap_bar(pdev, 3);
+
+ if (card->plxbase == NULL ||
+ card->scabase == NULL ||
+ card->rambase == NULL) {
+ printk(KERN_ERR "pc300: ioremap() failed\n");
+ pc300_pci_remove_one(pdev);
+ }
+
+ /* PLX PCI 9050 workaround for local configuration register read bug */
+ pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, scaphys);
+ card->init_ctrl_value = readl(&((plx9050 __iomem *)card->scabase)->init_ctrl);
+ pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, plxphys);
+
if (pdev->device == PCI_DEVICE_ID_PC300_TE_1 ||
pdev->device == PCI_DEVICE_ID_PC300_TE_2)
card->type = PC300_TE; /* not fully supported */
@@ -340,35 +369,6 @@
return -ENOMEM;
}
- if (pci_resource_len(pdev, 0) != PC300_PLX_SIZE ||
- pci_resource_len(pdev, 2) != PC300_SCA_SIZE ||
- pci_resource_len(pdev, 3) < 16384) {
- printk(KERN_ERR "pc300: invalid card EEPROM parameters\n");
- pc300_pci_remove_one(pdev);
- return -EFAULT;
- }
-
- plxphys = pci_resource_start(pdev,0) & PCI_BASE_ADDRESS_MEM_MASK;
- card->plxbase = ioremap(plxphys, PC300_PLX_SIZE);
-
- scaphys = pci_resource_start(pdev,2) & PCI_BASE_ADDRESS_MEM_MASK;
- card->scabase = ioremap(scaphys, PC300_SCA_SIZE);
-
- ramphys = pci_resource_start(pdev,3) & PCI_BASE_ADDRESS_MEM_MASK;
- card->rambase = pci_ioremap_bar(pdev, 3);
-
- if (card->plxbase == NULL ||
- card->scabase == NULL ||
- card->rambase == NULL) {
- printk(KERN_ERR "pc300: ioremap() failed\n");
- pc300_pci_remove_one(pdev);
- }
-
- /* PLX PCI 9050 workaround for local configuration register read bug */
- pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, scaphys);
- card->init_ctrl_value = readl(&((plx9050 __iomem *)card->scabase)->init_ctrl);
- pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, plxphys);
-
/* Reset PLX */
p = &card->plxbase->init_ctrl;
writel(card->init_ctrl_value | 0x40000000, p);