From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25F1A2B9AD; Tue, 14 May 2024 11:44:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715687094; cv=none; b=NVpQ0xc+mubsaDNbAnMMhvgtutBL/YIVUbtkz21Jxo7aPsSuSAkM5oxYKRNOhZiAzvysca7z6Nmjjvoh/jMoJPAdN3HTuq6z1vAzZUaL7l8rpcTEZ04gG/KylCFN+G+GUW+hBMPbloyfAT1hAJe/mkavnprKNj3ltBXCH5/HKX4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715687094; c=relaxed/simple; bh=+askBIAI4WNWzoVIz1ehACZK7Xp6ADcUjKN5FfbULaE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sNNgp8Cu+2YNJcX8ExJ+6OyMAqFYo+yfsx1l2aQXUaOy41YuKuNjfgnAYckqiVWfLa0x2i0mHcuN3E/JfKLT3xR1R1artkcDShhH1nPoq9pvzpudyAJ7S3negSQ8p00p2C7BrCtjM+12NyxxoMB/tLnbX06Fs8NqLvhU4P3kyHU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BdoOkzrh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BdoOkzrh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1057C2BD10; Tue, 14 May 2024 11:44:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715687094; bh=+askBIAI4WNWzoVIz1ehACZK7Xp6ADcUjKN5FfbULaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BdoOkzrhj1LX61Gzv6j0njG0UBqRBmJi21l/DrJFmKKIJh40xKSV8WFDc2Dq0eBpu RlQ/EvjYLW+EKxwJX/fkeEo/KWE67UllRi466FNZBlpWdLD33H2KAjmwSiW/9HYMde wFEVbVtvbM7GzUgTf6baE8MDJsIixLoGIaQpG5bI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dmitry Shmidt , Neil Armstrong , Jerome Brunet , Mark Brown , Sasha Levin Subject: [PATCH 5.4 61/84] ASoC: meson: axg-tdm-interface: Fix formatters in trigger" Date: Tue, 14 May 2024 12:20:12 +0200 Message-ID: <20240514100953.981166471@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514100951.686412426@linuxfoundation.org> References: <20240514100951.686412426@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Neil Armstrong [ Upstream commit c26830b6c5c534d273ce007eb33d5a2d2ad4e969 ] This reverts commit bf5e4887eeddb48480568466536aa08ec7f179a5 because the following and required commit e138233e56e9829e65b6293887063a1a3ccb2d68 causes the following system crash when using audio: BUG: sleeping function called from invalid context at kernel/locking/mutex.c:282 Fixes: bf5e4887eeddb4848056846 ("ASoC: meson: axg-tdm-interface: manage formatters in trigger") Reported-by: Dmitry Shmidt Signed-off-by: Neil Armstrong Acked-by: Jerome Brunet Link: https://lore.kernel.org/r/20220421155725.2589089-1-narmstrong@baylibre.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/meson/axg-tdm-interface.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c index dc2fe9e2baadd..34aff050caf25 100644 --- a/sound/soc/meson/axg-tdm-interface.c +++ b/sound/soc/meson/axg-tdm-interface.c @@ -351,29 +351,13 @@ static int axg_tdm_iface_hw_free(struct snd_pcm_substream *substream, return 0; } -static int axg_tdm_iface_trigger(struct snd_pcm_substream *substream, - int cmd, +static int axg_tdm_iface_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - struct axg_tdm_stream *ts = - snd_soc_dai_get_dma_data(dai, substream); - - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - axg_tdm_stream_start(ts); - break; - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - case SNDRV_PCM_TRIGGER_STOP: - axg_tdm_stream_stop(ts); - break; - default: - return -EINVAL; - } + struct axg_tdm_stream *ts = snd_soc_dai_get_dma_data(dai, substream); - return 0; + /* Force all attached formatters to update */ + return axg_tdm_stream_reset(ts); } static int axg_tdm_iface_remove_dai(struct snd_soc_dai *dai) @@ -413,8 +397,8 @@ static const struct snd_soc_dai_ops axg_tdm_iface_ops = { .set_fmt = axg_tdm_iface_set_fmt, .startup = axg_tdm_iface_startup, .hw_params = axg_tdm_iface_hw_params, + .prepare = axg_tdm_iface_prepare, .hw_free = axg_tdm_iface_hw_free, - .trigger = axg_tdm_iface_trigger, }; /* TDM Backend DAIs */ -- 2.43.0