From patchwork Tue Jan 21 12:30:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 212990 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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=unavailable 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 2B016C2D0CE for ; Tue, 21 Jan 2020 12:39:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F30F224654 for ; Tue, 21 Jan 2020 12:39:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727350AbgAUMjJ (ORCPT ); Tue, 21 Jan 2020 07:39:09 -0500 Received: from fsfla.org ([217.69.89.142]:58568 "EHLO fsfla.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727059AbgAUMjJ (ORCPT ); Tue, 21 Jan 2020 07:39:09 -0500 X-Greylist: delayed 456 seconds by postgrey-1.27 at vger.kernel.org; Tue, 21 Jan 2020 07:39:08 EST Received: from free.home (177.205.27.213.dynamic.adsl.gvt.net.br [177.205.27.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by fsfla.org (Postfix) with ESMTPSA id 37620A2B7C; Tue, 21 Jan 2020 12:31:13 +0000 (UTC) Received: from livre.home (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 00LCUjG21635112 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Jan 2020 09:30:47 -0300 From: Alexandre Oliva To: Viresh Kumar Cc: Paul Burton , Jiaxun Yang , linux-mips@vger.kernel.org, paul.burton@mips.com, "Rafael J. Wysocki" , linux-pm@vger.kernel.org Subject: [PATCH] [Loongson2F] adjust cpufreq uses of LOONGSON_CHIPCFG Organization: Free thinker, not speaking for FSF Latin America References: <20200120180612.gurkikzbh77stk4v@pburton-laptop> <20200121045354.2ugc6u2p6j7k6kof@vireshk-i7> Date: Tue, 21 Jan 2020 09:30:45 -0300 In-Reply-To: <20200121045354.2ugc6u2p6j7k6kof@vireshk-i7> (Viresh Kumar's message of "Tue, 21 Jan 2020 10:23:54 +0530") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The post-fork cleanup of loongson2ef from loongson64 changed LOONGSON_CHIPCFG from a single-argument functional macro to a non-functional macro with an mmio address in loongson2ef, but loongson2_cpufreq still uses the notation of a functional macro call expecting it to be an lvalue. Fixed based on loongson_suspend_enter. Signed-off-by: Alexandre Oliva Cc: Jiaxun Yang Cc: linux-mips@vger.kernel.org Cc: paul.burton@mips.com Acked-by: Viresh Kumar --- drivers/cpufreq/loongson2_cpufreq.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c index 84f0eee..ace2d46 100644 --- a/drivers/cpufreq/loongson2_cpufreq.c +++ b/drivers/cpufreq/loongson2_cpufreq.c @@ -144,9 +144,11 @@ static void loongson2_cpu_wait(void) u32 cpu_freq; spin_lock_irqsave(&loongson2_wait_lock, flags); - cpu_freq = LOONGSON_CHIPCFG(0); - LOONGSON_CHIPCFG(0) &= ~0x7; /* Put CPU into wait mode */ - LOONGSON_CHIPCFG(0) = cpu_freq; /* Restore CPU state */ + cpu_freq = readl(LOONGSON_CHIPCFG); + /* Put CPU into wait mode */ + writel(readl(LOONGSON_CHIPCFG) & ~0x7, LOONGSON_CHIPCFG); + /* Restore CPU state */ + writel(cpu_freq, LOONGSON_CHIPCFG); spin_unlock_irqrestore(&loongson2_wait_lock, flags); local_irq_enable(); }