From patchwork Thu Apr 30 09:24:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47798 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8DC8C2121F for ; Thu, 30 Apr 2015 09:33:00 +0000 (UTC) Received: by layy10 with SMTP id y10sf13869041lay.0 for ; Thu, 30 Apr 2015 02:32:59 -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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type :content-transfer-encoding:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=90sjBkpl+lUjm9WXJSDtdd+ymCtkkChiYNljvtMans4=; b=lyFdQx3uP581Ewkutunk4aHGFUldMsY9BTt8pinrE0E8IvdQzbbnuHV/MFEILBt44v 7II0VO/5svtRtqPzDVHBhxLz8EpZk5SK2luiBNeOHTki7ytCWp3ioR0+Lfp77bzIc4KB IX4eDZEjHrlsPMV78ylxwjG7JGslJODfv0NtqsxbD4j9n8QVKsbC8Rfkf6hVBt3RQIzX SxScND0eT9s4mwsAcGLXIedEP3SzzGMFyCmhYChyNNF9bPYKgG3X1uUCJi5hGdcuZTf2 YmRtHfjP/E4JOjwRskFb5mDEVKmw/sLHTvBaMhm59sNRPTmYpngUF14Y6qIIvGdn4Grq AVHg== X-Gm-Message-State: ALoCoQnME54ff2ZOkWtVa0zhUw+V26p+BcrYeVlI6sWYeqqXevDYxpBiclKXFdkw811m+FaQqXEa X-Received: by 10.180.73.137 with SMTP id l9mr1216151wiv.5.1430386379517; Thu, 30 Apr 2015 02:32:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.114 with SMTP id q18ls359186laa.8.gmail; Thu, 30 Apr 2015 02:32:59 -0700 (PDT) X-Received: by 10.112.181.68 with SMTP id du4mr2914500lbc.11.1430386379304; Thu, 30 Apr 2015 02:32:59 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id ur10si1367592lbb.12.2015.04.30.02.32.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2015 02:32:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbcga7 with SMTP id ga7so39992389lbc.1 for ; Thu, 30 Apr 2015 02:32:58 -0700 (PDT) X-Received: by 10.152.27.98 with SMTP id s2mr3029685lag.106.1430386378881; Thu, 30 Apr 2015 02:32:58 -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.112.67.65 with SMTP id l1csp2998410lbt; Thu, 30 Apr 2015 02:32:58 -0700 (PDT) X-Received: by 10.68.135.233 with SMTP id pv9mr6489880pbb.115.1430385972439; Thu, 30 Apr 2015 02:26:12 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nf2si2640288pbc.149.2015.04.30.02.26.11; Thu, 30 Apr 2015 02:26:12 -0700 (PDT) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751497AbbD3JZy (ORCPT + 2 others); Thu, 30 Apr 2015 05:25:54 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:53079 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751521AbbD3JZT (ORCPT ); Thu, 30 Apr 2015 05:25:19 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YnkiW-0005OH-8E; Thu, 30 Apr 2015 11:25:12 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Marc Zyngier , Shannon Zhao , Jiri Slaby Subject: [patch added to the 3.12 stable tree] arm64: KVM: export demux regids as KVM_REG_ARM64 Date: Thu, 30 Apr 2015 11:24:45 +0200 Message-Id: <1430385911-20480-37-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1430385911-20480-1-git-send-email-jslaby@suse.cz> References: <1430385911-20480-1-git-send-email-jslaby@suse.cz> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@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.217.176 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Alex Bennée This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== commit efd48ceacea78e4d4656aa0a6bf4c5b92ed22130 upstream. 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 Signed-off-by: Shannon Zhao Signed-off-by: Jiri Slaby --- 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 03244582bc55..5ee99e43890a 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;