From nobody Mon Aug 24 20:47:20 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 4hTNJZ17gxz6pssc for ; Mon, 24 Aug 2026 20:47:26 +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 4hTNJY6HrKz3q5s for ; Mon, 24 Aug 2026 20:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787604445; 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=+Nwtgw+DH6UkY16ZfqEokKCV+DmE6UZHBlb5Ndx6lR0=; b=n+/zse2XTYNpqNAmyFWj+cpCPzMYoUNrNMjZkrB95VPT4IpU8lSq1b/pBDjo39j0BVXESy 6jTGa7+99xQyuntjAI3vZLZ5QFXaE4zVYVZysou1OI67+qnceyFWS9L4zJoHgxWMlwhWr5 63TTWeFVf13flgQ+PbM160fSMrYg/fYD0mBDcquxtnAZEQFNdc/c12FvXG6x5XYFqg/547 JxCu3imY1XNJtRzZx2gRRjfGNn8yqP+iwZUhQEJ4np9aOwSAC9/3pm28N4g3DrRV1eg/Tc NizlST0IGOW6Z0+fgf4fXdc6x9aFquBl086I1Lcn3+ZoTYLX7LPVKPVl2+VEvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787604445; a=rsa-sha256; cv=none; b=FQUuWHxZhYunXRQgoVmdw2r4vVzvBObjzbZ9AyjLelnbvCzEwTLJOZQXIty6WJIdwfpC0I aMITOOXV0CwBWQqsp198rBrIKz9BxzFUlbVq0YzbjnnfdMCDAUxKtwFp2Zjh4NDVBLzkDk S0Ghq9ykhyMCq/wyndbkfbWkHuOjDQzPch8D6cV/YpyZa2Dc1h8y6SQYhhUVcXRKukugRu oxmoNs39uaL84GEgjohC7+bQ6oPCCoQ/7CLZjG0AHtxnQPSM8LfliaUAmjdJWiWXTaSkrj dktvxp8GIeUnqx/KnIVKuoxqj4n0TKwg9z1Aa3kQ+I04E7JdazNcek9i/fkKlA== 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=1787604445; 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=+Nwtgw+DH6UkY16ZfqEokKCV+DmE6UZHBlb5Ndx6lR0=; b=AZF5cLcVvypsh+MumeZgZJTHjf4Mvo7tOR1Fza5a2VVSugZgC4Q9iQEN816E/ZfgAOnlfY +23vUoTyd4Znf+TO8HvUIF9hubvzSAHfKW7YeqBsBLT1TAYUB69G/q28PbQIZ76+V5/RU+ ZEYnXWy2c43b/t+6KesXZdPxPRVHFgbENMvg71qTCFU2+ozd0C07VOm4DoHMAiw/6Io2rT TCvk5DKIQSjBfr6Dg6fQARXuGIMAhN/QU2V1tEnjulqZA+PjplAglVt4b50RnKSRX2VzPy 4gI3fDRlJR23KBSk/y7osOI6TzeYusb/9vnZ/lsGGJi5htnnes6OSK5FuiM4XA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTNJY4kSrz4yk for ; Mon, 24 Aug 2026 20:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fe02 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 20:47:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: adf4c3336c31 - stable/15 - bcm2835_audio: Remove wrong chn_intr() 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: adf4c3336c319cd14de9f45a7a44465aca3a9f36 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 20:47:20 +0000 Message-Id: <6a8cadd8.1fe02.7981de60@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=adf4c3336c319cd14de9f45a7a44465aca3a9f36 commit adf4c3336c319cd14de9f45a7a44465aca3a9f36 Author: Christos Margiolis AuthorDate: 2026-08-21 00:47:03 +0000 Commit: Christos Margiolis CommitDate: 2026-08-24 20:47:13 +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 (cherry picked from commit f0778a6f9ba7045239a0055ebfbd7965d1f162c9) --- 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 4b138de58238..0915bee677ef 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -679,7 +679,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);