From patchwork Wed Sep 24 17:41:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 37863 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 728EE202FD for ; Wed, 24 Sep 2014 17:43:53 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id mc6sf874194lab.3 for ; Wed, 24 Sep 2014 10:43:52 -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: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=wscGBafCX6p35H3YR1yh8kbyHievIHA5/9QHW+jXgas=; b=Px4CnmWKFPbtAhkYIrlHQXWH17sk+lTc5a/SDAbO3aNGJRhXCG/zFuNd44RXVHvn1S bl3P4Dj7zzt8QgUCow38ycJnquwZVbVenCUHCfmiOnFMmeTMpLHsxP3CC58aiP11cR28 4Dvz1ti8Dl0OCo5cnAJjEVSlpQEkRquoL3EBSX0qsFqjOqqSwbyN5BgMf2GbZhFTpxfJ YD3PZR7mIIQjZ9ghYzOS0GycsEXJB9h7T0+3lQDWNy0weMoxfrpF9sGIgEpCz/TcJ8Ly ERm1BPXimxInkdC4c82/xuonTTBr6PW0OF4BfqTW5xLA0sA66mUNef7mOL6UJBB1C41Y ej3w== X-Gm-Message-State: ALoCoQmwJac/8v+8l/+lS56JzWXpBPSRr/dPVLUufRWEzafNMz5aM6CgMYIx8ODxTwfpL/cr41Gv X-Received: by 10.194.179.196 with SMTP id di4mr317492wjc.0.1411580632198; Wed, 24 Sep 2014 10:43:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.38 with SMTP id p6ls191225lap.72.gmail; Wed, 24 Sep 2014 10:43:51 -0700 (PDT) X-Received: by 10.152.234.76 with SMTP id uc12mr8144258lac.50.1411580631877; Wed, 24 Sep 2014 10:43:51 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com [209.85.217.178]) by mx.google.com with ESMTPS id n3si13225058lbe.27.2014.09.24.10.43.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Sep 2014 10:43:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id z12so8441524lbi.23 for ; Wed, 24 Sep 2014 10:43:51 -0700 (PDT) X-Received: by 10.152.179.226 with SMTP id dj2mr8095505lac.40.1411580631559; Wed, 24 Sep 2014 10:43:51 -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.130.169 with SMTP id of9csp625203lbb; Wed, 24 Sep 2014 10:43:50 -0700 (PDT) X-Received: by 10.68.117.238 with SMTP id kh14mr11230567pbb.55.1411580630042; Wed, 24 Sep 2014 10:43:50 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id bh3si27446609pdb.42.2014.09.24.10.43.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Sep 2014 10:43:50 -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 1XWqZj-0006Ip-4M; Wed, 24 Sep 2014 17:41:59 +0000 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XWqZg-0006GY-Ct for linux-arm-kernel@lists.infradead.org; Wed, 24 Sep 2014 17:41:57 +0000 Received: from edgewater-inn.cambridge.arm.com (edgewater-inn.cambridge.arm.com [10.1.203.204]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id s8OHfWwo028954; Wed, 24 Sep 2014 18:41:32 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 2F8261AE10C0; Wed, 24 Sep 2014 18:41:39 +0100 (BST) From: Will Deacon To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] ARM: mm: clear SCTLR.HA instead of setting it for LPAE Date: Wed, 24 Sep 2014 18:41:38 +0100 Message-Id: <1411580498-17367-1-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140924_104156_863707_49481C64 X-CRM114-Status: GOOD ( 10.27 ) X-Spam-Score: -5.7 (-----) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-5.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [217.140.96.50 listed in list.dnswl.org] -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Cc: catalin.marinas@arm.com, Will Deacon 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: will.deacon@arm.com 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.178 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 SCTLR.HA (hardware access flag) is deprecated and not actually implemented by any CPUs. Furthermore, it can confuse cr_alignment checks where the whole value of SCTLR is compared against the value sitting in the hardware, since the bit is actually RAZ/WI and will not match the saved cr_alignment value. Signed-off-by: Will Deacon Acked-by: Catalin Marinas --- v1 -> v2: Reword commit message arch/arm/mm/proc-v7-3level.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S index b64e67c7f176..d3daed0ae0ad 100644 --- a/arch/arm/mm/proc-v7-3level.S +++ b/arch/arm/mm/proc-v7-3level.S @@ -157,9 +157,9 @@ ENDPROC(cpu_v7_set_pte_ext) * TFR EV X F IHD LR S * .EEE ..EE PUI. .TAT 4RVI ZWRS BLDP WCAM * rxxx rrxx xxx0 0101 xxxx xxxx x111 xxxx < forced - * 11 0 110 1 0011 1100 .111 1101 < we want + * 11 0 110 0 0011 1100 .111 1101 < we want */ .align 2 .type v7_crval, #object v7_crval: - crval clear=0x0120c302, mmuset=0x30c23c7d, ucset=0x00c01c7c + crval clear=0x0122c302, mmuset=0x30c03c7d, ucset=0x00c01c7c