From patchwork Mon Jan 30 10:02:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9544633 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 3D8E460417 for ; Mon, 30 Jan 2017 10:06:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2742126E81 for ; Mon, 30 Jan 2017 10:06:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B36627E15; Mon, 30 Jan 2017 10:06:59 +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 D534B26E81 for ; Mon, 30 Jan 2017 10:06:58 +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 1cY8rR-000625-Fw; Mon, 30 Jan 2017 10:06:57 +0000 Received: from mail-wm0-f49.google.com ([74.125.82.49]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cY8oL-0001tS-FI for linux-arm-kernel@lists.infradead.org; Mon, 30 Jan 2017 10:03:47 +0000 Received: by mail-wm0-f49.google.com with SMTP id v77so39993689wmv.0 for ; Mon, 30 Jan 2017 02:03:25 -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=I95IOP7tcXFVHnlw7gTmFwx+7Cy0Oe2Di4eUdxW5Jjo=; b=fBv5jzTT71fDD8ShvJVOdKMmTi0zqoZZoj8bt0aj65QFyANH0+kTNqQvTJjLGSatpF UJW9TnlXLBXO1xJHtHKAMzytnlvq8a2GlKIAHgnIDD6Xw/yTRXHExiXWnslTZQUny2+O i1kp1XhkHeeK5jvGD7Zhzei2hyhd4cFmxoKrXFxlOloM4NGsOrtBb2iIW4Fy82Y0v9k9 khLbYRfR94FN7+ew/UyTSGOfIIo7JUbz/lqnomp67l4rCIe3K9fhVt850RjIiZ/TGsa1 wY7d5NvaodOatLf0pAUt2uLcq2L+thnSbcohTFswfhEfXAk4VlLk1kC57H9wNt17oeRS jnnw== 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=I95IOP7tcXFVHnlw7gTmFwx+7Cy0Oe2Di4eUdxW5Jjo=; b=EnayfLo7o5JGB4DztX6QVRrpnhaYz185YzDE1WETy4SiXuleRMyFOBmRkOYhCqatCn cGuE7q+f8cju1yUZ399UXj6m5ToLxK4pceSJXQnYgEptTICG94J8EOOTp6UX7KTod11J Q3ihmoC53e9s0GIS3PViOrFhH3clrnxIlgR25ZCEgFGsGyVN5EiQeBZaOURm1RkjtjWY CsdPRv8IptVhQOGQBdcrn9kveam6OuVthcSpiciTa8opvv1Qc6LSgRkhdfKQfwoncWa1 Znd5bV6Hvlnlb+6Dj7qxWeOA9/xgF83dboJc/G0d+OdLCJJ0h1Yf5doGF8Kzd4b301EF swpw== X-Gm-Message-State: AIkVDXJKLFeWlAuYdnmlu0y9pT0dfnfc5YMsbYKqgMdLYCe/IAxwtL9IGQQYpHeKCWR8VZTT X-Received: by 10.28.185.77 with SMTP id j74mr13934425wmf.76.1485770543735; Mon, 30 Jan 2017 02:02:23 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id j18sm21939536wrb.33.2017.01.30.02.02.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Jan 2017 02:02:23 -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 v7 08/14] sata: ahci-da850: implement a workaround for the softreset quirk Date: Mon, 30 Jan 2017 11:02:05 +0100 Message-Id: <1485770531-6772-9-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1485770531-6772-1-git-send-email-bgolaszewski@baylibre.com> References: <1485770531-6772-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170130_020345_709947_451854A3 X-CRM114-Status: GOOD ( 16.97 ) 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 Acked-by: Tejun Heo --- 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 72126a0..84c7805 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 = {