Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1558375

[PATCH 06/10] sata: ahci_da850: implement a softreset quirk

Show all headers | View raw

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>
---
 drivers/ata/ahci_da850.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c
index 5930af81..bb9eb4c 100644
--- a/drivers/ata/ahci_da850.c
+++ b/drivers/ata/ahci_da850.c
@@ -54,11 +54,31 @@ 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);
+
+	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,
+};
+
 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 = {
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/10] ARM: da850-lcdk: add SATA support Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-13 13:50 +0100
  [PATCH 06/10] sata: ahci_da850: implement a softreset quirk Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-13 13:50 +0100
    Re: [PATCH 06/10] sata: ahci_da850: implement a softreset quirk Tejun Heo <tj@kernel.org> - 2017-01-16 00:20 +0100
      Re: [PATCH 06/10] sata: ahci_da850: implement a softreset quirk Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-16 11:20 +0100
  [PATCH 01/10] ARM: davinci: add a clock lookup entry for the SATA clock Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-13 13:50 +0100
  [PATCH 09/10] ARM: dts: da850: add the SATA node Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-13 13:50 +0100
    Re: [PATCH 09/10] ARM: dts: da850: add the SATA node David Lechner <david@lechnology.com> - 2017-01-13 20:40 +0100
      Re: [PATCH 09/10] ARM: dts: da850: add the SATA node Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-16 11:10 +0100
  [PATCH 03/10] devicetree: bindings: add bindings for ahci-da850 Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-13 13:50 +0100
    Re: [PATCH 03/10] devicetree: bindings: add bindings for ahci-da850 David Lechner <david@lechnology.com> - 2017-01-13 20:30 +0100
      Re: [PATCH 03/10] devicetree: bindings: add bindings for ahci-da850 Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-16 11:20 +0100
        Re: [PATCH 03/10] devicetree: bindings: add bindings for ahci-da850 Sekhar Nori <nsekhar@ti.com> - 2017-01-16 13:50 +0100
          Re: [PATCH 03/10] devicetree: bindings: add bindings for ahci-da850 Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-16 15:40 +0100
            Re: [PATCH 03/10] devicetree: bindings: add bindings for ahci-da850 David Lechner <david@lechnology.com> - 2017-01-16 19:50 +0100
  [PATCH 05/10] sata: ahci_da850: add device tree match table Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-13 13:50 +0100
  [PATCH 08/10] ARM: dts: da850: add pinmux settings for the SATA controller Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-13 13:50 +0100
  [PATCH 07/10] sata: ahci_da850: add support for the da850,clk_multiplier DT property Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-13 13:50 +0100
    Re: [PATCH 07/10] sata: ahci_da850: add support for the  da850,clk_multiplier DT property David Lechner <david@lechnology.com> - 2017-01-13 21:40 +0100
  [PATCH 04/10] sata: hardreset: retry if phys link is down Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-13 13:50 +0100
    Re: [PATCH 04/10] sata: hardreset: retry if phys link is down Tejun Heo <tj@kernel.org> - 2017-01-16 00:20 +0100
      Re: [PATCH 04/10] sata: hardreset: retry if phys link is down Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-16 13:30 +0100
  [PATCH 02/10] ARM: davinci_all_defconfig: enable SATA modules Bartosz Golaszewski <bgolaszewski@baylibre.com> - 2017-01-13 14:50 +0100
  Re: [PATCH 00/10] ARM: da850-lcdk: add SATA support Sekhar Nori <nsekhar@ti.com> - 2017-01-13 15:40 +0100

csiph-web