Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 26 Apr 2026 03:19:43 +0000
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 1f72d525fc7d - main - Revert "nda: Filter non-storage nvme drives"
Message-ID:  <69ed844f.398af.62da190d@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=1f72d525fc7d26c1c605b50519b9da1c78fec437

commit 1f72d525fc7d26c1c605b50519b9da1c78fec437
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2026-04-26 03:16:05 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2026-04-26 03:16:05 +0000

    Revert "nda: Filter non-storage nvme drives"
    
    This reverts commit b40205855e100a4bd95f89e97c15d268ef5b3a35. There's an
    aparent path lifetime issue in it that needs to be investigated.
    
    Sponsored by:           Netflix
---
 sys/cam/nvme/nvme_da.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c
index ac1e1f09e2af..be578bae5da5 100644
--- a/sys/cam/nvme/nvme_da.c
+++ b/sys/cam/nvme/nvme_da.c
@@ -49,7 +49,6 @@
 #include <sys/sbuf.h>
 #include <geom/geom.h>
 #include <geom/geom_disk.h>
-#include <dev/pci/pcireg.h>
 #endif /* _KERNEL */
 
 #ifndef _KERNEL
@@ -732,7 +731,6 @@ ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 	switch (code) {
 	case AC_FOUND_DEVICE:
 	{
-		struct ccb_pathinq cpi;
 		struct ccb_getdev *cgd;
 		cam_status status;
 
@@ -743,18 +741,6 @@ ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 		if (cgd->protocol != PROTO_NVME)
 			break;
 
-		/*
-		 * For PCIe cards, filter all the cards whose programming
-		 * interface doesn't conform to the NVMe storage spec. This
-		 * allows the nvme controller to attach to more than just
-		 * storage cards that use the nvme model.
-		 */
-		xpt_path_inq(&cpi, cgd->ccb_h.path);
-		if (cpi.transport == XPORT_NVME &&
-		    cpi.xport_specific.nvme.progif !=
-		    PCIP_STORAGE_NVM_ENTERPRISE_NVMHCI_1_0)
-			break;
-
 		/*
 		 * Allocate a peripheral instance for
 		 * this device and start the probe


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ed844f.398af.62da190d>