From patchwork Wed Jun 14 16:52:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9786935 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 CF44C60325 for ; Wed, 14 Jun 2017 16:54:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C19751FF15 for ; Wed, 14 Jun 2017 16:54:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B68942860C; Wed, 14 Jun 2017 16:54:25 +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 983461FF15 for ; Wed, 14 Jun 2017 16:54:24 +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 1dLBXS-0007Gs-VP; Wed, 14 Jun 2017 16:53:02 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLBXS-0007F3-8f for xen-devel@lists.xenproject.org; Wed, 14 Jun 2017 16:53:02 +0000 Received: from [85.158.143.35] by server-10.bemta-6.messagelabs.com id 80/FF-03613-DE961495; Wed, 14 Jun 2017 16:53:01 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVysyfVTfdNpmO kwd69Vhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aLS/4FT3krNjy5xNLA+Jiri5GLQ0hgM6PE rZ4WVghnOaPE+blfgRxODjYBXYkdN18zg9giAqESTxd8ZwYpYha4zihxesd8ti5GDg5hARuJi 9fyQWpYBFQlXiy8zARi8wpYS+xYsAdsjoSAnETD+ftgcziB4lO3T2YCaRUSsJK4uUJ/AiP3Ak aGVYwaxalFZalFukZGeklFmekZJbmJmTm6hgZmermpxcWJ6ak5iUnFesn5uZsYgd5lAIIdjGv mBx5ilORgUhLlnSroGCnEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgvdwBlBOsCg1PbUiLTMHGGYw aQkOHiUR3q2pQGne4oLE3OLMdIjUKUZFKXHeQJA+AZBERmkeXBsstC8xykoJ8zICHSLEU5Bal JtZgir/ilGcg1FJmLcsHWgKT2ZeCdz0V0CLmYAWB11wAFlckoiQkmpgnK8SlFQzk3VXp/Z7cU eDwmXfzwlOSDwxffnfJVbOR262K+QvuXjj7rGkqyftLEWPm0VFVN99O233vj8BGac2GhSIHvD 74XW6UDw+Yt2+X3unGP3X8nJ4E7/m7Nd9css3H50U4fX3FLtY5dx7WzvOt2kX6Lpt+P9kohqz s77hvPYbsqKLl7w8J6nEUpyRaKjFXFScCAAzphJcaAIAAA== X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1497459180!68021870!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.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54182 invoked from network); 14 Jun 2017 16:53:00 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-13.tower-21.messagelabs.com with SMTP; 14 Jun 2017 16:53:00 -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 451D315A2; Wed, 14 Jun 2017 09:53:00 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.207.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E94A33F3E1; Wed, 14 Jun 2017 09:52:58 -0700 (PDT) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Wed, 14 Jun 2017 17:52:18 +0100 Message-Id: <20170614165223.7543-30-andre.przywara@arm.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170614165223.7543-1-andre.przywara@arm.com> References: <20170614165223.7543-1-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org, Vijaya Kumar K , Vijay Kilari , Shanker Donthineni , Manish Jaggi Subject: [Xen-devel] [PATCH v12 29/34] 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 Acked-by: Julien Grall --- xen/arch/arm/vgic-v3-its.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index 07ee1b1..ad22bde 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -714,6 +714,29 @@ 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); + int ret; + + spin_lock(&its->its_lock); + + /* Remove from the radix tree and remove the host entry. */ + ret = its_discard_event(its, devid, eventid); + if ( ret ) + goto out_unlock; + + /* Remove from the guest's ITTE. */ + if ( !write_itte(its, devid, eventid, UNMAPPED_COLLECTION, INVALID_LPI) ) + ret = -1; + +out_unlock: + spin_unlock(&its->its_lock); + + return ret; +} + #define ITS_CMD_BUFFER_SIZE(baser) ((((baser) & 0xff) + 1) << 12) #define ITS_CMD_OFFSET(reg) ((reg) & GENMASK(19, 5)) @@ -753,6 +776,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;