[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 07/12] hw/arm/virt: Move post cpu realize check into its o
From: |
Andrew Jones |
Subject: |
Re: [PATCH v3 07/12] hw/arm/virt: Move post cpu realize check into its own function |
Date: |
Tue, 15 Sep 2020 09:31:05 +0200 |
On Tue, Sep 15, 2020 at 03:03:49PM +0800, Haibo Xu wrote:
> On Tue, 15 Sep 2020 at 14:22, Andrew Jones <drjones@redhat.com> wrote:
> >
> > On Tue, Sep 15, 2020 at 03:11:43AM +0000, Haibo Xu wrote:
> > > From: Andrew Jones <drjones@redhat.com>
> > >
> > > We'll add more to this new function in coming patches so we also
> > > state the gic must be created and call it below create_gic().
> > >
> > > No functional change intended.
> > >
> > > Signed-off-by: Andrew Jones <drjones@redhat.com>
> > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> > > ---
> > > hw/arm/virt.c | 38 ++++++++++++++++++++++----------------
> > > 1 file changed, 22 insertions(+), 16 deletions(-)
> >
> > This still isn't the right version of this patch. You need
> > https://www.mail-archive.com/qemu-devel@nongnu.org/msg727591.html
> >
>
> My fault! Very sorry for forgetting to address that in this version.
> Shall I re-send this patch with the fix? Or fix it in the next version?
I can wait. It'll be awhile before this series can be merged anyway, since
the KVM patches haven't been merged yet.
Thanks,
drew
>
> > >
> > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> > > index 3f6d26c531..2ffcb073af 100644
> > > --- a/hw/arm/virt.c
> > > +++ b/hw/arm/virt.c
> > > @@ -1672,6 +1672,26 @@ static void finalize_gic_version(VirtMachineState
> > > *vms)
> > > }
> > > }
> > >
> > > +static void virt_cpu_post_init(VirtMachineState *vms)
> > > +{
> > > + bool aarch64;
> > > +
> > > + aarch64 = object_property_get_bool(OBJECT(first_cpu), "aarch64",
> > > NULL);
> > > +
> > > + if (!kvm_enabled()) {
> > > + if (aarch64 && vms->highmem) {
> > > + int requested_pa_size = 64 - clz64(vms->highest_gpa);
> > > + int pamax = arm_pamax(ARM_CPU(first_cpu));
> > > +
> > > + if (pamax < requested_pa_size) {
> > > + error_report("VCPU supports less PA bits (%d) than
> > > requested "
> > > + "by the memory map (%d)", pamax,
> > > requested_pa_size);
> > > + exit(1);
> > > + }
> > > + }
> > > + }
> > > +}
> > > +
> > > static void machvirt_init(MachineState *machine)
> > > {
> > > VirtMachineState *vms = VIRT_MACHINE(machine);
> > > @@ -1890,22 +1910,6 @@ static void machvirt_init(MachineState *machine)
> > > fdt_add_timer_nodes(vms);
> > > fdt_add_cpu_nodes(vms);
> > >
> > > - if (!kvm_enabled()) {
> > > - ARMCPU *cpu = ARM_CPU(first_cpu);
> > > - bool aarch64 = object_property_get_bool(OBJECT(cpu), "aarch64",
> > > NULL);
> > > -
> > > - if (aarch64 && vms->highmem) {
> > > - int requested_pa_size, pamax = arm_pamax(cpu);
> > > -
> > > - requested_pa_size = 64 - clz64(vms->highest_gpa);
> > > - if (pamax < requested_pa_size) {
> > > - error_report("VCPU supports less PA bits (%d) than
> > > requested "
> > > - "by the memory map (%d)", pamax,
> > > requested_pa_size);
> > > - exit(1);
> > > - }
> > > - }
> > > - }
> > > -
> > > memory_region_add_subregion(sysmem, vms->memmap[VIRT_MEM].base,
> > > machine->ram);
> > > if (machine->device_memory) {
> > > @@ -1917,6 +1921,8 @@ static void machvirt_init(MachineState *machine)
> > >
> > > create_gic(vms);
> > >
> > > + virt_cpu_post_init(vms);
> > > +
> > > fdt_add_pmu_nodes(vms);
> > >
> > > create_uart(vms, VIRT_UART, sysmem, serial_hd(0));
> > > --
> > > 2.17.1
> > >
> > >
> >
>
- [PATCH v3 02/12] target/arm/kvm: spe: Add helper to detect SPE when using KVM, (continued)
- [PATCH v3 02/12] target/arm/kvm: spe: Add helper to detect SPE when using KVM, Haibo Xu, 2020/09/14
- [PATCH v3 04/12] target/arm: spe: Only enable SPE from 5.2 compat machines., Haibo Xu, 2020/09/14
- [PATCH v3 03/12] target/arm/cpu: spe: Add an option to turn on/off vSPE support, Haibo Xu, 2020/09/14
- [PATCH v3 06/12] target/arm/kvm: spe: Add device init and set_irq operations, Haibo Xu, 2020/09/14
- [PATCH v3 05/12] target/arm/kvm: spe: Unify device attr operation helper, Haibo Xu, 2020/09/14
- [PATCH v3 07/12] hw/arm/virt: Move post cpu realize check into its own function, Haibo Xu, 2020/09/14
[PATCH v3 08/12] hw/arm/virt: Move kvm pmu setup to virt_cpu_post_init, Haibo Xu, 2020/09/14
[PATCH v3 09/12] hw/arm/virt: spe: Add vSPE device and corresponding interrupt support, Haibo Xu, 2020/09/14
[PATCH v3 10/12] target/arm/cpu: spe: Enable spe to work with host cpu, Haibo Xu, 2020/09/14
[PATCH v3 11/12] target/arm/kvm: spe: Enable userspace irqchip support., Haibo Xu, 2020/09/14
[PATCH v3 12/12] target/arm: spe: Add corresponding test., Haibo Xu, 2020/09/14