From patchwork Fri Oct 25 07:13:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 177656 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3269404ill; Fri, 25 Oct 2019 00:17:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqyE9jzO/ZWQrDE+pmArNt8BAWUMPX2MBFjYeKO+Mgvf/yzRo2EtsZY/M7Gv7H/7vzIDcwP9 X-Received: by 2002:a17:906:3e41:: with SMTP id t1mr1997520eji.103.1571987838394; Fri, 25 Oct 2019 00:17:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571987838; cv=none; d=google.com; s=arc-20160816; b=NYvscD/Hn7AmIPjfhFAbg9f9v4DnI1P0Zt8y8FDx6eezIUZu1NJ1HEevHzwQzJKmTH iX3cgX8hdId5oQ7nfI0c2hf2121UWDXLCllDN2BthDYbCR4rcf8eDRooGObVhaIbpRT/ CSvLHIg61MZKT+2anm9HX0VK22qUYr2945H8pVdxIejbr7pMEYg5fEssYw1uv8uHVvf4 WccpJHwrnrL5iQIdtXiPjFzt4WOGAXq29oiuovEnXHRvcZB+zVd4krcI2psvIG4dSNzp m8WS6BOa17rY8hxruvPGl+UIExKLFg65FyXmmUuMjdXCcATDjji/6pGMmBL3qhin98qC 2SFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=dqmIx0tfLvNufeLgQvezOxjOQ/hfDQBp2JrEuJnPb3E=; b=HPM00b3YzwyJot378JT58UNzsA16iy0TC6xwjDfBFGN7uhp+eVGvcFygfLSVAS73Gd BYPM/teDW0XbyDMFdMkEd8Tw5+q9PYyCdPfzea6bObrp/jMETNFaymFZlB+VpYp3s9iv fDd3R1Ll4ciy5HpQkK1lgXW2kvzfxaNS8HsRItAZb4nzAMGFcIRyl8GTGQJDaqWvG0Qr PNEYcg+3cwfGyOqQPnYHmFcOMTBrFRXh6w1MZAgsPxiGSdg6F5pOXlV4wO0DR99iQKbh B/hzAsEYPMWoi/ZpvhKRWbVPhfxvW7EEyhfZASCkRvev6Lwi3qRU/VRymgDQivupl541 qzmA== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f45si681697ede.381.2019.10.25.00.17.18; Fri, 25 Oct 2019 00:17:18 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406730AbfJYHRO (ORCPT + 26 others); Fri, 25 Oct 2019 03:17:14 -0400 Received: from inva020.nxp.com ([92.121.34.13]:55410 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733140AbfJYHRN (ORCPT ); Fri, 25 Oct 2019 03:17:13 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 38CE71A0409; Fri, 25 Oct 2019 09:17:11 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 4F49B1A00FD; Fri, 25 Oct 2019 09:17:06 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 04A9C402BC; Fri, 25 Oct 2019 15:16:59 +0800 (SGT) From: Shengjiu Wang To: timur@kernel.org, nicoleotsuka@gmail.com, Xiubo.Lee@gmail.com, festevam@gmail.com, broonie@kernel.org, alsa-devel@alsa-project.org, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH V2] ASoC: fsl_esai: Add spin lock to protect reset, stop and start Date: Fri, 25 Oct 2019 15:13:53 +0800 Message-Id: <36e1d0157d2b71985b88e841d416d04c584c04fe.1571986436.git.shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org xrun may happen at the end of stream, the trigger->fsl_esai_trigger_stop maybe called in the middle of fsl_esai_hw_reset, this may cause esai in wrong state after stop, and there may be endless xrun interrupt. This issue may also happen with trigger->fsl_esai_trigger_start. So Add spin lock to lock those functions. Fixes: 7ccafa2b3879 ("ASoC: fsl_esai: recover the channel swap after xrun") Signed-off-by: Shengjiu Wang --- Change in v2 -add lock for fsl_esai_trigger_start. sound/soc/fsl/fsl_esai.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 2.21.0 Acked-by: Nicolin Chen diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 37b14c48b537..9b28e2af26e4 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -33,6 +33,7 @@ * @fsysclk: system clock source to derive HCK, SCK and FS * @spbaclk: SPBA clock (optional, depending on SoC design) * @task: tasklet to handle the reset operation + * @lock: spin lock to handle reset and stop behavior * @fifo_depth: depth of tx/rx FIFO * @slot_width: width of each DAI slot * @slots: number of slots @@ -56,6 +57,7 @@ struct fsl_esai { struct clk *fsysclk; struct clk *spbaclk; struct tasklet_struct task; + spinlock_t lock; /* Protect reset and stop */ u32 fifo_depth; u32 slot_width; u32 slots; @@ -676,8 +678,10 @@ static void fsl_esai_hw_reset(unsigned long arg) { struct fsl_esai *esai_priv = (struct fsl_esai *)arg; bool tx = true, rx = false, enabled[2]; + unsigned long lock_flags; u32 tfcr, rfcr; + spin_lock_irqsave(&esai_priv->lock, lock_flags); /* Save the registers */ regmap_read(esai_priv->regmap, REG_ESAI_TFCR, &tfcr); regmap_read(esai_priv->regmap, REG_ESAI_RFCR, &rfcr); @@ -715,6 +719,8 @@ static void fsl_esai_hw_reset(unsigned long arg) fsl_esai_trigger_start(esai_priv, tx); if (enabled[rx]) fsl_esai_trigger_start(esai_priv, rx); + + spin_unlock_irqrestore(&esai_priv->lock, lock_flags); } static int fsl_esai_trigger(struct snd_pcm_substream *substream, int cmd, @@ -722,6 +728,7 @@ static int fsl_esai_trigger(struct snd_pcm_substream *substream, int cmd, { struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai); bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; + unsigned long lock_flags; esai_priv->channels[tx] = substream->runtime->channels; @@ -729,12 +736,16 @@ static int fsl_esai_trigger(struct snd_pcm_substream *substream, int cmd, case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + spin_lock_irqsave(&esai_priv->lock, lock_flags); fsl_esai_trigger_start(esai_priv, tx); + spin_unlock_irqrestore(&esai_priv->lock, lock_flags); break; case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + spin_lock_irqsave(&esai_priv->lock, lock_flags); fsl_esai_trigger_stop(esai_priv, tx); + spin_unlock_irqrestore(&esai_priv->lock, lock_flags); break; default: return -EINVAL; @@ -1002,6 +1013,7 @@ static int fsl_esai_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, esai_priv); + spin_lock_init(&esai_priv->lock); ret = fsl_esai_hw_init(esai_priv); if (ret) return ret;