From patchwork Mon Aug 4 08:46:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 34774 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 71DCB20F2E for ; Mon, 4 Aug 2014 08:49:34 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id eu11sf48739317pac.7 for ; Mon, 04 Aug 2014 01:49:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=pHJgLdmZ+whKv7MdATeox0321ly8F3kpnKnZz7zR0e8=; b=JTK3IX69oQc61o2oEjqrv9TW2BHg9k/6L0p7jhrpn5tFgzQzpSeqlX74NCdfIK021g Qp2fRT9X5UivU0h7CcXyVGtSe6o5VKlTqJiRQqjnZE1bGjLkgzVI7PacFcsTMM+tPxeW 1iZhv7LSGOwwk4+38Jb5A3iT6/jA9Uvv3V20UmPj5vSWpfcqsXT6oWOSgUpCuC6W/23a vvCbjE2agAr57pCt0Vt/QUDvgjcLJWgSAMdKtLHqPQuMg7T1kUkaT/DXtXY2YHpi6VIq QglArFDoxg8oDr2KVeECczOne5aKr3DOGkGW3I7lUgojX/MPZyqKu2o/SDHxwtqeOIEc mQVQ== X-Gm-Message-State: ALoCoQnpjZ0BJXNAPhJ5lYAo2iL1WSKIYi6xLtK14EQwKgGq7dqKeYOa7+cFkNdt4gNsKjWulyVn X-Received: by 10.67.3.201 with SMTP id by9mr8683530pad.14.1407142173768; Mon, 04 Aug 2014 01:49:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.231 with SMTP id z94ls2034944qgz.54.gmail; Mon, 04 Aug 2014 01:49:33 -0700 (PDT) X-Received: by 10.52.35.81 with SMTP id f17mr18325691vdj.13.1407142173644; Mon, 04 Aug 2014 01:49:33 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id t1si11541544vcx.69.2014.08.04.01.49.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 01:49:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id la4so10676347vcb.9 for ; Mon, 04 Aug 2014 01:49:33 -0700 (PDT) X-Received: by 10.220.96.137 with SMTP id h9mr4703237vcn.46.1407142173551; Mon, 04 Aug 2014 01:49:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp288212vcb; Mon, 4 Aug 2014 01:49:33 -0700 (PDT) X-Received: by 10.70.108.164 with SMTP id hl4mr4681270pdb.70.1407142172487; Mon, 04 Aug 2014 01:49:32 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id km1si16890546pbd.1.2014.08.04.01.49.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Aug 2014 01:49:32 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XEDwT-0002Kk-29; Mon, 04 Aug 2014 08:48:29 +0000 Received: from mail-la0-f50.google.com ([209.85.215.50]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XEDvi-0001bq-Hn for linux-arm-kernel@lists.infradead.org; Mon, 04 Aug 2014 08:47:43 +0000 Received: by mail-la0-f50.google.com with SMTP id gf5so5078554lab.37 for ; Mon, 04 Aug 2014 01:47:19 -0700 (PDT) X-Received: by 10.112.225.7 with SMTP id rg7mr20565003lbc.52.1407142039693; Mon, 04 Aug 2014 01:47:19 -0700 (PDT) Received: from localhost.localdomain (188-178-240-98-static.dk.customer.tdc.net. [188.178.240.98]) by mx.google.com with ESMTPSA id px1sm26731207lbb.46.2014.08.04.01.47.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Aug 2014 01:47:18 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , Gleb Natapov Subject: [GIT PULL 06/51] arm64: KVM: export demux regids as KVM_REG_ARM64 Date: Mon, 4 Aug 2014 10:46:23 +0200 Message-Id: <1407142028-31105-7-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1407142028-31105-1-git-send-email-christoffer.dall@linaro.org> References: <1407142028-31105-1-git-send-email-christoffer.dall@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140804_014742_768846_FCA86F04 X-CRM114-Status: GOOD ( 11.28 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.50 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.50 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Marc Zyngier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christoffer.dall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Alex Bennée I suspect this is a -ECUTPASTE fault from the initial implementation. If we don't declare the register ID to be KVM_REG_ARM64 the KVM_GET_ONE_REG implementation kvm_arm_get_reg() returns -EINVAL and hilarity ensues. The kvm/api.txt document describes all arm64 registers as starting with 0x60xx... (i.e KVM_REG_ARM64). Signed-off-by: Alex Bennée Acked-by: Christoffer Dall Acked-by: Marc Zyngier Signed-off-by: Marc Zyngier --- arch/arm64/kvm/sys_regs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index c59a1bd..34f25a5 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -962,7 +962,7 @@ static unsigned int num_demux_regs(void) static int write_demux_regids(u64 __user *uindices) { - u64 val = KVM_REG_ARM | KVM_REG_SIZE_U32 | KVM_REG_ARM_DEMUX; + u64 val = KVM_REG_ARM64 | KVM_REG_SIZE_U32 | KVM_REG_ARM_DEMUX; unsigned int i; val |= KVM_REG_ARM_DEMUX_ID_CCSIDR;