From nobody Thu Mar 24 00:50:29 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 23CBB1A20FAD; Thu, 24 Mar 2022 00:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KP68Q0VLVz3wHP; Thu, 24 Mar 2022 00:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648083030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tj0WjZHZ933/H6ZPbnYgaj2ebvEsP+TCQe/TsXc5cDE=; b=h/w+U0en7RZgrart+zkhTuEQhcCNEdgvAFH4fpXuR1z28mjEarVPWIzBkRqrpFQS3uz9Gz 1JVx23/9UNYzvbqFUNM7GJKYuFbIGvTJMFKsMQ2mHa7gi/yBz4vBeVt1R5kmnDCPzzT8eX yuiIXtUpy3ucClQUB3zPJNRH2g4UFlq3Cl2BsCWdrtYjrXwOtTIgF2mKgGOe7RSU8aeAAL Ke8MoKfjJiJexoDTosfm6I5yakd0RI7hfEgn5Jox4t4duW5AF069nYVaIN5ptLKmUrucOE v/o9LBIEXog43A/LKPpSir6f6nb5IPZk42VWV+q0yWG5eJNkACnbX8FEaJ9FCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E4F575960; Thu, 24 Mar 2022 00:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22O0oTeA022118; Thu, 24 Mar 2022 00:50:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22O0oTGR022117; Thu, 24 Mar 2022 00:50:29 GMT (envelope-from git) Date: Thu, 24 Mar 2022 00:50:29 GMT Message-Id: <202203240050.22O0oTGR022117@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: c79ba1401252 - stable/13 - ipmi: Make all sysctls also tunables. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c79ba1401252a6e8624693c76138b17956d14917 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648083030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tj0WjZHZ933/H6ZPbnYgaj2ebvEsP+TCQe/TsXc5cDE=; b=EtRdoxMzTMn4xpoAFZkKrNATHVFY6cXuabZtySdo4uTLLM6gI2Y0JJr1LXe/udnteXdbwb 55sZbyiJSKU0iro8xKEvcUWIJIG1G74fbAfEg3/5ixhITtDvMDlKgogDeGx+0s6ugviQ00 6hLpvDuFrtOrtcUmch6hWlcS1ndIzm3cj2ixo0CNErry6zpa8yuZBhUmr/b4361UMwdnIl XAPFnxS5Zrr2WoV1DddZORnBnWs+sKqLK3+iSAnWge5dz5UVgQZBSdOnoky8AqdNwvLI5/ H/NII5VsT9T0d4ZROI8PHUvLnpIrSAHIHL2KzHcBGagFne+ZWWirrW75TkAUvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648083030; a=rsa-sha256; cv=none; b=XreaOn181B1XQOC/nzCtHeH913hAUDQrhYeK89jDNFB8/kpoTJsP78bh20AyfynnogWaFC 35CVFQpm+5UNFcKaV9w1YzqEU6ECsrwoAZQlqTsAe5s6J/LygLYWBNm8uHHaJdQsZoSJn7 FCE6V7XyxuFUWn0yzFVGgD6o+QelRiKpKjwehbdckhZrjdzanaTIK/X//0vbM/a4I5pxv+ OdaGhtxQz52hKBX3MBVz6puHhIXWWVCglcH5i6a1q8LE71WjDIBPTJiGBtxFS+wJa3rpyf VL9rAjgC19BTCGi1P59PVh8wTROehOeGCqGzAyL54XHglyEhX+aq6+WgQOiHCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=c79ba1401252a6e8624693c76138b17956d14917 commit c79ba1401252a6e8624693c76138b17956d14917 Author: Alexander Motin AuthorDate: 2022-03-17 17:32:46 +0000 Commit: Alexander Motin CommitDate: 2022-03-24 00:50:25 +0000 ipmi: Make all sysctls also tunables. MFC after: 1 week (cherry picked from commit 016d18229c6bd81891f47086bf4eec366a7c3cea) --- sys/dev/ipmi/ipmi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c index a8f3e7f1be10..3a9fb80fc208 100644 --- a/sys/dev/ipmi/ipmi.c +++ b/sys/dev/ipmi/ipmi.c @@ -104,16 +104,16 @@ SYSCTL_INT(_hw_ipmi, OID_AUTO, on, CTLFLAG_RWTUN, &on, 0, ""); SYSCTL_INT(_hw_ipmi, OID_AUTO, wd_init_enable, CTLFLAG_RWTUN, &wd_init_enable, 1, "Enable watchdog initialization"); -SYSCTL_INT(_hw_ipmi, OID_AUTO, wd_timer_actions, CTLFLAG_RW, +SYSCTL_INT(_hw_ipmi, OID_AUTO, wd_timer_actions, CTLFLAG_RWTUN, &wd_timer_actions, 0, "IPMI watchdog timer actions (including pre-timeout interrupt)"); -SYSCTL_INT(_hw_ipmi, OID_AUTO, wd_shutdown_countdown, CTLFLAG_RW, +SYSCTL_INT(_hw_ipmi, OID_AUTO, wd_shutdown_countdown, CTLFLAG_RWTUN, &wd_shutdown_countdown, 0, "IPMI watchdog countdown for shutdown (seconds)"); SYSCTL_INT(_hw_ipmi, OID_AUTO, wd_startup_countdown, CTLFLAG_RDTUN, &wd_startup_countdown, 0, "IPMI watchdog countdown initialized during startup (seconds)"); -SYSCTL_INT(_hw_ipmi, OID_AUTO, wd_pretimeout_countdown, CTLFLAG_RW, +SYSCTL_INT(_hw_ipmi, OID_AUTO, wd_pretimeout_countdown, CTLFLAG_RWTUN, &wd_pretimeout_countdown, 0, "IPMI watchdog pre-timeout countdown (seconds)"); SYSCTL_INT(_hw_ipmi, OID_AUTO, cyle_wait, CTLFLAG_RWTUN, @@ -944,7 +944,6 @@ ipmi_startup(void *arg) * disabled, clear any existing watchdog. */ if (on && wd_startup_countdown > 0) { - wd_timer_actions = IPMI_SET_WD_ACTION_POWER_CYCLE; if (ipmi_set_watchdog(sc, wd_startup_countdown) == 0 && ipmi_reset_watchdog(sc) == 0) { sc->ipmi_watchdog_active = wd_startup_countdown;