From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>,
Paul Mackerras <paulus@ozlabs.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH 4/5] powerpc/64s: avoid branch for ppc_msgsnd
Date: Fri, 7 Apr 2017 22:56:01 +1000 [thread overview]
Message-ID: <20170407125602.31146-5-npiggin@gmail.com> (raw)
In-Reply-To: <20170407125602.31146-1-npiggin@gmail.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/include/asm/dbell.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/include/asm/dbell.h b/arch/powerpc/include/asm/dbell.h
index 4db4cfdd829c..8ad66ccb7180 100644
--- a/arch/powerpc/include/asm/dbell.h
+++ b/arch/powerpc/include/asm/dbell.h
@@ -38,10 +38,8 @@ enum ppc_dbell {
static inline void _ppc_msgsnd(u32 msg)
{
- if (cpu_has_feature(CPU_FTR_HVMODE))
- __asm__ __volatile__ (PPC_MSGSND(%0) : : "r" (msg));
- else
- __asm__ __volatile__ (PPC_MSGSNDP(%0) : : "r" (msg));
+ __asm__ __volatile__ (ASM_FTR_IFSET(PPC_MSGSND(%1), PPC_MSGSNDP(%1), %0)
+ : : "i" (CPU_FTR_HVMODE), "r" (msg));
}
/* sync before sending message */
--
2.11.0
next prev parent reply other threads:[~2017-04-07 12:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-07 12:55 [PATCH 0/5] doorbell patches for POWER9 Nicholas Piggin
2017-04-07 12:55 ` [PATCH 1/5] powerpc/pseries: do not use msgsndp doorbells on POWER9 guests Nicholas Piggin
2017-04-09 8:03 ` Benjamin Herrenschmidt
2017-04-10 3:22 ` Nicholas Piggin
2017-04-10 4:07 ` Benjamin Herrenschmidt
2017-04-10 4:28 ` Nicholas Piggin
2017-04-11 10:10 ` Michael Ellerman
2017-04-11 12:18 ` Nicholas Piggin
2017-04-07 12:55 ` [PATCH 2/5] powerpc: change the doorbell IPI calling convention Nicholas Piggin
2017-04-07 12:56 ` [PATCH 3/5] powerpc: Introduce msgsnd/doorbell barrier primitives Nicholas Piggin
2017-04-07 12:56 ` Nicholas Piggin [this message]
2017-04-07 12:56 ` [PATCH 5/5] powerpc/powernv: POWER9 support for msgsnd/doorbell IPI 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=20170407125602.31146-5-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@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).