diff options
| author | Michael Ellerman | 2017-08-23 22:20:10 +1000 |
|---|---|---|
| committer | Michael Ellerman | 2017-08-23 22:20:10 +1000 |
| commit | 15c659ff9d5b367c886166a9854a89b72c524a68 (patch) | |
| tree | d33acaf62889bf6304f6109dd69923a17ab938be /arch/powerpc/kernel/idle_book3s.S | |
| parent | 516fa8d0e19d854253460ea7692551e836e7e2b5 (diff) | |
| parent | 1a92a80ad386a1a6e3b36d576d52a1a456394b70 (diff) | |
Merge branch 'fixes' into next
There's a non-trivial dependency between some commits we want to put in
next and the KVM prefetch work around that went into fixes. So merge
fixes into next.
Diffstat (limited to 'arch/powerpc/kernel/idle_book3s.S')
| -rw-r--r-- | arch/powerpc/kernel/idle_book3s.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index 4621568277f2..bfbf0976fc09 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -514,11 +514,17 @@ pnv_restore_hyp_resource_arch300: /* * Workaround for POWER9, if we lost resources, the ERAT * might have been mixed up and needs flushing. We also need - * to reload MMCR0 (see comment above). + * to reload MMCR0 (see comment above). We also need to set + * then clear bit 60 in MMCRA to ensure the PMU starts running. */ blt cr3,1f PPC_INVALIDATE_ERAT ld r1,PACAR1(r13) + mfspr r4,SPRN_MMCRA + ori r4,r4,(1 << (63-60)) + mtspr SPRN_MMCRA,r4 + xori r4,r4,(1 << (63-60)) + mtspr SPRN_MMCRA,r4 ld r4,_MMCR0(r1) mtspr SPRN_MMCR0,r4 1: |