Re: nvme trouble on MacBookPro13,1 after updating -current; PCI 0x2003106b

On Tue, 4 Aug 2026, Abdelkader Boudih wrote:

> If you revert `5e0ba47aa00e`, it should boot again.

Thank you, I have reverted it (solving some conflicts)
and it boots again.

Please note that this commit breaks 0x2003106b I have,
but the quirks are for 0x2005... So probably just some
quirks for 0x2003 have to be added?

commit 25cc19ba69584a357df24b66f5e6efa7fac88aaf
Author: Marcin Cieślak <[email protected]>
Date:   Tue Aug 4 20:57:57 2026 +0200

     Revert "nvme: add Apple T2 ANS2 NVMe quirks"

     This reverts commit 5e0ba47aa00ed82a4a06cc45f0d1b34b6948e47f.

diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
index 4b96966114fe..e85968ccee31 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -173,10 +173,6 @@ nvme_ctrlr_construct_io_qpairs(struct nvme_controller *ctrlr)
  	num_entries = min(num_entries, mqes + 1);
  	num_entries = min(num_entries, max_entries);

-	/* SHARED_CID_SPACE: IO CIDs must fit within the shared CID table. */
-	if (ctrlr->quirks & QUIRK_APPLE_SHARED_CID_SPACE)
-		num_entries = min(num_entries, NVME_ADMIN_ENTRIES);
-
  	num_trackers = NVME_IO_TRACKERS;
  	TUNABLE_INT_FETCH("hw.nvme.io_trackers", &num_trackers);

@@ -189,10 +185,6 @@ nvme_ctrlr_construct_io_qpairs(struct nvme_controller *ctrlr)
  	 */
  	num_trackers = min(num_trackers, (num_entries-1));

-	if (ctrlr->quirks & QUIRK_APPLE_SHARED_CID_SPACE)
-		num_trackers = min(num_trackers,
-		    NVME_ADMIN_ENTRIES - ctrlr->adminq.num_trackers);
-
  	/*
  	 * Our best estimate for the maximum number of I/Os that we should
  	 * normally have in flight at one time. This should be viewed as a hint,
@@ -757,11 +749,6 @@ nvme_ctrlr_configure_aer(struct nvme_controller *ctrlr)
  	struct nvme_async_event_request		*aer;
  	uint32_t				i;

-	if (ctrlr->quirks & QUIRK_APPLE_NO_ASYNC_EVENT) {
-		ctrlr->num_aers = 0;
-		return;
-	}
-
  	ctrlr->async_event_config = NVME_CRIT_WARN_ST_AVAILABLE_SPARE |
  	    NVME_CRIT_WARN_ST_DEVICE_RELIABILITY |
  	    NVME_CRIT_WARN_ST_READ_ONLY |
diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c
index d81b7ccfcb15..613771e790bb 100644
--- a/sys/dev/nvme/nvme_pci.c
+++ b/sys/dev/nvme/nvme_pci.c
@@ -98,9 +98,6 @@ static struct _pcsid
  	{ 0xa822144d,		0, 0, "Samsung PM1725a", QUIRK_DELAY_B4_CHK_RDY },
  	{ 0x07f015ad,		0, 0, "VMware NVMe Controller" },
  	{ 0x2003106b,		0, 0, "Apple S3X NVMe Controller" },
-	{ 0x2005106b,		0, 0, "Apple ANS2 NVMe Controller (T2)",
-	    QUIRK_APPLE_IDENTIFY_CNS_BROKEN | QUIRK_APPLE_SHARED_CID_SPACE |
-	    QUIRK_APPLE_NO_ASYNC_EVENT | QUIRK_APPLE_SINGLE_VECTOR },
  	{ 0x80611d0f,		0, 0, "Amazon EBS NVMe Controller",
  	    QUIRK_EMPTY_NAMESPACE_CHANGED_LOG },
  	{ 0x00000000,		0, 0, NULL  }
@@ -141,9 +138,6 @@ nvme_pci_probe (device_t device)
  	if (ep->devid)
  		ctrlr->quirks = ep->quirks;

-	if (ctrlr->quirks & QUIRK_APPLE_IDENTIFY_CNS_BROKEN)
-		ctrlr->max_identify_cns = NVME_APPLE_ANS2_MAX_CNS;
-
  	if (ep->desc) {
  		device_set_desc(device, ep->desc);
  		return (BUS_PROBE_DEFAULT);
@@ -336,15 +330,6 @@ nvme_ctrlr_setup_interrupts(struct nvme_controller *ctrlr)
  	if (force_intx)
  		return (nvme_ctrlr_setup_shared(ctrlr, 0));

-	if (ctrlr->quirks & QUIRK_APPLE_SINGLE_VECTOR) {
-		int n = 1;
-		if (pci_alloc_msi(dev, &n) == 0) {
-			ctrlr->msi_count = n;
-			return (nvme_ctrlr_setup_shared(ctrlr, 1));
-		}
-		return (nvme_ctrlr_setup_shared(ctrlr, 0));
-	}
-
  	if (pci_msix_count(dev) == 0)
  		goto msi;

diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
index 5a83966ba729..186a723aeb16 100644
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -165,8 +165,6 @@ struct nvme_qpair {

  	uint32_t		num_entries;
  	uint32_t		num_trackers;
-	uint32_t		sqe_shift;	/* SQE size shift: sqes_max - 6; 0 = 64 bytes, 1 = 128 bytes */
-	uint16_t		cid_base;	/* CID offset for SHARED_TAGS IO queues */
  	uint32_t		sq_tdbl_off;
  	uint32_t		cq_hdbl_off;

@@ -222,16 +220,10 @@ struct nvme_controller {
  	int			domain;
  	uint32_t		ready_timeout_in_ms;
  	uint32_t		quirks;
-	uint8_t			max_identify_cns;	/* max CNS value for IDENTIFY (0 = no limit) */
  #define	QUIRK_DELAY_B4_CHK_RDY	1		/* Can't touch MMIO on disable */
  #define	QUIRK_DISABLE_TIMEOUT	2		/* Disable broken completion timeout feature */
  #define	QUIRK_INTEL_ALIGNMENT	4		/* Pre NVMe 1.3 performance alignment */
  #define QUIRK_AHCI		8		/* Attached via AHCI redirect */
-#define	QUIRK_APPLE_IDENTIFY_CNS_BROKEN		0x10	/* Reject IDENTIFY with CNS >= max_identify_cns */
-#define	NVME_APPLE_ANS2_MAX_CNS			1	/* T2: highest CNS accepted (Identify Controller) */
-#define	QUIRK_APPLE_SHARED_CID_SPACE		0x20	/* Admin/IO share a single CID table */
-#define	QUIRK_APPLE_NO_ASYNC_EVENT		0x40	/* Skip NVMe async event requests */
-#define	QUIRK_APPLE_SINGLE_VECTOR		0x80	/* Single MSI vector, one IO queue */
  #define	QUIRK_EMPTY_NAMESPACE_CHANGED_LOG	0x100	/* Change Namespace List Log is always empty */

  	int			resource_id;
@@ -331,12 +323,6 @@ struct nvme_controller {
  	counter_u64_t			alignment_splits;
  };

-/*
- * Access the idx'th submission queue entry.
- * sqe_shift is sqes_max - 6: 0 for standard 64-byte SQEs, 1 for 128-byte.
- */
-#define	NVME_SQE(qpair, idx)	(&(qpair)->cmd[(idx) << (qpair)->sqe_shift])
-
  #define nvme_mmio_offsetof(reg)						       \
  	offsetof(struct nvme_registers, reg)

diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c
index 73af36f977ca..e31bf818ed35 100644
--- a/sys/dev/nvme/nvme_qpair.c
+++ b/sys/dev/nvme/nvme_qpair.c
@@ -231,7 +231,7 @@ nvme_qpair_complete_tracker(struct nvme_tracker *tr,
  		nvme_qpair_print_completion(qpair, cpl);
  	}

-	qpair->act_tr[cpl->cid - qpair->cid_base] = NULL;
+	qpair->act_tr[cpl->cid] = NULL;

  	KASSERT(cpl->cid == req->cmd.cid, ("cpl cid does not match cmd cid\n"));

@@ -305,7 +305,7 @@ nvme_qpair_manual_complete_tracker(
  	memset(&cpl, 0, sizeof(cpl));

  	cpl.sqid = qpair->id;
-	cpl.cid = qpair->cid_base + tr->cid;
+	cpl.cid = tr->cid;
  	cpl.status = nvme_qpair_make_status(sct, sc, dnr);
  	nvme_qpair_complete_tracker(tr, &cpl, print_on_error);
  }
@@ -433,9 +433,8 @@ _nvme_qpair_process_completions(struct nvme_qpair *qpair)
  		    NVME_STATUS_GET_P(status) == NVME_STATUS_GET_P(cpl.status),
  		    ("Phase unexpectedly inconsistent"));

-		if (cpl.cid >= qpair->cid_base &&
-		    cpl.cid < qpair->cid_base + qpair->num_trackers)
-			tr = qpair->act_tr[cpl.cid - qpair->cid_base];
+		if (cpl.cid < qpair->num_trackers)
+			tr = qpair->act_tr[cpl.cid];
  		else
  			tr = NULL;

@@ -531,18 +530,6 @@ nvme_qpair_construct(struct nvme_qpair *qpair,
  	qpair->num_trackers = num_trackers;
  	qpair->ctrlr = ctrlr;

-	/* sqes[7:4]: max SQE size exponent; admin always 64 bytes per spec. */
-	if (qpair->id != 0) {
-		uint8_t sqes_max = (ctrlr->cdata.sqes >> 4) & 0xf;
-		qpair->sqe_shift = (sqes_max > 6) ? (sqes_max - 6) : 0;
-	} else {
-		qpair->sqe_shift = 0;
-	}
-	if ((ctrlr->quirks & QUIRK_APPLE_SHARED_CID_SPACE) && qpair->id != 0)
-		qpair->cid_base = ctrlr->adminq.num_trackers;
-	else
-		qpair->cid_base = 0;
-
  	mtx_init(&qpair->lock, "nvme qpair lock", NULL, MTX_DEF);
  	mtx_init(&qpair->recovery, "nvme qpair recovery", NULL, MTX_DEF);

@@ -566,7 +553,7 @@ nvme_qpair_construct(struct nvme_qpair *qpair,
  	 * Each component must be page aligned, and individual PRP lists
  	 * cannot cross a page boundary.
  	 */
-	cmdsz = qpair->num_entries * sizeof(struct nvme_command) << qpair->sqe_shift;
+	cmdsz = qpair->num_entries * sizeof(struct nvme_command);
  	cmdsz = roundup2(cmdsz, ctrlr->page_size);
  	cplsz = qpair->num_entries * sizeof(struct nvme_completion);
  	cplsz = roundup2(cplsz, ctrlr->page_size);
@@ -1000,8 +987,7 @@ nvme_qpair_timeout(void *arg)
  				 * queue which will reset the card if it
  				 * times out.
  				 */
-				nvme_ctrlr_cmd_abort(ctrlr,
-				    qpair->cid_base + tr->cid, qpair->id,
+				nvme_ctrlr_cmd_abort(ctrlr, tr->cid, qpair->id,
  				    nvme_abort_complete, tr);
  			} else {
  				/*
@@ -1054,7 +1040,7 @@ nvme_qpair_submit_tracker(struct nvme_qpair *qpair, struct nvme_tracker *tr)
  	mtx_assert(&qpair->lock, MA_OWNED);

  	req = tr->req;
-	req->cmd.cid = qpair->cid_base + tr->cid;
+	req->cmd.cid = tr->cid;
  	qpair->act_tr[tr->cid] = tr;
  	ctrlr = qpair->ctrlr;

@@ -1075,7 +1061,7 @@ nvme_qpair_submit_tracker(struct nvme_qpair *qpair, struct nvme_tracker *tr)
  		tr->deadline = SBT_MAX;

  	/* Copy the command from the tracker to the submission queue. */
-	memcpy(NVME_SQE(qpair, qpair->sq_tail), &req->cmd, sizeof(req->cmd));
+	memcpy(&qpair->cmd[qpair->sq_tail], &req->cmd, sizeof(req->cmd));

  	if (++qpair->sq_tail == qpair->num_entries)
  		qpair->sq_tail = 0;
@@ -1249,7 +1235,7 @@ nvme_qpair_reset(struct nvme_qpair *qpair)
  	qpair->phase = 1;

  	memset(qpair->cmd, 0,
-	    qpair->num_entries * sizeof(struct nvme_command) << qpair->sqe_shift);
+	    qpair->num_entries * sizeof(struct nvme_command));
  	memset(qpair->cpl, 0,
  	    qpair->num_entries * sizeof(struct nvme_completion));
  }
diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c
index 8f6cef4109f0..ad9dac430fa8 100644
--- a/sys/dev/nvme/nvme_sim.c
+++ b/sys/dev/nvme/nvme_sim.c
@@ -96,15 +96,6 @@ nvme_sim_nvmeio(struct cam_sim *sim, union ccb *ccb)
  	struct nvme_controller *ctrlr;

  	ctrlr = sim2ctrlr(sim);
-
-	if (ctrlr->max_identify_cns != 0 &&
-	    nvmeio->cmd.opc == NVME_OPC_IDENTIFY &&
-	    (le32toh(nvmeio->cmd.cdw10) & 0xff) > ctrlr->max_identify_cns) {
-		nvmeio->ccb_h.status = CAM_REQ_INVALID;
-		xpt_done(ccb);
-		return;
-	}
-
  	payload = nvmeio->data_ptr;
  	size = nvmeio->dxfer_len;
  	/* SG LIST ??? */
diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c
index d94bff15244f..1b64ebddb9b2 100644
--- a/sys/dev/nvme/nvme_sysctl.c
+++ b/sys/dev/nvme/nvme_sysctl.c
@@ -69,7 +69,7 @@ nvme_dump_queue(struct nvme_qpair *qpair)

  	printf("Submission queue:\n");
  	for (i = 0; i < qpair->num_entries; i++) {
-		cmd = NVME_SQE(qpair, i);
+		cmd = &qpair->cmd[i];
  		printf("%05d: ", i);
  		nvme_qpair_print_command(qpair, cmd);
  	}