diff options
author | Luka Perkov <luka@openwrt.org> | 2013-10-29 02:19:09 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2013-10-29 02:19:09 +0000 |
commit | df388048b472ac1739cf7a98134ec8534fa94117 (patch) | |
tree | 9fa7d94c62181b5c0935a770428b7b432c9a462f /target/linux/imx6/patches-3.12/0032-PCI-imx6-fix-imprecise-abort-handler.patch | |
parent | b8038b78ecf8e7ceb5fd08a839e12158654b12e9 (diff) | |
download | master-31e0f0ae-df388048b472ac1739cf7a98134ec8534fa94117.tar.gz master-31e0f0ae-df388048b472ac1739cf7a98134ec8534fa94117.tar.bz2 master-31e0f0ae-df388048b472ac1739cf7a98134ec8534fa94117.zip |
imx6: add initial 3.12 support
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38574
Diffstat (limited to 'target/linux/imx6/patches-3.12/0032-PCI-imx6-fix-imprecise-abort-handler.patch')
-rw-r--r-- | target/linux/imx6/patches-3.12/0032-PCI-imx6-fix-imprecise-abort-handler.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/imx6/patches-3.12/0032-PCI-imx6-fix-imprecise-abort-handler.patch b/target/linux/imx6/patches-3.12/0032-PCI-imx6-fix-imprecise-abort-handler.patch new file mode 100644 index 0000000000..5cef4114f4 --- /dev/null +++ b/target/linux/imx6/patches-3.12/0032-PCI-imx6-fix-imprecise-abort-handler.patch @@ -0,0 +1,36 @@ +From 8590081d5328fe59d4f72aaadafb47fb91d8dc7c Mon Sep 17 00:00:00 2001 +From: Tim Harvey <tharvey@gateworks.com> +Date: Thu, 17 Oct 2013 15:52:16 -0700 +Subject: [PATCH] PCI: imx6: fix imprecise abort handler + +An imprecise abort is triggered when a port behind a switch is accessed +and no device is present. At enumeration, imprecise aborts are not enabled +thus this ends up getting deferred until the kernel has completed init. At +that point we must not adjust PC - the handler must do nothing, but a handler +must exist. + +This fixes random crashes that occur right after freeing init. +This is against linux-pci/host-imx6. + +Acked-by: Marek Vasut <marex@denx.de> +Tested-by: Marek Vasut <marex@denx.de> +Signed-off-by: Tim Harvey <tharvey@gateworks.com> +--- + drivers/pci/host/pci-imx6.c | 6 ------ + 1 file changed, 6 deletions(-) + +--- a/drivers/pci/host/pci-imx6.c ++++ b/drivers/pci/host/pci-imx6.c +@@ -200,12 +200,6 @@ static int pcie_phy_write(void __iomem * + static int imx6q_pcie_abort_handler(unsigned long addr, + unsigned int fsr, struct pt_regs *regs) + { +- /* +- * If it was an imprecise abort, then we need to correct the +- * return address to be _after_ the instruction. +- */ +- if (fsr & (1 << 10)) +- regs->ARM_pc += 4; + return 0; + } + |