From nobody Mon Feb 21 18:54:03 2022 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 982D619DDDB3; Mon, 21 Feb 2022 18:54:03 +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 4K2Wfz3fXtz3Qkl; Mon, 21 Feb 2022 18:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645469643; 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=8qNRAQtdCDnqLuGcCv/tQq/LG48Jo+tAZR80EFSthsY=; b=GnPt8p9kBwoUtc0CmeomEtzhwh0h5ZzfqOL1YUzy/iR1pNo/dHJrlu/PG90OqoMhY/M890 prYq04BZqGrD89XpO10yzrMMQ3y/lmBxn7Lb+6CGzKwKZTxGioTBCziHpL8sC7htXa+mq+ OaRNHNLtjeWm0JF1GoekkKL2xMm/I+ya6Kg+2ufJVpTm2rPXXsyHtlj76JCe/FWyusKt/U bxvy9tNk6Trj4sC44a3UkX+pKYrwfB6WGIoZAEZOhc2xsptdgCc3nB2ZTWxYDT6G1yxv5w OgrVo6A5Q8XcNLT2W0px4OsykWMzCbwKRTGeMF1L49y2OvC5Zjy7dUj9sHL09g== 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 5DA4215B4B; Mon, 21 Feb 2022 18:54:03 +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 21LIs34d009719; Mon, 21 Feb 2022 18:54:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LIs3ow009718; Mon, 21 Feb 2022 18:54:03 GMT (envelope-from git) Date: Mon, 21 Feb 2022 18:54:03 GMT Message-Id: <202202211854.21LIs3ow009718@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: e71afa120275 - main - nvme: Add OAES bit-field definitions 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: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e71afa1202750b7cc8d49e77b7eed0114ece1657 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645469643; 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=8qNRAQtdCDnqLuGcCv/tQq/LG48Jo+tAZR80EFSthsY=; b=vfZZRefgfG6DJbz97iMBzAhC/HciAs+rIgO7kI7L5Xs/C5Bb4R1w7V5gkgetskbTgsWhK+ 6610LDXXfIEhj/V2K6wuGPVSTnVl7Bh0JJdYbX8IHGpekcjCZJLCEaS+skj69t3n7VZ7XQ Lv7zgVhYU3ezjalCJdzzGZZuh26qDEbp7Nr4+fKZYh8gb7TxyQ8DFrOSlJptjE00OXFS/r 2J9fO49a4MlgUwl4MS+OfcG+4aARVhJHpSPsza6UwqJpOvgczZh8q8XhYq23sKbwfjAxrq 1aHQVhFXp9oZFURmT37jItbUpdevumjHDlJAETiK6BbsxFke1SyjLfLkVnNvgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645469643; a=rsa-sha256; cv=none; b=QeXH90myo3Q3PLeX0XMuZJ1JxL5KvbtFeQPB0WofQu00OakNih34ngbgsbtRHQbwvT4yYw 2rAMEF7J62Y++AQ0PJx7feAb58RIkxzT9GxTbFVRGMD2o2DgtK5yIKZzfgflwXJlyprs09 gAIcgVB2vizRB06TPdRVe9WrEBTALtuf7vn005KDojBRlP5SQXZIZHCoWK9hkE901NVdNj GsqBFZEQl63FjBvs6OIcUwFKvw0dHYgezSd1B+kZitjrSohOyfNSHMOqOO5XyPq6KxfU3S yi5/o1hDrKLEx/WJVMe5tvVoiinnjOdNKku7Sg7FH23vV2WPWIndhkpJ3SQB6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=e71afa1202750b7cc8d49e77b7eed0114ece1657 commit e71afa1202750b7cc8d49e77b7eed0114ece1657 Author: Chuck Tuffli AuthorDate: 2022-02-21 18:34:14 +0000 Commit: Chuck Tuffli CommitDate: 2022-02-21 18:34:14 +0000 nvme: Add OAES bit-field definitions Create definitions for the Optional Asynchronous Events Supported (OAES) values. Also adds a helper macro for the common use case of "mask and shift". E.g. value = NVME_CTRLR_DATA_OAES_NS_ATTR_MASK << NVME_CTRLR_DATA_OAES_NS_ATTR_SHIFT; becomes value = NVMEB(NVME_CTRLR_DATA_OAES_NS_ATTR); Reviewed by: mav, imp Differential Revision: https://reviews.freebsd.org/D34300 --- sys/dev/nvme/nvme.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 7d153c61165c..05c0a7335bc0 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -237,6 +237,35 @@ #define NVME_CTRLR_DATA_MIC_ANAR_SHIFT (3) #define NVME_CTRLR_DATA_MIC_ANAR_MASK (0x1) +/** OAES - Optional Asynchronous Events Supported */ +/* supports Namespace Attribute Notices event */ +#define NVME_CTRLR_DATA_OAES_NS_ATTR_SHIFT (8) +#define NVME_CTRLR_DATA_OAES_NS_ATTR_MASK (0x1) +/* supports Firmware Activation Notices event */ +#define NVME_CTRLR_DATA_OAES_FW_ACTIVATE_SHIFT (9) +#define NVME_CTRLR_DATA_OAES_FW_ACTIVATE_MASK (0x1) +/* supports Asymmetric Namespace Access Change Notices event */ +#define NVME_CTRLR_DATA_OAES_ASYM_NS_CHANGE_SHIFT (11) +#define NVME_CTRLR_DATA_OAES_ASYM_NS_CHANGE_MASK (0x1) +/* supports Predictable Latency Event Aggregate Log Change Notices event */ +#define NVME_CTRLR_DATA_OAES_PREDICT_LATENCY_SHIFT (12) +#define NVME_CTRLR_DATA_OAES_PREDICT_LATENCY_MASK (0x1) +/* supports LBA Status Information Notices event */ +#define NVME_CTRLR_DATA_OAES_LBA_STATUS_SHIFT (13) +#define NVME_CTRLR_DATA_OAES_LBA_STATUS_MASK (0x1) +/* supports Endurance Group Event Aggregate Log Page Changes Notices event */ +#define NVME_CTRLR_DATA_OAES_ENDURANCE_GROUP_SHIFT (14) +#define NVME_CTRLR_DATA_OAES_ENDURANCE_GROUP_MASK (0x1) +/* supports Normal NVM Subsystem Shutdown event */ +#define NVME_CTRLR_DATA_OAES_NORMAL_SHUTDOWN_SHIFT (15) +#define NVME_CTRLR_DATA_OAES_NORMAL_SHUTDOWN_MASK (0x1) +/* supports Zone Descriptor Changed Notices event */ +#define NVME_CTRLR_DATA_OAES_ZONE_DESC_CHANGE_SHIFT (27) +#define NVME_CTRLR_DATA_OAES_ZONE_DESC_CHANGE_MASK (0x1) +/* supports Discovery Log Page Change Notification event */ +#define NVME_CTRLR_DATA_OAES_LOG_PAGE_CHANGE_SHIFT (31) +#define NVME_CTRLR_DATA_OAES_LOG_PAGE_CHANGE_MASK (0x1) + /** OACS - optional admin command support */ /* supports security send/receive commands */ #define NVME_CTRLR_DATA_OACS_SECURITY_SHIFT (0) @@ -533,6 +562,9 @@ enum nvme_critical_warning_state { #define NVME_SS_PAGE_SSTAT_GDE_SHIFT (8) #define NVME_SS_PAGE_SSTAT_GDE_MASK (0x1) +/* Helper macro to combine *_MASK and *_SHIFT defines */ +#define NVMEB(name) (name##_MASK << name##_SHIFT) + /* CC register SHN field values */ enum shn_value { NVME_SHN_NORMAL = 0x1,