From patchwork Mon Dec 5 21:46:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 702899 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tXdsw2S7gz9s3T for ; Tue, 6 Dec 2016 08:57:56 +1100 (AEDT) Received: from localhost ([::1]:44568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cE1Gj-0006wB-DH for incoming@patchwork.ozlabs.org; Mon, 05 Dec 2016 16:57:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cE16f-0006cH-7A for qemu-devel@nongnu.org; Mon, 05 Dec 2016 16:47:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cE16a-0002D0-AV for qemu-devel@nongnu.org; Mon, 05 Dec 2016 16:47:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33168) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cE16Y-0002CK-4q; Mon, 05 Dec 2016 16:47:22 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 292CFC05AA48; Mon, 5 Dec 2016 21:47:21 +0000 (UTC) Received: from localhost.localdomain.com (vpn1-4-120.ams2.redhat.com [10.36.4.120]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB5LksKZ019596; Mon, 5 Dec 2016 16:47:17 -0500 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, qemu-devel@nongnu.org, qemu-arm@nongnu.org, drjones@redhat.com, marc.zyngier@arm.com, christoffer.dall@linaro.org Date: Mon, 5 Dec 2016 22:46:36 +0100 Message-Id: <1480974406-29345-6-git-send-email-eric.auger@redhat.com> In-Reply-To: <1480974406-29345-1-git-send-email-eric.auger@redhat.com> References: <1480974406-29345-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 05 Dec 2016 21:47:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [kvm-unit-tests RFC 05/15] arm/arm64: GICv3: add cpu count X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andre.przywara@arm.com, pbonzini@redhat.com, alex.bennee@linaro.org, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add a new cpu_count field in gicv3_data indicating the number of redistributors. This will be useful for enumeration of their resources such as LPI pending tables. Signed-off-by: Eric Auger --- lib/arm/asm/gic-v3.h | 1 + lib/arm/gic-v3.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/arm/asm/gic-v3.h b/lib/arm/asm/gic-v3.h index ed330af..039b7c2 100644 --- a/lib/arm/asm/gic-v3.h +++ b/lib/arm/asm/gic-v3.h @@ -58,6 +58,7 @@ struct gicv3_data { void *dist_base; void *redist_base[NR_CPUS]; unsigned int irq_nr; + unsigned int cpu_count; }; extern struct gicv3_data gicv3_data; diff --git a/lib/arm/gic-v3.c b/lib/arm/gic-v3.c index 6246221..9921f4d 100644 --- a/lib/arm/gic-v3.c +++ b/lib/arm/gic-v3.c @@ -12,12 +12,14 @@ void gicv3_set_redist_base(size_t stride) void *ptr = gicv3_data.redist_base[0]; u64 typer; + gicv3_data.cpu_count = 0; do { typer = gicv3_read_typer(ptr + GICR_TYPER); if ((typer >> 32) == aff) { gicv3_redist_base() = ptr; return; } + gicv3_data.cpu_count++; ptr += stride; /* skip RD_base, SGI_base, etc. */ } while (!(typer & GICR_TYPER_LAST));