D44441.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D44441.diff
View Options

	diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
	--- a/sys/dev/nvme/nvme.h
	+++ b/sys/dev/nvme/nvme.h
	@@ -63,6 +63,13 @@
	/* Many items are expressed in terms of power of two times MPS */
	#define NVME_MPS_SHIFT 12

	+/* Limits on queue sizes: See 4.1.3 Queue Size in NVMe 1.4b. */
	+#define NVME_MIN_ADMIN_ENTRIES 2
	+#define NVME_MAX_ADMIN_ENTRIES 4096
	+
	+#define NVME_MIN_IO_ENTRIES 2
	+#define NVME_MAX_IO_ENTRIES 65536
	+
	/* Register field definitions */
	#define NVME_CAP_LO_REG_MQES_SHIFT (0)
	#define NVME_CAP_LO_REG_MQES_MASK (0xFFFF)
	diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
	--- a/sys/dev/nvme/nvme_private.h
	+++ b/sys/dev/nvme/nvme_private.h
	@@ -57,9 +57,6 @@

	#define NVME_ADMIN_TRACKERS (16)
	#define NVME_ADMIN_ENTRIES (128)
	-/* min and max are defined in admin queue attributes section of spec */
	-#define NVME_MIN_ADMIN_ENTRIES (2)
	-#define NVME_MAX_ADMIN_ENTRIES (4096)

	/*
	* NVME_IO_ENTRIES defines the size of an I/O qpair's submission and completion
	@@ -74,11 +71,6 @@
	#define NVME_MIN_IO_TRACKERS (4)
	#define NVME_MAX_IO_TRACKERS (1024)

	-/*
	- * NVME_MAX_IO_ENTRIES is not defined, since it is specified in CC.MQES
	- * for each controller.
	- */
	-
	#define NVME_INT_COAL_TIME (0) /* disabled */
	#define NVME_INT_COAL_THRESHOLD (0) /* 0-based */