From patchwork Mon Aug 4 08:46:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 34799 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AE98D20F2E for ; Mon, 4 Aug 2014 08:56:40 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id s7sf18274563qap.10 for ; Mon, 04 Aug 2014 01:56:40 -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=GK0of9Q7J0dPF5oSjVq2ANekBJQDmE08ZeDtWpW3CvI=; b=laLcPUPP+NCYmPAJaTTLniXTStxnYbuPeKfbAnuD4IsyruumwGmQ+V5TU78zKivwiP p8swaEke7HxbIBehtT5KWB/FfVzwTRYqN9N8hNif6Y+NRcegEIDn+t6cIvHPBkHbQJrw 201fMTtfOJm0AR8HiW35rodveN26Uq4ffOxootObDMJBJDjhAgnzZbtHmqc3r7KtKsbk UAZSUefzkpHFir/KAf+wOLjLAAviDyLLrF1eYwF/xttuTgmHIJ3opEbyJjl+OQwRWw3m GRvAhQk4C3QzXJ6EYA8S+bdwiLf3f6qcRiw43Z9wFkDawVhDRBMciQPq3OMCUle81Q5W 5Row== X-Gm-Message-State: ALoCoQmzS1juK5Up/3BTeu/TzdLO0MhqDv47mC+oRIrRoQw5dRqhCqw6g89CHAu54ZMIgk+gM6HZ X-Received: by 10.236.18.135 with SMTP id l7mr3091529yhl.1.1407142600564; Mon, 04 Aug 2014 01:56:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.133 with SMTP id b5ls2036717qgb.43.gmail; Mon, 04 Aug 2014 01:56:40 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr21932575vcb.0.1407142600487; Mon, 04 Aug 2014 01:56:40 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id b8si11562523vcf.7.2014.08.04.01.56.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 01:56:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id lf12so10601341vcb.1 for ; Mon, 04 Aug 2014 01:56:40 -0700 (PDT) X-Received: by 10.221.24.135 with SMTP id re7mr733412vcb.53.1407142600416; Mon, 04 Aug 2014 01:56:40 -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 tc5csp288551vcb; Mon, 4 Aug 2014 01:56:40 -0700 (PDT) X-Received: by 10.70.102.102 with SMTP id fn6mr2690276pdb.100.1407142599651; Mon, 04 Aug 2014 01:56:39 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id bv5si16912249pbb.11.2014.08.04.01.56.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Aug 2014 01:56:39 -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 1XEE2u-0007T2-2D; Mon, 04 Aug 2014 08:55:08 +0000 Received: from mail-la0-f51.google.com ([209.85.215.51]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XEDwT-000218-Nq for linux-arm-kernel@lists.infradead.org; Mon, 04 Aug 2014 08:48:30 +0000 Received: by mail-la0-f51.google.com with SMTP id pn19so5154469lab.10 for ; Mon, 04 Aug 2014 01:48:07 -0700 (PDT) X-Received: by 10.152.161.225 with SMTP id xv1mr1528380lab.71.1407142087131; Mon, 04 Aug 2014 01:48:07 -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.48.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Aug 2014 01:48:06 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , Gleb Natapov Subject: [GIT PULL 30/51] ARM: KVM: __kvm_vcpu_run function return result fix in BE case Date: Mon, 4 Aug 2014 10:46:47 +0200 Message-Id: <1407142028-31105-31-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140804_014829_975781_AA4A8A7F X-CRM114-Status: UNSURE ( 9.63 ) X-CRM114-Notice: Please train this message. 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.51 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.51 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Marc Zyngier , Victor Kamensky , 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: , 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: 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.170 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: Victor Kamensky 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 Signed-off-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..01dcb0e 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 CONFIG_CPU_ENDIAN_BE8 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 /* CONFIG_CPU_ENDIAN_BE8 */ bx lr @ return to IOCTL /********************************************************************