powerpc/64s: Fix MASKABLE_RELON_EXCEPTION_HV_OOL macro

"Linux Kernel Mailing List" <[email protected]> Wed, 14 Feb 2018 18:19:52 +0000 (UTC)
Newsgroups gmane.linux.kernel.commits.head
Message-ID <[email protected]>
Web:        https://git.kernel.org/torvalds/c/5c11d1e52d996749897a8616860b18a084c894f0
Commit:     5c11d1e52d996749897a8616860b18a084c894f0
Parent:     1d9a090783bef19fe8cdec878620d22f05191316
Refname:    refs/heads/master
Author:     Madhavan Srinivasan <[email protected]>
AuthorDate: Tue Feb 6 18:06:37 2018 +0530
Committer:  Michael Ellerman <[email protected]>
CommitDate: Thu Feb 8 23:56:10 2018 +1100

    powerpc/64s: Fix MASKABLE_RELON_EXCEPTION_HV_OOL macro
    
    Commit f14e953b191f ("powerpc/64s: Add support to take additional
    parameter in MASKABLE_* macro") messed up MASKABLE_RELON_EXCEPTION_HV_OOL
    macro by adding the wrong SOFTEN test which caused guest kernel crash
    at boot. Patch to fix the macro to use SOFTEN_TEST_HV instead of
    SOFTEN_NOTEST_HV.
    
    Fixes: f14e953b191f ("powerpc/64s: Add support to take additional parameter in MASKABLE_* macro")
    Reported-by: Alexey Kardashevskiy <[email protected]>
    Fix-Suggested-by: Michael Ellerman <[email protected]>
    Signed-off-by: Madhavan Srinivasan <[email protected]>
    Tested-by: Alexey Kardashevskiy <[email protected]>
    Signed-off-by: Michael Ellerman <[email protected]>
---
 arch/powerpc/include/asm/exception-64s.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 176dfb73d42c..471b2274fbeb 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -645,7 +645,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 					  EXC_HV, SOFTEN_TEST_HV, bitmask)
 
 #define MASKABLE_RELON_EXCEPTION_HV_OOL(vec, label, bitmask)		\
-	MASKABLE_EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_NOTEST_HV, vec, bitmask);\
+	MASKABLE_EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_HV, vec, bitmask);\
 	EXCEPTION_RELON_PROLOG_PSERIES_1(label, EXC_HV)
 
 /*
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html