From nobody Sun Feb 27 18:16:54 2022 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 6F77119D552F; Sun, 27 Feb 2022 18:16:54 +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 4K6BYL2h56z3MTx; Sun, 27 Feb 2022 18:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645985814; 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=SM4BPVxLARmApEAHD5jgwT9fIVKtIgxoDwf/6DhGkkQ=; b=Xg2IjDRVmleX5u1SnrN8AhjpgC2ExMNU8K3bZhDzIvP1vqBP5SsDywueybAePz6b+hwky/ +c+qXG862d+nskuCVaDKPQ2t8s2HqzvZinLy6W28dpSoN2yLGjSICCxI1E0Qegu2y52Q+h 9/WZbou/GCAgf2R1DCzTWO9W6e+0UiP7VH+Jy6PMYiBPgFZjLd+8iERAJ+gado+r5MYsgD boTF50cTLxfpCsF4UGKScrIZ3ic8Hy0BgLr+HhEsVVHdSBag9awi49Zh1wR5Voo8I4AClI 6yclcti4BKZZODIhvmZh12lwGJmBIxsnNSoNwfIlrOLlCZr4NvkrCHKXudfElw== 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 3BEF43D4B; Sun, 27 Feb 2022 18:16:54 +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 21RIGser058684; Sun, 27 Feb 2022 18:16:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RIGs7d058683; Sun, 27 Feb 2022 18:16:54 GMT (envelope-from git) Date: Sun, 27 Feb 2022 18:16:54 GMT Message-Id: <202202271816.21RIGs7d058683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: c55ba19b7029 - stable/13 - nvme: Add OAES bit-field definitions 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: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c55ba19b702981b579dfb0bc2d49bdbb5f92c036 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645985814; 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=SM4BPVxLARmApEAHD5jgwT9fIVKtIgxoDwf/6DhGkkQ=; b=BppaIQAx9O2vQ6ALCRthwWS40/neTjYgfPYsOYew8EiViUQKEzo+wzukj83sqIRYCP3g0T MrtDCONOPXAB4Fj54fvrzodPSvATRnknzAgnAwklz3AMmKbU0BWDdDbTvVixU1iKYyK0k/ Sh6oP9bVGX0mrQcC8PQO6vWLrPu6QDr+WfEt2s5e+M1dBXbyVDTqYKMTuU4e/YvzKYkZ1G tIVR6Cy6OPCWCsD0trN/dTfjIq7m/kH3QVxvzkwur6D9/mGI+uaTx3cwFWCinHUzmjrdNZ 3+DzyX5epPrdz0kM5oMtQAvlVFiOlSM1U33AhGcjuBIphbPyxDXCnEP3nlNCAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645985814; a=rsa-sha256; cv=none; b=pt0sSdjbCUgwOhQKq/jlyhuVYx/8ArTn3ImCCSkq42wh0I+IeGJ3RU7KBYrkGJSxiHrZ3S 3/VjUkYCmhipisl+VlayBl92zhqktwTh8A8zlM+SgoUh/2twNe89WpG4eOjxqoI+vID/3t Ia9ykEealKINf5AyCUSXoXy3yNGlYlY//BimztfDr05v812wh4iLLLpu3khqPcV7HwEfHN TBJygB8NUVMa2Zi5/7McqMtAd4wbcJWchGFUM67W3IuUcZwlagVFGRN9eKmLcWnP07Ti1P EL/oLVjHXtKQsIfo3sjD6rSR8iDPz8aaC7PBtEpjFzTzdN1Xq9+V2FHsacuHzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=c55ba19b702981b579dfb0bc2d49bdbb5f92c036 commit c55ba19b702981b579dfb0bc2d49bdbb5f92c036 Author: Chuck Tuffli AuthorDate: 2022-02-21 18:34:14 +0000 Commit: Chuck Tuffli CommitDate: 2022-02-28 01:59:31 +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); (cherry picked from commit e71afa1202750b7cc8d49e77b7eed0114ece1657) --- 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,