From patchwork Mon Nov 13 15:34:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 13454135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id EE706C4332F for ; Mon, 13 Nov 2023 15:35:28 +0000 (UTC) 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:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ihZ1XVML5eNm6PPtYfiSafOdp8rk7rEoOEmn2gUNZy8=; b=B1twYQ1aD1ilnj 9vMIoVOCuoK6fPFAdkmO8Po/gJfpaRdDKulnaQV+PsiA2aY3gT+S7DzXe3d6OTFNJ2pDEvtoxGbnM Hd1t8tXUF0S2R50iQcR44ISjW8wVza/Bx/E/H0IsFac7+3jqbNgcwnaRQiU9x0GXLPOFcqvdJ7C8U GIkcFeciNaT4n0QPMtpRaT2AHZCLQnBfhiJjHpYIo6xK8aQEbVgFH3ZS34MLw3YmYAACzorNFZQBE m/20Fyr2Rp6adZZ9H+ntkUZC6HSoHFXAIErwjnk/83q2UzulcGCRJFczoTt+X5A9Glv+Q0WrjL9nH M9HBJR8ATg/S57ZUt9qw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r2Yxp-00EFPN-0d; Mon, 13 Nov 2023 15:35:01 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r2Yxm-00EFOv-0s for linux-arm-kernel@lists.infradead.org; Mon, 13 Nov 2023 15:34:59 +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 2AD2EFEC; Mon, 13 Nov 2023 07:35:35 -0800 (PST) Received: from usa.arm.com (e103737-lin.cambridge.arm.com [10.1.197.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 091303F7B4; Mon, 13 Nov 2023 07:34:48 -0800 (PST) From: Sudeep Holla To: linux-arm-kernel@lists.infradead.org Cc: Sudeep Holla , Mark Rutland , Lorenzo Pieralisi Subject: [PATCH] firmware: psci: Fix return value from psci_system_suspend() Date: Mon, 13 Nov 2023 15:34:46 +0000 Message-ID: <20231113153446.82684-1-sudeep.holla@arm.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231113_073458_377019_55E3C106 X-CRM114-Status: GOOD ( 10.83 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Currently we return the value from invoke_psci_fn() directly as return value from psci_system_suspend(). It is wrong to send the PSCI interface return value directly. psci_to_linux_errno() provide the mapping from PSCI return value to the one that can be returned to the callers within the kernel. Use psci_to_linux_errno() to convert and return the correct value from psci_system_suspend(). Fixes: faf7ec4a92c0 ("drivers: firmware: psci: add system suspend support") Signed-off-by: Sudeep Holla Acked-by: Mark Rutland --- drivers/firmware/psci/psci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Hi, For some reason, this has gone unnoticed for years. I bumped into this when I was trying to test suspend on FVP which claims to support but returns error when called. The error was getting not communicated properly(incorrect error code) before this patch. Regards, Sudeep -- 2.42.0 diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index d9629ff87861..2328ca58bba6 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -497,10 +497,12 @@ int psci_cpu_suspend_enter(u32 state) static int psci_system_suspend(unsigned long unused) { + int err; phys_addr_t pa_cpu_resume = __pa_symbol(cpu_resume); - return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND), + err = invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND), pa_cpu_resume, 0, 0); + return psci_to_linux_errno(err); } static int psci_system_suspend_enter(suspend_state_t state)