powerpc/powernv: Fallback to old HMI handling behavior for old firmware
PATCH 1/1 powerpc/powernv: Fallback to old HMI handling behavior for old firmware
From: Mahesh Salgaonkar <[email protected]>
Recently we moved HMI handling into Linux kernel instead of taking HMI directly in OPAL. This new change is dependent on new OPAL call for HMI recovery which was introduced in newer firmware. While this new change works fine with latest OPAL firmware, we broke the HMI handling if we run newer kernel on old OPAL firmware that results in system hang.
This patch fixes this issue by falling back to old HMI behavior on older OPAL firmware.
This patch introduces a check for opal token OPAL_HANDLE_HMI to see if we are running on newer firmware or old firmware. On newer firmware this check would return OPAL_TOKEN_PRESENT, otherwise we are running on old firmware and fallback to old HMI behavior.
This patch depends on opal check token patch posted at ppc-devel
https://lists.ozlabs.org/pipermail/linuxppc-dev/2014-August/120224.html
--- arch/powerpc/platforms/powernv/opal.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/powerpc/platforms/powernv/opal.c +18 -0
@@ -194,6 +194,24 @@ static int __init opal_register_exception_handlers(void)* fwnmi area at 0x7000 to provide the glue space to OPAL */ glue =0x7000 ; + +/* Check if we are running on newer firmware that exports +* OPAL_HANDLE_HMI token. If yes, then don't ask opal to patch +* HMI interrupt and we catch it directly in Linux kernel. +* +* For older firmware we will fallback to old behavior and +* let OPAL patch the HMI vector and handle it inside OPAL +* firmware. +*/ +if (opal_check_token (OPAL_HANDLE_HMI ) !=OPAL_TOKEN_PRESENT ) { +/* We are on old firmware. fallback to old behavior. */ +pr_info ("%s: Falling back to old HMI handling behavior.\n" , + __func__); +opal_register_exception_handler ( +OPAL_HYPERVISOR_MAINTENANCE_HANDLER , +0 , glue); + glue +=128 ; + }opal_register_exception_handler (OPAL_SOFTPATCH_HANDLER ,0 , glue);#endif
Quoted 11 lines · Mahesh J Salgaonkar
From: Mahesh Salgaonkar <[email protected]>
Recently we moved HMI handling into Linux kernel instead of taking HMI directly in OPAL. This new change is dependent on new OPAL call for HMI recovery which was introduced in newer firmware. While this new change works fine with latest OPAL firmware, we broke the HMI handling if we run newer kernel on old OPAL firmware that results in system hang.
This patch fixes this issue by falling back to old HMI behavior on older OPAL firmware.
Quoted 7 lines
This patch introduces a check for opal token
OPAL_HANDLE_HMIto see if we are running on newer firmware or old firmware. On newer firmware this check would returnOPAL_TOKEN_PRESENT, otherwise we are running on old firmware and fallback to old HMI behavior.This patch depends on opal check token patch posted at ppc-devel
https://lists.ozlabs.org/pipermail/linuxppc-dev/2014-August/120224.html
(just reviewed that patch before this one...)
Quoted 18 lines
arch/powerpc/platforms/powernv/opal.c +10
-0@@ -194,6 +194,24 @@ static int __init opal_register_exception_handlers(void)* fwnmi area at 0x7000 to provide the glue space to OPAL */ glue =0x7000 ; + +/* Check if we are running on newer firmware that exports +* OPAL_HANDLE_HMI token. If yes, then don't ask opal to patch +* HMI interrupt and we catch it directly in Linux kernel. +* +* For older firmware we will fallback to old behavior and +* let OPAL patch the HMI vector and handle it inside OPAL +* firmware. +*/ +if (opal_check_token (OPAL_HANDLE_HMI ) !=OPAL_TOKEN_PRESENT ) {
arch/powerpc/platforms/powernv/opal.c static int __init opal_register_exception_handlers(void) · line 216
Quoted 10 lines
arch/powerpc/platforms/powernv/opal.c +8
-0+/* We are on old firmware. fallback to old behavior. */ +pr_info ("%s: Falling back to old HMI handling behavior.\n" , + __func__); +opal_register_exception_handler ( +OPAL_HYPERVISOR_MAINTENANCE_HANDLER , +0 , glue); + glue +=128 ; + }opal_register_exception_handler (OPAL_SOFTPATCH_HANDLER ,0 , glue);
So.. that all looks fine, but another note: why are we doing the OPAL_SOFTPATCH_HANDLER and why is it all #if 0 out in skiboot?
for this patch:
Michael Ellerman
reviewerQuoted 1 line · Mahesh Salgaonkar
From: Mahesh Salgaonkar <[email protected]>
Hi Mahesh,
Quoted 8 lines
Recently we moved HMI handling into Linux kernel instead of taking HMI directly in OPAL. This new change is dependent on new OPAL call for HMI recovery which was introduced in newer firmware. While this new change works fine with latest OPAL firmware, we broke the HMI handling if we run newer kernel on old OPAL firmware that results in system hang.
This patch fixes this issue by falling back to old HMI behavior on older OPAL firmware.
It sounds like "older" firmware is actually "the currently released firmware". The "newer" firmware is still in development, is that right?
If so please update the comment and changelog to better reflect that.
arch/powerpc/platforms/powernv/opal.c static int __init opal_register_exception_handlers(void) · line 198
Quoted 10 lines
arch/powerpc/platforms/powernv/opal.c +2
-0@@ -194,6 +194,24 @@ static int __init opal_register_exception_handlers(void)* fwnmi area at 0x7000 to provide the glue space to OPAL */ glue =0x7000 ; + +/* Check if we are running on newer firmware that exports
Please format your long comments like:
/*
* Check if we are ..
*/
I know some of our code uses the other style but this is the commonly accepted style.
arch/powerpc/platforms/powernv/opal.c static int __init opal_register_exception_handlers(void) · line 206
Quoted 8 lines
arch/powerpc/platforms/powernv/opal.c +8
-0+* OPAL_HANDLE_HMI token. If yes, then don't ask opal to patch +* HMI interrupt and we catch it directly in Linux kernel. +* +* For older firmware we will fallback to old behavior and +* let OPAL patch the HMI vector and handle it inside OPAL +* firmware. +*/ +if (opal_check_token (OPAL_HANDLE_HMI ) !=OPAL_TOKEN_PRESENT ) {
OPAL_TOKEN_PRESENT was dropped from the API. Just use:
if (!opal_check_token(OPAL_HANDLE_HMI)) {arch/powerpc/platforms/powernv/opal.c static int __init opal_register_exception_handlers(void) · line 209
Quoted 3 lines
arch/powerpc/platforms/powernv/opal.c +3
-0+/* We are on old firmware. fallback to old behavior. */ +pr_info ("%s: Falling back to old HMI handling behavior.\n" , + __func__);
Please just use "opal: " rather than __func__.
And rather than the user having to know what the old vs new behaviour is, can you make it explicit in the message, eg:
"opal: Old firmware detected, letting OPAL handle HMIs."
arch/powerpc/platforms/powernv/opal.c static int __init opal_register_exception_handlers(void) · line 214
Quoted 5 lines
arch/powerpc/platforms/powernv/opal.c +5
-0+opal_register_exception_handler ( +OPAL_HYPERVISOR_MAINTENANCE_HANDLER , +0 , glue); + glue +=128 ; + }
Newline here please.
arch/powerpc/platforms/powernv/opal.c static int __init opal_register_exception_handlers(void) · line 216
Quoted 2 lines
arch/powerpc/platforms/powernv/opal.c +0
-0opal_register_exception_handler (OPAL_SOFTPATCH_HANDLER ,0 , glue);#endif
cheers