From nobody Sat Nov 02 18:39:11 2024 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 4XgmjC5Sqdz5cVPJ; Sat, 02 Nov 2024 18:39: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XgmjC4sdZz4mdQ; Sat, 2 Nov 2024 18:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730572751; 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=JMf3t6FEGFl5bQ2+QEqpSBQa00BT787Id8nTbf4p1Sg=; b=F9MCEBD2QGYy0NH7DWToDJaxEpX5QMES4AotMK9QzpzLwxGjM85KKIiiT8lERWoUJV96Gt 40iBO/h1gmlc7IckPRX3zgfcE+o5G9k3UMWp/kYDVdpjEnaxDEYUaeQcQYbBTUaswfPhPD 74MfWAxtVZW9WJW0QVW44gpx0XcyghwyRY7ewB3Vl+i4x4zTApkTEpq/1rFrgQnRj4BCVO KOkQUU6SP9aRm9VS7Rfy4dXzuuBqigZoOKDWSSSGKstEJiymoIJNK7QE4OefOiQ69lc6WU M7cg6e3dsICAjFv1VtHSxKf00v0BjYDM7XOqzbWRN7+ZmVIe4qPAiPbXnNfkzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730572751; 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=JMf3t6FEGFl5bQ2+QEqpSBQa00BT787Id8nTbf4p1Sg=; b=aQizaNkuPVoR4sSnsDXma1vs3nZ23cmIUB4FxLtmILXklyAWSOOxNhUEC2woS38lzZ6fTx UNEX5ITZ3qkLdtY+YeZnluwqrcYwNX0NedNAKeUhW7pdfoyHoottOe7+ESR7nnmsoThXa0 WbfLIj60deCJ/oZZuF7i204kCDOR/B4DjuaFO7IFF0yzaCBD08e4zLmvcSA/kUAOCwGEKc hF5rXR+fNx8lLU5Zf9iW8uOtfMaCqPCk1OIvTf1VuSFUIbHKFimJ1kkMCSSa8NEiq/avs0 kNW7PK0S647LV5eLSv/WQsxKBPTgfJ5EZnOP2ixc5rSYMvDdDmdn9oRnbyKAuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730572751; a=rsa-sha256; cv=none; b=dtD6YjN6O84Lex88D/qZlhbRh1G33kGjLq/c5P34qWGdXy5bry9j2VkTFj4Op9AAQ44jwf OMpe3tDzmLH7/b9ewcF5h6jKHoap0qpLolfFR/VzBe1TPcvFec7JM8SJhfPawjhoVW6/zP uQ4eSZVG2NbcI+BxkUY5+ZJi18TWkRZvXhmk1V5/0se7fqAgYwNiojqTtFgw+UZbdNWJNY g918iWVu7JAlg5o8IZez2tBaGpHZWZtlVmc0gVYDSzwX5imbdQuniCEfHf5WqFvGP2nVhM +LNS0TIViPmEVLtOAiobsp/YA+7GHuywE7T/02tb4arQUdODWtZYLnBbxnxtRw== 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 4XgmjC4Sn2zGJ0; Sat, 2 Nov 2024 18:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A2IdBXL023089; Sat, 2 Nov 2024 18:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A2IdBbP023086; Sat, 2 Nov 2024 18:39:11 GMT (envelope-from git) Date: Sat, 2 Nov 2024 18:39:11 GMT Message-Id: <202411021839.4A2IdBbP023086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5e5e4e1cf0c3 - main - cam: report sct/sc in that order 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e5e4e1cf0c3e46cbb120203d0f42415cd72cb6b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5e5e4e1cf0c3e46cbb120203d0f42415cd72cb6b commit 5e5e4e1cf0c3e46cbb120203d0f42415cd72cb6b Author: Warner Losh AuthorDate: 2024-11-02 18:28:54 +0000 Commit: Warner Losh CommitDate: 2024-11-02 18:28:54 +0000 cam: report sct/sc in that order This should have no effect on scripting, but when reading it, sct/sc is the natural order of things (and the order we print them in elsewhere). Report them in that order. Sponsored by: Netflix --- sys/cam/cam_periph.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index 4052ec2e1570..98236e3f5f5c 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -2166,9 +2166,9 @@ cam_periph_devctl_notify(union ccb *ccb) { struct ccb_nvmeio *n = &ccb->nvmeio; - sbuf_printf(&sb, "sc=\"%02x\" sct=\"%02x\" cdw0=\"%08x\" ", - NVME_STATUS_GET_SC(n->cpl.status), - NVME_STATUS_GET_SCT(n->cpl.status), n->cpl.cdw0); + sbuf_printf(&sb, "sct=\"%02x\" sc=\"%02x\" cdw0=\"%08x\" ", + NVME_STATUS_GET_SCT(n->cpl.status), + NVME_STATUS_GET_SC(n->cpl.status), n->cpl.cdw0); type = "error"; break; }