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 43F1DC48BE5 for ; Fri, 11 Jun 2021 16:48:27 +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 0C60B613C3 for ; Fri, 11 Jun 2021 16:48:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C60B613C3 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=jC5tnBoy3EZ0IpLjvBgij42CXiFnDm0g3TsikRxnJLg=; b=z22kQ6qHiu+do1 LZobjSPg0xQxVIfXwipzMqJt2BrNn72VWIA9S4AqgLxUmOv2M/ve1/2ufeCWJz3r5xraJoA2sgltD C6y7HnLKKKu3TEUjAP2A0svcwUNRwGwsqlhleM/sV1keeoQ9H7g6rzxw+PRJ1BWJ9TpGix5vmMxFz Gk5vy9U9nuNKXIOzLqIKFRtQxJThVv4fLg+CHhaW10mGCypbAUWZcx7TL46lZEtLEFrX5yNR6dDIM eEge7IzXckZP0oD00aTW28dFHt53HSO/pE6IrUR7UmdWCBMgyha5NkFrVQMopaVkC/ks0+V/cZbs6 HRirBNIPYgLKA8lM3itA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrkJL-0067Jd-10; Fri, 11 Jun 2021 16:47:11 +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 1lrkJH-0067Dv-4z for linux-arm-kernel@lists.infradead.org; Fri, 11 Jun 2021 16:47:08 +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 DA1F3D6E; Fri, 11 Jun 2021 09:47:03 -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 A36583F719; Fri, 11 Jun 2021 09:47:02 -0700 (PDT) Date: Fri, 11 Jun 2021 17:46:57 +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 1/3] arm64: Add cpuidle context save/restore helpers Message-ID: <20210611164657.GA9252@lpieralisi> References: <20210608172715.2396787-1-maz@kernel.org> <20210608172715.2396787-2-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210608172715.2396787-2-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_094707_289034_0197DDF2 X-CRM114-Status: GOOD ( 20.03 ) 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:13PM +0100, Marc Zyngier wrote: > As we need to start doing some additional work on all idle > paths, let's introduce a set of macros that will perform > the work related to the GICv3 pseudo-NMI idle entry exit. > > Stubs are introduced to 32bit ARM for compatibility. > As these helpers are currently unused, the is no functional s/the/there > change. > > Signed-off-by: Marc Zyngier > --- > arch/arm/include/asm/cpuidle.h | 5 +++++ > arch/arm64/include/asm/cpuidle.h | 35 ++++++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+) > > diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h > index 0d67ed682e07..1e0b8da12d96 100644 > --- a/arch/arm/include/asm/cpuidle.h > +++ b/arch/arm/include/asm/cpuidle.h > @@ -49,4 +49,9 @@ extern int arm_cpuidle_suspend(int index); > > extern int arm_cpuidle_init(int cpu); > > +struct arm_cpuidle_context { }; > + > +#define arm_cpuidle_save_context(c) (void)c > +#define arm_cpuidle_restore_context(c) (void)c > + > #endif > diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h > index 3c5ddb429ea2..53adad0a5c7e 100644 > --- a/arch/arm64/include/asm/cpuidle.h > +++ b/arch/arm64/include/asm/cpuidle.h > @@ -18,4 +18,39 @@ static inline int arm_cpuidle_suspend(int index) > return -EOPNOTSUPP; > } > #endif > + > +#ifdef CONFIG_ARM64_PSEUDO_NMI > +#include > + > +struct arm_cpuidle_context { > + unsigned long pmr; > + unsigned long daif_bits; > +}; > + > +#define arm_cpuidle_save_context(__c) \ > + do { \ > + struct arm_cpuidle_context *c = __c; \ > + if (system_uses_irq_prio_masking()) { \ > + c->daif_bits = read_sysreg(daif); \ > + write_sysreg(c->daif_bits | PSR_I_BIT | PSR_F_BIT, \ > + daif); \ > + c->pmr = gic_read_pmr(); \ > + gic_write_pmr(GIC_PRIO_IRQON | GIC_PRIO_PSR_I_SET); \ > + } \ > + } while (0) > + > +#define arm_cpuidle_restore_context(__c) \ > + do { \ > + struct arm_cpuidle_context *c = __c; \ > + if (system_uses_irq_prio_masking()) { \ > + gic_write_pmr(c->pmr); \ > + write_sysreg(c->daif_bits, daif); \ > + } \ > + } while (0) > +#else > +struct arm_cpuidle_context { }; > + > +#define arm_cpuidle_save_context(c) (void)c > +#define arm_cpuidle_restore_context(c) (void)c > +#endif > #endif It looks good to me - maybe I would define it irq_context for clarity but that's just a naming convention. Reviewed-by: Lorenzo Pieralisi _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel