From patchwork Thu Feb 2 22:00:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 52196 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp495974wrn; Thu, 2 Feb 2023 14:02:36 -0800 (PST) X-Google-Smtp-Source: AK7set95xKwNrDjOrAeBv9preQ/Df+ipWosiuNN8Fu5HzQLmQZnWfjRCITDEAIRy+t82fLNscc9d X-Received: by 2002:aa7:984f:0:b0:592:619e:ddb9 with SMTP id n15-20020aa7984f000000b00592619eddb9mr8045498pfq.24.1675375355906; Thu, 02 Feb 2023 14:02:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675375355; cv=none; d=google.com; s=arc-20160816; b=coA+zS8blUijSXHUMiisKz+VQoU2gg5s5QJ61LJ3U7lRPQ4g0o2qqO5iIH5LjumjYK V8Gbq/WGbafAh/AN4Qgt9R/AIdBdapW9NxjzzP2laBQqVPP++JSvFAiU3THEOCVSyGn6 rdkpYX23PhQmD2MP1BocKGKz7bG3ARz+kjKJ9LHfvq6RUGW3bp/OrC5vPRuGkzfDC140 giGm47mTbt2zwwLhhtnpju0HdS1U9cvG+eWv1F29XyDcXCnwNi6oTyuaTEffvmKDNlb4 DVWGwZpcrWdbVPOR1BXs782LHfN+mwP8UGDlpLfEgoSmMvwwUenV8D7Ehr+lz594psQ5 tqbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=+vrP6x4T9y3LBVQTyEpVLcHcjo3vK9avyGJed9Ro+PY=; b=oPE3zZDCwehhvsiFESGYqbxoAe09QINKt2ye0FiyMGv9/t3tDRyoxPnOrb3TAdrPng PUCGURfSvzwBn9lQ/Y8WqHDR/oNYbDyHN6BsHkG0RV5hUo3VypC7/9aD1aH7sMn3Wr+S kBhfnsOEgRQRU/XaaPGNQKmt972xu1qpxwcshIgP4RchZPauFvkuEDtZn44vsApVwYJs ZI9oUItXzlSIoi/Oc8NqN+g4p+hEeQ/HEMXvWYgii9Muh/7gVkWqr1Jx9DBbG9re1Cve 5j3u49ciBPxhTqXypqCneBB9Qinofmogpur2Y26+eMAbzhWiB7ajbm5A0KNxIp6raL/t lKug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=fDff1QUa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y201-20020a6264d2000000b0058aa91de9e1si520987pfb.25.2023.02.02.14.02.14; Thu, 02 Feb 2023 14:02:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=fDff1QUa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232509AbjBBWBV (ORCPT + 99 others); Thu, 2 Feb 2023 17:01:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232453AbjBBWBS (ORCPT ); Thu, 2 Feb 2023 17:01:18 -0500 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E354D7B408 for ; Thu, 2 Feb 2023 14:00:55 -0800 (PST) Received: by mail-pj1-x102a.google.com with SMTP id f16-20020a17090a9b1000b0023058bbd7b2so2543194pjp.0 for ; Thu, 02 Feb 2023 14:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+vrP6x4T9y3LBVQTyEpVLcHcjo3vK9avyGJed9Ro+PY=; b=fDff1QUaUePyrEO4K8PPJaKVKrS67CDWzshdJihkORr3Ui4KtY4IlqYfEDwINOUrgc jcUkc/WY/hV+22kjwpG7NbLjhRLmn6hhUunsDgDto4c42tr1dygTqmITCJav1rljlcNB +vzWl29h+6Euy34nzxUXIXoBhcDrFDyAD+Dd0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+vrP6x4T9y3LBVQTyEpVLcHcjo3vK9avyGJed9Ro+PY=; b=fAjpeaJwzQCcCWUNSmHV3Lfr/flIJnnZY1KT6gn6XBjDJ9QGy8BQJPQI0ZLTWrhznl w5wKeX7xkBuHMYA8Kpci3g+VVEp/zmo7O4FcQ7k1wsnWec1P2DQ/CN+BuIviH5TL3D7o E6GicCuWV6ORRcngaLtf+jLQ8u3M6j7xRNofYym78+RbANJe1EZld9b8Y3EsbM5i6xZj tx2fax1Or2pH4BTHQ5FxhZPH5sHR/WwmQ0fEJf03bRaHuB4jJwmU6YKj2/EAHJkgsjD0 mBqne1d0fj0UiRrx3L427Dh1ZIf3T2X10QDIj4HL/r5TyBadI/K1TRqRXAbLf1FHtC71 9Fbg== X-Gm-Message-State: AO0yUKUJSHN+/6U0qIufZ5sLsqYu5hGUGXwlHejUXEuWk9RECt7jX+OT 1wo94HCIuIVfCtVIGY1Fr/+QHQ== X-Received: by 2002:a17:902:cf08:b0:194:a6e0:3ba with SMTP id i8-20020a170902cf0800b00194a6e003bamr8169139plg.54.1675375236301; Thu, 02 Feb 2023 14:00:36 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:9d:2:f71:fcf9:d3e0:e9c0]) by smtp.gmail.com with ESMTPSA id jb21-20020a170903259500b00192fc9e8552sm179629plb.0.2023.02.02.14.00.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Feb 2023 14:00:35 -0800 (PST) From: Douglas Anderson To: Viresh Kumar , Manivannan Sadhasivam Cc: swboyd@chromium.org, mka@chromium.org, Douglas Anderson , Andy Gross , Bjorn Andersson , Konrad Dybcio , "Rafael J. Wysocki" , Sasha Levin , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH] cpufreq: qcom-hw: Fix cpufreq_driver->get() for non-LMH systems Date: Thu, 2 Feb 2023 14:00:23 -0800 Message-Id: <20230202140005.1.I4b30aaa027c73372ec4068cc0f0dc665af8b938d@changeid> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756758388998878334?= X-GMAIL-MSGID: =?utf-8?q?1756758388998878334?= On a sc7180-based Chromebook, when I go to /sys/devices/system/cpu/cpu0/cpufreq I can see: cpuinfo_cur_freq:2995200 cpuinfo_max_freq:1804800 scaling_available_frequencies:300000 576000 ... 1708800 1804800 scaling_cur_freq:1804800 scaling_max_freq:1804800 As you can see the `cpuinfo_cur_freq` is bogus. It turns out that this bogus info started showing up as of commit 205f5e984d30 ("cpufreq: qcom-hw: Fix the frequency returned by cpufreq_driver->get()"). That commit seems to assume that everyone is on the LMH bandwagon, but sc7180 isn't. Let's go back to the old code in the case where LMH isn't used. Fixes: 205f5e984d30 ("cpufreq: qcom-hw: Fix the frequency returned by cpufreq_driver->get()") Signed-off-by: Douglas Anderson Reviewed-by: Konrad Dybcio Reviewed-by: Manivannan Sadhasivam --- drivers/cpufreq/qcom-cpufreq-hw.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c index 9505a812d6a1..957cf6bb8c05 100644 --- a/drivers/cpufreq/qcom-cpufreq-hw.c +++ b/drivers/cpufreq/qcom-cpufreq-hw.c @@ -143,40 +143,42 @@ static unsigned long qcom_lmh_get_throttle_freq(struct qcom_cpufreq_data *data) return lval * xo_rate; } -/* Get the current frequency of the CPU (after throttling) */ -static unsigned int qcom_cpufreq_hw_get(unsigned int cpu) +/* Get the frequency requested by the cpufreq core for the CPU */ +static unsigned int qcom_cpufreq_get_freq(unsigned int cpu) { struct qcom_cpufreq_data *data; + const struct qcom_cpufreq_soc_data *soc_data; struct cpufreq_policy *policy; + unsigned int index; policy = cpufreq_cpu_get_raw(cpu); if (!policy) return 0; data = policy->driver_data; + soc_data = qcom_cpufreq.soc_data; - return qcom_lmh_get_throttle_freq(data) / HZ_PER_KHZ; + index = readl_relaxed(data->base + soc_data->reg_perf_state); + index = min(index, LUT_MAX_ENTRIES - 1); + + return policy->freq_table[index].frequency; } -/* Get the frequency requested by the cpufreq core for the CPU */ -static unsigned int qcom_cpufreq_get_freq(unsigned int cpu) +static unsigned int qcom_cpufreq_hw_get(unsigned int cpu) { struct qcom_cpufreq_data *data; - const struct qcom_cpufreq_soc_data *soc_data; struct cpufreq_policy *policy; - unsigned int index; policy = cpufreq_cpu_get_raw(cpu); if (!policy) return 0; data = policy->driver_data; - soc_data = qcom_cpufreq.soc_data; - index = readl_relaxed(data->base + soc_data->reg_perf_state); - index = min(index, LUT_MAX_ENTRIES - 1); + if (data->throttle_irq >= 0) + return qcom_lmh_get_throttle_freq(data) / HZ_PER_KHZ; - return policy->freq_table[index].frequency; + return qcom_cpufreq_get_freq(cpu); } static unsigned int qcom_cpufreq_hw_fast_switch(struct cpufreq_policy *policy,