From nobody Mon Jan 26 15:57:44 2026 X-Original-To: dev-commits-src-all@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 4f0CqF4JmKz6QS0L for ; Mon, 26 Jan 2026 15:57: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0CqD5dKZz453L for ; Mon, 26 Jan 2026 15:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769443064; 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=scPe335YGIemu1D8DWvWW0CN0RbMoYBQDgfIFKr6iUQ=; b=hUdVsYU2M+PCFGCNc/0MIQ1Lw3VgUZ/JsfNzZNw0BYLf6Wvjs26q5dzfMMk1nMREmTK+eb om0iaJtA9yKa/o5fLHrIatVKF+9hQUp92Rvf6b9YqgO9C/dvAfu1sfauoYJj+gVPfso8iG tzlLKsHSAQYTe9Vj9YXb2qL69rJRDwG/JsrVsnwT5FOQIqcP+Iw9S9wAXM93ktiy7GL5P3 fEDLAswz/2EUQ34Wfj+ufQwpWVUvB0+tiLcA5WvzBDmOmdCBdTUV+J7xPxkyGwv4ynGPlj 2r94vBLmcxc6BL5lSaQFFRsggmsmac2jLhxq9dHyUIYwdNMviULSAcorl9tK/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769443064; 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=scPe335YGIemu1D8DWvWW0CN0RbMoYBQDgfIFKr6iUQ=; b=jAUnm2gq6JFWK9iJOczvQtPaNkCCymMm8PYJaAPU62E8gkrzxLFGPisnWfXtAP12HFTPia bbCQ3pYK3aJcPpxAGJmR5YJ3kbhYsM85Fz31b9QXHmwRnD+1e/HZaTIkLPldp+QIu+waOr GnV5AJ+9ONcMkbfugXj5vMEeqkWEAR3rGFfBfjVuWmKcwSXQpcICAMYEQ/VkXyQmvH+QSV Y6QXhMxEqCTr/kYiLsNufhg1odOfGvClyYCjFWe2iiuKh3OeMqtEDCdD0HhNjD4/kiND2O k+H6F6CEoe5SVavQmH9mqBKy8ZXvfLoMfePTZnIIZLMCnHdCD3l9D7WhMxqgxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769443064; a=rsa-sha256; cv=none; b=YyBDfwjy7GNDsknzYg7Q+R5PdVxJ9qjbo203DepeHjjw5HleNmF0CN0GgT/qBDqyXBUTpX rfpzZFa2TtOVCXfSMyquYwrJygDgTpXMEfD4tE6sSpXlfhbcdHbNDGEVXT3WPfD9gIPO9A Ht3bYTuPMmMpTnUfSh3GnJ7fn5lDdq2BeyI+ImK7unE7QQHZkkcVlxhHZJiCRhrF5nMXw/ +qhnHboYb+svQBMC8aeMj/RB+TsbL1SSnwzYVCee/+qs0oWx0pRLEmuhfPN0x7S4IFIl8b wp87w73W9BIBxSv5b/CwXdFDSFSn0wF8DLSHfrB4IlB6Hwl87+Ps0buttv1yog== 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 4f0CqD5DdxzBbW for ; Mon, 26 Jan 2026 15:57:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37bdf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 15:57:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 518c01b31e96 - main - sym(4): Provide a DEVICE_DETACH(9) method List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 518c01b31e96bbe8353a551885a61e7da6aed5f6 Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 15:57:44 +0000 Message-Id: <69778ef8.37bdf.46830bb7@gitrepo.freebsd.org> The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=518c01b31e96bbe8353a551885a61e7da6aed5f6 commit 518c01b31e96bbe8353a551885a61e7da6aed5f6 Author: Marius Strobl AuthorDate: 2026-01-22 09:05:38 +0000 Commit: Marius Strobl CommitDate: 2026-01-26 15:54:48 +0000 sym(4): Provide a DEVICE_DETACH(9) method This also fixes sym_cam_free() to tear things down correctly, i. e. in opposite order of setup, as well as sym_cam_attach() to not free devq and SIM twice in the failure case. --- sys/dev/sym/sym_hipd.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index 6b7c0bd355ef..0e51607fb07a 100644 --- a/sys/dev/sym/sym_hipd.c +++ b/sys/dev/sym/sym_hipd.c @@ -2249,10 +2249,11 @@ static void sym_update_dflags(hcb_p np, u_char *flags, struct ccb_trans_settings *cts); static const struct sym_pci_chip *sym_find_pci_chip (device_t dev); -static int sym_pci_probe (device_t dev); -static int sym_pci_attach (device_t dev); -static void sym_pci_free (hcb_p np); +static device_probe_t sym_pci_probe; +static device_attach_t sym_pci_attach; +static device_detach_t sym_pci_detach; + static int sym_cam_attach (hcb_p np); static void sym_cam_free (hcb_p np); @@ -8237,6 +8238,7 @@ sym_update_dflags(hcb_p np, u_char *flags, struct ccb_trans_settings *cts) static device_method_t sym_pci_methods[] = { DEVMETHOD(device_probe, sym_pci_probe), DEVMETHOD(device_attach, sym_pci_attach), + DEVMETHOD(device_detach, sym_pci_detach), DEVMETHOD_END }; @@ -8740,21 +8742,25 @@ sym_pci_attach(device_t dev) */ attach_failed: if (np) - sym_pci_free(np); + sym_pci_detach(dev); return ENXIO; } /* - * Free everything that have been allocated for this device. + * Detach a device by freeing everything that has been allocated for it. */ -static void sym_pci_free(hcb_p np) +static int +sym_pci_detach(device_t dev) { + hcb_p np; SYM_QUEHEAD *qp; ccb_p cp; tcb_p tp; lcb_p lp; int target, lun; + np = device_get_softc(dev); + /* * First free CAM resources. */ @@ -8829,6 +8835,8 @@ static void sym_pci_free(hcb_p np) SYM_LOCK_DESTROY(); device_set_softc(np->device, NULL); sym_mfree_dma(np, sizeof(*np), "HCB"); + + return (0); } /* @@ -8902,11 +8910,6 @@ static int sym_cam_attach(hcb_p np) return 1; fail: - if (sim) - cam_sim_free(sim, FALSE); - if (devq) - cam_simq_free(devq); - SYM_UNLOCK(); sym_cam_free(np); @@ -8929,15 +8932,16 @@ static void sym_cam_free(hcb_p np) SYM_LOCK(); + if (np->path) { + xpt_async(AC_LOST_DEVICE, np->path, NULL); + xpt_free_path(np->path); + np->path = NULL; + } if (np->sim) { xpt_bus_deregister(cam_sim_path(np->sim)); cam_sim_free(np->sim, /*free_devq*/ TRUE); np->sim = NULL; } - if (np->path) { - xpt_free_path(np->path); - np->path = NULL; - } SYM_UNLOCK(); }