From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH 05/13] powerpc/64s: irq replay merge HV and non-HV paths for doorbell replay
Date: Sun, 6 Aug 2017 03:02:33 +1000 [thread overview]
Message-ID: <20170805170241.22966-6-npiggin@gmail.com> (raw)
In-Reply-To: <20170805170241.22966-1-npiggin@gmail.com>
This results in smaller code, and fewer branches.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/kernel/entry_64.S | 6 +-----
arch/powerpc/kernel/exceptions-64s.S | 2 +-
arch/powerpc/kernel/irq.c | 2 --
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 49d8422767b4..ec67f67dafab 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -990,11 +990,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR)
#ifdef CONFIG_PPC_BOOK3E
cmpwi cr0,r3,0x280
#else
- BEGIN_FTR_SECTION
- cmpwi cr0,r3,0xe80
- FTR_SECTION_ELSE
- cmpwi cr0,r3,0xa00
- ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE)
+ cmpwi cr0,r3,0xa00
#endif /* CONFIG_PPC_BOOK3E */
bne 1f
addi r3,r1,STACK_FRAME_OVERHEAD;
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 67321be3122c..f9d0796fb2c9 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -1674,7 +1674,7 @@ _GLOBAL(__replay_interrupt)
cmpwi r3,0x500
beq hardware_interrupt_common
BEGIN_FTR_SECTION
- cmpwi r3,0xe80
+ cmpwi r3,0xa00
beq h_doorbell_common_msgclr
cmpwi r3,0xea0
beq h_virt_irq_common
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 7c46e0cce054..60ee6d7251b8 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -207,8 +207,6 @@ notrace unsigned int __check_irq_replay(void)
#else
if (happened & PACA_IRQ_DBELL) {
local_paca->irq_happened &= ~PACA_IRQ_DBELL;
- if (cpu_has_feature(CPU_FTR_HVMODE))
- return 0xe80;
return 0xa00;
}
#endif /* CONFIG_PPC_BOOK3E */
--
2.11.0
next prev parent reply other threads:[~2017-08-05 17:03 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-05 17:02 [PATCH 00/13] idle and soft-irq improvements and POWER9 idle optimisation Nicholas Piggin
2017-08-05 17:02 ` [PATCH 01/13] powerpc/64s: masked interrupt avoid branch Nicholas Piggin
2017-08-05 17:02 ` [PATCH 02/13] powerpc/64s: masked interrupt avoid instruction Nicholas Piggin
2017-08-05 17:02 ` [PATCH 03/13] powerpc/64s: masked interrupt returns to kernel so avoid r13 restore Nicholas Piggin
2017-08-05 17:02 ` [PATCH 04/13] powerpc/64: cleanup __check_irq_replay Nicholas Piggin
2017-08-05 17:02 ` Nicholas Piggin [this message]
2017-08-05 17:02 ` [PATCH 06/13] powerpc/64s: irq replay external use the HV handler in HV mode on POWER9 Nicholas Piggin
2017-08-05 17:02 ` [PATCH 07/13] powerpc/64: remove redundant instruction in interrupt replay Nicholas Piggin
2017-08-05 17:02 ` [PATCH 08/13] powerpc/64s: irq replay remove spurious irq reason Nicholas Piggin
2017-08-05 23:00 ` Benjamin Herrenschmidt
2017-08-06 0:51 ` Nicholas Piggin
2017-08-10 13:12 ` Michael Ellerman
2017-08-05 17:02 ` [PATCH 09/13] powerpc/64: runlatch CTRL[RUN] set optimisation Nicholas Piggin
2017-08-05 17:02 ` [PATCH 10/13] powerpc/64s: idle simplify KVM idle on POWER9 Nicholas Piggin
2017-08-08 10:36 ` Gautham R Shenoy
2017-08-08 12:42 ` Nicholas Piggin
2017-08-10 6:24 ` Gautham R Shenoy
2017-08-10 13:14 ` Michael Ellerman
2017-08-10 13:53 ` Nicholas Piggin
2017-08-05 17:02 ` [PATCH 11/13] powerpc/64s: idle POWER9 can execute stop without ptesync Nicholas Piggin
2017-08-08 10:37 ` Gautham R Shenoy
2017-08-10 13:15 ` Michael Ellerman
2017-08-10 14:03 ` Nicholas Piggin
2017-08-05 17:02 ` [PATCH 12/13] powerpc/64s: idle POWER9 can execute stop in virtual mode Nicholas Piggin
2017-08-05 22:57 ` Benjamin Herrenschmidt
2017-08-08 10:45 ` Gautham R Shenoy
2017-08-05 17:02 ` [PATCH 13/13] powerpc/64s: idle ESL=0 stop can avoid all save/restore overhead Nicholas Piggin
2017-08-05 17:11 ` Nicholas Piggin
2017-08-08 10:49 ` Gautham R Shenoy
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=20170805170241.22966-6-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.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).