From patchwork Wed Jul 4 14:42:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 141067 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp886716ljj; Wed, 4 Jul 2018 07:42:29 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfvG3CB0KF47fCWZdoYzGdCbyz2fJ/gJdTeKoMfUIKb1Yh8iJDoYOD+CWCamliEcpp5c719 X-Received: by 2002:adf:e9c1:: with SMTP id l1-v6mr1769148wrn.14.1530715349169; Wed, 04 Jul 2018 07:42:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530715349; cv=none; d=google.com; s=arc-20160816; b=bKgKzLRgGAOpUmN0acv0aaDivx0X7wEipGrBFoJCAP/U9OMbPxOSS82DtJvK3+IaCt 2rYbzp67lEJRi0m5NOgmHqqFoUwMFBZHZazfvtnrd5mbkVS94hVCxbkWaoPOMjbTOS45 jrgKGxy8cLEbynmwKp4bok5HIco1MHiIEc0obNu12degn/YIGUbl+hXz0SXph+WE4ndW sIo7SQtz0sX2QeF7AGqucVOHmLylIOXukWEx98Kp3k2EjF8vAf/UOrWDnDCeYGlXhi+1 tCVauydkYHq0OKj+LDP4/6rW9/b7IDYiXOIPHSR3egbMw6rJyNF2DcMH8teYXbFbzXWt NQrg== 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=Gb/uGQLiGswYA0F24G8XB4IRw9bwcrmJLtuEnoLJpm8=; b=imVqtd5CKh/20BAJODiiJSphovIlUUbQMX95pH7i+rHcK9c//PhwmAwZxWbHADtARI txAnHMFNdBBKQbn+w/g/UqJIV6UrlIs8o6yGEJqv3uOb1Wtuy3KzDKkcX9nHfwcvVs0f k4o5QuD5QhcRly7f5k6T5II/K+twgoIlkv1bZZm81QT09F4nIfjjuaflrbDt/Y1m3n9g cel8v/wcAZBaNJY5MeyruW/v3KUDEaQ0JdaEsEKNt5xt+hJUc4u1O3Q4Qu8iLzH0WzZK in86qmAbtjQNWUttqXI3aDpymS1zLnOPMu81A/aVOKZASAgSW82bgKf6qWFs0ffFTbo7 qgLg== 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=OJWTnh1V; 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 a202-v6si3130412wmd.181.2018.07.04.07.42.28; Wed, 04 Jul 2018 07:42:29 -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=OJWTnh1V; 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 A785026778A; Wed, 4 Jul 2018 16:42:18 +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 5FD3B26779B; Wed, 4 Jul 2018 16:42:16 +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 F35E4267790 for ; Wed, 4 Jul 2018 16:42:12 +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=fad4x0IDg/WlyC1hT9ptDBZuKAPnjduFcwQCCqOzcgk=; b=OJWTnh1VxFIX dPq39wPg8lXZCp21hGtT+QyUlnqhk2ExX9ub1vbOASHo3mZZ2jmsCCl7DH0ozKvQtSNfi81yelQPI PcRTnor9/+uZEmLeKgqiJw0e7fOJLRB9XHp5LUMThwWK1bEgHtV6yPkVCpMnZocfuhY/1vpwS1Blk u55pM=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1faiyt-00073w-Da; Wed, 04 Jul 2018 14:42:07 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1faiys-00041m-WE; Wed, 04 Jul 2018 15:42:07 +0100 From: Mark Brown To: Takashi Iwai In-Reply-To: <20180704140146.6768-4-tiwai@suse.de> Message-Id: Date: Wed, 04 Jul 2018 15:42:06 +0100 Cc: alsa-devel@alsa-project.org, Banajit Goswami , Alexandre Torgue , Patrick Lai , Peter Ujfalusi , Mark Brown , Maxime Coquelin Subject: [alsa-devel] Applied "ASoC: sti: Use snd_pcm_stop_xrun() helper" 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: sti: Use snd_pcm_stop_xrun() helper 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 dc865fb9e7c2251c9585ff6a7bf185d499db13e4 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 4 Jul 2018 16:01:45 +0200 Subject: [PATCH] ASoC: sti: Use snd_pcm_stop_xrun() helper The XRUN trigger from the driver should be done via snd_pcm_stop_xrun(). It fixes the missing stream locking as a gratis, too. Signed-off-by: Takashi Iwai Signed-off-by: Mark Brown --- sound/soc/sti/uniperif_player.c | 6 +++--- sound/soc/sti/uniperif_reader.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.18.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c index d8b6936e544e..313dab2857ef 100644 --- a/sound/soc/sti/uniperif_player.c +++ b/sound/soc/sti/uniperif_player.c @@ -91,7 +91,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id) SET_UNIPERIF_ITM_BCLR_FIFO_ERROR(player); /* Stop the player */ - snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN); + snd_pcm_stop_xrun(player->substream); } ret = IRQ_HANDLED; @@ -105,7 +105,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id) SET_UNIPERIF_ITM_BCLR_DMA_ERROR(player); /* Stop the player */ - snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN); + snd_pcm_stop_xrun(player->substream); ret = IRQ_HANDLED; } @@ -138,7 +138,7 @@ static irqreturn_t uni_player_irq_handler(int irq, void *dev_id) dev_err(player->dev, "Underflow recovery failed\n"); /* Stop the player */ - snd_pcm_stop(player->substream, SNDRV_PCM_STATE_XRUN); + snd_pcm_stop_xrun(player->substream); ret = IRQ_HANDLED; } diff --git a/sound/soc/sti/uniperif_reader.c b/sound/soc/sti/uniperif_reader.c index ee0055e60852..7b63d35ef428 100644 --- a/sound/soc/sti/uniperif_reader.c +++ b/sound/soc/sti/uniperif_reader.c @@ -65,7 +65,7 @@ static irqreturn_t uni_reader_irq_handler(int irq, void *dev_id) if (unlikely(status & UNIPERIF_ITS_FIFO_ERROR_MASK(reader))) { dev_err(reader->dev, "FIFO error detected\n"); - snd_pcm_stop(reader->substream, SNDRV_PCM_STATE_XRUN); + snd_pcm_stop_xrun(reader->substream); ret = IRQ_HANDLED; }