From patchwork Sat May 13 12:12:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1780946 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=JklTL/wb; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QJPf62YJWz20KF for ; Sat, 13 May 2023 22:12:46 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4QJPf533xpz3cM3 for ; Sat, 13 May 2023 22:12:45 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=JklTL/wb; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::1036; helo=mail-pj1-x1036.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=JklTL/wb; dkim-atps=neutral Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4QJPdz4pXKz3c8v for ; Sat, 13 May 2023 22:12:39 +1000 (AEST) Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-24e2bbec3d5so7881830a91.3 for ; Sat, 13 May 2023 05:12:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683979957; x=1686571957; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8CjaykpBz+db1elbPePAy1/oJXnu407mt9BweJAn5+U=; b=JklTL/wbMCXESAxqMAZm6yaFpgTmiP0daL/mRyJ5BNr+rdetFzvGZPlnvBLoZHJstt X6ez9rsV+9qjoVZ4LWNiFyxidYqGEWnlIRiTDUQqKBcy9tZ5mwR38ejEomE3/TGgfzu2 KfGL4QgdYnwa60JUIKYU9b75dBO7HwW1I3/1bffPFDw0ovGoRo2dkyGW4F8YcMWYgB8U cs/9MdKunt2+Pufs/mlgN0SHAJ74vu37cCe4/wzv6Zx+DbY3M52gvkNpCEj5uFw2Ex3C 0GPrkDb6dTnBun6tO7KJXGoKqsjL73pM0YJUvY0a5sWcjJn9ZDS/Rzwhtak0sCaDtzRp xXnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683979957; x=1686571957; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8CjaykpBz+db1elbPePAy1/oJXnu407mt9BweJAn5+U=; b=Ja61yUM7QMWolXrA5KmHogGFzy1G1t6clMCqqzpxJU9UJB86ou6LkNlVmGdNWCgCJL CwWNGCq9vCAFd+nY2b3ZSs+pfD4qYbjV4IWEGmfmI5cPubJlLGyo6/XDeKkF3pznDjgB g1cCwPDmKThuyguj6Kq0PFqATsN1bWCWRI6uqQSgbSxWHRxZSsXB8MVxgdz3x+hdBO5L V6GKJTycztSQoL8T5QWv6bPjFbmaG98Car105FIWpbvbVuA/wqciBOpjkbf9kTCIeU0w 0Ow5JNoIPFSOlVhtR+aND8XisPb2h3JuEIEyH3hw3s2NY4w3pElY8BZsyoNB/aK0hn+g Fglw== X-Gm-Message-State: AC+VfDwdN3iLxj+yV3RkC32UUPtqWcm+qghCFf7De0zZ4ZxiWPNfbO6s ecHJon0tAVdQGEd0fROIMh9PorkNWYc= X-Google-Smtp-Source: ACHHUZ5zetEDqbDFt5ymzcO4V+eHSNhoTUFX2VwVW2q+pMqzwExLfklfDxatHAbpjYkvboNRejQTNA== X-Received: by 2002:a17:90a:8049:b0:24d:e929:56cf with SMTP id e9-20020a17090a804900b0024de92956cfmr27615935pjw.39.1683979957273; Sat, 13 May 2023 05:12:37 -0700 (PDT) Received: from wheely.local0.net (203-221-165-68.tpgi.com.au. [203.221.165.68]) by smtp.gmail.com with ESMTPSA id v4-20020a17090a778400b00250aa8ef89csm8505140pjk.18.2023.05.13.05.12.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 05:12:36 -0700 (PDT) From: Nicholas Piggin To: skiboot@lists.ozlabs.org Date: Sat, 13 May 2023 22:12:23 +1000 Message-Id: <20230513121226.99723-2-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230513121226.99723-1-npiggin@gmail.com> References: <20230513121226.99723-1-npiggin@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH 1/4] ipmi: Fix potential infinite loop in sync_msg polling X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 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" Current gcc with -Os happens to generate code that re-loads the variable in the loop, but that could change without notice, and with -O2 it does infinite loop if sync_msg is !NULL, because it is not declared volatile and there is no compiler barrier in the loop. Add the usual cpu_relax() there to provide the compiler barrier. Signed-off-by: Nicholas Piggin Reviewed-by: Stewart Smith > --- core/ipmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/ipmi.c b/core/ipmi.c index bbc1a7b6..59aa95fc 100644 --- a/core/ipmi.c +++ b/core/ipmi.c @@ -170,7 +170,8 @@ void ipmi_queue_msg_sync(struct ipmi_msg *msg) } lock(&sync_lock); - while (sync_msg); + while (sync_msg) + cpu_relax(); sync_msg = msg; if (msg->backend->disable_retry && !opal_booting()) msg->backend->disable_retry(msg); From patchwork Sat May 13 12:12:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1780948 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=A1FxeJ5x; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QJPfQ5KG9z20KF for ; Sat, 13 May 2023 22:13:02 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4QJPfQ4G9Nz3c8v for ; Sat, 13 May 2023 22:13:02 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=A1FxeJ5x; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::1036; helo=mail-pj1-x1036.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=A1FxeJ5x; dkim-atps=neutral Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4QJPf10DGkz3bxY for ; Sat, 13 May 2023 22:12:41 +1000 (AEST) Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-24e2bbec3d5so7881847a91.3 for ; Sat, 13 May 2023 05:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683979960; x=1686571960; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4efrrqkouVHGuBun+KWu0DquKNhhg1Gcm03bOkAeMvA=; b=A1FxeJ5xdvrQZ70Qj/GN4NXbDFNh9AqG/J6CrtuaQQdn2OAZZ+03AX7cRMAgMc1rA2 YRNXJE4jzoC/q/DqTL6AFtrZfXw19uXvhX4zmBd4FE2p7+3coWrzvyN7MGzangeaKzUA 6CcIClxXj04ASouWaQ0L7XU2Gc5Wf0bg1RztPwIKA6SFgj09xNSrzK/8lM2Al6t9Qde8 TUS4Ggm7tVXP9ymLLNJ6mpdXiOzfpJRO0sncwfIZQhMIBn2dCG64VKbriZM55zkJjnsp b1hwmJenBcWKhwiJCIwungCpg+HU+ks99LT3S9f66xON9HsABWyk0CgwQi+embwA5gZB 8JiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683979960; x=1686571960; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4efrrqkouVHGuBun+KWu0DquKNhhg1Gcm03bOkAeMvA=; b=X4uOmYGFyfsn5L75yQ5M2OQrMCkx188yAIuWFqKUQiJO1PK8TnQ9ejSxLnQoO2HY7w XdZGRb8/sqIdMWr1PpT2W0EJ1hb32p6JxtbpSq4iIEhGSFQhI+yf6Y3JGRebkj1n5NW0 uxgvEgb5lVQoHsUhz3TAALb/NQOdwLXtsDMyZLjeROrOdpY9pasjdU6Q3GwB9IIEPvRf bQMGZlg+98UbzPFu6OP4lnrGqZIoNA7ZJXEDZa/16KlgkDB/0zgJTqKruixRnS1Fdckp Dcf240t7YZukPUH6qwv6bs0FBoFNLrKto+GIvDI4ULICM6lAKaDASzJpR592IzV2Jgkm 48zg== X-Gm-Message-State: AC+VfDzGlagSwXSkXyKpGpvtd0QF3L8L68htT/Nxj2DMiqa1PUQyHuF/ gZnaIn/PEkVyeZY1hbQthRiL//yrgkQ= X-Google-Smtp-Source: ACHHUZ75RAy35h7u1JnNsY/WzSXeOL0sFUYFgFDIww5wabLZfuJvS+8Z84tRuvbB6kLVLOeZlt8VtA== X-Received: by 2002:a17:90b:38cb:b0:252:b95c:a701 with SMTP id nn11-20020a17090b38cb00b00252b95ca701mr4789287pjb.32.1683979960084; Sat, 13 May 2023 05:12:40 -0700 (PDT) Received: from wheely.local0.net (203-221-165-68.tpgi.com.au. [203.221.165.68]) by smtp.gmail.com with ESMTPSA id v4-20020a17090a778400b00250aa8ef89csm8505140pjk.18.2023.05.13.05.12.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 05:12:39 -0700 (PDT) From: Nicholas Piggin To: skiboot@lists.ozlabs.org Date: Sat, 13 May 2023 22:12:24 +1000 Message-Id: <20230513121226.99723-3-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230513121226.99723-1-npiggin@gmail.com> References: <20230513121226.99723-1-npiggin@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH 2/4] platforms: Use astbmc_exit X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 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" Move all platforms using astbmc_init() to use astbmc_exit(). Move ipmi_set_boot_count() to astbmc_exit from ipmi_wdt_final_reset(). Signed-off-by: Nicholas Piggin --- hw/ipmi/ipmi-watchdog.c | 1 - platforms/astbmc/barreleye.c | 2 +- platforms/astbmc/common.c | 2 ++ platforms/astbmc/firestone.c | 2 +- platforms/astbmc/garrison.c | 2 +- platforms/astbmc/habanero.c | 2 +- platforms/astbmc/mihawk.c | 2 +- platforms/astbmc/p8dnu.c | 2 +- platforms/astbmc/p8dtu.c | 4 ++-- platforms/astbmc/p9dsu.c | 2 +- platforms/astbmc/palmetto.c | 2 +- platforms/astbmc/vesnin.c | 2 +- platforms/astbmc/zaius.c | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hw/ipmi/ipmi-watchdog.c b/hw/ipmi/ipmi-watchdog.c index dc0a9e5b..38fbff8c 100644 --- a/hw/ipmi/ipmi-watchdog.c +++ b/hw/ipmi/ipmi-watchdog.c @@ -200,7 +200,6 @@ void ipmi_wdt_final_reset(void) #else set_wdt(WDT_NO_ACTION, 100, 0, false, false); #endif - ipmi_set_boot_count(); } void ipmi_wdt_init(void) diff --git a/platforms/astbmc/barreleye.c b/platforms/astbmc/barreleye.c index f7542d66..ad51bd63 100644 --- a/platforms/astbmc/barreleye.c +++ b/platforms/astbmc/barreleye.c @@ -159,7 +159,7 @@ DECLARE_PLATFORM(barreleye) = { .elog_commit = ipmi_elog_commit, .start_preload_resource = flash_start_preload_resource, .resource_loaded = flash_resource_loaded, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .op_display = op_display_lpc, }; diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c index 83ef70ad..9ce22b38 100644 --- a/platforms/astbmc/common.c +++ b/platforms/astbmc/common.c @@ -502,6 +502,8 @@ void astbmc_early_init(void) void astbmc_exit(void) { ipmi_wdt_final_reset(); + + ipmi_set_boot_count(); } static const struct bmc_sw_config bmc_sw_ami = { diff --git a/platforms/astbmc/firestone.c b/platforms/astbmc/firestone.c index ae5603eb..c29dee09 100644 --- a/platforms/astbmc/firestone.c +++ b/platforms/astbmc/firestone.c @@ -143,7 +143,7 @@ DECLARE_PLATFORM(firestone) = { .elog_commit = ipmi_elog_commit, .start_preload_resource = flash_start_preload_resource, .resource_loaded = flash_resource_loaded, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .op_display = op_display_lpc, }; diff --git a/platforms/astbmc/garrison.c b/platforms/astbmc/garrison.c index e698e2f6..ddf1d747 100644 --- a/platforms/astbmc/garrison.c +++ b/platforms/astbmc/garrison.c @@ -278,7 +278,7 @@ DECLARE_PLATFORM(garrison) = { .elog_commit = ipmi_elog_commit, .start_preload_resource = flash_start_preload_resource, .resource_loaded = flash_resource_loaded, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .seeprom_update = astbmc_seeprom_update, .op_display = op_display_lpc, diff --git a/platforms/astbmc/habanero.c b/platforms/astbmc/habanero.c index b98ff896..92788a6f 100644 --- a/platforms/astbmc/habanero.c +++ b/platforms/astbmc/habanero.c @@ -133,7 +133,7 @@ DECLARE_PLATFORM(habanero) = { .elog_commit = ipmi_elog_commit, .start_preload_resource = flash_start_preload_resource, .resource_loaded = flash_resource_loaded, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .seeprom_update = astbmc_seeprom_update, .op_display = op_display_lpc, diff --git a/platforms/astbmc/mihawk.c b/platforms/astbmc/mihawk.c index 54c28841..e12b21b4 100644 --- a/platforms/astbmc/mihawk.c +++ b/platforms/astbmc/mihawk.c @@ -560,7 +560,7 @@ DECLARE_PLATFORM(mihawk) = { .cec_power_down = astbmc_ipmi_power_down, .cec_reboot = astbmc_ipmi_reboot, .elog_commit = ipmi_elog_commit, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .ocapi = &mihawk_ocapi, .npu2_device_detect = npu2_i2c_presence_detect, diff --git a/platforms/astbmc/p8dnu.c b/platforms/astbmc/p8dnu.c index e223d158..9d4a130a 100644 --- a/platforms/astbmc/p8dnu.c +++ b/platforms/astbmc/p8dnu.c @@ -337,7 +337,7 @@ DECLARE_PLATFORM(p8dnu) = { .elog_commit = ipmi_elog_commit, .start_preload_resource = flash_start_preload_resource, .resource_loaded = flash_resource_loaded, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .seeprom_update = astbmc_seeprom_update, .op_display = op_display_lpc, diff --git a/platforms/astbmc/p8dtu.c b/platforms/astbmc/p8dtu.c index a9d8dc06..e5703e38 100644 --- a/platforms/astbmc/p8dtu.c +++ b/platforms/astbmc/p8dtu.c @@ -249,7 +249,7 @@ DECLARE_PLATFORM(p8dtu1u) = { .elog_commit = ipmi_elog_commit, .start_preload_resource = flash_start_preload_resource, .resource_loaded = flash_resource_loaded, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .seeprom_update = astbmc_seeprom_update, .op_display = op_display_lpc, @@ -268,7 +268,7 @@ DECLARE_PLATFORM(p8dtu2u) = { .elog_commit = ipmi_elog_commit, .start_preload_resource = flash_start_preload_resource, .resource_loaded = flash_resource_loaded, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .seeprom_update = astbmc_seeprom_update, .op_display = op_display_lpc, diff --git a/platforms/astbmc/p9dsu.c b/platforms/astbmc/p9dsu.c index 5c9756ec..554b940b 100644 --- a/platforms/astbmc/p9dsu.c +++ b/platforms/astbmc/p9dsu.c @@ -719,7 +719,7 @@ DECLARE_PLATFORM(p9dsu1u) = { .cec_power_down = astbmc_ipmi_power_down, .cec_reboot = astbmc_ipmi_reboot, .elog_commit = ipmi_elog_commit, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .op_display = op_display_lpc, }; diff --git a/platforms/astbmc/palmetto.c b/platforms/astbmc/palmetto.c index 546d5119..b0d4da25 100644 --- a/platforms/astbmc/palmetto.c +++ b/platforms/astbmc/palmetto.c @@ -117,7 +117,7 @@ DECLARE_PLATFORM(palmetto) = { .elog_commit = ipmi_elog_commit, .start_preload_resource = flash_start_preload_resource, .resource_loaded = flash_resource_loaded, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .op_display = op_display_lpc, }; diff --git a/platforms/astbmc/vesnin.c b/platforms/astbmc/vesnin.c index f7e1844f..9ad5dccc 100644 --- a/platforms/astbmc/vesnin.c +++ b/platforms/astbmc/vesnin.c @@ -340,7 +340,7 @@ DECLARE_PLATFORM(vesnin) = { .elog_commit = ipmi_elog_commit, .start_preload_resource = flash_start_preload_resource, .resource_loaded = flash_resource_loaded, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .op_display = op_display_lpc, }; diff --git a/platforms/astbmc/zaius.c b/platforms/astbmc/zaius.c index f3807a00..a122c2d6 100644 --- a/platforms/astbmc/zaius.c +++ b/platforms/astbmc/zaius.c @@ -250,7 +250,7 @@ DECLARE_PLATFORM(zaius) = { .cec_power_down = astbmc_ipmi_power_down, .cec_reboot = astbmc_ipmi_reboot, .elog_commit = ipmi_elog_commit, - .exit = ipmi_wdt_final_reset, + .exit = astbmc_exit, .terminate = ipmi_terminate, .ocapi = &zaius_ocapi, .npu2_device_detect = npu2_i2c_presence_detect, From patchwork Sat May 13 12:12:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1780949 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=Vr4bljvI; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QJPfb28Csz20KF for ; Sat, 13 May 2023 22:13:11 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4QJPfb1MKKz3fP1 for ; Sat, 13 May 2023 22:13:11 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=Vr4bljvI; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::431; helo=mail-pf1-x431.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=Vr4bljvI; dkim-atps=neutral Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4QJPf53sCxz3cNF for ; Sat, 13 May 2023 22:12:45 +1000 (AEST) Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6439d505274so6718728b3a.0 for ; Sat, 13 May 2023 05:12:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683979963; x=1686571963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MP8YVjOthJ+CZkE032FK8sAlEslxZRdVXOfoRaoO5DQ=; b=Vr4bljvIPFEvyoldxqS8DWeBubNGVuWLsUV/ZoW+/6NgiRjd3zJXrbDFT6w4T5c9g4 K6R684Vgi2BvHe0fIDu0gCo6eebdqsGReZZClyqIti5VPsgFmFR4UoLZWnJ64+iwo/j4 2irJuTwi1psyn0PYMG9rEc1dreReqFJ6w8E56xwQV97VWUNNp47Nlw7f9TBQgVkpcSfb AdWbEMXzcTaWxGgPuFK7Mkfoz9hzc3mG5cdyHxAF45nMZXBmV8tZz2Ww3t+0Vr5iC9Sp uRO+jQLIIX8L2pHF2BDTbzxbYmLmTxXsrmqlJJzYSaWyYyCktsmMu7o3bLGqTW/xoydu 0ddQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683979963; x=1686571963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MP8YVjOthJ+CZkE032FK8sAlEslxZRdVXOfoRaoO5DQ=; b=MVwx8HTkZjnEg9OwLm9sM8X3ZAzqTsXQ6qxVzc2ZRnaB25ZHH0/25z3TSYtTbc//4v vyYTO8vBWYi9mUTnhd84UJJaIrQjJy4Ft8shvPuH8khzbqr/4C0hA1Q7RRzf3f1Ee4/a dN1nSXlZbV14vGszgaZAuzvDwAufXw07iEHL8bxOwbtAYrtb/prT6A9MwVVdnOPMhNWN /Dq0PZjSVfnNiIcRtzuBod3NkD51NJo8LgYHh18wULE0/8WwDHbls3geS8nc6YH9l+q+ cuMLCpoiQ5L2xqwjzOhs0Hbd/sdIUgNyvcR+251TQbWRL4bmYa6+6Ak8IqKzADtfRiel TCjQ== X-Gm-Message-State: AC+VfDyh6vD/vZHrrLwPsKgkSFSTxxbM+XzJVBIsJRoM0Cz1xH2pmLpk WxH1Ds/n7V7vIPptGkyIgHei3ymws+Y= X-Google-Smtp-Source: ACHHUZ4S0OSxOjDYYBoUn3kh9psE4Es2htirLf7KkdNB1UqyXVJIn7NYGzzpoOTYXR6xhFcDZlWqfA== X-Received: by 2002:a05:6a20:7283:b0:102:dd98:509b with SMTP id o3-20020a056a20728300b00102dd98509bmr16352960pzk.21.1683979962867; Sat, 13 May 2023 05:12:42 -0700 (PDT) Received: from wheely.local0.net (203-221-165-68.tpgi.com.au. [203.221.165.68]) by smtp.gmail.com with ESMTPSA id v4-20020a17090a778400b00250aa8ef89csm8505140pjk.18.2023.05.13.05.12.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 05:12:42 -0700 (PDT) From: Nicholas Piggin To: skiboot@lists.ozlabs.org Date: Sat, 13 May 2023 22:12:25 +1000 Message-Id: <20230513121226.99723-4-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230513121226.99723-1-npiggin@gmail.com> References: <20230513121226.99723-1-npiggin@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH 3/4] ipmi: flush the ipmi message queue before booting a kernel X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 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" Bring ipmi to a consistent state before booting a kernel by flushing all outstanding messages. The OS may not start kicking the IPMI state machine for some time. For example, without this change, when booting in QEMU, the IPMI command issued by ipmi_wdt_final_reset() to disable the watchdog is not sent to the BMC before the OS boots, effectively leaving the watchdog enabled until the OS begins to drive OPAL pollers. Signed-off-by: Nicholas Piggin Reviewed-by: Stewart Smith > --- core/ipmi.c | 11 ++++++++++- hw/bt.c | 7 ++++++- hw/fsp/fsp-ipmi.c | 12 ++++++++++-- include/ipmi.h | 7 ++++++- platforms/astbmc/common.c | 6 ++++++ platforms/ibm-fsp/common.c | 6 ++++++ 6 files changed, 44 insertions(+), 5 deletions(-) diff --git a/core/ipmi.c b/core/ipmi.c index 59aa95fc..673aa0c9 100644 --- a/core/ipmi.c +++ b/core/ipmi.c @@ -159,7 +159,7 @@ void ipmi_cmd_done(uint8_t cmd, uint8_t netfn, uint8_t cc, struct ipmi_msg *msg) void ipmi_queue_msg_sync(struct ipmi_msg *msg) { - void (*poll)(void) = msg->backend->poll; + bool (*poll)(void) = msg->backend->poll; if (!ipmi_present()) return; @@ -192,6 +192,15 @@ void ipmi_queue_msg_sync(struct ipmi_msg *msg) } } +void ipmi_flush(void) +{ + if (!ipmi_present()) + return; + + while (ipmi_backend->poll()) + time_wait_ms(10); +} + static void ipmi_read_event_complete(struct ipmi_msg *msg) { prlog(PR_DEBUG, "IPMI read event %02x complete: %d bytes. cc: %02x\n", diff --git a/hw/bt.c b/hw/bt.c index 5016feab..1912cd3a 100644 --- a/hw/bt.c +++ b/hw/bt.c @@ -519,9 +519,14 @@ static void bt_poll(struct timer *t __unused, void *data __unused, bt.irq_ok ? TIMER_POLL : msecs_to_tb(BT_DEFAULT_POLL_MS)); } -static void bt_ipmi_poll(void) +static bool bt_ipmi_poll(void) { + if (!lpc_ok()) + return false; + bt_poll(NULL, NULL, mftb()); + + return bt.queue_len > 0; } static void bt_add_msg(struct bt_msg *bt_msg) diff --git a/hw/fsp/fsp-ipmi.c b/hw/fsp/fsp-ipmi.c index e368c282..9e600f3f 100644 --- a/hw/fsp/fsp-ipmi.c +++ b/hw/fsp/fsp-ipmi.c @@ -243,14 +243,22 @@ static int fsp_ipmi_dequeue_msg(struct ipmi_msg *ipmi_msg) return 0; } + +static bool fsp_ipmi_poll(void) +{ + /* fsp_opal_poll poller checks command responses */ + opal_run_pollers(); + + return !list_empty(&fsp_ipmi.msg_queue); +} + static struct ipmi_backend fsp_ipmi_backend = { .alloc_msg = fsp_ipmi_alloc_msg, .free_msg = fsp_ipmi_free_msg, .queue_msg = fsp_ipmi_queue_msg, .queue_msg_head = fsp_ipmi_queue_msg_head, .dequeue_msg = fsp_ipmi_dequeue_msg, - /* FIXME if ever use ipmi_queue_msg_sync on FSP */ - .poll = NULL, + .poll = fsp_ipmi_poll, }; static bool fsp_ipmi_rr_notify(uint32_t cmd_sub_mod, diff --git a/include/ipmi.h b/include/ipmi.h index 3e629ba4..5b7efd1e 100644 --- a/include/ipmi.h +++ b/include/ipmi.h @@ -178,8 +178,10 @@ struct ipmi_backend { * * So, ensure we have a way to drive any state machines that an IPMI * backend may neeed to crank to ensure forward progress. + * + * This returns true while there are any messages queued. */ - void (*poll)(void); + bool (*poll)(void); }; extern struct ipmi_backend *ipmi_backend; @@ -220,6 +222,9 @@ void ipmi_queue_msg_sync(struct ipmi_msg *msg); /* Removes the message from the list, queued previously */ int ipmi_dequeue_msg(struct ipmi_msg *msg); +/* Polls the backend until all queued messages are completed */ +void ipmi_flush(void); + /* Process a completed message */ void ipmi_cmd_done(uint8_t cmd, uint8_t netfn, uint8_t cc, struct ipmi_msg *msg); diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c index 9ce22b38..bfbba2d5 100644 --- a/platforms/astbmc/common.c +++ b/platforms/astbmc/common.c @@ -504,6 +504,12 @@ void astbmc_exit(void) ipmi_wdt_final_reset(); ipmi_set_boot_count(); + + /* + * Booting into an OS that may not call back into skiboot for + * some time. Ensure all IPMI messages are processed first. + */ + ipmi_flush(); } static const struct bmc_sw_config bmc_sw_ami = { diff --git a/platforms/ibm-fsp/common.c b/platforms/ibm-fsp/common.c index 4a723b25..f289d1f2 100644 --- a/platforms/ibm-fsp/common.c +++ b/platforms/ibm-fsp/common.c @@ -186,6 +186,12 @@ void ibm_fsp_exit(void) /* Clear SRCs on the op-panel when Linux starts */ op_panel_clear_src(); + + /* + * Booting into an OS that may not call back into skiboot for + * some time. Ensure all IPMI messages are processed first. + */ + ipmi_flush(); } int64_t ibm_fsp_cec_reboot(void) From patchwork Sat May 13 12:12:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1780950 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=pFqnrJCB; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QJPfm3R9Jz20KF for ; Sat, 13 May 2023 22:13:20 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4QJPfm2LpJz3cdw for ; Sat, 13 May 2023 22:13:20 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=pFqnrJCB; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::535; helo=mail-pg1-x535.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=pFqnrJCB; dkim-atps=neutral Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4QJPf82FHtz3fN5 for ; Sat, 13 May 2023 22:12:48 +1000 (AEST) Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-517bdc9e81dso5737571a12.1 for ; Sat, 13 May 2023 05:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683979966; x=1686571966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UbJFgjcrsPTAROPOfCEl2c2/7YNhuRHPByENH45pI58=; b=pFqnrJCBmKsPcw/yRtWS/ZTwZ9/aX0N6haDQyALNIfSEBlOHXnhB9HAn4sf6JoSVpd KpUehoMM3Pup8pzKlAIFq6b69YLY/UwLDs2y1cFQFclOo/ZoEPnkVld/tbvcPoH1XVl9 vzXJnszZuxACHfT4IlziX8nr0k9yw7zh1ibPn0xXp1QmJZ2eYvClt0jCBYF/9s2i4ciT dnO63PX6xaYlb3gFYIDd5JBx1WW/g2wYSoVAMQQcmnzPd/BD7Zuxvv94Mf5QjpCm9rIF xlZ4q24jlQIiiiLZa2kWdCxcbon4dEas5U7FRdvH4QJ/BEkGK4cBLTqaqLlcKJkXQk3C 5DTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683979966; x=1686571966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UbJFgjcrsPTAROPOfCEl2c2/7YNhuRHPByENH45pI58=; b=DPCjk+DHfwQsmdWTo+LHfNg3hkqX4vsvjR7/CAMKKQuxD1e/M/eOi920Bh9Dni+OSs IcGsLZXMeGBq2K+beVSFrsck3trxhGY/Y6kFCYjUhAZKadeTXCibtO9MM3iOTyHsLVWh c2Z6Wb5zQvnV/ubC4WsrWwuYj1B5KdtF5zDQa21BYjox09yqlAwMF/FztqtHjYuMIYh1 ce6I47qruT0Po4RdqOl9VIFpamug6m0y1EjMYRoK5nrnktO+KIp/+PwZ7SNcU+g/hT8o cmgRAYMhLbPSBDVwz8DtZj3FS4Pg3mFE5blfW3VFS6KzTYh8tCKL7h3CdmNLAFURdiu3 v/6w== X-Gm-Message-State: AC+VfDzi23/FiMSkELqiZ0mjqggmK+mHgjksXHlJ6KRqNjPAlI+yMlcT RUKs2i/pt6ZS9gPWiAOLG+pSS4+01hQ= X-Google-Smtp-Source: ACHHUZ6jUwzx/a4YXwpCCCA7JekkkjyFlywJ6AXt7EJ5qpLwmgEDbxv57dExWpWLAZr+PMWNIoR+Nw== X-Received: by 2002:a17:90a:f0c8:b0:250:46b3:547e with SMTP id fa8-20020a17090af0c800b0025046b3547emr25563151pjb.14.1683979965822; Sat, 13 May 2023 05:12:45 -0700 (PDT) Received: from wheely.local0.net (203-221-165-68.tpgi.com.au. [203.221.165.68]) by smtp.gmail.com with ESMTPSA id v4-20020a17090a778400b00250aa8ef89csm8505140pjk.18.2023.05.13.05.12.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 05:12:45 -0700 (PDT) From: Nicholas Piggin To: skiboot@lists.ozlabs.org Date: Sat, 13 May 2023 22:12:26 +1000 Message-Id: <20230513121226.99723-5-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230513121226.99723-1-npiggin@gmail.com> References: <20230513121226.99723-1-npiggin@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH 4/4] ipmi: remove unused OS watchdog support X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 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" This code hasn't been enabled, remove it. Signed-off-by: Nicholas Piggin --- core/ipmi.c | 11 ----------- hw/ipmi/ipmi-watchdog.c | 25 ------------------------- include/ipmi.h | 3 --- 3 files changed, 39 deletions(-) diff --git a/core/ipmi.c b/core/ipmi.c index 673aa0c9..2b1bb1ca 100644 --- a/core/ipmi.c +++ b/core/ipmi.c @@ -220,17 +220,6 @@ static void ipmi_get_message_flags_complete(struct ipmi_msg *msg) prlog(PR_DEBUG, "IPMI Get Message Flags: %02x\n", flags); - /* Once we see an interrupt we assume the payload has - * booted. We disable the wdt and let the OS setup its own - * wdt. - * - * This is also where we consider the OS to be booted, so we set - * the boot count sensor */ - if (flags & IPMI_MESSAGE_FLAGS_WATCHDOG_PRE_TIMEOUT) { - ipmi_wdt_stop(); - ipmi_set_boot_count(); - } - /* Message available in the event buffer? Queue a Read Event command * to retrieve it. The flag is cleared by performing a read */ if (flags & IPMI_MESSAGE_FLAGS_EVENT_BUFFER) { diff --git a/hw/ipmi/ipmi-watchdog.c b/hw/ipmi/ipmi-watchdog.c index 38fbff8c..40882e16 100644 --- a/hw/ipmi/ipmi-watchdog.c +++ b/hw/ipmi/ipmi-watchdog.c @@ -43,7 +43,6 @@ more frequently than necessary. */ #define WDT_MARGIN 300 static struct timer wdt_timer; -static bool wdt_stopped; static bool wdt_ticking; /* Saved values from the last watchdog set action */ @@ -161,23 +160,6 @@ static void reset_wdt(struct timer *t __unused, void *data, } } -void ipmi_wdt_stop(void) -{ - if (!wdt_stopped) { - /* Make sure the background reset timer is disabled before - * stopping the watchdog. If we issue a reset after disabling - * the timer, it will be re-enabled. */ - wdt_ticking = false; - cancel_timer(&wdt_timer); - - /* Configure the watchdog to be disabled and do no action - * in case the underlying implementation is buggy and times - * out anyway. */ - wdt_stopped = true; - set_wdt(WDT_NO_ACTION, 100, 0, false, false); - } -} - void ipmi_wdt_final_reset(void) { /* We can safely stop the timer prior to setting up our final @@ -192,14 +174,7 @@ void ipmi_wdt_final_reset(void) * can catch up in their development environments. * If you still read this after 2018, send a patch! */ -#if 0 - /* Configure the watchdog and make sure it is still enabled */ - set_wdt(WDT_RESET_ACTION | WDT_PRETIMEOUT_SMI, WDT_TIMEOUT, - WDT_MARGIN/10, true, true); - sync_reset_wdt(); -#else set_wdt(WDT_NO_ACTION, 100, 0, false, false); -#endif } void ipmi_wdt_init(void) diff --git a/include/ipmi.h b/include/ipmi.h index 5b7efd1e..d751e7a1 100644 --- a/include/ipmi.h +++ b/include/ipmi.h @@ -269,9 +269,6 @@ void ipmi_parse_sel(struct ipmi_msg *msg); /* Starts the watchdog timer */ void ipmi_wdt_init(void); -/* Stop the wdt */ -void ipmi_wdt_stop(void); - /* Reset the watchdog timer. Does not return until the timer has been * reset and does not schedule future resets. */ void ipmi_wdt_final_reset(void);