Commit 4ec3ed7f authored Oct 17, 2013 by Tim Harvey Committed by Bjorn Helgaas Oct 29, 2013

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.

Tested-by: Marek Vasut <marex@denx.de>
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Marek Vasut <marex@denx.de>

parent 9b5cd094

drivers/pci/host/pci-imx6.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -200,12 +200,6 @@ static int pcie_phy_write(void __iomem *dbi_base, int addr, int data)
		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;
		}