aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-4.4/800-PCI-iproc-Ignore-ARM-core-aborts-when-running-on-bcm.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2016-11-28 13:07:29 +0100
committerRafał Miłecki <rafal@milecki.pl>2016-11-28 13:14:14 +0100
commit32875a2d79a553c339f861190a4e9f21c97da88e (patch)
tree9169298d39734d491821c5ab77d4b424dd3a5372 /target/linux/bcm53xx/patches-4.4/800-PCI-iproc-Ignore-ARM-core-aborts-when-running-on-bcm.patch
parentcb7ab730c76c47bbcb1f8ba4cd8df8d4b1071e55 (diff)
downloadupstream-32875a2d79a553c339f861190a4e9f21c97da88e.tar.gz
upstream-32875a2d79a553c339f861190a4e9f21c97da88e.tar.bz2
upstream-32875a2d79a553c339f861190a4e9f21c97da88e.zip
bcm53xx: use upstream accepted fix for ARM core aborts
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/bcm53xx/patches-4.4/800-PCI-iproc-Ignore-ARM-core-aborts-when-running-on-bcm.patch')
-rw-r--r--target/linux/bcm53xx/patches-4.4/800-PCI-iproc-Ignore-ARM-core-aborts-when-running-on-bcm.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/target/linux/bcm53xx/patches-4.4/800-PCI-iproc-Ignore-ARM-core-aborts-when-running-on-bcm.patch b/target/linux/bcm53xx/patches-4.4/800-PCI-iproc-Ignore-ARM-core-aborts-when-running-on-bcm.patch
deleted file mode 100644
index af1ae6137b..0000000000
--- a/target/linux/bcm53xx/patches-4.4/800-PCI-iproc-Ignore-ARM-core-aborts-when-running-on-bcm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Subject: [PATCH] PCI: iproc: Ignore ARM core aborts when running on bcma bus
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Northstar devices have host bridges that forward errors to the ARM core.
-These errors happen during PCI bus probing (device enumeration) and are
-expected. There is no reason for them to cause a die() so this patch
-adds a handler silencing them.
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
-
---- a/drivers/pci/host/pcie-iproc-bcma.c
-+++ b/drivers/pci/host/pcie-iproc-bcma.c
-@@ -40,6 +40,15 @@ static int iproc_pcie_bcma_map_irq(const
- return bcma_core_irq(bdev, 5);
- }
-
-+static int iproc_pcie_bcma_abort_handler(unsigned long addr, unsigned int fsr,
-+ struct pt_regs *regs)
-+{
-+ if (fsr == 0x1406)
-+ return 0;
-+
-+ return 1;
-+}
-+
- static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
- {
- struct iproc_pcie *pcie;
-@@ -65,6 +74,9 @@ static int iproc_pcie_bcma_probe(struct
-
- pcie->map_irq = iproc_pcie_bcma_map_irq;
-
-+ hook_fault_code(16 + 6, iproc_pcie_bcma_abort_handler, SIGBUS, BUS_OBJERR,
-+ "imprecise external abort");
-+
- ret = iproc_pcie_setup(pcie, &res);
- if (ret)
- dev_err(pcie->dev, "PCIe controller setup failed\n");