* [PATCH] powerpc: POWER9 remove ICSWX feature
@ 2017-04-19 2:27 Nicholas Piggin
2017-04-19 2:27 ` [PATCH] powerpc: POWER9 DD1 remove SAO feature Nicholas Piggin
2017-04-19 22:04 ` powerpc: POWER9 remove ICSWX feature Michael Ellerman
0 siblings, 2 replies; 4+ messages in thread
From: Nicholas Piggin @ 2017-04-19 2:27 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Nicholas Piggin
POWER9 does not implement this instruction.
Fixes: c3ab300ea5 ("powerpc: Add POWER9 cputable entry")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/include/asm/cputable.h | 2 +-
arch/powerpc/platforms/Kconfig.cputype | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 4edbc2f7569a..9c3a44bb4694 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -473,7 +473,7 @@ enum {
CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \
CPU_FTR_DSCR | CPU_FTR_SAO | \
CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \
- CPU_FTR_ICSWX | CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY | \
+ CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY | \
CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_DAWR | \
CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP | CPU_FTR_ARCH_300)
#define CPU_FTRS_POWER9_DD1 (CPU_FTRS_POWER9 | CPU_FTR_POWER9_DD1)
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index ef4c4b8fc547..3baf821a186d 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -279,7 +279,8 @@ config PPC_ICSWX
This option enables kernel support for the PowerPC Initiate
Coprocessor Store Word (icswx) coprocessor instruction on POWER7
- or newer processors.
+ and POWER8 processors. POWER9 uses new copy/paste instructions
+ to invoke the coprocessor.
This option is only useful if you have a processor that supports
the icswx coprocessor instruction. It does not have any effect
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] powerpc: POWER9 DD1 remove SAO feature
2017-04-19 2:27 [PATCH] powerpc: POWER9 remove ICSWX feature Nicholas Piggin
@ 2017-04-19 2:27 ` Nicholas Piggin
2017-04-19 22:04 ` Michael Ellerman
2017-04-19 22:04 ` powerpc: POWER9 remove ICSWX feature Michael Ellerman
1 sibling, 1 reply; 4+ messages in thread
From: Nicholas Piggin @ 2017-04-19 2:27 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Nicholas Piggin
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/include/asm/cputable.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 9c3a44bb4694..456f584952f8 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -476,7 +476,8 @@ enum {
CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY | \
CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_DAWR | \
CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP | CPU_FTR_ARCH_300)
-#define CPU_FTRS_POWER9_DD1 (CPU_FTRS_POWER9 | CPU_FTR_POWER9_DD1)
+#define CPU_FTRS_POWER9_DD1 ((CPU_FTRS_POWER9 | CPU_FTR_POWER9_DD1) & \
+ (~CPU_FTR_SAO))
#define CPU_FTRS_CELL (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: powerpc: POWER9 remove ICSWX feature
2017-04-19 2:27 [PATCH] powerpc: POWER9 remove ICSWX feature Nicholas Piggin
2017-04-19 2:27 ` [PATCH] powerpc: POWER9 DD1 remove SAO feature Nicholas Piggin
@ 2017-04-19 22:04 ` Michael Ellerman
1 sibling, 0 replies; 4+ messages in thread
From: Michael Ellerman @ 2017-04-19 22:04 UTC (permalink / raw)
To: Nicholas Piggin, linuxppc-dev; +Cc: Nicholas Piggin
On Wed, 2017-04-19 at 02:27:37 UTC, Nicholas Piggin wrote:
> POWER9 does not implement this instruction.
>
> Fixes: c3ab300ea5 ("powerpc: Add POWER9 cputable entry")
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/2384d2d7adc41463a69d3eb0720896
cheers
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-19 22:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-19 2:27 [PATCH] powerpc: POWER9 remove ICSWX feature Nicholas Piggin
2017-04-19 2:27 ` [PATCH] powerpc: POWER9 DD1 remove SAO feature Nicholas Piggin
2017-04-19 22:04 ` Michael Ellerman
2017-04-19 22:04 ` powerpc: POWER9 remove ICSWX feature Michael Ellerman
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).