Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3771189pxt; Tue, 10 Aug 2021 10:57:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIac20q5x4FaLOK5bR4gSOWZVgJoClB6fOH2vQJHM+P4PEWWI/mzjv6VSJn7LrVF91p1ze X-Received: by 2002:a6b:c906:: with SMTP id z6mr33441iof.7.1628618231952; Tue, 10 Aug 2021 10:57:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628618231; cv=none; d=google.com; s=arc-20160816; b=E7x9+BPwos0yCg5YtfQBHwg4oM3vRiqGgiB8LEqBe/uonXXaSz9Pn7FA5HbVgDbbb7 Q+F0H/0IkmPjhwyJNC8oI3KP8YXFYZ5ccwNdEg0FX27SqlUkQaZpNylb+mJZ3n9HVodJ M8cAO6Mg+t6rFmu6+kBpMwtg9eJfUVjS1hS1drsZWwVPmWTlbiDv4xHkJmJHTh6Cbp76 Twn9nGhu9PtKcudoRb2NKi/6PhP4dbHSXxHaFFdxrLlaOvvTXPY991Gc3Bojf+Mh93xN oPv2IAewX9s4YiqpcDUzp/ldQpa+gcIEIeVRzRtpvafMA370oX0o4eiRSsF4PhJyrE4X Ldug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HkWF7ZFY/xefw3+gE3GAaP7Tw8+qgpR6xexb346zcXM=; b=a4RjyDRAK2YC/fNKSOmfyY8L7ft3wVoSz+fVSlhk2k2XLsfyTMINMRsotKyC1nePfG Az0uRT2qQKN9m6xDiHAhZYYp0Pk2zM9ke6C3JZZ+Zi9fHKduxlUqdCdXyCV85VE+yQh9 F2xGpqxM8mVHj8u91XUzKL1DY0fTuGPuN570UcdGVo9nKiXktBGmnE9G01W/5qpP7Wwg +F65vK1gtERtd9ZHF2OMhjgvjXLlOtUWYpLkNJmfEzvJ76jBrzv0ind74qKXj0vvFEOi knINW2X4lmS1KrnSnLJn7FPtth26eJKKZXF5Q3+vD0TjxU8YNwA8t+q/lfjHcoM/AXXO UjAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="EEOgPq//"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e26si9640582jam.19.2021.08.10.10.57.00; Tue, 10 Aug 2021 10:57:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="EEOgPq//"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237003AbhHJRyN (ORCPT + 99 others); Tue, 10 Aug 2021 13:54:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:56820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237311AbhHJRuW (ORCPT ); Tue, 10 Aug 2021 13:50:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 470BE61268; Tue, 10 Aug 2021 17:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617355; bh=FdWywKv8SbwuIqYa5xSaii43ysuEvBOKZD29oT8IvRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EEOgPq//ekUECof4soH+VIZmerI3zlfnIHfDqfP2dH10mah7GYsb3nH97Ld9Kyq9y PzMpS06XuPUyGJotDmMabjBb/IMxmgzMtwcJ8JwSDhobeBmludfiRCnZT2JMTQQPvv qFn/CpLxScIvBVpFq31ZGW0UsB12UcCNBgR1cw1I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "chihhao.chen" , Takashi Iwai , Sasha Levin Subject: [PATCH 5.13 022/175] ALSA: usb-audio: fix incorrect clock source setting Date: Tue, 10 Aug 2021 19:28:50 +0200 Message-Id: <20210810173001.684698695@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: chihhao.chen [ Upstream commit 4511781f95da0a3b2bad34f3f5e3967e80cd2d18 ] The following scenario describes an echo test for Samsung USBC Headset (AKG) with VID/PID (0x04e8/0xa051). We first start a capture stream(USB IN transfer) in 96Khz/24bit/1ch mode. In clock find source function, we get value 0x2 for clock selector and 0x1 for clock source. Kernel-4.14 behavior Since clock source is valid so clock selector was not set again. We pass through this function and start a playback stream(USB OUT transfer) in 48Khz/32bit/2ch mode. This time we get value 0x1 for clock selector and 0x1 for clock source. Finally clock id with this setting is 0x9. Kernel-5.10 behavior Clock selector was always set one more time even it is valid. When we start a playback stream, we will get 0x2 for clock selector and 0x1 for clock source. In this case clock id becomes 0xA. This is an incorrect clock source setting and results in severe noises. We see wrong data rate in USB IN transfer. (From 288 bytes/ms becomes 144 bytes/ms) It should keep in 288 bytes/ms. This earphone works fine on older kernel version load because this is a newly-added behavior. Fixes: d2e8f641257d ("ALSA: usb-audio: Explicitly set up the clock selector") Signed-off-by: chihhao.chen Link: https://lore.kernel.org/r/1627100621-19225-1-git-send-email-chihhao.chen@mediatek.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/clock.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/usb/clock.c b/sound/usb/clock.c index 17bbde73d4d1..14772209194b 100644 --- a/sound/usb/clock.c +++ b/sound/usb/clock.c @@ -325,6 +325,12 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip, selector->baCSourceID[ret - 1], visited, validate); if (ret > 0) { + /* + * For Samsung USBC Headset (AKG), setting clock selector again + * will result in incorrect default clock setting problems + */ + if (chip->usb_id == USB_ID(0x04e8, 0xa051)) + return ret; err = uac_clock_selector_set_val(chip, entity_id, cur); if (err < 0) return err; -- 2.30.2