From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 4908DC48BE0 for ; Fri, 11 Jun 2021 16:50:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 06083613C3 for ; Fri, 11 Jun 2021 16:50:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 06083613C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gPsQXUBKN8p4emHGCXVIK0gneE8a5YOb4NnOL478OD4=; b=fCIOHlnnZwI2Ip /TSh1YpBPV93hpR4TABRr/MtmG6PMCheEuPqPtvNEfuFhYws7ffbZILda+YHOdkG4bil330LRnfSs goNwecmNq82munvxapgu1TBSEhwbM6UJYc3peuKtfUt6qoVSowa1TCDabWZz+RLMEgBcTbooVdpzC xFkGgneSg3PxZjUVNV+mRvD6jfMJa/rcsNw630tKJmW6s+xj9iGSYCzCtU4ApoD8zkTrLh3FE/jso v+FYPqGUopvUh/1n9HeTmGroTOVvA98pXWfTsNxsJfiKVFpLq8HFzrvKTUGlLtFwmp7thknKJypMp cRCUj+156a2tZewElQQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrkKQ-0068KQ-4X; Fri, 11 Jun 2021 16:48:18 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrkKL-0068JG-O9 for linux-arm-kernel@lists.infradead.org; Fri, 11 Jun 2021 16:48:15 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 74FC0D6E; Fri, 11 Jun 2021 09:48:12 -0700 (PDT) Received: from lpieralisi (e121166-lin.cambridge.arm.com [10.1.196.255]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3F49C3F719; Fri, 11 Jun 2021 09:48:11 -0700 (PDT) Date: Fri, 11 Jun 2021 17:48:08 +0100 From: Lorenzo Pieralisi To: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, Will Deacon , Catalin Marinas , Mark Rutland , Valentin Schneider , Alexandru Elisei , Russell King , kernel-team@android.com Subject: Re: [PATCH 2/3] arm64: Convert cpu_do_idle() to using cpuidle context helpers Message-ID: <20210611164808.GB9252@lpieralisi> References: <20210608172715.2396787-1-maz@kernel.org> <20210608172715.2396787-3-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210608172715.2396787-3-maz@kernel.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210611_094813_865959_BA27A1B6 X-CRM114-Status: GOOD ( 17.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Jun 08, 2021 at 06:27:14PM +0100, Marc Zyngier wrote: > Now that we have helpers that are aware of the pseudo-NMI > feature, introduce them to cpu_do_idle(). This allows for > some nice cleanup. > > No functional change intended. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/kernel/process.c | 41 ++++++++----------------------------- > 1 file changed, 9 insertions(+), 32 deletions(-) Reviewed-by: Lorenzo Pieralisi > diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c > index b4bb67f17a2c..f99144eda8dc 100644 > --- a/arch/arm64/kernel/process.c > +++ b/arch/arm64/kernel/process.c > @@ -46,9 +46,9 @@ > #include > > #include > -#include > #include > #include > +#include > #include > #include > #include > @@ -74,33 +74,6 @@ EXPORT_SYMBOL_GPL(pm_power_off); > > void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); > > -static void noinstr __cpu_do_idle(void) > -{ > - dsb(sy); > - wfi(); > -} > - > -static void noinstr __cpu_do_idle_irqprio(void) > -{ > - unsigned long pmr; > - unsigned long daif_bits; > - > - daif_bits = read_sysreg(daif); > - write_sysreg(daif_bits | PSR_I_BIT | PSR_F_BIT, daif); > - > - /* > - * Unmask PMR before going idle to make sure interrupts can > - * be raised. > - */ > - pmr = gic_read_pmr(); > - gic_write_pmr(GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET); > - > - __cpu_do_idle(); > - > - gic_write_pmr(pmr); > - write_sysreg(daif_bits, daif); > -} > - > /* > * cpu_do_idle() > * > @@ -112,10 +85,14 @@ static void noinstr __cpu_do_idle_irqprio(void) > */ > void noinstr cpu_do_idle(void) > { > - if (system_uses_irq_prio_masking()) > - __cpu_do_idle_irqprio(); > - else > - __cpu_do_idle(); > + struct arm_cpuidle_context context; > + > + arm_cpuidle_save_context(&context); > + > + dsb(sy); > + wfi(); > + > + arm_cpuidle_restore_context(&context); > } > > /* > -- > 2.30.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel