From 1f72d525fc7d26c1c605b50519b9da1c78fec437 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sat, 25 Apr 2026 21:16:05 -0600 Subject: [PATCH] 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 ac1e1f09e2a..be578bae5da 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -49,7 +49,6 @@ #include #include #include -#include #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