From nobody Wed Dec 10 22:53:59 2025 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 4dRWHC58t7z6Jqdr for ; Wed, 10 Dec 2025 22:53:59 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dRWHC2Jd4z3PcM for ; Wed, 10 Dec 2025 22:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765407239; 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=1mGpPfjMVWg0kCRMCjAKvpH7XhGMSJaNZTKGlqQaAO4=; b=BnLITaDIoAUp9zVmQ89AzqqNjryac4AKT5JzSfx4XO8yUrHiWM1upTFDLx/9umSX5K7l5I Ze31B37xZi5TGYtSwzeGqAtsa8LC0HgOt0j51ySdzdsh3Vv2vx+9uMv2ifZ5k3IB4+SCDh FpwHNH/p7sdSAMwPQbK96mlzfxm/58wkc8VIW3sUBWJSlrGNWolgtyxkfBd/rlM983Ak65 f97Qkwb+yVOtTwfDOgJE9XMjDGSiFTDllxg57P+il127Ui3pL2M5z/hsT6GmvolQOlzgx4 D+6LCDHEbbiCCCQD1V6BynicHTiDx+QPSNJeSfV0Gv1x3g9pshtyMx94iIWFHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765407239; 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=1mGpPfjMVWg0kCRMCjAKvpH7XhGMSJaNZTKGlqQaAO4=; b=lwKRMrNQvEP5uzHu+LOGt3l63tI7jZipkh9UCDgu8jCavGv0IXvAJQKZ+UbdmIBc/3RdD4 cMzMAsnVqGeSWs5a9cTNH8kb2YpPoPMf3WkNoUi7pxUhDuVh2JQjJAYFQVwwnNu2Ia4p/c vJHMfDA3TjjYqC19XRjrtNeMEciFJhxe1Texx0NirvAUGDvOZeQ/bDf6URRgKRn00+s0sm /l0BAQloGsKvA5/ihycqXdDcyDT+orkjH/P9SymJ4hok+UDZ9x2/eHrB2JUoF6l5nz5dd+ HYh6lRSOWXNub4C7WlzxAJVXE/hpVk1H4hJbJSWJMBCQsKESnXiQ45gFS3IBoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765407239; a=rsa-sha256; cv=none; b=hYmruU9RRLsz3dujcHyhCjKyWQ7C+f6wi9zT8VvSM9fHzKSiTlsybMJKlEzWMVtlKQwn10 GO8t4rD90uVlFUmxfPLgbEm4Fh4G9TN4mNF0dY5sKO5PCc+KxCihJht4KAR0DzLJUEL51C 2hqLwrHxtftN3xGdLfoadpHVIhSKG1YmtgQHI1NXA9xaqAesirsrbIzbbYBdxAc9pyTnGF v8rW1YxQZnj4N0hmyfwKX+mEFYXFWx2sX3NNbSZ4NldVsb0LCrnBJK9byi6L8zTY8Ti5yD cEDmT8f0viUsmUZIrTgexQrHfldmjoqnOY2nuCSXX0nCcgxqvEtXzjWgCpSw2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dRWHC1YB7z143F for ; Wed, 10 Dec 2025 22:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b5c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 22:53:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0a19464bf7af - main - nvme: Only attach to storage NVMe devices 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: 0a19464bf7afa35ce2aa7649152bc3a7629faa98 Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 22:53:59 +0000 Message-Id: <6939fa07.b5c4.42f70329@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0a19464bf7afa35ce2aa7649152bc3a7629faa98 commit 0a19464bf7afa35ce2aa7649152bc3a7629faa98 Author: Warner Losh AuthorDate: 2025-12-10 22:53:12 +0000 Commit: Warner Losh CommitDate: 2025-12-10 22:53:12 +0000 nvme: Only attach to storage NVMe devices Only attach CAM to the nvme storage devices. Sponsored by: Netflix --- sys/cam/cam_ccb.h | 2 +- sys/dev/nvme/nvme_sim.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index 19f18f36b8c9..bb23c6bed26f 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -650,7 +650,7 @@ struct ccb_pathinq_settings_nvme { uint8_t bus; uint8_t slot; uint8_t function; - uint8_t extra; + uint8_t progif; char dev_name[NVME_DEV_NAME_LEN]; /* nvme controller dev name for this device */ }; _Static_assert(sizeof(struct ccb_pathinq_settings_nvme) == 64, diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index d134d1daafc3..8b861cf3aa71 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -208,7 +208,7 @@ nvme_sim_action(struct cam_sim *sim, union ccb *ccb) cpi->xport_specific.nvme.bus = pci_get_bus(dev); cpi->xport_specific.nvme.slot = pci_get_slot(dev); cpi->xport_specific.nvme.function = pci_get_function(dev); - cpi->xport_specific.nvme.extra = 0; + cpi->xport_specific.nvme.progif = pci_get_progif(dev); strlcpy(cpi->xport_specific.nvme.dev_name, device_get_nameunit(dev), sizeof(cpi->xport_specific.nvme.dev_name)); cpi->hba_vendor = pci_get_vendor(dev); @@ -314,6 +314,13 @@ nvme_sim_probe(device_t dev) { if (nvme_use_nvd) return (ENXIO); + /* + * Only do storage devices with CAM. NVMHCI 1.0 interfaces are the only + * ones that have namespaces with LBA ranges on them. + */ + if (pci_get_progif(device_get_parent(dev)) != + PCIP_STORAGE_NVM_ENTERPRISE_NVMHCI_1_0) + return (ENXIO); device_set_desc(dev, "nvme cam"); return (BUS_PROBE_DEFAULT);