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=-13.9 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,URIBL_BLOCKED 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 E2CDFC47082 for ; Tue, 8 Jun 2021 18:25:41 +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 B241E61376 for ; Tue, 8 Jun 2021 18:25:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B241E61376 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=xLQWi0TTqCYL+cvF7X0s5dWEKGcIEaDi+kdgxo+75AM=; b=I7UqPXjHfrUw1w sZD4oS72iD2w4TQjHC5twnCddWtdRmILlbO3L5NoR37ztfGqRTdDk2nXo4J+0O5o/o/NMiPyFZrF8 Qf4+8VuXbj0SBKDB01G5za3LLkx/bFpxZItCB20I8Z0lqMcf8ivLKQub7wL76hbqd74SgC7j9Oh8m nIO5n7S6N8An0SfiR8Hpp2t4O/eZgAmaKR7voV40MPC+kTERtj5NUfAMWA9B3j6UafmCcHgg+CQap 95Nk8z2lA2mTLpjLi9AQO+rK/VyqMqpqvEu5wmTKBV1m+S1PDGbuR42O35BlZJCDWs29aKXC1A3XY rb+Fzv/0bJItoOJFE6GA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqgO7-009ywT-Ss; Tue, 08 Jun 2021 18:23:44 +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 1lqgLf-009xr6-JN for linux-arm-kernel@lists.infradead.org; Tue, 08 Jun 2021 18:21:13 +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 BB6D4D6E; Tue, 8 Jun 2021 11:21:08 -0700 (PDT) Received: from bogus (unknown [10.57.73.170]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 07F523F694; Tue, 8 Jun 2021 11:21:06 -0700 (PDT) Date: Tue, 8 Jun 2021 19:20:44 +0100 From: Sudeep Holla To: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, Lorenzo Pieralisi , 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: <20210608182044.ayqa6fbab4jyz7kp@bogus> 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210608_112111_738127_59714537 X-CRM114-Status: GOOD ( 17.57 ) 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 (I see Lorenzo has replied on the other thread including me where the issue was reported asking more details) 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(+) > > 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); > + We need similar save/restore for system suspend as well I believe (psci_system_suspend_enter) -- Regards, Sudeep _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel