From patchwork Mon Mar 27 09:31:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 9646167 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 D2797602BF for ; Mon, 27 Mar 2017 10:01:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB96427F80 for ; Mon, 27 Mar 2017 10:01:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9FECA2835B; Mon, 27 Mar 2017 10:01:15 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2DED627F80 for ; Mon, 27 Mar 2017 10:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=SJZmYdXXFrz/Ig2I2W/lWxYAYVI6QEf9cxbxOjJspOQ=; b=DZtg1rcXswT8QwQbZhAnw+gSI1 JjzKrxOws1ojVzlk9kZMbgbjgygAtDjj8dR4VQ3BnyVKE3t8vMDunvsvK7oshdF+jQSJ8nvwpcD2g 2JY2vS2CO3M0OYcgJ8GamT5B2N9kj4oPJsyya5KZtEuG8jrmG7g9Tbt+flSsRESWEal9P18xm7K9N fRnM+W005agmMIN2CR7w6cfP2LSM5DqlcSkNIYKhl+74I+IrblfigTbAzammzS+0BvWf09Xoh767v YKeSw/Be8Md/WDIEudsQz1SR4xTOADnW5rRvFnEBrZujv2FVud5k4j80u1H0tZajYr4Vp19csD6NC aEyPfmnQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1csRSb-0000Aw-S7; Mon, 27 Mar 2017 10:01:13 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1csRIl-0004qY-GG for linux-arm-kernel@bombadil.infradead.org; Mon, 27 Mar 2017 09:51:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=vwv6Ufd/KGQP323HcpIe6UBGC7qoamRI2Cu/YfKxUHI=; b=iO7jg2LLg/jsxL2nCnCgsW266 P6tB0TkuG2lZ2mGgK0MBGcEKaujube2NaeSJq7MTRRymYxAo7pWIBEIk6WssWq7KIdwVuIcQNRnvs 0kZkRVW9KZ85BRk6fflS/6VCqu+jnb3WlcFbJ91wlcpETnWHNVyLkKdroVmxeGwn1d+eprUoyuR7z jHYlakaJbKr/ly5LEzpliyQXvxJY0+BFiShnLKwRz0jL+sh3KiRcPCN+W0akNzxZ25J2GwI+EcakC ey6pmwviHiEywDOdWxlPmTWZpivZqv83hggSfATiw/N8eCgr09nBG1BO+/OopHmxhl37YxWHUxyBc xceH/9Cuw==; Received: from mx1.redhat.com ([209.132.183.28]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1csR0t-0002xQ-PO for linux-arm-kernel@lists.infradead.org; Mon, 27 Mar 2017 09:32:37 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 48A61B56A9; Mon, 27 Mar 2017 09:32:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 48A61B56A9 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eric.auger@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 48A61B56A9 Received: from localhost.localdomain.com (ovpn-117-27.ams2.redhat.com [10.36.117.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0ECE8F7D6; Mon, 27 Mar 2017 09:32:10 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, marc.zyngier@arm.com, christoffer.dall@linaro.org, andre.przywara@arm.com, vijayak@caviumnetworks.com, Vijaya.Kumar@cavium.com, peter.maydell@linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: [PATCH v4 11/22] KVM: arm64: ITS: Interpret MAPD ITT_addr field Date: Mon, 27 Mar 2017 11:31:01 +0200 Message-Id: <1490607072-21610-12-git-send-email-eric.auger@redhat.com> In-Reply-To: <1490607072-21610-1-git-send-email-eric.auger@redhat.com> References: <1490607072-21610-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 27 Mar 2017 09:32:14 +0000 (UTC) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170327_103235_952704_4EF09A09 X-CRM114-Status: GOOD ( 13.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Prasun.Kapoor@cavium.com, drjones@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Up to now the MAPD ITT_addr had been ignored. We will need it for save/restore. Let's record it in the its_device struct. Signed-off-by: Eric Auger --- v3 -> v4: - in vgic_its_cmd_handle_mapd, itt_addr directly is shifted - correct ittaddr bitmask to support 48bit GPA --- virt/kvm/arm/vgic/vgic-its.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index ddd2780..89a0db7 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -103,6 +103,7 @@ struct its_device { /* the head for the list of ITTEs */ struct list_head itt_head; u32 nb_eventid_bits; + gpa_t itt_addr; u32 device_id; }; @@ -553,6 +554,7 @@ static u64 its_cmd_mask_field(u64 *its_cmd, int word, int shift, int size) #define its_cmd_get_id(cmd) its_cmd_mask_field(cmd, 1, 0, 32) #define its_cmd_get_physical_id(cmd) its_cmd_mask_field(cmd, 1, 32, 32) #define its_cmd_get_collection(cmd) its_cmd_mask_field(cmd, 2, 0, 16) +#define its_cmd_get_ittaddr(cmd) its_cmd_mask_field(cmd, 2, 8, 47) #define its_cmd_get_target_addr(cmd) its_cmd_mask_field(cmd, 2, 16, 32) #define its_cmd_get_validbit(cmd) its_cmd_mask_field(cmd, 2, 63, 1) @@ -824,6 +826,7 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, u32 device_id = its_cmd_get_deviceid(its_cmd); bool valid = its_cmd_get_validbit(its_cmd); u8 nb_eventid_bits = its_cmd_get_size(its_cmd) + 1; + gpa_t itt_addr = its_cmd_get_ittaddr(its_cmd) << 8; struct its_device *device; if (!vgic_its_check_id(its, its->baser_device_table, device_id)) @@ -855,6 +858,7 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, device->device_id = device_id; device->nb_eventid_bits = nb_eventid_bits; + device->itt_addr = itt_addr; INIT_LIST_HEAD(&device->itt_head);