From nobody Wed Jun 25 11:22:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bRzvJ4lTZz5yvF4; Wed, 25 Jun 2025 11:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bRzvH3VC7z3DKb; Wed, 25 Jun 2025 11:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750850571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CpWv6fkpxMceEx37KZxVCd5d5pjb5rvgBUVg3FWlsJE=; b=Ve/zvjyaeZ+sdokUvI9MaQlU7lqIKvpLq/PxcqllaRL6Aa+djTbJFCACmJ9Ogbes1kIYkg mBiOzwxiQgcVFQOA4bR+BaI2WK+1/KK8syiSdIw090vRL9f+WINFIhntwCYvJaQvXI1O9o 9RI1bknUl4cKnNi64rZtKrDNhZcfRDQBrD5pw4gK59wjoM78JTzo/wrn62oH9H3C4YFLM7 ZqcC4Zb34V48NnVX9Sl1EXiQge/JoYB6T6a1UO8mmx0CreWj1g0q2S7Xt1zY3d8VYi0R21 0Yfp5Tti+P/2CNW+SE4HlU57t3ejSuMoGK6q7LYSJw9T6POC5okwALb4yPbm5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750850571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CpWv6fkpxMceEx37KZxVCd5d5pjb5rvgBUVg3FWlsJE=; b=sC2Txq7y6Wy1t3DZDceMsKM6g8ldEDuoxccH894e0n87jqTiKaXS49l34U0/99sJV5Q63V 4LRUPbADinLUlZJiaMarVtaYfybNvAwQY9E35VWXk8vQrDZ4Vy6yGyu29JsUXE1f8wT8N1 2k5K9cPe76I3BWBtBaqQj1MSEQfdSMF5Y6dcTUBFy+LzMDvWPx+eca6oa/XCNndU7nLLeg rHXKCBbN+JUrtmi3PrASRrAAB2+g1kr2YyOCz3KEDsSFKy8Tk4knS+epBG19XLFQTMk1wF CH+BGUB/lURIO+kBYcxo0zTMZYvaTwxKpY08p8u68MShsgjLLpYIpc7KfeUqBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750850571; a=rsa-sha256; cv=none; b=YpTvH0rQ95y9AIByeaYubMX+e8juz6Ikq2Wc6hrtcrze3ve42RNw9MPDX/qQUi1yC1M1r6 hJSSNZAzKtuw4rwQC8FsiKCQeIMRk+K9IvGLKZoAEIW0QMJnsNxP4FYV7C6pb207zsAAEA rJ6+wQC5g8wN5aSzE+5Yfasg7MZ7ov/u90+jybAS4Gm7vjoLCjqq5RAet7DrVkNzrSZNad wM6eEjLuavju7kuuqYxcrGdUFZyRWAImWVfVCcqXXQRa8eQSih0CmveB5LveH+8ewBF3Gn Tl9V+QKonNyyblhCdkCT3AT2UTKdz4xdE9daWZ2dINM9R34WwuQqb95YtQd5Uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bRzvH362pz16Q; Wed, 25 Jun 2025 11:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55PBMpmw001309; Wed, 25 Jun 2025 11:22:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55PBMpWP001305; Wed, 25 Jun 2025 11:22:51 GMT (envelope-from git) Date: Wed, 25 Jun 2025 11:22:51 GMT Message-Id: <202506251122.55PBMpWP001305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 288ba78edcfd - main - dev/psci: Check for functions before calling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 288ba78edcfd82b4b558a46fae78e4076acbe200 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=288ba78edcfd82b4b558a46fae78e4076acbe200 commit 288ba78edcfd82b4b558a46fae78e4076acbe200 Author: Andrew Turner AuthorDate: 2025-06-24 16:47:28 +0000 Commit: Andrew Turner CommitDate: 2025-06-24 17:45:42 +0000 dev/psci: Check for functions before calling In the SMCCC TRNG and Errata ABI drivers check if the version functions are implemented before calling them. Without this the firmware may complain about an unimplemented function being called. Reported by: bz Reviewed by: bz Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50978 --- sys/dev/psci/smccc_errata.c | 3 ++- sys/dev/psci/smccc_trng.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/psci/smccc_errata.c b/sys/dev/psci/smccc_errata.c index 92f39c72c7f0..ebfc0f8b67ee 100644 --- a/sys/dev/psci/smccc_errata.c +++ b/sys/dev/psci/smccc_errata.c @@ -70,7 +70,8 @@ errata_identify(driver_t *driver, device_t parent) { int32_t version; - if (smccc_get_version() < SMCCC_MAKE_VERSION(1, 1)) + /* Check if Errata ABI is supported */ + if (smccc_arch_features(EM_VERSION) != SMCCC_RET_SUCCESS) return; /* Check we have Errata 1.0 or later */ diff --git a/sys/dev/psci/smccc_trng.c b/sys/dev/psci/smccc_trng.c index 5f54d8adc24a..bf8c95a81c83 100644 --- a/sys/dev/psci/smccc_trng.c +++ b/sys/dev/psci/smccc_trng.c @@ -69,8 +69,8 @@ trng_identify(driver_t *driver, device_t parent) { int32_t version; - /* TRNG depends on SMCCC 1.1 (per the spec) */ - if (smccc_get_version() < SMCCC_MAKE_VERSION(1, 1)) + /* Check if TRNG is supported */ + if (smccc_arch_features(TRNG_VERSION) != SMCCC_RET_SUCCESS) return; /* Check we have TRNG 1.0 or later */