From: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
To: Nicholas Piggin <npiggin@gmail.com>
Cc: benh@kernel.crashing.org, mpe@ellerman.id.au, anton@samba.org,
paulus@samba.org, linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH 09/13] powerpc: Introduce new mask bit for soft_enabled
Date: Mon, 19 Sep 2016 11:27:16 +0530 [thread overview]
Message-ID: <abf50104-1fe8-3791-db96-7f50dc200acd@linux.vnet.ibm.com> (raw)
In-Reply-To: <20160916201620.7c927e60@roar.ozlabs.ibm.com>
On Friday 16 September 2016 03:46 PM, Nicholas Piggin wrote:
> On Thu, 15 Sep 2016 18:31:59 +0530
> Madhavan Srinivasan <maddy@linux.vnet.ibm.com> wrote:
>
>> Currently soft_enabled is used as the flag to determine
>> the interrupt state. Patch extends the soft_enabled
>> to be used as a mask instead of a flag.
> This should be the title of the patch, IMO. Introducing the new
> mask bit is incidental (and could be moved to patch 11). The key
> here of course is switching the tests from a flag to a mask.
>
> Very cool that you got this all worked out without adding any
> new instructions.
Will make the changes accordingly. Thanks
>
> Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
>
>> Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
>> ---
>> arch/powerpc/include/asm/exception-64s.h | 4 ++--
>> arch/powerpc/include/asm/hw_irq.h | 1 +
>> arch/powerpc/include/asm/irqflags.h | 4 ++--
>> arch/powerpc/kernel/entry_64.S | 4 ++--
>> arch/powerpc/kernel/exceptions-64e.S | 6 +++---
>> 5 files changed, 10 insertions(+), 9 deletions(-)
>>
>> diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
>> index dd3253bd0d8e..1eea4ab75607 100644
>> --- a/arch/powerpc/include/asm/exception-64s.h
>> +++ b/arch/powerpc/include/asm/exception-64s.h
>> @@ -430,9 +430,9 @@ label##_relon_hv: \
>>
>> #define __SOFTEN_TEST(h, vec) \
>> lbz r10,PACASOFTIRQEN(r13); \
>> - cmpwi r10,IRQ_DISABLE_MASK_LINUX; \
>> + andi. r10,r10,IRQ_DISABLE_MASK_LINUX; \
>> li r10,SOFTEN_VALUE_##vec; \
>> - beq masked_##h##interrupt
>> + bne masked_##h##interrupt
>> #define _SOFTEN_TEST(h, vec) __SOFTEN_TEST(h, vec)
>>
>> #define SOFTEN_TEST_PR(vec) \
>> diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
>> index fd9b421f9020..245262c02bab 100644
>> --- a/arch/powerpc/include/asm/hw_irq.h
>> +++ b/arch/powerpc/include/asm/hw_irq.h
>> @@ -32,6 +32,7 @@
>> */
>> #define IRQ_DISABLE_MASK_NONE 0
>> #define IRQ_DISABLE_MASK_LINUX 1
>> +#define IRQ_DISABLE_MASK_PMU 2
>>
>> #endif /* CONFIG_PPC64 */
>>
>> diff --git a/arch/powerpc/include/asm/irqflags.h b/arch/powerpc/include/asm/irqflags.h
>> index d0ed2a7d7d10..9ff09747a226 100644
>> --- a/arch/powerpc/include/asm/irqflags.h
>> +++ b/arch/powerpc/include/asm/irqflags.h
>> @@ -48,11 +48,11 @@
>> #define RECONCILE_IRQ_STATE(__rA, __rB) \
>> lbz __rA,PACASOFTIRQEN(r13); \
>> lbz __rB,PACAIRQHAPPENED(r13); \
>> - cmpwi cr0,__rA,IRQ_DISABLE_MASK_LINUX;\
>> + andi. __rA,__rA,IRQ_DISABLE_MASK_LINUX;\
>> li __rA,IRQ_DISABLE_MASK_LINUX; \
>> ori __rB,__rB,PACA_IRQ_HARD_DIS; \
>> stb __rB,PACAIRQHAPPENED(r13); \
>> - beq 44f; \
>> + bne 44f; \
>> stb __rA,PACASOFTIRQEN(r13); \
>> TRACE_DISABLE_INTS; \
>> 44:
>> diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
>> index 879aeb11ad29..533e363914a9 100644
>> --- a/arch/powerpc/kernel/entry_64.S
>> +++ b/arch/powerpc/kernel/entry_64.S
>> @@ -764,8 +764,8 @@ restore:
>> */
>> ld r5,SOFTE(r1)
>> lbz r6,PACASOFTIRQEN(r13)
>> - cmpwi cr0,r5,IRQ_DISABLE_MASK_LINUX
>> - beq restore_irq_off
>> + andi. r5,r5,IRQ_DISABLE_MASK_LINUX
>> + bne restore_irq_off
>>
>> /* We are enabling, were we already enabled ? Yes, just return */
>> cmpwi cr0,r6,IRQ_DISABLE_MASK_NONE
>> diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
>> index 5c628b5696f6..8e40df2c2f30 100644
>> --- a/arch/powerpc/kernel/exceptions-64e.S
>> +++ b/arch/powerpc/kernel/exceptions-64e.S
>> @@ -212,8 +212,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_EMB_HV)
>> /* Interrupts had better not already be enabled... */
>> twnei r6,IRQ_DISABLE_MASK_LINUX
>>
>> - cmpwi cr0,r5,IRQ_DISABLE_MASK_LINUX
>> - beq 1f
>> + andi. r5,r5,IRQ_DISABLE_MASK_LINUX
>> + bne 1f
>>
>> TRACE_ENABLE_INTS
>> stb r5,PACASOFTIRQEN(r13)
>> @@ -352,7 +352,7 @@ ret_from_mc_except:
>>
>> #define PROLOG_ADDITION_MASKABLE_GEN(n) \
>> lbz r10,PACASOFTIRQEN(r13); /* are irqs soft-disabled ? */ \
>> - cmpwi cr0,r10,IRQ_DISABLE_MASK_LINUX;/* yes -> go out of line */ \
>> + andi. r10,r10,IRQ_DISABLE_MASK_LINUX;/* yes -> go out of line */ \
>> beq masked_interrupt_book3e_##n
>>
>> #define PROLOG_ADDITION_2REGS_GEN(n) \
next prev parent reply other threads:[~2016-09-19 5:57 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-15 13:01 [PATCH 00/13] powerpc: "paca->soft_enabled" based local atomic operation implementation Madhavan Srinivasan
2016-09-15 13:01 ` [PATCH 01/13] powerpc: Add #defs for paca->soft_enabled flags Madhavan Srinivasan
2016-09-15 13:01 ` [PATCH 02/13] powerpc: Cleanup to use IRQ_DISABLE_MASK_* macros for paca->soft_enabled update Madhavan Srinivasan
2016-09-16 9:47 ` Nicholas Piggin
2016-09-19 4:04 ` Madhavan Srinivasan
2016-09-15 13:01 ` [PATCH 03/13] powerpc: move set_soft_enabled() and rename Madhavan Srinivasan
2016-09-16 9:50 ` Nicholas Piggin
2016-09-19 4:05 ` Madhavan Srinivasan
2016-09-15 13:01 ` [PATCH 04/13] powerpc: Use soft_enabled_set api to update paca->soft_enabled Madhavan Srinivasan
2016-09-16 9:53 ` Nicholas Piggin
2016-09-16 11:43 ` David Laight
2016-09-16 11:59 ` Nicholas Piggin
2016-09-16 13:22 ` David Laight
2016-09-19 2:52 ` Nicholas Piggin
2016-09-19 5:32 ` Madhavan Srinivasan
2016-09-19 5:05 ` Madhavan Srinivasan
2016-09-19 4:11 ` Madhavan Srinivasan
2016-09-15 13:01 ` [PATCH 05/13] powerpc: Add soft_enabled manipulation functions Madhavan Srinivasan
2016-09-16 9:57 ` Nicholas Piggin
2016-09-19 5:41 ` Madhavan Srinivasan
2016-09-15 13:01 ` [PATCH 06/13] powerpc: reverse the soft_enable logic Madhavan Srinivasan
2016-09-16 10:05 ` Nicholas Piggin
2016-09-19 5:45 ` Madhavan Srinivasan
2016-09-15 13:01 ` [PATCH 07/13] powerpc: Avoid using EXCEPTION_PROLOG_1 macro in MASKABLE_* Madhavan Srinivasan
2016-09-16 10:08 ` Nicholas Piggin
2016-09-15 13:01 ` [PATCH 08/13] powerpc: Add new _EXCEPTION_PROLOG_1 macro Madhavan Srinivasan
2016-09-16 10:12 ` Nicholas Piggin
2016-09-19 5:54 ` Madhavan Srinivasan
2016-09-15 13:01 ` [PATCH 09/13] powerpc: Introduce new mask bit for soft_enabled Madhavan Srinivasan
2016-09-16 10:16 ` Nicholas Piggin
2016-09-19 5:57 ` Madhavan Srinivasan [this message]
2016-09-15 13:02 ` [PATCH 10/13] powerpc: Add "bitmask" paramater to MASKABLE_* macros Madhavan Srinivasan
2016-09-16 11:03 ` Nicholas Piggin
2016-09-19 5:58 ` Madhavan Srinivasan
2016-09-15 13:02 ` [PATCH 11/13] powerpc: Add support to mask perf interrupts and replay them Madhavan Srinivasan
2016-09-16 10:47 ` Nicholas Piggin
2016-09-15 13:02 ` [PATCH 12/13] powerpc: Add a Kconfig and a functions to set new soft_enabled mask Madhavan Srinivasan
2016-09-16 10:34 ` Nicholas Piggin
2016-09-16 10:56 ` Nicholas Piggin
2016-09-19 6:03 ` Madhavan Srinivasan
2016-09-15 13:02 ` [PATCH 13/13] powerpc: rewrite local_t using soft_irq Madhavan Srinivasan
2016-09-15 16:55 ` kbuild test robot
2016-09-16 11:01 ` Nicholas Piggin
2016-09-16 11:08 ` [PATCH 00/13] 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=abf50104-1fe8-3791-db96-7f50dc200acd@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).