From patchwork Wed Apr 5 23:19:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9665913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 29C9E60352 for ; Wed, 5 Apr 2017 23:23:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AC562816B for ; Wed, 5 Apr 2017 23:23:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FB3328584; Wed, 5 Apr 2017 23:23:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AF0C72816B for ; Wed, 5 Apr 2017 23:23:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvuEj-00053h-2A; Wed, 05 Apr 2017 23:21:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvuEh-0004zz-DU for xen-devel@lists.xenproject.org; Wed, 05 Apr 2017 23:21:11 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id EC/E5-14551-6EB75E85; Wed, 05 Apr 2017 23:21:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRWlGSWpSXmKPExsVysyfVTfdZ9dM Ig12N7Bbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8azr0dZC7qFK242rmJpYNzP18XIxSEksIlR 4sPsa+wQzl5GiT2725i7GDk52AR0JXbcfA1miwiESsz5+QjI5uBgFqiU6F7ED2IKC1hIbHmgC FLBIqAq0bLlAFgFr4C7xP/ZEiCmhICcxJV/CSAVnEDRl63HWEBsIQE3iWsTp7JMYORewMiwil G9OLWoLLVI10wvqSgzPaMkNzEzR9fQwFgvN7W4ODE9NScxqVgvOT93EyPQr/UMDIw7GK+0OR9 ilORgUhLlVfB5EiHEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgndb1dMIIcGi1PTUirTMHGCAwaQl OHiURHitQNK8xQWJucWZ6RCpU4yKUuK8m0ASAiCJjNI8uDZYUF9ilJUS5mVkYGAQ4ilILcrNL EGVf8UozsGoJMzLDYwRIZ7MvBK46a+AFjMBLX5y5yHI4pJEhJRUA6NI9CPhcDnDRWp+O67a71 c2vBF76+r0wFuLPadYhuhqf1978TJHr/Ot3zKRhftr/uiwZV/dlv3V8bD7XS/fM02TWw0D9tm c3aRkFKI2YVNnQbLLsffPd2wV+yy72OhWUtRlC+5wkc6EOQfi/y+9xmrJdkG1bVrU4jChnqgN B3SnTG8wNv7oIa7EUpyRaKjFXFScCABFcA6sZQIAAA== X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1491434469!38949281!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27786 invoked from network); 5 Apr 2017 23:21:09 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-9.tower-31.messagelabs.com with SMTP; 5 Apr 2017 23:21:09 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 59C37B16; Wed, 5 Apr 2017 16:21:09 -0700 (PDT) Received: from slackpad.lan (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 17A313F4FF; Wed, 5 Apr 2017 16:21:07 -0700 (PDT) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Thu, 6 Apr 2017 00:19:13 +0100 Message-Id: <1491434362-30310-22-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1491434362-30310-1-git-send-email-andre.przywara@arm.com> References: <1491434362-30310-1-git-send-email-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org, Shanker Donthineni , Vijay Kilari Subject: [Xen-devel] [PATCH v5 21/30] ARM: vITS: handle MAPC command X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The MAPC command associates a given collection ID with a given redistributor, thus mapping collections to VCPUs. We just store the vcpu_id in the collection table for that. Signed-off-by: Andre Przywara --- xen/arch/arm/vgic-v3-its.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index 36f942a..bbca5cf 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -95,6 +95,21 @@ static paddr_t get_baser_phys_addr(uint64_t reg) } /* Must be called with the ITS lock held. */ +static int its_set_collection(struct virt_its *its, uint16_t collid, + uint16_t vcpu_id) +{ + paddr_t addr = get_baser_phys_addr(its->baser_coll); + + ASSERT(spin_is_locked(&its->its_lock)); + + if ( collid >= its->max_collections ) + return -ENOENT; + + return vgic_access_guest_memory(its->d, addr + collid * sizeof(uint16_t), + &vcpu_id, sizeof(vcpu_id), true); +} + +/* Must be called with the ITS lock held. */ static struct vcpu *get_vcpu_from_collection(struct virt_its *its, uint16_t collid) { @@ -346,6 +361,29 @@ static int its_handle_int(struct virt_its *its, uint64_t *cmdptr) return 0; } +static int its_handle_mapc(struct virt_its *its, uint64_t *cmdptr) +{ + uint32_t collid = its_cmd_get_collection(cmdptr); + uint64_t rdbase = its_cmd_mask_field(cmdptr, 2, 16, 44); + + if ( collid >= its->max_collections ) + return -1; + + if ( rdbase >= its->d->max_vcpus ) + return -1; + + spin_lock(&its->its_lock); + + if ( its_cmd_get_validbit(cmdptr) ) + its_set_collection(its, collid, rdbase); + else + its_set_collection(its, collid, UNMAPPED_COLLECTION); + + spin_unlock(&its->its_lock); + + return 0; +} + #define ITS_CMD_BUFFER_SIZE(baser) ((((baser) & 0xff) + 1) << 12) /* @@ -380,6 +418,9 @@ static int vgic_its_handle_cmds(struct domain *d, struct virt_its *its) case GITS_CMD_INT: ret = its_handle_int(its, command); break; + case GITS_CMD_MAPC: + ret = its_handle_mapc(its, command); + break; case GITS_CMD_SYNC: /* We handle ITS commands synchronously, so we ignore SYNC. */ break;