From nobody Mon Sep 25 11:00:41 2023 X-Original-To: dev-commits-src-all@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 4RvKfd5c9jz4vMZK; Mon, 25 Sep 2023 11:00:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RvKfd5150z3LPY; Mon, 25 Sep 2023 11:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639641; 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=SJ6dokyUgLbf/HZ201+ZjCeeDXb0Duj1IJO+utusBcI=; b=FE07fSpq6oQkxiALX2bXwDsvzvRkeq9So+4mFzEz4gkcT+D6hvXqpQxFuXKdegVKGJZ2TU Bw6xtWkTo/FOyJUk95U8jxp64bPfnxr9vgh43PX9dl9E5RqJ8WERyh9cI9oJ49qgr06QbA NCC2tZRQjz9Nk8uK8cep/vUN903LL7HTw56kvlJllr7x0oyrovi8LL1mzhjrZLlAnpo7ok iDsVygNpPUq1NdJ/E6ZlU2tKfzqCmmBgpO3qVX5GUqZUXUb/kKU/s5NBBqTA21T7wwP3qT aKHSbS7gGHfIHtO/VeuDg8ZYnxBQ6iw6azoIKLDMlXoeIb77+gQYO/CCjPrZqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695639641; a=rsa-sha256; cv=none; b=euu13dpLqNhy41cV5raLeRo1ymIl+w1JCYXuvgMhoG8H8NpAlQypgQvQzWYWSo1K5moafU fkP1NyZWhoiIt+5UGpTAuoYLP3TcbhLYyXt7R3fArPZ7/nu7dxNFOsWcl4argoDRX433lO HAww3rmS8RviBrj2dmf68PS8T09tt+kmH4LIyJVd9zCV1zPb0qt1B+LIrdLfKt7Boeq83U fArqaqU7jJDx3xj5KtjYsbZjD/KS5rGROqRWvEhwKiZqXvOufTJvQZeIwgaQRm3VTD+9/V yWAu0N6KzK+MyaRhqK3jwOUvXcMyZKfR4tqc++ClF3Mz0zc4aUXe2cCe6amkYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639641; 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=SJ6dokyUgLbf/HZ201+ZjCeeDXb0Duj1IJO+utusBcI=; b=kRRfhZp0BWMydJ/1TlcivDV5lKemXeU358fArJSDR1R5Fof4xYNckR9ffNwQLSW8GcGo1P YHWJF7zaOfODn+uBFZSIUXN7lHJcOby/kKTMrbaW/a2UUHF0oMofzsM0Fhm2UvYjfh2dZK cwOeDzD+ua6GGdV02lDie0hOOyhHjFJDfz+Ayhk/9O8AoQ6pIJmm227t33Zd3Ab7I1qz4U i+EY830Re3GmkLmS22eS81Y7QmBOI2YMUjSx5GLuVR+j99grPd1cJ+d+7ufOl5PVCSinpo 2x1Kd9C3LINSBhkXPKkVkE3W/1FjzSy9VqpNbA4SsnsenAgaN+xgDkHuAO07dA== 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 4RvKfd44rZz1QQ4; Mon, 25 Sep 2023 11:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38PB0fRM052257; Mon, 25 Sep 2023 11:00:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PB0f1R052254; Mon, 25 Sep 2023 11:00:41 GMT (envelope-from git) Date: Mon, 25 Sep 2023 11:00:41 GMT Message-Id: <202309251100.38PB0f1R052254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: a2228dc70153 - stable/13 - Allow psci.h to be used by userspace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: a2228dc7015344b4d8d532f75c3eb175c56ac513 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a2228dc7015344b4d8d532f75c3eb175c56ac513 commit a2228dc7015344b4d8d532f75c3eb175c56ac513 Author: Andrew Turner AuthorDate: 2023-03-16 12:08:32 +0000 Commit: Andrew Turner CommitDate: 2023-09-25 08:41:15 +0000 Allow psci.h to be used by userspace Wrap parts of psci.h that aren't usable by userspace in _KERNEL checks. This allows it to be used to implement PSCI and SMCCC by bhyve in userspace. Sponsored by: Arm Ltd Sponsored by: Innovate UK Sponsored by: The FreeBSD Foundation (cherry picked from commit 473ab212dc1f72c1765f112568237d229d4e0441) --- sys/dev/psci/psci.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/psci/psci.h b/sys/dev/psci/psci.h index 6eeab8ab6071..c34b5d0b104f 100644 --- a/sys/dev/psci/psci.h +++ b/sys/dev/psci/psci.h @@ -30,6 +30,7 @@ #include #include +#ifdef _KERNEL typedef int (*psci_initfn_t)(device_t dev, int default_version); typedef int (*psci_callfn_t)(register_t, register_t, register_t, register_t, register_t, register_t, register_t, register_t, @@ -50,6 +51,7 @@ psci_call(register_t a, register_t b, register_t c, register_t d) return (psci_callfn(a, b, c, d, 0, 0, 0, 0, NULL)); } +#endif /* * PSCI return codes. @@ -100,6 +102,7 @@ psci_call(register_t a, register_t b, register_t c, register_t d) #define PSCI_VER_MAJOR(v) (((v) >> 16) & 0xFF) #define PSCI_VER_MINOR(v) ((v) & 0xFF) +#ifdef _KERNEL enum psci_fn { PSCI_FN_VERSION, PSCI_FN_CPU_SUSPEND, @@ -113,5 +116,6 @@ enum psci_fn { PSCI_FN_SYSTEM_RESET, PSCI_FN_MAX }; +#endif #endif /* _MACHINE_PSCI_H_ */