From owner-svn-src-head@freebsd.org Wed Jun 24 19:51:04 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3AF283421A2; Wed, 24 Jun 2020 19:51:04 +0000 (UTC) (envelope-from markj@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49sYfw0s4fz42K9; Wed, 24 Jun 2020 19:51:04 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 189D3170CE; Wed, 24 Jun 2020 19:51:04 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05OJp36F095922; Wed, 24 Jun 2020 19:51:03 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05OJp3Bi095920; Wed, 24 Jun 2020 19:51:03 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202006241951.05OJp3Bi095920@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 24 Jun 2020 19:51:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362592 - in head: share/man/man4 sys/dev/acpi_support X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head: share/man/man4 sys/dev/acpi_support X-SVN-Commit-Revision: 362592 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2020 19:51:04 -0000 Author: markj Date: Wed Jun 24 19:51:03 2020 New Revision: 362592 URL: https://svnweb.freebsd.org/changeset/base/362592 Log: acpi_ibm(4): Rename disengaged mode to unthrottled mode. This mode was added in r362496. Rename it to make the meaning more clear. PR: 247306 Suggested by: rpokala Submitted by: Ali Abdallah MFC with: r362496 Modified: head/share/man/man4/acpi_ibm.4 head/sys/dev/acpi_support/acpi_ibm.c Modified: head/share/man/man4/acpi_ibm.4 ============================================================================== --- head/share/man/man4/acpi_ibm.4 Wed Jun 24 18:51:01 2020 (r362591) +++ head/share/man/man4/acpi_ibm.4 Wed Jun 24 19:51:03 2020 (r362592) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 19, 2020 +.Dd June 24, 2020 .Dt ACPI_IBM 4 .Os .Sh NAME @@ -293,7 +293,7 @@ is not set accordingly. .It Va dev.acpi_ibm.0.fan_level Indicates at what speed the fan should run when being in manual mode. Valid values range from 0 (off) to 7 (max) and 8. -Level 8 is used by the driver to set the fan in disengaged mode. +Level 8 is used by the driver to set the fan in unthrottled mode. In this mode, the fan is set to spin freely and will quickly reach a very high speed. Use this mode only if absolutely necessary, e.g., if the system has reached its @@ -311,7 +311,7 @@ off .It Li 6, 7 ~4300 RPM .It Li 8 -~6400 RPM (Full-speed, disengaged) +~6400 RPM (Full-speed, unthrottled) .El .It Va dev.acpi_ibm.0.fan_speed (read-only) Modified: head/sys/dev/acpi_support/acpi_ibm.c ============================================================================== --- head/sys/dev/acpi_support/acpi_ibm.c Wed Jun 24 18:51:01 2020 (r362591) +++ head/sys/dev/acpi_support/acpi_ibm.c Wed Jun 24 19:51:03 2020 (r362592) @@ -106,7 +106,7 @@ ACPI_MODULE_NAME("IBM") #define IBM_EC_MASK_MUTE (1 << 6) #define IBM_EC_FANSTATUS 0x2F #define IBM_EC_MASK_FANLEVEL 0x3f -#define IBM_EC_MASK_FANDISENGAGED (1 << 6) +#define IBM_EC_MASK_FANUNTHROTTLED (1 << 6) #define IBM_EC_MASK_FANSTATUS (1 << 7) #define IBM_EC_FANSPEED 0x84 @@ -265,7 +265,7 @@ static struct { .name = "fan_level", .method = ACPI_IBM_METHOD_FANLEVEL, .description = "Fan level, 0-7 (recommended max), " - "8 (disengaged, full-speed)", + "8 (unthrottled, full-speed)", }, { .name = "fan", @@ -831,7 +831,7 @@ acpi_ibm_sysctl_get(struct acpi_ibm_softc *sc, int met */ if (!sc->fan_handle) { ACPI_EC_READ(sc->ec_dev, IBM_EC_FANSTATUS, &val_ec, 1); - if (val_ec & IBM_EC_MASK_FANDISENGAGED) + if (val_ec & IBM_EC_MASK_FANUNTHROTTLED) val = 8; else val = val_ec & IBM_EC_MASK_FANLEVEL; @@ -924,11 +924,11 @@ acpi_ibm_sysctl_set(struct acpi_ibm_softc *sc, int met /* Read the current fan status. */ ACPI_EC_READ(sc->ec_dev, IBM_EC_FANSTATUS, &val_ec, 1); val = val_ec & ~(IBM_EC_MASK_FANLEVEL | - IBM_EC_MASK_FANDISENGAGED); + IBM_EC_MASK_FANUNTHROTTLED); if (arg == 8) - /* Full speed, set the disengaged bit. */ - val |= 7 | IBM_EC_MASK_FANDISENGAGED; + /* Full speed, set the unthrottled bit. */ + val |= 7 | IBM_EC_MASK_FANUNTHROTTLED; else val |= arg;