From patchwork Tue Jun 23 19:50:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191530 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp2288308ile; Tue, 23 Jun 2020 13:01:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDzOgCi+Zlkf/MhuVgIR/3OYfEsKwasnjQ+StG38WmRb73y13a8DIIreuhqHpdkmNdHJkw X-Received: by 2002:a05:6402:22e4:: with SMTP id dn4mr23807152edb.288.1592942475408; Tue, 23 Jun 2020 13:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592942475; cv=none; d=google.com; s=arc-20160816; b=BGYKlnF8mxK27ydjF/PyB66A4GdIRSRpKnR5v7VD/pUbF6hF0FoKTSfjMA1eRNy1hc /OB3oAIf/pckxP/SklXYOXh5m5glYnzEONhI0c+hNIkckJhSSg35/LOUwvJYRaAKhzFL 4FwPTMV5ye5lZdbeUDb40UXLvXEUg9THWw2Fce5oifcPyvE/1imgcIcwb4hbYhZNxoi/ YE9MLo4zb09pEzyrl4l846a9D4/0SAHqTgWjsSjrkJpS58Ztw266VGOb8hC59EiCxZ8V N+CVh3Ek5IBhRcBXoShTe18+yG8SbURle3MbVmRx/cFW4gJsPzk7WtipQN9Nb2IkGTBa AyAw== 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=XxKz5t3MOez/SS0DLGH9fcuXpkFc63jz89jxBv0mdwE=; b=JU9x2UnMU3ML8+14jfEd4ldv2EZo+cZMaAPXRjvNkjt9CJNhJerfwby0mm8nrJNMN6 n2s9yJ364zqR5jyBVe0k2sw5F+2zTgenucxj0jTjOTWqBEscNx1tz4THBgzFs0OrlkCT oaBQpfzZ3dVn3FAwVR5MWKOL2BrqW963F7ArwwhWpeiNITI7w8jdDlQQQWhx1fE4oy6r UUrmG3umxEOYkXmqUgG2280Q4G4tM80o9OaeriZqB3IBdgwjZ5QxntfhGPDlNyXA74Nr r9PZt73jQJq6tDZ5jg1K8cJp+B61UyKn2AJ9xuqdaxkm82H1vyvKkvwagSU4MYtlrZ7L M1EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UNYFKFc6; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d18si11563806edz.309.2020.06.23.13.01.15; Tue, 23 Jun 2020 13:01:15 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UNYFKFc6; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387587AbgFWUBN (ORCPT + 15 others); Tue, 23 Jun 2020 16:01:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:37574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387579AbgFWUBL (ORCPT ); Tue, 23 Jun 2020 16:01: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 34C8120706; Tue, 23 Jun 2020 20:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942470; bh=gyxZKGmYpcSubDwX2gLuJPlr8ZhheA/wFX1fIONie/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UNYFKFc6TsJJH83sWrgNj/cbkzxepig39qU3LKBL/vpwpG12IrnpNCylgjt9c2WEC CBJNeKiH7Ggeg5RD6QcjguRMIgBF45ZBwtLr5baAYIbmbxGtYobeNsiP9y74mfiVHn hFGopZgYDn7eo701mbitmMTfyBYQOg+V2nou76V0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Nicolin Chen , Mark Brown , Sasha Levin Subject: [PATCH 5.7 012/477] ASoC: fsl_esai: Disable exception interrupt before scheduling tasklet Date: Tue, 23 Jun 2020 21:50:09 +0200 Message-Id: <20200623195408.177073818@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shengjiu Wang [ Upstream commit 1fecbb71fe0e46b886f84e3b6decca6643c3af6d ] Disable exception interrupt before scheduling tasklet, otherwise if the tasklet isn't handled immediately, there will be endless xrun interrupt. Fixes: 7ccafa2b3879 ("ASoC: fsl_esai: recover the channel swap after xrun") Signed-off-by: Shengjiu Wang Acked-by: Nicolin Chen Link: https://lore.kernel.org/r/a8f2ad955aac9e52587beedc1133b3efbe746895.1587968824.git.shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/fsl/fsl_esai.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.25.1 diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index c7a49d03463a7..84290be778f0e 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -87,6 +87,10 @@ static irqreturn_t esai_isr(int irq, void *devid) if ((saisr & (ESAI_SAISR_TUE | ESAI_SAISR_ROE)) && esai_priv->reset_at_xrun) { dev_dbg(&pdev->dev, "reset module for xrun\n"); + regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, + ESAI_xCR_xEIE_MASK, 0); + regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, + ESAI_xCR_xEIE_MASK, 0); tasklet_schedule(&esai_priv->task); }