From nobody Mon May 29 00:56:11 2023 X-Original-To: dev-commits-src-branches@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 4QTxt35hVfz4Y7Jt; Mon, 29 May 2023 00:56:11 +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 4QTxt351Gcz3HcQ; Mon, 29 May 2023 00:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685321771; 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=UGdPGkSuQDh7Eoo9NKxH3B/fMQiFf47HfZmwPvAGOms=; b=jbCbw0sKfC4eXSZplVgwnnsQQo93hW0KTTmWOWkhXPbblexUrf7w8odAGSrsCqBtPGbtzS jD4PWfLPrwLZCm5qr1H3IMnyxzyLHo2fzwdbs6ruABUPynQJqNVqVZLy2NqD5TnAi0XzRf 9fpc+b86109Ul276kBny+cLRBMKyIUZFvWmE4NzYBrDeBDipsGjhCORsAIZgTu/4EmEemF DDiTY36vmpAS9Gfa5Bk+JlzSTifvnaABTm3/sJMgOfmVl/V7nYMenXi5xZBfPcONfJhdn6 4YNcznx42zUBgqV/XTjdra9OS8EAPbwpnRoXttfpnwDoVneZ/mHIiGvlJu4pzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685321771; 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=UGdPGkSuQDh7Eoo9NKxH3B/fMQiFf47HfZmwPvAGOms=; b=nVmfiBUHHecFRB3l2nn772GUqw/DjjMGR46ptB/tsB2fzhikugo2+4Em5Do6nWe4yqPCpm mhXOqfwlZduxkTEamxC8/9TDjJjmqfYlH5De0UcX5ZpGxMnad/+xUUD2iJT/hF0qMmIx3i gDdk6SPw2OcCf+GVXNnnzXoXHuKgyA1vLiQfk/03lDQXyLEVWBCc8dPzdW24gbfn2cV2Ve kMVFEqEECunchZr4VPu/LZkvDEukxvvqi1t45kJdhCdmImKlhn6psSrUycXnI+vsE0VBUs lKIbof0KFJtzEUt+7Bq0ZqahHJdC6WSRR2qhS7gb5NzK9GHJodUG3DAojX2qqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685321771; a=rsa-sha256; cv=none; b=iLDbX5idOeJCJ6C5VloER9RIDjGs+oIUjV+ZJ6vUNkRCRIGZ22TeP6ISUjexAdDtG4XPB/ 7fBXPUhEFanUmx03mxeDWNvo1sENE0L8FGZjl9gK90hhNgNl1tXLGCeTCUBaVOOWLlR1Pb JwhD6UKjwxT1F90+mTIOeh5OZzgmHugXLtMjdl9gOP5yvZ1oSoygwu59ii4IkeqiNAPmX9 gSr0ZgHDfBbjUD+3tco0YFDfYeE4m5ZJBtVKP3u68pQe92GP1ok4k7L70TBIXmoggRIoBA Vw75SKGnrG/ndTXxO0EJPuXcpv87RZhjVapDlGyOdoAjiahab4U8WRv5KIMjLg== 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 4QTxt32qhTzrms; Mon, 29 May 2023 00:56:11 +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 34T0uB97038944; Mon, 29 May 2023 00:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34T0uBN4038943; Mon, 29 May 2023 00:56:11 GMT (envelope-from git) Date: Mon, 29 May 2023 00:56:11 GMT Message-Id: <202305290056.34T0uBN4038943@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: 3ffa7eff2275 - stable/13 - nvmecontrol: Fix power subcommand output. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 3ffa7eff2275de05a3defeef859902a66f1d3135 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=3ffa7eff2275de05a3defeef859902a66f1d3135 commit 3ffa7eff2275de05a3defeef859902a66f1d3135 Author: Alexander Motin AuthorDate: 2023-05-15 20:48:50 +0000 Commit: Alexander Motin CommitDate: 2023-05-29 00:56:05 +0000 nvmecontrol: Fix power subcommand output. The returned value consists of two fields. Report them separately. MFC after: 2 weeks (cherry picked from commit f409f11bc556e6da4c4cdb9f20a2ba3b0977fb32) --- 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