Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1180157ybv; Wed, 5 Feb 2020 22:59:21 -0800 (PST) X-Google-Smtp-Source: APXvYqyzANQnqC/vFwJjILrTy47qgDkfhez3JzVFyOGv5t+DaZcWPBUszvxepm8of51b0oilZyvn X-Received: by 2002:a05:6808:4c7:: with SMTP id a7mr5965915oie.83.1580972361495; Wed, 05 Feb 2020 22:59:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580972361; cv=none; d=google.com; s=arc-20160816; b=aaKB/G1hUPPsw8ag8rHPfOnKBjJLbsZAF6QHZH/qjqFrQGV7Ozz5huJh/8dZaVvBly CGQ5j6qVqo9NES/65kN5JUYAsJVFestLsn6lFF+wl3BscpWj2VHljrcTcdnDta0n+QVm lXXWlMCovzxE8I7dFdxo0S07oDHJVN33WZZOexGvOMkkSM9b/1NtU6n1/XWkkpGiTaZl eb4Yjcys1ZY2RcAglwTzwhBBOedvWXXQHSiJSuEJ355vT9UCFdS0w0T/0JqXEAnfT7G8 GfdScci8bv4XpVApwpq1ufuq8LyHVXPjHy4T4S4jSl45GRk3ltyfXIgWTDEwoflVcwDk Foew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:dkim-signature; bh=bxRwFUXngDBjgxNPPv8dbzG1tkt2CPGPkhy9O9fhPKU=; b=I3yu2Yg4hDSm+j5htglkitTgPWekXRYQWu/IYZaqgoy6v00ZdDfphwwgHZBtG23L3d oQ7p2rR+Xs1It8tzr6jJcGheEjawtwxL9VIVu0hdnUIvDZ0WtZktwDwtbMI3qOJ6IVAi 4fJzQUUyZvTlRaNdOdWKjKD7ySo8VMRXgXB+MyO0BMYKa4JFs/dx72q5NbdxzEgrS9w8 L73fLN5xl008zrLmaJ+DjLOPevl8+dR4eBk+duqc+ASVHLO+WW5xPRHIbKBz7JLAsm8t eMzHqUu0mTHRrFgWAAtpAXS2gxTmYGxNUvxbUhNKvSyDONhX6GgdZf8trypgMyiHV0Yh yskA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=g9V9jh32; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k1si1294357oic.245.2020.02.05.22.59.09; Wed, 05 Feb 2020 22:59:21 -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=fail header.i=@mg.codeaurora.org header.s=smtp header.b=g9V9jh32; 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 S1728043AbgBFG5c (ORCPT + 99 others); Thu, 6 Feb 2020 01:57:32 -0500 Received: from mail25.static.mailgun.info ([104.130.122.25]:30176 "EHLO mail25.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728015AbgBFG53 (ORCPT ); Thu, 6 Feb 2020 01:57:29 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1580972248; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=bxRwFUXngDBjgxNPPv8dbzG1tkt2CPGPkhy9O9fhPKU=; b=g9V9jh32bSKSbhPS1eJisY3We2+f/aTZmt00qxwsx9aQdU7KLGinqBCQUGNRojAZ68965sN/ 9Gd3ZmL7mWfDVpyOzNIt7FUMRtSI9RprhMg8zV2PiPBw4Rx4pweRcIlrQgXxM3BrOf7wzLuE DBGWLsL4B1KsJUfWyOLClxRfKNQ= X-Mailgun-Sending-Ip: 104.130.122.25 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5e3bb8d7.7f4c174d0f80-smtp-out-n02; Thu, 06 Feb 2020 06:57:27 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 5591DC447A5; Thu, 6 Feb 2020 06:57:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.0 Received: from pacamara-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: cang) by smtp.codeaurora.org (Postfix) with ESMTPSA id 356E3C43383; Thu, 6 Feb 2020 06:57:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 356E3C43383 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=cang@codeaurora.org From: Can Guo To: asutoshd@codeaurora.org, nguyenb@codeaurora.org, hongwus@codeaurora.org, rnayak@codeaurora.org, linux-scsi@vger.kernel.org, kernel-team@android.com, saravanak@google.com, salyzyn@google.com, cang@codeaurora.org Cc: Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" , Bean Huo , Stanley Chu , Colin Ian King , Tomas Winkler , Bart Van Assche , Venkat Gopalakrishnan , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 6/8] scsi: ufs: Add dev ref clock gating wait time support Date: Wed, 5 Feb 2020 22:56:49 -0800 Message-Id: <1580972212-29881-7-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1580972212-29881-1-git-send-email-cang@codeaurora.org> References: <1580972212-29881-1-git-send-email-cang@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In UFS version 3.0, a newly added attribute bRefClkGatingWaitTime defines the minimum time for which the reference clock is required by device during transition to LS-MODE or HIBERN8 state. Make this change to reflect the new requirement by adding delays before turning off the clock. Signed-off-by: Can Guo Reviewed-by: Asutosh Das Reviewed-by: Bean Huo diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h index cfe3803..990cb48 100644 --- a/drivers/scsi/ufs/ufs.h +++ b/drivers/scsi/ufs/ufs.h @@ -167,6 +167,7 @@ enum attr_idn { QUERY_ATTR_IDN_FFU_STATUS = 0x14, QUERY_ATTR_IDN_PSA_STATE = 0x15, QUERY_ATTR_IDN_PSA_DATA_SIZE = 0x16, + QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME = 0x17, }; /* Descriptor idn for Query requests */ @@ -534,6 +535,8 @@ struct ufs_dev_info { u16 wmanufacturerid; /*UFS device Product Name */ u8 *model; + u16 wspecversion; + u32 clk_gating_wait_us; }; /** diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index e8f7f9d..76beaf9 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -91,6 +91,9 @@ /* default delay of autosuspend: 2000 ms */ #define RPM_AUTOSUSPEND_DELAY_MS 2000 +/* Default value of wait time before gating device ref clock */ +#define UFSHCD_REF_CLK_GATING_WAIT_US 0xFF /* microsecs */ + #define ufshcd_toggle_vreg(_dev, _vreg, _on) \ ({ \ int _ret; \ @@ -3281,6 +3284,29 @@ static inline int ufshcd_read_unit_desc_param(struct ufs_hba *hba, param_offset, param_read_buf, param_size); } +static int ufshcd_get_ref_clk_gating_wait(struct ufs_hba *hba) +{ + int err = 0; + u32 gating_wait = UFSHCD_REF_CLK_GATING_WAIT_US; + + if (hba->dev_info.wspecversion >= 0x300) { + err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_READ_ATTR, + QUERY_ATTR_IDN_REF_CLK_GATING_WAIT_TIME, 0, 0, + &gating_wait); + if (err) + dev_err(hba->dev, "Failed reading bRefClkGatingWait. err = %d, use default %uus\n", + err, gating_wait); + + if (gating_wait == 0) { + gating_wait = UFSHCD_REF_CLK_GATING_WAIT_US; + dev_err(hba->dev, "Undefined ref clk gating wait time, use default %uus\n", + gating_wait); + } + } + + return err; +} + /** * ufshcd_memory_alloc - allocate memory for host memory space data structures * @hba: per adapter instance @@ -6626,6 +6652,10 @@ static int ufs_get_device_desc(struct ufs_hba *hba) dev_info->wmanufacturerid = desc_buf[DEVICE_DESC_PARAM_MANF_ID] << 8 | desc_buf[DEVICE_DESC_PARAM_MANF_ID + 1]; + /* getting Specification Version in big endian format */ + dev_info->wspecversion = desc_buf[DEVICE_DESC_PARAM_SPEC_VER] << 8 | + desc_buf[DEVICE_DESC_PARAM_SPEC_VER + 1]; + model_index = desc_buf[DEVICE_DESC_PARAM_PRDCT_NAME]; err = ufshcd_read_string_desc(hba, model_index, &dev_info->model, SD_ASCII_STD); @@ -7003,6 +7033,8 @@ static int ufshcd_device_params_init(struct ufs_hba *hba) goto out; } + ufshcd_get_ref_clk_gating_wait(hba); + ufs_fixup_device_setup(hba); if (!ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_READ_FLAG, -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project