Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp84165imm; Thu, 2 Aug 2018 14:26:44 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcAbD8WM3eikQokyNvRFQrBJ73A1PuN3R/BnC3iovsMhlZH7qv5TkxhUI0PT8wKigzhn2Wo X-Received: by 2002:a62:8559:: with SMTP id u86-v6mr1262747pfd.32.1533245204915; Thu, 02 Aug 2018 14:26:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533245204; cv=none; d=google.com; s=arc-20160816; b=BtXFFXBQ6xwavGiSsr7iMqtWxzUbDYYsWV4HALrKk2+mmhLf/DM16JC4JXyUCCD1NG yqE0GEFdioQAf4ykUuUYf6dN85icXX8BImtV+z8mJw+s5S5fM5bDZE4tE1F9RGNyxEiK DdhuLEdrla3upLrUjV5OZPYZVEZew740RQuQLpKvIW9BLmY8GEs53bBEKzjqfPa+WelL EOGGg4+jIhIg4rHGLGfm7HpN3B+dhYuFYyplmaF3Zx5OVcdyfxefKHONLagyjmanz/wb EJz5UAMQEEJdpRR9yvXgTqfpLD59+8IaVmGusg0aZhKHKQg0KdO/IqQuJa7Mbk+/VRw2 ohVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=DFnTr+2NeE6XXk6Ud6qLAY2DVC3J4MM2kRNEA/6tw/Y=; b=SW+aDeJIFTcm7hQnqh1Lo5qEmjHjbUyQAE64UMAHn1lYFOuO/jrT69upycrWLWsUF6 hb/e9hoknvrDmbla0Ix3hb0RKEXP9PnbCUhbZbD16vTGTxipi5UJc34PCcuCGMfMTOft dHh5VZmBGg/Bf1UMuF+YnC27YBMwWZrzZaDH4iE5NOSitse5CwIlcBWn/Wucayf7pfqf 5GgaNbjlbOivlz2rC9eOnQ/2XdxBNOQqh2WqJL93t40YQDoRFf+e3IHx9hme5UbtbiO/ 7oaPBjrSDpuGvd1XNh00VqcL0SNG74Qu2h2dWdXj+gXL4ISlqqXiBP5Yrb5UfS6vcQSF tGtA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r21-v6si3017298pgi.690.2018.08.02.14.26.30; Thu, 02 Aug 2018 14:26:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732189AbeHBXRe (ORCPT + 99 others); Thu, 2 Aug 2018 19:17:34 -0400 Received: from g2t1383g.austin.hpe.com ([15.233.16.89]:30769 "EHLO g2t1383g.austin.hpe.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729407AbeHBXRO (ORCPT ); Thu, 2 Aug 2018 19:17:14 -0400 Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by g2t1383g.austin.hpe.com (Postfix) with ESMTPS id 987861D55; Thu, 2 Aug 2018 21:24:18 +0000 (UTC) Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2352.austin.hpe.com (Postfix) with ESMTP id 30DE4B5; Thu, 2 Aug 2018 21:24:18 +0000 (UTC) Received: from lxbuild.ftc.rdlabs.hpecorp.net (lxbuild.ftc.rdlabs.hpecorp.net [16.78.34.175]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id D3CCB36; Thu, 2 Aug 2018 21:24:17 +0000 (UTC) From: Jerry Hoemann To: wim@linux-watchdog.org, linux@roeck-us.net Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Jerry Hoemann Subject: [PATCH 2/4] watchdog: hpwdt: Claim NMI from iLO Date: Thu, 2 Aug 2018 15:15:39 -0600 Message-Id: <1533244541-42310-3-git-send-email-jerry.hoemann@hpe.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1533244541-42310-1-git-send-email-jerry.hoemann@hpe.com> References: <1533244541-42310-1-git-send-email-jerry.hoemann@hpe.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The hwpdt driver is overloaded for handling both the iLO watchdog and the explicit "Generate NMI to System" virutal button. Claim the iLO NMI virtual button even if we are not claiming the iLO watchdog pretimeout. Signed-off-by: Jerry Hoemann --- drivers/watchdog/hpwdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 369022d..8a85ddd 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -162,7 +162,7 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs) if (ilo5 && ulReason == NMI_UNKNOWN && !mynmi) return NMI_DONE; - if (ilo5 && !pretimeout) + if (ilo5 && !pretimeout && !(mynmi & 0x4)) return NMI_DONE; hpwdt_stop(); -- 1.8.3.1