From patchwork Tue Jan 17 12:26:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9520651 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 DA62B6020B for ; Tue, 17 Jan 2017 12:29:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B55612853B for ; Tue, 17 Jan 2017 12:29:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8B892853D; Tue, 17 Jan 2017 12:29:20 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3C34A2853B for ; Tue, 17 Jan 2017 12:29:20 +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 1cTSt1-0007zr-BK; Tue, 17 Jan 2017 12:29:15 +0000 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTSrD-0004m7-57 for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2017 12:27:26 +0000 Received: by mail-wm0-x233.google.com with SMTP id c206so220275564wme.0 for ; Tue, 17 Jan 2017 04:27:02 -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=TTyDYu6UCQO3+jdcohC+6HgB8+wsgHHQR+iJ3dAGSwI=; b=ih0rg9vvM7SLO15YJKFDXHvOgmG+UCVPZwssFF69GANB5cy15EYNHBq5BlhiOKl0Sz Imc2xunsbnM0B5bsZUvKE3N+bu1YBCAQ10jfVgKKPBkrts0A20vHLtHcOxj8F0M5/00p rZTqk8h1gyKy/gcpm1GqHUlDuS2i2qSCzq0QTysqDGYvjIQRlKgzE03Og8tObT9qX9mW 2HGJ4KSTvrCxBewDxBK7qesAQCJ6vMcZnGqlesla3kqC+FMzeH6jKOPfkNm0tw+SL4RV BJFlDfqh3bppkhTolbHw/ls4pqNBuIMuV1uNOSkeJyGb0dgLIr+6mS5IclqJ2BxxK+p3 6mRA== 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=TTyDYu6UCQO3+jdcohC+6HgB8+wsgHHQR+iJ3dAGSwI=; b=HA9/ihpWWSO6Td3m3fNQlTtrDfRuZcf5rrrH36NIPOWpUGMCihezKUR8fbdE0sbshF 7HoH8Ba1v9Me2gOdUGIHFPm4L+jo9TWc9kDoIYHfG506SJpdLqD+scYpee7Ayq/OLFKz 7lnhA0rtCf1xlb5Nip7tx+mNqq5AtCjoLW6JaUY+fUBd5HnZBw4Y4fc327yJc2zyxvm6 ryO5HTVcSf0sAajcQPfa0raWP9A2c1aHrV5w0NzfBq1U+kbX62UEz4tbUwhRlknWrBUt RJZOQd6Jsm5HAtZbotG44ntfzneVbdGJJy1D6jYHlAiSPKG2iryCc95XPFu5PnbS0i7i DhDg== X-Gm-Message-State: AIkVDXLdvWuF4WOu85n5ST9LlVeROmpjlDY5yYGGLpT6gqqBHSm4iVNmfYYvx+E+xSFtVoWb X-Received: by 10.28.21.206 with SMTP id 197mr15253002wmv.128.1484656021529; Tue, 17 Jan 2017 04:27:01 -0800 (PST) Received: from bgdev-debian.lan (jua06-1-82-242-157-225.fbx.proxad.net. [82.242.157.225]) by smtp.gmail.com with ESMTPSA id o143sm5466112wmd.3.2017.01.17.04.26.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 04:27:00 -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 v2 10/14] sata: ahci-da850: add a workaround for controller instability Date: Tue, 17 Jan 2017 13:26:12 +0100 Message-Id: <1484655976-25382-11-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484655976-25382-1-git-send-email-bgolaszewski@baylibre.com> References: <1484655976-25382-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170117_042723_632912_CB4E2A81 X-CRM114-Status: GOOD ( 17.31 ) 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 We have a use case with the da850 SATA controller where at PLL0 frequency of 456MHz (needed to properly service the LCD controller) the chip becomes unstable and the hardreset operation is ignored the first time 50% of times. The sata core driver already retries to resume the link because some controllers ignore writes to the SControl register, but just retrying the resume operation doesn't work - we need to issue he phy/wake reset again to make it work. Reimplement ahci_hardreset() in the driver and poke the controller a couple times before really giving up. Signed-off-by: Bartosz Golaszewski --- drivers/ata/ahci_da850.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c index e0dc089..a7a7161 100644 --- a/drivers/ata/ahci_da850.c +++ b/drivers/ata/ahci_da850.c @@ -16,7 +16,8 @@ #include #include "ahci.h" -#define DRV_NAME "ahci_da850" +#define DRV_NAME "ahci_da850" +#define HARDRESET_RETRIES 5 /* SATA PHY Control Register offset from AHCI base */ #define SATA_P0PHYCR_REG 0x178 @@ -76,6 +77,29 @@ static int ahci_da850_softreset(struct ata_link *link, return ret; } +static int ahci_da850_hardreset(struct ata_link *link, + unsigned int *class, unsigned long deadline) +{ + int ret, retry = HARDRESET_RETRIES; + bool online; + + /* + * In order to correctly service the LCD controller of the da850 SoC, + * we increased the PLL0 frequency to 456MHz from the default 300MHz. + * + * This made the SATA controller unstable and the hardreset operation + * does not always succeed the first time. Before really giving up to + * bring up the link, retry the reset a couple times. + */ + do { + ret = ahci_do_hardreset(link, class, deadline, &online); + if (online) + return ret; + } while (retry--); + + return ret; +} + static struct ata_port_operations ahci_da850_port_ops = { .inherits = &ahci_platform_ops, .softreset = ahci_da850_softreset, @@ -83,6 +107,8 @@ static struct ata_port_operations ahci_da850_port_ops = { * No need to override .pmp_softreset - it's only used for actual * PMP-enabled ports. */ + .hardreset = ahci_da850_hardreset, + .pmp_hardreset = ahci_da850_hardreset, }; static const struct ata_port_info ahci_da850_port_info = {