From patchwork Mon Apr 3 20:28:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9660567 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 7325D6032D for ; Mon, 3 Apr 2017 20:29:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6544228403 for ; Mon, 3 Apr 2017 20:29:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A1652841C; Mon, 3 Apr 2017 20:29:07 +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 136C128403 for ; Mon, 3 Apr 2017 20:29:07 +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 1cv8Yz-0005MN-Lg; Mon, 03 Apr 2017 20:26:57 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cv8Yy-0005Go-8X for xen-devel@lists.xenproject.org; Mon, 03 Apr 2017 20:26:56 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id 40/A7-19731-F00B2E85; Mon, 03 Apr 2017 20:26:55 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVysyfVTZd/w6M Ig+fXeC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1owHP+0LJvFXfL+3hLWB8QF3FyMXh5DAJkaJ ee/es0M4yxklzj15AORwcrAJ6ErsuPmaGcQWEQiVeLrgO5jNLKAksf/sNUYQW1jAWqLx8wYWE JtFQFXixKlrYDYvUHxN13omEFtCQE6i4fx9sF5OoHjrx6NgvUICVhITHjYxTWDkXsDIsIpRvT i1qCy1SNdYL6koMz2jJDcxM0fX0MBMLze1uDgxPTUnMalYLzk/dxMj0LsMQLCDseOf0yFGSQ4 mJVFe9UmPIoT4kvJTKjMSizPii0pzUosPMcpwcChJ8PquB8oJFqWmp1akZeYAwwwmLcHBoyTC mw+S5i0uSMwtzkyHSJ1iVJQS5+UHSQiAJDJK8+DaYKF9iVFWSpiXEegQIZ6C1KLczBJU+VeM4 hyMSsK8oSBTeDLzSuCmvwJazAS0+MmdhyCLSxIRUlINjFbc30/neVZXTPxo3bHEUOrvr7ebbj CI3g2f3rdI7PVJ3qLC7jix/llS3vsP7trSHXFzmrQQ21vH448+TQrKfMlrJiCcsUng95NX928 IbLnuHH3g1NvH74OUbq/11fFZ96s/4qS34Xt2u3S2Q3zJrOZ+cq4eUio3jTJMYyKLV9S2/rl5 qMfyghJLcUaioRZzUXEiANh0kSpoAgAA X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1491251214!90755630!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 37731 invoked from network); 3 Apr 2017 20:26:55 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-7.tower-27.messagelabs.com with SMTP; 3 Apr 2017 20:26:55 -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 82BAE80D; Mon, 3 Apr 2017 13:26:54 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.207.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C2B333F4FF; Mon, 3 Apr 2017 13:26:53 -0700 (PDT) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Mon, 3 Apr 2017 21:28:24 +0100 Message-Id: <20170403202829.7278-23-andre.przywara@arm.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170403202829.7278-1-andre.przywara@arm.com> References: <20170403202829.7278-1-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH v4 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 | 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 a2758cd..2f024b1 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -473,6 +473,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, @@ -513,6 +540,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;