Received: by 2002:a19:f015:0:0:0:0:0 with SMTP id p21csp634593lfc; Wed, 11 Mar 2020 04:19:39 -0700 (PDT) X-Google-Smtp-Source: ADFU+vum5VSp9jR/33Ofz/pZ6yFnZzHLI7HzeqTOu+YnY+q4wZWU1iXRLyTIZf3ZyCCouiR5UILc X-Received: by 2002:ac8:6704:: with SMTP id e4mr2095880qtp.311.1583925578904; Wed, 11 Mar 2020 04:19:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583925578; cv=none; d=google.com; s=arc-20160816; b=YrgbWHKAAwei4EaXWOYetqCxdpSih/AQE/eqwDn4wqUr0/5vunHDPqOIjsYv2a6QnP 98MU0cgRofflc/7jVKnZD4aiRtHL8o9Qyh7garpnkzKZVHJGeIYUUbpMC+f91QwQchUA FQeEoz0crYAcK25Z3NH7hcnUCHauEzUnmOzBfm184NOkkcjurCYczbTHLv3EqCIvJ9Gt c3XvCqIcI2z6cuesBBpN+cH+nAU2pR5/YozolHsoJXKLfPGgQHXm8s1Az9OlU9KoIit2 6GM2nldPe4aTRKSvrs5cxlJJQW39oIqpGnzilGntObRyuodTEzqKDGJNqoZtZqn7F0P3 I8vQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=WuwgRG3MZDIV9O2VREpGbG5a/gfDBmq2SMU+8pGvWZE=; b=xKyu2pqP9ZzXjN0psHvVpsusH+0ugy/QKBseKrUEZOwhMf3xo7Mloa85B3Cag7Tzcx 4hgAZwWWLyAzcPhKPzEUUFem06/+Ci2219Df+jXS/dCsiifFpRg9eonhI1xXp25X0lSs oJrzhS5WHEImAFECD1MCSQlwvVNy2OPfo0pHFuj3Yn5sRjlzOsLoJlGv5l2EKKNn/4eF eglHN/buRkYUAcj8cMbD43N5PAR4kLfv1/61grg5/DvMWLJL7nYk7JaBtOMHzXriJSqN BbGDWJE7e4r535EgHTuhtcKYrRffRypa7zrSdoUuHgV7slACyidVRxb3x0nwuMG4vew8 BthQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=DqetTEqC; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id n7si568559qvm.205.2020.03.11.04.19.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Mar 2020 04:19:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=DqetTEqC; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 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]:49780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBzOk-0006By-9r for alex.bennee@linaro.org; Wed, 11 Mar 2020 07:19:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55622) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBzMB-00020p-8V for qemu-arm@nongnu.org; Wed, 11 Mar 2020 07:17:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBzM9-0000WG-Cw for qemu-arm@nongnu.org; Wed, 11 Mar 2020 07:16:59 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:26469 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jBzM7-0000NJ-I7 for qemu-arm@nongnu.org; Wed, 11 Mar 2020 07:16:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583925415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WuwgRG3MZDIV9O2VREpGbG5a/gfDBmq2SMU+8pGvWZE=; b=DqetTEqC2zqU0gNsqsvxu83ke2bXfM0lnvW9U9RiIsk3Ysq3mMhlMjQsFBa4qvw2roeItP 2uYhetOhiEGKSmGZH2QxfOCPPtzWeeL4sMe6qLjQmHawZjzqMcOHhS1OTCXYYxF84x3CUl +jH/9hMn1cWQ8hNrAOwSrVIutxBUYyU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-217-atKVSywuPniJFvfDuARPDQ-1; Wed, 11 Mar 2020 07:16:51 -0400 X-MC-Unique: atKVSywuPniJFvfDuARPDQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4FC2F107ACC7; Wed, 11 Mar 2020 11:16:50 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.36.118.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 247F491D91; Wed, 11 Mar 2020 11:16:46 +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 Subject: [PATCH v4 4/6] target/arm/kvm: Let kvm_arm_vgic_probe() return a bitmap Date: Wed, 11 Mar 2020 12:16:24 +0100 Message-Id: <20200311111626.5705-5-eric.auger@redhat.com> In-Reply-To: <20200311111626.5705-1-eric.auger@redhat.com> References: <20200311111626.5705-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: maz@kernel.org, drjones@redhat.com, richard.henderson@linaro.org, philmd@redhat.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: D7Vp1Kj0bBai Convert kvm_arm_vgic_probe() so that it returns a bitmap of supported in-kernel emulation VGIC versions instead of the max version: at the moment values can be v2 and v3. This allows to expose the case where the host GICv3 also supports GICv2 emulation. This will be useful to choose the default version in KVM accelerated mode. Signed-off-by: Eric Auger Reviewed-by: Andrew Jones Reviewed-by: Richard Henderson --- target/arm/kvm_arm.h | 3 +++ hw/arm/virt.c | 11 +++++++++-- target/arm/kvm.c | 14 ++++++++------ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index ae9e075d75..48bf5e16d5 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -15,6 +15,9 @@ #include "exec/memory.h" #include "qemu/error-report.h" =20 +#define KVM_ARM_VGIC_V2 (1 << 0) +#define KVM_ARM_VGIC_V3 (1 << 1) + /** * kvm_arm_vcpu_init: * @cs: CPUState diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 22da0a7ad7..f798b6ec10 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1554,11 +1554,18 @@ static void finalize_gic_version(VirtMachineState *= vms) vms->gic_version =3D VIRT_GIC_VERSION_3; } } else { - vms->gic_version =3D kvm_arm_vgic_probe(); - if (!vms->gic_version) { + int probe_bitmap =3D kvm_arm_vgic_probe(); + + if (!probe_bitmap) { error_report( "Unable to determine GIC version supported by host"); exit(1); + } else { + if (probe_bitmap & KVM_ARM_VGIC_V3) { + vms->gic_version =3D VIRT_GIC_VERSION_3; + } else { + vms->gic_version =3D VIRT_GIC_VERSION_2; + } } } } else if (vms->gic_version =3D=3D VIRT_GIC_VERSION_NOSEL) { diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 85860e6f95..390077c518 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -874,15 +874,17 @@ int kvm_arch_irqchip_create(KVMState *s) =20 int kvm_arm_vgic_probe(void) { + int val =3D 0; + if (kvm_create_device(kvm_state, KVM_DEV_TYPE_ARM_VGIC_V3, true) =3D=3D 0) { - return 3; - } else if (kvm_create_device(kvm_state, - KVM_DEV_TYPE_ARM_VGIC_V2, true) =3D=3D 0)= { - return 2; - } else { - return 0; + val |=3D KVM_ARM_VGIC_V3; } + if (kvm_create_device(kvm_state, + KVM_DEV_TYPE_ARM_VGIC_V2, true) =3D=3D 0) { + val |=3D KVM_ARM_VGIC_V2; + } + return val; } =20 int kvm_arm_set_irq(int cpu, int irqtype, int irq, int level) --=20 2.20.1