From patchwork Tue Jun 23 19:53:24 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: 191599 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1365821ecs; Tue, 23 Jun 2020 14:22:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCxS9nStGAmeKH22k5RAnfN8LMNzn+ApJ2rvFbJMy/ykFyi/zOFGPpjEM7c/trjJHBpBMi X-Received: by 2002:aa7:d74c:: with SMTP id a12mr24024824eds.369.1592947327256; Tue, 23 Jun 2020 14:22:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592947327; cv=none; d=google.com; s=arc-20160816; b=lL1YuYt5aVEGHeyJTW7ToUMEaseLF4kY+5HW/Nu+haZ1hVZm0xkX/rR7PpwFuA8PL5 nNvB/+p2uFpbO9d1WduVFsQmjmJgjWt1xAFPFHW70RMnQfvGZyT5eOI92xVaRq4HQgIt Cxpz3FVE0Di0P2MWyaxXoWcCkpeNMleq2mx3w8Kj4KLv6v9ZqYigm5BT2AaXZCCp01ri ozEQ2Cb8T2CDHKV3AsPUJpyXmD2Z66Fb6065HgKtJRxuIWPTYz7gGNxiJ2iu1vyYttjt KC5NIYGxcH60tH2HYov5Ugs+t3Ib7PvQrRaaXkQX1QEJCrqHJgP2exI8/+EQSo+hW27B VwhA== 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=NwtZJ4LSzPZzryfOcnPmLPV6coHn4JaGQqT4ajQgfmk5whbv7n8CacL8V+bvN9bMzx fpBn0Sd6MQkVFhd5nlJn+3B7ftkBEjwm66JEZpYcWusA4Lmuj3kaj6/xzFcazjpm/tbS wyR83oNqirarXGMvdfsVgVVbqzYhanSTsuTY0mrSzSl8epxpBkgZLBtoBHQhh7gD5JQE T8xYXoP3Qmuv7Oyhcv3+zI60PWpar2iRL/Bx5+HzEaq8Oa34B4kApi36I7Yo6Jo/UhJ8 mZPERvP+fRqLIqIDL0OURI6eb1WtUnMoED2sDEbYhu+42M1211rnO69usSEQi0Qt+9IP uKpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eC5B+bSw; 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 lj9si5625300ejb.507.2020.06.23.14.22.06; Tue, 23 Jun 2020 14:22:07 -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=eC5B+bSw; 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 S2389865AbgFWUWf (ORCPT + 15 others); Tue, 23 Jun 2020 16:22:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:40364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390172AbgFWUW1 (ORCPT ); Tue, 23 Jun 2020 16:22:27 -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 C544E2064B; Tue, 23 Jun 2020 20:22:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943747; bh=gyxZKGmYpcSubDwX2gLuJPlr8ZhheA/wFX1fIONie/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eC5B+bSw0A/FGYs0e36D0Tk+5k2I+w2TeJCUzmZ0Pmi+X6rqn27VYuOAtWgMLyCSa xnBgGpt9rGzRKBc9OHtyrfFDPO9YPTlltN47FsHWzxmYhyoh+x9xfGCpcL1yBbW3+l wgVJIsQF+Pk/yL6bHyqT/+sZOzvsyv0tDnJaCKis= 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.4 009/314] ASoC: fsl_esai: Disable exception interrupt before scheduling tasklet Date: Tue, 23 Jun 2020 21:53:24 +0200 Message-Id: <20200623195339.237612207@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195338.770401005@linuxfoundation.org> References: <20200623195338.770401005@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); }