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 9049FC48BE5 for ; Fri, 11 Jun 2021 16:51:40 +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 5B078613C3 for ; Fri, 11 Jun 2021 16:51:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B078613C3 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=2WqHOIeiV0+Vllng84Rhe+ftMRkJbu9heN6r9Y0gsLA=; b=lyBazxgi46CQq6 J0xr2Ho+7fM/5HqQzwF4SkC6wp4kCxCd5nAWoF6vwMUi/5duInW+L3a9ef827JII7zblJCMI/6Nhc t80R0kxzQdLqRGNQVo6wVUc6Hhz9NeWF4/n2QT3ozPLHQ2GcvMK0V0Pdsv92z7BcZG5Uxvhf7MZ0r 7f78POScW8JBA6S3NVo1e/7rfv9pZJ12Q8LHlcRZyJUDMea2BWch3RGXRfJhH2psubA90Vtp9pdtu Djit3Tctx/taF4oYq7NIhs2jFfHT+fBncVzhT+0Xy5oI2YU7lPLtgDeaFP6QpnmqlGiTpxOfrN1xz 2kEFSbiUqj8BU7fWd2Hw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrkLp-0068wj-TR; Fri, 11 Jun 2021 16:49:46 +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 1lrkLl-0068uv-M5 for linux-arm-kernel@lists.infradead.org; Fri, 11 Jun 2021 16:49:43 +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 1F0A5D6E; Fri, 11 Jun 2021 09:49:41 -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 DAB9A3F719; Fri, 11 Jun 2021 09:49:39 -0700 (PDT) Date: Fri, 11 Jun 2021 17:49:37 +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 3/3] PSCI: Use cpuidle context helpers in psci_cpu_suspend_enter() Message-ID: <20210611164937.GC9252@lpieralisi> References: <20210608172715.2396787-1-maz@kernel.org> <20210608172715.2396787-4-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210608172715.2396787-4-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_094941_801358_101C58CB X-CRM114-Status: GOOD ( 16.72 ) 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:15PM +0100, Marc Zyngier wrote: > The PSCI CPU suspend code isn't aware of the PMR vs DAIF game, > resulting in a system that locks up if entering CPU suspend > with GICv3 pNMI enabled. > > To save the day, teach the suspend code about our new cpuidle > context helpers, which will do everything that's required just > like the usual WFI cpuidle code. > > This fixes my Altra system, which would otherwise lock-up at > boot time when booted with irqchip.gicv3_pseudo_nmi=1. > > Signed-off-by: Marc Zyngier > --- > drivers/firmware/psci/psci.c | 5 +++++ > 1 file changed, 5 insertions(+) We need an additional patch for PSCI suspend, regardless: Reviewed-by: Lorenzo Pieralisi > diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c > index 3c1c5daf6df2..d10675bdd9d0 100644 > --- a/drivers/firmware/psci/psci.c > +++ b/drivers/firmware/psci/psci.c > @@ -333,13 +333,18 @@ static int psci_suspend_finisher(unsigned long state) > > int psci_cpu_suspend_enter(u32 state) > { > + struct arm_cpuidle_context context; > int ret; > > + arm_cpuidle_save_context(&context); > + > if (!psci_power_state_loses_context(state)) > ret = psci_ops.cpu_suspend(state, 0); > else > ret = cpu_suspend(state, psci_suspend_finisher); > > + arm_cpuidle_restore_context(&context); > + > return ret; > } > #endif > -- > 2.30.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel