hw/arm/virt: Use 256MB ECAM region by default
With this patch, virt-3.0 machine uses a new 256MB ECAM region by default instead of the legacy 16MB one, if highmem is set (LPAE supported by the guest) and (!firmware_loaded || aarch64). Indeed aarch32 mode FW may not support this high ECAM region. Signed-off-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Andrew Jones <drjones@redhat.com> Message-id: 1529072910-16156-11-git-send-email-eric.auger@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
8ae9a1ca5b
commit
17ec075a65
|
@ -1318,6 +1318,7 @@ static void machvirt_init(MachineState *machine)
|
||||||
int n, virt_max_cpus;
|
int n, virt_max_cpus;
|
||||||
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
||||||
bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0);
|
bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0);
|
||||||
|
bool aarch64 = true;
|
||||||
|
|
||||||
/* We can probe only here because during property set
|
/* We can probe only here because during property set
|
||||||
* KVM is not available yet
|
* KVM is not available yet
|
||||||
|
@ -1433,6 +1434,8 @@ static void machvirt_init(MachineState *machine)
|
||||||
numa_cpu_pre_plug(&possible_cpus->cpus[cs->cpu_index], DEVICE(cpuobj),
|
numa_cpu_pre_plug(&possible_cpus->cpus[cs->cpu_index], DEVICE(cpuobj),
|
||||||
&error_fatal);
|
&error_fatal);
|
||||||
|
|
||||||
|
aarch64 &= object_property_get_bool(cpuobj, "aarch64", NULL);
|
||||||
|
|
||||||
if (!vms->secure) {
|
if (!vms->secure) {
|
||||||
object_property_set_bool(cpuobj, false, "has_el3", NULL);
|
object_property_set_bool(cpuobj, false, "has_el3", NULL);
|
||||||
}
|
}
|
||||||
|
@ -1491,6 +1494,8 @@ static void machvirt_init(MachineState *machine)
|
||||||
create_uart(vms, pic, VIRT_SECURE_UART, secure_sysmem, serial_hd(1));
|
create_uart(vms, pic, VIRT_SECURE_UART, secure_sysmem, serial_hd(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
vms->highmem_ecam &= vms->highmem && (!firmware_loaded || aarch64);
|
||||||
|
|
||||||
create_rtc(vms, pic);
|
create_rtc(vms, pic);
|
||||||
|
|
||||||
create_pcie(vms, pic);
|
create_pcie(vms, pic);
|
||||||
|
@ -1788,6 +1793,8 @@ static void virt_3_0_instance_init(Object *obj)
|
||||||
"Set GIC version. "
|
"Set GIC version. "
|
||||||
"Valid values are 2, 3 and host", NULL);
|
"Valid values are 2, 3 and host", NULL);
|
||||||
|
|
||||||
|
vms->highmem_ecam = !vmc->no_highmem_ecam;
|
||||||
|
|
||||||
if (vmc->no_its) {
|
if (vmc->no_its) {
|
||||||
vms->its = false;
|
vms->its = false;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1825,8 +1832,11 @@ static void virt_2_12_instance_init(Object *obj)
|
||||||
|
|
||||||
static void virt_machine_2_12_options(MachineClass *mc)
|
static void virt_machine_2_12_options(MachineClass *mc)
|
||||||
{
|
{
|
||||||
|
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
|
||||||
|
|
||||||
virt_machine_3_0_options(mc);
|
virt_machine_3_0_options(mc);
|
||||||
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_12);
|
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_12);
|
||||||
|
vmc->no_highmem_ecam = true;
|
||||||
}
|
}
|
||||||
DEFINE_VIRT_MACHINE(2, 12)
|
DEFINE_VIRT_MACHINE(2, 12)
|
||||||
|
|
||||||
|
|
|
@ -98,6 +98,7 @@ typedef struct {
|
||||||
bool no_pmu;
|
bool no_pmu;
|
||||||
bool claim_edge_triggered_timers;
|
bool claim_edge_triggered_timers;
|
||||||
bool smbios_old_sys_ver;
|
bool smbios_old_sys_ver;
|
||||||
|
bool no_highmem_ecam;
|
||||||
} VirtMachineClass;
|
} VirtMachineClass;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
Loading…
Reference in a new issue