From patchwork Fri Jan 20 11:21:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9528033 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 4F7796020B for ; Fri, 20 Jan 2017 11:25:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40DB4201F5 for ; Fri, 20 Jan 2017 11:25:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 34F63285F5; Fri, 20 Jan 2017 11:25:23 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [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 EDB98201F5 for ; Fri, 20 Jan 2017 11:25:22 +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 1cUXJp-0001kx-Mq; Fri, 20 Jan 2017 11:25:21 +0000 Received: from mail-wm0-f46.google.com ([74.125.82.46]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cUXIB-000673-MW for linux-arm-kernel@lists.infradead.org; Fri, 20 Jan 2017 11:23:42 +0000 Received: by mail-wm0-f46.google.com with SMTP id r144so38517954wme.1 for ; Fri, 20 Jan 2017 03:23:19 -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=AFQX1rhblBfnvu3A1TWJdY4VhRJOu0bJcNLRU57ZCURW/zSP1z2pWPoVcYCg+eSONT c/EYuMpmoedRJKsTGtfnI2pQ/HcUDa4YkhV8WHlQ8fwZ5mQ4YhMRi+CY+Y3q104Q60+/ hH8mSvW0I01jdCpTWilGSVLmikBb401Wuwl/OqQ3b7+7lyn6vJDsqXccmB88hNbV/WkQ 2RSorWmNDW2ptrXLXjrTiY8lksE+A97h4wiMvxrOV5HJjP6rPAwsAN2ENviIqLrBLi87 akQZU9GnGFBiAQo84mcjeYcWGaEExi4rN9ajXjIcNO0ZOinLfJHE94NpghnYyruT+eGW 1OOA== 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=Uv70lc0iKZV94bu/e0a8P75KsLw6vCnDYZ06HCV714oNEGB2YPKyIpnbDBDeLfrQiT OsinEP1zvqENPGh/zaU2O/DHWrEwPpci2VjnZLoTzwvG5i1ZjKDw3fdU4MwS1lME0mM4 96DJt7IRNmmpQKFw7eLZZohrfaicX3X1rtYNTeB1+eAcCGmVQrr/nsGTWokiXrxKs0OJ Mw+0JTSRvFdpp2VS07TBskyRNN3PsaT6oJKaiXNo2xirQ0EeOo3dfTGolrdCVHH4ECmb 4ylzTNtfRneZCIW3EXV6aOIa/AKRA3OixOiruprTiJINyLAg3GIc37bi27wPDIuvH9z1 YcyQ== X-Gm-Message-State: AIkVDXKVAxWZ3DyXHGp+UWjhCi5BbwmKNev78ykLwMekfGDeurFZKYZhwPtY7XXyeJ3F6I+N X-Received: by 10.28.166.216 with SMTP id p207mr2779112wme.27.1484911337962; Fri, 20 Jan 2017 03:22:17 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id l74sm5482402wmg.2.2017.01.20.03.22.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Jan 2017 03:22:17 -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 v5 08/14] sata: ahci-da850: implement a workaround for the softreset quirk Date: Fri, 20 Jan 2017 12:21:59 +0100 Message-Id: <1484911325-23425-9-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484911325-23425-1-git-send-email-bgolaszewski@baylibre.com> References: <1484911325-23425-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170120_032340_105554_F5348BB8 X-CRM114-Status: GOOD ( 16.48 ) 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 = {