From patchwork Mon Dec 14 17:21:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11972529 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED084C4361B for ; Mon, 14 Dec 2020 17:24:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A6EDC22516 for ; Mon, 14 Dec 2020 17:24:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408439AbgLNRYH (ORCPT ); Mon, 14 Dec 2020 12:24:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408510AbgLNRX6 (ORCPT ); Mon, 14 Dec 2020 12:23:58 -0500 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B204C06179C for ; Mon, 14 Dec 2020 09:23:18 -0800 (PST) Received: by mail-pl1-x643.google.com with SMTP id bj5so8975730plb.4 for ; Mon, 14 Dec 2020 09:23:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ixXiJOTpChsS+4hsOynBoznKWWFukOcSg8gnLionDSc=; b=JR/A58L++gYOFPkthluSdjweS9CJRgdMUVOXmjprfA1QPNlbEHthNfByO0JoyKPdM/ clkf8QWTb84hc9tw2QCU5bNTf2w5sbO5wSvwK/jU1GwJ8CC2eZo0NvMv6lJXg5c4+nRm vP6i3psTjbxQ2cZE2jn/VeQv44A8aaFeFxJRw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ixXiJOTpChsS+4hsOynBoznKWWFukOcSg8gnLionDSc=; b=JCfCRQsZsf5DlbdfoeX2gF3uz21lgbkXqus2LU9txEl5gPEI9TaUKpJkq4Yctlqg9V 925hMm9Wocj9KJsNwAC/PceC+bKNJV7tNes7dCDmJjfx9rTczH0DW9Dss57DoHcnIib5 xB0ikdQ94aAK8bYpJydSci8M9gyJgAUDwc/ZTezxLDw86hm4eFjn8yLgznXP2Jkzrbma GI3B3nXmzqyZ2n7gVUVis9MwmVWERCoXvX+Yi76N2mvDyOqGMgdB/Zke6IIJrSpJ41pV mgqKWBvIo3HbvlZXC4rID8KLZyntBr4mQHgxB9ADzS2fxzyj/PP42rcZssXV2e4QgKLW GsHQ== X-Gm-Message-State: AOAM533pyx2aT+V0VmXUiz0g9MytWcdZFyDmdmRuTBH2+QRgqBxe1hOZ b09/EBrVxH3jspYk0CaUaqRjGg== X-Google-Smtp-Source: ABdhPJxnhLBxYwe6+7mjOz3eHTxWqA0+Qq10RmkZ3BR4aip0H78wl4m2aTZmzdXZNTGzKIjQ+UlDjQ== X-Received: by 2002:a17:90a:c910:: with SMTP id v16mr26359722pjt.198.1607966597919; Mon, 14 Dec 2020 09:23:17 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id 7sm16013498pfh.142.2020.12.14.09.23.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 09:23:17 -0800 (PST) From: Douglas Anderson To: Ulf Hansson , Adrian Hunter Cc: Taniya Das , vbadigan@codeaurora.org, Stephen Boyd , Douglas Anderson , Bjorn Andersson , Andy Gross , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [PATCH v5 1/2] mmc: sdhci-msm: Warn about overclocking SD/MMC Date: Mon, 14 Dec 2020 09:21:14 -0800 Message-Id: <20201214092048.v5.1.Iec3430c7d3c2a29262695edef7b82a14aaa567e5@changeid> X-Mailer: git-send-email 2.29.2.576.ga3fc446d84-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org As talked about in commit 5e4b7e82d497 ("clk: qcom: gcc-sdm845: Use floor ops for sdcc clks"), most clocks handled by the Qualcomm clock drivers are rounded _up_ by default instead of down. We should make sure SD/MMC clocks are always rounded down in the clock drivers. Let's add a warning in the Qualcomm SDHCI driver to help catch the problem. This would have saved a bunch of time [1]. NOTE: this doesn't actually fix any problems, it just makes it obvious to devs that there is a problem and that should be an indication to fix the clock driver. [1] http://lore.kernel.org/r/20201210102234.1.I096779f219625148900fc984dd0084ed1ba87c7f@changeid Suggested-by: Stephen Boyd Signed-off-by: Douglas Anderson Reviewed-by: Stephen Boyd Reviewed-by: Bjorn Andersson Acked-by: Adrian Hunter --- (no changes since v4) Changes in v4: - Emphasize in the commit message that this itself doesn't fix anything. Changes in v3: - Proper printf format code. Changes in v2: - Store rate in unsigned long, not unsigned int. - Reuse the clk_get_rate() in the later print. drivers/mmc/host/sdhci-msm.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 3451eb325513..50beb407dbe9 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -353,6 +353,7 @@ static void msm_set_clock_rate_for_bus_mode(struct sdhci_host *host, struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); struct mmc_ios curr_ios = host->mmc->ios; struct clk *core_clk = msm_host->bulk_clks[0].clk; + unsigned long achieved_rate; int rc; clock = msm_get_clock_rate_for_bus_mode(host, clock); @@ -363,10 +364,20 @@ static void msm_set_clock_rate_for_bus_mode(struct sdhci_host *host, curr_ios.timing); return; } + + /* + * Qualcomm clock drivers by default round clock _up_ if they can't + * make the requested rate. This is not good for SD. Yell if we + * encounter it. + */ + achieved_rate = clk_get_rate(core_clk); + if (achieved_rate > clock) + pr_warn("%s: Card appears overclocked; req %u Hz, actual %lu Hz\n", + mmc_hostname(host->mmc), clock, achieved_rate); + msm_host->clk_rate = clock; pr_debug("%s: Setting clock at rate %lu at timing %d\n", - mmc_hostname(host->mmc), clk_get_rate(core_clk), - curr_ios.timing); + mmc_hostname(host->mmc), achieved_rate, curr_ios.timing); } /* Platform specific tuning */ From patchwork Mon Dec 14 17:21:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 11972547 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36365C2BB9A for ; Mon, 14 Dec 2020 17:33:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9667522525 for ; Mon, 14 Dec 2020 17:25:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408522AbgLNRYm (ORCPT ); Mon, 14 Dec 2020 12:24:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408523AbgLNRYh (ORCPT ); Mon, 14 Dec 2020 12:24:37 -0500 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 691EDC0617B0 for ; Mon, 14 Dec 2020 09:23:20 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id g20so8147188plo.2 for ; Mon, 14 Dec 2020 09:23:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Cg6Bq8u6T5dLgFu86otlHuVnE4BbKztYZ9gDn/MmCXc=; b=M/f24FvBVPavu1tTNzezOto0bS8sgtxaEDsDYCm3yKXZOjBEHMug6ph2ZN2jp/rAcQ 0uAAjoQGoGvG7mlHkdqoJ20q2OX/rgkx+RcG5KYoh4rUtzgAksgNRx/HGWTLPeykoeUM HNsvLfjZYGAaPTkJbX+yPO2qkw6UuG/pRLBPA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cg6Bq8u6T5dLgFu86otlHuVnE4BbKztYZ9gDn/MmCXc=; b=CQU5KSXMhmDHUDzXMmTRCkHk92hQMpIYxRFKcrRaqca26tbtowcJuHkDNloDZp4oxe wr5NPkDbPI/Ur2j88bsdAemAXc2Q8seovXZYouTBxy7M/QjNCxlyDBWQ+L9SF061fIKH tn7Eufgj24X5a50yW/CLdXnYY3mkvrQhzI0eGpJ3Kz4CmAu6qF8UIM3SepZXMfbWsrOJ xI9KXLE93o8midJraXaKdYMm5knKAelmfcdCFgZG9AdEAuhOinMC09BwvdVNMy9m5azU Uhg0GZ3EwxXncsIpyYJKpj9+Wf+NtCsR6PjmHth99ixhj3cIaSO5s/ZKk5jLZugoKmLY vi3Q== X-Gm-Message-State: AOAM530jJCifU4PAbAGyhhEaM5UYdEJ4yODlNn2hR8ZUVUbJMLYBWFcp yVLVKvtrYnl7N1stHDg5USEJOA== X-Google-Smtp-Source: ABdhPJzBFDAtXnY4SIfO2hMauHJDz6Ubh83KhYpJyoVJiaqsTbdWhwA9llolIS2fzSFnfZcuHDq/2A== X-Received: by 2002:a17:90b:50a:: with SMTP id r10mr26452721pjz.103.1607966599913; Mon, 14 Dec 2020 09:23:19 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:42b0:34ff:fe3d:58e6]) by smtp.gmail.com with ESMTPSA id 7sm16013498pfh.142.2020.12.14.09.23.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 09:23:18 -0800 (PST) From: Douglas Anderson To: Ulf Hansson , Adrian Hunter Cc: Taniya Das , vbadigan@codeaurora.org, Stephen Boyd , Douglas Anderson , Bjorn Andersson , Andy Gross , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [PATCH v5 2/2] mmc: sdhci-msm: Actually set the actual clock Date: Mon, 14 Dec 2020 09:21:15 -0800 Message-Id: <20201214092048.v5.2.I7564620993acd4baa63fa0e3925ca879a86d3ee3@changeid> X-Mailer: git-send-email 2.29.2.576.ga3fc446d84-goog In-Reply-To: <20201214092048.v5.1.Iec3430c7d3c2a29262695edef7b82a14aaa567e5@changeid> References: <20201214092048.v5.1.Iec3430c7d3c2a29262695edef7b82a14aaa567e5@changeid> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The MSM SDHCI driver always set the "actual_clock" field to 0. It had a comment about it not being needed because we weren't using the standard SDHCI divider mechanism and we'd just fallback to "host->clock". However, it's still better to provide the actual clock. Why? 1. It will make timeout calculations slightly better. On one system I have, the eMMC requets 200 MHz (for HS400-ES) but actually gets 192 MHz. These are close, but why not get the more accurate one. 2. If things are seriously off in the clock driver and it's missing rates or picking the wrong rate (maybe it's rounding up instead of down), this will make it much more obvious what's going on. NOTE: we have to be a little careful here because the "actual_clock" field shouldn't include the multiplier that sdhci-msm needs internally. Suggested-by: Adrian Hunter Signed-off-by: Douglas Anderson Reviewed-by: Bjorn Andersson Acked-by: Adrian Hunter Reviewed-by: Veerabhadrarao Badiganti --- Changes in v5: - Remove unused clock parameter. - Add a comment that we're stashing the requested rate. Changes in v4: - ("mmc: sdhci-msm: Actually set the actual clock") new for v4. drivers/mmc/host/sdhci-msm.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 50beb407dbe9..f5669dc858d0 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -328,8 +328,7 @@ static void sdhci_msm_v5_variant_writel_relaxed(u32 val, writel_relaxed(val, host->ioaddr + offset); } -static unsigned int msm_get_clock_rate_for_bus_mode(struct sdhci_host *host, - unsigned int clock) +static unsigned int msm_get_clock_mult_for_bus_mode(struct sdhci_host *host) { struct mmc_ios ios = host->mmc->ios; /* @@ -342,8 +341,8 @@ static unsigned int msm_get_clock_rate_for_bus_mode(struct sdhci_host *host, ios.timing == MMC_TIMING_MMC_DDR52 || ios.timing == MMC_TIMING_MMC_HS400 || host->flags & SDHCI_HS400_TUNING) - clock *= 2; - return clock; + return 2; + return 1; } static void msm_set_clock_rate_for_bus_mode(struct sdhci_host *host, @@ -354,14 +353,16 @@ static void msm_set_clock_rate_for_bus_mode(struct sdhci_host *host, struct mmc_ios curr_ios = host->mmc->ios; struct clk *core_clk = msm_host->bulk_clks[0].clk; unsigned long achieved_rate; + unsigned int desired_rate; + unsigned int mult; int rc; - clock = msm_get_clock_rate_for_bus_mode(host, clock); - rc = dev_pm_opp_set_rate(mmc_dev(host->mmc), clock); + mult = msm_get_clock_mult_for_bus_mode(host); + desired_rate = clock * mult; + rc = dev_pm_opp_set_rate(mmc_dev(host->mmc), desired_rate); if (rc) { pr_err("%s: Failed to set clock at rate %u at timing %d\n", - mmc_hostname(host->mmc), clock, - curr_ios.timing); + mmc_hostname(host->mmc), desired_rate, curr_ios.timing); return; } @@ -371,11 +372,14 @@ static void msm_set_clock_rate_for_bus_mode(struct sdhci_host *host, * encounter it. */ achieved_rate = clk_get_rate(core_clk); - if (achieved_rate > clock) + if (achieved_rate > desired_rate) pr_warn("%s: Card appears overclocked; req %u Hz, actual %lu Hz\n", - mmc_hostname(host->mmc), clock, achieved_rate); + mmc_hostname(host->mmc), desired_rate, achieved_rate); + host->mmc->actual_clock = achieved_rate / mult; + + /* Stash the rate we requested to use in sdhci_msm_runtime_resume() */ + msm_host->clk_rate = desired_rate; - msm_host->clk_rate = clock; pr_debug("%s: Setting clock at rate %lu at timing %d\n", mmc_hostname(host->mmc), achieved_rate, curr_ios.timing); } @@ -1756,13 +1760,6 @@ static unsigned int sdhci_msm_get_min_clock(struct sdhci_host *host) static void __sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock) { u16 clk; - /* - * Keep actual_clock as zero - - * - since there is no divider used so no need of having actual_clock. - * - MSM controller uses SDCLK for data timeout calculation. If - * actual_clock is zero, host->clock is taken for calculation. - */ - host->mmc->actual_clock = 0; sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); @@ -1785,7 +1782,7 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock) struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); if (!clock) { - msm_host->clk_rate = clock; + host->mmc->actual_clock = msm_host->clk_rate = 0; goto out; }