From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AD52237FF0; Fri, 20 Dec 2024 17:14:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734714854; cv=none; b=PFHFjETUIz86Ogumdn1HkB0HtvQuscgoz0jmZFv8JU8Jm7rh3gg7lk5peGVtTArYslaGvGlQCuSnSnWPMMJXD0/sYoRzVkTJzM5UOXohiRJbQYSLHMEJsHVHSv5RCgZasJdfcbExEXIc6j4JIhpXti5VL3xIMxmIm+NJ3KQI4ng= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734714854; c=relaxed/simple; bh=DB9UWibh/wQp+GDutQPzG3b1VoBUBac7Nz/dQCkBW2A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tiQtZ355tR6P/XeKBlRLq6gzY7J5JTAKyA2OGlPg0ia3ymO7A7CI5xYm0CgR6W6L1g/bwOc04vAzw9E1JbA9N906fbP5101l2o5Cw0uihyB5LHa/S6dF6d64jD2yr9KjdWZyvipE2Flp78OB9axHchMFBXS3PoMEYZ5yuAoMoms= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hGPvN+rP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hGPvN+rP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD233C4CECD; Fri, 20 Dec 2024 17:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1734714853; bh=DB9UWibh/wQp+GDutQPzG3b1VoBUBac7Nz/dQCkBW2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hGPvN+rPw/YG+Wwkl5LwnrmczGPb0wgpCiUhspcQBA1A4geD1MwGQyJVYPX9/PP09 qploJQxB1cJd/X8s68XiS53rRkRkw+hmgEr+Ggs4+w3VTvAiotIvKj6ElkXf3QJjE9 l0bBNEKSMgvUmvWEp3pg4SLpfnIM4D29d7Mt84T93MMDvqKty72GDWJGKXD8Z258S0 b3cFtFocH4kAmPG84AsWX/9d5lrRfC3+rue51FDouF6OS0E7St399azP0OS0Kzm8Iu ayli2TDPKi01FVKAwJv+N+oh9iGWlS83DnhOM2hliuWQuKaCoIPlc3HzYbAUwd62Wm BycKIn/T7A4vQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Adrian Ratiu , Takashi Iwai , Takashi Iwai , Sasha Levin , perex@perex.cz, k.kosik@outlook.com, alexander@tsoy.me, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 3/7] sound: usb: format: don't warn that raw DSD is unsupported Date: Fri, 20 Dec 2024 12:14:02 -0500 Message-Id: <20241220171406.512413-3-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241220171406.512413-1-sashal@kernel.org> References: <20241220171406.512413-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.232 Content-Transfer-Encoding: 8bit From: Adrian Ratiu [ Upstream commit b50a3e98442b8d72f061617c7f7a71f7dba19484 ] UAC 2 & 3 DAC's set bit 31 of the format to signal support for a RAW_DATA type, typically used for DSD playback. This is correctly tested by (format & UAC*_FORMAT_TYPE_I_RAW_DATA), fp->dsd_raw = true; and call snd_usb_interface_dsd_format_quirks(), however a confusing and unnecessary message gets printed because the bit is not properly tested in the last "unsupported" if test: if (format & ~0x3F) { ... } For example the output: usb 7-1: new high-speed USB device number 5 using xhci_hcd usb 7-1: New USB device found, idVendor=262a, idProduct=9302, bcdDevice=0.01 usb 7-1: New USB device strings: Mfr=1, Product=2, SerialNumber=6 usb 7-1: Product: TC44C usb 7-1: Manufacturer: TC44C usb 7-1: SerialNumber: 5000000001 hid-generic 0003:262A:9302.001E: No inputs registered, leaving hid-generic 0003:262A:9302.001E: hidraw6: USB HID v1.00 Device [DDHIFI TC44C] on usb-0000:08:00.3-1/input0 usb 7-1: 2:4 : unsupported format bits 0x100000000 This last "unsupported format" is actually wrong: we know the format is a RAW_DATA which we assume is DSD, so there is no need to print the confusing message. This we unset bit 31 of the format after recognizing it, to avoid the message. Suggested-by: Takashi Iwai Signed-off-by: Adrian Ratiu Link: https://patch.msgid.link/20241209090529.16134-2-adrian.ratiu@collabora.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/format.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sound/usb/format.c b/sound/usb/format.c index 29ed301c6f06..552094012c49 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -61,6 +61,8 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip, pcm_formats |= SNDRV_PCM_FMTBIT_SPECIAL; /* flag potentially raw DSD capable altsettings */ fp->dsd_raw = true; + /* clear special format bit to avoid "unsupported format" msg below */ + format &= ~UAC2_FORMAT_TYPE_I_RAW_DATA; } format <<= 1; @@ -72,8 +74,11 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip, sample_width = as->bBitResolution; sample_bytes = as->bSubslotSize; - if (format & UAC3_FORMAT_TYPE_I_RAW_DATA) + if (format & UAC3_FORMAT_TYPE_I_RAW_DATA) { pcm_formats |= SNDRV_PCM_FMTBIT_SPECIAL; + /* clear special format bit to avoid "unsupported format" msg below */ + format &= ~UAC3_FORMAT_TYPE_I_RAW_DATA; + } format <<= 1; break; -- 2.39.5