diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 22:43:43 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 22:43:43 +1100 |
| commit | 5400fc229e6078a6964b15fb98e9a994df3d642a (patch) | |
| tree | eaaed61828654237ace607f45b5ba3aa42ce1160 /arch/powerpc/include/asm/reg.h | |
| parent | powerpc: Enable support for ibm,drc-info devtree property (diff) | |
| parent | powerpc/mm: Remove unused flag arg in global_invalidates (diff) | |
| download | linux-dev-5400fc229e6078a6964b15fb98e9a994df3d642a.tar.xz linux-dev-5400fc229e6078a6964b15fb98e9a994df3d642a.zip | |
Merge branch 'topic/ppc-kvm' into next
Merge the topic branch we share with kvm-ppc, this brings in two xive
commits, one from Paul to rework HMI handling, and a minor cleanup to
drop an unused flag.
Diffstat (limited to 'arch/powerpc/include/asm/reg.h')
| -rw-r--r-- | arch/powerpc/include/asm/reg.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index ffc9990e8040..e6c7eadf6bce 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -431,8 +431,9 @@ #define SPRN_LPID 0x13F /* Logical Partition Identifier */ #endif #define LPID_RSVD 0x3ff /* Reserved LPID for partn switching */ -#define SPRN_HMER 0x150 /* Hardware m? error recovery */ -#define SPRN_HMEER 0x151 /* Hardware m? enable error recovery */ +#define SPRN_HMER 0x150 /* Hypervisor maintenance exception reg */ +#define HMER_DEBUG_TRIG (1ul << (63 - 17)) /* Debug trigger */ +#define SPRN_HMEER 0x151 /* Hyp maintenance exception enable reg */ #define SPRN_PCR 0x152 /* Processor compatibility register */ #define PCR_VEC_DIS (1ul << (63-0)) /* Vec. disable (bit NA since POWER8) */ #define PCR_VSX_DIS (1ul << (63-1)) /* VSX disable (bit NA since POWER8) */ |