On Thu, 2011-05-12 at 11:33 +0200, Alexander Graf wrote:

Am 11.05.2011 um 12:39 schrieb Paul Mackerras [off-list ref]:

quoted

Commits a5d4f3ad3a ("powerpc: Base support for exceptions using
HSRR0/1") and 673b189a2e ("powerpc: Always use SPRN_SPRG_HSCRATCH0
when running in HV mode") cause compile and link errors for 32-bit
classic Book 3S processors when KVM is enabled.  This fixes these
errors.

Signed-off-by: Paul Mackerras <redacted>
---
arch/powerpc/include/asm/reg.h       |    5 +++++
arch/powerpc/kvm/book3s_rmhandlers.S |    2 ++
2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 47e3416..05658b7 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h

@@ -823,6 +823,11 @@
   FTR_SECTION_ELSE_NESTED(66);            \
   mtspr    SPRN_SPRG_HSCRATCH0,rX;            \
   ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_HVMODE_206, 66)
+
+#else /* CONFIG_PPC_BOOK3S_64 */
+#define GET_SCRATCH0(rX)    mfspr    rX,SPRN_SPRG_SCRATCH0
+#define SET_SCRATCH0(rX)    mtspr    SPRN_SPRG_SCRATCH0,rX
+

#endif

#ifdef CONFIG_PPC_BOOK3E_64

diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S
index ae99af6..1a1b344 100644
--- a/arch/powerpc/kvm/book3s_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_rmhandlers.S

@@ -112,7 +112,9 @@ INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_MACHINE_CHECK

INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_DATA_STORAGE
INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_INST_STORAGE
INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_EXTERNAL
+#ifdef CONFIG_PPC_BOOK3S_64
INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_EXTERNAL_HV

Hrm - I don't remember putting this one here. When did it get into the tree and why wasn't I CC'ed?

Because I did and I forgot :-)

The patch in question only marginally touched kvm, it's one in a series
that rework of the ppc64 exception vectors to better operate on modern
CPUs running in HV mode (deal with HSRR's vs SRR's etc...) and it needed
a small fixup to the KVM code due to 0x500 becoming "H" interrupts
(using HSRR's) on these.

Unfortunately, it looks like I didn't have KVM enabled in any of my
32-bit test configs and missed that little breakage.

I should have CCed you I suppose, I simply forgot as it wasn't primarily
a KVM related patch.

Cheers,
Ben.