diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-27 23:55:49 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-27 23:55:49 +1100 |
| commit | c0b346729b5dd3c7d0232f043f5b15947ffc7978 (patch) | |
| tree | a790a37bfc5815b46c8f9a4faf9a2d38c74d2cdb /arch/powerpc/kernel/dt_cpu_ftrs.c | |
| parent | 34a286a4ac576d3d9ea3ac2bc7bbd4216a1f7ac7 (diff) | |
| parent | 9654153158d3e0684a1bdb76dbababdb7111d5a0 (diff) | |
| download | linux-c0b346729b5dd3c7d0232f043f5b15947ffc7978.tar.gz linux-c0b346729b5dd3c7d0232f043f5b15947ffc7978.tar.bz2 linux-c0b346729b5dd3c7d0232f043f5b15947ffc7978.zip | |
Merge branch 'topic/ppc-kvm' into next
Merge the DAWR series, which touches arch code and KVM code and may need
to be merged into the kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/kernel/dt_cpu_ftrs.c')
| -rw-r--r-- | arch/powerpc/kernel/dt_cpu_ftrs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/dt_cpu_ftrs.c b/arch/powerpc/kernel/dt_cpu_ftrs.c index 0a0c601c6ade..0af2c5dc5162 100644 --- a/arch/powerpc/kernel/dt_cpu_ftrs.c +++ b/arch/powerpc/kernel/dt_cpu_ftrs.c @@ -713,6 +713,9 @@ static __init void cpufeatures_cpu_quirks(void) else if ((version & 0xffffefff) == 0x004e0202) cur_cpu_spec->cpu_features |= CPU_FTR_P9_TM_HV_ASSIST | CPU_FTR_P9_TM_XER_SO_BUG; + + if ((version & 0xffff0000) == 0x004e0000) + cur_cpu_spec->cpu_features &= ~(CPU_FTR_DAWR); } static void __init cpufeatures_setup_finished(void) |