| Message ID | 1517920597-14588-1-git-send-email-maddy@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5c11d1e52d996749897a8616860b18a084c894f0 |
| Headers | show |
| Series | powerpc/64s: Fix MASKABLE_RELON_EXCEPTION_HV_OOL macro | expand |
On 06/02/18 23:36, Madhavan Srinivasan wrote: > 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 trash at boot. Patch to fix > the macro to use SOFTEN_TEST_HV instead of SOFTEN_NOTEST_HV. > > Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru> > Fix-Suggested-by: Michael Ellerman <mpe@ellerman.id.au> > Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> > --- > 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) > > /* > Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru>
On Tue, 2018-02-06 at 12:36:37 UTC, Madhavan Srinivasan wrote: > 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 trash at boot. Patch to fix > the macro to use SOFTEN_TEST_HV instead of SOFTEN_NOTEST_HV. > > Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru> > Fix-Suggested-by: Michael Ellerman <mpe@ellerman.id.au> > Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> > Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru> Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/5c11d1e52d996749897a8616860b18 cheers
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) /*
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 trash at boot. Patch to fix the macro to use SOFTEN_TEST_HV instead of SOFTEN_NOTEST_HV. Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru> Fix-Suggested-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> --- arch/powerpc/include/asm/exception-64s.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)