From patchwork Fri Nov 25 10:18:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 13055746 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 C75F7C4332F for ; Fri, 25 Nov 2022 10:38:04 +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=gjAL7gSSn+RqB8ErmQd3sXI6+PF7RYFAPnD8sDAXhVw=; b=1TWlyWoL6k2N/W nyM5kmnSGqBLGZf8Hz8nNIr9kWFPJZ84AmZGl/hvkk1D+RedS8XfCqeF8mP5w4Lu+WIUTHpCXL2FH jW2zOjQ6lYwzJWWkfqHr78WP7LRnf+aifdF8QhiJOLIxh5kbeOZ9rZoI1NohkRyGAH/ma3c+gc8LB UXYPGpnuuQaQdjoGlbuxi5evb4tw9doIcdcPKfRY9Dhg2r5lQsSb1BC6QmJtVYrHu2jZ+xjGgEPon gkYaLdWBTyi6Qz/3jt0CdIYsbCHdabjHpp0bVNuZOHFTAFM+OSGEc6to5whsy6BP4jjtNXo9MDKIN l9nwSIiC+/qn9WvdxwiQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oyW4n-00FX2X-CA; Fri, 25 Nov 2022 10:36:58 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oyVn2-00FJpo-2f for linux-arm-kernel@lists.infradead.org; Fri, 25 Nov 2022 10:18:37 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id ACD20B82976; Fri, 25 Nov 2022 10:18:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 143FCC433C1; Fri, 25 Nov 2022 10:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669371512; bh=zWTAq+uGGK/hdPVyIp6XWQdS38gXslyuYuYTRW8txDk=; h=From:To:Cc:Subject:Date:From; b=UGryysrgOi6CdtNL/+Z8vMkflfxnbi4q8TfchzxkJtZtbXT34pPbrIw1e1Itaqlv6 CcL+kSXZEl7V/PBInyrKOSlRRxty/1RYtM6KOIEecmPp6HgELzLO/FLG4s3a6KwhBA rOD0LA14LZWYL7HbfNmJGaD4KkJJyMoZgsSEN/MeqU5a9/A1fUk3KiewfTgRnd1LrN 5kIoYXGs/QnHaVrYaT8sGK7ze7FGt0IgvFRvGAsJvZtCEWHJKeYHcfEF1dLMKM0ph7 BLe89m5n7MjM5p4QkCKwNOEqUIcHcVBSJv13Pruiu0uR4FfHqdkFvbUiOqW+7BpzT2 FY3gKcTgiB1Hw== From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: Will Deacon , Dmitry Baryshkov , Mark Rutland , Lorenzo Pieralisi , Arnd Bergmann Subject: [PATCH] firmware/psci: Fix MEM_PROTECT_RANGE function numbers Date: Fri, 25 Nov 2022 10:18:26 +0000 Message-Id: <20221125101826.22404-1-will@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221125_021836_323608_5194A08B X-CRM114-Status: GOOD ( 14.12 ) 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 PSCI v1.1 offers 32-bit and 64-bit variants of the MEM_PROTECT_RANGE call using function identifier 20. Fix the incorrect definitions of the MEM_PROTECT_CHECK_RANGE calls in the PSCI UAPI header. Cc: Dmitry Baryshkov Cc: Mark Rutland Cc: Lorenzo Pieralisi Cc: Arnd Bergmann Fixes: 3137f2e60098 ("firmware/psci: Add debugfs support to ease debugging") Signed-off-by: Will Deacon Acked-by: Marc Zyngier --- include/uapi/linux/psci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h index 3511095c2702..42a40ad3fb62 100644 --- a/include/uapi/linux/psci.h +++ b/include/uapi/linux/psci.h @@ -58,7 +58,7 @@ #define PSCI_1_1_FN_SYSTEM_RESET2 PSCI_0_2_FN(18) #define PSCI_1_1_FN_MEM_PROTECT PSCI_0_2_FN(19) -#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN(19) +#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN(20) #define PSCI_1_0_FN64_CPU_DEFAULT_SUSPEND PSCI_0_2_FN64(12) #define PSCI_1_0_FN64_NODE_HW_STATE PSCI_0_2_FN64(13) @@ -67,7 +67,7 @@ #define PSCI_1_0_FN64_STAT_COUNT PSCI_0_2_FN64(17) #define PSCI_1_1_FN64_SYSTEM_RESET2 PSCI_0_2_FN64(18) -#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN64(19) +#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN64(20) /* PSCI v0.2 power state encoding for CPU_SUSPEND function */ #define PSCI_0_2_POWER_STATE_ID_MASK 0xffff