Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp4397169ybv; Mon, 10 Feb 2020 18:40:40 -0800 (PST) X-Google-Smtp-Source: APXvYqzKWQYhKNEFd38SB8SZUzbySrAsKwlxfCMGmFxlUTH9YJZ9lFUsIzpUkqY9iH2AqO2kjkOp X-Received: by 2002:a9d:a68:: with SMTP id 95mr3376554otg.87.1581388840178; Mon, 10 Feb 2020 18:40:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581388840; cv=none; d=google.com; s=arc-20160816; b=OHf6HViymzEOPORc7xjjaKAHlpip8wvy5skEqGsijZY896bCC+MLKe92Qgi4QAjLPD rG2GOz1832xwwlWO6T15ARqFd/sqVgm53A1SaX6xpYZi3uYFQ8hclZp+culeR7j3ogZg 5SufjPCnqTLdEhqOMtvBKq7uw41bpJsOpiB/BKWjYzX1TV6Ms9i8T51c86qbXsAyS1nB MdTuWH0XwHucLxPaqhwllDtVeqtGc7RqxZu0gYZTCXjz9y3GBWTUAeVJV79CnybB9H8f DSbvqOGUX3IksVQfcxMqr7jgjZletfOFBj4At8qWa0j3fYa0/txWWCOhFxHoz7tBzg7b QAKg== 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=tbDNMomGjJ7cvmYyF8PQisUL3aRlv7HcybX79OJNwX8=; b=ZhABlQvqdGOvMnIIcHDD7FzU4ETleSuxNfu330ZzQ95Dhr90l87lYe4FQx/rjSaVff bPU3YmrjB+FWUZZPRksBvdn0B2oYiTHcgGwC3CryAMR7aWOuUye1/gcBfAxCQEv6u62o TMwOELpnDvaTuUPjY7YRfGcibUZCggN6sBxMeTgD4DU9ESqzMYp60ndOuqfWu178wGKi 3A4ssJ9ydcIE0mg9pFrCpVeFcxTovCVuGYGT0Eqe/5EmHthYil2lKC/xUSTcp3He5S5x GBscAvWFghX8MMZus+arJvVH85uGRpqPnGDVZ3z0fpxHa2hEnMFl2/4HkHyVXPocSTpJ WQ2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b="mXK1/scy"; 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 y8si1024186oih.141.2020.02.10.18.40.28; Mon, 10 Feb 2020 18:40:40 -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="mXK1/scy"; 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 S1727976AbgBKCig (ORCPT + 99 others); Mon, 10 Feb 2020 21:38:36 -0500 Received: from mail25.static.mailgun.info ([104.130.122.25]:64993 "EHLO mail25.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727962AbgBKCie (ORCPT ); Mon, 10 Feb 2020 21:38:34 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1581388714; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=tbDNMomGjJ7cvmYyF8PQisUL3aRlv7HcybX79OJNwX8=; b=mXK1/scyIumvxE6oKEvVkj5zfe3IaphxW7AEkdyzD5pvnWhqt56MtIrHeWOwtaAb93MT/CbG CHDq40b2MzMSHuuP0ve9qPO8bptRUb6Xf9hBm8TpY2hi/glNkeBdaWa9HxNjlybTX7Lvi/Eu rrUEF26aE/Rax0+Xr+mhcykAACc= 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 5e4213a9.7fa68a7e5570-smtp-out-n03; Tue, 11 Feb 2020 02:38:33 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 7069AC447B3; Tue, 11 Feb 2020 02:38:30 +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, URIBL_BLOCKED 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 4533DC447A3; Tue, 11 Feb 2020 02:38:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4533DC447A3 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" , Matthias Brugger , Bean Huo , Colin Ian King , Tomas Winkler , Stanley Chu , Bart Van Assche , Venkat Gopalakrishnan , linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek SoC support) Subject: [PATCH v9 6/7] scsi: ufs: Add dev ref clock gating wait time support Date: Mon, 10 Feb 2020 18:37:48 -0800 Message-Id: <1581388671-18078-7-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1581388671-18078-1-git-send-email-cang@codeaurora.org> References: <1581388671-18078-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 Reviewed-by: Stanley Chu --- drivers/scsi/ufs/ufs.h | 3 +++ drivers/scsi/ufs/ufshcd.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) 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..adcce41 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,31 @@ 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); + } + + hba->dev_info.clk_gating_wait_us = gating_wait; + } + + return err; +} + /** * ufshcd_memory_alloc - allocate memory for host memory space data structures * @hba: per adapter instance @@ -6626,6 +6654,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 +7035,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