1 files changed, 67 insertions, 5 deletions

diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c
index a98cba55c7f0..bf5c3616e344 100644
--- a/drivers/pci/dwc/pci-imx6.c
+++ b/drivers/pci/dwc/pci-imx6.c
@@ -24,6 +24,7 @@
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
 #include <linux/resource.h>
 #include <linux/signal.h>
 #include <linux/types.h>
@@ -59,6 +60,7 @@ struct imx6_pcie {
         u32                     tx_swing_full;
         u32                     tx_swing_low;
         int                     link_gen;
+        struct regulator        *vpcie;
 };
 
 /* Parameters for the waiting for PCIe PHY PLL to lock on i.MX7 */
@@ -252,11 +254,40 @@ static void imx6_pcie_reset_phy(struct imx6_pcie *imx6_pcie)
 static int imx6q_pcie_abort_handler(unsigned long addr,
                 unsigned int fsr, struct pt_regs *regs)
 {
-        return 0;
+        unsigned long pc = instruction_pointer(regs);
+        unsigned long instr = *(unsigned long *)pc;
+        int reg = (instr >> 12) & 15;
+
+        /*
+         * If the instruction being executed was a read,
+         * make it look like it read all-ones.
+         */
+        if ((instr & 0x0c100000) == 0x04100000) {
+                unsigned long val;
+
+                if (instr & 0x00400000)
+                        val = 255;
+                else
+                        val = -1;
+
+                regs->uregs[reg] = val;
+                regs->ARM_pc += 4;
+                return 0;
+        }
+
+        if ((instr & 0x0e100090) == 0x00100090) {
+                regs->uregs[reg] = -1;
+                regs->ARM_pc += 4;
+                return 0;
+        }
+
+        return 1;
 }
 
 static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
 {
+        struct device *dev = imx6_pcie->pci->dev;
+
         switch (imx6_pcie->variant) {
         case IMX7D:
                 reset_control_assert(imx6_pcie->pciephy_reset);
@@ -283,6 +314,14 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
                                    IMX6Q_GPR1_PCIE_REF_CLK_EN, 0 << 16);
                 break;
         }
+
+        if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) {
+                int ret = regulator_disable(imx6_pcie->vpcie);
+
+                if (ret)
+                        dev_err(dev, "failed to disable vpcie regulator: %d\n",
+                                ret);
+        }
 }
 
 static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie)
@@ -349,10 +388,19 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
         struct device *dev = pci->dev;
         int ret;
 
+        if (imx6_pcie->vpcie && !regulator_is_enabled(imx6_pcie->vpcie)) {
+                ret = regulator_enable(imx6_pcie->vpcie);
+                if (ret) {
+                        dev_err(dev, "failed to enable vpcie regulator: %d\n",
+                                ret);
+                        return;
+                }
+        }
+
         ret = clk_prepare_enable(imx6_pcie->pcie_phy);
         if (ret) {
                 dev_err(dev, "unable to enable pcie_phy clock\n");
-                return;
+                goto err_pcie_phy;
         }
 
         ret = clk_prepare_enable(imx6_pcie->pcie_bus);
@@ -412,6 +460,13 @@ err_pcie:
         clk_disable_unprepare(imx6_pcie->pcie_bus);
 err_pcie_bus:
         clk_disable_unprepare(imx6_pcie->pcie_phy);
+err_pcie_phy:
+        if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) {
+                ret = regulator_disable(imx6_pcie->vpcie);
+                if (ret)
+                        dev_err(dev, "failed to disable vpcie regulator: %d\n",
+                                ret);
+        }
 }
 
 static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie)
@@ -602,7 +657,7 @@ static int imx6_pcie_link_up(struct dw_pcie *pci)
                         PCIE_PHY_DEBUG_R1_XMLH_LINK_UP;
 }
 
-static struct dw_pcie_host_ops imx6_pcie_host_ops = {
+static const struct dw_pcie_host_ops imx6_pcie_host_ops = {
         .host_init = imx6_pcie_host_init,
 };
 
@@ -775,6 +830,13 @@ static int imx6_pcie_probe(struct platform_device *pdev)
         if (ret)
                 imx6_pcie->link_gen = 1;
 
+        imx6_pcie->vpcie = devm_regulator_get_optional(&pdev->dev, "vpcie");
+        if (IS_ERR(imx6_pcie->vpcie)) {
+                if (PTR_ERR(imx6_pcie->vpcie) == -EPROBE_DEFER)
+                        return -EPROBE_DEFER;
+                imx6_pcie->vpcie = NULL;
+        }
+
         platform_set_drvdata(pdev, imx6_pcie);
 
         ret = imx6_add_pcie_port(imx6_pcie, pdev);
@@ -819,8 +881,8 @@ static int __init imx6_pcie_init(void)
          * we can install the handler here without risking it
          * accessing some uninitialized driver state.
          */
-        hook_fault_code(16 + 6, imx6q_pcie_abort_handler, SIGBUS, 0,
-                        "imprecise external abort");
+        hook_fault_code(8, imx6q_pcie_abort_handler, SIGBUS, 0,
+                        "external abort on non-linefetch");
 
         return platform_driver_register(&imx6_pcie_driver);
 }