From patchwork Mon Sep 22 15:02:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 37683 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f197.google.com (mail-we0-f197.google.com [74.125.82.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C3627202A1 for ; Mon, 22 Sep 2014 15:04:44 +0000 (UTC) Received: by mail-we0-f197.google.com with SMTP id p10sf933956wes.0 for ; Mon, 22 Sep 2014 08:04:44 -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=UBiiwodNODc2FywyeIrtbwZegHW6YgT4y0vftpP9D7c=; b=iplWDP+7B07hLLUnO/QiSydAQW25OrNNWBugqpmHw8lnD2Y8mgibmxGmnYokHa043R SrisIyqqFhG7rGA0C08xA3U+S0sF+ksX+EPlb+Q65pfxHebnYg+C3uLrdzRCIdhRdl8H oOHkTMWVGIuXPWFoyfw3C+IQik+xlBHILMqOR96G8GNqfykotU2iWZ5pVsJfrfrG1bxK KJJN3dZiS9LE/jONd00pnR/3tsktDOMD3AOskf4PN6uC8r65i1E6Yb0A7J3oDCE7h6TD wcmoudJQoDrxs5hi7mgXJGKRzlohHv/wp6x514JGpokZ6c+gXvbNDLUU4oXej5FfsPZJ q9DQ== X-Gm-Message-State: ALoCoQkmOU4IjrRQtK+0hYyiLi4F6l0H5kPEHaOSSl9QdbT73lNEOpoEX+Z58Tl2S7uLBiE5qalU X-Received: by 10.180.183.165 with SMTP id en5mr2158255wic.1.1411398284027; Mon, 22 Sep 2014 08:04:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.7 with SMTP id f7ls532725laa.64.gmail; Mon, 22 Sep 2014 08:04:43 -0700 (PDT) X-Received: by 10.112.142.33 with SMTP id rt1mr3958772lbb.69.1411398283780; Mon, 22 Sep 2014 08:04:43 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com [209.85.217.177]) by mx.google.com with ESMTPS id xm7si14791911lbb.97.2014.09.22.08.04.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Sep 2014 08:04:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id z12so6865914lbi.22 for ; Mon, 22 Sep 2014 08:04:43 -0700 (PDT) X-Received: by 10.112.200.134 with SMTP id js6mr24823032lbc.0.1411398283264; Mon, 22 Sep 2014 08:04: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.112.130.169 with SMTP id of9csp252679lbb; Mon, 22 Sep 2014 08:04:41 -0700 (PDT) X-Received: by 10.67.23.103 with SMTP id hz7mr22046992pad.118.1411398280877; Mon, 22 Sep 2014 08:04:40 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id cp5si16059927pdb.162.2014.09.22.08.04.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Sep 2014 08:04:40 -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 1XW58Q-0000an-VO; Mon, 22 Sep 2014 15:02:38 +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 1XW58O-0000FY-PT for linux-arm-kernel@lists.infradead.org; Mon, 22 Sep 2014 15:02:37 +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 s8MF2Cwo026730; Mon, 22 Sep 2014 16:02:12 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id F38C31AE1387; Mon, 22 Sep 2014 16:02:18 +0100 (BST) From: Will Deacon To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: mm: clear SCTLR.HA instead of setting it for LPAE Date: Mon, 22 Sep 2014 16:02:17 +0100 Message-Id: <1411398137-5521-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-20140922_080237_208356_6B93AF8B X-CRM114-Status: GOOD ( 11.59 ) X-Spam-Score: -6.0 (------) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-6.0 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] -1.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Cc: 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.177 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, not actually implemented by any CPUs and would probably break Linux if it was (since we don't use atomics when accessing page table entries). 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 --- 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