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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 34557C4332F for ; Thu, 22 Dec 2022 00:47:18 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27D55852E7; Thu, 22 Dec 2022 01:47:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671670027; bh=QmZw5pg7Tb8S5lZSwHFTJK2EvE3523pA58EPcoxlH6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=I7IwHiN3cCn8yoV/v3VLi16tPhm58Ghg5N4xP0Nw7Jv9pif0AQaSFaIPFC4FJ6Gn5 UpN8IWL/faxf5k9Qf5dVeVHJr02C/easZ1FZhaqX1IhtrCi/OG36r7JJNArpxRvurH cSHtQT5KZKAZTxllyDjcMEq68kKstplHI4SecAu0QFALqXBckM1eqZVcnHeZGuEdv/ yFFBvKig1qNwF9G42bGTuKMdtP1uF4F2mqAXUEBPy1xDpDq4SIcRkOX+HbvCRRFrpK 5Las3FR49cY2MDY4IwZ1qO0wS9ykjRkB57e9Dyo0E2KijOlMSTK0SMKyqe9z6PkKXC 87z5WF4n6oCbg== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 86BED85236; Thu, 22 Dec 2022 01:47:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671670021; bh=QmZw5pg7Tb8S5lZSwHFTJK2EvE3523pA58EPcoxlH6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fPZCkaeld+5C0g1XyTCu4G3wWZVD5AQ9eau6WrfBSEKslN+yrC7WAJGUdUBuu107B DyfDDYqzYfKe2fkrvppqBByBUCBYzYn/KoZm1a+CRi+nx0r1Vtsa1Z+oq/mGyBffYp q1PzBIrpHuEUyUjF34khSadMjLeuN5P8rUSBKPSkwfa6nsiwITy+uFuIlQBuM1Wr8y VpFp5CEKEIns1+u7A6pZQkey3edBmyfJEMqqaKQ+cuWpKNafAy7KqfaFNJllyVc8M0 a+YntDlnL0BRWuarbHYN86LIu5DmbnxAZclQanUGwxTZO9VvtIAZCq1sM+lCOL8U2l Gr9jSEZf5PDxA== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , "NXP i.MX U-Boot Team" , "Ying-Chun Liu (PaulLiu)" , Adam Ford , Andrejs Cainikovs , Fabio Estevam , Manoj Sai , Marcel Ziswiler , Michael Trimarchi , Peng Fan , Ricardo Salveti , Simon Glass , Stefano Babic , Tim Harvey , Ye Li Subject: [PATCH 02/10] arm: psci: Fix RESET2 hook Date: Thu, 22 Dec 2022 01:46:35 +0100 Message-Id: <20221222004643.1013095-2-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221222004643.1013095-1-marex@denx.de> References: <20221222004643.1013095-1-marex@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean The RESET2 hook is a PSCI v1.1 functionality, rename the macro accordinly. Add missing handler for the RESET2 hook, so it can be implemented by U-Boot. Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "NXP i.MX U-Boot Team" Cc: "Ying-Chun Liu (PaulLiu)" Cc: Adam Ford Cc: Andrejs Cainikovs Cc: Fabio Estevam Cc: Manoj Sai Cc: Marcel Ziswiler Cc: Michael Trimarchi Cc: Peng Fan Cc: Ricardo Salveti Cc: Simon Glass Cc: Stefano Babic Cc: Tim Harvey Cc: Ye Li --- arch/arm/cpu/armv8/fwcall.c | 2 +- arch/arm/cpu/armv8/psci.S | 2 ++ arch/arm/include/asm/psci.h | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c index 16914dc1eed..87de09979b1 100644 --- a/arch/arm/cpu/armv8/fwcall.c +++ b/arch/arm/cpu/armv8/fwcall.c @@ -103,7 +103,7 @@ void __noreturn psci_system_reset2(u32 reset_level, u32 cookie) { struct pt_regs regs; - regs.regs[0] = ARM_PSCI_0_2_FN64_SYSTEM_RESET2; + regs.regs[0] = ARM_PSCI_1_1_FN64_SYSTEM_RESET2; regs.regs[1] = PSCI_RESET2_TYPE_VENDOR | reset_level; regs.regs[2] = cookie; if (use_smc_for_psci) diff --git a/arch/arm/cpu/armv8/psci.S b/arch/arm/cpu/armv8/psci.S index 7ffc8dbadbe..1133518f16e 100644 --- a/arch/arm/cpu/armv8/psci.S +++ b/arch/arm/cpu/armv8/psci.S @@ -82,6 +82,7 @@ PSCI_DEFAULT(psci_node_hw_state_64) PSCI_DEFAULT(psci_system_suspend_64) PSCI_DEFAULT(psci_stat_residency_64) PSCI_DEFAULT(psci_stat_count_64) +PSCI_DEFAULT(psci_system_reset2_64) .align 3 _psci_64_table: @@ -95,6 +96,7 @@ PSCI_TABLE(ARM_PSCI_1_0_FN64_NODE_HW_STATE, psci_node_hw_state_64) PSCI_TABLE(ARM_PSCI_1_0_FN64_SYSTEM_SUSPEND, psci_system_suspend_64) PSCI_TABLE(ARM_PSCI_1_0_FN64_STAT_RESIDENCY, psci_stat_residency_64) PSCI_TABLE(ARM_PSCI_1_0_FN64_STAT_COUNT, psci_stat_count_64) +PSCI_TABLE(ARM_PSCI_1_1_FN64_SYSTEM_RESET2, psci_system_reset2_64) PSCI_TABLE(0, 0) .macro psci_enter diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index 8b3fb872255..7343b941ef0 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -69,7 +69,6 @@ #define ARM_PSCI_0_2_FN64_AFFINITY_INFO ARM_PSCI_0_2_FN64(4) #define ARM_PSCI_0_2_FN64_MIGRATE ARM_PSCI_0_2_FN64(5) #define ARM_PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU ARM_PSCI_0_2_FN64(7) -#define ARM_PSCI_0_2_FN64_SYSTEM_RESET2 ARM_PSCI_0_2_FN64(18) /* PSCI 1.0 interface */ #define ARM_PSCI_1_0_FN_PSCI_FEATURES ARM_PSCI_0_2_FN(10) @@ -87,6 +86,9 @@ #define ARM_PSCI_1_0_FN64_STAT_RESIDENCY ARM_PSCI_0_2_FN64(16) #define ARM_PSCI_1_0_FN64_STAT_COUNT ARM_PSCI_0_2_FN64(17) +/* PSCI 1.1 interface */ +#define ARM_PSCI_1_1_FN64_SYSTEM_RESET2 ARM_PSCI_0_2_FN64(18) + /* 1KB stack per core */ #define ARM_PSCI_STACK_SHIFT 10 #define ARM_PSCI_STACK_SIZE (1 << ARM_PSCI_STACK_SHIFT) -- 2.35.1