From patchwork Thu Oct 3 15:52:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175138 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp561297ill; Thu, 3 Oct 2019 09:33:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqzw+o7sbUQIFAPxTM+OCuZF8zGxa75uvdum7XYy6LVTDiTfrRw0F7P7hDH7PMTsBs6vqR7B X-Received: by 2002:a50:c2c2:: with SMTP id u2mr10361584edf.220.1570120275750; Thu, 03 Oct 2019 09:31:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570120275; cv=none; d=google.com; s=arc-20160816; b=J2Fy0y1c9i50cx3G9ygokUhCqNYpc1hkXJkfdncgvB/+Ct55YjRUS/xZNQuP11716u mad2OavIl57qNUnS6RlR+hn+T+0ei9lr/rmUzkkoCNQqH0IUcBJCri3dcU5bGzHWPMex 5zrhyGjGG81gB5E1kpJlU/e+e4vYXvdM2m44E9oqvXVjBV4N1Msx5CgooOxAa0YlIdCo 7f5hSlTuCc1Og9b/PoMBhIFhlgWjye/Mfe2bT6QMbYHM+HGX6Pih0T2m20dcyasJ1Aum q291JdOilSObGP9LywZJHVNe4jKxJ9CjqB+b8OVBArSyN7MxX58At3X5yQaof+HFLmbA P5nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YOWuqtAz6zfw5sLwjKHmhMjJpip81hPamPrzqU55Jaw=; b=LwLcnVrxJs2DycAuTiTHhmltFTKWEK7iq/S4myW0E9g5JN/2Zww6/+qBIGvfCGBVxz 3aOmhxHwXygTwh2nNfkhNm5B/a0xTwpxJ7JVjfoTtD4BvOhHZnW5Ro9lVEM0Wfey1Q83 /xoZDTVIebRANOaWclqOsrPbt4Mc1CI0kcSMgFBcuES3f4HOTtBDSR+mCDbYwqbtwfcn aPFAXNRjivG8R8vZP7LlS1DBRe7Oy1sAKXzFUC3yBNG56mwR/3d96gG2MFVRr5DQTiz9 CyznIek5ZgEP0AAk4jkjoDCm70/YcDyElpu3MBsy0fdy6SVM1EHte011XIcapqXECRHH iiUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q52m57zD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u8si1535222ejt.219.2019.10.03.09.31.15; Thu, 03 Oct 2019 09:31:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q52m57zD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390517AbfJCQbO (ORCPT + 27 others); Thu, 3 Oct 2019 12:31:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:37876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403843AbfJCQbL (ORCPT ); Thu, 3 Oct 2019 12:31:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 892CC2054F; Thu, 3 Oct 2019 16:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120271; bh=kfvdiciDmqZ1VtqoBpuDh3Z6dlpATwLZE7GsvgO6uLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q52m57zDVzeQXtqe3c2MsByjW5NjEPsUOJTGq/5JF05lkTmG1OdhNQPsL461O3B2E rcFBANyLVVcutE5GNfW+imanZrbZnOXhHhx/2od1Puqn53ncboTtVi7REAfTjAXD/K laMZCxOHLENmorIb8swfmbtqwk59fshJxygZNxy0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Mark Brown , Sasha Levin Subject: [PATCH 5.2 158/313] ASoC: fsl_ssi: Fix clock control issue in master mode Date: Thu, 3 Oct 2019 17:52:16 +0200 Message-Id: <20191003154548.494258620@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shengjiu Wang [ Upstream commit 696d05225cebffd172008d212657be90e823eac0 ] The test case is arecord -Dhw:0 -d 10 -f S16_LE -r 48000 -c 2 temp.wav & aplay -Dhw:0 -d 30 -f S16_LE -r 48000 -c 2 test.wav There will be error after end of arecord: aplay: pcm_write:2051: write error: Input/output error Capture and Playback work in parallel in master mode, one substream stops, the other substream is impacted, the reason is that clock is disabled wrongly. The clock's reference count is not increased when second substream starts, the hw_param() function returns in the beginning because first substream is enabled, then in end of first substream, the hw_free() disables the clock. This patch is to move the clock enablement to the place before checking of the device enablement in hw_param(). Signed-off-by: Shengjiu Wang Link: https://lore.kernel.org/r/1567012817-12625-1-git-send-email-shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/fsl/fsl_ssi.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 09b2967befd96..d83be26d64467 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -799,15 +799,6 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, u32 wl = SSI_SxCCR_WL(sample_size); int ret; - /* - * SSI is properly configured if it is enabled and running in - * the synchronous mode; Note that AC97 mode is an exception - * that should set separate configurations for STCCR and SRCCR - * despite running in the synchronous mode. - */ - if (ssi->streams && ssi->synchronous) - return 0; - if (fsl_ssi_is_i2s_master(ssi)) { ret = fsl_ssi_set_bclk(substream, dai, hw_params); if (ret) @@ -823,6 +814,15 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, } } + /* + * SSI is properly configured if it is enabled and running in + * the synchronous mode; Note that AC97 mode is an exception + * that should set separate configurations for STCCR and SRCCR + * despite running in the synchronous mode. + */ + if (ssi->streams && ssi->synchronous) + return 0; + if (!fsl_ssi_is_ac97(ssi)) { /* * Keep the ssi->i2s_net intact while having a local variable