diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2017-11-22 07:17:01 -0500 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-11-22 07:17:01 -0500 |
commit | 4d6c51b107cc73b15a377224549aa5593f90df89 (patch) | |
tree | ed7c872877c88343b10a10028216aff49c1c3bff | |
parent | 73ce9aec65b17433e18163d07eb5cb6bf114bd6c (diff) |
powerpc/64s: Fix Power9 DD2.1 logic in DT CPU features
I got the logic wrong in the DT CPU features code when I added the
Power9 DD2.1 feature. We should be setting the bit if we detect a
DD2.1, not clearing it if we detect a DD2.0.
This code isn't actually exercised at the moment so nothing is
actually broken.
Fixes: 3ffa9d9e2a7c ("powerpc/64s: Fix Power9 DD2.0 workarounds by adding DD2.1 feature")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | arch/powerpc/kernel/dt_cpu_ftrs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/dt_cpu_ftrs.c b/arch/powerpc/kernel/dt_cpu_ftrs.c index 602e0fde19b4..8bdc2f96c5d6 100644 --- a/arch/powerpc/kernel/dt_cpu_ftrs.c +++ b/arch/powerpc/kernel/dt_cpu_ftrs.c | |||
@@ -735,8 +735,8 @@ static __init void cpufeatures_cpu_quirks(void) | |||
735 | */ | 735 | */ |
736 | if ((version & 0xffffff00) == 0x004e0100) | 736 | if ((version & 0xffffff00) == 0x004e0100) |
737 | cur_cpu_spec->cpu_features |= CPU_FTR_POWER9_DD1; | 737 | cur_cpu_spec->cpu_features |= CPU_FTR_POWER9_DD1; |
738 | else if ((version & 0xffffefff) == 0x004e0200) | 738 | else if ((version & 0xffffefff) == 0x004e0201) |
739 | cur_cpu_spec->cpu_features &= ~CPU_FTR_POWER9_DD2_1; | 739 | cur_cpu_spec->cpu_features |= CPU_FTR_POWER9_DD2_1; |
740 | } | 740 | } |
741 | 741 | ||
742 | static void __init cpufeatures_setup_finished(void) | 742 | static void __init cpufeatures_setup_finished(void) |