Message ID | 1430704362-6292-21-git-send-email-shannon.zhao@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBCOL5N4BVYCBB55CTOVAKGQETRHXWOA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E75012121F for <linaro@patches.linaro.org>; Mon, 4 May 2015 01:55:04 +0000 (UTC) Received: by lbbrr5 with SMTP id rr5sf38773575lbb.3 for <linaro@patches.linaro.org>; Sun, 03 May 2015 18:55:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=7xGosLw7NU8Y1kPeo8lPzBW0W8auKFPSAjpwvCE2ZCM=; b=RYcPNYqlfMNczxeGToswcYoUhN7B4mMkY0nFIF4OdGxq5he+JQgmTSsmoNFpKE9nuM wYHHSuCSzuOWJJeV8fYbyvO3EU+UALUn28rMOWDpt2ReCVdMpxs4likO8lEEmCsgL3Ot 4cYXu3TjGPfX53NDfWDEeX1HpOHDsSLtxEm4jrN9+4dbcCqDzwAsPnod4hEm/V0ecFtU s5J1Jpq4ChFmzGo2+L1xjTkfkmIK++bFwGZ+Nh7eQsGvpE4RK2DPlqMwlGj442C58Q80 7m5mhp3r+OFdrPy3IcKhPnZSoJoRCv0d5xjEvhnl/0Et3TksxsF+vga7ICVflsqSVj5S JIQQ== X-Gm-Message-State: ALoCoQkMFOWp43lCqPZiZKUH+3V8DFtfTqLdUjjjm/cdq05DwarcQ8+NjPglDDad6bkZqM9Sao4q X-Received: by 10.152.206.36 with SMTP id ll4mr16981381lac.6.1430704503687; Sun, 03 May 2015 18:55:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.30.74 with SMTP id q10ls703738lah.35.gmail; Sun, 03 May 2015 18:55:03 -0700 (PDT) X-Received: by 10.112.159.162 with SMTP id xd2mr17324574lbb.67.1430704503542; Sun, 03 May 2015 18:55:03 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id x10si9079204lax.97.2015.05.03.18.55.03 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 May 2015 18:55:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by laat2 with SMTP id t2so95038020laa.1 for <patchwork-forward@linaro.org>; Sun, 03 May 2015 18:55:03 -0700 (PDT) X-Received: by 10.112.163.168 with SMTP id yj8mr17583393lbb.36.1430704503445; Sun, 03 May 2015 18:55:03 -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.67.65 with SMTP id l1csp1412816lbt; Sun, 3 May 2015 18:55:02 -0700 (PDT) X-Received: by 10.66.63.70 with SMTP id e6mr17672985pas.148.1430704501784; Sun, 03 May 2015 18:55:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ix6si17838787pac.46.2015.05.03.18.55.01; Sun, 03 May 2015 18:55:01 -0700 (PDT) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751918AbbEDBzA (ORCPT <rfc822;shannon.zhao@linaro.org> + 2 others); Sun, 3 May 2015 21:55:00 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:33742 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751854AbbEDBzA (ORCPT <rfc822;stable@vger.kernel.org>); Sun, 3 May 2015 21:55:00 -0400 Received: by pdbnk13 with SMTP id nk13so150007555pdb.0 for <stable@vger.kernel.org>; Sun, 03 May 2015 18:54:59 -0700 (PDT) X-Received: by 10.70.33.134 with SMTP id r6mr37750834pdi.152.1430704499771; Sun, 03 May 2015 18:54:59 -0700 (PDT) Received: from localhost ([180.150.153.1]) by mx.google.com with ESMTPSA id z5sm11009019pbt.54.2015.05.03.18.54.58 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 03 May 2015 18:54:58 -0700 (PDT) From: shannon.zhao@linaro.org To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, christoffer.dall@linaro.org, shannon.zhao@linaro.org, Li Liu <john.liuli@huawei.com>, Marc Zyngier <marc.zyngier@arm.com> Subject: [PATCH for 3.14.y stable 20/47] ARM: virt: fix wrong HSCTLR.EE bit setting Date: Mon, 4 May 2015 09:52:15 +0800 Message-Id: <1430704362-6292-21-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1430704362-6292-1-git-send-email-shannon.zhao@linaro.org> References: <1430704362-6292-1-git-send-email-shannon.zhao@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shannon.zhao@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.215.48 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: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
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