| Message ID | 1433256507-7856-6-git-send-email-shannon.zhao@linaro.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBCOL5N4BVYCBB5EEW6VQKGQE6AA47RY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3EC9620C3B for <linaro@patches.linaro.org>; Tue, 2 Jun 2015 14:49:25 +0000 (UTC) Received: by wibut5 with SMTP id ut5sf14707358wib.0 for <linaro@patches.linaro.org>; Tue, 02 Jun 2015 07:49:24 -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=O+La2o3qba0oQTSzXY8ZOxlknw1c8+eMgjy6ZxjL7Ij+Qr3mVvEiqBG9uTzVsBP7y7 mtReK5Hdds7x+qtJYZy23Ymzgxj1kmgZWL6QsA/Ab1zXviVg1lTMurn8MCOdElVLGORv zmPkIXU+ne6KAFOJd6STfnQxXrgrlCvLuBiAuq31QzFwP85dCmq5IcUx0yCKpNtrdYjd Rr+aJMI9dlSxUYFBWUVRtVm9PpoC6Jm9qoEO1SrhV/n/blrgmI451iTzZE5ibPlEVQwp dRNoIwRNWyCyfWEnKBAfYQ7Qq410sZL/ussoLEdfDppxDvl9auxUrBMLrK1lDIOtKRQ/ QAxQ== X-Gm-Message-State: ALoCoQkWkXFQNY1leL0Bva/DTvNxPmlkk2ATwoSt0MZrzR4CJE6W5PmWhIkHy/s7OTU+210/nTg8 X-Received: by 10.112.144.4 with SMTP id si4mr19396508lbb.17.1433256564526; Tue, 02 Jun 2015 07:49:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.169 with SMTP id l9ls820845lah.52.gmail; Tue, 02 Jun 2015 07:49:24 -0700 (PDT) X-Received: by 10.152.243.9 with SMTP id wu9mr26119272lac.63.1433256564378; Tue, 02 Jun 2015 07:49:24 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id f2si15284092laa.43.2015.06.02.07.49.24 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2015 07:49:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbcue7 with SMTP id ue7so106060557lbc.0 for <patchwork-forward@linaro.org>; Tue, 02 Jun 2015 07:49:24 -0700 (PDT) X-Received: by 10.152.21.136 with SMTP id v8mr26637891lae.19.1433256564277; Tue, 02 Jun 2015 07:49:24 -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.108.230 with SMTP id hn6csp3128325lbb; Tue, 2 Jun 2015 07:49:23 -0700 (PDT) X-Received: by 10.66.243.69 with SMTP id ww5mr23789573pac.106.1433256561911; Tue, 02 Jun 2015 07:49:21 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hv8si26697315pdb.173.2015.06.02.07.49.21; Tue, 02 Jun 2015 07:49:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759032AbbFBOtS (ORCPT <rfc822;shannon.zhao@linaro.org> + 2 others); Tue, 2 Jun 2015 10:49:18 -0400 Received: from mail-oi0-f46.google.com ([209.85.218.46]:33561 "EHLO mail-oi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932319AbbFBOtQ (ORCPT <rfc822;stable@vger.kernel.org>); Tue, 2 Jun 2015 10:49:16 -0400 Received: by oiww2 with SMTP id w2so127355437oiw.0 for <stable@vger.kernel.org>; Tue, 02 Jun 2015 07:49:15 -0700 (PDT) X-Received: by 10.202.93.4 with SMTP id r4mr22207845oib.92.1433256555557; Tue, 02 Jun 2015 07:49:15 -0700 (PDT) Received: from localhost ([167.160.116.34]) by mx.google.com with ESMTPSA id e200sm9607333oig.17.2015.06.02.07.49.13 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 02 Jun 2015 07:49:14 -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 05/32] ARM: virt: fix wrong HSCTLR.EE bit setting Date: Tue, 2 Jun 2015 22:48:00 +0800 Message-Id: <1433256507-7856-6-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1433256507-7856-1-git-send-email-shannon.zhao@linaro.org> References: <1433256507-7856-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.217.182 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