From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:adf:b64b:0:0:0:0:0 with SMTP id i11-v6csp4669172wre; Wed, 30 May 2018 05:13:56 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLq72Jc1hepYMbRoCYfC3i/+18qsDQO/R5yVZ8B2VWLRP1Tpm6fSav5tPF5BacG8nr8YAn2 X-Received: by 2002:aed:29c2:: with SMTP id o60-v6mr2191249qtd.2.1527682436882; Wed, 30 May 2018 05:13:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527682436; cv=none; d=google.com; s=arc-20160816; b=Ox6p0O5PjqumPw/vo+wk9EwsJscZYV6+f+Il9mJT6J7yCLdO9EvWh1ZtrrMaiL4/2F oDaSkuP3DjqNiDJnSEbJ7epARnKkj2vzPI1HzFmWqOb3QPjjOGghCOWHHju8Dff2tjA3 rMJZAyH6NVSFUEYultsAWHEOcMxvyb9l8tRq3uHUZzV5qu7STpaL+D/zpS0msfjIyyKi jDFj9YNeu5y+RWiC88jiTxh1ovcDxHkNc0kBwWIEe0+GdkdIJjo4SSlsXOeQWkoPqc1X /yku83FtnCRmSBJUejGeDoGASUa0/Ft3fx1eSoOJjf92tDFmqMkw80inVQoTS/PCHAtw oGQg== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:to:from:date:arc-authentication-results; bh=Z+IZ8d2T+METd/y/SiGBZnRMwCxbP4GkQC7kp1CHsh0=; b=0hp6md82EZKLb77MOKeya54jXuvQeh2w0rs9W06m+CTSwoLB+WwnwZ0AETAG+BFSt/ tQprSnUyYcll+NfNLnWrx4s31+XxavaHm0CZCUu73PVDcd+GRUMXLtAiAcFNFI/13a1H uFiMSTd7LrSanmLI2ONtWyehZCmB8wgStAfZGWIuZQWWPrSeA6N1Ryt8AbasXJwUsZwb rdmeiYVyNAnq30sS+llDmx9KTxxkRDGNW5S0rud5z362wEmtgrKWYbCO9JLuC+GqqWLZ TcFS8A0SBYPDnF4/Hf1o+BUOobq7KmklU1UwssPuZ+t86bOZPY1+O0U3G2k00fuYy7IZ 4cXw== 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 39-v6si8143476qkw.102.2018.05.30.05.13.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 30 May 2018 05:13:56 -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]:38180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNzzI-0000Ml-C2 for alex.bennee@linaro.org; Wed, 30 May 2018 08:13:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNzz7-0000LQ-Kk for qemu-arm@nongnu.org; Wed, 30 May 2018 08:13:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNzz3-000114-FS for qemu-arm@nongnu.org; Wed, 30 May 2018 08:13:45 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42050 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 1fNzz3-000109-AQ; Wed, 30 May 2018 08:13:41 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA2E940BC047; Wed, 30 May 2018 12:13:40 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18B9210FFE6B; Wed, 30 May 2018 12:13:34 +0000 (UTC) Date: Wed, 30 May 2018 14:13:33 +0200 From: Igor Mammedov To: Eric Auger Message-ID: <20180530141333.39c030ed@redhat.com> In-Reply-To: <1527680741-2725-6-git-send-email-eric.auger@redhat.com> References: <1527680741-2725-1-git-send-email-eric.auger@redhat.com> <1527680741-2725-6-git-send-email-eric.auger@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 30 May 2018 12:13:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 30 May 2018 12:13:40 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'imammedo@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: Re: [Qemu-arm] [Qemu-devel] [RFC v3 5/8] hw/arm/virt: GICv3 DT node with one or two redistributor regions 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: peter.maydell@linaro.org, drjones@redhat.com, marc.zyngier@arm.com, qemu-devel@nongnu.org, christoffer.dall@arm.com, qemu-arm@nongnu.org, zhaoshenglong@huawei.com, eric.auger.pro@gmail.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: wucbDn2HEzY6 On Wed, 30 May 2018 13:45:38 +0200 Eric Auger wrote: > This patch allows the creation of a GICv3 node with 1 or 2 > redistributor regions depending on the number of smu_cpus. > The second redistributor region is located just after the > existing RAM region, at 256GB and contains up to up to 512 vcpus. > > Please refer to kernel documentation for further node details: > Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt > > Signed-off-by: Eric Auger > > --- > > v2 -> v3: > - VIRT_GIC_REDIST2 is now 64MB large, ie. 512 redistributor capacity > - virt_gicv3_redist_region_count does not test kvm_irqchip_in_kernel > anymore > --- > hw/arm/virt.c | 29 ++++++++++++++++++++++++----- > include/hw/arm/virt.h | 14 ++++++++++++++ > 2 files changed, 38 insertions(+), 5 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index ed79460..3018ec2 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -149,6 +149,8 @@ static const MemMapEntry a15memmap[] = { > [VIRT_PCIE_PIO] = { 0x3eff0000, 0x00010000 }, > [VIRT_PCIE_ECAM] = { 0x3f000000, 0x01000000 }, > [VIRT_MEM] = { 0x40000000, RAMLIMIT_BYTES }, > + /* Additional 64 MB redist region (can contain up to 512 redistributors) */ > + [VIRT_GIC_REDIST2] = { 0x4000000000ULL, 0x4000000ULL }, could it be placed after VIRT_PCIE_MMIO_HIGH, so we would have some space here to increase RAM without creating the second RAM region upto 512GB boundary? > /* Second PCIe window, 512GB wide at the 512GB boundary */ > [VIRT_PCIE_MMIO_HIGH] = { 0x8000000000ULL, 0x8000000000ULL }, > }; > @@ -402,13 +404,30 @@ static void fdt_add_gic_node(VirtMachineState *vms) > qemu_fdt_setprop_cell(vms->fdt, "/intc", "#size-cells", 0x2); > qemu_fdt_setprop(vms->fdt, "/intc", "ranges", NULL, 0); > if (vms->gic_version == 3) { > + int nb_redist_regions = virt_gicv3_redist_region_count(vms); > + > qemu_fdt_setprop_string(vms->fdt, "/intc", "compatible", > "arm,gic-v3"); > - qemu_fdt_setprop_sized_cells(vms->fdt, "/intc", "reg", > - 2, vms->memmap[VIRT_GIC_DIST].base, > - 2, vms->memmap[VIRT_GIC_DIST].size, > - 2, vms->memmap[VIRT_GIC_REDIST].base, > - 2, vms->memmap[VIRT_GIC_REDIST].size); > + > + qemu_fdt_setprop_cell(vms->fdt, "/intc", > + "#redistributor-regions", nb_redist_regions); > + > + if (nb_redist_regions == 1) { > + qemu_fdt_setprop_sized_cells(vms->fdt, "/intc", "reg", > + 2, vms->memmap[VIRT_GIC_DIST].base, > + 2, vms->memmap[VIRT_GIC_DIST].size, > + 2, vms->memmap[VIRT_GIC_REDIST].base, > + 2, vms->memmap[VIRT_GIC_REDIST].size); > + } else { > + qemu_fdt_setprop_sized_cells(vms->fdt, "/intc", "reg", > + 2, vms->memmap[VIRT_GIC_DIST].base, > + 2, vms->memmap[VIRT_GIC_DIST].size, > + 2, vms->memmap[VIRT_GIC_REDIST].base, > + 2, vms->memmap[VIRT_GIC_REDIST].size, > + 2, vms->memmap[VIRT_GIC_REDIST2].base, > + 2, vms->memmap[VIRT_GIC_REDIST2].size); > + } > + > if (vms->virt) { > qemu_fdt_setprop_cells(vms->fdt, "/intc", "interrupts", > GIC_FDT_IRQ_TYPE_PPI, ARCH_GICV3_MAINT_IRQ, > diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h > index 4ac7ef6..308156f 100644 > --- a/include/hw/arm/virt.h > +++ b/include/hw/arm/virt.h > @@ -35,6 +35,8 @@ > #include "qemu/notify.h" > #include "hw/boards.h" > #include "hw/arm/arm.h" > +#include "sysemu/kvm.h" > +#include "hw/intc/arm_gicv3_common.h" > > #define NUM_GICV2M_SPIS 64 > #define NUM_VIRTIO_TRANSPORTS 32 > @@ -60,6 +62,7 @@ enum { > VIRT_GIC_V2M, > VIRT_GIC_ITS, > VIRT_GIC_REDIST, > + VIRT_GIC_REDIST2, > VIRT_SMMU, > VIRT_UART, > VIRT_MMIO, > @@ -130,4 +133,15 @@ typedef struct { > > void virt_acpi_setup(VirtMachineState *vms); > > +/* Return the number of used redistributor regions */ > +static inline int virt_gicv3_redist_region_count(VirtMachineState *vms) > +{ > + uint32_t redist0_capacity = > + vms->memmap[VIRT_GIC_REDIST].size / GICV3_REDIST_SIZE; > + > + assert(vms->gic_version == 3); > + > + return vms->smp_cpus > redist0_capacity ? 2 : 1; > +} > + > #endif /* QEMU_ARM_VIRT_H */