From nobody Sun Jul 12 18:47:30 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 4gyvh76CvWz6kYcf for ; Sun, 12 Jul 2026 18:47:35 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gyvh75bsMz3kqf for ; Sun, 12 Jul 2026 18:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783882055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xwHDYkotySgGW2+J1sfO+JzTNNff6otfA3rgaGvW0L8=; b=j1Ae7c4gHHGaKYExlAvaf3olxe6ELtOTD8r9B1D1HeF7UCzXKZNSTvQM0iGYMJObGfg5wn M/TLWbHSVy7XYzX/d33ev4EnHqV6zjfUteaxqwEVHJtoQgzFWbzFA2nBbtOJsQhfNxHRJM THbOHiyxPSpNskul+TZ1Ya2olyzsWFWbAfdstFpIVb/vmqL9QS1MuqmApbTYi1tpXJ5ouE /rsMfSKg5O9p580Ti/+rbe0pw1WJIWbKKzrsVHg9D8FYdZD/LkRMcvY5zlv08vEl/NmWx/ 1iWEyWh730ydhrLdLj9xwsuzbVNHCblRjCGbzS3l88rAe7Dw8B9gHkpYVVC7sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783882055; a=rsa-sha256; cv=none; b=qNEPlQWPckfiiI6u5oVGDdOXNn4WFRIpPLow32wBEla/AcNlxg2fSeWVq0fkOELligzGTC Z+jwpGK2L0Y53WiI2n/k0wDSvkOoJfmJGUKWaRwTtOaTGm7TQxKKRaAmjQCrFy1hTQzHLL iDVenn17bQBcz52lwaKRciM7gPJEtwC/nUled3VFiCiDRd07CTFM6wDVWY4cr/PH/TIrcu dAowS1Z079JKiKNPZA0KQOOhl/6/lE+f7FhdP21u5k1nz10QdJ5toYUYq7nqIF3Qbyq/2f G+gI6EqGJ9vmIVrrD4wW6bAsVoCQc5IfhwQC+tzXTsLuPO0ft01L9yJhA4aSyQ== 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=1783882055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xwHDYkotySgGW2+J1sfO+JzTNNff6otfA3rgaGvW0L8=; b=T+5siKYMsP7esGApiWra4PZeLULLOKqzafMoj9XAmjAqgY6CgPTlvHRIXbj8y/eE5Gh6qr PtGWr+dBXoSAoLZHI4U2Bxk0WSJ1wLndNdx23JeykLBlbRGSOLJQReGo/CCFyFY8o4g+LQ YKOdXX25LWAcqIf6CVxpfHAMkF//ESYKgKywDRsWbhi+0hxG9B9n5kB9pGBpZfeRZNiLIj jmGosa2OU+jB+0ZfPhW/57VeBtnZ6A3gaNxUdTEI3c3tG9ZyrKvx1II2/sWrND+6Ap9InE XTMeoObtyUpv/pfh9HuELtI5ZDD+FQr27RQ7lvIJ9VKPROa3ICAj/12v0xU0Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gyvh740Lmz7xP for ; Sun, 12 Jul 2026 18:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25510 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Jul 2026 18:47:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: -k From: Adrian Chadd Subject: git: ad91d47db306 - main - bluetooth: signal devd on netgraph device events 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 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad91d47db306738cc29f30c4d506509a3f5eeb8c Auto-Submitted: auto-generated Date: Sun, 12 Jul 2026 18:47:30 +0000 Message-Id: <6a53e142.25510.1286cc24@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=ad91d47db306738cc29f30c4d506509a3f5eeb8c commit ad91d47db306738cc29f30c4d506509a3f5eeb8c Author: -k AuthorDate: 2026-07-12 18:16:09 +0000 Commit: Adrian Chadd CommitDate: 2026-07-12 18:28:15 +0000 bluetooth: signal devd on netgraph device events Currently, devd emits events for external adapters only. Send Netgraph init/disconnect events to devd so the internal adapter's state could be asserted from userland. (adrian - indentation changes.) Signed-off-by: Kirill Orlov (-k) Reviewed-by: adrian, imp Pull-Request: https://github.com/freebsd/freebsd-src/pull/2196 --- sbin/devd/devd.conf | 15 +++++++ sys/netgraph/bluetooth/hci/ng_hci_main.c | 71 ++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf index 86faf2f30722..9fa11463cd42 100644 --- a/sbin/devd/devd.conf +++ b/sbin/devd/devd.conf @@ -159,4 +159,19 @@ notify 100 { action "/sbin/init q"; }; +# Track the bluetooth adapter's arrival/departure. This is useful +# for internal adapters that do not emit regular device events. +notify 100 { + match "system" "BLUETOOTH"; + match "subsystem" "HCI"; + match "type" "INITIALIZED"; + action "logger 'Bluetooth adapter initialized: $*'"; +}; +notify 100 { + match "system" "BLUETOOTH"; + match "subsystem" "HCI"; + match "type" "POWERED_OFF"; + action "logger 'Bluetooth adapter powered off: $*'"; +}; + */ diff --git a/sys/netgraph/bluetooth/hci/ng_hci_main.c b/sys/netgraph/bluetooth/hci/ng_hci_main.c index 13bf970f0135..190cb80a1c4c 100644 --- a/sys/netgraph/bluetooth/hci/ng_hci_main.c +++ b/sys/netgraph/bluetooth/hci/ng_hci_main.c @@ -33,7 +33,10 @@ */ #include +#include +#include #include +#include #include #include #include @@ -110,6 +113,19 @@ static int ng_hci_linktype_to_addrtype(int linktype) } return BDADDR_BREDR; } + +/* + * Append bdaddr_t as "xx:xx:xx:xx:xx:xx" to sbuf. + */ + +static void +ng_hci_append_bdaddr_to_sbuf(struct sbuf *sb, const bdaddr_t *ba) +{ + sbuf_printf(sb, "%02x:%02x:%02x:%02x:%02x:%02x", + ba->b[5], ba->b[4], ba->b[3], + ba->b[2], ba->b[1], ba->b[0]); +} /* ng_hci_append_bdaddr_to_sbuf */ + /***************************************************************************** ***************************************************************************** ** Netgraph methods implementation @@ -268,6 +284,31 @@ ng_hci_disconnect(hook_p hook) /* Connection terminated by local host */ ng_hci_unit_clean(unit, 0x16); unit->state &= ~(NG_HCI_UNIT_CONNECTED|NG_HCI_UNIT_INITED); + + /* Signal power off to devd */ + { + struct sbuf *sb; + sb = sbuf_new_auto(); + sbuf_printf(sb, "node=%s bdaddr=", + NG_NODE_NAME(NG_HOOK_NODE(hook))); + ng_hci_append_bdaddr_to_sbuf(sb, &unit->bdaddr); + sbuf_printf(sb, "\n"); + + if (sbuf_finish(sb) > 0) { + log(LOG_WARNING, + "hci: failed to signal bt device " \ + "power off to devd: " \ + "%02x:%02x:%02x:%02x:%02x:%02x\n", + unit->bdaddr.b[5], unit->bdaddr.b[4], + unit->bdaddr.b[3], unit->bdaddr.b[2], + unit->bdaddr.b[1], unit->bdaddr.b[0]); + } else { + devctl_notify("BLUETOOTH", "HCI", + "POWERED_OFF", sbuf_data(sb)); + } + + sbuf_delete(sb); + } } else return (EINVAL); @@ -371,6 +412,36 @@ ng_hci_default_rcvmsg(node_p node, item_p item, hook_p lasthook) ng_hci_node_is_up(unit->node, unit->acl, NULL, 0); ng_hci_node_is_up(unit->node, unit->sco, NULL, 0); + + /* Signal init to devd */ + { + struct sbuf *sb; + sb = sbuf_new_auto(); + sbuf_printf(sb, "node=%s bdaddr=", + NG_NODE_NAME(node)); + ng_hci_append_bdaddr_to_sbuf(sb, + &unit->bdaddr); + sbuf_printf(sb, "\n"); + + if (sbuf_finish(sb) > 0) { + log(LOG_WARNING, + "hci: failed to signal bt " \ + "device init to devd: " + "%02x:%02x:%02x:%02x:%02x:%02x\n", + unit->bdaddr.b[5], + unit->bdaddr.b[4], + unit->bdaddr.b[3], + unit->bdaddr.b[2], + unit->bdaddr.b[1], + unit->bdaddr.b[0]); + } else { + devctl_notify("BLUETOOTH", "HCI", + "INITIALIZED", sbuf_data(sb)); + } + + sbuf_delete(sb); + } + break; /* Get node debug level */