Skip to content

Commit

Permalink
powerpc/pseries: Fix HV facility unavailable to use correct handler
Browse files Browse the repository at this point in the history
The 0xf80 hv_facility_unavailable trampoline branches to the 0xf60
handler. This works because they both do the same thing, but it should
be fixed.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Nicholas Piggin authored and Michael Ellerman committed Sep 22, 2016
1 parent 98b665d commit 40e1b1c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/kernel/exceptions-64s.S
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ facility_unavailable_trampoline:
hv_facility_unavailable_trampoline:
SET_SCRATCH0(r13)
EXCEPTION_PROLOG_0(PACA_EXGEN)
b facility_unavailable_hv
b hv_facility_unavailable_hv

#ifdef CONFIG_CBE_RAS
STD_EXCEPTION_HV(0x1200, 0x1202, cbe_system_error)
Expand Down Expand Up @@ -592,7 +592,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
KVM_HANDLER(PACA_EXGEN, EXC_STD, 0xf40)
STD_EXCEPTION_PSERIES_OOL(0xf60, facility_unavailable)
KVM_HANDLER(PACA_EXGEN, EXC_STD, 0xf60)
STD_EXCEPTION_HV_OOL(0xf82, facility_unavailable)
STD_EXCEPTION_HV_OOL(0xf82, hv_facility_unavailable)
KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xf82)

/*
Expand Down

0 comments on commit 40e1b1c

Please sign in to comment.