From patchwork Wed Jun 14 16:52:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9786951 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 8429360325 for ; Wed, 14 Jun 2017 16:54:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73FB8285E6 for ; Wed, 14 Jun 2017 16:54:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68D5B2860B; Wed, 14 Jun 2017 16:54:39 +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 17264285E6 for ; Wed, 14 Jun 2017 16:54:39 +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 1dLBXI-0006xb-2R; Wed, 14 Jun 2017 16:52:52 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLBXG-0006vM-Q8 for xen-devel@lists.xenproject.org; Wed, 14 Jun 2017 16:52:50 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id 0A/F2-03920-2E961495; Wed, 14 Jun 2017 16:52:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRWlGSWpSXmKPExsVysyfVTfdhpmO kwbPP6hbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bcFd2MBYeEKg4/2sPewHiYr4uRi0NIYDOj ROPlGcwQznJGia9ffwI5nBxsAroSO26+BrNFBEIlni74DlbELHCdUeL0jvlsIAlhAQuJfQ/vs IDYLAKqEk+PTwGL8wpYS8w/fJUVxJYQkJNoOH8fbBAnUHzq9slMXYwcQNusJG6u0J/AyL2AkW EVo0ZxalFZapGukbleUlFmekZJbmJmjq6hgZlebmpxcWJ6ak5iUrFecn7uJkaghxmAYAfj4rW BhxglOZiURHmnCjpGCvEl5adUZiQWZ8QXleakFh9ilOHgUJLgDcoAygkWpaanVqRl5gBDDSYt wcGjJMK7NRUozVtckJhbnJkOkTrFqCglzhsI0icAksgozYNrg4X3JUZZKWFeRqBDhHgKUotyM 0tQ5V8xinMwKgnzlqUDTeHJzCuBm/4KaDET0OKgCw4gi0sSEVJSDYx5/9s7RMOZQ3UN91VPuD shOilz5YctKRsMZ9UkrTlXUTJbQjdacuXlkg0i6xasl5pe9z1vSUuVZNiclUvrHoWETDWbUL4 xW0nwVkOlWZ0ew+Kr4szzw8wP58zM1+e+ZCDYvKX747VK5tQyx7Mc/lPsdef6OJQ8ebU8anf4 BLZr73mmB59f91uJpTgj0VCLuag4EQDavviBagIAAA== X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1497459169!107808028!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 31477 invoked from network); 14 Jun 2017 16:52:49 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-9.tower-27.messagelabs.com with SMTP; 14 Jun 2017 16:52:49 -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 EA62D15BF; Wed, 14 Jun 2017 09:52:48 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.207.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9A5C03F3E1; Wed, 14 Jun 2017 09:52:47 -0700 (PDT) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Wed, 14 Jun 2017 17:52:11 +0100 Message-Id: <20170614165223.7543-23-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 22/34] ARM: vITS: handle INT 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 INT command sets a given LPI identified by a DeviceID/EventID pair as pending and thus triggers it to be injected. As read_itte() is now eventually used, we add the static keyword. Signed-off-by: Andre Przywara Reviewed-by: Julien Grall --- xen/arch/arm/vgic-v3-its.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c index 36910aa..8a2a0d2 100644 --- a/xen/arch/arm/vgic-v3-its.c +++ b/xen/arch/arm/vgic-v3-its.c @@ -186,8 +186,8 @@ static paddr_t its_get_itte_address(struct virt_its *its, * address and puts the result in vcpu_ptr and vlpi_ptr. * Must be called with the ITS lock held. */ -bool read_itte(struct virt_its *its, uint32_t devid, uint32_t evid, - struct vcpu **vcpu_ptr, uint32_t *vlpi_ptr) +static bool read_itte(struct virt_its *its, uint32_t devid, uint32_t evid, + struct vcpu **vcpu_ptr, uint32_t *vlpi_ptr) { paddr_t addr; struct vits_itte itte; @@ -259,6 +259,28 @@ static uint64_t its_cmd_mask_field(uint64_t *its_cmd, unsigned int word, #define its_cmd_get_validbit(cmd) its_cmd_mask_field(cmd, 2, 63, 1) #define its_cmd_get_ittaddr(cmd) (its_cmd_mask_field(cmd, 2, 8, 44) << 8) +static int its_handle_int(struct virt_its *its, uint64_t *cmdptr) +{ + uint32_t devid = its_cmd_get_deviceid(cmdptr); + uint32_t eventid = its_cmd_get_id(cmdptr); + struct vcpu *vcpu; + uint32_t vlpi; + bool ret; + + spin_lock(&its->its_lock); + ret = read_itte(its, devid, eventid, &vcpu, &vlpi); + spin_unlock(&its->its_lock); + if ( !ret ) + return -1; + + if ( vlpi == INVALID_LPI ) + return -1; + + vgic_vcpu_inject_lpi(its->d, vlpi); + + return 0; +} + #define ITS_CMD_BUFFER_SIZE(baser) ((((baser) & 0xff) + 1) << 12) #define ITS_CMD_OFFSET(reg) ((reg) & GENMASK(19, 5)) @@ -295,6 +317,9 @@ static int vgic_its_handle_cmds(struct domain *d, struct virt_its *its) switch ( its_cmd_get_command(command) ) { + case GITS_CMD_INT: + ret = its_handle_int(its, command); + break; case GITS_CMD_SYNC: /* We handle ITS commands synchronously, so we ignore SYNC. */ break;