powerpc/powernv: Show checkstop reason for NPU2 HMIs
PATCH 1/1 powerpc/powernv: Show checkstop reason for NPU2 HMIs
If the kernel is notified of an HMI caused by the NPU2, it's currently not being recognized and it logs the default message:
Unknown Malfunction Alert of type 3
The NPU on Power 9 has 3 Fault Isolation Registers, so that's a lot of possible causes, but we should at least log that it's an NPU problem and report which FIR and which bit were raised if opal gave us the information.
---
Could be merged independently from (the opal-api.h change is already in the skiboot tree), but works better with, the matching skiboot change:
http://patchwork.ozlabs.org/patch/1104076/
arch/powerpc/include/asm/opal-api.h | 1 + arch/powerpc/platforms/powernv/opal-hmi.c | 40 +++++++++++++++++++++++ 2 files changed, 41 insertions(+)
arch/powerpc/include/asm/opal-api.h +1 -0
@@ -568,6 +568,7 @@ enum OpalHMI_XstopType {CHECKSTOP_TYPE_UNKNOWN =0 ,CHECKSTOP_TYPE_CORE =1 ,CHECKSTOP_TYPE_NX =2 , +CHECKSTOP_TYPE_NPU =3 }; enum OpalHMI_CoreXstopReason {
arch/powerpc/platforms/powernv/opal-hmi.c +40 -0
@@ -149,6 +149,43 @@ static void print_nx_checkstop_reason(const char *level, xstop_reason[i].description); } +static void print_npu_checkstop_reason (const char *level, +struct OpalHMIEvent *hmi_evt) +{ +uint8_t reason, reason_count, i; + +/* +* We may not have a checkstop reason on some combination of +* hardware and/or skiboot version +*/ +if (!hmi_evt->u.xstop_error.xstop_reason) { +printk ("%s NPU checkstop on chip %x\n" , level, +be32_to_cpu (hmi_evt->u.xstop_error.u.chip_id)); +return ; + } + +/* +* NPU2 has 3 FIRs. Reason encoded on a byte as: +* 2 bits for the FIR number +* 6 bits for the bit number +* It may be possible to find several reasons. +* +* We don't display a specific message per FIR bit as there +* are too many and most are meaningless without the workbook +* and/or hw team help anyway. +*/ + reason_count =sizeof (hmi_evt->u.xstop_error.xstop_reason) / +sizeof (reason); +for (i =0 ; i < reason_count; i++) { + reason = (hmi_evt->u.xstop_error.xstop_reason >> (8 * i)) &0xFF ; +if (reason) +printk ("%s NPU checkstop on chip %x: FIR%d bit %d is set\n" , + level, +be32_to_cpu (hmi_evt->u.xstop_error.u.chip_id), + reason >>6 , reason &0x3F ); + } +} +static void print_checkstop_reason (const char *level,struct OpalHMIEvent *hmi_evt) {
@@ -160,6 +197,9 @@ static void print_checkstop_reason(const char *level,case CHECKSTOP_TYPE_NX :print_nx_checkstop_reason (level, hmi_evt);break ; +case CHECKSTOP_TYPE_NPU : +print_npu_checkstop_reason (level, hmi_evt); +break ;default :printk ("%s Unknown Malfunction Alert of type %d\n" , level, type);
Signature · 1 line
2.21.0
Michael Ellerman
reviewerQuoted 10 lines · Frederic Barrat
If the kernel is notified of an HMI caused by the NPU2, it's currently not being recognized and it logs the default message:
Unknown Malfunction Alert of type 3
The NPU on Power 9 has 3 Fault Isolation Registers, so that's a lot of possible causes, but we should at least log that it's an NPU problem and report which FIR and which bit were raised if opal gave us the information.
Quoted 7 lines
Signed-off-by Frederic Barrat <[email protected]>---
Could be merged independently from (the
opal-api.hchange is already in the skiboot tree), but works better with, the matching skiboot change:
http://patchwork.ozlabs.org/patch/1104076/
Well it *must* work with or without the skiboot change, because old/new kernels will run on old/new skiboots.
It looks like it will work fine, we just won't get any extra information in xstop_reason, right?
cheers
Quoted 72 lines
arch/powerpc/include/asm/opal-api.h +1
-0@@ -568,6 +568,7 @@ enum OpalHMI_XstopType {CHECKSTOP_TYPE_UNKNOWN =0 ,CHECKSTOP_TYPE_CORE =1 ,CHECKSTOP_TYPE_NX =2 , +CHECKSTOP_TYPE_NPU =3 }; enum OpalHMI_CoreXstopReason {arch/powerpc/platforms/powernv/opal-hmi.c +40
-0@@ -149,6 +149,43 @@ static void print_nx_checkstop_reason(const char *level, xstop_reason[i].description); } +static void print_npu_checkstop_reason (const char *level, +struct OpalHMIEvent *hmi_evt) +{ +uint8_t reason, reason_count, i; + +/* +* We may not have a checkstop reason on some combination of +* hardware and/or skiboot version +*/ +if (!hmi_evt->u.xstop_error.xstop_reason) { +printk ("%s NPU checkstop on chip %x\n" , level, +be32_to_cpu (hmi_evt->u.xstop_error.u.chip_id)); +return ; + } + +/* +* NPU2 has 3 FIRs. Reason encoded on a byte as: +* 2 bits for the FIR number +* 6 bits for the bit number +* It may be possible to find several reasons. +* +* We don't display a specific message per FIR bit as there +* are too many and most are meaningless without the workbook +* and/or hw team help anyway. +*/ + reason_count =sizeof (hmi_evt->u.xstop_error.xstop_reason) / +sizeof (reason); +for (i =0 ; i < reason_count; i++) { + reason = (hmi_evt->u.xstop_error.xstop_reason >> (8 * i)) &0xFF ; +if (reason) +printk ("%s NPU checkstop on chip %x: FIR%d bit %d is set\n" , + level, +be32_to_cpu (hmi_evt->u.xstop_error.u.chip_id), + reason >>6 , reason &0x3F ); + } +} +static void print_checkstop_reason (const char *level,struct OpalHMIEvent *hmi_evt) {@@ -160,6 +197,9 @@ static void print_checkstop_reason(const char *level,case CHECKSTOP_TYPE_NX :print_nx_checkstop_reason (level, hmi_evt);break ; +case CHECKSTOP_TYPE_NPU : +print_npu_checkstop_reason (level, hmi_evt); +break ;default :printk ("%s Unknown Malfunction Alert of type %d\n" , level, type);Signature · 1 line
2.21.0
Le 23/05/2019 à 15:45, Michael Ellerman a écrit :
Quoted 20 lines
Quoted 10 lines · Frederic Barrat
If the kernel is notified of an HMI caused by the NPU2, it's currently not being recognized and it logs the default message:
Unknown Malfunction Alert of type 3
The NPU on Power 9 has 3 Fault Isolation Registers, so that's a lot of possible causes, but we should at least log that it's an NPU problem and report which FIR and which bit were raised if opal gave us the information.
Quoted 7 lines
Signed-off-by Frederic Barrat <[email protected]>---
Could be merged independently from (the
opal-api.hchange is already in the skiboot tree), but works better with, the matching skiboot change:
http://patchwork.ozlabs.org/patch/1104076/
Quoted 5 lines
Well it *must* work with or without the skiboot change, because old/new kernels will run on old/new skiboots.
It looks like it will work fine, we just won't get any extra information in
xstop_reason, right?
Yes, that's understood, and it was tested. On an old skiboot, we're now printing that we got an NPU checkstop (instead of the "unknown malfunction alert"), we just won't have the extra FIR info. That's what I meant by "works better with the skiboot patch".
Fred
Quoted 75 lines
cheers
Quoted 72 lines
arch/powerpc/include/asm/opal-api.h +1
-0@@ -568,6 +568,7 @@ enum OpalHMI_XstopType {CHECKSTOP_TYPE_UNKNOWN =0 ,CHECKSTOP_TYPE_CORE =1 ,CHECKSTOP_TYPE_NX =2 , +CHECKSTOP_TYPE_NPU =3 }; enum OpalHMI_CoreXstopReason {arch/powerpc/platforms/powernv/opal-hmi.c +40
-0@@ -149,6 +149,43 @@ static void print_nx_checkstop_reason(const char *level, xstop_reason[i].description); } +static void print_npu_checkstop_reason (const char *level, +struct OpalHMIEvent *hmi_evt) +{ +uint8_t reason, reason_count, i; + +/* +* We may not have a checkstop reason on some combination of +* hardware and/or skiboot version +*/ +if (!hmi_evt->u.xstop_error.xstop_reason) { +printk ("%s NPU checkstop on chip %x\n" , level, +be32_to_cpu (hmi_evt->u.xstop_error.u.chip_id)); +return ; + } + +/* +* NPU2 has 3 FIRs. Reason encoded on a byte as: +* 2 bits for the FIR number +* 6 bits for the bit number +* It may be possible to find several reasons. +* +* We don't display a specific message per FIR bit as there +* are too many and most are meaningless without the workbook +* and/or hw team help anyway. +*/ + reason_count =sizeof (hmi_evt->u.xstop_error.xstop_reason) / +sizeof (reason); +for (i =0 ; i < reason_count; i++) { + reason = (hmi_evt->u.xstop_error.xstop_reason >> (8 * i)) &0xFF ; +if (reason) +printk ("%s NPU checkstop on chip %x: FIR%d bit %d is set\n" , + level, +be32_to_cpu (hmi_evt->u.xstop_error.u.chip_id), + reason >>6 , reason &0x3F ); + } +} +static void print_checkstop_reason (const char *level,struct OpalHMIEvent *hmi_evt) {@@ -160,6 +197,9 @@ static void print_checkstop_reason(const char *level,case CHECKSTOP_TYPE_NX :print_nx_checkstop_reason (level, hmi_evt);break ; +case CHECKSTOP_TYPE_NPU : +print_npu_checkstop_reason (level, hmi_evt); +break ;default :printk ("%s Unknown Malfunction Alert of type %d\n" , level, type);Signature · 1 line
2.21.0
Quoted 10 lines · Frederic Barrat
If the kernel is notified of an HMI caused by the NPU2, it's currently not being recognized and it logs the default message:
Unknown Malfunction Alert of type 3
The NPU on Power 9 has 3 Fault Isolation Registers, so that's a lot of possible causes, but we should at least log that it's an NPU problem and report which FIR and which bit were raised if opal gave us the information.
Quoted 7 lines
Signed-off-by Frederic Barrat <[email protected]>---
Could be merged independently from (the
opal-api.hchange is already in the skiboot tree), but works better with, the matching skiboot change:
http://patchwork.ozlabs.org/patch/1104076/
Still always safest to hold off until merged into skiboot :)
Quoted 45 lines
arch/powerpc/include/asm/opal-api.h | 1 + arch/powerpc/platforms/powernv/opal-hmi.c | 40 +++++++++++++++++++++++ 2 files changed, 41 insertions(+)arch/powerpc/include/asm/opal-api.h +1
-0@@ -568,6 +568,7 @@ enum OpalHMI_XstopType {CHECKSTOP_TYPE_UNKNOWN =0 ,CHECKSTOP_TYPE_CORE =1 ,CHECKSTOP_TYPE_NX =2 , +CHECKSTOP_TYPE_NPU =3 }; enum OpalHMI_CoreXstopReason {arch/powerpc/platforms/powernv/opal-hmi.c +19
-0@@ -149,6 +149,43 @@ static void print_nx_checkstop_reason(const char *level, xstop_reason[i].description); } +static void print_npu_checkstop_reason (const char *level, +struct OpalHMIEvent *hmi_evt) +{ +uint8_t reason, reason_count, i; + +/* +* We may not have a checkstop reason on some combination of +* hardware and/or skiboot version +*/ +if (!hmi_evt->u.xstop_error.xstop_reason) { +printk ("%s NPU checkstop on chip %x\n" , level, +be32_to_cpu (hmi_evt->u.xstop_error.u.chip_id)); +return ; + } + +/* +* NPU2 has 3 FIRs. Reason encoded on a byte as: +* 2 bits for the FIR number +* 6 bits for the bit number
arch/powerpc/platforms/powernv/opal-hmi.c static void print_nx_checkstop_reason(const char *level, · line 180
Quoted 10 lines
arch/powerpc/platforms/powernv/opal-hmi.c +10
-0+* It may be possible to find several reasons. +* +* We don't display a specific message per FIR bit as there +* are too many and most are meaningless without the workbook +* and/or hw team help anyway. +*/ + reason_count =sizeof (hmi_evt->u.xstop_error.xstop_reason) / +sizeof (reason); +for (i =0 ; i < reason_count; i++) { + reason = (hmi_evt->u.xstop_error.xstop_reason >> (8 * i)) &0xFF ;
very nitpicky: should we call be32_to_cpu() so that the bits appear in order?
Quoted 22 lines
arch/powerpc/platforms/powernv/opal-hmi.c +11
-0+if (reason) +printk ("%s NPU checkstop on chip %x: FIR%d bit %d is set\n" , + level, +be32_to_cpu (hmi_evt->u.xstop_error.u.chip_id), + reason >>6 , reason &0x3F ); + } +} +static void print_checkstop_reason (const char *level,struct OpalHMIEvent *hmi_evt) {@@ -160,6 +197,9 @@ static void print_checkstop_reason(const char *level,case CHECKSTOP_TYPE_NX :print_nx_checkstop_reason (level, hmi_evt);break ; +case CHECKSTOP_TYPE_NPU : +print_npu_checkstop_reason (level, hmi_evt); +break ;default :printk ("%s Unknown Malfunction Alert of type %d\n" , level, type);
Signature · 2 lines
Andrew Donnellan OzLabs, ADL Canberra [email protected] IBM Australia Limited
Michael Ellerman
AppliedQuoted 5 lines · Frederic Barrat
If the kernel is notified of an HMI caused by the NPU2, it's currently not being recognized and it logs the default message:
Unknown Malfunction Alert of type 3
Quoted 7 lines
The NPU on Power 9 has 3 Fault Isolation Registers, so that's a lot of possible causes, but we should at least log that it's an NPU problem and report which FIR and which bit were raised if opal gave us the information.
Signed-off-by Frederic Barrat <[email protected]>Reviewed-by Andrew Donnellan <[email protected]>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/89d87bcba2874d824affb7842bb3960c
cheers