This code is used at boot and machine checks, so it should be using
early_radix_enabled() (which is usable any time).
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/kernel/mce_power.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c
index b76ca198e09c..d37e612050b5 100644
--- a/arch/powerpc/kernel/mce_power.c
+++ b/arch/powerpc/kernel/mce_power.c
@@ -128,7 +128,7 @@ void __flush_tlb_power9(unsigned int action)
{
unsigned int num_sets;
- if (radix_enabled())
+ if (early_radix_enabled())
num_sets = POWER9_TLB_SETS_RADIX;
else
num_sets = POWER9_TLB_SETS_HASH;--
2.13.3
<div class=3D"socmaildefaultfont" dir=3D"ltr" style=3D"font-family:Arial, H=
elvetica, sans-serif;font-size:10.5pt" ><div dir=3D"ltr" ><span style=3D"fo=
nt-size:0.857em;" >Nick,</span></div>
<div dir=3D"ltr" > </div>
<div dir=3D"ltr" ><span style=3D"font-size:0.857em;" >I applied your patch =
into linux kernel 4.13, rebuild it, installed it, then had a test, still ca=
n not boot OS. System hung here, the same as before.</span></div>
<div dir=3D"ltr" ><span style=3D"font-size:0.857em;" >Would you please have=
a look?</span></div>
<div dir=3D"ltr" ><span style=3D"font-size:0.714em;" >The system is going d=
own NOW!<br>Sent SIGTERM to all processes<br>Sent SIGKILL to all processes<=
br>[ 104.755810] kexec=5Fcore: Starting new kernel<br>[ 126.157=
029744,5] OPAL: Switch to big-endian OS</span></div>
<div dir=3D"ltr" > </div>
<div dir=3D"ltr" > </div>
<div dir=3D"ltr" ><div class=3D"socmaildefaultfont" dir=3D"ltr" style=3D"fo=
nt-family:Arial, Helvetica, sans-serif;font-size:10.5pt" ><div class=3D"soc=
maildefaultfont" dir=3D"ltr" style=3D"font-family:Arial, Helvetica, sans-se=
rif;font-size:10.5pt" ><div class=3D"socmaildefaultfont" dir=3D"ltr" style=
=3D"font-family:Arial, Helvetica, sans-serif;font-size:10.5pt" ><div dir=3D=
"ltr" ><span style=3D"font-size:0.857em;" ><font face=3D"Default Sans Serif=
,Verdana,Arial,Helvetica,sans-serif" ><i>Best Regards!<br>Meng Li<br>IBM Op=
enPOWER Application Engineer</i></font></span></div></div></div></div></div>
<div dir=3D"ltr" > </div>
<div dir=3D"ltr" > </div>
<blockquote data-history-content-modified=3D"1" dir=3D"ltr" style=3D"border=
-left:solid #aaaaaa 2px; margin-left:5px; padding-left:5px; direction:ltr; =
margin-right:0px" >----- Original message -----<br>From: Nicholas Piggin &l=
t;npiggin@gmail.com><br>To: linuxppc-dev@lists.ozlabs.org<br>Cc: Nichola=
s Piggin <npiggin@gmail.com>, Jeremy Kerr <jk@ozlabs.org>, Meng=
YK Li <shlimeng@cn.ibm.com><br>Subject: [PATCH] powerpc/powernv: Use=
early=5Fradix=5Fenabled in POWER9 tlb flush<br>Date: Wed, Sep 27, 2017 1:4=
6 PM<br>
<div><font size=3D"2" face=3D"Default Monospace,Courier New,Courier,monospa=
ce" >This code is used at boot and machine checks, so it should be using<br=
early=5Fradix=5Fenabled() (which is usable any time).<br><br>Signed-off-by=
: Nicholas Piggin <npiggin@gmail.com><br>---<br> arch/powerpc/ke=
rnel/mce=5Fpower.c | 2 +-<br> 1 file changed, 1 insertion(+), 1 deleti=
on(-)<br><br>diff --git a/arch/powerpc/kernel/mce=5Fpower.c b/arch/powerpc/=
kernel/mce=5Fpower.c<br>index b76ca198e09c..d37e612050b5 100644<br>--- a/ar=
ch/powerpc/kernel/mce=5Fpower.c<br>+++ b/arch/powerpc/kernel/mce=5Fpower.c<=
br>@@ -128,7 +128,7 @@ void =5F=5Fflush=5Ftlb=5Fpower9(unsigned int action)=
<br> {<br> unsigned int num=5Fsets;<br> <br>- if (radix=5Fe=
nabled())<br>+ if (early=5Fradix=5Fenabled())<br> num=5Fsets =3D POWE=
R9=5FTLB=5FSETS=5FRADIX;<br> else<br> num=5Fsets =3D POWER9=5FT=
LB=5FSETS=5FHASH;<br>--<br>2.13.3</font><br> </div></blockquote>
<div dir=3D"ltr" > </div></div><BR>
On Wed, 2017-09-27 at 05:45:58 UTC, Nicholas Piggin wrote:
This code is used at boot and machine checks, so it should be using
early_radix_enabled() (which is usable any time).
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/969a86a2855d484a00205a424df1c6
cheers