From patchwork Wed Apr 5 23:19:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9665879 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 372DB60364 for ; Wed, 5 Apr 2017 23:22:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28F732816B for ; Wed, 5 Apr 2017 23:22:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1DD902857E; Wed, 5 Apr 2017 23:22:55 +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 CAB8928584 for ; Wed, 5 Apr 2017 23:22:54 +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 1cvuEp-0005Fb-6W; Wed, 05 Apr 2017 23:21:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvuEn-0005Bq-Iy for xen-devel@lists.xenproject.org; Wed, 05 Apr 2017 23:21:17 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 35/EF-04270-CEB75E85; Wed, 05 Apr 2017 23:21:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVysyfVTfdN9dM Ig2V/RS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozLaycyF7znqzhw7Q17A+Mi7i5GLg4hgU2M Es8u9DJDOHsZJZZ+AnE4OdgEdCV23HwNZosIhErM+fkIyObgYBaolOhexA8SFhawltj55isji M0ioCrx7PFLMJtXwF3i9bHlTCDlEgJyElf+JYCEOYHCL1uPsYDYQgJuEtcmTmWZwMi9gJFhFa NGcWpRWWqRrqGZXlJRZnpGSW5iZo6uoYGxXm5qcXFiempOYlKxXnJ+7iZGoHcZgGAH46rtnoc YJTmYlER5FXyeRAjxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4N1W9TRCSLAoNT21Ii0zBxhmMGkJ Dh4lEd73IGne4oLE3OLMdIjUKUZFKXHeTSAJAZBERmkeXBsstC8xykoJ8zICHSLEU5BalJtZg ir/ilGcg1FJmJcbGClCPJl5JXDTXwEtZgJa/OTOQ5DFJYkIKakGRuaHhwOTPd/86P0xketr5q avTwKqVC3n2jpbhEydxLC+Z678RRNnP4YJZkuDvrH26Wc/bz0uXxG/7WXbgrOXv4VYvf47zzE sQuDdPB8f3y87O1VWW93UCC/9kfPlpWrA0azDPru0ErX6E83nFF87ejvOWGGHT6ql/i7j9d0r 9r76KyG9MYnhuBJLcUaioRZzUXEiAJVC+oNoAgAA X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1491434475!93735542!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 45196 invoked from network); 5 Apr 2017 23:21:16 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-10.tower-31.messagelabs.com with SMTP; 5 Apr 2017 23:21:16 -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 92B6BB16; Wed, 5 Apr 2017 16:21:15 -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 50EC53F4FF; Wed, 5 Apr 2017 16:21:14 -0700 (PDT) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Thu, 6 Apr 2017 00:19:17 +0100 Message-Id: <1491434362-30310-26-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 25/30] ARM: vITS: handle DISCARD 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 DISCARD command drops the connection between a DeviceID/EventID and an LPI/collection pair. We mark the respective structure entries as not allocated and make sure that any queued IRQs are removed. Signed-off-by: Andre Przywara --- xen/arch/arm/vgic-v3-its.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index 6afb915..47f2884 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -549,6 +549,35 @@ out_unlock: return ret; } +static int its_handle_discard(struct virt_its *its, uint64_t *cmdptr) +{ + uint32_t devid = its_cmd_get_deviceid(cmdptr); + uint32_t eventid = its_cmd_get_id(cmdptr); + struct pending_irq *pirq; + struct vcpu *vcpu; + uint32_t vlpi; + + if ( !read_itte(its, devid, eventid, &vcpu, &vlpi) ) + return -1; + + pirq = its->d->arch.vgic.handler->lpi_to_pending(its->d, vlpi); + if ( pirq ) + { + clear_bit(GIC_IRQ_GUEST_QUEUED, &pirq->status); + gic_remove_from_queues(vcpu, vlpi); + } + + if ( !write_itte(its, devid, eventid, UNMAPPED_COLLECTION, INVALID_LPI, + NULL) ) + return -1; + + if ( !gicv3_assign_guest_event(its->d, its->doorbell_address, + devid, eventid, NULL, 0) ) + return -1; + + return 0; +} + #define ITS_CMD_BUFFER_SIZE(baser) ((((baser) & 0xff) + 1) << 12) /* @@ -580,6 +609,9 @@ static int vgic_its_handle_cmds(struct domain *d, struct virt_its *its) case GITS_CMD_CLEAR: ret = its_handle_clear(its, command); break; + case GITS_CMD_DISCARD: + ret = its_handle_discard(its, command); + break; case GITS_CMD_INT: ret = its_handle_int(its, command); break;