From nobody Thu Mar 17 17:34:19 2022 X-Original-To: dev-commits-src-main@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 9C84F1A2CACF; Thu, 17 Mar 2022 17:34:19 +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 4KKDlv3zfbz4ZDw; Thu, 17 Mar 2022 17:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647538459; 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=qZXJIY3aCTlp2El8dzv/mKc0UU4FM8mPZuCRhTBg7z8=; b=m4AtN+ksMC6pF6/wtA+NxLGOq3cSGDOEEF7nhfvOpb/ALW6z1T0Iu44Txyx1S0K5MutyL+ Sex8b8siJiZlGrdH5QG1Y5I90LH/IysNWvhOLTsqCs/L1FJW1UIdJVjt2G6fyhqpXNBsNN bu5n9wwzyt4yRW9F3fLci27mDnL7QBLGtDbqPy2LZhK08gKCrEPmdWJLUeXRIjIvovM4fA JpmkVixaWIxsbJT197E+gPawFVPH9dcDyS0Q6Z3fD4dqS0hstUDHi4h2c+tN6HI33G7FRY cyU8/mb75ZuIi9Tg4DBPXm6lXE9MqpxfqhZxKxikDrZoGQjBfKn3zWqAyU4OHg== 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 68BE87090; Thu, 17 Mar 2022 17:34:19 +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 22HHYJQK099723; Thu, 17 Mar 2022 17:34:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HHYJie099722; Thu, 17 Mar 2022 17:34:19 GMT (envelope-from git) Date: Thu, 17 Mar 2022 17:34:19 GMT Message-Id: <202203171734.22HHYJie099722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 016d18229c6b - main - ipmi: Make all sysctls also tunables. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 016d18229c6bd81891f47086bf4eec366a7c3cea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647538459; 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=qZXJIY3aCTlp2El8dzv/mKc0UU4FM8mPZuCRhTBg7z8=; b=sQci777zSEkUyfXXWoUdZovvmZm46LZ8+VvqiDMQ5LTbuVBDwBx/KzaBV5pDqqlTUUOYvM asuXTU7TyB2OJbxA0ba+5orog0BvUSqvXzUP0Vz+Wy9PdrsZpqnmlgi3g+CzKWfFn61DoI xd2lTuNFQJbEgLvmGS2pZvaJMnPze4mVdE+87wq+dQeYtbSRadBNnJYX4lhupGYAmndH6q 2V4L1GZ3vPQJhHoR+SUYxnSOm4qnlGgmmdcbjAJeFkxEXxwnKvSK2crcyKir0E9gbEIKE0 LXXWG1ewJdb5GsUoCOW9A1Md4omyXH9h+LB2LczDbwKrqtB2ju/5mXy4X11+Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647538459; a=rsa-sha256; cv=none; b=m2Q5qSbDvlvWjs6c1XBUbR9DdpTuZL7EiEIhtU3xL5RNH02j6jz/k9X3RI56tWhF3R+lKK JW/KCF9Sw3XoXp0XrsEmprH/jI8vEntyWAIyoK4jJ3DpBquYkM6pcAiBiM32QVu2Qi1noF z40sslJxJRFduU+9i1oy14ngaNce/OjJzCWvLp6XPRj7NfZ/DKXP3jQGuYMKASEWPL/tDZ VVLS/7C4BnjfR50V4unjxiDGOh78gfS8i2EVOO0jsW5/ngMR0sKYdS7F3jHYT9JQJor4pa TVhMf0+lQyZnkE4ShBfWC/h9/inYkzTuj/gKy1qJZOL/nsOxHIMdN+L8tVoioA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=016d18229c6bd81891f47086bf4eec366a7c3cea commit 016d18229c6bd81891f47086bf4eec366a7c3cea Author: Alexander Motin AuthorDate: 2022-03-17 17:32:46 +0000 Commit: Alexander Motin CommitDate: 2022-03-17 17:34:15 +0000 ipmi: Make all sysctls also tunables. MFC after: 1 week --- 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;