From patchwork Tue Jun 4 07:20:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 10974311 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 98C6214E5 for ; Tue, 4 Jun 2019 07:20:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D92027528 for ; Tue, 4 Jun 2019 07:20:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70DC5286CB; Tue, 4 Jun 2019 07:20:31 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59C5F286CC for ; Tue, 4 Jun 2019 07:20:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726982AbfFDHUV (ORCPT ); Tue, 4 Jun 2019 03:20:21 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:40833 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726875AbfFDHUH (ORCPT ); Tue, 4 Jun 2019 03:20:07 -0400 Received: by mail-pf1-f193.google.com with SMTP id u17so12126354pfn.7 for ; Tue, 04 Jun 2019 00:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=D3XWMIqhXFSeKwJRGJ6IYznTDgg0AaloPMfGvuC80wY=; b=X8Atb4xA74DTxVSx/Ukx/fVa0wQKoezZtlxqvBf96Cf95zR2X1FfRXwJesGaQZdL81 Ki3C59Rptp13xpbiX/YwbAQriKHHYOP8RB57asRp25JOM9bmtIgLSecC3+xGNnzsRB/h Xr8W/s+GvDudZP7kUJBeUMf4LPBBKOwKQvyhcIF2pPwUc4M0COinI0f0F9NFxjWqY2y3 KsN2qiYtNfie3Dyb5EO7qO13QROoyWkuFLfEc7m74O01zBpWkQw0GTg2EdHfBiZeD+d9 cZDV5H3fJjtubbILssEhG3IOyBv9mAKLCWwsDVQupXFYhQ5+6TLcCZRQv7dhqVJGWL6z 8CAQ== 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=D3XWMIqhXFSeKwJRGJ6IYznTDgg0AaloPMfGvuC80wY=; b=rw1dLkCp18TbLw8RDwHTHvqraZJ7U39hIyKK2F/xJh70e1GtDt/6ZxDDuLrRpf4Hlu cVop9rJ+ulr0Sp2FMWi1rwhkunOWhYXUEm58lgz6tIkbqX5UdW2Uc7dx44MimZpK47ja 7ihATeDbDaf106g6ERqI/23Qb/Kpb/0UGh5so3fTn9DYIMFt8/Sa2+/OoTATiNIXbzKL 4haZ+sm6Zk2pRLR61n+A0kOugG3m6IV0CfI1Df0pJmEdz/Su7ycpxqKoivzA0/dC1ZMB HvsH2LCVPgXeZ7p/0/tY//3oufq6Q80FqjyY2vSG/1jTX0OLXWBcGF7Bmhoqdi4Rtxz/ iBmw== X-Gm-Message-State: APjAAAWHdihefX6204xsHrKLQl+WqwOfHyMYwze6Gi4xLjuGQmWX2TkN pCAyEsYgtYNSrhZO0e4BeKWb6g== X-Google-Smtp-Source: APXvYqwIp0yPQVLkTzYfOYL8foJhru05lDR4yF3ReVF/y76RzLLNdJInPRCaoMp0xsnrSEllMGMDiQ== X-Received: by 2002:a17:90a:9504:: with SMTP id t4mr35609032pjo.100.1559632806648; Tue, 04 Jun 2019 00:20:06 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id d6sm17747446pgv.4.2019.06.04.00.20.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 00:20:06 -0700 (PDT) From: Bjorn Andersson To: Pedro Sousa , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Andy Gross , Linus Walleij , Rob Herring , Mark Rutland , linux-arm-msm@vger.kernel.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH 2/3] scsi: ufs: Allow resetting the UFS device Date: Tue, 4 Jun 2019 00:20:00 -0700 Message-Id: <20190604072001.9288-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190604072001.9288-1-bjorn.andersson@linaro.org> References: <20190604072001.9288-1-bjorn.andersson@linaro.org> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Acquire the device-reset GPIO and toggle this to reset the UFS device during initialization and host reset. Signed-off-by: Bjorn Andersson --- drivers/scsi/ufs/ufshcd.c | 44 +++++++++++++++++++++++++++++++++++++++ drivers/scsi/ufs/ufshcd.h | 4 ++++ 2 files changed, 48 insertions(+) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 8c1c551f2b42..951a0efee536 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -42,6 +42,7 @@ #include #include #include +#include #include "ufshcd.h" #include "ufs_quirks.h" #include "unipro.h" @@ -6104,6 +6105,25 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) return err; } +/** + ufshcd_device_reset() - toggle the (optional) device reset line + * @hba: per-adapter instance + * + * Toggles the (optional) reset line to reset the attached device. + */ +static void ufshcd_device_reset(struct ufs_hba *hba) +{ + /* + * The USB device shall detect reset pulses of 1us, sleep for 10us to + * be on the safe side. + */ + gpiod_set_value_cansleep(hba->device_reset, 1); + usleep_range(10, 15); + + gpiod_set_value_cansleep(hba->device_reset, 0); + usleep_range(10, 15); +} + /** * ufshcd_host_reset_and_restore - reset and restore host controller * @hba: per-adapter instance @@ -6159,6 +6179,9 @@ static int ufshcd_reset_and_restore(struct ufs_hba *hba) int retries = MAX_HOST_RESET_RETRIES; do { + /* Reset the attached device */ + ufshcd_device_reset(hba); + err = ufshcd_host_reset_and_restore(hba); } while (err && --retries); @@ -7355,6 +7378,18 @@ static void ufshcd_variant_hba_exit(struct ufs_hba *hba) ufshcd_vops_exit(hba); } +static int ufshcd_init_device_reset(struct ufs_hba *hba) +{ + hba->device_reset = devm_gpiod_get_optional(hba->dev, "device-reset", + GPIOD_OUT_HIGH); + if (IS_ERR(hba->device_reset)) { + dev_err(hba->dev, "failed to acquire reset gpio: %ld\n", + PTR_ERR(hba->device_reset)); + } + + return PTR_ERR_OR_ZERO(hba->device_reset); +} + static int ufshcd_hba_init(struct ufs_hba *hba) { int err; @@ -7394,9 +7429,15 @@ static int ufshcd_hba_init(struct ufs_hba *hba) if (err) goto out_disable_vreg; + err = ufshcd_init_device_reset(hba); + if (err) + goto out_disable_variant; + hba->is_powered = true; goto out; +out_disable_variant: + ufshcd_vops_setup_regulators(hba, false); out_disable_vreg: ufshcd_setup_vreg(hba, false); out_disable_clks: @@ -8290,6 +8331,9 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) goto exit_gating; } + /* Reset the attached device */ + ufshcd_device_reset(hba); + /* Host controller enable */ err = ufshcd_hba_enable(hba); if (err) { diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index ecfa898b9ccc..d8be67742168 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -72,6 +72,8 @@ #define UFSHCD "ufshcd" #define UFSHCD_DRIVER_VERSION "0.2" +struct gpio_desc; + struct ufs_hba; enum dev_cmd_type { @@ -706,6 +708,8 @@ struct ufs_hba { struct device bsg_dev; struct request_queue *bsg_queue; + + struct gpio_desc *device_reset; }; /* Returns true if clocks can be gated. Otherwise false */