From nobody Thu May 14 15:36:45 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 4gGZF933cHz6dKf1 for ; Thu, 14 May 2026 15:36:45 +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 4gGZF92MzZz3gy9 for ; Thu, 14 May 2026 15:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778773005; 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=4nXjW7roiQZ7s+PyxuUo2+6K3jSpfxpiH8rzv0o1p3I=; b=XofzrbN/RPbSGa/NtkhVucttPcLHbQ7mLBKFzc9/WfXz1k87e6qr2sEnR/1kYukB0QhUsc UNmjZJtYAfG2nAYNj7Hpw6SnXC3diFOvT4S6O1ZR1EoNKv+HUmI2+xl8LlxYXqQMDuHWt1 VZNZv5L8GxjtUYPZsWVtJmWnSRmmtD+bM41isbKe8RX42Yj6HBsjp3kFtShB5uwidV4/BR oOA3DkZpwkv4KXj9S7yqidcDNulQ9+Y9TOrxUDSpvAcWUKG7iRf8cepawAuQAI7Txl8Xrv aCpCP62halPvlnquRpuBe6tMHfmmr7zGDYuk+ht221Ams9qHU+nVq/KobQ3vNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778773005; a=rsa-sha256; cv=none; b=Nfo7v0ljBbhCSRnGYYqKXqU4RY8ezlQ649ZsafWdPb2mFHKKYsKUolONJCJtycCn70HCa7 +EB+PhSA6dum/WKkDNuHGF5jRsssSzOUjtWyiKNSuIGYtk7XVIfdQuKuCSCUE6fSiiCh0P aCJ7nqZ9ANSoigKrOrRpRPDJGYmSdSl3qefwGEDC91kA4Ww2itNUxcmaQORTFnAwvs8Wfg Hc9xdlPUGK8IbypaIH+SRjcuAWq2MldWUAPyC8uOVB0soK3sDNsw6XQca98EKIfvhd983l MIPRRaZdY3Q7I4auztybZq9wefPlbjboOy6+hSsDeXNivds4gtdePknnNGlp7A== 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=1778773005; 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=4nXjW7roiQZ7s+PyxuUo2+6K3jSpfxpiH8rzv0o1p3I=; b=nyvD17mbYpGyiFRipwvyUfo3tJm/AMQcMFGowMe77lwCn5W4HDi0VkJBgLfE0KUF+k2fEn U9McHR8R6uiuJCYK0+3Iwvy/O9meyhyr1kkiDcEiP4XFNr2QI2MDUHBigUokvwgjssG4Ql tOc810lKupsvWYkIbxgjDkh9o51wws9D0Sx3FbsTCZN7u7/FiSTX7llIpQGTLUvUeeQHYW CkzdMjOjBgnC/j4F6P1dDljMng/zwnfdiMwdpOJ/W25xYxHsDXuGN4MfSRbdIDRVS/MoWg b4lfBOk4Lt3RyR0pbZeUaW+110OFTGwAdhvAjk0gusCjuSqA8G7/+aep5eOXVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGZF91Zbjzk5R for ; Thu, 14 May 2026 15:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3626e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 15:36:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fb4e7898a359 - main - Revert "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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: fb4e7898a359a5044e6794c7fe8a698d29af1fd3 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 15:36:45 +0000 Message-Id: <6a05ec0d.3626e.6afe0cb9@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb4e7898a359a5044e6794c7fe8a698d29af1fd3 commit fb4e7898a359a5044e6794c7fe8a698d29af1fd3 Author: Warner Losh AuthorDate: 2026-05-14 15:35:35 +0000 Commit: Warner Losh CommitDate: 2026-05-14 15:35:35 +0000 Revert "nvme: Only attach to storage NVMe devices" This reverts commit 0a19464bf7afa35ce2aa7649152bc3a7629faa98. It's incorrect for ahci attachments. Reverting to merge to stable/15 to merge to releng/15.1 for the release. Sponsored by: Netflix --- sys/cam/cam_ccb.h | 2 +- sys/dev/nvme/nvme_sim.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index cedb3a9ad61c..e0516fb37850 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -651,7 +651,7 @@ struct ccb_pathinq_settings_nvme { uint8_t bus; uint8_t slot; uint8_t function; - uint8_t progif; + uint8_t extra; 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 b9f09c8d1f61..a6ba1a498185 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.progif = pci_get_progif(dev); + cpi->xport_specific.nvme.extra = 0; 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,13 +314,6 @@ 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);