From patchwork Thu Feb 12 05:53:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 44585 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9823821527 for ; Thu, 12 Feb 2015 05:55:54 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id b13sf4953697wgh.2 for ; Wed, 11 Feb 2015 21:55:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=RxqslQFZD4aztGiKWlZeRUDWmOJGHfUKBb8usUmGZVM=; b=D9t6cXW2WIYWayQQTeJtLaFxaYzhoY+f/JBS5CasKAKkJ9iiOSp/RFdPVv33gPsZq5 8eck3ipqQYJVw2HnzwPPjpLZOKd6uvDOr1ayAP1mks2i4qcXtxC/mqKruukYxwWrLWy/ nXfum1YymMGtVSDODBIrE7kiNJZAbZWPJRSfVal6r4nCKLAgeE6VpuoOL0v8EG8ITzq4 TW9L0padqpRD2QuE78GN22G0cQV5xHunmMc0/Eef+5/oh8V14PQAfQe2+eVmeQUwBCCj LjqJsHj6cRk0g4hxmm6T2wl6eHfjdrbHdy3L8AFieyGxYEJgRGM7l3I3+1ATrozHKIuk gg7g== X-Gm-Message-State: ALoCoQmS6ieeJEOS9YbAFp6YZyAry06DcS3MMmPyg01I1BLeLQQbeecuKCTH7ULU/sFFNhHSJ6Uf X-Received: by 10.152.2.67 with SMTP id 3mr274897las.8.1423720553856; Wed, 11 Feb 2015 21:55:53 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.5 with SMTP id ua5ls125050lac.68.gmail; Wed, 11 Feb 2015 21:55:53 -0800 (PST) X-Received: by 10.152.170.170 with SMTP id an10mr1648736lac.121.1423720553420; Wed, 11 Feb 2015 21:55:53 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id w3si376541lbm.144.2015.02.11.21.55.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Feb 2015 21:55:53 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by labgd6 with SMTP id gd6so7940027lab.7 for ; Wed, 11 Feb 2015 21:55:53 -0800 (PST) X-Received: by 10.152.37.138 with SMTP id y10mr1791416laj.88.1423720553124; Wed, 11 Feb 2015 21:55:53 -0800 (PST) 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.35.133 with SMTP id h5csp238763lbj; Wed, 11 Feb 2015 21:55:52 -0800 (PST) X-Received: by 10.229.25.200 with SMTP id a8mr6430844qcc.22.1423720551173; Wed, 11 Feb 2015 21:55:51 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u47si3977906qge.5.2015.02.11.21.55.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 11 Feb 2015 21:55:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:48559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLmkg-0002mu-CC for patch@linaro.org; Thu, 12 Feb 2015 00:55:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLmiw-0000GI-1T for qemu-devel@nongnu.org; Thu, 12 Feb 2015 00:54:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLmir-00014b-KF for qemu-devel@nongnu.org; Thu, 12 Feb 2015 00:54:01 -0500 Received: from mail-ie0-f178.google.com ([209.85.223.178]:39269) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLmir-00014W-FS for qemu-devel@nongnu.org; Thu, 12 Feb 2015 00:53:57 -0500 Received: by iecvy18 with SMTP id vy18so9598441iec.6 for ; Wed, 11 Feb 2015 21:53:57 -0800 (PST) X-Received: by 10.50.143.106 with SMTP id sd10mr1883453igb.17.1423720437035; Wed, 11 Feb 2015 21:53:57 -0800 (PST) Received: from localhost.localdomain ([113.28.134.59]) by mx.google.com with ESMTPSA id hi15sm638526igb.19.2015.02.11.21.53.54 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Feb 2015 21:53:56 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, christoffer.dall@linaro.org, alex.bennee@linaro.org Date: Thu, 12 Feb 2015 13:53:34 +0800 Message-Id: <1423720414-32041-5-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1423720414-32041-1-git-send-email-greg.bellows@linaro.org> References: <1423720414-32041-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.223.178 Cc: edgar.iglesias@gmail.com, Greg Bellows , a.spyridakis@virtualopensystems.com Subject: [Qemu-devel] [PATCH v6 4/4] target-arm: Add AArch32 guest support to KVM64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: greg.bellows@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.215.54 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 Add 32-bit to/from 64-bit register synchronization on register gets and puts. Set EL1_32BIT feature flag passed to KVM Signed-off-by: Greg Bellows Reviewed-by: Peter Maydell --- v4 -> v5 - Fix target check v3 -> v4 - Add check that to make sure KVM64 is only being used on AArch64 family of machines. - Relocate register sync to follow register fetches. - Refresh env->aarch64 prior to use. v2 -> v3 - Conditionalize sync of 32-bit and 64-bit registers --- target-arm/kvm64.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c index 033babf..48fdb87 100644 --- a/target-arm/kvm64.c +++ b/target-arm/kvm64.c @@ -82,7 +82,7 @@ int kvm_arch_init_vcpu(CPUState *cs) ARMCPU *cpu = ARM_CPU(cs); if (cpu->kvm_target == QEMU_KVM_ARM_TARGET_NONE || - !arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { + !object_dynamic_cast(cpu, TYPE_AARCH64_CPU)) { fprintf(stderr, "KVM is not supported for this guest CPU type\n"); return -EINVAL; } @@ -96,6 +96,9 @@ int kvm_arch_init_vcpu(CPUState *cs) cpu->psci_version = 2; cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_PSCI_0_2; } + if (!arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { + cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_EL1_32BIT; + } /* Do KVM_ARM_VCPU_INIT ioctl */ ret = kvm_arm_vcpu_init(cs); @@ -133,6 +136,13 @@ int kvm_arch_put_registers(CPUState *cs, int level) ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; + /* If we are in AArch32 mode then we need to copy the AArch32 regs to the + * AArch64 registers before pushing them out to 64-bit KVM. + */ + if (!is_a64(env)) { + aarch64_sync_32_to_64(env); + } + for (i = 0; i < 31; i++) { reg.id = AARCH64_CORE_REG(regs.regs[i]); reg.addr = (uintptr_t) &env->xregs[i]; @@ -162,7 +172,11 @@ int kvm_arch_put_registers(CPUState *cs, int level) } /* Note that KVM thinks pstate is 64 bit but we use a uint32_t */ - val = pstate_read(env); + if (is_a64(env)) { + val = pstate_read(env); + } else { + val = cpsr_read(env); + } reg.id = AARCH64_CORE_REG(regs.pstate); reg.addr = (uintptr_t) &val; ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); @@ -242,7 +256,14 @@ int kvm_arch_get_registers(CPUState *cs) if (ret) { return ret; } - pstate_write(env, val); + + env->aarch64 = ((val & PSTATE_nRW) == 0); + if (is_a64(env)) { + pstate_write(env, val); + } else { + env->uncached_cpsr = val & CPSR_M; + cpsr_write(env, val, 0xffffffff); + } /* KVM puts SP_EL0 in regs.sp and SP_EL1 in regs.sp_el1. On the * QEMU side we keep the current SP in xregs[31] as well. @@ -256,6 +277,15 @@ int kvm_arch_get_registers(CPUState *cs) return ret; } + /* If we are in AArch32 mode then we need to sync the AArch32 regs with the + * incoming AArch64 regs received from 64-bit KVM. + * We must perform this after all of the registers have been acquired from + * the kernel. + */ + if (!is_a64(env)) { + aarch64_sync_64_to_32(env); + } + reg.id = AARCH64_CORE_REG(elr_el1); reg.addr = (uintptr_t) &env->elr_el[1]; ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®);