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 | 069c51534a3ecccbc69813eb00e2963f9a294b4e (patch) | |
tree | 1f4a72903e45fed253dfe277018ee365682032b5 /target/linux/brcm63xx/patches-3.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch | |
parent | b5a1ebe6df0b4591581aa7597c87a7277726a349 (diff) | |
download | master-187ad058-069c51534a3ecccbc69813eb00e2963f9a294b4e.tar.gz master-187ad058-069c51534a3ecccbc69813eb00e2963f9a294b4e.tar.bz2 master-187ad058-069c51534a3ecccbc69813eb00e2963f9a294b4e.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41856 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch | 9 |
1 files changed, 8 insertions, 1 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; |