Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3574755ybl; Mon, 3 Feb 2020 02:51:45 -0800 (PST) X-Google-Smtp-Source: APXvYqwVDGBKXmMMO8zBFwN34RKCpfXAL5UZ/0iZhtzkkt6R1TPc161qC7zFvH4EiY1FYLEC3Ti4 X-Received: by 2002:a9d:2902:: with SMTP id d2mr7648474otb.305.1580727105354; Mon, 03 Feb 2020 02:51:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580727105; cv=none; d=google.com; s=arc-20160816; b=hX0p04PMrRXrdt5LWDHfQxq5pFdkDt22V9BFe79DUwJN7IGdqdflXS/YnAMzjY/Jt1 p/9ojJXU00+GcSdPNpRgr6//yqySJZOVxzvBsR+amLumPDmBvmLov9sYZ2KFg1X/przl nvKRQ1iJxPel1+joAOTHAqck45vlxFhqKI8LiZ5ckqpyffotrq+St3O8xssHWxNrzBfp A7epI6tX1FGiLzTT7pFZ73V/T3nRAUuZk2nMB4s/zBBGVv9XokY8cz4o9VP/RVBQo2f1 G7/C8zCZqsC+EYoEs0Yt6fWkjg/b9er8gdSzsG+/CnZ+1/kU3WFqXYTM/7KhH0RKRHEt laYg== 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=ydAWfmJ6ct2lzfrmKDIX0eGSI1GYD4Kne11bNAqMhJk=; b=08zcallT9skec0vK51F9eCYHhmHSRuE5p7YDg1dqPrbXK32Kd6o1Dc606cJ+CxGf/Z nf7QmyTgkrte0Xp0BvEhs2eQ6isnbxbPKkDKz8a4LYYs3gw81BrvdXNkxeHSpgidz23k TiZDHCq8qNjyaFaUrzkvuokAlBndCy3fHdvJVp7Qpe2+A8TMfHg50zzviEbcxCBIQIMW CKvPcrk4OBoZMLY+kUG0hk69dFDsnF3AchH4MUDyoLOpFIfowNFMsrvlj2HLKQPvLXvV WygwcafClkn7IF50LtUJbHMi0DGvINJdB7SrDH37VDDYAuBWOZlAerhl2J/dejqGoXKG FlHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=BRejBsmW; 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 d2si9026301oth.267.2020.02.03.02.51.33; Mon, 03 Feb 2020 02:51:45 -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=BRejBsmW; 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 S1727995AbgBCJSk (ORCPT + 99 others); Mon, 3 Feb 2020 04:18:40 -0500 Received: from mail26.static.mailgun.info ([104.130.122.26]:13666 "EHLO mail26.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727968AbgBCJSi (ORCPT ); Mon, 3 Feb 2020 04:18:38 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1580721518; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=ydAWfmJ6ct2lzfrmKDIX0eGSI1GYD4Kne11bNAqMhJk=; b=BRejBsmWJI0yCh93Ap73HcS/DeAfLXU7JmSRPI0ZX18S2CgWAj3RUyDxN+4+zpk1dJj5nApI GAERouOct4b8Z0i6dUc73X5XnnFRhEPVVHQywo4Y06KueD95Tna4kV1/o4B4CxRIC56TdJRN 5NXVQAFBsDEtV9rH0s/vQgNW26w= X-Mailgun-Sending-Ip: 104.130.122.26 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 5e37e566.7f59330b7308-smtp-out-n03; Mon, 03 Feb 2020 09:18:30 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 001E1C447A2; Mon, 3 Feb 2020 09:18:28 +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 257D4C433CB; Mon, 3 Feb 2020 09:18:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 257D4C433CB 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 v5 6/8] scsi: ufs: Add dev ref clock gating wait time support Date: Mon, 3 Feb 2020 01:17:48 -0800 Message-Id: <1580721472-10784-7-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1580721472-10784-1-git-send-email-cang@codeaurora.org> References: <1580721472-10784-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 --- drivers/scsi/ufs/ufs.h | 3 +++ drivers/scsi/ufs/ufshcd.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h index cfe3803..304076e 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 spec_version; + u32 clk_gating_wait_us; }; /** diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index e8f7f9d..d5c547b 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,37 @@ 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.spec_version >= 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); + } + + /* + * bRefClkGatingWaitTime defines the minimum time for which the + * reference clock is required by device during transition from + * HS-MODE to LS-MODE or HIBERN8 state. Give it more time to be + * on the safe side. + */ + hba->dev_info.clk_gating_wait_us = gating_wait + 50; + } + + return err; +} + /** * ufshcd_memory_alloc - allocate memory for host memory space data structures * @hba: per adapter instance @@ -6626,6 +6660,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->spec_version = 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 +7041,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