From patchwork Thu Mar 16 11:20:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9627965 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 98BE260522 for ; Thu, 16 Mar 2017 11:21:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8CC73285B5 for ; Thu, 16 Mar 2017 11:21:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8177728604; Thu, 16 Mar 2017 11:21:02 +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 2FCE4285B5 for ; Thu, 16 Mar 2017 11:21:02 +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 1coTRA-0008Iu-Or; Thu, 16 Mar 2017 11:19:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coTR9-0008EF-0g for xen-devel@lists.xenproject.org; Thu, 16 Mar 2017 11:19:19 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 34/24-26304-6B47AC85; Thu, 16 Mar 2017 11:19:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsVysyfVTXdryak Ig7UrzS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxbcz8xFnzjr7h9YSFbA+N2ni5GTg4hgc2M EjPfaXUxcgHZyxkl/u9eywySYBPQldhx8zWYLSIQKjHn5yMwm1mgUuLih/1sILawgLVEy80+J hCbRUBV4vrWNWA2r4CNxK2bG8BqJATkJBrO3wfr5QSKd5zcwwax2Fri89HP7BMYuRcwMqxi1C hOLSpLLdI1NNNLKspMzyjJTczM0TU0MNXLTS0uTkxPzUlMKtZLzs/dxAj0LwMQ7GA8f9rzEKM kB5OSKK+W+akIIb6k/JTKjMTijPii0pzU4kOMMhwcShK81cVAOcGi1PTUirTMHGCgwaQlOHiU RHgLQNK8xQWJucWZ6RCpU4yKUuK8NiAJAZBERmkeXBssuC8xykoJ8zICHSLEU5BalJtZgir/i lGcg1FJmLccZApPZl4J3PRXQIuZgBa//XACZHFJIkJKqoExMrn75i1Wf+vQ9zLP2Phn5yanTt zdbPQ7xeLH1br3l3K+r4s72iEVrNx1/L1GyTY/UYX7jkUL7krc2qJ/Q+fw3zd/P3DYt5y+mL7 kGuvFD0t2Pzi18vURnei0PP39W1IYJY4VGARM1Hm5rHHD/J6mJUd+zXPedebJ3q5ZObrLhY9o PObp+fnAXomlOCPRUIu5qDgRAG/l2eZpAgAA X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1489663157!50937522!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 54090 invoked from network); 16 Mar 2017 11:19:17 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-14.tower-206.messagelabs.com with SMTP; 16 Mar 2017 11:19:17 -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 21C7413D5; Thu, 16 Mar 2017 04:19:17 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.207.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1C3853F5C9; Thu, 16 Mar 2017 04:19:15 -0700 (PDT) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Thu, 16 Mar 2017 11:20:25 +0000 Message-Id: <20170316112030.20419-23-andre.przywara@arm.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170316112030.20419-1-andre.przywara@arm.com> References: <20170316112030.20419-1-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org, Shanker Donthineni , Vijay Kilari Subject: [Xen-devel] [PATCH v2 22/27] 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index bb573de..21a663e 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -369,6 +369,36 @@ 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(vcpu, vlpi, false); + if ( pirq ) + { + clear_bit(GIC_IRQ_GUEST_QUEUED, &pirq->status); + gic_remove_from_queues(vcpu, vlpi); + + /* Mark this pending IRQ struct as availabe again. */ + if ( !test_bit(GIC_IRQ_GUEST_VISIBLE, &pirq->status) ) + pirq->irq = 0; + } + + if ( !write_itte(its, devid, eventid, ~0, 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, @@ -392,6 +422,9 @@ static int vgic_its_handle_cmds(struct domain *d, struct virt_its *its, case GITS_CMD_CLEAR: its_handle_clear(its, cmdptr); break; + case GITS_CMD_DISCARD: + its_handle_discard(its, cmdptr); + break; case GITS_CMD_INT: its_handle_int(its, cmdptr); break;