From patchwork Wed Mar 18 14:20:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 45957 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DBAF82153C for ; Wed, 18 Mar 2015 14:21:20 +0000 (UTC) Received: by wghl18 with SMTP id l18sf7495071wgh.1 for ; Wed, 18 Mar 2015 07:21:20 -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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=8PvF8mL3o3ek6CdSPEzOj6HZZXMa/TE1Te51/V1ot98=; b=HGwxm0V3/1f1LcjYpTSWApHtb1Awro8lt/Cq8TORYPSgkh3Yexxv+yD/QbLiWzejKy 6dCS1NgnwD2zM8XaP3vBoCTDjA1Ta2ej57wNL5zFaDEowhfU0bCkFodB2gcSLLesS7hg sAy2mlcYU9pPr/jB+4IRDxWUcf2wmhP/dk9TzutuSk9z0BJNoqqlSHO9Ryu2ytM2T0qt WZNY8dxQt/mBbLcshFm3JkDAwMX4jpGvG+kwvWqgBeHZT0AvYaMjw+zwvs242UQEU0HI E62gsODT6TCi8n1vobt0nF81ytPRpS/iitdEPF+bOyiLqxtl8czF4frQMUkDOwp1tF5Y AoZw== X-Gm-Message-State: ALoCoQlZwcaR8coFGc8I5OyGVQwHkyXiNuV5IVO8/0uvYAL0/XNO7HRX114pUH/FOGolPYxtaByT X-Received: by 10.180.80.35 with SMTP id o3mr1508531wix.0.1426688480162; Wed, 18 Mar 2015 07:21:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.69 with SMTP id kw5ls148555lac.86.gmail; Wed, 18 Mar 2015 07:21:20 -0700 (PDT) X-Received: by 10.112.17.98 with SMTP id n2mr32138778lbd.40.1426688480005; Wed, 18 Mar 2015 07:21:20 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id 2si13017612lan.25.2015.03.18.07.21.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2015 07:21:19 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbcgn8 with SMTP id gn8so30713097lbc.2 for ; Wed, 18 Mar 2015 07:21:19 -0700 (PDT) X-Received: by 10.152.43.51 with SMTP id t19mr63712601lal.73.1426688479920; Wed, 18 Mar 2015 07:21:19 -0700 (PDT) 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.112.35.133 with SMTP id h5csp1188029lbj; Wed, 18 Mar 2015 07:21:19 -0700 (PDT) X-Received: by 10.194.234.40 with SMTP id ub8mr145094284wjc.100.1426688477371; Wed, 18 Mar 2015 07:21:17 -0700 (PDT) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com. [209.85.212.180]) by mx.google.com with ESMTPS id w1si4040093wix.3.2015.03.18.07.21.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2015 07:21:17 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.212.180 as permitted sender) client-ip=209.85.212.180; Received: by wixw10 with SMTP id w10so41288982wix.0 for ; Wed, 18 Mar 2015 07:21:17 -0700 (PDT) X-Received: by 10.180.24.3 with SMTP id q3mr7084303wif.79.1426688477029; Wed, 18 Mar 2015 07:21:17 -0700 (PDT) Received: from wychelm.lan (cpc4-aztw19-0-0-cust71.18-1.cable.virginm.net. [82.33.25.72]) by mx.google.com with ESMTPSA id m9sm3355898wiz.24.2015.03.18.07.21.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2015 07:21:16 -0700 (PDT) From: Daniel Thompson To: linux-arm-kernel@lists.infradead.org Cc: Daniel Thompson , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org, patches@linaro.org, linaro-kernel@lists.linaro.org, John Stultz , Sumit Semwal , Marc Zyngier , Andrew Thoelke Subject: [RFC PATCH 4/7] arm64: irqflags: Reorder the fiq & async macros Date: Wed, 18 Mar 2015 14:20:25 +0000 Message-Id: <1426688428-3150-5-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1426688428-3150-1-git-send-email-daniel.thompson@linaro.org> References: <1426688428-3150-1-git-send-email-daniel.thompson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.thompson@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.175 as permitted sender) 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: , Separate out the local fiq & async macros from the various arch inlines. This makes is easier for us (in a later patch) to provide an alternative implementation of these inlines. Signed-off-by: Daniel Thompson --- arch/arm64/include/asm/irqflags.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/irqflags.h b/arch/arm64/include/asm/irqflags.h index 11cc941bd107..df7477af6389 100644 --- a/arch/arm64/include/asm/irqflags.h +++ b/arch/arm64/include/asm/irqflags.h @@ -53,12 +53,6 @@ static inline void arch_local_irq_disable(void) : "memory"); } -#define local_fiq_enable() asm("msr daifclr, #1" : : : "memory") -#define local_fiq_disable() asm("msr daifset, #1" : : : "memory") - -#define local_async_enable() asm("msr daifclr, #4" : : : "memory") -#define local_async_disable() asm("msr daifset, #4" : : : "memory") - /* * Save the current interrupt enable state. */ @@ -90,6 +84,12 @@ static inline int arch_irqs_disabled_flags(unsigned long flags) return flags & PSR_I_BIT; } +#define local_fiq_enable() asm("msr daifclr, #1" : : : "memory") +#define local_fiq_disable() asm("msr daifset, #1" : : : "memory") + +#define local_async_enable() asm("msr daifclr, #4" : : : "memory") +#define local_async_disable() asm("msr daifset, #4" : : : "memory") + /* * save and restore debug state */