From patchwork Fri Mar 31 18:05:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9657091 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 5C88E60350 for ; Fri, 31 Mar 2017 18:05:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4ED6F286B7 for ; Fri, 31 Mar 2017 18:05:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4096D286F3; Fri, 31 Mar 2017 18:05:54 +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 93C49286B7 for ; Fri, 31 Mar 2017 18:05:53 +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 1cu0ty-0005t1-K5; Fri, 31 Mar 2017 18:03:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cu0tx-0005pO-DH for xen-devel@lists.xenproject.org; Fri, 31 Mar 2017 18:03:57 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id D2/75-19998-C0A9ED85; Fri, 31 Mar 2017 18:03:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRWlGSWpSXmKPExsVysyfVTZdn1r0 Ig71bRCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyOzoqCSfwV8+fMYm9gfMDdxcjFISSwiVFi w7fHjF2MnEDOckaJmfulQWw2AV2JHTdfM4PYIgKhEk8XfAeyOTiYBSoluhfxg4SFBawlVs7Yy QZiswioSnxZ1wNWzitgI/Hi7G2wuISAnETD+ftgcU6g+PxdP1ghVllLNHy6yzyBkXsBI8MqRo 3i1KKy1CJdQ0u9pKLM9IyS3MTMHF1DA2O93NTi4sT01JzEpGK95PzcTYxA39YzMDDuYPx93O8 QoyQHk5Io7/fiexFCfEn5KZUZicUZ8UWlOanFhxhlODiUJHgDZwLlBItS01Mr0jJzgEEGk5bg 4FES4ZUCSfMWFyTmFmemQ6ROMSpKifO6gyQEQBIZpXlwbbDAvsQoKyXMy8jAwCDEU5BalJtZg ir/ilGcg1FJmHc+yBSezLwSuOmvgBYzAS22+HoXZHFJIkJKqoEx2+v7+0WJlvHPV3Rb5W3/f3 7qi/1LJBV49d8wVzycvemzX9d0Xx39DWs3Onu+uvB85vb3Lew7bZlK2K++9biz+WNV1TH7rii Huo6He1/+eN4jsaer+OCyC+nHJ6/xYhPeofisxO3GvI6roZcmX9aV+HB8/1XOconHVetn3XLn e1CjN2NjPbdNhRJLcUaioRZzUXEiAGHYTYNnAgAA X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1490983435!93343771!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 49715 invoked from network); 31 Mar 2017 18:03:56 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-8.tower-31.messagelabs.com with SMTP; 31 Mar 2017 18:03:56 -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 8BB9380D; Fri, 31 Mar 2017 11:03:55 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.207.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 19E943F59A; Fri, 31 Mar 2017 11:03:53 -0700 (PDT) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Fri, 31 Mar 2017 19:05:20 +0100 Message-Id: <20170331180525.30038-22-andre.przywara@arm.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170331180525.30038-1-andre.przywara@arm.com> References: <20170331180525.30038-1-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org, Shanker Donthineni , Vijay Kilari Subject: [Xen-devel] [PATCH v3 21/26] 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 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index 0085719..59553f8 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -467,6 +467,33 @@ static int its_handle_movi(struct virt_its *its, uint64_t *cmdptr) return 0; } +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 = 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; + + gicv3_assign_guest_event(its->d, its->doorbell_address, + devid, eventid, NULL, 0); + + return 0; +} + #define ITS_CMD_BUFFER_SIZE(baser) ((((baser) & 0xff) + 1) << 12) static int vgic_its_handle_cmds(struct domain *d, struct virt_its *its, @@ -507,6 +534,9 @@ static int vgic_its_handle_cmds(struct domain *d, struct virt_its *its, case GITS_CMD_CLEAR: ret = its_handle_clear(its, cmdptr); break; + case GITS_CMD_DISCARD: + ret = its_handle_discard(its, cmdptr); + break; case GITS_CMD_INT: ret = its_handle_int(its, cmdptr); break;