From: Oliver Upton <oliver.upton@linux.dev>
To: kvmarm@lists.linux.dev
Cc: kvm@vger.kernel.org, Marc Zyngier <maz@kernel.org>,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>, Will Deacon <will@kernel.org>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Salil Mehta <salil.mehta@huawei.com>,
Oliver Upton <oliver.upton@linux.dev>
Subject: [PATCH kvmtool 20/21] aarch64: psci: Implement SYSTEM_{OFF,RESET}
Date: Fri, 26 May 2023 22:18:49 +0000 [thread overview]
Message-ID: <20230526221849.317435-1-oliver.upton@linux.dev> (raw)
In-Reply-To: <20230526221712.317287-1-oliver.upton@linux.dev>
Add support for the PSCI SYSTEM_{OFF,RESET} calls. Match the behavior of
the SYSTEM_EVENT based implementation and just terminate the VM.
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
---
arm/aarch64/psci.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arm/aarch64/psci.c b/arm/aarch64/psci.c
index c33e63bdc3ef..daeb6f11f2d0 100644
--- a/arm/aarch64/psci.c
+++ b/arm/aarch64/psci.c
@@ -33,6 +33,8 @@ static void psci_features(struct kvm_cpu *vcpu, struct arm_smccc_res *res)
case PSCI_0_2_FN_AFFINITY_INFO:
case PSCI_0_2_FN64_AFFINITY_INFO:
case PSCI_0_2_FN_MIGRATE_INFO_TYPE:
+ case PSCI_0_2_FN_SYSTEM_OFF:
+ case PSCI_0_2_FN_SYSTEM_RESET:
case ARM_SMCCC_VERSION_FUNC_ID:
res->a0 = PSCI_RET_SUCCESS;
break;
@@ -194,6 +196,10 @@ void handle_psci(struct kvm_cpu *vcpu, struct arm_smccc_res *res)
/* Trusted OS not present */
res->a0 = PSCI_0_2_TOS_MP;
break;
+ case PSCI_0_2_FN_SYSTEM_OFF:
+ case PSCI_0_2_FN_SYSTEM_RESET:
+ kvm__reboot(vcpu->kvm);
+ break;
default:
res->a0 = PSCI_RET_NOT_SUPPORTED;
}
--
2.41.0.rc0.172.g3f132b7071-goog
next prev parent reply other threads:[~2023-05-26 22:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-26 22:16 [PATCH kvmtool 00/21] arm64: Handle PSCI calls in userspace Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 01/21] update_headers: Use a list for arch-generic headers Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 02/21] update_headers: Add missing entries to list of headers to copy Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 03/21] Copy 64-bit alignment attrtibutes from Linux 6.4-rc1 Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 04/21] Update headers with " Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 05/21] Import arm-smccc.h from " Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 06/21] aarch64: Copy cputype.h " Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 07/21] arm: Stash kvm_vcpu_init for later use Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 08/21] arm: Add support for resetting a vCPU Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 09/21] arm: Use KVM_SET_MP_STATE ioctl to power off non-boot vCPUs Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 10/21] aarch64: Expose ARM64_CORE_REG() for general use Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 11/21] arm: Generalize execution state specific VM initialization Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 12/21] Add helpers to pause the VM from vCPU thread Oliver Upton
2023-06-09 10:59 ` Shaoqin Huang
2023-06-15 8:59 ` Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 13/21] aarch64: Add support for finding vCPU for given MPIDR Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 14/21] aarch64: Add skeleton implementation for PSCI Oliver Upton
2023-06-13 15:10 ` Joey Gouly
2023-05-26 22:17 ` [PATCH kvmtool 15/21] aarch64: psci: Implement CPU_SUSPEND Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 16/21] aarch64: psci: Implement CPU_OFF Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 17/21] aarch64: psci: Implement CPU_ON Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 18/21] aarch64: psci: Implement AFFINITY_INFO Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 19/21] aarch64: psci: Implement MIGRATE_INFO_TYPE Oliver Upton
2023-05-26 22:18 ` Oliver Upton [this message]
2023-05-26 22:19 ` [PATCH kvmtool 21/21] aarch64: smccc: Start sending PSCI to userspace Oliver Upton
2023-06-14 12:05 ` [PATCH kvmtool 00/21] arm64: Handle PSCI calls in userspace Joey Gouly
2023-06-14 16:05 ` Oliver Upton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230526221849.317435-1-oliver.upton@linux.dev \
--to=oliver.upton@linux.dev \
--cc=james.morse@arm.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=maz@kernel.org \
--cc=salil.mehta@huawei.com \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox