From patchwork Thu May 24 00:13:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Kennington X-Patchwork-Id: 919460 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40rqdS48M6z9s1B for ; Thu, 24 May 2018 10:14:52 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="Cis3M8jo"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40rqdS0T0BzF1Hg for ; Thu, 24 May 2018 10:14:52 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="Cis3M8jo"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=flex--wak.bounces.google.com (client-ip=2607:f8b0:400c:c05::24a; helo=mail-vk0-x24a.google.com; envelope-from=3zgmgwwmkb8sdr1x55x2v.t5391zs55a2z9a9.5g2rs9.58x@flex--wak.bounces.google.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="Cis3M8jo"; dkim-atps=neutral Received: from mail-vk0-x24a.google.com (mail-vk0-x24a.google.com [IPv6:2607:f8b0:400c:c05::24a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40rqcl1qgzzF1Gj for ; Thu, 24 May 2018 10:14:08 +1000 (AEST) Received: by mail-vk0-x24a.google.com with SMTP id i205-v6so13860084vke.17 for ; Wed, 23 May 2018 17:14:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:in-reply-to:message-id:references:subject:from:to :cc; bh=2dobfiu+Q4fDdm6aS0et4hdO1S1nvGsPL8Xq/AmcLFE=; b=Cis3M8joqNIK2OH0VHUZwkawwcwbrMjGUrJZH3IAbJ+2pueLOJo6o5ukysnJQ4XFlL FzUQq8NOdJcuEFhR6TvyNw6lNGZ1e+PHmUBgVElfkvDaR8KPytFe0NJdaLoDd071VM3S GMBAijmmul+58K7/+cT0TB9/TbncEp5wJPuHX0rEx81TGVGCioDR3RqyET0fD3w/Zs2B VdsVgIne5PRMDJrLfZVBsfmL8GFjMpA16wqnmPpxmLonTgGgSa/oPOTWO1viUVUaNrNo 8sWT2AKtcxUGVhUO8zMVOWsHS9kkWArFWEVqr7/i1xbJ7GJlJWZfe8B5Bb2AlXgCLQxF Ec7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:in-reply-to:message-id :references:subject:from:to:cc; bh=2dobfiu+Q4fDdm6aS0et4hdO1S1nvGsPL8Xq/AmcLFE=; b=t9CIOf7440eJThXRy8DxBKaXwUma68CHE2R1eYfMTXrdd9PyMQ0AWji86mbXmFxS1a dyQ3AhBp5g/MTwZwmcS9Kx6ozP/GY5T87r2+d4TJwEaa/mEwpyGyqMTsQCGjeWqdS+My bPSjE8S8zGNi+AsiM7NQY8dbO6HLg2GF+AVg/s++rpnY3OmIJ0VEDi2Z5Fyvd9twkWtv SAskEaWCEdhivyltKF20DB0Ch6R2RJZe7QlaeSi1h0pMreGmR/wE/hKtyAguPLASFjY/ cqhgBmnYLm26MIPv3wENdmeGxyUappWSIHsssiPErD0F10gkyhwzplnKJ/jtQK/YkBMV bloQ== X-Gm-Message-State: ALKqPwcq2YPvlKu6mTRxvBPxsqQvkGHjo3+2g0koL74Zd93wtoUYItIp 51YDdBYW3UrJV5YtBbCwXb9IJd+q6BfFyFxzkHZFCN0ibILReA5+Qkv4RoQz3qAdkwszagg8Gma yb6qzTuhtW0nGHYYJi2t43Anb7BL4UHHfKCUMvd8iR4DwtP803AdKHe3w X-Google-Smtp-Source: AB8JxZrWNkvmELQonzTiTlE2Fam7g3GEZ+Wu+xs5qWpZRZCQymfUZWcYbXk0qWdmIG5aAp8GxOGtFME= MIME-Version: 1.0 X-Received: by 2002:a1f:9d4b:: with SMTP id g72-v6mr2120058vke.89.1527120846777; Wed, 23 May 2018 17:14:06 -0700 (PDT) Date: Wed, 23 May 2018 17:13:27 -0700 In-Reply-To: <20180524001335.15457-1-wak@google.com> Message-Id: <20180524001335.15457-2-wak@google.com> References: <20180524001335.15457-1-wak@google.com> X-Mailer: git-send-email 2.17.0 From: "William A. Kennington III" To: skiboot@lists.ozlabs.org, alistair@popple.id.au, jk@ozlabs.org Subject: [Skiboot] [PATCH 1/9] ipmi-watchdog: WD_POWER_CYCLE_ACTION -> WD_RESET_ACTION X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" The IPMI specification denotes that action 0x1 is Host Reset and 0x3 is Host Power Cycle. Use the correct name for Reset in our watchdog code. Signed-off-by: William A. Kennington III --- hw/ipmi/ipmi-watchdog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ipmi/ipmi-watchdog.c b/hw/ipmi/ipmi-watchdog.c index 55c3bf555..966d10de4 100644 --- a/hw/ipmi/ipmi-watchdog.c +++ b/hw/ipmi/ipmi-watchdog.c @@ -31,7 +31,7 @@ /* WDT expiration actions */ #define WDT_PRETIMEOUT_SMI 0x10 -#define WDT_POWER_CYCLE_ACTION 0x01 +#define WDT_RESET_ACTION 0x01 #define WDT_NO_ACTION 0x00 /* How long to set the overall watchdog timeout for. In units of @@ -122,7 +122,7 @@ void ipmi_wdt_final_reset(void) /* todo: this is disabled while we're waiting on fixed watchdog * behaviour */ #if 0 - set_wdt(WDT_POWER_CYCLE_ACTION | WDT_PRETIMEOUT_SMI, WDT_TIMEOUT, + set_wdt(WDT_RESET_ACTION | WDT_PRETIMEOUT_SMI, WDT_TIMEOUT, WDT_MARGIN/10); reset_wdt(NULL, (void *) 1); #endif @@ -134,7 +134,7 @@ void ipmi_wdt_final_reset(void) void ipmi_wdt_init(void) { init_timer(&wdt_timer, reset_wdt, NULL); - set_wdt(WDT_POWER_CYCLE_ACTION, WDT_TIMEOUT, 0); + set_wdt(WDT_RESET_ACTION, WDT_TIMEOUT, 0); /* Start the WDT. We do it synchronously to make sure it has * started before skiboot continues booting. Otherwise we