From nobody Mon Apr 08 20:25:59 2024 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 4VD0wS1z5yz5Hhst; Mon, 8 Apr 2024 20:26:00 +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 4VD0wS0Vp0z3y4p; Mon, 8 Apr 2024 20:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712607960; 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=lRlfPPg+wG5cZ7XCHKDklyFMlraBNgXobH1S88omXmM=; b=U4WuPeAIY2xNjmYcrtvRa2q431pj3DWQ2ciwh/CV/eyR87xgKpIv3WNTG/nD/5AGgyfW38 Eda+vXthse700Mxr0OqeAoJcciERRa5RezYAv80/ZKW9VTwQF17p0O98ss4zqq8Y36k3UX H5yz0x8x+7Ch733RKQwXYOqxXHSpx5zVIj+7naHVacEr005sm4SsEZroMWx6CaIcv4E8Ty eYKEhfps6Msgvg0CCsjofuUzVsLKCovu3o6IxpWwmT44ub2pRwU5iUwN7RcP68QsgGw0eZ /8VAmiqrQZfXOYcXypo0LXL4AqNsmN3Ips57w+uOxmlmdkZis/pTIHAzQiMZnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712607960; a=rsa-sha256; cv=none; b=PhRhBNhKEvXmlL4s5OGRdIPMEiPrl+QEy/Gv3pHeg5Y2xRWfkTg2R8nOCSENAJ9e7DO3nF NJObpAgQvbuYCwLR6D0QOQNFZJoxuj7iP1rChvin+qCqL5TmIY689YHF8eRr5i0hNrFza+ WvhfMlsn59xG+Xr342dZ4t/Ohd9H8Jh8fQ9OP9/szeHOavWptpeXBmdOfB7MKLAiiwD32O TSfVWJoXkkwLLqTxukXL2i3CsOt/d29qygfbMQlJ96MG3H5D7CqzHJS8pWTbWp10f8pYNB qow+SuFnJlvz5z+IlcKg9+onfVhxbuDqmiV6XZHZto9qO1lV7mgXwZc8GP/7QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712607960; 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=lRlfPPg+wG5cZ7XCHKDklyFMlraBNgXobH1S88omXmM=; b=j1vEo8GjlRANjzTS4Q9GPfB6EcdoSaphLkab3XYbirprmF8lkcXsN7OmSdONMflsNkvVnl q6xgENVvkpx51cAi53Oza2uAZO9WKQ3pWMQjom8it9jGhOJVDlvuGRhkTDYd8YS9B9deGo bfnItaiHMOh9JkRRc2ti2k2phyLi3HyzMvlFfcUg1ntX6oBsLx3kv5Bol7SPS1GRDCEVa+ VG8krIEzEYv3TFs95Tou/VFoGhS7BCRXXizaAfRz6OFqI4z6h3/KTv4ZwfoHTXH2k6kAlX LeRgiWbiwag3B6A2zFzoGBN+ipfsK/7lP52CRGOPTzS+nRGu6cBvD9nCKe+ZBQ== 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 4VD0wR6g8SzPmC; Mon, 8 Apr 2024 20:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 438KPxwY040338; Mon, 8 Apr 2024 20:25:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438KPxuD040335; Mon, 8 Apr 2024 20:25:59 GMT (envelope-from git) Date: Mon, 8 Apr 2024 20:25:59 GMT Message-Id: <202404082025.438KPxuD040335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 4329e6ccfa4a - stable/13 - nvme: Firmware revisions in the firmware slot info logpage are ASCII strings 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4329e6ccfa4a493933700d267dd4918ba3592a3f Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4329e6ccfa4a493933700d267dd4918ba3592a3f commit 4329e6ccfa4a493933700d267dd4918ba3592a3f Author: John Baldwin AuthorDate: 2024-03-01 22:18:43 +0000 Commit: John Baldwin CommitDate: 2024-04-08 18:01:07 +0000 nvme: Firmware revisions in the firmware slot info logpage are ASCII strings In particular, don't try to byteswap the values as 64-bit integers and always print a non-empty version as a string. Reviewed by: chuck, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44121 (cherry picked from commit 7485926e09a08fbfe83a9bc908e7d43aaca4c172) --- sbin/nvmecontrol/logpage.c | 13 ++----------- sys/dev/nvme/nvme.h | 14 ++------------ sys/dev/nvme/nvme_ctrlr.c | 4 ---- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index 35944993b32f..ad96c973acdf 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -230,10 +230,6 @@ read_logpage(int fd, uint8_t log_page, uint32_t nsid, uint8_t lsp, nvme_health_information_page_swapbytes( (struct nvme_health_information_page *)payload); break; - case NVME_LOG_FIRMWARE_SLOT: - nvme_firmware_page_swapbytes( - (struct nvme_firmware_page *)payload); - break; case NVME_LOG_CHANGED_NAMESPACE: nvme_ns_list_swapbytes((struct nvme_ns_list *)payload); break; @@ -424,15 +420,10 @@ print_log_firmware(const struct nvme_controller_data *cdata, void *buf, uint32_t else status = "Inactive"; - if (fw->revision[i] == 0LLU) + if (fw->revision[i][0] == '\0') printf("Empty\n"); else - if (isprint(*(char *)&fw->revision[i])) - printf("[%s] %.8s\n", status, - (char *)&fw->revision[i]); - else - printf("[%s] %016jx\n", status, - fw->revision[i]); + printf("[%s] %.8s\n", status, fw->revision[i]); } } diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 298efb7a19ed..39f9ce1b5907 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1420,7 +1420,8 @@ _Static_assert(sizeof(struct nvme_health_information_page) == 512, "bad size for struct nvme_firmware_page { uint8_t afi; uint8_t reserved[7]; - uint64_t revision[7]; /* revisions for 7 slots */ + /* revisions for 7 slots */ + uint8_t revision[7][NVME_FIRMWARE_REVISION_LENGTH]; uint8_t reserved2[448]; } __packed __aligned(4); @@ -1962,17 +1963,6 @@ void nvme_health_information_page_swapbytes( #endif } -static inline -void nvme_firmware_page_swapbytes(struct nvme_firmware_page *s __unused) -{ -#if _BYTE_ORDER != _LITTLE_ENDIAN - int i; - - for (i = 0; i < 7; i++) - s->revision[i] = le64toh(s->revision[i]); -#endif -} - static inline void nvme_ns_list_swapbytes(struct nvme_ns_list *s __unused) { diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index bcbc8dc26ee1..a3862113ed75 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -704,10 +704,6 @@ nvme_ctrlr_async_event_log_page_cb(void *arg, const struct nvme_completion *cpl) nvme_health_information_page_swapbytes( (struct nvme_health_information_page *)aer->log_page_buffer); break; - case NVME_LOG_FIRMWARE_SLOT: - nvme_firmware_page_swapbytes( - (struct nvme_firmware_page *)aer->log_page_buffer); - break; case NVME_LOG_CHANGED_NAMESPACE: nvme_ns_list_swapbytes( (struct nvme_ns_list *)aer->log_page_buffer);