From patchwork Tue May 13 16:13:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vkamensky X-Patchwork-Id: 30096 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A0E5020446 for ; Tue, 13 May 2014 16:17:21 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id ma3sf2531302pbc.7 for ; Tue, 13 May 2014 09:17:20 -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:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=UDg4VZnvKca3vA+F9wE3Z6Ly40EYZZH+Vsa0H28Qmsk=; b=SmgErlU9KVBxusYdjov0jPgleUWopxswOB8tj6MJbswBjI8BJZ6qS32viG9KSJjJ8y JPb/CLznL8Jgc83HtW69GULXo3ZT11iQGVq41AxW4k29MIHfPD2lMR0BCuX4kwerZn8v OpJSExas2qywsXHzVYjV2A9ujHdtfmXARf2YorC9C9bfjzzT2wyoyEOfV3JwjFRWNbW8 QyA5eIO+fO6oBi/iDk+kBDeD1w5AEvMl/ALxmzxjvGIQL+WvLG1GwuMz4BodLjEhATZ9 DdpmxE5fzEF0I1UOdP/DbxB9vPCvRBdOfjB6ick2MNDs7pnU4q4k5Df1lw84HNbvduXS /xuA== X-Gm-Message-State: ALoCoQlSKRQtTe9pRaBVmAzO2GrN2DF6u2uYGTcunLZGQvGjI4uSf9OXleV2OXw6EJX/FqLHgxcL X-Received: by 10.66.190.202 with SMTP id gs10mr18029859pac.0.1399997840965; Tue, 13 May 2014 09:17:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.74 with SMTP id w68ls2037899qgw.53.gmail; Tue, 13 May 2014 09:17:20 -0700 (PDT) X-Received: by 10.58.66.195 with SMTP id h3mr935749vet.57.1399997840752; Tue, 13 May 2014 09:17:20 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id i14si689669veh.85.2014.05.13.09.17.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 May 2014 09:17:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id if17so753531vcb.36 for ; Tue, 13 May 2014 09:17:20 -0700 (PDT) X-Received: by 10.58.116.175 with SMTP id jx15mr29717268veb.9.1399997840680; Tue, 13 May 2014 09:17:20 -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.220.221.72 with SMTP id ib8csp164116vcb; Tue, 13 May 2014 09:17:20 -0700 (PDT) X-Received: by 10.224.164.197 with SMTP id f5mr49590720qay.32.1399997840295; Tue, 13 May 2014 09:17:20 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id v10si7997219qat.208.2014.05.13.09.17.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 May 2014 09:17:20 -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 1WkFMU-0002fH-Gu; Tue, 13 May 2014 16:15:26 +0000 Received: from mail-pb0-f43.google.com ([209.85.160.43]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WkFMG-0001Sv-8W for linux-arm-kernel@lists.infradead.org; Tue, 13 May 2014 16:15:13 +0000 Received: by mail-pb0-f43.google.com with SMTP id up15so458474pbc.30 for ; Tue, 13 May 2014 09:14:56 -0700 (PDT) X-Received: by 10.66.140.6 with SMTP id rc6mr64779686pab.87.1399997696396; Tue, 13 May 2014 09:14:56 -0700 (PDT) Received: from kamensky-w530.hsd1.ca.comcast.net (c-24-6-79-41.hsd1.ca.comcast.net. [24.6.79.41]) by mx.google.com with ESMTPSA id dd5sm28958360pbc.85.2014.05.13.09.14.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 May 2014 09:14:55 -0700 (PDT) From: Victor Kamensky To: kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com, agraf@suse.de Subject: [PATCH v3 04/14] ARM: KVM: __kvm_vcpu_run function return result fix in BE case Date: Tue, 13 May 2014 09:13:56 -0700 Message-Id: <1399997646-4716-5-git-send-email-victor.kamensky@linaro.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1399997646-4716-1-git-send-email-victor.kamensky@linaro.org> References: <1399997646-4716-1-git-send-email-victor.kamensky@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140513_091512_352327_E76D3BE3 X-CRM114-Status: UNSURE ( 9.08 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 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.160.43 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Cc: taras.kondratiuk@linaro.org, linaro-kernel@lists.linaro.org, linux-arm-kernel@lists.infradead.org, Victor Kamensky X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 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: victor.kamensky@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.177 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 The __kvm_vcpu_run function returns a 64-bit result in two registers, which has to be adjusted for BE case. Signed-off-by: Victor Kamensky Acked-by: Christoffer Dall Acked-by: Marc Zyngier --- arch/arm/kvm/interrupts.S | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S index 24d4e65..7dfe9e4 100644 --- a/arch/arm/kvm/interrupts.S +++ b/arch/arm/kvm/interrupts.S @@ -199,8 +199,13 @@ after_vfp_restore: restore_host_regs clrex @ Clear exclusive monitor +#ifndef __ARMEB__ mov r0, r1 @ Return the return code mov r1, #0 @ Clear upper bits in return value +#else + @ r1 already has return code + mov r0, #0 @ Clear upper bits in return value +#endif /* __ARMEB__ */ bx lr @ return to IOCTL /********************************************************************