Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1211712ybv; Fri, 7 Feb 2020 16:53:04 -0800 (PST) X-Google-Smtp-Source: APXvYqzTBUbg2Lgjus4RgeH7LdIRr7S2m3FK73IWv9f55IZeIw9xML0wpXjC3JY3OW27cyOcWRy6 X-Received: by 2002:a05:6830:18f5:: with SMTP id d21mr1579876otf.225.1581123184243; Fri, 07 Feb 2020 16:53:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581123184; cv=none; d=google.com; s=arc-20160816; b=brKmZFXljKDI5pEL2HO+zVDE5RIbo/bIMiyau/ppDtMIQJ2/J/Y8S2GUjFXZgZdx6u d3BzoVIteWaudJsxWoV9QUIldlYgMzKCpVYmw+t1wbQuBqcmwzAbh0AcbVkFQRyYGfXR SZeXsYSYXZSH762v8+N1z9+am5G5N+0IE+dOkaJp4GwUuRlIXhZS1a+MQYgf+d05DRwu WgxIUw3NDXFDzDgHzZ3wwv79gBYcws7Gng+Y+eRjYjfzmeopGVlYgbecDR+HlsH5APS8 xPkTKEoWfejkHh0yskjITEyOVHjjbsLeibMsNpNXGwqNLzp8zVKB8UE+3bsSUQTk1pr4 X7AQ== 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=GfnWP3Nd68Zxa4H5JQd3vdiMnBMgjmeULVcZSSMrA6s=; b=W28uWveCFrcJLGXmCHGU4SXzC/9pw2JJd+bi5lC4a527JmP9j5vEe9eVwIJSfAHGg2 QN6a7pwtEurhEA8/4mZXDwh/PkQEhy0MXfAjCnmhgsd7oEzOB7N3TX0XV/kzJ4lJAlIf 6o9073cEz8jfrLcMVD+vSObbHcfMwYILm2t+BuujCk5TAx25quzcwxGkUpgGKr3kz1Dr 5Fcp7tOy8WODD9J43ASFad+wqVaZEBTTa+gh1vVBvQEbLDfRHEnGQj9xYk/WfRVFmahU 9NGPS7JvEztlpSo1YBG8p9fbBAJCD0AZvEZ0YkfP82C9vQIYMq2SZRnSBxowtLqrDPsn 7JHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mg.codeaurora.org header.s=smtp header.b=WoxxNmbK; 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 u16si104948oic.66.2020.02.07.16.52.52; Fri, 07 Feb 2020 16:53:04 -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=WoxxNmbK; 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 S1727589AbgBHAvR (ORCPT + 99 others); Fri, 7 Feb 2020 19:51:17 -0500 Received: from mail25.static.mailgun.info ([104.130.122.25]:49099 "EHLO mail25.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727118AbgBHAvO (ORCPT ); Fri, 7 Feb 2020 19:51:14 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1581123073; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=GfnWP3Nd68Zxa4H5JQd3vdiMnBMgjmeULVcZSSMrA6s=; b=WoxxNmbK6Zi0mNA9Ah0hqbWY7CHT9ffXIE67g8ZFKI3M8/km2oaQ4D1SErPg+CuCXJyQei8+ jiDzRLrWlOzU6fJqGaEswd+AJynwc5OqfwW4ynSWbeR3xO5pJJo+haFJCs1GHobY8n0gsP3Y TyWchYR6L50vFuJ7c4rnkOTbLp8= 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 5e3e05fe.7f3192385880-smtp-out-n02; Sat, 08 Feb 2020 00:51:10 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 38EF8C447AB; Sat, 8 Feb 2020 00:51:09 +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 713CDC433CB; Sat, 8 Feb 2020 00:51:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 713CDC433CB 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 , Stanley Chu , Tomas Winkler , 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 6/7] scsi: ufs: Add dev ref clock gating wait time support Date: Fri, 7 Feb 2020 16:50:28 -0800 Message-Id: <1581123030-12023-7-git-send-email-cang@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1581123030-12023-1-git-send-email-cang@codeaurora.org> References: <1581123030-12023-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 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