Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp929430ybt; Wed, 17 Jun 2020 18:10:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxImQ5a0w1xKwG8QV8hqitD5ROadwLWDayRxBCOXnmSriTQCJpbxgqhyjRlY6xpEZl9ZSvi X-Received: by 2002:a17:906:2b92:: with SMTP id m18mr1873737ejg.218.1592442649183; Wed, 17 Jun 2020 18:10:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592442649; cv=none; d=google.com; s=arc-20160816; b=ezplrISxxuIPD5rRtFwSRg21ZVwaW1berE8kcq5FNxT0Gm+SwFGRi6AcwP3cpwpEGc PZZVk79x+PaRfQumvvOfY2jWCVEMbFXRJEk+OaK+KtcHomjJ4rnROhI3KibFGajwjoQS 1qCouBip7IqssV1ihpyPGh6tz15AFXra2kvJxSKTxy7PW+Q/jDIsbVQAHoqNi+/eqUnR ZwxOsPgv0V8F2uDkF6R5Zf+lj5HX8h2Mee4HLNMBUBdIKdv2LcZOszAGWb+NNV6jmQ3w 0hpoh7jw0Exifs/cPYoXHBp+YoGVp/GZK0xhuSSy+/Bcu+mjmomUjDxKapQGcm/yxiRh 9TvA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1BZB2yrZz7P8byFcPkmWEFx6cbBeuguM9YhAXRwiSt0=; b=topY+lWOWY7BpxPvf9JofU+wKO15cQccRT+4sdyGSY1x7IsUkI6zgdPx7JXKqSyKnQ /gff2tuf8SqOdw4OYla2kcskHm4LmtO4OGlXO2mN7Wx6JCqPoSaCM4e+4uB7xzGupdyx nZymSXH3YTBma9N79EpQ3stQ8o34kasFk0PqS+reZ/bo2bquj7AzolrD9eHr8BZtF7p8 zpqNrSS8o4u1Vel8reXgYYd6mwJ6lBgX1KFBblbeY1lz2vrtO/H2/rrEYiwHPG9UPwHS DJr/eqIeTIRXo7l6nJ7naimXPgC61VPPdIRQq+XQq0OOdJtA1uJuxY6LOTgkoyggnrDv +Jjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=05DUXdz8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f18si908441ejf.617.2020.06.17.18.10.27; Wed, 17 Jun 2020 18:10:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=05DUXdz8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727792AbgFRBIZ (ORCPT + 99 others); Wed, 17 Jun 2020 21:08:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:33996 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727782AbgFRBIX (ORCPT ); Wed, 17 Jun 2020 21:08:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 586F721D7D; Thu, 18 Jun 2020 01:08:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442503; bh=082nMbW7W4EL25ot2oiMRYNGZ531syXYTu7mVW7Gabo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=05DUXdz8UVIOEo+t+X6SJz3GeSlKJHHr3PhWvf831NjgrbuM/1PlmeRdMZYq+supg oE2KETg9lvggBe2wZLcZGZpVK3oWYlqxtrajnxV1esko+almnn4bVPLobfy7OwTgQz Rc+M8SltyNaB4a/oBL3RmOK69Nk1XrqEhIHuioP4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shengjiu Wang , Nicolin Chen , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.7 013/388] ASoC: fsl_esai: Disable exception interrupt before scheduling tasklet Date: Wed, 17 Jun 2020 21:01:50 -0400 Message-Id: <20200618010805.600873-13-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(+) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index c7a49d03463a..84290be778f0 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); } -- 2.25.1