From patchwork Wed Oct 31 10:34:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 149776 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6610124ljp; Wed, 31 Oct 2018 03:35:00 -0700 (PDT) X-Google-Smtp-Source: AJdET5csHnVoGv5hVU0Bbfnagbre1aMLzpnpGaDVYOeqAdr1F+9GDTzaReGWaqMidLdzfqY0PuRh X-Received: by 2002:adf:9b12:: with SMTP id b18-v6mr2271245wrc.35.1540982100213; Wed, 31 Oct 2018 03:35:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540982100; cv=none; d=google.com; s=arc-20160816; b=a65d/uG8A8ow+U2DwypDc7TTSzz14KTLlZkq7Qq3Xs9i95MdNYKNDkadAo0fHkCiZp 1wgSpCAlJS9hOYwkuZHJBlqPcp6/vdoqcaMjEk5ykoHgl2JtNCKtg5bIkxvJLSfEJdqh +CUtASOyb67hiaPuj80vlgkhMEPJ9DIOzckY/a4XocZmnGB6yYDxq5QH7SZ8llXWsOea TwvORRfZAHoQS1cR+mKzgjsLoSMqZorF1PEtcNDJKvIdbglHkKuMJWAFY9h8CmvwNZSH yYeBs93e6KU/67JM9cMgt2AM4NwWi2uG6IUPRNOQlSLNZFKhj/3i1B2t0ezZHY1Ot8ZU NucQ== 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; bh=qrx+Se3GALFivShkvN3onLG/Z8Vujm1K9I5/hHtF5Cc=; b=xv1YLDIbJhadSqiLW4GffxlEAlIwA24FmWkKsQbxv7hHDbQGrU5qcxitvuwSqhqV+M k2Gjshv4xU1spxVcNJt8H0szZ4DITes0VPf99wU3BuVyAq431WNk+BC0X3qRxq0/XTC0 auyFmKkwDkZL+4Ag4r0X4AyTLTJa6+pSLARBW0uqRqB37e6v9qSHINFWcr2016sxpAVd H+n1F/PClRE9jErKPu0rKxSCYtqbBr5uIk+paMeYmP52a+wtNFLQH4lnstbGcKS+wr4E yirCFf09scSm/MU1swb6OmUQIEshJHtU9Ag0QQ9TQxPGTLVTZqye2zuanC8oeNRGdyRx 3IwQ== 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=tK+kYKuQ; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id g5-v6si7624353wrs.149.2018.10.31.03.35.00; Wed, 31 Oct 2018 03:35:00 -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=tK+kYKuQ; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4B5E92677D0; Wed, 31 Oct 2018 11:34:58 +0100 (CET) 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 04E962677D1; Wed, 31 Oct 2018 11:34:55 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE 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 4C2DB2675B8 for ; Wed, 31 Oct 2018 11:34:51 +0100 (CET) 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=nEbwDaB3ne5LYM9HAFpmLc0x+EopoXIqccbjFvj2148=; b=tK+kYKuQMsEH nqBskCoQPG3QflX2p1VmyPFJ28RzoEakQSe4KxlZLtgDVnEjlePSF/XHG43wviFxMdrin7XaBoIEv hkQGBmPcLJL6C9yv8bLoPVkfb242vb++jitOGIecxdQDIZixnOPsr8TIz/ygd+UukPz1PgB9Y171+ wUUaU=; Received: from [87.246.78.46] (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 1gHnpr-00044a-2H; Wed, 31 Oct 2018 10:34:51 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id A0ADE440078; Wed, 31 Oct 2018 10:34:50 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87ftwn0x15.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181031103450.A0ADE440078@finisterre.ee.mobilebroadband> Date: Wed, 31 Oct 2018 10:34:50 +0000 (GMT) Cc: alsa-devel@alsa-project.org, RYO KATAOKA , TAKAMITSU HONDA , Ryusuke Sakato , TAKESHI KIHARA , Yusuke Goda , Mark Brown , HIROYUKI YOKOYAMA , YOSHIYUKI ITO , YUTA WAKASAWA , Masao Nomura Subject: [alsa-devel] Applied "ASoC: rsnd: fixup clock start checker" 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: rsnd: fixup clock start checker has been applied to the asoc tree at https://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 3ee9a76a8c5a10e1bfb04b81db767c6d562ddaf3 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 31 Oct 2018 00:48:12 +0000 Subject: [PATCH] ASoC: rsnd: fixup clock start checker commit 4d230d12710646 ("ASoC: rsnd: fixup not to call clk_get/set under non-atomic") fixuped clock start timing. But it exchanged clock start checker from ssi->usrcnt to ssi->rate. Current rsnd_ssi_master_clk_start() is called from .prepare, but some player (for example GStreamer) might calls it many times. In such case, the checker might returns error even though it was not error. It should check ssi->usrcnt instead of ssi->rate. This patch fixup it. Without this patch, GStreamer can't switch 48kHz / 44.1kHz. Reported-by: Yusuke Goda Signed-off-by: Kuninori Morimoto Tested-by: Yusuke Goda Signed-off-by: Mark Brown --- sound/soc/sh/rcar/ssi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.19.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index fcb4df23248c..6ec78f3096dd 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -306,7 +306,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, if (rsnd_ssi_is_multi_slave(mod, io)) return 0; - if (ssi->rate) { + if (ssi->usrcnt > 1) { if (ssi->rate != rate) { dev_err(dev, "SSI parent/child should use same rate\n"); return -EINVAL;