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: 92057 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp730664qgi; Fri, 20 Jan 2017 03:22:42 -0800 (PST) X-Received: by 10.98.37.132 with SMTP id l126mr10072402pfl.45.1484911362539; Fri, 20 Jan 2017 03:22:42 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d74si6552000pfd.278.2017.01.20.03.22.42; Fri, 20 Jan 2017 03:22:42 -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 S1752141AbdATLWf (ORCPT + 25 others); Fri, 20 Jan 2017 06:22:35 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:35638 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093AbdATLW3 (ORCPT ); Fri, 20 Jan 2017 06:22:29 -0500 Received: by mail-wm0-f43.google.com with SMTP id r126so33003389wmr.0 for ; Fri, 20 Jan 2017 03:22:23 -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=rWFuA7+iivEkneDQ7Rez5hnLtbA8n/evMHruvVJ473dcXnlFZG1JdfnzgThkHcWYLF QXs+zEktQeyyHo9ZJKxjMKHHz49m9OzDOoFVBfIgxLlwYxaN14pX5WzhybRhWVevI8uj 0GEbI9DT72zoivijgfboKpqFc2fqBi3Kp4iLaCe7x3QJKaiQ2qDvBmIYnqO7Zigr6mH6 2jwwka9th+4QG525ND9WQK2dcxdtKXOQn5Q906r1Wn2uhAeMPQM6wjDV3rXJQIOM4vR3 xxgt5rbDIZbQGENzAo5FCg5zm03idk7C+HrSVrk5fgcrpRL2DP96f32v43L2bIHlSTlL NGiA== X-Gm-Message-State: AIkVDXIun54DiniOes+JayB1QBm1pWJnG8633wtL4HG1on85pPfDX0l9pqWQUFOx7ASBuBkg 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 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 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.3 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 = {