From patchwork Tue Jan 17 12:26:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9520639 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 755AC6020B for ; Tue, 17 Jan 2017 12:28:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52B4D2853B for ; Tue, 17 Jan 2017 12:28:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4782F2853D; Tue, 17 Jan 2017 12:28:24 +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=ham 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 C8EE72853B for ; Tue, 17 Jan 2017 12:28:23 +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 1cTSsA-0006fx-Q3; Tue, 17 Jan 2017 12:28:22 +0000 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTSr9-0004lo-3T for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2017 12:27:21 +0000 Received: by mail-wm0-x22c.google.com with SMTP id c206so220273071wme.0 for ; Tue, 17 Jan 2017 04:26:58 -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=1p8arA0SVMZDuSqLqDWUpElqZc8KdA/kfZqPkscxd/Y=; b=cTnWK0moj5YQFrH6vFBd6CD70eysr6EwE51CBKHNZczh5aKBGDj0sf16oBnd9W6L3N b5rsMy+zfcFuTwQHizW7k9weJMxiaoFuoMXrX2fokYHdP0/2zfYTjXL7C84fHOSHs9xk QNeTJkDjeByGUnnGceG4LE9pg84D+KQ1htmoiTQuYEVWBEL4fRwTFrw88XrXIrrzDQOI kMnp6Luj+5fpcE8izxRVsu4dK7EyW6ko1uFGAenzTM4HKX6t36GH0jMGC9hFzDKzogVv GzKDLLHsRC7Uht8/oVm7a1YwtcWBe8jepdVQlP4Wg090Ts3XPDmziArApj7xinymo795 XLmQ== 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=1p8arA0SVMZDuSqLqDWUpElqZc8KdA/kfZqPkscxd/Y=; b=XxORFp044/tkR7J1N33O0DxyOveqHuPEbyUnpz/jLafao6zZg4V9LGknI1t+n6Lk/R S5duGvH2O2pzw4ylhu5O82SlX/e31je8pt23ekKO03A/I2qJm7HgOH/12gVtSFhrFt6U QjSuhzu38Ax45vcpxovuysdwhETL/G9WyZHemdGQykhp5ZhnRIONEUWICNl8zuO8mVa3 pwr8uNoHL+6ee4kCmuYXbrlHu5yPNd0K73fKlL+/B/TSjPnNxCWHZa4d4CdUn8eINxZj zIYikAppHTYaki0B4DCud7+FcYm/5Kdmahn4tFuGWe6B4pWj4UFsgLAkyWN2YCwawvlg iLjw== X-Gm-Message-State: AIkVDXJlwt5nQBVYXEAozXGBJycofDtxuhvAyYVi6HZf95JRz4yoEAyi6JpYiuPMzO4vrDL+ X-Received: by 10.28.5.70 with SMTP id 67mr15675885wmf.32.1484656017295; Tue, 17 Jan 2017 04:26:57 -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.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 04:26:56 -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 08/14] sata: ahci-da850: implement a workaround for the softreset quirk Date: Tue, 17 Jan 2017 13:26:10 +0100 Message-Id: <1484655976-25382-9-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_042719_453148_9928EAC7 X-CRM114-Status: GOOD ( 17.11 ) 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 c071701..e0dc089 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 = {