From patchwork Mon Sep 17 21:20:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 146862 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4245153ljw; Mon, 17 Sep 2018 14:21:07 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYvqMhGeqqRO07vjlQ/WaW/769Ije+Ov3bN0nOomVY/cQPvocwxxoZW+E6wgpjHxSQ8nsMi X-Received: by 2002:a1c:d141:: with SMTP id i62-v6mr12295096wmg.113.1537219267264; Mon, 17 Sep 2018 14:21:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537219267; cv=none; d=google.com; s=arc-20160816; b=E3Lm96hd1q+5ceU2u8F4HTX01XAvKiUIU5UylnRx3Qtcn1sBT0tRZs8qWZWRrXa0ac rWjzo4H51aeyx2F9777QhlnJLXXFBgdT6bNjYKrqh1i15bE5YdSyB/31CZBXXNWinuY4 s7rvTDSWpGM9h1SLuQmAWKAB0tR7G1PhUg3EKvwZk2Al+PwLrPH6Nx5eRjWiZrgzo8Kd qgWp7Td3ckHDGOuTdsEUkA+YMYBS/yAXBNPT2bpakwc6kS40l8IK7ov1z0eDmoWEBqIQ /1EbVASrYxVZqNShmBMGUQIlKZV7BDErngkKUR5+0F+m37rSrnGbsIRWM3FooO7UfuHH ypWg== 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=mwS3ffix7IzqKoUplTsT10NKoTELuqSCtVYJfjRSYhQ=; b=nTvPFsaPKVGfUSjcbZznXpPwLZeu2D2MSvYzL+F+05hUKQ4u9s4XAuITKEJtsWMhON ss0/KJj6Ew3DCgmhQbCddeuwzPKVjdCBOMD72AuIMDKEDNixEEuPCzazNcjkk7Ej1TCR uXlnmvimKwn2u125gN38EmcpAQMnsEZZgbmyNDvybrmU8q/ullYIypete1qbHWaPo5bo 0xmvySiJCqLEHdvVU8gXF92QrSGGJ69B71Ga7CdlFAbs9xF1qERUKS/NuhW7Lr/4WhHq U1Ryn+0A6lffWYOg/EeVQ+jLd7p6iIQV/0EOKeKbQ5ysM4uq09/xRlWYoFpw2KGbBqEp TLgQ== 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=gISq0eo5; 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 n13-v6si15007444wro.28.2018.09.17.14.21.06; Mon, 17 Sep 2018 14:21:07 -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=gISq0eo5; 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 296D626788B; Mon, 17 Sep 2018 23:21:05 +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 3264226788C; Mon, 17 Sep 2018 23:21:03 +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.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS 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 8222C267889 for ; Mon, 17 Sep 2018 23:21:00 +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=bCKHvQyOGk5PsNQc+jH8XAu6xNtm+oC5JOcCgPp/R94=; b=gISq0eo5JXmm 4urEPnNS5hP3ufBhQcxDkR12NTJwG6PmFyhH8Yhb3SjXKddmFQ147pAHMQLD+E1aFGE2X3agMfj97 v/9hatEuWmg0kArxmxRTP3g8C57U+F1Ui2L3Xeh5BMdhSaNJ5rpkw3MZs1CzipYqHDL3z8qGU9ZZY 32aLw=; Received: from [209.121.128.187] (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 1g20x0-0000jy-IH; Mon, 17 Sep 2018 21:20:58 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id A8EFC440078; Mon, 17 Sep 2018 22:20:56 +0100 (BST) From: Mark Brown To: Oder Chiou In-Reply-To: <1537182189-13694-1-git-send-email-oder_chiou@realtek.com> Message-Id: <20180917212056.A8EFC440078@finisterre.ee.mobilebroadband> Date: Mon, 17 Sep 2018 22:20:56 +0100 (BST) Cc: jack.yu@realtek.com, alsa-devel@alsa-project.org, cychiang@google.com, lgirdwood@gmail.com, yuhsuan@google.com, broonie@kernel.org, shumingf@realtek.com, flove@realtek.com Subject: [alsa-devel] Applied "ASoC: rt5514-spi: Get the period_bytes in the copy work to make sure the value correctly" 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: rt5514-spi: Get the period_bytes in the copy work to make sure the value correctly 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 fbb673f7c6555d5434ad005f86b0d4368b1203d9 Mon Sep 17 00:00:00 2001 From: Oder Chiou Date: Mon, 17 Sep 2018 19:03:09 +0800 Subject: [PATCH] ASoC: rt5514-spi: Get the period_bytes in the copy work to make sure the value correctly The value of period_bytes will get the zero before the hw_params() is not run completely. Move the function snd_pcm_lib_period_bytes() to copy work, and make sure that is not zero. Signed-off-by: Oder Chiou Signed-off-by: Mark Brown --- sound/soc/codecs/rt5514-spi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 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/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 18686ffb0cd5..13809821e1f8 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -91,6 +91,14 @@ static void rt5514_spi_copy_work(struct work_struct *work) runtime = rt5514_dsp->substream->runtime; period_bytes = snd_pcm_lib_period_bytes(rt5514_dsp->substream); + if (!period_bytes) { + schedule_delayed_work(&rt5514_dsp->copy_work, 5); + goto done; + } + + if (rt5514_dsp->buf_size % period_bytes) + rt5514_dsp->buf_size = (rt5514_dsp->buf_size / period_bytes) * + period_bytes; if (rt5514_dsp->get_size >= rt5514_dsp->buf_size) { rt5514_spi_burst_read(RT5514_BUFFER_VOICE_WP, (u8 *)&buf, @@ -149,13 +157,11 @@ static void rt5514_spi_copy_work(struct work_struct *work) static void rt5514_schedule_copy(struct rt5514_dsp *rt5514_dsp) { - size_t period_bytes; u8 buf[8]; if (!rt5514_dsp->substream) return; - period_bytes = snd_pcm_lib_period_bytes(rt5514_dsp->substream); rt5514_dsp->get_size = 0; /** @@ -183,10 +189,6 @@ static void rt5514_schedule_copy(struct rt5514_dsp *rt5514_dsp) rt5514_dsp->buf_size = rt5514_dsp->buf_limit - rt5514_dsp->buf_base; - if (rt5514_dsp->buf_size % period_bytes) - rt5514_dsp->buf_size = (rt5514_dsp->buf_size / period_bytes) * - period_bytes; - if (rt5514_dsp->buf_base && rt5514_dsp->buf_limit && rt5514_dsp->buf_rp && rt5514_dsp->buf_size) schedule_delayed_work(&rt5514_dsp->copy_work, 0);