From patchwork Wed Feb 5 17:03:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 24192 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2B9A220675 for ; Wed, 5 Feb 2014 17:05:21 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf3554692oag.1 for ; Wed, 05 Feb 2014 09:05:20 -0800 (PST) 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=X/7rR1E/WN4xmmcyWibj4JvihlY8o3oeZhE/y5WQPLw=; b=U7oAiFiwEWB0YyRoTwVFzGc5lbXs94K/vQ/23wdT4nQJ+NnsYssSq8UwlflQ8tC1hr NK4vKyMrWqajI1KdBopJpEfUG0/mCyBwDrmPk4PjU8AYX6GLFtnYEBDIdf75C+QdD9rc ZQdPdqaug71Yy4nmgeNNCRdwdlK8tgdLQuF55QJT9hnoxjTSmv0nY/2DYXF9vmyRYzwf PUZGo7ohlY9qG+m/ae1sXpPQw9jDIyDl5x0/E0edIzQpFUvaSSu8pPls1l0mXlg7PtJi NiRV2/BTOsUMw4Kp8A9MgaN6BzE9ot0ifJXxveXnWVJxJQ9wQTLsy/sfj8qdAGXTrB8o FEPQ== X-Gm-Message-State: ALoCoQmYJud6O5T1aa2Kas7c620HCwaVuILMCzDMuzSc0kpkqkLaTIqcppSQN5vjqxKUMcDhuOWE X-Received: by 10.43.78.135 with SMTP id zm7mr932778icb.27.1391619920262; Wed, 05 Feb 2014 09:05:20 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.180 with SMTP id z49ls178260qgd.59.gmail; Wed, 05 Feb 2014 09:05:20 -0800 (PST) X-Received: by 10.52.95.233 with SMTP id dn9mr1432200vdb.3.1391619920134; Wed, 05 Feb 2014 09:05:20 -0800 (PST) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id i3si9856177vcp.127.2014.02.05.09.05.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Feb 2014 09:05:20 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id ie18so499838vcb.26 for ; Wed, 05 Feb 2014 09:05:20 -0800 (PST) X-Received: by 10.52.107.35 with SMTP id gz3mr1462478vdb.8.1391619920063; Wed, 05 Feb 2014 09:05:20 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp64574vcz; Wed, 5 Feb 2014 09:05:19 -0800 (PST) X-Received: by 10.180.198.52 with SMTP id iz20mr17617285wic.59.1391619912526; Wed, 05 Feb 2014 09:05:12 -0800 (PST) Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by mx.google.com with ESMTPS id t1si15470379wjx.67.2014.02.05.09.05.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Feb 2014 09:05:12 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.179 is neither permitted nor denied by best guess record for domain of leif.lindholm@linaro.org) client-ip=209.85.212.179; Received: by mail-wi0-f179.google.com with SMTP id hn9so767159wib.6 for ; Wed, 05 Feb 2014 09:05:11 -0800 (PST) X-Received: by 10.180.187.16 with SMTP id fo16mr17741911wic.26.1391619911857; Wed, 05 Feb 2014 09:05:11 -0800 (PST) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by mx.google.com with ESMTPSA id p1sm47427211wie.1.2014.02.05.09.05.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Feb 2014 09:05:11 -0800 (PST) From: Leif Lindholm To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org Cc: patches@linaro.org, Leif Lindholm , Will Deacon Subject: [PATCH 02/22] arm: add new asm macro update_sctlr Date: Wed, 5 Feb 2014 17:03:53 +0000 Message-Id: <1391619853-10601-3-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1391619853-10601-1-git-send-email-leif.lindholm@linaro.org> References: <1391619853-10601-1-git-send-email-leif.lindholm@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , A new macro for setting/clearing bits in the SCTLR. Signed-off-by: Leif Lindholm Suggested-by: Will Deacon Cc: Will Deacon --- arch/arm/include/asm/assembler.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 5c22851..e8ca24b 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -383,4 +383,18 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) #endif .endm +#ifdef CONFIG_CPU_CP15 +/* Macro for setting/clearing bits in sctlr */ + .macro update_sctlr, tmp:req, set=, clear= + mrc p15, 0, \tmp, c1, c0, 0 + .ifnc \set, + orr \tmp, \set + .endif + .ifnc \clear, + bic \tmp, \tmp, \clear + .endif + mcr p15, 0, \tmp, c1, c0, 0 + .endm +#endif + #endif /* __ASM_ASSEMBLER_H__ */