summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormlelstv <mlelstv@NetBSD.org>2022-07-31 11:58:37 +0000
committermlelstv <mlelstv@NetBSD.org>2022-07-31 11:58:37 +0000
commita36835502e7cc113b0a162e20b6d67121b236fe2 (patch)
tree296e2e8af53c7ae2b02237973c3d08f43acafcc9 /sys/dev
parentee432ee5b2715ac462a7e2b0b9c79d8ee12e526f (diff)
The status is an 8 bit field. Fix masks and move the status type field
to the correct bit position.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/nvmereg.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/nvmereg.h b/sys/dev/ic/nvmereg.h
index ac6ae9f02e8..d9d28fd5163 100644
--- a/sys/dev/ic/nvmereg.h
+++ b/sys/dev/ic/nvmereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmereg.h,v 1.16 2021/11/14 07:27:25 skrll Exp $ */
+/* $NetBSD: nvmereg.h,v 1.17 2022/07/31 11:58:37 mlelstv Exp $ */
/* $OpenBSD: nvmereg.h,v 1.10 2016/04/14 11:18:32 dlg Exp $ */
/*
@@ -240,14 +240,14 @@ struct nvme_cqe {
uint16_t flags;
#define NVME_CQE_DNR __BIT(15)
#define NVME_CQE_M __BIT(14)
-#define NVME_CQE_SCT_MASK __BITS(8, 10)
-#define NVME_CQE_SCT(_f) ((_f) & (0x07 << 8))
+#define NVME_CQE_SCT_MASK __BITS(9, 11)
+#define NVME_CQE_SCT(_f) ((_f) & NVME_CQE_SCT_MASK)
#define NVME_CQE_SCT_GENERIC (0x00 << 8)
#define NVME_CQE_SCT_COMMAND (0x01 << 8)
#define NVME_CQE_SCT_MEDIAERR (0x02 << 8)
#define NVME_CQE_SCT_VENDOR (0x07 << 8)
-#define NVME_CQE_SC_MASK __BITS(1, 7)
-#define NVME_CQE_SC(_f) ((_f) & (0x7f << 1))
+#define NVME_CQE_SC_MASK __BITS(1, 8)
+#define NVME_CQE_SC(_f) ((_f) & NVME_CQE_SC_MASK)
/* generic command status codes */
#define NVME_CQE_SC_SUCCESS (0x00 << 1)
#define NVME_CQE_SC_INVALID_OPCODE (0x01 << 1)