From: Marc Zyngier <marc.zyngier@arm.com> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu Cc: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Peter Maydell <peter.maydell@linaro.org>, Christoffer Dall <christoffer.dall@linaro.org>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Mark Rutland <mark.rutland@arm.com>, Robin Murphy <robin.murphy@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Jon Masters <jcm@redhat.com> Subject: [PATCH v2 06/16] arm/arm64: KVM: Implement PSCI 1.0 support Date: Mon, 29 Jan 2018 17:45:49 +0000 [thread overview] Message-ID: <20180129174559.1866-7-marc.zyngier@arm.com> (raw) In-Reply-To: <20180129174559.1866-1-marc.zyngier@arm.com> PSCI 1.0 can be trivially implemented by having PSCI 0.2 and the FEATURES call. Of, and returning 1.0 as the PSCI version. We happily ignore everything else, as it is optional. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- include/kvm/arm_psci.h | 1 + virt/kvm/arm/psci.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/include/kvm/arm_psci.h b/include/kvm/arm_psci.h index 3a408c846c09..e7f69c0dc249 100644 --- a/include/kvm/arm_psci.h +++ b/include/kvm/arm_psci.h @@ -21,6 +21,7 @@ #define PSCI_VERSION(x,y) ((((x) & 0x7fff) << 16) | ((y) & 0xffff)) #define KVM_ARM_PSCI_0_1 PSCI_VERSION(0, 1) #define KVM_ARM_PSCI_0_2 PSCI_VERSION(0, 2) +#define KVM_ARM_PSCI_1_0 PSCI_VERSION(1, 0) int kvm_psci_version(struct kvm_vcpu *vcpu); int kvm_psci_call(struct kvm_vcpu *vcpu); diff --git a/virt/kvm/arm/psci.c b/virt/kvm/arm/psci.c index 053654082bd4..6299501f7664 100644 --- a/virt/kvm/arm/psci.c +++ b/virt/kvm/arm/psci.c @@ -315,6 +315,47 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) return ret; } +static int kvm_psci_1_0_call(struct kvm_vcpu *vcpu) +{ + u32 psci_fn = smccc_get_function(vcpu); + u32 feature; + unsigned long val; + int ret = 1; + + switch(psci_fn) { + case PSCI_0_2_FN_PSCI_VERSION: + val = KVM_ARM_PSCI_1_0; + break; + case PSCI_1_0_FN_PSCI_FEATURES: + feature = smccc_get_arg1(vcpu); + switch(feature) { + case PSCI_0_2_FN_PSCI_VERSION: + case PSCI_0_2_FN_CPU_SUSPEND: + case PSCI_0_2_FN64_CPU_SUSPEND: + case PSCI_0_2_FN_CPU_OFF: + case PSCI_0_2_FN_CPU_ON: + case PSCI_0_2_FN64_CPU_ON: + 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 PSCI_1_0_FN_PSCI_FEATURES: + val = 0; + break; + default: + val = PSCI_RET_NOT_SUPPORTED; + break; + } + break; + default: + return kvm_psci_0_2_call(vcpu); + } + + smccc_set_retval(vcpu, val, 0, 0, 0); + return ret; +} + static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu) { struct kvm *kvm = vcpu->kvm; @@ -357,6 +398,8 @@ static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu) int kvm_psci_call(struct kvm_vcpu *vcpu) { switch (kvm_psci_version(vcpu)) { + case KVM_ARM_PSCI_1_0: + return kvm_psci_1_0_call(vcpu); case KVM_ARM_PSCI_0_2: return kvm_psci_0_2_call(vcpu); case KVM_ARM_PSCI_0_1: -- 2.14.2
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 06/16] arm/arm64: KVM: Implement PSCI 1.0 support Date: Mon, 29 Jan 2018 17:45:49 +0000 [thread overview] Message-ID: <20180129174559.1866-7-marc.zyngier@arm.com> (raw) In-Reply-To: <20180129174559.1866-1-marc.zyngier@arm.com> PSCI 1.0 can be trivially implemented by having PSCI 0.2 and the FEATURES call. Of, and returning 1.0 as the PSCI version. We happily ignore everything else, as it is optional. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- include/kvm/arm_psci.h | 1 + virt/kvm/arm/psci.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/include/kvm/arm_psci.h b/include/kvm/arm_psci.h index 3a408c846c09..e7f69c0dc249 100644 --- a/include/kvm/arm_psci.h +++ b/include/kvm/arm_psci.h @@ -21,6 +21,7 @@ #define PSCI_VERSION(x,y) ((((x) & 0x7fff) << 16) | ((y) & 0xffff)) #define KVM_ARM_PSCI_0_1 PSCI_VERSION(0, 1) #define KVM_ARM_PSCI_0_2 PSCI_VERSION(0, 2) +#define KVM_ARM_PSCI_1_0 PSCI_VERSION(1, 0) int kvm_psci_version(struct kvm_vcpu *vcpu); int kvm_psci_call(struct kvm_vcpu *vcpu); diff --git a/virt/kvm/arm/psci.c b/virt/kvm/arm/psci.c index 053654082bd4..6299501f7664 100644 --- a/virt/kvm/arm/psci.c +++ b/virt/kvm/arm/psci.c @@ -315,6 +315,47 @@ static int kvm_psci_0_2_call(struct kvm_vcpu *vcpu) return ret; } +static int kvm_psci_1_0_call(struct kvm_vcpu *vcpu) +{ + u32 psci_fn = smccc_get_function(vcpu); + u32 feature; + unsigned long val; + int ret = 1; + + switch(psci_fn) { + case PSCI_0_2_FN_PSCI_VERSION: + val = KVM_ARM_PSCI_1_0; + break; + case PSCI_1_0_FN_PSCI_FEATURES: + feature = smccc_get_arg1(vcpu); + switch(feature) { + case PSCI_0_2_FN_PSCI_VERSION: + case PSCI_0_2_FN_CPU_SUSPEND: + case PSCI_0_2_FN64_CPU_SUSPEND: + case PSCI_0_2_FN_CPU_OFF: + case PSCI_0_2_FN_CPU_ON: + case PSCI_0_2_FN64_CPU_ON: + 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 PSCI_1_0_FN_PSCI_FEATURES: + val = 0; + break; + default: + val = PSCI_RET_NOT_SUPPORTED; + break; + } + break; + default: + return kvm_psci_0_2_call(vcpu); + } + + smccc_set_retval(vcpu, val, 0, 0, 0); + return ret; +} + static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu) { struct kvm *kvm = vcpu->kvm; @@ -357,6 +398,8 @@ static int kvm_psci_0_1_call(struct kvm_vcpu *vcpu) int kvm_psci_call(struct kvm_vcpu *vcpu) { switch (kvm_psci_version(vcpu)) { + case KVM_ARM_PSCI_1_0: + return kvm_psci_1_0_call(vcpu); case KVM_ARM_PSCI_0_2: return kvm_psci_0_2_call(vcpu); case KVM_ARM_PSCI_0_1: -- 2.14.2
next prev parent reply other threads:[~2018-01-29 17:47 UTC|newest] Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-29 17:45 [PATCH v2 00/16] arm64: Add SMCCC v1.1 support and CVE-2017-5715 (Spectre variant 2) mitigation Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 01/16] arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 02/16] arm: " Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 03/16] arm/arm64: KVM: Consolidate the PSCI include files Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 04/16] arm/arm64: KVM: Add PSCI_VERSION helper Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-30 13:15 ` Robin Murphy 2018-01-30 13:15 ` Robin Murphy 2018-01-30 14:52 ` Marc Zyngier 2018-01-30 14:52 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 05/16] arm/arm64: KVM: Add smccc accessors to PSCI code Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier [this message] 2018-01-29 17:45 ` [PATCH v2 06/16] arm/arm64: KVM: Implement PSCI 1.0 support Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 07/16] arm/arm64: KVM: Add PSCI version selection API Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-31 17:38 ` Andrew Jones 2018-01-31 17:38 ` Andrew Jones 2018-01-31 17:45 ` Marc Zyngier 2018-01-31 17:45 ` Marc Zyngier 2018-01-31 18:03 ` Andrew Jones 2018-01-31 18:03 ` Andrew Jones 2018-01-31 18:03 ` Andrew Jones 2018-01-31 18:36 ` Marc Zyngier 2018-01-31 18:36 ` Marc Zyngier 2018-01-31 19:15 ` Andrew Jones 2018-01-31 19:15 ` Andrew Jones 2018-01-31 18:11 ` kbuild test robot 2018-01-31 18:11 ` kbuild test robot 2018-01-29 17:45 ` [PATCH v2 08/16] arm/arm64: KVM: Advertise SMCCC v1.1 Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-30 0:23 ` Russell King - ARM Linux 2018-01-30 0:23 ` Russell King - ARM Linux 2018-01-30 12:28 ` Marc Zyngier 2018-01-30 12:28 ` Marc Zyngier 2018-01-30 12:28 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 09/16] arm/arm64: KVM: Turn kvm_psci_version into a static inline Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 10/16] arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-30 12:38 ` Robin Murphy 2018-01-30 12:38 ` Robin Murphy 2018-01-29 17:45 ` [PATCH v2 11/16] arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 12/16] firmware/psci: Expose PSCI conduit Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:55 ` Lorenzo Pieralisi 2018-01-29 17:55 ` Lorenzo Pieralisi 2018-01-29 17:45 ` [PATCH v2 13/16] firmware/psci: Expose SMCCC version through psci_ops Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 18:39 ` Lorenzo Pieralisi 2018-01-29 18:39 ` Lorenzo Pieralisi 2018-01-30 12:09 ` Marc Zyngier 2018-01-30 12:09 ` Marc Zyngier 2018-01-30 12:55 ` Robin Murphy 2018-01-30 12:55 ` Robin Murphy 2018-01-30 13:51 ` Marc Zyngier 2018-01-30 13:51 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 14/16] arm/arm64: smccc: Make function identifiers an unsigned quantity Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` [PATCH v2 15/16] arm/arm64: smccc: Implement SMCCC v1.1 inline primitive Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 19:07 ` Robin Murphy 2018-01-29 19:07 ` Robin Murphy 2018-01-30 8:54 ` Marc Zyngier 2018-01-30 8:54 ` Marc Zyngier 2018-01-29 21:45 ` Ard Biesheuvel 2018-01-29 21:45 ` Ard Biesheuvel 2018-01-30 12:27 ` Marc Zyngier 2018-01-30 12:27 ` Marc Zyngier 2018-01-30 12:29 ` Ard Biesheuvel 2018-01-30 12:29 ` Ard Biesheuvel 2018-01-30 12:29 ` Ard Biesheuvel 2018-01-29 17:45 ` [PATCH v2 16/16] arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 17:45 ` Marc Zyngier 2018-01-29 19:41 ` Ard Biesheuvel 2018-01-29 19:41 ` Ard Biesheuvel 2018-01-30 12:10 ` Marc Zyngier 2018-01-30 12:10 ` Marc Zyngier 2018-01-31 13:56 ` Hanjun Guo 2018-01-31 13:56 ` Hanjun Guo 2018-01-31 13:56 ` Hanjun Guo 2018-01-31 14:11 ` Marc Zyngier 2018-01-31 14:11 ` Marc Zyngier 2018-01-31 14:35 ` Ard Biesheuvel 2018-01-31 14:35 ` Ard Biesheuvel 2018-01-31 14:38 ` Ard Biesheuvel 2018-01-31 14:38 ` Ard Biesheuvel 2018-01-31 15:05 ` Marc Zyngier 2018-01-31 15:05 ` Marc Zyngier 2018-02-01 2:40 ` Hanjun Guo 2018-02-01 2:40 ` Hanjun Guo 2018-02-01 6:52 ` Hanjun Guo 2018-02-01 6:52 ` Hanjun Guo 2018-02-01 6:52 ` Hanjun Guo 2018-02-01 8:53 ` Marc Zyngier 2018-02-01 8:53 ` Marc Zyngier 2018-02-02 3:43 ` Hanjun Guo 2018-02-02 3:43 ` Hanjun Guo 2018-06-09 13:22 ` [PATCH v2 00/16] arm64: Add SMCCC v1.1 support and CVE-2017-5715 (Spectre variant 2) mitigation Jon Masters 2018-06-09 13:22 ` Jon Masters 2018-06-09 14:06 ` Marc Zyngier 2018-06-09 14:06 ` Marc Zyngier 2018-06-09 14:06 ` Marc Zyngier
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=20180129174559.1866-7-marc.zyngier@arm.com \ --to=marc.zyngier@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=christoffer.dall@linaro.org \ --cc=jcm@redhat.com \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=mark.rutland@arm.com \ --cc=peter.maydell@linaro.org \ --cc=robin.murphy@arm.com \ --cc=will.deacon@arm.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.