From patchwork Tue Jun 9 11:41:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 6571551 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CBF2A9F2F4 for ; Tue, 9 Jun 2015 11:44:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C2978203AB for ; Tue, 9 Jun 2015 11:44:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C09EC203A1 for ; Tue, 9 Jun 2015 11:44:32 +0000 (UTC) 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 1Z2Hv8-0004VU-UE; Tue, 09 Jun 2015 11:42:18 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z2Hv3-0004PH-NT for linux-arm-kernel@lists.infradead.org; Tue, 09 Jun 2015 11:42:14 +0000 Received: by wigg3 with SMTP id g3so13879960wig.1 for ; Tue, 09 Jun 2015 04:41:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=Q12kh/RZySpP+4nRAKIBvm/uq0t+WVb3weJgbzfjWSQ=; b=JUd4YFPJtonFxkSWEMHpYJKKfrE5xahv691wzss2JrbpK/uOIB7WlDsyFjWl2LT2lD SyXSvEKLvFftUXmJePbeOm4GtLtSEle79nojPHYaHViJxWcNwJ86dmdtZ5h1Uv721g1Z CQJtxBbB5ceMdff2DAUmMFOYh6OTtyBK4pFvII9QlRhvOTviGmKikYog2Pe+jT9jgNRH jYMEyTqi80BCSN+gSeSRcnle5kLd52kmBNRyEEblqy5LBU5pXUTQHhOSn6FF5Ns6QWAv Jg2kzIfWYFc16XY1m23/jrNjWWqwtC6SygTHX9Y3NK3A7yOPwbMXiHwjeHYCmWx3BIWP A8WQ== X-Gm-Message-State: ALoCoQnv151Qrip+wD9jvFLvhS2jzz6CpS6e9UbfwXUn9vSsrGC7ogm9Ga5oVAbPzNFKjvyD3e70 X-Received: by 10.180.9.7 with SMTP id v7mr31466322wia.60.1433850111012; Tue, 09 Jun 2015 04:41:51 -0700 (PDT) Received: from [192.168.1.124] (cpc4-aztw19-0-0-cust71.18-1.cable.virginm.net. [82.33.25.72]) by mx.google.com with ESMTPSA id j7sm8996018wjz.11.2015.06.09.04.41.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2015 04:41:50 -0700 (PDT) Message-ID: <5576D0FE.10900@linaro.org> Date: Tue, 09 Jun 2015 12:41:50 +0100 From: Daniel Thompson User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Maxime Coquelin , Russell King - ARM Linux Subject: Re: [PATCH] ARM: Re-enable TRACE_IRQFLAGS_SUPPORT on ARMv7-M References: <1433802288-25508-1-git-send-email-mcoquelin.stm32@gmail.com> <20150608224749.GB7557@n2100.arm.linux.org.uk> In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150609_044213_945308_FB53BB23 X-CRM114-Status: GOOD ( 17.90 ) X-Spam-Score: -0.7 (/) Cc: "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Arnd Bergmann , =?UTF-8?B?VXdlIEtsZWluZS1Lw7ZuaWc=?= 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 09/06/15 10:14, Maxime Coquelin wrote: >> The real solution is to provide a definition _in asm-generic_ for >> arch_irqs_disabled(), rather than having almost every arch doing: >> >> static inline bool arch_irqs_disabled(void) >> { >> return arch_irqs_disabled_flags(arch_local_save_flags()); >> } >> >> I'm personally refusing to take a patch for ARM which adds yet another >> copy of the above. This is, after all, exactly the kind of stuff that >> should be in asm-generic, or if not, in include/linux but overridable >> by arch stuff. >> >> We keep going between the two extremes of "lets push lots of stuff into >> arch stuff" and "lets try to extract the common bits out of arch code". >> >> Let's try and settle on one approach, and apply it universally. > > I agree on the idea but I don't measure all the impacts it would have. Hey Maxime, just out of interest... Does the following patch, which makes the arch_irqs_disabled() implementation from asm-generic available on arm, fix the build for you? I've only done a real quick 'n dirty check for regression: multi_v7_defconfig still works ;-) If the patch is useful I can test it a bit harder... From d86ef4466cfdbe622a65bcc7e72a8ca0d1dd2879 Mon Sep 17 00:00:00 2001 From: Daniel Thompson Date: Tue, 9 Jun 2015 12:35:24 +0100 Subject: [PATCH] ARM: irqflags: Get arch_irqs_disabled from asm-generic asm-generic/irqflags.h provides an implementation of arch_irqs_disabled(). Lets grab that implementation. Suggested-by: Russell King Signed-off-by: Daniel Thompson Acked-by: Maxime Coquelin Tested-by: Joachim Eastwood --- arch/arm/include/asm/irqflags.h | 11 +++++++++++ 1 file changed, 11 insertions(+) #endif /* ifndef __ASM_ARM_IRQFLAGS_H */ diff --git a/arch/arm/include/asm/irqflags.h b/arch/arm/include/asm/irqflags.h index 3b763d6652a0..43908146a5cf 100644 --- a/arch/arm/include/asm/irqflags.h +++ b/arch/arm/include/asm/irqflags.h @@ -20,6 +20,7 @@ #if __LINUX_ARM_ARCH__ >= 6 +#define arch_local_irq_save arch_local_irq_save static inline unsigned long arch_local_irq_save(void) { unsigned long flags; @@ -31,6 +32,7 @@ static inline unsigned long arch_local_irq_save(void) return flags; } +#define arch_local_irq_enable arch_local_irq_enable static inline void arch_local_irq_enable(void) { asm volatile( @@ -40,6 +42,7 @@ static inline void arch_local_irq_enable(void) : "memory", "cc"); } +#define arch_local_irq_disable arch_local_irq_disable static inline void arch_local_irq_disable(void) { asm volatile( @@ -56,6 +59,7 @@ static inline void arch_local_irq_disable(void) /* * Save the current interrupt enable state & disable IRQs */ +#define arch_local_irq_save arch_local_irq_save static inline unsigned long arch_local_irq_save(void) { unsigned long flags, temp; @@ -73,6 +77,7 @@ static inline unsigned long arch_local_irq_save(void) /* * Enable IRQs */ +#define arch_local_irq_enable arch_local_irq_enable static inline void arch_local_irq_enable(void) { unsigned long temp; @@ -88,6 +93,7 @@ static inline void arch_local_irq_enable(void) /* * Disable IRQs */ +#define arch_local_irq_disable arch_local_irq_disable static inline void arch_local_irq_disable(void) { unsigned long temp; @@ -135,6 +141,7 @@ static inline void arch_local_irq_disable(void) /* * Save the current interrupt enable state. */ +#define arch_local_save_flags arch_local_save_flags static inline unsigned long arch_local_save_flags(void) { unsigned long flags; @@ -147,6 +154,7 @@ static inline unsigned long arch_local_save_flags(void) /* * restore saved IRQ & FIQ state */ +#define arch_local_irq_restore arch_local_irq_restore static inline void arch_local_irq_restore(unsigned long flags) { asm volatile( @@ -156,10 +164,13 @@ static inline void arch_local_irq_restore(unsigned long flags) : "memory", "cc"); } +#define arch_irqs_disabled_flags arch_irqs_disabled_flags static inline int arch_irqs_disabled_flags(unsigned long flags) { return flags & IRQMASK_I_BIT; } +#include + #endif /* ifdef __KERNEL__ */