From patchwork Mon Aug 4 08:46:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 34793 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2ADC720F2E for ; Mon, 4 Aug 2014 08:54:44 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id fp1sf44235938pdb.9 for ; Mon, 04 Aug 2014 01:54:43 -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=iFn9Skbfd4jLfyx/DAX/0Rp8ijfcl3JrRMVD5I3lrvo=; b=e0CxBHxlWWPdz7hfgESNI8NV1VwtmJBzT2mwQjuTe7ebgM93siiUSphPo9q0OR5RhA TLiteed26khgIWamL4JAeNogsCrKf0arBpuzgcusTfwLUCRUbRg7JojKptj6yQB6XNh/ 2aBfP9xSij4E5MkHaB2bQy/pfbhS5CJQARg566DX6E0l1qVb7fjsNFOXhFxLBwOeW/ha G2z22vAYswho3jPDdIs5KKnDYe9qSBMVIZu3uro1OvveUVitG7+kAluVHXwvirfbW7YS ZeSViSMJU544k2N8wAoNgHEzG22p8m02x9TMM93hB5Abk9mGhuUYLP6XDiGMSY9PNKn+ mtsg== X-Gm-Message-State: ALoCoQkOu6PcQOZMwPvzxXyIP23qi0Lh3qMj8CM+GtZFPFQShLd2AWDowFlxvXxG9TLHG0ZQEDm6 X-Received: by 10.66.145.33 with SMTP id sr1mr8238044pab.18.1407142483410; Mon, 04 Aug 2014 01:54:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.140 with SMTP id b12ls2010512qge.88.gmail; Mon, 04 Aug 2014 01:54:43 -0700 (PDT) X-Received: by 10.52.243.135 with SMTP id wy7mr62056vdc.82.1407142483307; Mon, 04 Aug 2014 01:54:43 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id v3si11537127vdv.28.2014.08.04.01.54.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 01:54:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ij19so10519590vcb.11 for ; Mon, 04 Aug 2014 01:54:43 -0700 (PDT) X-Received: by 10.52.248.146 with SMTP id ym18mr18620365vdc.8.1407142483083; Mon, 04 Aug 2014 01:54:43 -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 tc5csp288461vcb; Mon, 4 Aug 2014 01:54:42 -0700 (PDT) X-Received: by 10.70.50.137 with SMTP id c9mr2615577pdo.101.1407142482193; Mon, 04 Aug 2014 01:54:42 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id fx12si8460757pdb.244.2014.08.04.01.54.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Aug 2014 01:54:42 -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 1XEE0i-0002PC-M7; Mon, 04 Aug 2014 08:52:52 +0000 Received: from mail-lb0-f172.google.com ([209.85.217.172]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XEDwL-0001wa-8K for linux-arm-kernel@lists.infradead.org; Mon, 04 Aug 2014 08:48:22 +0000 Received: by mail-lb0-f172.google.com with SMTP id z11so5081454lbi.31 for ; Mon, 04 Aug 2014 01:48:01 -0700 (PDT) X-Received: by 10.112.25.104 with SMTP id b8mr967336lbg.95.1407142081407; Mon, 04 Aug 2014 01:48:01 -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.47.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Aug 2014 01:48:00 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , Gleb Natapov Subject: [GIT PULL 27/51] ARM: virt: fix wrong HSCTLR.EE bit setting Date: Mon, 4 Aug 2014 10:46:44 +0200 Message-Id: <1407142028-31105-28-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_014821_493514_67C83922 X-CRM114-Status: UNSURE ( 8.99 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.4 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.172 listed in list.dnswl.org] -0.7 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.217.172 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record Cc: Marc Zyngier , Li Liu , 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.180 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: Li Liu HSCTLR.EE is defined as bit[25] referring to arm manual DDI0606C.b(p1590). Reviewed-by: Marc Zyngier Signed-off-by: Li Liu Signed-off-by: Marc Zyngier --- arch/arm/kernel/hyp-stub.S | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 797b1a6..7e666cf 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -134,9 +134,7 @@ ENTRY(__hyp_stub_install_secondary) mcr p15, 4, r7, c1, c1, 3 @ HSTR THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE -#ifdef CONFIG_CPU_BIG_ENDIAN - orr r7, #(1 << 9) @ HSCTLR.EE -#endif +ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE mcr p15, 4, r7, c1, c0, 0 @ HSCTLR mrc p15, 4, r7, c1, c1, 1 @ HDCR