From patchwork Tue Mar 30 19:17:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1460229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=foundries.io header.i=@foundries.io header.a=rsa-sha256 header.s=google header.b=h15Pvo1+; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F8zk36ltcz9sVq for ; Wed, 31 Mar 2021 06:18:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EFF1D8297E; Tue, 30 Mar 2021 21:17:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=foundries.io header.i=@foundries.io header.b="h15Pvo1+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2327382967; Tue, 30 Mar 2021 21:17:38 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C76DF82958 for ; Tue, 30 Mar 2021 21:17:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@foundries.io Received: by mail-lj1-x235.google.com with SMTP id u10so21151307lju.7 for ; Tue, 30 Mar 2021 12:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundries.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pbjYkrlwutLi8mOzvf2lRLS4J2UoK8/DiCHGcO916Eo=; b=h15Pvo1+xH/B4eUW6k4x+B13wTJvEjl65DbXshJOnnKQ7U22z1ABjFPuwe2yMPswzF gDQs47NFm3xe9Izw2CYL6JApMtt4ZL9ZSjMKU/KUacokqwFLiX2f8dUMnzpepnLX3GRz PNcbVtrGViwe9CkL2uidm50X4Th4JbyxKEXSTebGpfxM5lPPpG92d6VTmcob20RAQ6qg +bd/51cGGYOMl6bP+Y5wCVClgvqfuPCXCoXSAXPIT/KuFlHOf4IMBTfBvqsYEliq1wub RRIbBieF4MQfVjjA5EIh+67FjbRR0rShVJWD+VbTIMmw8TTswQ/rwNfbWlN9LS0N3bNK PQ4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pbjYkrlwutLi8mOzvf2lRLS4J2UoK8/DiCHGcO916Eo=; b=ZUrxvI79CoLC6NXpVOKQ3nwtHLM8AZTDswkAryuZFYxd3xRmUbGy0wJSo++ZFszfbw 0viLk4xe1Yt4ydKsFtcwD6yF4AfjGRTDlql9FW99DbDaNytKBP+ErC6jI9UnfDu/kO6r K/r1aBJZsqDBwjnN7wSwVCQ8nfsdS2ymEB+/wC2FY3ocWCKUstLu/N8uz6vD8oDDp+V/ ikqmjIEiE3NQ22Fw5RWhaeBkIc6cyuCmVNJXzkidESaBKmo6PUaJF/44otnH70ZZGWs+ 7qHDhuSC7H9zmJOW5UacEIbOqmdqdt1gfTUpP7s5XuFybKuBcETRgItE+mn2jNSeoTW+ GMnw== X-Gm-Message-State: AOAM532kP5GLgiNWybA71Wbr6DQMFaQFwimiuQMWmvi751Z7HTyIWQIm nllATvZaveaXYnlSlBbleovmveQGv3WlwkAh X-Google-Smtp-Source: ABdhPJzeIMO//5xrW7su6LPBXXxQxCuBpuRYIEmth8SeTIMyHR7eXp/jQzehVCsMDmyuEdtSk0BULw== X-Received: by 2002:a2e:9b47:: with SMTP id o7mr22269284ljj.66.1617131853729; Tue, 30 Mar 2021 12:17:33 -0700 (PDT) Received: from localhost ([109.108.76.111]) by smtp.gmail.com with ESMTPSA id w13sm2903042ljw.2.2021.03.30.12.17.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 12:17:33 -0700 (PDT) From: Igor Opaniuk X-Google-Original-From: Igor Opaniuk To: u-boot@lists.denx.de Cc: tim.anderson@foundries.io, mike@foundries.io, jorge@foundries.io, daiane.angolini@foundries.io, ricardo@foundries.io, vanessa.maegima@foundries.io, Igor Opaniuk , Jon Hunter , Masahiro Yamada , Michal Simek , Patrick Delaunay , Simon Glass , Yann Gautier Subject: [RFC PATCH v1 2/3] psci: add features/reset2 support Date: Tue, 30 Mar 2021 22:17:21 +0300 Message-Id: <20210330191722.1126160-3-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210330191722.1126160-1-igor.opaniuk@gmail.com> References: <20210330191722.1126160-1-igor.opaniuk@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.4 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Adds support for: * PSCI_FEATURES, which was introduced in PSCI 1.0. This provides API that allows discovering whether a specific PSCI function is implemented and its features. * SYSTEM_RESET2, which was introduced in PSCI 1.1, which extends existing SYSTEM_RESET. It provides support for vendor-specific resets, providing reset_type as an additional param. For additional details visit [1]. Implementations of some functions were borrowed from Linux PSCI driver code [2]. [1] https://developer.arm.com/documentation/den0022/latest/ [2] master/drivers/firmware/psci/psci.c Signed-off-by: Igor Opaniuk --- drivers/firmware/psci.c | 70 +++++++++++++++++++++++++++++++++++++++++ include/linux/psci.h | 3 ++ 2 files changed, 73 insertions(+) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 68953cc4f4..8416cd445f 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -26,12 +27,26 @@ #define PSCI_METHOD_HVC 1 #define PSCI_METHOD_SMC 2 +/* + * While a 64-bit OS can make calls with SMC32 calling conventions, for some + * calls it is necessary to use SMC64 to pass or return 64-bit values. + * For such calls PSCI_FN_NATIVE(version, name) will choose the appropriate + * (native-width) function ID. + */ +#if defined(CONFIG_ARM64) +#define PSCI_FN_NATIVE(version, name) PSCI_##version##_FN64_##name +#else +#define PSCI_FN_NATIVE(version, name) PSCI_##version##_FN_##name +#endif + #if CONFIG_IS_ENABLED(EFI_LOADER) int __efi_runtime_data psci_method; #else int psci_method __attribute__ ((section(".data"))); #endif +static bool reset2_supported; + unsigned long __efi_runtime invoke_psci_fn (unsigned long function_id, unsigned long arg0, unsigned long arg1, unsigned long arg2) @@ -53,6 +68,27 @@ unsigned long __efi_runtime invoke_psci_fn return res.a0; } +static int psci_features(u32 psci_func_id) +{ + return invoke_psci_fn(PSCI_1_0_FN_PSCI_FEATURES, + psci_func_id, 0, 0); +} + +static u32 psci_0_2_get_version(void) +{ + return invoke_psci_fn(PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0); +} + +static void psci_init_system_reset2(void) +{ + int ret; + + ret = psci_features(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2)); + + if (ret != PSCI_RET_NOT_SUPPORTED) + reset2_supported = true; +} + static int psci_bind(struct udevice *dev) { /* No SYSTEM_RESET support for PSCI 0.1 */ @@ -73,6 +109,7 @@ static int psci_bind(struct udevice *dev) static int psci_probe(struct udevice *dev) { const char *method; + u32 ver; #if defined(CONFIG_ARM64) if (current_el() == 3) @@ -94,6 +131,16 @@ static int psci_probe(struct udevice *dev) return -EINVAL; } + ver = psci_0_2_get_version(); + + pr_debug("PSCIv%d.%d detected in firmware.\n", + PSCI_VERSION_MAJOR(ver), + PSCI_VERSION_MINOR(ver)); + + if (PSCI_VERSION_MAJOR(ver) >= 1) { + psci_init_system_reset2(); + } + return 0; } @@ -141,6 +188,29 @@ void reset_misc(void) } #endif /* CONFIG_PSCI_RESET */ +void psci_sys_reset(u32 type) +{ + do_psci_probe(); + + if (type == SYSRESET_WARM && reset2_supported) { + /* + * reset_type[31] = 0 (architectural) + * reset_type[30:0] = 0 (SYSTEM_WARM_RESET) + * cookie = 0 (ignored by the implementation) + */ + invoke_psci_fn(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2), 0, 0, 0); + } else { + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); + } +} + +void psci_sys_poweroff(void) +{ + do_psci_probe(); + + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); +} + #ifdef CONFIG_CMD_POWEROFF int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { diff --git a/include/linux/psci.h b/include/linux/psci.h index 38edde3137..c78c1079a8 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -118,6 +118,9 @@ #ifdef CONFIG_ARM_PSCI_FW unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3); +void psci_sys_reset(u32 type); +void psci_sys_poweroff(void); + #else static inline unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3)