Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp227726pxj; Tue, 18 May 2021 01:52:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcB2nfUz55lTDcJvYnLm4jAQ+ndypkMEGOjeL2oHlJpGa9UwrBdLCe1qbSk9eVegk86vnP X-Received: by 2002:a6b:6d0e:: with SMTP id a14mr3426093iod.40.1621327940295; Tue, 18 May 2021 01:52:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621327940; cv=none; d=google.com; s=arc-20160816; b=Y9aIWCUiFpQRVa2kQ6I635/+/3ctFdgfWmXfLFRjb9qLrb9cozlB3+N2TN4K50OCEE tX/WOpOZm15j1P5DpsR7MHvK1+LC/cIZ7SkSIVqCntJ8O5N0pf7uitfZWtZC16lKfwsi ZiURJjBg2XE4Ersa1mEjIcSPpql3H3jsIBjA+/brvtu/tFcFs9qMyunYm698obUegXXq 45aBbXUnlc3aEcCTV+aV5T++jJf/WDg5ZwOVqfXA3b+l83ITBFsRHQZUnL72dkgyR4VJ E3XcCmoDT/CBLJIER+Q/1VgWmJGcgdXMBqjrSZhENsq+ySo60vHBJHLHr+ud812T6EMd hG8g== 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=tbZw4vvg6WqC0qcC11mcxXM9ysilWw6DjxKNH/9Z8S0=; b=K6KR/75P0h97MhbUl7I9RIakk115hLQVOdSpf1IhzZZZaPOivaolqZnT2pIkSFaAhc xy44Cy9td0HDDlYYv6vzNTV4hXceCbPku7qyC2/mkvItxZqiNaQNpSvLo2yGXq850PuP ntNivz0iNVGJdjDesgujSvAQ+QfWafqfqpSXvsdQvptjsBOnHtBfPLVS8yhRN07h57zF OlX8SgrdcNrcHghFERzdW/t1jHErj0KPyb9e/3I2nJUYqc/ggzB1VTJy1I3S7Mp6MOze OnUyyvDqvIZhAk8OQoNoHM8s3CsjbKxkLuQoiA7iKHm5hUPSEodwUFWsz0270tDecCNA RYPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UxFKBPQZ; 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 m1si23604542ilu.13.2021.05.18.01.52.07; Tue, 18 May 2021 01:52:20 -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=UxFKBPQZ; 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 S242548AbhEQPC4 (ORCPT + 99 others); Mon, 17 May 2021 11:02:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:49086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240902AbhEQOwl (ORCPT ); Mon, 17 May 2021 10:52:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6E60A6199C; Mon, 17 May 2021 14:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621261438; bh=BMgVRc07yMdSNpu4EtODLQluJHjs8aTrZ8NbIbKt+d4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UxFKBPQZyCMoQi77oO1CG78yngZrR5l6dAdTA4dXhCe/yl3cdmURsxn4U7A6AaRoF /CZYyN29ntNpwjipSVeGrXOOO4s7TBP3KZWby+EEbiFtmQ9ZaMGDv1/8nvaHU6LYH4 8STCTW4qrvYl/1PXuFY5VmMzyUw7OsBa7UslW+GI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mikhail Durnev , Mark Brown , Sasha Levin Subject: [PATCH 5.10 020/289] ASoC: rsnd: core: Check convert rate in rsnd_hw_params Date: Mon, 17 May 2021 15:59:05 +0200 Message-Id: <20210517140305.862589919@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140305.140529752@linuxfoundation.org> References: <20210517140305.140529752@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: Mikhail Durnev [ Upstream commit 19c6a63ced5e07e40f3a5255cb1f0fe0d3be7b14 ] snd_pcm_hw_params_set_rate_near can return incorrect sample rate in some cases, e.g. when the backend output rate is set to some value higher than 48000 Hz and the input rate is 8000 Hz. So passing the value returned by snd_pcm_hw_params_set_rate_near to snd_pcm_hw_params will result in "FSO/FSI ratio error" and playing no audio at all while the userland is not properly notified about the issue. If SRC is unable to convert the requested sample rate to the sample rate the backend is using, then the requested sample rate should be adjusted in rsnd_hw_params. The userland will be notified about that change in the returned hw_params structure. Signed-off-by: Mikhail Durnev Link: https://lore.kernel.org/r/1615870055-13954-1-git-send-email-mikhail_durnev@mentor.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sh/rcar/core.c | 69 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 6e670b3e92a0..289928d4c0c9 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1428,8 +1428,75 @@ static int rsnd_hw_params(struct snd_soc_component *component, } if (io->converted_chan) dev_dbg(dev, "convert channels = %d\n", io->converted_chan); - if (io->converted_rate) + if (io->converted_rate) { + /* + * SRC supports convert rates from params_rate(hw_params)/k_down + * to params_rate(hw_params)*k_up, where k_up is always 6, and + * k_down depends on number of channels and SRC unit. + * So all SRC units can upsample audio up to 6 times regardless + * its number of channels. And all SRC units can downsample + * 2 channel audio up to 6 times too. + */ + int k_up = 6; + int k_down = 6; + int channel; + struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io); + dev_dbg(dev, "convert rate = %d\n", io->converted_rate); + + channel = io->converted_chan ? io->converted_chan : + params_channels(hw_params); + + switch (rsnd_mod_id(src_mod)) { + /* + * SRC0 can downsample 4, 6 and 8 channel audio up to 4 times. + * SRC1, SRC3 and SRC4 can downsample 4 channel audio + * up to 4 times. + * SRC1, SRC3 and SRC4 can downsample 6 and 8 channel audio + * no more than twice. + */ + case 1: + case 3: + case 4: + if (channel > 4) { + k_down = 2; + break; + } + fallthrough; + case 0: + if (channel > 2) + k_down = 4; + break; + + /* Other SRC units do not support more than 2 channels */ + default: + if (channel > 2) + return -EINVAL; + } + + if (params_rate(hw_params) > io->converted_rate * k_down) { + hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->min = + io->converted_rate * k_down; + hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->max = + io->converted_rate * k_down; + hw_params->cmask |= SNDRV_PCM_HW_PARAM_RATE; + } else if (params_rate(hw_params) * k_up < io->converted_rate) { + hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->min = + (io->converted_rate + k_up - 1) / k_up; + hw_param_interval(hw_params, SNDRV_PCM_HW_PARAM_RATE)->max = + (io->converted_rate + k_up - 1) / k_up; + hw_params->cmask |= SNDRV_PCM_HW_PARAM_RATE; + } + + /* + * TBD: Max SRC input and output rates also depend on number + * of channels and SRC unit: + * SRC1, SRC3 and SRC4 do not support more than 128kHz + * for 6 channel and 96kHz for 8 channel audio. + * Perhaps this function should return EINVAL if the input or + * the output rate exceeds the limitation. + */ + } } return rsnd_dai_call(hw_params, io, substream, hw_params); -- 2.30.2