From patchwork Fri Nov 23 14:10:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 151860 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2162844ljp; Fri, 23 Nov 2018 06:10:59 -0800 (PST) X-Google-Smtp-Source: AFSGD/WK1ewc2OGBCMI288Mz+dSlpJdC8jhjO6+i7iaap1D6+Q+Q4Yfj1dfLUxaBW/co8o/LAr16 X-Received: by 2002:a1c:9081:: with SMTP id s123mr14117947wmd.126.1542982259644; Fri, 23 Nov 2018 06:10:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542982259; cv=none; d=google.com; s=arc-20160816; b=R9CFFUOFr7bj5E9XXnU7kqzfB+aimHRNnejRLhcN30kLVqulXQhvygonaWCsnGM2OZ eweB1hNvSwlJoSAa9b2jwTYLc9f48G4p1mB2B9hktx62FOUO6l7NS4VAeRwaZ9dB2MeZ aANKgxqLuppaLLsZmcD1bEBANSp47TsM3qaOWn6I6LizKvUMyt4GenRmtYlFdl40FfJJ 9aHyaQtAQrKyNvrheil825BaTg7ZltnZJuBUX1l86Dwje+V47w3uIUaZvxvgv8wn+4iz DXvTGXOJx7lEL3UOblfORyFVbB9Ik6RcjRwvbcd7wq1s+nLg7UQbqaBmFlX+nUH2tCLl xW9A== 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=zodeGnpcMZPk+cPjjXO+ORHpMmHV+bgGzMlbtsxE6QA=; b=JKkdleC27WTfa0dhTurneDcAlAR74oHDQKD7hriHDOhP41EAVXURjb+EXarA8Xa/UF l/p95+Wdb2W2j24YBJGx0WvLhgG+k2rsWcZR8OiLddm2qR1zkh8oJO1z3L2W5ct4vPf9 YvRpnuSYQBFn91AhEhFbHm4ibpNR/pKxj3XQJxUHVwNiSERAK4C3RKc9uOCYTnwdu+Qf 3bzbE9CSNRYBmf8GOZUlpT7fxxkWldC3DzoBCvYhwBXMGfu+oUAq75Akv2DK1Hejbq6Q /MWr/OeqU8ihU4TN0fU79YFqEhky1P8Jswkfx/nu51kGesbol6XOw2/tE0bxjaxrcdZk W9Kg== 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=uAWNGnE3; 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 q10si15100961wrd.104.2018.11.23.06.10.59; Fri, 23 Nov 2018 06:10:59 -0800 (PST) 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=uAWNGnE3; 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 7FF3E2678F7; Fri, 23 Nov 2018 15:10:57 +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 6F9C9267947; Fri, 23 Nov 2018 15:10:54 +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.0 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 898BE2678DF for ; Fri, 23 Nov 2018 15:10:52 +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=etD0Dxnw/kT1ZS4YpgkEi3dTP7WN/6b82uE/WK9SoeM=; b=uAWNGnE3wFvE mak3B2GsWoGBwrcUrHHpCjpRhKzE2oQaHWv+lAqx77K5UEer+x0SJLXW1MJW51OI0WqIKo2HcroLr /1nAT2yLXv1oemAixwZy4egO1dT0O1NvvKChOuq7fyQ9QYm9siWsEFr6L8jgx6H+w1ZNhbfGFFI+1 co7sw=; Received: from [176.12.107.140] (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 1gQCAU-000179-Jx; Fri, 23 Nov 2018 14:10:50 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 29479440078; Fri, 23 Nov 2018 14:10:49 +0000 (GMT) From: Mark Brown To: Peter Ujfalusi In-Reply-To: <20181114110623.30932-4-peter.ujfalusi@ti.com> Message-Id: <20181123141049.29479440078@finisterre.ee.mobilebroadband> Date: Fri, 23 Nov 2018 14:10:49 +0000 (GMT) Cc: alsa-devel@alsa-project.org, matt@ranostay.consulting, tony@atomide.com, hns@goldelico.com, Liam Girdwood , Mark Brown , kernel@pyra-handheld.com, linux-omap@vger.kernel.org, jarkko.nikula@bitmer.com Subject: [alsa-devel] Applied "ASoC: omap-dmic: Add pm_qos handling to avoid overruns with CPU_IDLE" 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: omap-dmic: Add pm_qos handling to avoid overruns with CPU_IDLE 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 ffdcc3638c58d55a6fa68b6e5dfd4fb4109652eb Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 14 Nov 2018 13:06:23 +0200 Subject: [PATCH] ASoC: omap-dmic: Add pm_qos handling to avoid overruns with CPU_IDLE We need to block sleep states which would require longer time to leave than the time the DMA must react to the DMA request in order to keep the FIFO serviced without overrun. Signed-off-by: Peter Ujfalusi Acked-by: Jarkko Nikula Signed-off-by: Mark Brown --- sound/soc/omap/omap-dmic.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.19.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index fe966272bd0c..cba9645b6487 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -48,6 +48,8 @@ struct omap_dmic { struct device *dev; void __iomem *io_base; struct clk *fclk; + struct pm_qos_request pm_qos_req; + int latency; int fclk_freq; int out_freq; int clk_div; @@ -124,6 +126,8 @@ static void omap_dmic_dai_shutdown(struct snd_pcm_substream *substream, mutex_lock(&dmic->mutex); + pm_qos_remove_request(&dmic->pm_qos_req); + if (!dai->active) dmic->active = 0; @@ -228,6 +232,8 @@ static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream, /* packet size is threshold * channels */ dma_data = snd_soc_dai_get_dma_data(dai, substream); dma_data->maxburst = dmic->threshold * channels; + dmic->latency = (OMAP_DMIC_THRES_MAX - dmic->threshold) * USEC_PER_SEC / + params_rate(params); return 0; } @@ -238,6 +244,9 @@ static int omap_dmic_dai_prepare(struct snd_pcm_substream *substream, struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai); u32 ctrl; + if (pm_qos_request_active(&dmic->pm_qos_req)) + pm_qos_update_request(&dmic->pm_qos_req, dmic->latency); + /* Configure uplink threshold */ omap_dmic_write(dmic, OMAP_DMIC_FIFO_CTRL_REG, dmic->threshold);