From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andre Przywara Subject: Re: [PATCH v4 4/4] kvmtool: ARM/ARM64: Provide PSCI-0.2 to guest when KVM supports it Date: Tue, 30 Sep 2014 10:02:05 +0100 Message-ID: <542A718D.1050407@arm.com> References: <1411084676-8275-1-git-send-email-anup.patel@linaro.org> <1411084676-8275-5-git-send-email-anup.patel@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: "kvm@vger.kernel.org" , "patches@apm.com" , Will Deacon , Marc Zyngier , "penberg@kernel.org" , "christoffer.dall@linaro.org" , "pranavkumar@linaro.org" To: Anup Patel , "kvmarm@lists.cs.columbia.edu" Return-path: Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:59385 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751787AbaI3JCP (ORCPT ); Tue, 30 Sep 2014 05:02:15 -0400 In-Reply-To: <1411084676-8275-5-git-send-email-anup.patel@linaro.org> Sender: kvm-owner@vger.kernel.org List-ID: Hi Anup, this looks good now, only one minor formatting thing below. On 19/09/14 00:57, Anup Patel wrote: > If in-kernel KVM support PSCI-0.2 emulation then we should set > KVM_ARM_VCPU_PSCI_0_2 feature for each guest VCPU and also > provide "arm,psci-0.2","arm,psci" as PSCI compatible string. > > This patch updates kvm_cpu__arch_init() and setup_fdt() as > per above. > > Signed-off-by: Pranavkumar Sawargaonkar > Signed-off-by: Anup Patel > --- > tools/kvm/arm/fdt.c | 52 ++++++++++++++++++++++++++++++++++++++++++----- > tools/kvm/arm/kvm-cpu.c | 5 +++++ > 2 files changed, 52 insertions(+), 5 deletions(-) > > diff --git a/tools/kvm/arm/fdt.c b/tools/kvm/arm/fdt.c > index 186a718..a15450e 100644 > --- a/tools/kvm/arm/fdt.c > +++ b/tools/kvm/arm/fdt.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > > static char kern_cmdline[COMMAND_LINE_SIZE]; > > @@ -84,6 +85,34 @@ static void generate_irq_prop(void *fdt, u8 irq) > _FDT(fdt_property(fdt, "interrupts", irq_prop, sizeof(irq_prop))); > } > > +struct psci_fns { > + u32 cpu_suspend; > + u32 cpu_off; > + u32 cpu_on; > + u32 migrate; > +}; > + > +static struct psci_fns psci_0_1_fns = { > + .cpu_suspend = KVM_PSCI_FN_CPU_SUSPEND, > + .cpu_off = KVM_PSCI_FN_CPU_OFF, > + .cpu_on = KVM_PSCI_FN_CPU_ON, > + .migrate = KVM_PSCI_FN_MIGRATE, > +}; > + > +static struct psci_fns psci_0_2_aarch32_fns = { > + .cpu_suspend = PSCI_0_2_FN_CPU_SUSPEND, > + .cpu_off = PSCI_0_2_FN_CPU_OFF, > + .cpu_on = PSCI_0_2_FN_CPU_ON, > + .migrate = PSCI_0_2_FN_MIGRATE, > +}; > + > +static struct psci_fns psci_0_2_aarch64_fns = { > + .cpu_suspend = PSCI_0_2_FN64_CPU_SUSPEND, > + .cpu_off = PSCI_0_2_FN_CPU_OFF, > + .cpu_on = PSCI_0_2_FN64_CPU_ON, > + .migrate = PSCI_0_2_FN64_MIGRATE, > +}; > + > static int setup_fdt(struct kvm *kvm) > { > struct device_header *dev_hdr; > @@ -93,6 +122,7 @@ static int setup_fdt(struct kvm *kvm) > cpu_to_fdt64(kvm->arch.memory_guest_start), > cpu_to_fdt64(kvm->ram_size), > }; > + struct psci_fns *fns; > void *fdt = staging_fdt; > void *fdt_dest = guest_flat_to_host(kvm, > kvm->arch.dtb_guest_start); > @@ -162,12 +192,24 @@ static int setup_fdt(struct kvm *kvm) > > /* PSCI firmware */ > _FDT(fdt_begin_node(fdt, "psci")); > - _FDT(fdt_property_string(fdt, "compatible", "arm,psci")); > + if (kvm__supports_extension(kvm, KVM_CAP_ARM_PSCI_0_2)) { > + const char compatible[] = "arm,psci-0.2\0arm,psci"; > + _FDT(fdt_property(fdt, "compatible", > + compatible, sizeof(compatible))); > + if (kvm->cfg.arch.aarch32_guest) { > + fns = &psci_0_2_aarch32_fns; > + } else { > + fns = &psci_0_2_aarch64_fns; > + } You can remove the braces here. Given that you fix that: Reviewed-by: Andre Przywara Thanks! Andre > + } else { > + _FDT(fdt_property_string(fdt, "compatible", "arm,psci")); > + fns = &psci_0_1_fns; > + } > _FDT(fdt_property_string(fdt, "method", "hvc")); > - _FDT(fdt_property_cell(fdt, "cpu_suspend", KVM_PSCI_FN_CPU_SUSPEND)); > - _FDT(fdt_property_cell(fdt, "cpu_off", KVM_PSCI_FN_CPU_OFF)); > - _FDT(fdt_property_cell(fdt, "cpu_on", KVM_PSCI_FN_CPU_ON)); > - _FDT(fdt_property_cell(fdt, "migrate", KVM_PSCI_FN_MIGRATE)); > + _FDT(fdt_property_cell(fdt, "cpu_suspend", fns->cpu_suspend)); > + _FDT(fdt_property_cell(fdt, "cpu_off", fns->cpu_off)); > + _FDT(fdt_property_cell(fdt, "cpu_on", fns->cpu_on)); > + _FDT(fdt_property_cell(fdt, "migrate", fns->migrate)); > _FDT(fdt_end_node(fdt)); > > /* Finalise. */ > diff --git a/tools/kvm/arm/kvm-cpu.c b/tools/kvm/arm/kvm-cpu.c > index 6de5344..219de16 100644 > --- a/tools/kvm/arm/kvm-cpu.c > +++ b/tools/kvm/arm/kvm-cpu.c > @@ -56,6 +56,11 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id) > if (vcpu->kvm_run == MAP_FAILED) > die("unable to mmap vcpu fd"); > > + /* Set KVM_ARM_VCPU_PSCI_0_2 if available */ > + if (kvm__supports_extension(kvm, KVM_CAP_ARM_PSCI_0_2)) { > + vcpu_init.features[0] |= (1UL << KVM_ARM_VCPU_PSCI_0_2); > + } > + > /* > * If preferred target ioctl successful then use preferred target > * else try each and every target type. >