From patchwork Thu Jan 19 13:29:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9525719 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8CB8C6020B for ; Thu, 19 Jan 2017 13:32:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D8CC26E64 for ; Thu, 19 Jan 2017 13:32:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70AC428210; Thu, 19 Jan 2017 13:32:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, RDNS_NONE,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (unknown [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 360C826E64 for ; Thu, 19 Jan 2017 13:32:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cUCpJ-0002SY-R6; Thu, 19 Jan 2017 13:32:29 +0000 Received: from mail-wm0-f41.google.com ([74.125.82.41]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cUCoD-0000hA-Tx for linux-arm-kernel@lists.infradead.org; Thu, 19 Jan 2017 13:31:24 +0000 Received: by mail-wm0-f41.google.com with SMTP id r126so289570965wmr.0 for ; Thu, 19 Jan 2017 05:31:04 -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=hFmDM2GBJ/vTixiXlDl8X9Ccc8JDAS1MatMHD9xw8Bw=; b=07XiMz2OXZr8toDE6d3LQYNdtaO7XNlwL+RMemJajFSV6pdDaKpjSkshnveQP80PmS eyOOs/D8pAaxHT7pK+BICOj2+Eq465tFT9QxavuCNQ+oC+jYSITUcyy4SSs//NOZDCn/ YwcTuX3C4aax8NfslFnxZI/bwuOJRbL//VuSf0G+TcmBMSPI2hR9jZF9kqlWIMLUBT5l UZQTcW/UgJSgk5RqVopG/H6+v0isq6Yalgl9PWa0weT364A50RRN+DiubmT9gsEgSiS8 3SzdbZJdanwGu+sigScMrxTORb+kXQ3RA0X0XKt0hkAu9kpJuzNOKiqt0g9kvThXhgjf R/Uw== 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=hFmDM2GBJ/vTixiXlDl8X9Ccc8JDAS1MatMHD9xw8Bw=; b=tObmCNbfrlqoh6aQc1h7vjd7cwq4fBVopECG0kcl5gjZB+JyTrwGY+cgKGc/CLY/Xr FZoC5JMnZO6v83u5WoHQYkssNEUje1JCkcd1KyFPokroHY8sNTGzFTrnzANz8tcmJcon BlnN9i/kgnz4YOTxnGCFjsC9Nk7TJ8kLt7IQMmxf1a6zPxCo0CityDGOTwP6DUDKuPmO dT3EglBb+uIKm/tatC5Ystuqy0ZQB4oVw2PBkL4liGECARExRu5J3ksIYJbNImc2JvYc hrMoNqGa9bWlSPBJWq1pKNjsRuWzVI1iKytwUlm1ZmkMpf7MGleoCc27Iw350bWugVcO MPAQ== X-Gm-Message-State: AIkVDXIuh9F4JStgSaJV/1khaaA4LQWW9I5BUJId9/f7DwYsmhaDODYUWgoUJVksGjiwCfsI X-Received: by 10.223.146.34 with SMTP id 31mr7397732wrj.201.1484832603555; Thu, 19 Jan 2017 05:30:03 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id c202sm53251996wmd.10.2017.01.19.05.30.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jan 2017 05:30:03 -0800 (PST) From: Bartosz Golaszewski To: Kevin Hilman , Sekhar Nori , Patrick Titiano , Michael Turquette , Tejun Heo , Rob Herring , Mark Rutland , Russell King , David Lechner Subject: [PATCH v4 08/14] sata: ahci-da850: implement a workaround for the softreset quirk Date: Thu, 19 Jan 2017 14:29:42 +0100 Message-Id: <1484832588-18413-9-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484832588-18413-1-git-send-email-bgolaszewski@baylibre.com> References: <1484832588-18413-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170119_053122_215217_D7C59082 X-CRM114-Status: GOOD ( 17.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-ide@vger.kernel.org, Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 = {