linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
To: mpe@ellerman.id.au
Cc: benh@kernel.crashing.org, anton@samba.org, paulus@samba.org,
	npiggin@gmail.com, linuxppc-dev@lists.ozlabs.org,
	Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Subject: [PATCH v10 15/17] powerpc/64s: Add new set of irq_soft_mask_ functions for PMI masking
Date: Wed, 20 Dec 2017 09:25:55 +0530	[thread overview]
Message-ID: <1513742157-28768-16-git-send-email-maddy@linux.vnet.ibm.com> (raw)
In-Reply-To: <1513742157-28768-1-git-send-email-maddy@linux.vnet.ibm.com>

To support soft-masking of the performance monitor interrupt, a set of
new powerpc_local_irq_pmu_save() and powerpc_local_irq_restore()
functions are added. And powerpc_local_irq_save() implemented, by
adding a new irq_soft_mask manipulation function
irq_soft_mask_or_return().

Local_irq_pmu_* macros are provided to access these
powerpc_local_irq_pmu* functions which includes
trace_hardirqs_on|off() to match what we have in
include/linux/irqflags.h.

Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
---
 arch/powerpc/include/asm/hw_irq.h | 71 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 716fe87a3588..eea02cbf5699 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -34,8 +34,12 @@
  */
 #define IRQ_SOFT_MASK_NONE	0x00
 #define IRQ_SOFT_MASK_STD	0x01 /* local_irq_disable() interrupts */
+#ifdef CONFIG_PPC_BOOK3S
 #define IRQ_SOFT_MASK_PMU	0x02
 #define IRQ_SOFT_MASK_ALL	0x03
+#else
+#define IRQ_SOFT_MASK_ALL	0x01
+#endif
 
 #endif /* CONFIG_PPC64 */
 
@@ -115,6 +119,24 @@ static inline notrace unsigned long irq_soft_mask_set_return(unsigned long mask)
 	return flags;
 }
 
+static inline notrace unsigned long irq_soft_mask_or_return(unsigned long mask)
+{
+	unsigned long flags, tmp;
+
+	asm volatile(
+		"lbz %0,%2(13); or %1,%0,%3; stb %1,%2(13)"
+		: "=&r" (flags), "=r" (tmp)
+		: "i" (offsetof(struct paca_struct, irq_soft_mask)),
+		  "r" (mask)
+		: "memory");
+
+#ifdef CONFIG_PPC_IRQ_SOFT_MASK_DEBUG
+	WARN_ON((mask | flags) && !((mask | flags) & IRQ_SOFT_MASK_STD));
+#endif
+
+	return flags;
+}
+
 static inline unsigned long arch_local_save_flags(void)
 {
 	return irq_soft_mask_return();
@@ -147,6 +169,55 @@ static inline bool arch_irqs_disabled(void)
 	return arch_irqs_disabled_flags(arch_local_save_flags());
 }
 
+#ifdef CONFIG_PPC_BOOK3S
+/*
+ * To support disabling and enabling of irq with PMI, set of
+ * new powerpc_local_irq_pmu_save() and powerpc_local_irq_restore()
+ * functions are added. These macros are implemented using generic
+ * linux local_irq_* code from include/linux/irqflags.h.
+ */
+#define raw_local_irq_pmu_save(flags)					\
+	do {								\
+		typecheck(unsigned long, flags);			\
+		flags = irq_soft_mask_or_return(IRQ_SOFT_MASK_STD |	\
+				IRQ_SOFT_MASK_PMU);			\
+	} while(0)
+
+#define raw_local_irq_pmu_restore(flags)				\
+	do {								\
+		typecheck(unsigned long, flags);			\
+		arch_local_irq_restore(flags);				\
+	} while(0)
+
+#ifdef CONFIG_TRACE_IRQFLAGS
+#define powerpc_local_irq_pmu_save(flags)			\
+	 do {							\
+		raw_local_irq_pmu_save(flags);			\
+		trace_hardirqs_off();				\
+	} while(0)
+#define powerpc_local_irq_pmu_restore(flags)			\
+	do {							\
+		if (raw_irqs_disabled_flags(flags)) {		\
+			raw_local_irq_pmu_restore(flags);	\
+			trace_hardirqs_off();			\
+		} else {					\
+			trace_hardirqs_on();			\
+			raw_local_irq_pmu_restore(flags);	\
+		}						\
+	} while(0)
+#else
+#define powerpc_local_irq_pmu_save(flags)			\
+	do {							\
+		raw_local_irq_pmu_save(flags);			\
+	} while(0)
+#define powerpc_local_irq_pmu_restore(flags)			\
+	do {							\
+		raw_local_irq_pmu_restore(flags);		\
+	} while (0)
+#endif  /* CONFIG_TRACE_IRQFLAGS */
+
+#endif /* CONFIG_PPC_BOOK3S */
+
 #ifdef CONFIG_PPC_BOOK3E
 #define __hard_irq_enable()	asm volatile("wrteei 1" : : : "memory")
 #define __hard_irq_disable()	asm volatile("wrteei 0" : : : "memory")
-- 
2.7.4

  parent reply	other threads:[~2017-12-20  3:57 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-20  3:55 [PATCH v10 00/17] powerpc: "paca->soft_enabled" based local atomic operation implementation Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 01/17] powerpc/64: do not trace irqs-off at interrupt return to soft-disabled context Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 02/17] powerpc/64: Add #defines for paca->soft_enabled flags Madhavan Srinivasan
2018-01-22  3:34   ` [v10, " Michael Ellerman
2017-12-20  3:55 ` [PATCH v10 03/17] powerpc/64: Improve inline asm in arch_local_irq_disable Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 04/17] powerpc/64: Fix arch_local_irq_disable() prototype Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 05/17] powerpc/64: move set_soft_enabled(), rename it, add memory clobber Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 06/17] powerpc/64: Implement and use soft_enabled_return API Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 07/17] powerpc/64: Implement and use soft_enabled_set_return API Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 08/17] powerpc/64: Cleanup hard_irq_disable() macro Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 09/17] powerpc/64: Change soft_enabled from flag to bitmask Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 10/17] powerpc/64: Rename soft_enabled to irq_soft_mask Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 11/17] powerpc/64s: Avoid using EXCEPTION_PROLOG_1 macro in MASKABLE_* Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 12/17] powerpc/64s: Add support to take additional parameter in MASKABLE_* macro Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 13/17] powerpc/64s: Add support to mask perf interrupts and replay them Madhavan Srinivasan
2018-01-15 13:23   ` Nicholas Piggin
2017-12-20  3:55 ` [PATCH v10 14/17] powerpc: Add new kconfig IRQ_DEBUG_SUPPORT Madhavan Srinivasan
2017-12-20  3:55 ` Madhavan Srinivasan [this message]
2017-12-20  3:55 ` [PATCH v10 16/17] powerpc: use generic atomic implementation for local_t Madhavan Srinivasan
2017-12-20  3:55 ` [PATCH v10 17/17] powerpc/64s: Implement local_t using irq soft masking Madhavan Srinivasan
2017-12-20  5:02 ` [PATCH v10 00/17] powerpc: "paca->soft_enabled" based local atomic operation implementation Nicholas Piggin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1513742157-28768-16-git-send-email-maddy@linux.vnet.ibm.com \
    --to=maddy@linux.vnet.ibm.com \
    --cc=anton@samba.org \
    --cc=benh@kernel.crashing.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=npiggin@gmail.com \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).