From nobody Thu Nov 05 02:07:10 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 4jKm0N3jsmz6xwFH for ; Thu, 05 Nov 2026 02:07:16 +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 4jKm0N1Rxqz4QVG for ; Thu, 05 Nov 2026 02:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793844436; 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=ZzJ1geDI2VCLcvZU02Zd0z5wK0+Gdv4c1QMIfPMGJYo=; b=hV8yOJiyJBmlpPKXF1Qmydit2vp36KYuNsnDtdcu4I/dC+nnGbKBSZSrLYA2ThLBdIdeZ9 0EMhdaX+GEiVf46+b0NTkeUPcKYA911ySWOwWT3xNBIY/XjpvlXBbCE1qtnmUrY7vaAw2z ChrWmD23C7KcRPVg64ZSojGnr6/0I6MwjbnZwNVQCjsE+J/JUzhgQCCismUNWCMQOXdKs6 IxC6MbomZrUXayoU+ECqi0hNj33ifwnI/lzcL5Lr6fZc5lMor23R+T6t1cQVCV9fnv76Fq WMRSuvfG5zZ8qm6ZAdopkXJ2b98sWxMRJFv3OfrKMm50rkJ6Rt6eHTUXd4g0Bg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793844436; b=OvoJO2922wqYPnQu6ic9q68Wn3s60UqJjiwxor/KKUGjO1UXpMHoYb2zY65yumiBPyGiwg UqJKzwJdl2HFQv8nb9L9EN70fl90Yyg201g067QpEsBLn8aU5x3VVtvkNd1hYBoTykyzpq dv0tuy+5Ip/h5A7w3IicUcThJX3v96FXLFxsErWW9ItQ5+rK3hifJPpHiD1UYdDduDqnuA T/jJictHzNHdgx2rMRb3YpBYURLdPxhYqyNdwVZ7fi4UBO7YArzhMmdFP+mmRsJhoxgtVN oc+dYk8K1LuoMOQ+ZhHqx4fBr0NDz4VCYPGSB8djO/tjKdFhEK8gv2aKi4fjsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793844436; 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=ZzJ1geDI2VCLcvZU02Zd0z5wK0+Gdv4c1QMIfPMGJYo=; b=hVhUL2DgqzmCuJcVTi5f+I6keq/W2S/Hl873sbaLpDmvm5wvFOQtXbBQdpghtnSY5l4cSb IlsuMgaB6KiwKoDZqPHp7cb6mg5pSdo6jpgRkCzpSAfboZIfiz0taWuss7OzmnPXYApG3P zMTVkWP51o54cBxKmR4y1BBhzcGTgGfD1Dd/S07yfZE1qjyZP6UjFa/nueBl2dzqrKO/df AeXClFNMip1X6NALy/zGm67wrjU8+2nvqa8IOGhGqRxozSj/qGS8NN1DItC33uzjXZrEmt g5EP1ie1bnv48gaHDPtLdiFHftr9jIRkmKQoxOcUeBKEBF7wOaYO8OAdOCI/7w== 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 4jKm0N0rQCzSkD for ; Thu, 05 Nov 2026 02:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46902 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 02:07:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: adc47928706d - stable/15 - snd_hdspe: 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: adc47928706d579f409b5858ccd1bf71cd1fa80e Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 02:07:10 +0000 Message-Id: <6aebe4ce.46902.47095bd@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=adc47928706d579f409b5858ccd1bf71cd1fa80e commit adc47928706d579f409b5858ccd1bf71cd1fa80e Author: Kevin Bowling AuthorDate: 2026-07-21 03:33:08 +0000 Commit: Kevin Bowling CommitDate: 2026-11-05 02:07:02 +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 Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D58371 (cherry picked from commit d1dcb2b117a3c128c8e8eda047f93739f06d6099) --- 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 43730203c1c6..451365728c58 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); }