From patchwork Thu Jun 4 13:28:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 49526 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ACECF21562 for ; Thu, 4 Jun 2015 13:28:47 +0000 (UTC) Received: by wgv5 with SMTP id 5sf10238706wgv.0 for ; Thu, 04 Jun 2015 06:28:46 -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 :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=rpYxaoCJ7BpPUUbNMNkX8Ub24KIhQtLakQhvzaTwyi0=; b=YxLcJKeb9y0rEV3nRWhoSNHAdHNgrUdAfThlRCd8m51kxuUo5jg9dOo5xd9dW/Xh6T ZN98fopbXZG7MwUF/EEja8Jiy+gMijDXNCuH46mT+eD/CFwdC/GzRltThIVo//D2NR13 aYLQ5SVJW/pS/7cPtzcbrD4Dvq4KwUQ6PcjTqVy9iZuBdezelPIsVw86GXwrWv6DJ7IU Izw4ypD6KDxCfZMb+/X2pITbDOQi3teF63/+1OWdKpmA/nK9/Uw0PNDO4ivUyuO1BzSc J4gzk1V7cbGPEFjZfPmMYtYB0wina8ErJtQO3Bjbnt3MM5W6Y56COsYJGavkE8baNUzJ PF2w== X-Gm-Message-State: ALoCoQnXSuWmkjU9QNCEHsmiW+Iz/mO9Y+y9U7AtZCQCguO+iYEOcsofFXGYN7TjsTxuWV4iORQi X-Received: by 10.112.219.200 with SMTP id pq8mr35672171lbc.7.1433424526923; Thu, 04 Jun 2015 06:28:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.4.73 with SMTP id i9ls212738lai.100.gmail; Thu, 04 Jun 2015 06:28:46 -0700 (PDT) X-Received: by 10.152.8.102 with SMTP id q6mr7211299laa.27.1433424526745; Thu, 04 Jun 2015 06:28:46 -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 am2si1862645lac.0.2015.06.04.06.28.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jun 2015 06:28:46 -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 lbcue7 with SMTP id ue7so27252394lbc.0 for ; Thu, 04 Jun 2015 06:28:46 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr14932913lak.117.1433424526603; Thu, 04 Jun 2015 06:28:46 -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.108.230 with SMTP id hn6csp610086lbb; Thu, 4 Jun 2015 06:28:45 -0700 (PDT) X-Received: by 10.66.139.167 with SMTP id qz7mr68704527pab.135.1433424524713; Thu, 04 Jun 2015 06:28:44 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id kv16si5863338pab.207.2015.06.04.06.28.40; Thu, 04 Jun 2015 06:28:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753501AbbFDN2h (ORCPT + 28 others); Thu, 4 Jun 2015 09:28:37 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:42602 "EHLO socrates.bennee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752777AbbFDN2f (ORCPT ); Thu, 4 Jun 2015 09:28:35 -0400 Received: from localhost ([127.0.0.1] helo=zen.linaroharston) by socrates.bennee.com with esmtp (Exim 4.80) (envelope-from ) id 1Z0WXo-0003ST-LN; Thu, 04 Jun 2015 16:54:56 +0200 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: marc.zyngier@arm.com Cc: christoffer.dall@linaro.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gleb Natapov , Paolo Bonzini , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2] KVM: arm64: fix misleading comments in save/restore Date: Thu, 4 Jun 2015 14:28:37 +0100 Message-Id: <1433424517-31816-1-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.4.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: alex.bennee@linaro.org X-SA-Exim-Scanned: No (on socrates.bennee.com); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: alex.bennee@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: , The elr_el2 and spsr_el2 registers in fact contain the processor state before entry into EL2. In the case of guest state it could be in either el0 or el1. Signed-off-by: Alex Bennée --- v2 - s/hypervisor code/EL2/ - comment: pc/pstate before entering/on return from el2 --- arch/arm64/kvm/hyp.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index 5befd01..519805f 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -50,8 +50,8 @@ stp x29, lr, [x3, #80] mrs x19, sp_el0 - mrs x20, elr_el2 // EL1 PC - mrs x21, spsr_el2 // EL1 pstate + mrs x20, elr_el2 // pc before entering el2 + mrs x21, spsr_el2 // pstate before entering el2 stp x19, x20, [x3, #96] str x21, [x3, #112] @@ -82,8 +82,8 @@ ldr x21, [x3, #16] msr sp_el0, x19 - msr elr_el2, x20 // EL1 PC - msr spsr_el2, x21 // EL1 pstate + msr elr_el2, x20 // pc on return from el2 + msr spsr_el2, x21 // pstate on return from el2 add x3, x2, #CPU_XREG_OFFSET(19) ldp x19, x20, [x3]