From nobody Fri Aug 21 00:47:14 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 4hR1qD4pkkz6pPlJ for ; Fri, 21 Aug 2026 00:47:20 +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 4hR1qC5mlRz49Nw for ; Fri, 21 Aug 2026 00:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787273239; 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=bPykfM7TtX5e5MRltcI+LcyfPclghIzNNLxUVnZle9eKusN37pIMc6XTFpa5d1zZmtUvCz E3/5eQgfmfRkRmd0NRuIApWAmWpv/j9ILEGpkM+BL/UGe6wDo0ptt22Ute50IcCb81zenL F43gBbT0m2OhAMULuFXKsIoWiGfhwbJi2PnMhQJlk7nRT9bWN756KO/apVyheLf5fupWMg G1B8fMYnDawUjOZEStu9/zqABNScZkqx2oZrC9Bw8jDNjsJPVVCWO6BaZBPqIk9hYIneBj WJZ9W0iK0aGgDeaA6V281t0lZMR32NedawiY8OQVNui1l7WIS7lMjApJwgtX7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787273239; a=rsa-sha256; cv=none; b=SvlW7Pl66wnwlZ3Q4QgX6scu3ROMuVgL2rV0NirXQQSp2MGBH5a4TsdCDegggNnjLnk6e2 UH0UoXjL1SdQb//uFSg/UdGamh7/iY+ADvnhpb7ervUhYaxB2SKejjem6ABV/07uLSLGK1 OwCHytchzBI6MdoocJYbk5W0WKUuAIly+J0QGmvm6GHXOejpVt0dHTb95ZmQMgjDrd27LN GlQTPA6CYHPqc2tPUPx4lwH/BEVuMP8/I6gQkIo8LrtbTxhAzm/c/P3sTFe1ppHWau+loh 0DaZ1TbQSc3AKAV3rA0Xdb56zS7UUCOerPOrHPnmj8xYCtlDh+EqXcvCk+1Www== 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=1787273239; 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=uk5F6WVE++6yDARrY7x+V10bdUmjnqG9akDW4bUY0NZ6EsSol5oFik/85D/gesHlRMmtgU rc7s8CxePqeBqlgSthYVo+Cl9ZoGHM32PuSyVmg/QrSFAcDnPtq+CIzKWGU9W7bJ5M4yEk Sj0gZII1jaXzISNsuAOrXpAfotsqjASR4+FkUkrfP7itquHdxNUJVb0r8wskxd4h56m4Cf b7eXYERGw6ancEIXhIahKsds9Tcub1g4yOswxXhnjoE3j0SCR1hzBdYfh+kCaSyTh+qNWY W/lzwH6VT0KPxtOv+5ilDF7qDZ8Qx/nC5Tn4U7S8JbCefrwyhgACsB4nYfrfuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hR1qC4k0gzhf9 for ; Fri, 21 Aug 2026 00:47:19 +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 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/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);