diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-04-08 05:09:42 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-04-08 05:09:42 +0000 |
| commit | 7798074429c87da16e75e1a2812ba65a57f31ed6 (patch) | |
| tree | 08f82ea32b4eba7a96ee6721ffe96915c1bfb692 /target/linux/brcm47xx | |
| parent | 1d2abb6f16ca3430606edb42a15a97b6cb61af9a (diff) | |
| download | upstream-7798074429c87da16e75e1a2812ba65a57f31ed6.tar.gz upstream-7798074429c87da16e75e1a2812ba65a57f31ed6.tar.bz2 upstream-7798074429c87da16e75e1a2812ba65a57f31ed6.zip | |
brcm47xx: add fix "Data bus error" on CardBus ssb SoCs
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 45308
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.18/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch | 35 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.18/976-ssb_increase_pci_delay.patch | 2 |
2 files changed, 36 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch b/target/linux/brcm47xx/patches-3.18/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch new file mode 100644 index 0000000000..e860acb22c --- /dev/null +++ b/target/linux/brcm47xx/patches-3.18/900-ssb-reject-PCI-writes-setting-CardBus-bridge-resourc.patch @@ -0,0 +1,35 @@ +From 5c81397a0147ea59c778d1de14ef54e2268221f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> +Date: Wed, 8 Apr 2015 06:58:11 +0200 +Subject: [PATCH] ssb: reject PCI writes setting CardBus bridge resources +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +If SoC has a CardBus we can set resources of device at slot 1 only. It's +impossigle to set bridge resources as it simply overwrites device 1 +configuration and usually results in Data bus error-s. + +Signed-off-by: Rafał Miłecki <zajec5@gmail.com> +--- + drivers/ssb/driver_pcicore.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c +index 15a7ee3..c603d19 100644 +--- a/drivers/ssb/driver_pcicore.c ++++ b/drivers/ssb/driver_pcicore.c +@@ -164,6 +164,10 @@ static int ssb_extpci_write_config(struct ssb_pcicore *pc, + SSB_WARN_ON(!pc->hostmode); + if (unlikely(len != 1 && len != 2 && len != 4)) + goto out; ++ /* CardBus SoCs allow configuring dev 1 resources only */ ++ if (extpci_core->cardbusmode && dev != 1 && ++ off >= PCI_BASE_ADDRESS_0 && off <= PCI_BASE_ADDRESS_5) ++ goto out; + addr = get_cfgspace_addr(pc, bus, dev, func, off); + if (unlikely(!addr)) + goto out; +-- +1.8.4.5 + diff --git a/target/linux/brcm47xx/patches-3.18/976-ssb_increase_pci_delay.patch b/target/linux/brcm47xx/patches-3.18/976-ssb_increase_pci_delay.patch index b56f1d5be3..bf932729e9 100644 --- a/target/linux/brcm47xx/patches-3.18/976-ssb_increase_pci_delay.patch +++ b/target/linux/brcm47xx/patches-3.18/976-ssb_increase_pci_delay.patch @@ -1,6 +1,6 @@ --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c -@@ -375,7 +375,7 @@ static void ssb_pcicore_init_hostmode(st +@@ -388,7 +388,7 @@ static void ssb_pcicore_init_hostmode(st set_io_port_base(ssb_pcicore_controller.io_map_base); /* Give some time to the PCI controller to configure itself with the new * values. Not waiting at this point causes crashes of the machine. */ |