From nobody Wed Dec 10 22:53:50 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 4dRWH25yNjz6Jqgd for ; Wed, 10 Dec 2025 22:53:50 +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 4dRWH23gYmz3P84 for ; Wed, 10 Dec 2025 22:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765407230; 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=9Ul/YCmmbh8713KqLjnweLTkjmxnXgYzH9qkjoNYaHQ=; b=TAdE4lMBSGJnMo6UOPyK9ZKjhXmPjbcplb6JY4yZ2H6vqJYiByKq33coXoIYVjiOs9Q4rw qGK3+0hqc7FPbAmxjDLbh6IL4N3irRBr2R/gwL44RkJSATU77xDHZ9ip25/jQPN2jec0Ny 7s5jd9WtvyuL3XdW8AfPcpi3M+AsG7YXCjCvRUYWnx824ATN7YY2ar5dFe0Wg1aYYRfSPQ uo+zVEb/GZWXys/axPsaEYW75Jru4lNtmCHlJxml3irEJRsnbZfdEKWe0uusthkvVlLoDA Sgf+8k5U7QiKWPHA3OUveWepLikZ+9sV8HVd4blqyDAOjXv/EgFwd0O1+DbYqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765407230; 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=9Ul/YCmmbh8713KqLjnweLTkjmxnXgYzH9qkjoNYaHQ=; b=pAyFmqxZPQid4NkZ/f6fq6ZVQTO1cbbQU8k/pgrhh4VuieTTVbTcWndiGHbwsL3/e7jWhr xMczi2wnUbjvoqLAAu0Cn23+pmtqgnxUaxmFj7Y+p63cybCmx+xu0BuQOUkN146ooM6mx0 tbmAcHLgoS0WkINSvwbOmVvXknQdw/+RK7JxVv0q+9lm3QLmjopcPbHN4G1m2iORyPDZ+w lQiez4qycE6B0qzYqgHJbjbbVSd+b8E/3Y4fLIjq0EAUa/As7NcROkaRyVq5GevDhIx/aD 2y972fyMDVHF+L7SybRwSBqa8JU5nU0BZFqdh0yiHIDpbI/5BsY0MhN5qkJnJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765407230; a=rsa-sha256; cv=none; b=fOA70CBESKBp9B+CeVVTZ/es8MeIU9miPwsj2dAjeQbNDMcBmf0+0Vf7240sii5u4qs2uX M1EcJ4wcGcUpiyB6Y3QBf8Wj9+AX31j6vYgkuWLnyMxbyzqsbWHKSSEFiQ7PPYIzxvyeIQ oS3nN2efRTO7RuIYCof6kuwnYa6VQ/HKHdZ0Yj21m2yQeC5R3O8d2olS4dj3y4Qqvfjarn Q8+46Y2zCbiA5uztu/UOAf3AGzH6yfrf4CCeLl8GG0FVKnP3RahkNv3RvwjyhwkBHhmw1H NoVk8JzzlMO+RNw56hEHJUqMLnmqyuyCMVXMQkqyZJbmctNvLXlDRN7CSKIl7Q== 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 4dRWH238V7z14K0 for ; Wed, 10 Dec 2025 22:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a0db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Dec 2025 22:53:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 743fbb549b17 - main - nvme: Add child device for each controller 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: 743fbb549b17c1288306cd3fffdf139137268f61 Auto-Submitted: auto-generated Date: Wed, 10 Dec 2025 22:53:50 +0000 Message-Id: <6939f9fe.a0db.7031fc1c@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=743fbb549b17c1288306cd3fffdf139137268f61 commit 743fbb549b17c1288306cd3fffdf139137268f61 Author: Warner Losh AuthorDate: 2025-12-10 22:52:17 +0000 Commit: Warner Losh CommitDate: 2025-12-10 22:52:17 +0000 nvme: Add child device for each controller Step 1 in the move from registering consumers for NVMe drives to newbus nvme drives: Add a child device and attach them for each controller that we initialize. Detach them when we detach the main device. Sponsored by: Netflix Reviewed by: dab Differential Revision: https://reviews.freebsd.org/D51383 --- sys/dev/nvme/nvme.c | 5 +++++ sys/dev/nvme/nvme_ctrlr.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c index d119f9877aaa..7788889ae591 100644 --- a/sys/dev/nvme/nvme.c +++ b/sys/dev/nvme/nvme.c @@ -104,9 +104,14 @@ int nvme_detach(device_t dev) { struct nvme_controller *ctrlr = DEVICE2SOFTC(dev); + int error; config_intrhook_drain(&ctrlr->config_hook); + error = bus_generic_detach(dev); + if (error) + return (error); + nvme_ctrlr_destruct(ctrlr, dev); return (0); } diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 3d8b26d2004c..50753f06c4e2 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1079,8 +1079,13 @@ nvme_ctrlr_start_config_hook(void *arg) config_intrhook_disestablish(&ctrlr->config_hook); if (!ctrlr->is_failed) { + device_t child; + ctrlr->is_initialized = true; nvme_notify_new_controller(ctrlr); + child = device_add_child(ctrlr->dev, NULL, DEVICE_UNIT_ANY); + device_set_ivars(child, ctrlr); + bus_attach_children(ctrlr->dev); } TSEXIT(); }