From patchwork Mon Dec 5 21:46:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 702906 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 3tXdzz4fvCz9snm for ; Tue, 6 Dec 2016 09:03:11 +1100 (AEDT) Received: from localhost ([::1]:44596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cE1Lo-0002vs-VX for incoming@patchwork.ozlabs.org; Mon, 05 Dec 2016 17:03:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cE177-0006yq-8V for qemu-devel@nongnu.org; Mon, 05 Dec 2016 16:47:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cE176-0002Mu-IQ for qemu-devel@nongnu.org; Mon, 05 Dec 2016 16:47:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50942) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cE170-0002Kt-AX; Mon, 05 Dec 2016 16:47:50 -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 403358AE72; Mon, 5 Dec 2016 21:47:49 +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 uB5LksKg019596; Mon, 5 Dec 2016 16:47:45 -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:43 +0100 Message-Id: <1480974406-29345-13-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.25]); Mon, 05 Dec 2016 21:47:49 +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 12/15] arm/arm64: ITS: create collection 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" Helper function to create a collection, characterized by its collection id and the target address. Currently the number of collections cannot exceed the number of redistributors. Signed-off-by: Eric Auger --- --- lib/arm/asm/gic-v3-its.h | 1 + lib/arm/gic-v3-its.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h index 31589d6..af82b32 100644 --- a/lib/arm/asm/gic-v3-its.h +++ b/lib/arm/asm/gic-v3-its.h @@ -190,6 +190,7 @@ extern void its_setup_baser(int i, struct its_baser *baser); extern void enable_lpi(u32 redist); extern void its_enable_defaults(void); extern struct its_device *its_create_device(u32 dev_id, int nvecs); +extern struct its_collection *its_create_collection(u32 col_id, u32 target); #endif /* !__ASSEMBLY__ */ diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c index c230959..1b50fc5 100644 --- a/lib/arm/gic-v3-its.c +++ b/lib/arm/gic-v3-its.c @@ -286,3 +286,20 @@ struct its_device *its_create_device(u32 device_id, int nvecs) its_data.nb_devices++; return new; } + +struct its_collection *its_create_collection(u32 col_id, u32 pe) +{ + if (col_id >= gicv3_data.cpu_count) + report_abort("%s coll_id=%d >= cpu_count %d\n", + __func__, col_id, gicv3_data.cpu_count); + + if (its_data.typer.pta) + its_data.collections[col_id].target_address = + (u64)gicv3_data.redist_base[pe]; + else + its_data.collections[col_id].target_address = pe << 16; + + its_data.collections[col_id].col_id = col_id; + + return &its_data.collections[col_id]; +}