From patchwork Tue Aug 29 19:51:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 111250 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp1857409qge; Tue, 29 Aug 2017 12:51:47 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7o91mdDsebB/U+Sx3LN02Cm+67yi/bJ1Qh9Xdu0ef1akqbbIVwQITJuC1oqedTb+tNQEMq X-Received: by 10.223.170.10 with SMTP id p10mr827709wrd.301.1504036307710; Tue, 29 Aug 2017 12:51:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504036307; cv=none; d=google.com; s=arc-20160816; b=ZQh1825RW/ghxE2a5sHCWa5fPvifvyAfYziG2HKv308IrMSrkBzYILzHn6zgElq5RU WqKmHuh6z3xm3vXNM6CURUek+S4xiiyd2YptvVlfR16IWx8qKhdZYKfDnZ8ld7Nv2glI RYSF92JoyYcqrTswboE9xpiC9exIGTWP+A2fpfWRG1QABZphNaCf6HN7Yy0dttRJ+/Sc rNN3D/qiHtZ5kl9YOIMKBXoUM9v3Ap74RirUmidc79fsSuDjy782eLUX6RSfI+mvfZzW KtVFd7Xylm8cmNkPIkccp88z2MHBYDuVohrammaFXpbT2FN9J62Iig5QJFaZnk6z1ppG camg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=AyskepyXme2J8blC2TcPUZq+IwJ4q/jZIrB7+vOFH6g=; b=F09J+vFcV+1lwa7qKDMy3aKLba/1aBW58HQOY0NZM8/T01uffSOQ9xYQFZwGakt19g +naLoKxzMQ8X/+mfhoJ6QvA0SNK5GWpYbC1yWrpc1ES8Atr3SovG8lLVkwJpI83BorKp 4U+xD7xTXhcoEMJYpD4U+ryPXo7WyZ7A/99Rub4qmWFNR9c6tKIC1/GyeXWB3HXgquSG ZpI/i7hcxfcCpY575cPl4h6gFqs81mAocD4oMRX3fM6YkD/+PoQs6GhDfXZwJUgvk8+6 yl43WARlo9q66ZEZrW33lTUnINUfdUUaK0GDqHO5/G4koYxIGFBdD0GYWN5dxHfISjqK 653Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=cgE4yXFR; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id 67si1825104wmw.182.2017.08.29.12.51.47; Tue, 29 Aug 2017 12:51:47 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=cgE4yXFR; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A7396266F44; Tue, 29 Aug 2017 21:51:45 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3987B266F89; Tue, 29 Aug 2017 21:51:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 0AD59266E37 for ; Tue, 29 Aug 2017 21:51:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=DG0+sgKR+cjCK3jnInZOWvnNmhCJLp66GZupnkrVpiM=; b=cgE4yXFRHfBu iHmuHfjmP49uqWYMhw5sUXouf1tluHL89uy8sDsn6xUiHZ9eMPZjhkkj/K46bwkCoMQTV8p905oJs wqANfQ/Zdhfe5Py5Fb4MqdNyI/+Pmx9EhfB8GQbqvoqCCmPdsLl/0cnt+/YpjH9J4AIPD3SnNXixO 17Tao=; Received: from 92.40.248.112.threembb.co.uk ([92.40.248.112] helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dmmXw-00041g-JH; Tue, 29 Aug 2017 19:51:36 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id EFFAB4400FC; Tue, 29 Aug 2017 20:51:35 +0100 (BST) From: Mark Brown To: Oskar Schirmer In-Reply-To: <1503697016-21422-1-git-send-email-oskar@scara.com> Message-Id: <20170829195135.EFFAB4400FC@finisterre.ee.mobilebroadband> Date: Tue, 29 Aug 2017 20:51:35 +0100 (BST) Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , Peter Ujfalusi , Mark Brown , Dan Murphy , Fabio Estevam , Andrew Morton , Andreas Dannenberg Subject: [alsa-devel] Applied "ASoC: tas2552: Fix fraction overflow in PLL calculation" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: tas2552: Fix fraction overflow in PLL calculation has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 1bb7cb68feb73a8106546cbd3379590297b0a950 Mon Sep 17 00:00:00 2001 From: Oskar Schirmer Date: Fri, 25 Aug 2017 21:36:56 +0000 Subject: [PATCH] ASoC: tas2552: Fix fraction overflow in PLL calculation Setting the PLL involves the calculation of a fixed point ratio with 4 decimal digits fraction, referred to as "J.D". The fraction "D" is stored separately from the integer part "J" and is limited to 0..9999. The current algorithm uses integer registers to calculate the fraction part, but failed to compensate for rounding errors, resulting in values larger than 9999 for the fraction part occasionally, e.g. for 44.1kHz audio rate and pll_clkin = 3763400 it would set J to 11 and D to 10002, which will at best result in wrong pitch. The critical part is the "pll_clkin / 10000", which would be ok with real numbers, but using integer arithmetic the rounding decreases the divisor, thus increasing the final quotient. The issue is solved by linear interpolation over the reciprocal function between the two adjacent points with integer divisor, i.e. pll_clkin / 10000 and pll_clkin / 10000 + 1, and doing all rounding to the lower result. As a side effect to the bug fix, the approximation to the desired frequency is much better, for the above mentioned example we get 11.9993, while the true ratio is 11.9993623. Signed-off-by: Oskar Schirmer Signed-off-by: Mark Brown --- sound/soc/codecs/tas2552.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c index 8840f72f3c4a..10116169a239 100644 --- a/sound/soc/codecs/tas2552.c +++ b/sound/soc/codecs/tas2552.c @@ -192,7 +192,7 @@ static int tas2552_setup_pll(struct snd_soc_codec *codec, * pll_clk = (.5 * pll_clkin * J.D) / 2^p * Need to fill in J and D here based on incoming freq */ - unsigned int d; + unsigned int d, q, t; u8 j; u8 pll_sel = (tas2552->pll_clk_id << 3) & TAS2552_PLL_SRC_MASK; u8 p = snd_soc_read(codec, TAS2552_PLL_CTRL_1); @@ -200,9 +200,12 @@ static int tas2552_setup_pll(struct snd_soc_codec *codec, p = (p >> 7); recalc: - j = (pll_clk * 2 * (1 << p)) / pll_clkin; - d = (pll_clk * 2 * (1 << p)) % pll_clkin; - d /= (pll_clkin / 10000); + t = (pll_clk * 2) << p; + j = t / pll_clkin; + d = t % pll_clkin; + t = pll_clkin / 10000; + q = d / (t + 1); + d = q + ((9999 - pll_clkin % 10000) * (d / t - q)) / 10000; if (d && (pll_clkin < 512000 || pll_clkin > 9200000)) { if (tas2552->pll_clk_id == TAS2552_PLL_CLKIN_BCLK) {