From: Bartosz Golaszewski <bgolaszewski@baylibre.com> To: Kevin Hilman <khilman@kernel.org>, Sekhar Nori <nsekhar@ti.com>, Patrick Titiano <ptitiano@baylibre.com>, Michael Turquette <mturquette@baylibre.com>, Tejun Heo <tj@kernel.org>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Russell King <linux@armlinux.org.uk>, David Lechner <david@lechnology.com> Cc: linux-ide@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski <bgolaszewski@baylibre.com> Subject: [PATCH v3 08/13] sata: ahci-da850: implement a workaround for the softreset quirk Date: Wed, 18 Jan 2017 14:19:56 +0100 [thread overview] Message-ID: <1484745601-4769-9-git-send-email-bgolaszewski@baylibre.com> (raw) In-Reply-To: <1484745601-4769-1-git-send-email-bgolaszewski@baylibre.com> 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 | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c index 7f5328f..11dd87e 100644 --- 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 = { -- 2.9.3
WARNING: multiple messages have this Message-ID (diff)
From: bgolaszewski@baylibre.com (Bartosz Golaszewski) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 08/13] sata: ahci-da850: implement a workaround for the softreset quirk Date: Wed, 18 Jan 2017 14:19:56 +0100 [thread overview] Message-ID: <1484745601-4769-9-git-send-email-bgolaszewski@baylibre.com> (raw) In-Reply-To: <1484745601-4769-1-git-send-email-bgolaszewski@baylibre.com> 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 | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c index 7f5328f..11dd87e 100644 --- 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 = { -- 2.9.3
next prev parent reply other threads:[~2017-01-18 13:19 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-18 13:19 [PATCH v3 00/13] ARM: da850-lcdk: add SATA support Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski [not found] ` <1484745601-4769-1-git-send-email-bgolaszewski-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> 2017-01-18 13:19 ` [PATCH v3 01/13] devicetree: bindings: add bindings for ahci-da850 Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 13:19 ` [PATCH v3 02/13] ARM: davinci_all_defconfig: enable SATA modules Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 13:20 ` [PATCH v3 12/13] ARM: dts: da850: add the SATA node Bartosz Golaszewski 2017-01-18 13:20 ` Bartosz Golaszewski 2017-01-18 13:20 ` Bartosz Golaszewski 2017-01-18 13:19 ` [PATCH v3 03/13] ARM: davinci: add a clock lookup entry for the SATA clock Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 13:19 ` [PATCH v3 04/13] sata: ahci-da850: get the sata clock using a connection id Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 13:19 ` [PATCH v3 05/13] ARM: davinci: da850: add con_id for the SATA clock Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 13:19 ` [PATCH v3 06/13] ARM: davinci: da850: model the SATA refclk Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 17:26 ` David Lechner 2017-01-18 17:26 ` David Lechner 2017-01-19 11:18 ` Bartosz Golaszewski 2017-01-19 11:18 ` Bartosz Golaszewski [not found] ` <ff4deee6-9700-fff3-be96-0ad2f008914b-nq/r/kbU++upp/zk7JDF2g@public.gmane.org> 2017-01-19 13:31 ` Bartosz Golaszewski 2017-01-19 13:31 ` Bartosz Golaszewski 2017-01-19 13:31 ` Bartosz Golaszewski 2017-01-18 13:19 ` [PATCH v3 07/13] sata: ahci-da850: add device tree match table Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski [this message] 2017-01-18 13:19 ` [PATCH v3 08/13] sata: ahci-da850: implement a workaround for the softreset quirk Bartosz Golaszewski 2017-01-18 13:19 ` [PATCH v3 09/13] sata: ahci: export ahci_do_hardreset() locally Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 18:28 ` Tejun Heo 2017-01-18 18:28 ` Tejun Heo 2017-01-18 18:28 ` Tejun Heo [not found] ` <20170118182826.GA1451-qYNAdHglDFBN0TnZuCh8vA@public.gmane.org> 2017-01-19 10:55 ` Bartosz Golaszewski 2017-01-19 10:55 ` Bartosz Golaszewski 2017-01-19 10:55 ` Bartosz Golaszewski [not found] ` <CAMpxmJULuF3cB7+Vy_qeWkTjooHvx8yk70w59Q=XNd0aAREcuw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2017-01-19 12:52 ` Tejun Heo 2017-01-19 12:52 ` Tejun Heo 2017-01-19 12:52 ` Tejun Heo 2017-01-18 13:19 ` [PATCH v3 10/13] sata: ahci-da850: add a workaround for controller instability Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 13:19 ` [PATCH v3 11/13] sata: ahci-da850: un-hardcode the MPY bits Bartosz Golaszewski 2017-01-18 13:19 ` Bartosz Golaszewski 2017-01-18 13:20 ` [PATCH v3 13/13] ARM: dts: da850-lcdk: enable the SATA node Bartosz Golaszewski 2017-01-18 13:20 ` Bartosz Golaszewski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1484745601-4769-9-git-send-email-bgolaszewski@baylibre.com \ --to=bgolaszewski@baylibre.com \ --cc=david@lechnology.com \ --cc=devicetree@vger.kernel.org \ --cc=khilman@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-ide@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=mturquette@baylibre.com \ --cc=nsekhar@ti.com \ --cc=ptitiano@baylibre.com \ --cc=robh+dt@kernel.org \ --cc=tj@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.