Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp108710ybg; Mon, 8 Jun 2020 17:50:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxBvyKnVDJOmToLgao6AC5aNNm6hqye5If//JsJLaBa4SvUg9pTwnmvhbCAjGHCi3PdWex X-Received: by 2002:a17:906:2e1a:: with SMTP id n26mr22414986eji.425.1591663835114; Mon, 08 Jun 2020 17:50:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591663835; cv=none; d=google.com; s=arc-20160816; b=FolfpgDyeQgBBKTJzDwqlUsNMg8wvQqpUZU6PTPiOjCpBkWQxB5pPCwJe9ST8V3WOp msAATyHIiv3D6hgLZflfpiRa2TMULvb9Ekp7emu5TYEDlFCUGhtYIMZyBozSJHzI28vb 7urSg+XEE5zOmRmw0jlJLyoY3bW/I6nJaiRzHsAz0Q0jOVCEB5kRwrvHox6mNJinCZjs cn31YwJ0BAAAVANmwyYMeNP1mV/+tVtH3qb6g2u8AfOZ3Q9I4WkxJ1DllYW20/unOM8a RxTXRjiWZGW9fLnH774n33Gdrs1Xz+OwnqTh130LF44FIvEu+1DZIClPcO5RyNn9IUYG Csfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=v/9gtymzW/l6e7XVZ1pYfZA/dzNVonK9/vR7OD8lN6A=; b=tsc5Q/P4QIPdRORPkS3D5rTEzxZKLz42CQznj+hjrP2Jvlu4nyI+pDa02gxAN7752m 28PPR9pb5FsjanySS4qGAB3TM2rdmUJPupfqJjBXFp3OIqaPdmYeSrd/F2unaAjFK7ma taGDqlxz7bTKfcqify24E2Rxzj6DcfkjD7q2ByZpETzmQijXhqif9wRuLgL+xGkRsMT8 lyJfKzGpz1OpBestWhATu4zyK1VwsvKtuWWajJ0BLfxlQQ3HlvHVV+7eKPZKDYTg7GQ0 s71IGD01Hq0hOSInW60Dfk9pQG+zYXp8HNm1+6g46YrdbFzfo8xPriFHPZx4p0vwH22n 9w3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jb65WC1N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a62si9727713edf.361.2020.06.08.17.50.11; Mon, 08 Jun 2020 17:50:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jb65WC1N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733305AbgFIAsc (ORCPT + 99 others); Mon, 8 Jun 2020 20:48:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:57400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727125AbgFHXK4 (ORCPT ); Mon, 8 Jun 2020 19:10:56 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3B8FA208FE; Mon, 8 Jun 2020 23:10:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657855; bh=eVw2k462iJ2Do0ojBFL2gwa0NOUuOVkmrSLmnwCge2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jb65WC1N9DK4h5ujlYgknQzKGblUIOd9qdgwnKY+xwJMxi6hkKnBFAN50L1nOTu28 o3t2xYQL2mo7H0+8yDF7eC6NEYEpcag5RVfGkP6/LH4VsG5kiY4+QswvO0wazE3HEE Ml0wGORmCyoWzANqDucLZa/AIXBO/Cbd6X/0Ei9k= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Serge Semin , Alexey Malahov , Jiaxun Yang , Thomas Bogendoerfer , Paul Burton , Ralf Baechle , Arnd Bergmann , Rob Herring , devicetree@vger.kernel.org, Sasha Levin , linux-mips@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 219/274] mips: Add udelay lpj numbers adjustment Date: Mon, 8 Jun 2020 19:05:12 -0400 Message-Id: <20200608230607.3361041-219-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608230607.3361041-1-sashal@kernel.org> References: <20200608230607.3361041-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Serge Semin [ Upstream commit ed26aacfb5f71eecb20a51c4467da440cb719d66 ] Loops-per-jiffies is a special number which represents a number of noop-loop cycles per CPU-scheduler quantum - jiffies. As you understand aside from CPU-specific implementation it depends on the CPU frequency. So when a platform has the CPU frequency fixed, we have no problem and the current udelay interface will work just fine. But as soon as CPU-freq driver is enabled and the cores frequency changes, we'll end up with distorted udelay's. In order to fix this we have to accordinly adjust the per-CPU udelay_val (the same as the global loops_per_jiffy) number. This can be done in the CPU-freq transition event handler. We subscribe to that event in the MIPS arch time-inititalization method. Co-developed-by: Alexey Malahov Signed-off-by: Alexey Malahov Signed-off-by: Serge Semin Reviewed-by: Jiaxun Yang Cc: Thomas Bogendoerfer Cc: Paul Burton Cc: Ralf Baechle Cc: Arnd Bergmann Cc: Rob Herring Cc: devicetree@vger.kernel.org Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/kernel/time.c | 70 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 37e9413a393d..caa01457dce6 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -18,12 +18,82 @@ #include #include #include +#include +#include #include #include #include #include +#ifdef CONFIG_CPU_FREQ + +static DEFINE_PER_CPU(unsigned long, pcp_lpj_ref); +static DEFINE_PER_CPU(unsigned long, pcp_lpj_ref_freq); +static unsigned long glb_lpj_ref; +static unsigned long glb_lpj_ref_freq; + +static int cpufreq_callback(struct notifier_block *nb, + unsigned long val, void *data) +{ + struct cpufreq_freqs *freq = data; + struct cpumask *cpus = freq->policy->cpus; + unsigned long lpj; + int cpu; + + /* + * Skip lpj numbers adjustment if the CPU-freq transition is safe for + * the loops delay. (Is this possible?) + */ + if (freq->flags & CPUFREQ_CONST_LOOPS) + return NOTIFY_OK; + + /* Save the initial values of the lpjes for future scaling. */ + if (!glb_lpj_ref) { + glb_lpj_ref = boot_cpu_data.udelay_val; + glb_lpj_ref_freq = freq->old; + + for_each_online_cpu(cpu) { + per_cpu(pcp_lpj_ref, cpu) = + cpu_data[cpu].udelay_val; + per_cpu(pcp_lpj_ref_freq, cpu) = freq->old; + } + } + + /* + * Adjust global lpj variable and per-CPU udelay_val number in + * accordance with the new CPU frequency. + */ + if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || + (val == CPUFREQ_POSTCHANGE && freq->old > freq->new)) { + loops_per_jiffy = cpufreq_scale(glb_lpj_ref, + glb_lpj_ref_freq, + freq->new); + + for_each_cpu(cpu, cpus) { + lpj = cpufreq_scale(per_cpu(pcp_lpj_ref, cpu), + per_cpu(pcp_lpj_ref_freq, cpu), + freq->new); + cpu_data[cpu].udelay_val = (unsigned int)lpj; + } + } + + return NOTIFY_OK; +} + +static struct notifier_block cpufreq_notifier = { + .notifier_call = cpufreq_callback, +}; + +static int __init register_cpufreq_notifier(void) +{ + return cpufreq_register_notifier(&cpufreq_notifier, + CPUFREQ_TRANSITION_NOTIFIER); +} +core_initcall(register_cpufreq_notifier); + +#endif /* CONFIG_CPU_FREQ */ + /* * forward reference */ -- 2.25.1