From patchwork Thu Jun 12 16:30:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vkamensky X-Patchwork-Id: 31837 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8FA6D20AE6 for ; Thu, 12 Jun 2014 16:32:45 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wm4sf3214471obc.7 for ; Thu, 12 Jun 2014 09:32:45 -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=hVq/a0j+muVy2yFt/JaMAFq/A+LmqvMpHPyEtVUUbB0=; b=fgxJ1ku3s78KMj6wM/nZE7G68F1324mcpafEyYj8GrFP2dlCM6EkedygEDkrhnsySg yHjJEYgCIdSuiKvlAjagRFCMficK9qaHNRvEiq0jlMY4qZmMGkVqPuJAsYJU0P0fQ2PO 0vRrr9ZjR7myJiE8mxewnLICrFLEdOqLqULGhyJ1Dg9Po3X7kyHb37rgrgQbP8pgfWLr dpPMjaqg1Swb7xdW2lYXTSi5OuqkUlACgugvYlDUa6iKDvJnGmoi0z+NW88L/juLlWYW 9hV3+bxORdQB4CI+EqP8HtvdHfEPbwiMVwVpZCGFCYOBOhtYO0Aes5gtDuDpUNUJScdi Ofqw== X-Gm-Message-State: ALoCoQm5S92Iqx8AELPIZdFloR75NyaoucnEuF3oN3E3RZWE7UYZ0ZikrHi5LBPrnkWJ+wEJ4y4c X-Received: by 10.182.91.79 with SMTP id cc15mr1745101obb.13.1402590765139; Thu, 12 Jun 2014 09:32:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.97 with SMTP id g88ls2940051qgf.40.gmail; Thu, 12 Jun 2014 09:32:45 -0700 (PDT) X-Received: by 10.52.33.241 with SMTP id u17mr816872vdi.82.1402590765007; Thu, 12 Jun 2014 09:32:45 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id er10si478782vdc.28.2014.06.12.09.32.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Jun 2014 09:32:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id la4so1107513vcb.28 for ; Thu, 12 Jun 2014 09:32:44 -0700 (PDT) X-Received: by 10.220.69.72 with SMTP id y8mr44826285vci.21.1402590764922; Thu, 12 Jun 2014 09:32:44 -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.54.6 with SMTP id vs6csp416938vcb; Thu, 12 Jun 2014 09:32:44 -0700 (PDT) X-Received: by 10.140.104.66 with SMTP id z60mr24386788qge.21.1402590764284; Thu, 12 Jun 2014 09:32:44 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id h11si34761590qgf.62.2014.06.12.09.32.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jun 2014 09:32:44 -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 1Wv7uW-00085b-Sp; Thu, 12 Jun 2014 16:31:32 +0000 Received: from mail-pd0-f182.google.com ([209.85.192.182]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wv7ty-0007sD-Lp for linux-arm-kernel@lists.infradead.org; Thu, 12 Jun 2014 16:31:00 +0000 Received: by mail-pd0-f182.google.com with SMTP id y13so1137102pdi.27 for ; Thu, 12 Jun 2014 09:30:37 -0700 (PDT) X-Received: by 10.66.255.67 with SMTP id ao3mr22090054pad.25.1402590637401; Thu, 12 Jun 2014 09:30:37 -0700 (PDT) Received: from kamensky-w530.cisco.com (128-107-239-235.cisco.com. [128.107.239.235]) by mx.google.com with ESMTPSA id nh8sm81278030pbc.25.2014.06.12.09.30.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jun 2014 09:30:36 -0700 (PDT) From: Victor Kamensky To: kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com, agraf@suse.de Subject: [PATCH v4 04/14] ARM: KVM: __kvm_vcpu_run function return result fix in BE case Date: Thu, 12 Jun 2014 09:30:03 -0700 Message-Id: <1402590613-3341-5-git-send-email-victor.kamensky@linaro.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1402590613-3341-1-git-send-email-victor.kamensky@linaro.org> References: <1402590613-3341-1-git-send-email-victor.kamensky@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140612_093058_755977_C2C3E857 X-CRM114-Status: UNSURE ( 9.15 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.182 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.192.182 listed in wl.mailspike.net] -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.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: 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.169 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..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 /********************************************************************