From patchwork Wed Jan 18 13:19:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 91774 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1010378qgi; Wed, 18 Jan 2017 05:20:54 -0800 (PST) X-Received: by 10.99.176.14 with SMTP id h14mr3956072pgf.22.1484745654377; Wed, 18 Jan 2017 05:20:54 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q78si197117pfj.291.2017.01.18.05.20.54; Wed, 18 Jan 2017 05:20:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753002AbdARNUr (ORCPT + 25 others); Wed, 18 Jan 2017 08:20:47 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:36733 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752936AbdARNUk (ORCPT ); Wed, 18 Jan 2017 08:20:40 -0500 Received: by mail-wm0-f46.google.com with SMTP id c85so243936666wmi.1 for ; Wed, 18 Jan 2017 05:20:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M2Mt1IUY+9KqnX3iZFJkMS6FZ88o8pZIMUf0LimNJkU=; b=ZaK+w/ElqlygURtC9ZLYF7I7LpEw4jCbBdWMgs8ypCAJcwX1rK8mLk3ve3mRZrBgan V+9Ie1jr0scjFOZjqtrVPwaEbfc7BXW5OOXkpdUwDjUFrI4KgsSPZcZ42CncSyEoG08q 0pdrgwDhpmET1316lky/pCkp5ggUKcOhyqR992mZ6lkJOSUIm2ExqY2x+PbZrMyPdYxf ca6+ngGZMq746CKt1QFRxNRa2D09TsSq1qNvEItO1y2JZon8RE0ur7h8uKaijpSWF3nZ zsdVciGyLoCLQNRsJjqbWJ8JfWgq8sNLsqvwGJb0hW2GTgVCR+oNw/DJ0tXuJVlM9mu/ p4Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=M2Mt1IUY+9KqnX3iZFJkMS6FZ88o8pZIMUf0LimNJkU=; b=alL8nebjqU+68wvhaFRTr8CwHFQfRs3VRnBXFZHc7CXFYsi1noFpQ13P0f2ux2pXJk C91h7OIG6hJIL1KazTGXUFCyLRiXpCwDYHSV/FA4gMMjjz+CUB4wWbIVOskmlhQhx0u2 shjP4+0cC4REgIZYWPFui+vsB2Xeotf7GXWr7emT2j/zV89S/e1lJmtLI4pAbaq11V92 dQmCV1cbu6lYmUKqTyOFSw0AmVn5/tUwz5Nl29YrSKJ/Dum/mEFavYEBttiDOSqFM5H8 fkg1u0ADOgZn07KcFN2fDEVft+oQpucwPwrbcodoka+8B+HifMmkUavHX2YgfJNisF0X zIzA== X-Gm-Message-State: AIkVDXIZ0UDS1U6nA9KtfWA/thN/lCiqSo6KU1NszxFGe2yt/GDsh8M375/HF4XBceRs1GJN X-Received: by 10.223.130.118 with SMTP id 109mr3441159wrb.10.1484745629132; Wed, 18 Jan 2017 05:20:29 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id w79sm4899569wmw.0.2017.01.18.05.20.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jan 2017 05:20:28 -0800 (PST) From: Bartosz Golaszewski To: Kevin Hilman , Sekhar Nori , Patrick Titiano , Michael Turquette , Tejun Heo , Rob Herring , Mark Rutland , Russell King , David Lechner Cc: linux-ide@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski Subject: [PATCH v3 09/13] sata: ahci: export ahci_do_hardreset() locally Date: Wed, 18 Jan 2017 14:19:57 +0100 Message-Id: <1484745601-4769-10-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484745601-4769-1-git-send-email-bgolaszewski@baylibre.com> References: <1484745601-4769-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/ata/ahci.h | 3 +++ drivers/ata/libahci.c | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) -- 2.9.3 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) {