From nobody Mon Feb 12 11:08:46 2024 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 4TYMCM3BKHz59b7Y; Mon, 12 Feb 2024 11:08:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYMCM1G1Vz4Y1J; Mon, 12 Feb 2024 11:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707736127; 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=vXonqPs42ua0ZXs0sLXzID14CtNuiTyRfuJaCpKNPys=; b=gWwCZPONzybuSDbWgMmuncUS41mjr9GpZxBCY11EoKGXJaPw/fFhXNtwbJl1vMag3ToHOd +oClkvJ1RPL8iddIRt0TOsZd/p7XW/3yv/u9NUDMsgi31Rl83GB+R+bhEAe5VDaYcAbJiW RZw7eVR+nnb7WvN/eD+Oo6mK5kJGLu6nVjWyAqplliIi/BJDH3cVUmuD10ot6mhxqJ5vce 6iRo6KF44Pohw70bmVxpdRjfMpjAqmtvUsKqmQVYjHMU3trXEL4DV1BBcsG5eVNqEb+40E i/UHV8FU3PamWhYZtbwHkac/C9/Z+K21k9JWiqv4BjXxvBo4z73SM5k3sQyuuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707736127; a=rsa-sha256; cv=none; b=kcA5MJ52rBTt9/mRBsMtO3ALn6f7ONXYDcWgxfadj/plH2VAb9jP7Y+aTiMVF0z5zK+Tve 3Pb3gT4zHosmiwknnYnL71tURosTmwkaaBVh4+TGC6xqg1jXxj7bQO8QRXits8fehI/n0B Kib8+eN7PiG4UoLDfjXMRewFQtEuS4jJoAXN8L+ao8D3AOHQVHMnsKe0BUZSnAfPbzIYO7 SDe0fu3+OYUG/rmrrh6aagq96SCvou3sv6xtUhoNQHwWHZIZ6Egl08TEf1fgNBWTTL51tT 89+V0mIzwahOOHlZS41sCzRMrE8Y/PRENc5QXztUV9KgNm6sBGXUWfYLeh5zNw== 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=1707736127; 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=vXonqPs42ua0ZXs0sLXzID14CtNuiTyRfuJaCpKNPys=; b=kX6DuTelQQzxnZeDqNIKT43g/VgQRFZrcbDXgWtx/dM2Jts5oTjGXdolKMZPOf2XxaB3xu WM05bWR7QVtYDb+xmvlJQEsUHHvnFNmiMc6hrxtGY69iLd0TnKpkNFC/gWxeduzmy59LYi dfZLMyArXqxcR4O/l/XFjqfEwgPMwwjSchoA6imKWM7h5PHD0xS5Vszg46uR+Ez6l7Tu/F z0u7oiVyLY1OXaxTsQ7dCcu42GiluTFrrmUfnu8tdJOMQuOh2eBEaEi2HieDkI27ZzdMly u7s4chUklQjk664eVK/FagJ8SmHlkQQ6EoYi6M+Hsj1nODaaXHtN4BrVyuDPnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYMCM0LFJzP0Z; Mon, 12 Feb 2024 11:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CB8k40041274; Mon, 12 Feb 2024 11:08:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CB8kAP041271; Mon, 12 Feb 2024 11:08:46 GMT (envelope-from git) Date: Mon, 12 Feb 2024 11:08:46 GMT Message-Id: <202402121108.41CB8kAP041271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 42fdcd9fd917 - main - snd_uaudio(4): Fix config detection with defaults set. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org 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: 42fdcd9fd917764d84edcc43e252a90cade78f80 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=42fdcd9fd917764d84edcc43e252a90cade78f80 commit 42fdcd9fd917764d84edcc43e252a90cade78f80 Author: Florian Walpen AuthorDate: 2024-02-12 11:05:27 +0000 Commit: Christos Margiolis CommitDate: 2024-02-12 11:07:21 +0000 snd_uaudio(4): Fix config detection with defaults set. Let the USB audio descriptor iteration detect configurations with more channels and larger sample size, even when the following global sysctl tunables are set to a lower value: hw.usb.uaudio.default_channels hw.usb.uaudio.default_bits This improves utility and is closer to the meaning of default. Also, do not create duplicate sample rate entries. MFC after: 2 weeks Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D43679 --- sys/dev/sound/usb/uaudio.c | 68 +++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index b0bf815f7797..eb4b676d5e7d 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -94,7 +94,7 @@ #include "feeder_if.h" static int uaudio_default_rate = 0; /* use rate list */ -static int uaudio_default_bits = 32; +static int uaudio_default_bits = 0; /* use default sample size */ static int uaudio_default_channels = 0; /* use default */ static int uaudio_buffer_ms = 4; static bool uaudio_handle_hid = true; @@ -150,6 +150,7 @@ SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RWTUN, #define UAUDIO_NFRAMES 64 /* must be factor of 8 due HS-USB */ #define UAUDIO_NCHANBUFS 2 /* number of outstanding request */ #define UAUDIO_RECURSE_LIMIT 255 /* rounds */ +#define UAUDIO_BITS_MAX 32 /* maximum sample size in bits */ #define UAUDIO_CHANNELS_MAX MIN(64, AFMT_CHANNEL_MAX) #define UAUDIO_MATRIX_MAX 8 /* channels */ @@ -2203,31 +2204,37 @@ uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev) uint8_t bits = uaudio_default_bits; uint8_t y; uint8_t channels = uaudio_default_channels; + uint8_t channels_max; uint8_t x; bits -= (bits % 8); - if ((bits == 0) || (bits > 32)) { + if ((bits == 0) || (bits > UAUDIO_BITS_MAX)) { /* set a valid value */ - bits = 32; + bits = UAUDIO_BITS_MAX; } - if (channels == 0) { - switch (usbd_get_speed(udev)) { - case USB_SPEED_LOW: - case USB_SPEED_FULL: - /* - * Due to high bandwidth usage and problems - * with HIGH-speed split transactions we - * disable surround setups on FULL-speed USB - * by default - */ - channels = 4; - break; - default: - channels = UAUDIO_CHANNELS_MAX; - break; - } - } else if (channels > UAUDIO_CHANNELS_MAX) + + if (channels > UAUDIO_CHANNELS_MAX) channels = UAUDIO_CHANNELS_MAX; + switch (usbd_get_speed(udev)) { + case USB_SPEED_LOW: + case USB_SPEED_FULL: + /* + * Due to high bandwidth usage and problems + * with HIGH-speed split transactions we + * disable surround setups on FULL-speed USB + * by default + */ + channels_max = 4; + /* more channels on request */ + if (channels > channels_max) + channels_max = channels; + break; + default: + channels_max = UAUDIO_CHANNELS_MAX; + break; + } + if (channels == 0) + channels = channels_max; if (sbuf_new(&sc->sc_sndstat, NULL, 4096, SBUF_AUTOEXTEND)) sc->sc_sndstat_valid = 1; @@ -2241,9 +2248,26 @@ uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev) uaudio_chan_fill_info_sub(sc, udev, rate, x, y); /* try find a matching rate, if any */ - for (z = 0; uaudio_rate_list[z]; z++) - uaudio_chan_fill_info_sub(sc, udev, uaudio_rate_list[z], x, y); + for (z = 0; uaudio_rate_list[z]; z++) { + if (uaudio_rate_list[z] != rate) + uaudio_chan_fill_info_sub(sc, udev, + uaudio_rate_list[z], x, y); + } + + /* after default value in first round, proceed with max bits */ + if (y == bits) + y = UAUDIO_BITS_MAX + 8; + /* skip default value subsequently */ + if (y == (bits + 8)) + y -= 8; } + + /* after default value in first round, proceed with max channels */ + if (x == channels) + x = channels_max + 1; + /* skip default value subsequently */ + if (x == (channels + 1)) + x--; } if (sc->sc_sndstat_valid) sbuf_finish(&sc->sc_sndstat);