Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95EA5C10F29 for ; Wed, 11 Mar 2020 13:18:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5B67C21D56 for ; Wed, 11 Mar 2020 13:18:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BsoOmFEl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B67C21D56 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51691 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC1FO-00046f-H6 for qemu-devel@archiver.kernel.org; Wed, 11 Mar 2020 09:18:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56607) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC1E6-0001cO-9v for qemu-devel@nongnu.org; Wed, 11 Mar 2020 09:16:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC1E4-0007oj-QK for qemu-devel@nongnu.org; Wed, 11 Mar 2020 09:16:46 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51809 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jC1E4-0007ny-Mv for qemu-devel@nongnu.org; Wed, 11 Mar 2020 09:16:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583932604; 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=NWsKxrm6MCuJ+bbq6H3eDVrINh3UM09rwzqXJQV8W0o=; b=BsoOmFElbXGnlsxTT+jrXpoASf6wSeRkUt8BUpP6id7KDeW6UOfgIVBMRWwUabnFZB+qGc mOoROKyIlgry/3GGzfkIGPCOPGVj0+swOjwRlgxfTdUZL/SpUR1qzw4sNaAB2u2oovpRTZ n2w3MkyLVGkkKECGd5tzwBdINYlSCJs= 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-205-G4BbWJomNqml4jq-XOuCqQ-1; Wed, 11 Mar 2020 09:16:40 -0400 X-MC-Unique: G4BbWJomNqml4jq-XOuCqQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BE28C189F760; Wed, 11 Mar 2020 13:16:38 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.36.118.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7588973880; Wed, 11 Mar 2020 13:16:35 +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 v5 2/6] hw/arm/virt: Introduce VirtGICType enum type Date: Wed, 11 Mar 2020 14:16:14 +0100 Message-Id: <20200311131618.7187-3-eric.auger@redhat.com> In-Reply-To: <20200311131618.7187-1-eric.auger@redhat.com> References: <20200311131618.7187-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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.120 X-BeenThere: qemu-devel@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-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We plan to introduce yet another value for the gic version (nosel). As we already use exotic values such as 0 and -1, let's introduce a dedicated enum type and let vms->gic_version take this type. Signed-off-by: Eric Auger Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Andrew Jones --- v3 -> v4: - added R-bs v2 -> v3: - replaced defines by enum VirtGICType - use that new type for vms->gic_version --- include/hw/arm/virt.h | 11 +++++++++-- hw/arm/virt.c | 30 +++++++++++++++--------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 02f500cb8e..c0827cacdf 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -95,6 +95,13 @@ typedef enum VirtIOMMUType { VIRT_IOMMU_VIRTIO, } VirtIOMMUType; =20 +typedef enum VirtGICType { + VIRT_GIC_VERSION_MAX, + VIRT_GIC_VERSION_HOST, + VIRT_GIC_VERSION_2, + VIRT_GIC_VERSION_3, +} VirtGICType; + typedef struct MemMapEntry { hwaddr base; hwaddr size; @@ -123,7 +130,7 @@ typedef struct { bool highmem_ecam; bool its; bool virt; - int32_t gic_version; + VirtGICType gic_version; VirtIOMMUType iommu; uint16_t virtio_iommu_bdf; struct arm_boot_info bootinfo; @@ -162,7 +169,7 @@ static inline int virt_gicv3_redist_region_count(VirtMa= chineState *vms) uint32_t redist0_capacity =3D vms->memmap[VIRT_GIC_REDIST].size / GICV3_REDIST_SIZE; =20 - assert(vms->gic_version =3D=3D 3); + assert(vms->gic_version =3D=3D VIRT_GIC_VERSION_3); =20 return vms->smp_cpus > redist0_capacity ? 2 : 1; } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7c38c6c7f9..4ed1f0cb2e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -299,7 +299,7 @@ static void fdt_add_timer_nodes(const VirtMachineState = *vms) irqflags =3D GIC_FDT_IRQ_FLAGS_EDGE_LO_HI; } =20 - if (vms->gic_version =3D=3D 2) { + if (vms->gic_version =3D=3D VIRT_GIC_VERSION_2) { irqflags =3D deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START, GIC_FDT_IRQ_PPI_CPU_WIDTH, (1 << vms->smp_cpus) - 1); @@ -440,7 +440,7 @@ static void fdt_add_gic_node(VirtMachineState *vms) qemu_fdt_setprop_cell(vms->fdt, nodename, "#address-cells", 0x2); qemu_fdt_setprop_cell(vms->fdt, nodename, "#size-cells", 0x2); qemu_fdt_setprop(vms->fdt, nodename, "ranges", NULL, 0); - if (vms->gic_version =3D=3D 3) { + if (vms->gic_version =3D=3D VIRT_GIC_VERSION_3) { int nb_redist_regions =3D virt_gicv3_redist_region_count(vms); =20 qemu_fdt_setprop_string(vms->fdt, nodename, "compatible", @@ -519,7 +519,7 @@ static void fdt_add_pmu_nodes(const VirtMachineState *v= ms) } } =20 - if (vms->gic_version =3D=3D 2) { + if (vms->gic_version =3D=3D VIRT_GIC_VERSION_2) { irqflags =3D deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START, GIC_FDT_IRQ_PPI_CPU_WIDTH, (1 << vms->smp_cpus) - 1); @@ -1470,7 +1470,7 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState= *vms, int idx) * purposes are to make TCG consistent (with 64-bit KVM hosts) * and to improve SGI efficiency. */ - if (vms->gic_version =3D=3D 3) { + if (vms->gic_version =3D=3D VIRT_GIC_VERSION_3) { clustersz =3D GICV3_TARGETLIST_BITS; } else { clustersz =3D GIC_TARGETLIST_BITS; @@ -1561,15 +1561,15 @@ static void machvirt_init(MachineState *machine) /* We can probe only here because during property set * KVM is not available yet */ - if (vms->gic_version <=3D 0) { - /* "host" or "max" */ + if (vms->gic_version =3D=3D VIRT_GIC_VERSION_HOST || + vms->gic_version =3D=3D VIRT_GIC_VERSION_MAX) { if (!kvm_enabled()) { - if (vms->gic_version =3D=3D 0) { + if (vms->gic_version =3D=3D VIRT_GIC_VERSION_HOST) { error_report("gic-version=3Dhost requires KVM"); exit(1); } else { /* "max": currently means 3 for TCG */ - vms->gic_version =3D 3; + vms->gic_version =3D VIRT_GIC_VERSION_3; } } else { vms->gic_version =3D kvm_arm_vgic_probe(); @@ -1628,7 +1628,7 @@ static void machvirt_init(MachineState *machine) /* The maximum number of CPUs depends on the GIC version, or on how * many redistributors we can fit into the memory map. */ - if (vms->gic_version =3D=3D 3) { + if (vms->gic_version =3D=3D VIRT_GIC_VERSION_3) { virt_max_cpus =3D vms->memmap[VIRT_GIC_REDIST].size / GICV3_REDIST_SIZE; virt_max_cpus +=3D @@ -1856,7 +1856,7 @@ static void virt_set_its(Object *obj, bool value, Err= or **errp) static char *virt_get_gic_version(Object *obj, Error **errp) { VirtMachineState *vms =3D VIRT_MACHINE(obj); - const char *val =3D vms->gic_version =3D=3D 3 ? "3" : "2"; + const char *val =3D vms->gic_version =3D=3D VIRT_GIC_VERSION_3 ? "3" := "2"; =20 return g_strdup(val); } @@ -1866,13 +1866,13 @@ static void virt_set_gic_version(Object *obj, const= char *value, Error **errp) VirtMachineState *vms =3D VIRT_MACHINE(obj); =20 if (!strcmp(value, "3")) { - vms->gic_version =3D 3; + vms->gic_version =3D VIRT_GIC_VERSION_3; } else if (!strcmp(value, "2")) { - vms->gic_version =3D 2; + vms->gic_version =3D VIRT_GIC_VERSION_2; } else if (!strcmp(value, "host")) { - vms->gic_version =3D 0; /* Will probe later */ + vms->gic_version =3D VIRT_GIC_VERSION_HOST; /* Will probe later */ } else if (!strcmp(value, "max")) { - vms->gic_version =3D -1; /* Will probe later */ + vms->gic_version =3D VIRT_GIC_VERSION_MAX; /* Will probe later */ } else { error_setg(errp, "Invalid gic-version value"); error_append_hint(errp, "Valid values are 3, 2, host, max.\n"); @@ -2141,7 +2141,7 @@ static void virt_instance_init(Object *obj) "physical address space above 32 bits"= , NULL); /* Default GIC type is v2 */ - vms->gic_version =3D 2; + vms->gic_version =3D VIRT_GIC_VERSION_2; object_property_add_str(obj, "gic-version", virt_get_gic_version, virt_set_gic_version, NULL); object_property_set_description(obj, "gic-version", --=20 2.20.1