From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93068C4338F for ; Mon, 2 Aug 2021 22:02:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6EC1F60725 for ; Mon, 2 Aug 2021 22:02:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230313AbhHBWCL (ORCPT ); Mon, 2 Aug 2021 18:02:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:51612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230050AbhHBWCL (ORCPT ); Mon, 2 Aug 2021 18:02:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 17C1E60E09; Mon, 2 Aug 2021 22:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627941721; bh=3CWcIe3hMXKRhtLMaC9ph/ZvFjRNgkjee8SjRCfmZL8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Du5HqCN0HPe8odb/3/QxcyPRzADKDqDwjdRMhNXRJ63uvRAanK1DiDRJEpqcCk6NQ cK7Izk51JPS+ba8Eof14wede68fzd1DFjWGLI7Ck80bNZ6PnhphLmTzJJbS3O9Q7g/ Bhw9sf8Zo7nB0iYaDda06CHCLMhBS7fHg12tySbHbMAQh99HhMsGTgx3dKdSBtKEEg 8dHDE0AGCOnuUeVdYo2igTE2QplpuGsFBwqjlo1g0QW0HKt4sC0LyOaXGAu3pW5IhH tNCTl+wT4ezxi4BLmJbn7tM+UEJxz71+qNoDZT6qW6lHBLAv9DY0hMCWxuZK7thU3b yu3nD9RWOecFw== Date: Mon, 2 Aug 2021 18:02:00 -0400 From: Sasha Levin To: Pierre-Louis Bossart Cc: stable@vger.kernel.org, gregkh@linuxfoundation.org, broonie@kernel.org, Rander Wang , Bard Liao , =?iso-8859-1?Q?P=E9ter?= Ujfalusi Subject: Re: [PATCH] ASoC: Intel: boards: fix xrun issue on platform with max98373 Message-ID: References: <20210802180614.23940-1-pierre-louis.bossart@linux.intel.com> <3abc9be2-d3e9-6e15-be73-782d6db4fe2f@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <3abc9be2-d3e9-6e15-be73-782d6db4fe2f@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Aug 02, 2021 at 04:28:23PM -0500, Pierre-Louis Bossart wrote: > > >On 8/2/21 2:27 PM, Sasha Levin wrote: >> On Mon, Aug 02, 2021 at 01:06:14PM -0500, Pierre-Louis Bossart wrote: >>> From: Rander Wang >>> >>> commit 33c8516841ea4fa12fdb8961711bf95095c607ee upstream >>> >>> On TGL platform with max98373 codec the trigger start sequence is >>> fe first, then codec component and sdw link is the last. Recently >>> a delay was introduced in max98373 codec driver and this resulted >>> to the start of sdw stream transmission was delayed and the data >>> transmitted by fw can't be consumed by sdw controller, so xrun happened. >>> >>> Adding delay in trigger function is a bad idea. This patch enable spk >>> pin in prepare function and disable it in hw_free to avoid xrun issue >>> caused by delay in trigger. >>> >>> Fixes: 3a27875e91fb ("ASoC: max98373: Added 30ms turn on/off time delay") >>> BugLink: https://github.com/thesofproject/sof/issues/4066 >>> Reviewed-by: Bard Liao >>> Reviewed-by: Péter Ujfalusi >>> Signed-off-by: Rander Wang >>> Signed-off-by: Pierre-Louis Bossart >>> >>> Link: >>> https://lore.kernel.org/r/20210625205042.65181-2-pierre-louis.bossart@linux.intel.com >>> >>> Signed-off-by: Mark Brown >>> --- >>> >>> backport to stable/linux-5.13.y and stable/linux-5.12.y since upstream >>> commit does not apply directly due to a rename in 9c5046e4b3e7 which >>> creates a conflict. >> >> Any objections to bringing in: >> >> 9c5046e4b3e7 ("ASoC: Intel: boards: create sof-maxim-common module") >> f6081af6cf2b ("ASoC: Intel: boards: handle hda-dsp-common as a module") >> >> to 5.13 instead? This way we'll be better aligned with upstream and >> avoid this type of failures in the future. > >Thanks for the suggestion Sasha, it'd certainly be easier for us and >distros/end-users if such renames/repartition patches could land in -stable. Okay, so I did just that and queued all 3 commits for 5.13. -- Thanks, Sasha