From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EFE9C433DB for ; Sat, 23 Jan 2021 17:31:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DF3AF22C9C for ; Sat, 23 Jan 2021 17:31:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726057AbhAWRbH (ORCPT ); Sat, 23 Jan 2021 12:31:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:53968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725550AbhAWRat (ORCPT ); Sat, 23 Jan 2021 12:30:49 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7A65122B2C; Sat, 23 Jan 2021 17:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611423002; bh=SijsJP6XJDLyDad0Q+qEK6H9AacK/MX9V42CKBdylI4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q2u7KgC2op0dGZ3WO8eRaOoijTsNKexbNmbYvC1eLBoZd5lc5QFMJ1zQfc6CVBZXX 7JFTKG/7knqMy8FQmCnMD86RaKzM5jdnN+9wCcvl8ntgyV/wp38CKS8sUaM3HgO9wR bsqKmAIhEpwgm3lo3x7h8n/b08JA8nEfx6rv5I0fDKUV7nyXcp93ELf9TP3lZsxHoC yL19S1m67U99DLf7S8mQSe/JLfm7CEKRqgYXGjSyc622DMF6J1ldHtvYl5cYi/Y/iK TgTtdFtYn0OwXBsnHnriYMK5+eDuK+UwDzFOhJB/kkqiPTpM2BYZOds82v/le7cK+h d1rgktc3OIeLA== Received: by earth.universe (Postfix, from userid 1000) id 4D6153C0C95; Sat, 23 Jan 2021 18:30:00 +0100 (CET) From: Sebastian Reichel To: Sebastian Reichel , Tony Lindgren , Pavel Machek , Merlijn Wajer , Mark Brown , Liam Girdwood Cc: Dan Carpenter , linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCHv1] ASoC: cpcap: fix microphone timeslot mask Date: Sat, 23 Jan 2021 18:29:45 +0100 Message-Id: <20210123172945.3958622-1-sre@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The correct mask is 0x1f8 (Bit 3-8), but due to missing BIT() 0xf (Bit 0-3) was set instead. This means setting of CPCAP_BIT_MIC1_RX_TIMESLOT0 (Bit 3) still worked (part of both masks). On the other hand the code does not properly clear the other MIC timeslot bits. I think this is not a problem, since they are probably initialized to 0 and not touched by the driver anywhere else. But the mask also contains some wrong bits, that will be cleared. Bit 0 (CPCAP_BIT_SMB_CDC) should be safe, since the driver enforces it to be 0 anyways. Bit 1-2 are CPCAP_BIT_FS_INV and CPCAP_BIT_CLK_INV. This means enabling audio recording forces the codec into SND_SOC_DAIFMT_NB_NF mode, which is obviously bad. The bug probably remained undetected, because there are not many use cases for routing microphone to the CPU on platforms using cpcap and user base is small. I do remember having some issues with bad sound quality when testing voice recording back when I wrote the driver. It probably was this bug. Fixes: f6cdf2d3445d ("ASoC: cpcap: new codec") Reported-by: Dan Carpenter Signed-off-by: Sebastian Reichel --- Hi, This is compile tested only, since I currently do not have my Droid 4 ready for running some tests. Maybe Tony, Pavel or Merlijn can give it a go using e.g. arecord. Thanks, -- Sebastian --- sound/soc/codecs/cpcap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/cpcap.c b/sound/soc/codecs/cpcap.c index e266d993ab2a..05bbacd0d174 100644 --- a/sound/soc/codecs/cpcap.c +++ b/sound/soc/codecs/cpcap.c @@ -1273,12 +1273,12 @@ static int cpcap_voice_hw_params(struct snd_pcm_substream *substream, if (direction == SNDRV_PCM_STREAM_CAPTURE) { mask = 0x0000; - mask |= CPCAP_BIT_MIC1_RX_TIMESLOT0; - mask |= CPCAP_BIT_MIC1_RX_TIMESLOT1; - mask |= CPCAP_BIT_MIC1_RX_TIMESLOT2; - mask |= CPCAP_BIT_MIC2_TIMESLOT0; - mask |= CPCAP_BIT_MIC2_TIMESLOT1; - mask |= CPCAP_BIT_MIC2_TIMESLOT2; + mask |= BIT(CPCAP_BIT_MIC1_RX_TIMESLOT0); + mask |= BIT(CPCAP_BIT_MIC1_RX_TIMESLOT1); + mask |= BIT(CPCAP_BIT_MIC1_RX_TIMESLOT2); + mask |= BIT(CPCAP_BIT_MIC2_TIMESLOT0); + mask |= BIT(CPCAP_BIT_MIC2_TIMESLOT1); + mask |= BIT(CPCAP_BIT_MIC2_TIMESLOT2); val = 0x0000; if (channels >= 2) val = BIT(CPCAP_BIT_MIC1_RX_TIMESLOT0); -- 2.29.2