From patchwork Wed Jul 4 14:35:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10507023 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3DEEB602BC for ; Wed, 4 Jul 2018 14:35:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E5FF28571 for ; Wed, 4 Jul 2018 14:35:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22B82288E7; Wed, 4 Jul 2018 14:35:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C045828571 for ; Wed, 4 Jul 2018 14:35:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=whr/zpPIyvAmW5zK9gnQCV/ibycRIq3yqbAbTFg2ANc=; b=Kiu 6JGbhoNOjwMFtYVW1Jqy82M8PNbfV5gYq7iI1e+iqG+cMJs+8b4wXex1VEiKWRsAOHSvm1ceE4RZy 3frXjEdeyLNzq6ihLgthjGFOrFGGEPVaYHVtNtQCfD+SZqgq3qlzeyyQREOSWgvDHfozF1368DrEh pnB/LZIrFkjYWbg5jegodXHsgIC8agmvhQSQ4ciuJ2HhfLEOWyPTN7Jf2Jp1E4JR6YU24tezAVs9Y VRmGR1b6qwcvMWasYQLbz90CELA1O/aDdHTzNwAPJRHymsbK+XX1yeR0r8RGCScdv9KfnORhRg97D sjjv1sgso0/XCRCGvA0boLPbVW4XCWQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1faisi-0003vj-UP; Wed, 04 Jul 2018 14:35:44 +0000 Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1faise-0003uX-Vm for linux-arm-kernel@lists.infradead.org; Wed, 04 Jul 2018 14:35:42 +0000 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=SAyxT+Fq7ZkFiwSjTPtSeEkKjkte27UL74xFy7kiY/E=; b=NAH6TV3AwLHL K1rgwozY2/0aRfzrAoTmxLOM39MGOK1jpKithqPDLePvwp8Bxh23TTo5R/wbbOZHZpu2+VAsp8fZw 2MpqhcQkjguhzW9eYAQnC59sdoGZfHn1kMypngRSGW78oKdvC+FsQXohIhqkqPdN4ps/YHzlAUV+A 2I2hA=; 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 1faisP-00072a-48; Wed, 04 Jul 2018 14:35:25 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1faisO-0003OI-Mz; Wed, 04 Jul 2018 15:35:24 +0100 From: Mark Brown To: Srinivas Kandagatla Subject: Applied "ASoC: qdsp6: q6asm-dai: do not close port if its not opened" to the asoc tree In-Reply-To: <20180704094944.16440-7-srinivas.kandagatla@linaro.org> Message-Id: Date: Wed, 04 Jul 2018 15:35:24 +0100 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180704_073541_197127_1B35D95F X-CRM114-Status: GOOD ( 15.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, bgoswami@codeaurora.org, linux-arm-msm@vger.kernel.org, tiwai@suse.com, lgirdwood@gmail.com, broonie@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: qdsp6: q6asm-dai: do not close port if its not opened 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 5dffc1752cabde6396fca28ff8343febfa524512 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Wed, 4 Jul 2018 10:49:44 +0100 Subject: [PATCH] ASoC: qdsp6: q6asm-dai: do not close port if its not opened asm ports are open as part of prepare, so for use cases like "aplay sample.wav" were sample.wav is not present. This would call port close eventhough port was never opened. DSP would return errors for such use cases. Avoid doing this by checking the port state. Signed-off-by: Srinivas Kandagatla Signed-off-by: Mark Brown --- sound/soc/qcom/qdsp6/q6asm-dai.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c index 349c6a883c63..360936703b3d 100644 --- a/sound/soc/qcom/qdsp6/q6asm-dai.c +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c @@ -390,7 +390,9 @@ static int q6asm_dai_close(struct snd_pcm_substream *substream) struct q6asm_dai_rtd *prtd = runtime->private_data; if (prtd->audio_client) { - q6asm_cmd(prtd->audio_client, CMD_CLOSE); + if (prtd->state) + q6asm_cmd(prtd->audio_client, CMD_CLOSE); + q6asm_unmap_memory_regions(substream->stream, prtd->audio_client); q6asm_audio_client_free(prtd->audio_client);