lantiq: fix ath_pci_fixup hang on bridged devices

Port of r41856.

In contrast to the brcm63xx target, it isn't sufficient to enable/disable
the bridge. The device needs to be enabled/disabled to fix the hang. The
bridge will be automatically enabled by the time the connected device is
enabled.

Fixes boot on TD-W8980.

Signed-off-by: Mathias Kresin <openwrt@kresin.me>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
SVN-Revision: 47129

diff --git a/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
index ec769ccf63c3699d08deadf9e6ae1bc68a6e3f12..2fc4db30660035bf24592bd649f3ae2da617aea0 100644 (file)
--- a/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
+++ b/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
@@ -415,7 +415,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +device_initcall(of_eth_mac_init);
 --- /dev/null
 +++ b/arch/mips/lantiq/xway/pci-ath-fixup.c
-@@ -0,0 +1,109 @@
+@@ -0,0 +1,118 @@
 +/*
 + *  Atheros AP94 reference board PCI initialization
 + *
@@ -442,6 +442,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +static void ath_pci_fixup(struct pci_dev *dev)
 +{
 +      void __iomem *mem;
++      struct pci_dev *bridge = pci_upstream_bridge(dev); 
 +      u16 *cal_data = NULL;
 +      u16 cmd;
 +      u32 bar0;
@@ -477,6 +478,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +              return;
 +      }
 +
++      if (bridge) {
++              pci_enable_device(dev);
++      }
++
 +      pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar0);
 +      pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, base);
 +      pci_read_config_word(dev, PCI_COMMAND, &cmd);
@@ -512,6 +517,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +
 +      pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, bar0);
 +
++      if (bridge) {
++              pci_disable_device(dev);
++      }
++
 +      iounmap(mem);
 +}
 +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath_pci_fixup);

diff --git a/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
index ec769ccf63c3699d08deadf9e6ae1bc68a6e3f12..2fc4db30660035bf24592bd649f3ae2da617aea0 100644 (file)
--- a/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
+++ b/target/linux/lantiq/patches-4.1/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch
@@ -415,7 +415,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +device_initcall(of_eth_mac_init);
 --- /dev/null
 +++ b/arch/mips/lantiq/xway/pci-ath-fixup.c
-@@ -0,0 +1,109 @@
+@@ -0,0 +1,118 @@
 +/*
 + *  Atheros AP94 reference board PCI initialization
 + *
@@ -442,6 +442,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +static void ath_pci_fixup(struct pci_dev *dev)
 +{
 +      void __iomem *mem;
++      struct pci_dev *bridge = pci_upstream_bridge(dev); 
 +      u16 *cal_data = NULL;
 +      u16 cmd;
 +      u32 bar0;
@@ -477,6 +478,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +              return;
 +      }
 +
++      if (bridge) {
++              pci_enable_device(dev);
++      }
++
 +      pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar0);
 +      pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, base);
 +      pci_read_config_word(dev, PCI_COMMAND, &cmd);
@@ -512,6 +517,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +
 +      pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, bar0);
 +
++      if (bridge) {
++              pci_disable_device(dev);
++      }
++
 +      iounmap(mem);
 +}
 +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath_pci_fixup);