From: bgolaszewski@baylibre.com (Bartosz Golaszewski)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 09/14] sata: ahci: export ahci_do_hardreset() locally
Date: Thu, 19 Jan 2017 14:29:43 +0100 [thread overview]
Message-ID: <1484832588-18413-10-git-send-email-bgolaszewski@baylibre.com> (raw)
In-Reply-To: <1484832588-18413-1-git-send-email-bgolaszewski@baylibre.com>
We need a way to retrieve the information about the online state of
the link in the ahci-da850 driver.
Create a new function: ahci_do_hardreset() which is called from
ahci_hardreset() for backwards compatibility, but has an additional
argument: 'online' - which can be used to check if the link is online
after this function returns.
The new routine will be used in the ahci-da850 driver to avoid code
duplication when implementing a workaround for tha da850 SATA
controller quirk/instability.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/ata/ahci.h | 3 +++
drivers/ata/libahci.c | 18 +++++++++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index 0cc08f8..5db6ab2 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -398,6 +398,9 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,
int pmp, unsigned long deadline,
int (*check_ready)(struct ata_link *link));
+int ahci_do_hardreset(struct ata_link *link, unsigned int *class,
+ unsigned long deadline, bool *online);
+
unsigned int ahci_qc_issue(struct ata_queued_cmd *qc);
int ahci_stop_engine(struct ata_port *ap);
void ahci_start_fis_rx(struct ata_port *ap);
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index ee7db31..3159f9e 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1519,8 +1519,8 @@ static int ahci_pmp_retry_softreset(struct ata_link *link, unsigned int *class,
return rc;
}
-static int ahci_hardreset(struct ata_link *link, unsigned int *class,
- unsigned long deadline)
+int ahci_do_hardreset(struct ata_link *link, unsigned int *class,
+ unsigned long deadline, bool *online)
{
const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context);
struct ata_port *ap = link->ap;
@@ -1528,7 +1528,6 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class,
struct ahci_host_priv *hpriv = ap->host->private_data;
u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;
struct ata_taskfile tf;
- bool online;
int rc;
DPRINTK("ENTER\n");
@@ -1540,17 +1539,26 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class,
tf.command = ATA_BUSY;
ata_tf_to_fis(&tf, 0, 0, d2h_fis);
- rc = sata_link_hardreset(link, timing, deadline, &online,
+ rc = sata_link_hardreset(link, timing, deadline, online,
ahci_check_ready);
hpriv->start_engine(ap);
- if (online)
+ if (*online)
*class = ahci_dev_classify(ap);
DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);
return rc;
}
+EXPORT_SYMBOL_GPL(ahci_do_hardreset);
+
+static int ahci_hardreset(struct ata_link *link, unsigned int *class,
+ unsigned long deadline)
+{
+ bool online;
+
+ return ahci_do_hardreset(link, class, deadline, &online);
+}
static void ahci_postreset(struct ata_link *link, unsigned int *class)
{
--
2.9.3
next prev parent reply other threads:[~2017-01-19 13:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-19 13:29 [PATCH v4 00/14] ARM: da850-lcdk: add SATA support Bartosz Golaszewski
2017-01-19 13:29 ` [PATCH v4 01/14] devicetree: bindings: add bindings for ahci-da850 Bartosz Golaszewski
2017-01-20 10:49 ` Sekhar Nori
2017-01-19 13:29 ` [PATCH v4 02/14] ARM: davinci_all_defconfig: enable SATA modules Bartosz Golaszewski
2017-01-19 13:29 ` [PATCH v4 03/14] ARM: davinci: add a clock lookup entry for the SATA clock Bartosz Golaszewski
2017-01-19 13:29 ` [PATCH v4 04/14] sata: ahci-da850: get the sata clock using a connection id Bartosz Golaszewski
2017-01-19 13:29 ` [PATCH v4 05/14] ARM: davinci: da850: add con_id for the SATA clock Bartosz Golaszewski
2017-01-19 13:29 ` [PATCH v4 06/14] ARM: davinci: da850: model the SATA refclk Bartosz Golaszewski
2017-01-20 10:52 ` Sekhar Nori
2017-01-20 10:55 ` Bartosz Golaszewski
2017-01-19 13:29 ` [PATCH v4 07/14] sata: ahci-da850: add device tree match table Bartosz Golaszewski
2017-01-19 13:29 ` [PATCH v4 08/14] sata: ahci-da850: implement a workaround for the softreset quirk Bartosz Golaszewski
2017-01-19 13:29 ` Bartosz Golaszewski [this message]
2017-01-19 13:29 ` [PATCH v4 10/14] sata: ahci-da850: add a workaround for controller instability Bartosz Golaszewski
2017-01-19 13:29 ` [PATCH v4 11/14] sata: ahci-da850: un-hardcode the MPY bits Bartosz Golaszewski
2017-01-19 13:29 ` [PATCH v4 12/14] ARM: dts: da850: add the SATA node Bartosz Golaszewski
2017-01-19 17:45 ` Sergei Shtylyov
2017-01-19 13:29 ` [PATCH v4 13/14] ARM: dts: da850-lcdk: enable " Bartosz Golaszewski
2017-01-19 13:29 ` [PATCH v4 14/14] ARM: davinci: remove BUG_ON() from da850_register_sata() 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=1484832588-18413-10-git-send-email-bgolaszewski@baylibre.com \
--to=bgolaszewski@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).