From nobody Thu Nov 05 02:07:24 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 4jKm0X3xtlz6xwPs for ; Thu, 05 Nov 2026 02:07:24 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jKm0X0rNFz4RCb for ; Thu, 05 Nov 2026 02:07:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793844444; 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=kTammMAIn4SOc2LKMpuLbkuLOCXe7HfplkpXYYyz9lI=; b=LbolChAHCIHxm5B5+GyT1o/LnbuGqAfidbm+/e5A8HS1MVZcB7BMTfiQByELo4j9cgRMuy 7rzTFCCRFlv1GltKCHfPl/uTYdVRU3cTGiKzQfW50810hoG5vaPOL2DwA5XKFjoNyfQQZQ SIxzQ7JRBWP9jb5QOgpsKUKzbighakd+P8M5V8vpDQYp5YJbKS/13oGLEnRyGm/O2LsgSq evJ6HAJ9CAlA88Ka8mS6cG88Ne8h/4+8F8qzZBR7y1UPdXpa5DJOFnHE1skpT9HoVV4xB9 MlP3tMmfAMmemgoBhTL9LERE2DcJzlgtL3B3Zkx+flET9ZItREJq8QildIRMaw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793844444; b=laR34MGBklvPMVbHjFeoRSgIEOnQfp5WnYsDeUZUcucOlgbJ3iVx0lFqJRYyqi72Ar7x3J BZRkX+yyoRYibMFHSxLjWd1iA/Rp59CmhSPvlbj3mHXz8CVtUvK6QgUcHbL0SL5tjnVWUB FVxMzwzL/ZHeuFOIVwhkdVl/7Xa5LjhfHrzd/j6eYxxDbiquzLFid/VqMeMRa6ymjWbjlA gyBdqHB7Lw+s8F5/s1waGH8am4CSxFuQvM1tUy45eARgnnE49o8lDgeAiH2SpAnygCqeYN 9U/jaQzAunOFKYNU06CDyxfGSju0x+15YyVcQoz89FpHmXinO2vq0vOk0QJv2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793844444; 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=kTammMAIn4SOc2LKMpuLbkuLOCXe7HfplkpXYYyz9lI=; b=BzVIUfRavQ0DxF+0J8GVaEBT1R0CisOrhwK1pnVUqIsCQ0gu9FTBQVgwwTWKZYfq+3sasE L0VreZa1I9DHvd1G9v6IJ05oYnuoqhyljlEKXm1EJJXTGUfpS2LhL9goL1ChtQxH3d40Ky kpuJVuh/oNgPD0qCdrL03iTdOXAhwGWNp03CK8jfzWDSOZCP0v5r9rXozpk+wEKNI02aqf ToUQNg5iEOX6GQEi8obaqH9Smp76V7MPOeX5uFZ4lfjygcVBN8GM6mqXXV/eNNZJt3A2VZ qFcL4dRkpJR55BYGmrQezxAi/uh5522lUsIY3BSD6Rx14L9v7+sFIDo5Xxsc/g== 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 4jKm0X0NQfzTN7 for ; Thu, 05 Nov 2026 02:07:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45365 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 02:07:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 4c43db6c59a5 - stable/15 - snd_hdsp: Serialize rate and latency updates List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4c43db6c59a55add794af998e6fd097dc1e07b7c Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 02:07:24 +0000 Message-Id: <6aebe4dc.45365.7976eab9@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4c43db6c59a55add794af998e6fd097dc1e07b7c commit 4c43db6c59a55add794af998e6fd097dc1e07b7c Author: Kevin Bowling AuthorDate: 2026-11-02 15:54:35 +0000 Commit: Kevin Bowling CommitDate: 2026-11-05 02:07:15 +0000 snd_hdsp: Serialize rate and latency updates Protect running-state checks and register updates with the softc lock. Keep the pointer reset and the HDSP 9632 frequency rewrite in the same critical section as the latency update. Drop the lock around sndbuf_resize(), which may sleep, and recheck the running state after reacquiring it. Preserve resize error handling so that a failed resize leaves the hardware unchanged. This mirrors the locking in snd_hdspe. Sponsored by: BBOX.io (cherry picked from commit a25ad366d51d52ef30b8bc4e2a7dd377255a409b) --- sys/dev/sound/pci/hdsp-pcm.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pci/hdsp-pcm.c b/sys/dev/sound/pci/hdsp-pcm.c index e320bddb8fe6..422b274a412c 100644 --- a/sys/dev/sound/pci/hdsp-pcm.c +++ b/sys/dev/sound/pci/hdsp-pcm.c @@ -851,6 +851,8 @@ hdspchan_setspeed(kobj_t obj, void *data, uint32_t speed) device_printf(scp->dev, "hdspchan_setspeed(%d)\n", speed); #endif + mtx_lock(&sc->lock); + if (hdsp_running(sc) == 1) goto end; @@ -890,8 +892,10 @@ hdspchan_setspeed(kobj_t obj, void *data, uint32_t speed) sc->speed = hr->speed; end: + speed = sc->speed; + mtx_unlock(&sc->lock); - return (sc->speed); + return (speed); } static uint32_t @@ -913,6 +917,8 @@ hdspchan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) device_printf(scp->dev, "hdspchan_setblocksize(%d)\n", blocksize); #endif + mtx_lock(&sc->lock); + if (hdsp_running(sc) == 1) goto end; @@ -943,16 +949,23 @@ hdspchan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) } } + /* sndbuf_resize() may sleep. */ + mtx_unlock(&sc->lock); if (sndbuf_resize(ch->buffer, 2, (hl->period * AFMT_CHANNEL(ch->format) * sizeof(uint32_t))) != 0) return (0); mtx_lock(&sc->lock); + /* A channel may have started while the lock was dropped. */ + if (hdsp_running(sc) == 1) { + mtx_unlock(&sc->lock); + return (0); + } + sc->ctrl_register &= ~HDSP_LAT_MASK; sc->ctrl_register |= hdsp_encode_latency(hl->n); hdsp_write_4(sc, HDSP_CONTROL_REG, sc->ctrl_register); sc->period = hl->period; - mtx_unlock(&sc->lock); #if 0 device_printf(scp->dev, "New period=%d\n", sc->period); @@ -963,6 +976,7 @@ hdspchan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) if (sc->type == HDSP_9632) hdsp_write_4(sc, HDSP_FREQ_REG, hdsp_freq_reg_value(sc->speed)); end: + mtx_unlock(&sc->lock); return (ch->buffer->blksz); }