From patchwork Mon Mar 4 14:42:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weizhao Ouyang X-Patchwork-Id: 1907645 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ADG7syAn; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TpLzD2xS7z23fC for ; Tue, 5 Mar 2024 01:43:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8149087FBC; Mon, 4 Mar 2024 15:43:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="ADG7syAn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 987DF87F92; Mon, 4 Mar 2024 15:43:11 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) (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 A21A187FAA for ; Mon, 4 Mar 2024 15:43:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=o451686892@gmail.com Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1dcad814986so40632975ad.0 for ; Mon, 04 Mar 2024 06:43:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709563385; x=1710168185; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kAnBmvUPtyk9ZyqY5Twdb8FXlln2XacWWSGREZ+qdVg=; b=ADG7syAniQ5h+x8LkavjzpasFuPcaqjFLTfdbzbyu2v0H8EkDCHUpt/VZfKnZOMyY2 6BQfvZmo8lVOs98C4CYcRf32T5HOfWhmq8ljmGWjwKD15MAZhBLbk9u/Tc05WPTvSQbZ J2t89WQKKmSANXy/2JKMmbJ/UUtwbNOJkizF/e1TH2YtikgI/Fr1qBpoNBnowfIrXYuq spJw4jUl1k8QdHIgLqnQNjZRPEY+fDmFE1JyiP03Tni3mAM/HvkCvKjn4K6IPL7MqllL DstucOaxOpzUcjo/4NiLQpjOt1bEYwe2Q+u+eAgdrWJ5cOHH2uAhh2g04Ow7Rnapye8U yjiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709563385; x=1710168185; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kAnBmvUPtyk9ZyqY5Twdb8FXlln2XacWWSGREZ+qdVg=; b=D+rVThlIEINlmesBJOwCzu/y4Etoazn63kqHnSwcz+F+99gvqpDxbm5amNLDG/Nrx9 PVPexchhf6py5ma8W9aCA1cf5FXR/eKruwXSbPz5lafF9xML/vC/SRD+0VzNUSRGnHTa rU0JVwNF5c8sghnk1Csot/CjA2PPM0TlOPl/tps2FNAsEn31nc/WoUTGZ40lKxiqtXHq UqEkbEokgndNE2Jo2jpO4w0szE9tCVLvi5N3Wv8garDzYqVlhhn3zubPCKa5ORdeqGnl T8D8mxCyZVURuZTqaIngOgB8xtv4mkh7MXtVCnlxQNUTASp0hAzvxD6brz5cN5Af8PCI CwrQ== X-Forwarded-Encrypted: i=1; AJvYcCWEvx5CkxdKLg0RXOAc9kCwR4lwmh+FZ7GIbf0jPaL40qEssDXRukOUHlyngWwbwuE7hM3igibABKvy/1F7+FwXZz1kDA== X-Gm-Message-State: AOJu0Yx9zD19X+ApKi4XWx71YspsbyDwq+SFYBxzlLZfgRVolqSc39Ak wsILDMz5TfvJkcuY8vLtNoUNZPmEwt/1WEkjQ1PNWMULw3N0YZWh X-Google-Smtp-Source: AGHT+IFEl6onAjtAZwyO+DsN9aAedcEbFzd5Jx+ay/aaoA25+DMO9DwkQGbUCILDmjFzQjAlvQ9p9g== X-Received: by 2002:a17:902:c408:b0:1db:28bd:2949 with SMTP id k8-20020a170902c40800b001db28bd2949mr13078576plk.0.1709563384957; Mon, 04 Mar 2024 06:43:04 -0800 (PST) Received: from ownia.localdomain ([8.210.91.195]) by smtp.gmail.com with ESMTPSA id lc8-20020a170902fa8800b001dc8923a2c4sm8629529plb.294.2024.03.04.06.43.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 06:43:04 -0800 (PST) From: Weizhao Ouyang To: Sughosh Ganu , Heinrich Schuchardt , Tom Rini , Etienne Carriere , Weizhao Ouyang , Simon Glass , Peng Fan , Ilias Apalodimas , Jens Wiklander , Abdellatif El Khlifi , u-boot@lists.denx.de Subject: [PATCH v4 1/3] firmware: psci: Fix bind_smccc_features psci check Date: Mon, 4 Mar 2024 14:42:40 +0000 Message-Id: <20240304144242.11666-2-o451686892@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240304144242.11666-1-o451686892@gmail.com> References: <20240304144242.11666-1-o451686892@gmail.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean According to PSCI specification DEN0022F, PSCI_FEATURES is used to check whether the SMCCC is implemented by discovering SMCCC_VERSION. Signed-off-by: Weizhao Ouyang --- v3: remove fallback smc call v2: check SMCCC_ARCH_FEATURES --- drivers/firmware/psci.c | 5 ++++- include/linux/arm-smccc.h | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index c6b9efab41..03544d76ed 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -135,10 +135,13 @@ static int bind_smccc_features(struct udevice *dev, int psci_method) PSCI_VERSION_MAJOR(psci_0_2_get_version()) == 0) return 0; - if (request_psci_features(ARM_SMCCC_ARCH_FEATURES) == + if (request_psci_features(ARM_SMCCC_VERSION) == PSCI_RET_NOT_SUPPORTED) return 0; + if (invoke_psci_fn(ARM_SMCCC_VERSION, 0, 0, 0) < ARM_SMCCC_VERSION_1_1) + return 0; + if (psci_method == PSCI_METHOD_HVC) pdata->invoke_fn = smccc_invoke_hvc; else diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index f44e9e8f93..da3d29aabe 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -55,8 +55,14 @@ #define ARM_SMCCC_QUIRK_NONE 0 #define ARM_SMCCC_QUIRK_QCOM_A6 1 /* Save/restore register a6 */ +#define ARM_SMCCC_VERSION 0x80000000 #define ARM_SMCCC_ARCH_FEATURES 0x80000001 +#define ARM_SMCCC_VERSION_1_0 0x10000 +#define ARM_SMCCC_VERSION_1_1 0x10001 +#define ARM_SMCCC_VERSION_1_2 0x10002 +#define ARM_SMCCC_VERSION_1_3 0x10003 + #define ARM_SMCCC_RET_NOT_SUPPORTED ((unsigned long)-1) #ifndef __ASSEMBLY__ From patchwork Mon Mar 4 14:42:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weizhao Ouyang X-Patchwork-Id: 1907646 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=WOJKQ1kN; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TpLzR0hcnz23fC for ; Tue, 5 Mar 2024 01:43:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0473487FAE; Mon, 4 Mar 2024 15:43:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="WOJKQ1kN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7314D87F92; Mon, 4 Mar 2024 15:43:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) (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 932D787FA9 for ; Mon, 4 Mar 2024 15:43:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=o451686892@gmail.com Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1dc5d0162bcso38227945ad.0 for ; Mon, 04 Mar 2024 06:43:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709563388; x=1710168188; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=V9B66oKheLZECYu8R4q13CZZkJRH/+q6HouwoF0reSE=; b=WOJKQ1kNzCFxGnlQ+JgSuiOnHGEzygfvdLDTQjDBPu2wk0Tksa1srJOibEEru03lHt 6uIsalng6p2rX0GM4pCbb3U8G5M5yZdS369Ey8Pn2eVkdPpiT9tm56AP8ZSwuk4wOYUn Nm5oEUDHFdKsyQaqSRLU5bd2JkINWI+RAWwPTBsFKwbRgqLiwCeKA1aBn0jp6XRN0/ee oo6lNf9J6GMX+SnKfbdPFXSe6Fcikid6wXZGrS8gU+S7WdlqtB085qd2GC/Y+xr/LWBE fJQenL5t9+IQNe8TeAf1exlJSpPnfAxubTPTyPPkhwoxwkHXSISwSQEQizSVT0z/rXu6 W6Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709563388; x=1710168188; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V9B66oKheLZECYu8R4q13CZZkJRH/+q6HouwoF0reSE=; b=LlqZ4Tw7n4AMR1wsocCRtYEOwDiHGZrjDxnlTTN7LQ9s4+/cQx8lfupNKr0CNdtyZP ZKCH3i32OKD4INW9kQv6qQY1TI4QYTUWrPSOxEgM8EsTk1gWmFupKNv7b40hgAoo6R48 Q1xfobl1FA/yIpVWEw73wLieoWzQ2HFVDs1EzldgRIx09DhOdQGx/E6JmezCo5lQqp5/ Y/BiDy+xV7D8UrMaA6UDB5hVYRMjbL9TqNVS0RyYQhtlcQH2HQ+XEhWHdfD9vgmpUXgV 3nrulRrEymzbbJUJfP9Zou+Elh8eG/n38mFH/ZV6Fbg4ziIt2S5z3NuyzOGzUyKsNFjE McRA== X-Forwarded-Encrypted: i=1; AJvYcCUuNBxr/as+XrpUkHahjAUUGPWruIY/oyjl2Zv4RRmD1ite51yeZFkqBXVfLIf6E9iXel+eo9sCji5HvudYH5DkN/bGjA== X-Gm-Message-State: AOJu0YwXZZKdf1/KTp9nJ+gYN9IIDtzwrPcTAueHCN6a3ZwjkZIFD1bf 1mVip39pNQX81FmQBplehdwQlAJfkJ+RPJgoNlBZJK7vb5lz/Nwn X-Google-Smtp-Source: AGHT+IEEM2VTEpx5ngWF36rWr526kWzgpCAP31yE3X02hp+oLXcEeWyPTG2AMbgZFqDcl7QtYUSWMQ== X-Received: by 2002:a17:903:2409:b0:1dc:a605:5435 with SMTP id e9-20020a170903240900b001dca6055435mr9750422plo.31.1709563388165; Mon, 04 Mar 2024 06:43:08 -0800 (PST) Received: from ownia.localdomain ([8.210.91.195]) by smtp.gmail.com with ESMTPSA id lc8-20020a170902fa8800b001dc8923a2c4sm8629529plb.294.2024.03.04.06.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 06:43:07 -0800 (PST) From: Weizhao Ouyang To: Sughosh Ganu , Heinrich Schuchardt , Tom Rini , Etienne Carriere , Weizhao Ouyang , Simon Glass , Peng Fan , Ilias Apalodimas , Jens Wiklander , Abdellatif El Khlifi , u-boot@lists.denx.de Subject: [PATCH v4 2/3] driver: rng: Fix SMCCC TRNG crash Date: Mon, 4 Mar 2024 14:42:41 +0000 Message-Id: <20240304144242.11666-3-o451686892@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240304144242.11666-1-o451686892@gmail.com> References: <20240304144242.11666-1-o451686892@gmail.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean Fix a SMCCC TRNG null pointer crash due to a failed smccc feature binding. Fixes: 53355bb86c25 ("drivers: rng: add smccc trng driver") Reviewed-by: Heinrich Schuchardt Signed-off-by: Weizhao Ouyang --- v3: add Fixes tag --- drivers/rng/smccc_trng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rng/smccc_trng.c b/drivers/rng/smccc_trng.c index 3a4bb33941..3087cb991a 100644 --- a/drivers/rng/smccc_trng.c +++ b/drivers/rng/smccc_trng.c @@ -166,7 +166,7 @@ static int smccc_trng_probe(struct udevice *dev) struct smccc_trng_priv *priv = dev_get_priv(dev); struct arm_smccc_res res; - if (!(smccc_trng_is_supported(smccc->invoke_fn))) + if (!smccc || !(smccc_trng_is_supported(smccc->invoke_fn))) return -ENODEV; /* At least one of 64bit and 32bit interfaces is available */ From patchwork Mon Mar 4 14:42:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weizhao Ouyang X-Patchwork-Id: 1907647 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ZB0yT4Uy; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TpLzd17xjz23fC for ; Tue, 5 Mar 2024 01:43:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6D16287FB9; Mon, 4 Mar 2024 15:43:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="ZB0yT4Uy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C065087FAE; Mon, 4 Mar 2024 15:43:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) (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 800EC87FAA for ; Mon, 4 Mar 2024 15:43:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=o451686892@gmail.com Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1dc3b4b9b62so38969865ad.1 for ; Mon, 04 Mar 2024 06:43:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709563392; x=1710168192; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IC7fwBnVFr7LZXSeRRyncmjuMuUcEgwgdmAWQJbhy2M=; b=ZB0yT4UyG0NDeyhQkQXH0KRYt5uhkYlyhnH0cFnoPXYWZ4aW+nHVm9zqKU30OB5tqx 0APzmOHpuIa33xVoJ9WKOIO1ibnPSTlenLPB1WUYm8Rfeo8Lq7mf7n8Z5ZZ6iQ7wAwPv FZfc0CzCnECiCBPfa2IraZVx/mwVbHx+H2ywzXgkuzTIHJsU3RYOEVk6iwt6z2RGyUXy q1x+Ci8fe0vNFGa3+5W7NJ5V7jOzzfJeqg9gHXKzl8riAc5oOvRwIrojGkHL6ujjHEJ+ hD0aVy9LdHmagaFARN3Y3jlUu5gc7BFxUvDqwtW16bblYzCppdIOjexSBL5WSsjEsNtl ankw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709563392; x=1710168192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IC7fwBnVFr7LZXSeRRyncmjuMuUcEgwgdmAWQJbhy2M=; b=c81pxqoV4jxgzJZjeRRVQGIRwEZrrwf/+0G4EUDlzzipzVk5s/mA0zRA0LglFsY9Re ID6Zi8xZyYQKfMe8FNwukJSSm+Ov1LfczDlLoCP9+ez82VkZDKg5rA6TJguTDR+iCVTF vhfXtSwOEX0Mnt9aoIoWWc4g16HAW9O5/astABK3nkgpJTLCgXgvLbAQ3N0XiYT0Jy43 BiYLrrUEjJGnNDUkt7IFm/xwhjP3ZHHtv5x+7x+U2cgfz9EC5ypyvoi81HR13ISv2qnM lw/qiF1MJJKfvBzUTYVZ5oGwxgzdD3bbO6dqsUflhQkshFZ4v1WjDi1YzfWHFpOlzjof 6mzw== X-Forwarded-Encrypted: i=1; AJvYcCWBmSbpHHQ7lbJ6mPDuMGDJql7tWuTv62wS/H4O844h5L0+6FCEKkil/JzwrHbr4uqDEFUpTUcerj9c613WJciGGdJiOw== X-Gm-Message-State: AOJu0YwvHidJ9XRYDnrkGJGGKztFEByTD3K0uvqPDyj/CTIYAGN2g1DZ rl64R9/CIQ56IVhjNHJh04zrpXfYKYzCnyMn1xk8wiXb6h/n03IU X-Google-Smtp-Source: AGHT+IHs1D3NAdT/9s2hyXFtiZ0ttPD8NcVLY4e9DDCeHFTOtljR7FMwGL3BHPb0mEuuH9cxKohtNg== X-Received: by 2002:a17:903:32cd:b0:1dc:fefe:8050 with SMTP id i13-20020a17090332cd00b001dcfefe8050mr7209705plr.29.1709563391648; Mon, 04 Mar 2024 06:43:11 -0800 (PST) Received: from ownia.localdomain ([8.210.91.195]) by smtp.gmail.com with ESMTPSA id lc8-20020a170902fa8800b001dc8923a2c4sm8629529plb.294.2024.03.04.06.43.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 06:43:11 -0800 (PST) From: Weizhao Ouyang To: Sughosh Ganu , Heinrich Schuchardt , Tom Rini , Etienne Carriere , Weizhao Ouyang , Simon Glass , Peng Fan , Ilias Apalodimas , Jens Wiklander , Abdellatif El Khlifi , u-boot@lists.denx.de Subject: [PATCH v4 3/3] cmd: rng: Add rng list command Date: Mon, 4 Mar 2024 14:42:42 +0000 Message-Id: <20240304144242.11666-4-o451686892@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240304144242.11666-1-o451686892@gmail.com> References: <20240304144242.11666-1-o451686892@gmail.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean The 'rng list' command probes all RNG devices and list those devices that are successfully probed. Also update the help info. Reviewed-by: Heinrich Schuchardt Signed-off-by: Weizhao Ouyang --- v4: update doc/usage/cmd/rng.rst --- cmd/rng.c | 23 ++++++++++++++++++----- doc/usage/cmd/rng.rst | 14 ++++++++++---- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/cmd/rng.c b/cmd/rng.c index 52f722c7af..b073a6c849 100644 --- a/cmd/rng.c +++ b/cmd/rng.c @@ -19,6 +19,22 @@ static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) struct udevice *dev; int ret = CMD_RET_SUCCESS; + if (argc == 2 && !strcmp(argv[1], "list")) { + int idx = 0; + + uclass_foreach_dev_probe(UCLASS_RNG, dev) { + idx++; + printf("RNG #%d - %s\n", dev->seq_, dev->name); + } + + if (!idx) { + log_err("No RNG device\n"); + return CMD_RET_FAILURE; + } + + return CMD_RET_SUCCESS; + } + switch (argc) { case 1: devnum = 0; @@ -56,12 +72,9 @@ static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return ret; } -U_BOOT_LONGHELP(rng, - "[dev [n]]\n" - " - print n random bytes(max 64) read from dev\n"); - U_BOOT_CMD( rng, 3, 0, do_rng, "print bytes from the hardware random number generator", - rng_help_text + "list - list all the probed rng devices\n" + "rng [dev] [n] - print n random bytes(max 64) read from dev\n" ); diff --git a/doc/usage/cmd/rng.rst b/doc/usage/cmd/rng.rst index 274e4d88df..4a61e33d27 100644 --- a/doc/usage/cmd/rng.rst +++ b/doc/usage/cmd/rng.rst @@ -11,16 +11,22 @@ Synopsis :: - rng [devnum [n]] + rng list + rng [dev] [n] -Description ------------ +rng list +-------- + +List all the probed rng devices. + +rng [dev] [n] +------------- The *rng* command reads the random number generator(RNG) device and prints the random bytes read on the console. A maximum of 64 bytes can be read in one invocation of the command. -devnum +dev The RNG device from which the random bytes are to be read. Defaults to 0.