From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:adf:b64b:0:0:0:0:0 with SMTP id i11-v6csp4808228wre; Wed, 30 May 2018 07:26:58 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKtGyEgLAN6Y18aEFiBghgV2FpKvGdtYZqfVeCIJ2LrlmT+M9WwNFjyUSwMqR6TP+dcTLmT X-Received: by 2002:ac8:1a94:: with SMTP id x20-v6mr2862406qtj.60.1527690418430; Wed, 30 May 2018 07:26:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527690418; cv=none; d=google.com; s=arc-20160816; b=0DIVtMfEodFoBbAm0XNV89g7BYh7tCmW8/Ali761pPcbTxoe5FKJSaJh+/XvU8kZPw yYk/Y8JpTcRdvbh7OGvgHY5VXOirD9DdyMmf/kOH7178c5HAJAC2gRifkkEGfHMD7n5C zA70DPW+3+1qEiJq+PL21vGXAfL/S+uZgR4ySfRVZdQq0aettpPqu4KGcY4qCE2KzQIg QhYfrvoIam4UxeVVA77UdPhesPYXSBlF+iCw0KgJGJM5zSlvOYmIXiWVPXIJJPSY6c3i xzCZW6x3DUftzdRAJw3fQbJ70wzMF7CUH4EY0hK+flkvOgiBZVXcUJEBUZ1dv/NUpMiF s8Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=xeRLGE0pKYKhlrk4LNGRiG2ykK2ITN83Yvk+mHYpD/w=; b=a1rsZT7R0gKLEz/8tZ/tQcuWudlKKHFBQ3X/49LI+aIkVnzdFYyk2EFs+VVKvPSF0K a1pk/icojSZg+rUxbarWvZZgcKWk7uiZjf5PL3gyH3tso/8Mms6KkthwfRa/+L1MRXwd a2JwOH703ruQe4cdbSBqfLMy/+WYqY/4m4HNpBdUsOcrlpCRmmu86TH/V0gX9xW4KAVL 2suJIZqbh+sbuMsoFhExqw58NX8ju7uNyRN1N1m8mZy3It5pN2YkCNMCilV+YFma7SwG VaTxm42DOc7k9CewELFdglZd/a1ei3Qm5B6w6hN9d5IOjbpAQPx14hLIJiQ+DQZ73rJH LkqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q8-v6si247198qtb.277.2018.05.30.07.26.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 30 May 2018 07:26:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:38976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fO241-00047X-Uz for alex.bennee@linaro.org; Wed, 30 May 2018 10:26:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fO23d-0003ta-0N for qemu-arm@nongnu.org; Wed, 30 May 2018 10:26:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fO23b-0000Jf-9h for qemu-arm@nongnu.org; Wed, 30 May 2018 10:26:33 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:55628 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fO23b-0000JU-4d; Wed, 30 May 2018 10:26:31 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BCD197C6B1; Wed, 30 May 2018 14:26:30 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-69.ams2.redhat.com [10.36.116.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38C5583B69; Wed, 30 May 2018 14:26:29 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org Date: Wed, 30 May 2018 16:26:20 +0200 Message-Id: <1527690380-9782-3-git-send-email-eric.auger@redhat.com> In-Reply-To: <1527690380-9782-1-git-send-email-eric.auger@redhat.com> References: <1527690380-9782-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 30 May 2018 14:26:30 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 30 May 2018 14:26:30 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eric.auger@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-arm] [PATCH 2/2] hw/arm/virt: Add virt-3.0 machine type X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: drjones@redhat.com, ard.biesheuvel@linaro.org, lersek@redhat.com, zhaoshenglong@huawei.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: lK9WhDzPqSZZ Add virt-3.0 machine type. This machine type supports highmem 256MB ECAM by default. This feature is disabled for earlier machine types and if highmem is off. The high 256MB ECAM region is chosen instead of the legacy 16MB one if the machine type allows it, 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 --- RFC -> v1 - check firmware_loaded and aarch64 value - do all the computation in machvirt_init --- hw/arm/virt.c | 31 ++++++++++++++++++++++++++++--- include/hw/arm/virt.h | 1 + 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d4247d0..83c2b5a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1275,6 +1275,7 @@ static void machvirt_init(MachineState *machine) int n, virt_max_cpus; MemoryRegion *ram = g_new(MemoryRegion, 1); bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0); + bool aarch64 = true; /* We can probe only here because during property set * KVM is not available yet @@ -1389,6 +1390,8 @@ static void machvirt_init(MachineState *machine) numa_cpu_pre_plug(&possible_cpus->cpus[cs->cpu_index], DEVICE(cpuobj), &error_fatal); + aarch64 &= object_property_get_bool(cpuobj, "aarch64", NULL); + if (!vms->secure) { object_property_set_bool(cpuobj, false, "has_el3", NULL); } @@ -1447,6 +1450,8 @@ static void machvirt_init(MachineState *machine) 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_pcie(vms, pic); @@ -1697,7 +1702,7 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); -static void virt_2_12_instance_init(Object *obj) +static void virt_3_0_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); @@ -1740,6 +1745,8 @@ static void virt_2_12_instance_init(Object *obj) "Set GIC version. " "Valid values are 2, 3 and host", NULL); + vms->highmem_ecam = vmc->no_highmem_ecam ? false : true; + if (vmc->no_its) { vms->its = false; } else { @@ -1765,10 +1772,28 @@ static void virt_2_12_instance_init(Object *obj) vms->irqmap = a15irqmap; } -static void virt_machine_2_12_options(MachineClass *mc) +static void virt_machine_3_0_options(MachineClass *mc) { } -DEFINE_VIRT_MACHINE_AS_LATEST(2, 12) +DEFINE_VIRT_MACHINE_AS_LATEST(3, 0) + +#define VIRT_COMPAT_2_12 \ + HW_COMPAT_2_12 + +static void virt_2_12_instance_init(Object *obj) +{ + virt_3_0_instance_init(obj); +} + +static void virt_machine_2_12_options(MachineClass *mc) +{ + VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); + + virt_machine_3_0_options(mc); + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_12); + vmc->no_highmem_ecam = true; +} +DEFINE_VIRT_MACHINE(2, 12) #define VIRT_COMPAT_2_11 \ HW_COMPAT_2_11 diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index e9423a7..10a5c71 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -95,6 +95,7 @@ typedef struct { bool no_pmu; bool claim_edge_triggered_timers; bool smbios_old_sys_ver; + bool no_highmem_ecam; } VirtMachineClass; typedef struct { -- 2.5.5