From nobody Sun Apr 26 03:19:43 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g3Bl40sv0z6bGW4 for ; Sun, 26 Apr 2026 03:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3Bl3738qz3b0R for ; Sun, 26 Apr 2026 03:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777173584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YMvqKdJFg1ADFslIhtcP7McV42FPuLY1p9uWB2cwC3A=; b=hmwWC7w+2l4AYB1Hlinhf0dO8hko05AjWWJuqbnw82I35Psi+Ow8A5iyE8W1mo4D3dcgJs P5hrWRBsQGbtIxlKJT/7DEskBCyw0pt22OWJLHKyUeNeniqv9sUiKyPjJEnn3hfp7inHH0 wwCaE9WhmhKV1GCdckMy5vcWyBwddSngL62GbCtrPtBVR1qiKX2q14vDb1VgarOqqnwnq8 NQzDSmxhYWdlW5ZEEk7mqZTbjM4PTxVd+R9rN+MTtF+hDT6HLOrPaI2zBFgXja+DdqlJiK 3xpfoUlKI4LaLsg7Tc06Iq/z0c+Ewy2QMlKa8TrSwBacW4akg36aBQsHygNb/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777173584; a=rsa-sha256; cv=none; b=tiO61lBKvI4/e1phQhgCd8osoZIZVy9qA+gPWHgmRG9+bdHMz2/6st79JW/3OQLNSL6YOL qt+qkiqoCi9RIO1avzxEj98qEIkECouJZiYJb34j1OVQkb/HOUeJOfVYuOev1e/TToo9Oc 0TjQ7Dx8y739qJazRyrtCaVcNQKckzPcqRk4+6QEDGSphkxs+oHuOD8SySbi8SNB68Yx5p jXGMn4HeiltVzNQcb9VHmW5FAjK3JE7o3osXEHOSzSe3E+r9pko6kiHD7kmVHbwrDqca8W Q9SbymCBBdvYr6/5y+zLt6NzXtyr/I0W/+pAb6D9LrM8O578Eho0px+ykeukkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777173584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YMvqKdJFg1ADFslIhtcP7McV42FPuLY1p9uWB2cwC3A=; b=Yc2j3lBMSYgbRC588PNpGznZLSA5KpoGQVo4Ht0o9kB7kZLA8xtrvEyiZUda5z3sE2nT3D LantTAje+BhTjsPJ4/hm7JAdGNFBZBabtAbCXV36q9Q+FfyIk0gXAWWb30rrV44WeECOjY 7DeDtmom0I4oMkYB00JdWUD/Ov8YXB2MhtVJiUf6DiZEfq8ixLQKssVy6YrBbVsATJlTX0 xZpShqxHCBcaJD3UTR2pTukjNhAJQEuctImsRcpRfYFoCmYA491SqCCAPkDlB6KxjtfMaG TTUcGQZW7DMdXam2ImsSGKoSMF/ejPTvhVWbNyn9ShVr3Z/OOU7arIZ/7xIQtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3Bl36dy6z124w for ; Sun, 26 Apr 2026 03:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 398af by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 03:19:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1f72d525fc7d - main - Revert "nda: Filter non-storage nvme drives" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f72d525fc7d26c1c605b50519b9da1c78fec437 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 03:19:43 +0000 Message-Id: <69ed844f.398af.62da190d@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1f72d525fc7d26c1c605b50519b9da1c78fec437 commit 1f72d525fc7d26c1c605b50519b9da1c78fec437 Author: Warner Losh AuthorDate: 2026-04-26 03:16:05 +0000 Commit: Warner Losh 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 #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