diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-07-28 11:12:25 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-07-28 11:12:25 +0000 |
| commit | 042fb8eb57bfb7aba295831579a4f48c11d642f0 (patch) | |
| tree | 8b7b11cc23365a4cf41ffea0db5218558e9ed959 | |
| parent | fd619513d1a2514b03cbfd6774260132ef78f3bd (diff) | |
| download | master-31e0f0ae-042fb8eb57bfb7aba295831579a4f48c11d642f0.tar.gz master-31e0f0ae-042fb8eb57bfb7aba295831579a4f48c11d642f0.tar.bz2 master-31e0f0ae-042fb8eb57bfb7aba295831579a4f48c11d642f0.zip | |
brcm63xx: 3.14: fix ath9k_pci_fixup
Since kernel commit 928bea964827 ("PCI: Delay enabling bridges until
they're needed"), pci fixups are run with bridges (e.g. the pcie port)
disabled.
This causses hangs when ath9k_pci_fixup tries to manually enable the
device to apply the register fixups.
Fix this by enabling any parent bridges before trying to access the
device itself.
Fixes boot on DSL-274XB rev F1.
Reported-by: Matteo Croce <matteo@openwrt.org>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 41856
3 files changed, 10 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch b/target/linux/brcm63xx/patches-3.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch index af06428565..23f16ad8e8 100644 --- a/target/linux/brcm63xx/patches-3.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch +++ b/target/linux/brcm63xx/patches-3.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch @@ -24,7 +24,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices obj-y += boards/ --- /dev/null +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c -@@ -0,0 +1,192 @@ +@@ -0,0 +1,199 @@ +/* + * Broadcom BCM63XX Ath9k EEPROM fixup helper. + * @@ -117,6 +117,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices +{ + void __iomem *mem; + struct ath9k_platform_data *pdata = NULL; ++ struct pci_dev *bridge = pci_upstream_bridge(dev); + u16 *cal_data = NULL; + u16 cmd; + u32 bar0; @@ -161,6 +162,9 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices + return; + } + ++ if (bridge) ++ pci_enable_device(bridge); ++ + pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar0); + pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar0); + pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, val); @@ -195,6 +199,9 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices + + pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, bar0); + ++ if (bridge) ++ pci_disable_device(bridge); ++ + iounmap(mem); + + dev->dev.platform_data = pdata; diff --git a/target/linux/brcm63xx/patches-3.14/420-BCM63XX-add-endian-check-for-ath9k.patch b/target/linux/brcm63xx/patches-3.14/420-BCM63XX-add-endian-check-for-ath9k.patch index 0809d785bd..24b91bbb56 100644 --- a/target/linux/brcm63xx/patches-3.14/420-BCM63XX-add-endian-check-for-ath9k.patch +++ b/target/linux/brcm63xx/patches-3.14/420-BCM63XX-add-endian-check-for-ath9k.patch @@ -21,7 +21,7 @@ /* --- a/arch/mips/bcm63xx/pci-ath9k-fixup.c +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c -@@ -174,12 +174,14 @@ static void ath9k_pci_fixup(struct pci_d +@@ -181,12 +181,14 @@ static void ath9k_pci_fixup(struct pci_d } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup); diff --git a/target/linux/brcm63xx/patches-3.14/421-BCM63XX-add-led-pin-for-ath9k.patch b/target/linux/brcm63xx/patches-3.14/421-BCM63XX-add-led-pin-for-ath9k.patch index 0d4f761308..f10e10a8d1 100644 --- a/target/linux/brcm63xx/patches-3.14/421-BCM63XX-add-led-pin-for-ath9k.patch +++ b/target/linux/brcm63xx/patches-3.14/421-BCM63XX-add-led-pin-for-ath9k.patch @@ -11,7 +11,7 @@ } --- a/arch/mips/bcm63xx/pci-ath9k-fixup.c +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c -@@ -175,13 +175,14 @@ static void ath9k_pci_fixup(struct pci_d +@@ -182,13 +182,14 @@ static void ath9k_pci_fixup(struct pci_d DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup); void __init pci_enable_ath9k_fixup(unsigned slot, u32 offset, |