sata: ahci-da850: implement a workaround for the softreset quirk

[ Upstream commit f4d435f3265661d04e5290a0a0450e3a38898128 ]

There's an issue with the da850 SATA controller: if port multiplier
support is compiled in, but we're connecting the drive directly to
the SATA port on the board, the drive can't be detected.

To make SATA work on the da850-lcdk board: first try to softreset
with pmp - if the operation fails with -EBUSY, retry without pmp.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c
index 267a3d3e79f4dc755be11b903453b687d94c313e..52f2674d5e89cf67304482eade094d9800af981b 100644 (file)
--- a/drivers/ata/ahci_da850.c
+++ b/drivers/ata/ahci_da850.c
@@ -54,11 +54,42 @@ static void da850_sata_init(struct device *dev, void __iomem *pwrdn_reg,
        writel(val, ahci_base + SATA_P0PHYCR_REG);
 }
 
+static int ahci_da850_softreset(struct ata_link *link,
+                               unsigned int *class, unsigned long deadline)
+{
+       int pmp, ret;
+
+       pmp = sata_srst_pmp(link);
+
+       /*
+        * There's an issue with the SATA controller on da850 SoCs: if we
+        * enable Port Multiplier support, but the drive is connected directly
+        * to the board, it can't be detected. As a workaround: if PMP is
+        * enabled, we first call ahci_do_softreset() and pass it the result of
+        * sata_srst_pmp(). If this call fails, we retry with pmp = 0.
+        */
+       ret = ahci_do_softreset(link, class, pmp, deadline, ahci_check_ready);
+       if (pmp && ret == -EBUSY)
+               return ahci_do_softreset(link, class, 0,
+                                        deadline, ahci_check_ready);
+
+       return ret;
+}
+
+static struct ata_port_operations ahci_da850_port_ops = {
+       .inherits = &ahci_platform_ops,
+       .softreset = ahci_da850_softreset,
+       /*
+        * No need to override .pmp_softreset - it's only used for actual
+        * PMP-enabled ports.
+        */
+};
+
 static const struct ata_port_info ahci_da850_port_info = {
        .flags          = AHCI_FLAG_COMMON,
        .pio_mask       = ATA_PIO4,
        .udma_mask      = ATA_UDMA6,
-       .port_ops       = &ahci_platform_ops,
+       .port_ops       = &ahci_da850_port_ops,
 };
 
 static struct scsi_host_template ahci_platform_sht = {