From nobody Mon May 15 20:52:24 2023 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 4QKs4m58n9z4B4tj; Mon, 15 May 2023 20:52:24 +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 4QKs4m4jfBz4Mlk; Mon, 15 May 2023 20:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684183944; 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=zsxsj24Jdp+o9PCNAnNoiCmddzw0MzVeq17aLqmnju8=; b=yib7gZ8b5gch+UEwlm2kIomiFeuuPdXCDhDFYv38XPt3tuhq/QjjSgLZ8jg16S1yl8z+Et f//tChTZlwwTzn+O2R3UEB6IUomDms3fgMv59C8fHEan9qlw76ha8a4GRkiQwiFFY/6Ejm 2JtNX3MLUXtAjx8ACSGZUsSg8JW0yp5IO8Z10t3MP+F8ujPo3UgHNwXES191UcY9gwjgSY fP1LyB2Cae3Gq2jDe9LbrpvboRqPXItRIcBMf285lL6v3mzxyn+e7QpBkvnYlHQ7oVL5SQ p+PcdVHMeT5kmPgGX0f4BYBb5A+vtDlh0JgHfbdodkdlx26mlV9BiKx8/lkwZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684183944; 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=zsxsj24Jdp+o9PCNAnNoiCmddzw0MzVeq17aLqmnju8=; b=QO9fGaURFc5OGsf1q6M9O80wj6oeaWBUHhKnuKY04xhHFzTNm4wXLQbe2jC+4/541v3OB9 MIpBFDuoHNi2XKY/lIdR2fX02RtorEhibocciEEYwBv69dyhataReNTJekUhRFmVYbCC9R EXg+jG8MNh39txULJ4CHEKeCZYMO80uryzF5oJZ/nFlr52fSaEEwqSv4+ujecbHnlaHqAp hymiiLtRCEryWt/B/wa4Wv5BiVhvQ942HxmYIBmdFrue9Mkqd/np1KO93teifGsy+nVEd8 0yh3AVfA75PGjaSjMWhT6KjrJ+DJWNBKxFvYN9Ko46iYhxqMiOceaRPRf35Phw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684183944; a=rsa-sha256; cv=none; b=I9sbLuM8Kt87Oj9XZXu88s54Zo5ixf0EmIuFY9rF5l1rJqeQC/6CCk6VIRL4Pn81IA1JaI B2/aPGP65iccCa/dsNFlrS+MA4pMfwivx4xO8nlXR3NcglkPIPiMXAADw96GDm+133ogs1 ozAYyee6Mll5upkt/6dtry4hYtgZwW91UStTkelmeDUshsMrLf9jn5/BMk2V3l/o3pEwvh /kDBuVvlukE6Jz3LDq0OARfIcd7M9bEqTVRmf7vMUpe0uUL0MeIg0So2hIGu4Wvs4U/GuN FsZYPaCzdxJ7pBNEcjBa13Thi9tj40P+YtQ88pPl6Scl1Zz3XFUlI3hKZ7IGJA== 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 4QKs4m3nhKzvl1; Mon, 15 May 2023 20:52:24 +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 34FKqOof079255; Mon, 15 May 2023 20:52:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34FKqOU6079254; Mon, 15 May 2023 20:52:24 GMT (envelope-from git) Date: Mon, 15 May 2023 20:52:24 GMT Message-Id: <202305152052.34FKqOU6079254@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: f409f11bc556 - main - nvmecontrol: Fix power subcommand output. 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/main X-Git-Reftype: branch X-Git-Commit: f409f11bc556e6da4c4cdb9f20a2ba3b0977fb32 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f409f11bc556e6da4c4cdb9f20a2ba3b0977fb32 commit f409f11bc556e6da4c4cdb9f20a2ba3b0977fb32 Author: Alexander Motin AuthorDate: 2023-05-15 20:48:50 +0000 Commit: Alexander Motin CommitDate: 2023-05-15 20:48:50 +0000 nvmecontrol: Fix power subcommand output. The returned value consists of two fields. Report them separately. MFC after: 2 weeks --- sbin/nvmecontrol/power.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbin/nvmecontrol/power.c b/sbin/nvmecontrol/power.c index 47ebc9c8c153..c6d7ad5455ff 100644 --- a/sbin/nvmecontrol/power.c +++ b/sbin/nvmecontrol/power.c @@ -137,7 +137,8 @@ power_show(int fd) if (nvme_completion_is_error(&pt.cpl)) errx(EX_IOERR, "set feature power mgmt request returned error"); - printf("Current Power Mode is %d\n", pt.cpl.cdw0); + printf("Current Power State is %d\n", pt.cpl.cdw0 & 0x1F); + printf("Current Workload Hint is %d\n", pt.cpl.cdw0 >> 5); } static void @@ -189,7 +190,7 @@ static const struct opts power_opts[] = { OPT("power", 'p', arg_uint32, opt, power, "Set the power state"), OPT("workload", 'w', arg_uint32, opt, workload, - "Set the workload"), + "Set the workload hint"), { NULL, 0, arg_none, NULL, NULL } }; #undef OPT