From patchwork Wed Jul 20 13:02:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijay Kilari X-Patchwork-Id: 9239527 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 DBAB060867 for ; Wed, 20 Jul 2016 13:04:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC76B2787C for ; Wed, 20 Jul 2016 13:04:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0D8527C0B; Wed, 20 Jul 2016 13:04:53 +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.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7B7F52787C for ; Wed, 20 Jul 2016 13:04:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bPr9j-0003rB-Dj; Wed, 20 Jul 2016 13:03:19 +0000 Received: from mail-pa0-x242.google.com ([2607:f8b0:400e:c03::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bPr9X-0003oM-DC for linux-arm-kernel@lists.infradead.org; Wed, 20 Jul 2016 13:03:11 +0000 Received: by mail-pa0-x242.google.com with SMTP id q2so3325561pap.0 for ; Wed, 20 Jul 2016 06:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uZ7dW+eICOA6ADuVFZH3WU3b+PAmAakU/OVRi1iTRoA=; b=qqvmDey59faPI9ioT3znFXjxVXAxvFo6m3aZd9YrWAHdBldrZEPUsq+uLfhjNNI6li tR/JqfsoiRmK5yHHHN1HUavQBvLijQDk0goJTGgUi5KLuZxn3hY8jRFBrnDqGdRzG7Bj JBJhx9K+lEP2EAFpdlFM9EXWf7St3TowYpikc0Ihsp4aqlwnws7xkxK2fmpLKC+V53ex xENwUMJil6DfiDiLtlQTbPymaRXTDm03zxQSlM1dcL7qdw6Su9Ko41m3Do15vjIqiQPp JNNFhjVgYGDSXH74Gg+uK2V5kfAEo27Uhzo1QgGwNcDW0imgrohvwkT74VNnySf5MLTd RPoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uZ7dW+eICOA6ADuVFZH3WU3b+PAmAakU/OVRi1iTRoA=; b=E3aQAqu6htKLkmxXuPqeh6Nc+6Kg5ImwVRg3JXVXzWKxerpz3Gm+OqdIcraO8UJu7p 82MBu1Y7FlnFIgDprkxDUxnbtcZT+9dX3E8XO2RueBhpOK4zL5fjuQv1d6vEoqZa6AHo 4t+tQ7mAkdFwR17odeJNfqEYcqmpOoshxovayBgz2bwVExxhlz+YLL8yf3CSC/ncNEeg HTdDtOKkUFvl48gByVgz+ERfYs3FLtFJkV0tVVaTYdFofzMUZgRGgzLGzWPYSZrbOfG8 LLoJd5etTdp5QLkczuvK8a/jUDBun6EHkJUr2YkT//4EBH2Nko+GPOoSfI4R4baDXbzk CDNA== X-Gm-Message-State: ALyK8tKL9RqjWPFNnGlv86FBzWmCHVcE8YM6wxX/Ze/jYur2xlTMjigRwFIM/MJk+YqDng== X-Received: by 10.66.80.136 with SMTP id r8mr55842757pax.72.1469019771384; Wed, 20 Jul 2016 06:02:51 -0700 (PDT) Received: from localhost.localdomain ([106.51.134.69]) by smtp.gmail.com with ESMTPSA id s23sm4792584pfd.23.2016.07.20.06.02.48 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jul 2016 06:02:50 -0700 (PDT) From: vijay.kilari@gmail.com To: marc.zyngier@arm.com, christoffer.dall@linaro.org Subject: [RFC PATCH v1 1/4] arm/arm64: vgic-new: Introduce 64-bit reg access support Date: Wed, 20 Jul 2016 18:32:25 +0530 Message-Id: <1469019748-31005-2-git-send-email-vijay.kilari@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1469019748-31005-1-git-send-email-vijay.kilari@gmail.com> References: <1469019748-31005-1-git-send-email-vijay.kilari@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160720_060307_470911_6CE76B9C X-CRM114-Status: GOOD ( 12.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Prasun.Kapoor@cavium.com, p.fedin@samsung.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Vijaya Kumar K 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 From: Vijaya Kumar K vgic_attr_regs_access() handles only 32-bit register value. Introduce union ureg to handle both 32 and 64 bit register size. Signed-off-by: Vijaya Kumar K --- virt/kvm/arm/vgic/vgic-kvm-device.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-kvm-device.c b/virt/kvm/arm/vgic/vgic-kvm-device.c index cc843fe..cace996 100644 --- a/virt/kvm/arm/vgic/vgic-kvm-device.c +++ b/virt/kvm/arm/vgic/vgic-kvm-device.c @@ -19,6 +19,11 @@ #include #include "vgic.h" +union ureg { + u32 reg32; + u64 reg64; +}; + /* common helpers */ static int vgic_check_ioaddr(struct kvm *kvm, phys_addr_t *ioaddr, @@ -255,7 +260,7 @@ void kvm_register_vgic_device(unsigned long type) */ static int vgic_attr_regs_access(struct kvm_device *dev, struct kvm_device_attr *attr, - u32 *reg, bool is_write) + union ureg *reg, bool is_write) { gpa_t addr; int cpuid, ret, c; @@ -293,10 +298,10 @@ static int vgic_attr_regs_access(struct kvm_device *dev, switch (attr->group) { case KVM_DEV_ARM_VGIC_GRP_CPU_REGS: - ret = vgic_v2_cpuif_uaccess(vcpu, is_write, addr, reg); + ret = vgic_v2_cpuif_uaccess(vcpu, is_write, addr, ®->reg32); break; case KVM_DEV_ARM_VGIC_GRP_DIST_REGS: - ret = vgic_v2_dist_uaccess(vcpu, is_write, addr, reg); + ret = vgic_v2_dist_uaccess(vcpu, is_write, addr, ®->reg32); break; default: ret = -EINVAL; @@ -328,9 +333,9 @@ static int vgic_v2_set_attr(struct kvm_device *dev, case KVM_DEV_ARM_VGIC_GRP_DIST_REGS: case KVM_DEV_ARM_VGIC_GRP_CPU_REGS: { u32 __user *uaddr = (u32 __user *)(long)attr->addr; - u32 reg; + union ureg reg; - if (get_user(reg, uaddr)) + if (get_user(reg.reg32, uaddr)) return -EFAULT; return vgic_attr_regs_access(dev, attr, ®, true); @@ -353,12 +358,12 @@ static int vgic_v2_get_attr(struct kvm_device *dev, case KVM_DEV_ARM_VGIC_GRP_DIST_REGS: case KVM_DEV_ARM_VGIC_GRP_CPU_REGS: { u32 __user *uaddr = (u32 __user *)(long)attr->addr; - u32 reg = 0; + union ureg reg; ret = vgic_attr_regs_access(dev, attr, ®, false); if (ret) return ret; - return put_user(reg, uaddr); + return put_user(reg.reg32, uaddr); } }