From nobody Mon Nov 02 15:49:40 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 4jJGNh3vgwz6xsqg for ; Mon, 02 Nov 2026 15:49:40 +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 4jJGNh3B6Vz4cX3 for ; Mon, 02 Nov 2026 15:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793634580; 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=DDRx5C/pOOlAd1QTqG4INPRtUW2UVVpZ1A5tjNTbjGI=; b=CmahXCdDFUDr31ZY+5znopRo60paj69T0ll2FBi7s8uwrd7Q+WerH5/0QEqNDCM94gU6IR xdXQWWcRkbx6t7A4NRVZaCVS8TcxQf/J33zlosLIxwdnRZisDsKozHEWNeMd3+wNZdlT43 gq7jCYBLdEt4ooou1rme2jvqq9Bez0Bzy72Ge2O3YoPd3TWZWGxI2JTg6A8fTJipqCwphM wvKbfz31IT9ZxO7L8W17vvwmD+zny9cM3b1AyyqlfeVVKL9F3oyVfstBLNJgCGctdc20d1 NAFyJzDM1u4R162DINga2aBQudf2t6udfW+xoiHpR8jkoMCgm+6vlIUahOz0MQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793634580; b=O355MKKo8EuadCSJ/iOm/lrAYqPYs9F/nUZ2CQI+kFBfm/JKTrRc9/wpjw5CGF/BsftbB7 B08gTTnlKh07sQ2OxJaXDEQlbu5kjhE+mDsnpyGQxkfGEpEQexySAsw3maAzXWH38PyiYP dbW5fWnR/2v/ZOEdJxPZMSc+eHzMExl30tZytfnfoNqdTfVZBypSBA3izxtSmAf5Kc8nhb BMdKrRIxdfaosHTpPUyz8S63HQpdHgj4LDgPQmZnFvUpr7EILm3l4SwLGHC/q0GfoPejoq DIC0wemVc8dRE0JZ9JJOxNE8WBdXgE1Dll9w+Oyq+XChYM1e1dbnlnjRGjfFAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793634580; 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=DDRx5C/pOOlAd1QTqG4INPRtUW2UVVpZ1A5tjNTbjGI=; b=OdLhLWnVVmqAL38EDXSoUvmZC2WK+GkvjBotCe14iGJ5Bw9oNJMftZKmP3XM0RsnweMuAl zhEelL590dvGvVtC8/WY0KN/KSy/a237ysv3GRXqktnpMyfaKmTRpjD8bwD/xpmLdug9HX 2QA3b4CUzZA0kKZOCNz8RUddd/kXxO1Ykyu2hdeREQe6gUDnGqJCprF44kUd9OaTzdZ5wj QAxIlZp8TNWf3ImrWEeSlAJdrAr4xYFdkW1/Duytt3WvDPLN5RurUd/GqoJbFTqK06APYv IMUIO+p3mZR9c+TTZCAFnpyZppO5OlyHt67W8WEGw+jxCg0tRnc9rpsAkZdcnQ== 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 4jJGNh2qp2zshs for ; Mon, 02 Nov 2026 15:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4245f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 15:49:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: d1dcb2b117a3 - main - snd_hdspe: Serialize rate and latency updates List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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/main X-Git-Reftype: branch X-Git-Commit: d1dcb2b117a3c128c8e8eda047f93739f06d6099 Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 15:49:40 +0000 Message-Id: <6ae8b114.4245f.226cdf9e@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d1dcb2b117a3c128c8e8eda047f93739f06d6099 commit d1dcb2b117a3c128c8e8eda047f93739f06d6099 Author: Kevin Bowling AuthorDate: 2026-07-21 03:33:08 +0000 Commit: Kevin Bowling CommitDate: 2026-11-02 15:49:22 +0000 snd_hdspe: Serialize rate and latency updates Protect running-state checks and register updates with the softc lock. Drop the lock around sndbuf_resize(), which may sleep, and recheck the running state after reacquiring it. Keep the resize ahead of the latency register update so that a failed resize leaves the hardware unchanged. Reviewed by: br MFC after: 3 days Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D58371 --- sys/dev/sound/pci/hdspe-pcm.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index 1f32909ce0d3..017142949d62 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -838,6 +838,8 @@ hdspechan_setspeed(kobj_t obj, void *data, uint32_t speed) device_printf(scp->dev, "hdspechan_setspeed(%d)\n", speed); #endif + mtx_lock(&sc->lock); + if (hdspe_running(sc) == 1) goto end; @@ -888,8 +890,10 @@ hdspechan_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 @@ -911,6 +915,8 @@ hdspechan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) device_printf(scp->dev, "hdspechan_setblocksize(%d)\n", blocksize); #endif + mtx_lock(&sc->lock); + if (hdspe_running(sc) == 1) goto end; @@ -941,12 +947,20 @@ hdspechan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) } } + /* sndbuf_resize() may sleep. */ + mtx_unlock(&sc->lock); if (sndbuf_resize(ch->buffer, (HDSPE_CHANBUF_SIZE * AFMT_CHANNEL(ch->format)) / (hl->period * 4), (hl->period * 4)) != 0) return (0); mtx_lock(&sc->lock); + /* A channel may have started while the lock was dropped. */ + if (hdspe_running(sc) == 1) { + mtx_unlock(&sc->lock); + return (0); + } + sc->ctrl_register &= ~HDSPE_LAT_MASK; sc->ctrl_register |= hdspe_encode_latency(hl->n); hdspe_write_4(sc, HDSPE_CONTROL_REG, sc->ctrl_register); @@ -954,10 +968,12 @@ hdspechan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) mtx_unlock(&sc->lock); #if 0 - device_printf(scp->dev, "New period=%d\n", sc->period); + device_printf(scp->dev, "New period=%d\n", hl->period); #endif + return (ch->buffer->blksz); end: + mtx_unlock(&sc->lock); return (ch->buffer->blksz); }