From nobody Fri Aug 21 00:47:14 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 4hR1q70Gwqz6pPTl for ; Fri, 21 Aug 2026 00:47:15 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hR1q65SD2z48lS for ; Fri, 21 Aug 2026 00:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787273234; 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=3XDp6OFlhePRpl2f1ggDFK0EMR7nqrGHJdksu7/A55E=; b=LoSm3WMacFotTVAupDezobbkTDF8ODDjL0vQix7d2Xe/5ibvl/x78NFge+FptUD0DRcY6H tOPSsOWjWeyVgwCKbsVoSapX5KU1DNt++H7q0wzkYB+enNht82tW1Gwyx/NktVc/m09ZXi vlD7JP5D6OXL4zG6IJnjn5YS/KZpGMxzMsWFbO0Ix1bt+BJ8gxmRcPmgyemLacRi5yCjdt AlTN+hBoettapnVukirnNdM71Lz6XxzO4ieOtDO06sk+Bl8VrZ3nsFENjIB7FzTJwGCyBz L8N6qQyE31SH+IhHnvtT4RwOo8QAJ03hLDzwX+QpV+eCDoqJ+vF7QTp2W9otJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787273234; a=rsa-sha256; cv=none; b=KhhwaXVrF6ECwr4Ghx0dnHY8wtIx5fDs4vnJ5tqLPg7j5rLc6GZ7frWdyD7citom3XIp2h 5W4kmJ4AMoosiMqclr5bjToPNybHvK0atI+J02YGYFcFII7nQYPFvE+0ttbWIWJvT8Xkca 8j+v6l/a/tM9Jo7DxOvL4sUNMMb1zouVfwWx5GiBN0z4Eun6JoA8ZWMrg3eVFtbl1S/Qew 7px9U6mv5f7oKn6S6geT0sMxQBaxF1w+AW/jZldpPq4M26K17RvrCV77lUXQil0T8GyCFp bwSzdADK+YlKfeYgOBAKWqBYvB/3+M2dbWOXPwcMNzRlSAOYN6q7VEsc4K8XcQ== 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=1787273234; 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=3XDp6OFlhePRpl2f1ggDFK0EMR7nqrGHJdksu7/A55E=; b=WmWqBucd5OUtU1Edi5SBs3xzvdFeySyT9n5lQA7lwhwf4U3jaDzYyUbED0OjTPQqdXn2iP sXtsWJtvLjW66Q30AgBDmUxoH/7jZ8yY1Cqr590kIfPOMRLR+dHdS4g8kJ0u7Hal5QWbge S6Ar9xJkFbxLkvDZ0HJNgSLeSWJ/QwFv1ykcHDHN4aZCqB64E2kAEZqZTIbogJERE/XKop BMBieO3ZlrXknaiOKhGJc21AzEfJwJCIxkXx2lMvCjG3SEOKNtLh4g+z0KeyMBqzNQxQHg gw99WCW5sOESONvUBT7QlTDboyuGDpOGBvKuEqZ7Y40pmXZzezcSnNGqPhFvxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hR1q64H9Rzhf8 for ; Fri, 21 Aug 2026 00:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24188 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Aug 2026 00:47:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: f0778a6f9ba7 - main - bcm2835_audio: Remove wrong chn_intr() 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0778a6f9ba7045239a0055ebfbd7965d1f162c9 Auto-Submitted: auto-generated Date: Fri, 21 Aug 2026 00:47:14 +0000 Message-Id: <6a87a012.24188.6cae510c@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f0778a6f9ba7045239a0055ebfbd7965d1f162c9 commit f0778a6f9ba7045239a0055ebfbd7965d1f162c9 Author: Christos Margiolis AuthorDate: 2026-08-21 00:47:03 +0000 Commit: Christos Margiolis CommitDate: 2026-08-21 00:47:03 +0000 bcm2835_audio: Remove wrong chn_intr() chn_trigger() calls bcmchan_trigger() with the channel lock held. However, bcmchan_trigger() calls chn_intr(), which also tries to lock, which results in a lock recursion panic. chn_intr() is meant to be called by the interrupt handler and not inside CHANNEL_TRIGGER() methods. Remove the call altogether, the bcm2835_worker_play_start() call that comes after is enough. Fixes: 69cab2d1bfb5 ("Fix locking in bcm2835_audio driver") Reported by: Marco Devesas Campos Tested by: Marco Devesas Campos Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D59055 --- sys/arm/broadcom/bcm2835/bcm2835_audio.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index 29808b053b92..82a98d9f6107 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -840,7 +840,6 @@ bcmchan_trigger(kobj_t obj, void *data, int go) switch (go) { case PCMTRIG_START: /* kickstart data flow */ - chn_intr(sc->pch.channel); ch->submitted_samples = 0; ch->retrieved_samples = 0; bcm2835_worker_play_start(sc);