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 v9 03/14] powerpc: Use soft_enabled_set api to update paca->soft_enabled
Date: Thu, 3 Aug 2017 09:19:07 +0530 [thread overview]
Message-ID: <1501732158-19009-4-git-send-email-maddy@linux.vnet.ibm.com> (raw)
In-Reply-To: <1501732158-19009-1-git-send-email-maddy@linux.vnet.ibm.com>
Force use of soft_enabled_set() wrapper to update paca-soft_enabled
wherever possisble. Also add a new wrapper function, soft_enabled_set_return(),
added to force the paca->soft_enabled updates.
Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/hw_irq.h | 14 ++++++++++++++
arch/powerpc/include/asm/kvm_ppc.h | 2 +-
arch/powerpc/kernel/irq.c | 2 +-
arch/powerpc/kernel/setup_64.c | 4 ++--
arch/powerpc/kernel/time.c | 6 +++---
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 29f04e287845..6bbcacaa4bd4 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -62,6 +62,20 @@ static inline notrace void soft_enabled_set(unsigned long enable)
: "memory");
}
+static inline notrace unsigned long soft_enabled_set_return(unsigned long enable)
+{
+ unsigned long flags;
+
+ asm volatile(
+ "lbz %0,%1(13); stb %2,%1(13)"
+ : "=r" (flags)
+ : "i" (offsetof(struct paca_struct, soft_enabled)),\
+ "r" (enable)
+ : "memory");
+
+ return flags;
+}
+
static inline unsigned long arch_local_save_flags(void)
{
unsigned long flags;
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
index d3608fe43245..76f82014cd80 100644
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -869,7 +869,7 @@ static inline void kvmppc_fix_ee_before_entry(void)
/* Only need to enable IRQs by hard enabling them after this */
local_paca->irq_happened = 0;
- local_paca->soft_enabled = IRQ_ENABLED;
+ soft_enabled_set(IRQ_ENABLED);
#endif
}
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index d5b90b8e13dc..d482f9a7e6a9 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -337,7 +337,7 @@ bool prep_irq_for_idle(void)
* of entering the low power state.
*/
local_paca->irq_happened &= ~PACA_IRQ_HARD_DIS;
- local_paca->soft_enabled = IRQ_ENABLED;
+ soft_enabled_set(IRQ_ENABLED);
/* Tell the caller to enter the low power state */
return true;
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 946e6131ff25..4e77972edfac 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -189,7 +189,7 @@ static void __init fixup_boot_paca(void)
/* Allow percpu accesses to work until we setup percpu data */
get_paca()->data_offset = 0;
/* Mark interrupts disabled in PACA */
- get_paca()->soft_enabled = IRQ_DISABLED;
+ soft_enabled_set(IRQ_DISABLED);
}
static void __init configure_exceptions(void)
@@ -345,7 +345,7 @@ void __init early_setup(unsigned long dt_ptr)
void early_setup_secondary(void)
{
/* Mark interrupts disabled in PACA */
- get_paca()->soft_enabled = 0;
+ soft_enabled_set(IRQ_DISABLED);
/* Initialize the hash table or TLB handling */
early_init_mmu_secondary();
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index d0d730c61758..f495956a3664 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -244,7 +244,7 @@ static u64 scan_dispatch_log(u64 stop_tb)
void accumulate_stolen_time(void)
{
u64 sst, ust;
- u8 save_soft_enabled = local_paca->soft_enabled;
+ unsigned long save_soft_enabled;
struct cpu_accounting_data *acct = &local_paca->accounting;
/* We are called early in the exception entry, before
@@ -253,7 +253,7 @@ void accumulate_stolen_time(void)
* needs to reflect that so various debug stuff doesn't
* complain
*/
- local_paca->soft_enabled = IRQ_DISABLED;
+ save_soft_enabled = soft_enabled_set_return(IRQ_DISABLED);
sst = scan_dispatch_log(acct->starttime_user);
ust = scan_dispatch_log(acct->starttime);
@@ -261,7 +261,7 @@ void accumulate_stolen_time(void)
acct->utime -= ust;
acct->steal_time += ust + sst;
- local_paca->soft_enabled = save_soft_enabled;
+ soft_enabled_set(save_soft_enabled);
}
static inline u64 calculate_stolen_time(u64 stop_tb)
--
2.7.4
next prev parent reply other threads:[~2017-08-03 3:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-03 3:49 [PATCH v9 00/14]powerpc: "paca->soft_enabled" based local atomic operation implementation Madhavan Srinivasan
2017-08-03 3:49 ` [PATCH v9 01/14] powerpc: Add #defs for paca->soft_enabled flags Madhavan Srinivasan
2017-08-03 3:49 ` [PATCH v9 02/14] powerpc: move set_soft_enabled() and rename Madhavan Srinivasan
2017-08-03 3:49 ` Madhavan Srinivasan [this message]
2017-08-03 3:49 ` [PATCH v9 04/14] powerpc: Add soft_enabled manipulation functions Madhavan Srinivasan
2017-08-03 3:49 ` [PATCH v9 05/14] powerpc/irq: Cleanup hard_irq_disable() macro Madhavan Srinivasan
2017-08-03 3:49 ` [PATCH v9 06/14] powerpc/irq: Fix arch_local_irq_disable() in book3s Madhavan Srinivasan
2017-08-03 3:49 ` [PATCH v9 07/14] powerpc: Modify soft_enable from flag to mask Madhavan Srinivasan
2017-08-03 4:44 ` Nicholas Piggin
2017-08-03 3:49 ` [PATCH v9 08/14] powerpc: Rename soft_enabled to soft_disable_mask Madhavan Srinivasan
2017-08-03 3:49 ` [PATCH v9 09/14] powerpc: Avoid using EXCEPTION_PROLOG_1 macro in MASKABLE_* Madhavan Srinivasan
2017-08-03 3:49 ` [PATCH v9 10/14] powerpc: Add support to take additional parameter in MASKABLE_* macro Madhavan Srinivasan
2017-08-03 3:49 ` [PATCH v9 11/14] Add support to mask perf interrupts and replay them Madhavan Srinivasan
2017-08-03 3:49 ` [PATCH v9 12/14] powerpc:Add new kconfig IRQ_DEBUG_SUPPORT Madhavan Srinivasan
2017-08-03 3:49 ` [PATCH v9 13/14] powerpc: Add new set of soft_disable_mask_ functions Madhavan Srinivasan
2017-08-03 3:49 ` [PATCH v9 14/14] powerpc: rewrite local_t using soft_irq Madhavan Srinivasan
2017-08-03 17:50 ` Nicholas Piggin
2017-08-04 1:40 ` Benjamin Herrenschmidt
2017-08-04 9:04 ` Nicholas Piggin
2017-08-04 15:18 ` David Laight
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=1501732158-19009-4-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).