Re: [v3,03/11] watchdog/hpwdt: Update nmi_panic message.

From: Guenter Roeck
Date: Sat Feb 17 2018 - 11:14:56 EST


On Thu, Feb 15, 2018 at 04:43:52PM -0700, Jerry Hoemann wrote:
> Include the nmistat in the nmi_panic message to give support
> an indication why the NMI was called (e.g. a timeout or generate
> nmi button.)
>
> Signed-off-by: Jerry Hoemann <jerry.hoemann@xxxxxxx>
> ---
> drivers/watchdog/hpwdt.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
> index 20a13c5d0285..07810caabf74 100644
> --- a/drivers/watchdog/hpwdt.c
> +++ b/drivers/watchdog/hpwdt.c
> @@ -113,19 +113,23 @@ static int hpwdt_my_nmi(void)
> */
> static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs)
> {
> - if ((ulReason == NMI_UNKNOWN) && !hpwdt_my_nmi())
> + unsigned int mynmi = hpwdt_my_nmi();
> + static char panic_msg[] =
> + "00: An NMI occurred. Depending on your system the reason "
> + "for the NMI is logged in any one of the following resources:\n"
> + "1. Integrated Management Log (IML)\n"
> + "2. OA Syslog\n"
> + "3. OA Forward Progress Log\n"
> + "4. iLO Event Log";
> +
> + if ((ulReason == NMI_UNKNOWN) && !mynmi)

As mentioned before, I won't accept patches with unnecessary ( ).
Deferring to Wim.

Guenter

> return NMI_DONE;
>
> if (allow_kdump)
> hpwdt_stop();
>
> - nmi_panic(regs, "An NMI occurred. Depending on your system the reason "
> - "for the NMI is logged in any one of the following "
> - "resources:\n"
> - "1. Integrated Management Log (IML)\n"
> - "2. OA Syslog\n"
> - "3. OA Forward Progress Log\n"
> - "4. iLO Event Log");
> + hex_byte_pack(panic_msg, mynmi);
> + nmi_panic(regs, panic_msg);
>
> return NMI_HANDLED;
> }