Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp436557imm; Fri, 1 Jun 2018 03:44:59 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI26RHg6T22urc2crUFeNvIhjOpFXYqHKUsESKdfHQvfd4JEDChH3HnC0igsQBkiqA80PVZ X-Received: by 2002:a17:902:780a:: with SMTP id p10-v6mr10681333pll.281.1527849899935; Fri, 01 Jun 2018 03:44:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527849899; cv=none; d=google.com; s=arc-20160816; b=QZdqpjaD+YwDrvV2KnO7ILptnCKHA4TeEzNoK3otCG4K6HErDNss+jiTbNFKluA73E yiBJIbdhp8d87mRertiextidxEOkyPh9kRokVpap3onOjDzsDBEFU6kuvgVDQWRwaiU/ xD9zsTUhShw7JlOb5+HNQESPwilm+fctc2WAWZA2c0Iy22X1muPVbPQuPKzBJyn1jPr0 +8JgtJm8E+N2DeiL6hhKGd95QsxC6dS2Be10sDfJgcGo8BJtkIJ4EvkPUXmu23TOuvSd 48M6wRDr5ok3uAb8mrC4dvVTiw7MMZME7wPFJsEaYj/NXaiCP/sp+5peNvh4ZqcrMVu+ 1UTA== 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:dkim-signature :arc-authentication-results; bh=cWYaqWOr/WT9LNhJYVuNFJOpCGWdAPQCyH5wmi+uMEg=; b=HjEUQBKoTxsnVtYriDi4m77QVDfkQWqPWnOonbgf/2hXJjUdHGcHsbRc8HjeLMHdIi 0asHpVuZ0REm7x21JpYWdKpi/Kfv6cBo6ce1yQOGKZn1+4QjJkSy45IUCdTEmt4SCkLJ Q+BywoPRZPXEjOZc/Dj5kJSLgrnREfBjza9nzmeWUZ/8qfHyDPxA2NBWcaxrnMOgEIqk c11aTku4ZHuwKHSQ7TBAQpo0qONwV1dgU4CWavX0WRkKjfaw+kKpIUR5HEe7eiIllpdS WqDAP4gfqIsNFSSBoNqg5EUPVxuXRJPME5zWkIt56E4qSsP0Ahjv3YG6k7i5rDd+DBgi KwWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=UkpiUQB0; dkim=pass header.i=@codeaurora.org header.s=default header.b=UkpiUQB0; 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 v137-v6si5409478pgb.682.2018.06.01.03.44.45; Fri, 01 Jun 2018 03:44:59 -0700 (PDT) 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=pass header.i=@codeaurora.org header.s=default header.b=UkpiUQB0; dkim=pass header.i=@codeaurora.org header.s=default header.b=UkpiUQB0; 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 S1751554AbeFAKoA (ORCPT + 99 others); Fri, 1 Jun 2018 06:44:00 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:49932 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750827AbeFAKn5 (ORCPT ); Fri, 1 Jun 2018 06:43:57 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id DE99360261; Fri, 1 Jun 2018 10:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1527849836; bh=pH5M3KHVED/SEZdMcgaEPkLqywhPACnoDAigGraplCI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UkpiUQB0Eto68Zi5S6MM+6+owb8xjpoRh3eBtsYuLqj2cRYcwtDdEsPVhM2SS8UT7 2WXirtTPJAHHLKkBpYK5UBHBNF7zRqf7g2JPitvTnK59DBXru1My+w7HugkmVZBjcP 1jmEuA23oMEkFXUAli5P70CDh2rjypiGbU3I9gO4= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from sayalil-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sayalil@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id EFE5460251; Fri, 1 Jun 2018 10:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1527849836; bh=pH5M3KHVED/SEZdMcgaEPkLqywhPACnoDAigGraplCI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UkpiUQB0Eto68Zi5S6MM+6+owb8xjpoRh3eBtsYuLqj2cRYcwtDdEsPVhM2SS8UT7 2WXirtTPJAHHLKkBpYK5UBHBNF7zRqf7g2JPitvTnK59DBXru1My+w7HugkmVZBjcP 1jmEuA23oMEkFXUAli5P70CDh2rjypiGbU3I9gO4= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org EFE5460251 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sayalil@codeaurora.org From: Sayali Lokhande To: subhashj@codeaurora.org, cang@codeaurora.org, vivek.gautam@codeaurora.org, rnayak@codeaurora.org, vinholikatti@gmail.com, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, asutoshd@codeaurora.org, evgreen@chromium.org Cc: linux-scsi@vger.kernel.org, Sayali Lokhande , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V1 1/3] scsi: ufs: set the device reference clock setting Date: Fri, 1 Jun 2018 16:12:52 +0530 Message-Id: <1527849774-7623-2-git-send-email-sayalil@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1527849774-7623-1-git-send-email-sayalil@codeaurora.org> References: <1527849774-7623-1-git-send-email-sayalil@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Subhash Jadavani UFS host supplies the reference clock to UFS device and UFS device specification allows host to provide one of the 4 frequencies (19.2 MHz, 26 MHz, 38.4 MHz, 52 MHz) for reference clock. Host should set the device reference clock frequency setting in the device based on what frequency it is supplying to UFS device. Signed-off-by: Subhash Jadavani [cang@codeaurora.org: Resolved trivial merge conflicts] Signed-off-by: Can Guo Signed-off-by: Sayali Lokhande --- drivers/scsi/ufs/ufs.h | 9 +++++++ drivers/scsi/ufs/ufshcd.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/scsi/ufs/ufshcd.h | 1 + 3 files changed, 72 insertions(+) diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h index 14e5bf7..e15deb0 100644 --- a/drivers/scsi/ufs/ufs.h +++ b/drivers/scsi/ufs/ufs.h @@ -378,6 +378,15 @@ enum query_opcode { UPIU_QUERY_OPCODE_TOGGLE_FLAG = 0x8, }; +/* bRefClkFreq attribute values */ +enum ref_clk_freq { + REF_CLK_FREQ_19_2_MHZ = 0x0, + REF_CLK_FREQ_26_MHZ = 0x1, + REF_CLK_FREQ_38_4_MHZ = 0x2, + REF_CLK_FREQ_52_MHZ = 0x3, + REF_CLK_FREQ_MAX = REF_CLK_FREQ_52_MHZ, +}; + /* Query response result code */ enum { QUERY_RESULT_SUCCESS = 0x00, diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index c5b1bf1..3669bc4 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6297,6 +6297,63 @@ static void ufshcd_def_desc_sizes(struct ufs_hba *hba) } /** + * ufshcd_set_dev_ref_clk - set the device bRefClkFreq + * @hba: per-adapter instance + * @ref_clk_freq: refrerence clock frequency to be set + * + * Read the current value of the bRefClkFreq attribute from device and update it + * if host is supplying different reference clock frequency than one mentioned + * in bRefClkFreq attribute. + * + * Returns zero on success, non-zero error value on failure. + */ +static int ufshcd_set_dev_ref_clk(struct ufs_hba *hba, u32 ref_clk_freq) +{ + int err = 0; + int ref_clk = -1; + static const char * const ref_clk_freqs[] = {"19.2 MHz", "26 MHz", + "38.4 MHz", "52 MHz"}; + + hba->dev_ref_clk_freq = ref_clk_freq; + err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_READ_ATTR, + QUERY_ATTR_IDN_REF_CLK_FREQ, 0, 0, &ref_clk); + + if (err) { + dev_err(hba->dev, "%s: failed reading bRefClkFreq. err = %d\n", + __func__, err); + goto out; + } + + if ((ref_clk < 0) || (ref_clk > REF_CLK_FREQ_52_MHZ)) { + dev_err(hba->dev, "%s: invalid ref_clk setting = %d\n", + __func__, ref_clk); + err = -EINVAL; + goto out; + } + + if (ref_clk == hba->dev_ref_clk_freq) + goto out; /* nothing to update */ + + err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, + QUERY_ATTR_IDN_REF_CLK_FREQ, 0, 0, + &hba->dev_ref_clk_freq); + + if (err) + dev_err(hba->dev, "%s: bRefClkFreq setting to %s failed\n", + __func__, ref_clk_freqs[hba->dev_ref_clk_freq]); + else + /* + * It is good to print this out here to debug any later failures + * related to gear switch. + */ + dev_info(hba->dev, "%s: bRefClkFreq setting to %s succeeded\n", + __func__, ref_clk_freqs[hba->dev_ref_clk_freq]); + +out: + return err; +} + +/** * ufshcd_probe_hba - probe hba to detect device and initialize * @hba: per-adapter instance * @@ -6361,6 +6418,11 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) "%s: Failed getting max supported power mode\n", __func__); } else { + /* + * Set the right value to bRefClkFreq before attempting to + * switch to HS gears. + */ + ufshcd_set_dev_ref_clk(hba, REF_CLK_FREQ_19_2_MHZ); ret = ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info); if (ret) { dev_err(hba->dev, "%s: Failed setting power mode, err = %d\n", diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 8110dcd..b026ad8 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -548,6 +548,7 @@ struct ufs_hba { void *priv; unsigned int irq; bool is_irq_enabled; + u32 dev_ref_clk_freq; /* Interrupt aggregation support is broken */ #define UFSHCD_QUIRK_BROKEN_INTR_AGGR 0x1 -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project