[PATCH v2] ASoC: SOF: Intel: broadwell: fix mutual exclusion with catpt driver
In v5.10, the "haswell" driver was replaced by the "catpt" driver, but the mutual exclusion with the SOF driver was not updated. This leads to errors with card names and UCM profiles not being loaded by PulseAudio.
This fix should only be applied on v5.10-stable, the mutual exclusion was removed in 5.11.
Reported-by: David Ward david.ward@ll.mit.edu Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=211985 Fixes: 6cbfa11d2694 ("ASoC: Intel: Select catpt and deprecate haswell") Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Acked-by: Mark Brown broonie@kernel.org Cc: stable@vger.kernel.org Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org Cc: Sasha Levin sashal@kernel.org --- v2: added Mark and Cezary tags, fixed stable address, added maintainers
sound/soc/sof/intel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index de7ff2d097ab..6708a2c5a838 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -84,7 +84,7 @@ config SND_SOC_SOF_BAYTRAIL
config SND_SOC_SOF_BROADWELL_SUPPORT bool "SOF support for Broadwell" - depends on SND_SOC_INTEL_HASWELL=n + depends on SND_SOC_INTEL_CATPT=n help This adds support for Sound Open Firmware for Intel(R) platforms using the Broadwell processors.
On Tue, Mar 09, 2021 at 04:16:18PM -0600, Pierre-Louis Bossart wrote:
In v5.10, the "haswell" driver was replaced by the "catpt" driver, but the mutual exclusion with the SOF driver was not updated. This leads to errors with card names and UCM profiles not being loaded by PulseAudio.
This fix should only be applied on v5.10-stable, the mutual exclusion was removed in 5.11.
Reported-by: David Ward david.ward@ll.mit.edu Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=211985 Fixes: 6cbfa11d2694 ("ASoC: Intel: Select catpt and deprecate haswell") Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Acked-by: Mark Brown broonie@kernel.org Cc: stable@vger.kernel.org Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org Cc: Sasha Levin sashal@kernel.org
v2: added Mark and Cezary tags, fixed stable address, added maintainers
Now queued up, thanks.
greg k-h
This is a note to let you know that I've just added the patch titled
[PATCH v2] ASoC: SOF: Intel: broadwell: fix mutual exclusion with catpt driver
to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summ...
The filename of the patch is: asoc-sof-intel-broadwell-fix-mutual-exclusion-with-catpt-driver.patch and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let stable@vger.kernel.org know about it.
From pierre-louis.bossart@linux.intel.com Wed Mar 10 13:06:02 2021
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Date: Tue, 9 Mar 2021 16:16:18 -0600 Subject: [PATCH v2] ASoC: SOF: Intel: broadwell: fix mutual exclusion with catpt driver To: alsa-devel@alsa-project.org Cc: tiwai@suse.de, broonie@kernel.org, Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com, David Ward david.ward@ll.mit.edu, Cezary Rojewski cezary.rojewski@intel.com, stable@vger.kernel.org, Greg Kroah-Hartman gregkh@linuxfoundation.org, Sasha Levin sashal@kernel.org Message-ID: 20210309221618.246754-1-pierre-louis.bossart@linux.intel.com
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
In v5.10, the "haswell" driver was replaced by the "catpt" driver, but the mutual exclusion with the SOF driver was not updated. This leads to errors with card names and UCM profiles not being loaded by PulseAudio.
This fix should only be applied on v5.10-stable, the mutual exclusion was removed in 5.11.
Reported-by: David Ward david.ward@ll.mit.edu Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=211985 Fixes: 6cbfa11d2694 ("ASoC: Intel: Select catpt and deprecate haswell") Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Cezary Rojewski cezary.rojewski@intel.com Acked-by: Mark Brown broonie@kernel.org Cc: stable@vger.kernel.org Cc: Sasha Levin sashal@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- sound/soc/sof/intel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -84,7 +84,7 @@ config SND_SOC_SOF_BAYTRAIL
config SND_SOC_SOF_BROADWELL_SUPPORT bool "SOF support for Broadwell" - depends on SND_SOC_INTEL_HASWELL=n + depends on SND_SOC_INTEL_CATPT=n help This adds support for Sound Open Firmware for Intel(R) platforms using the Broadwell processors.
Patches currently in stable-queue which might be from pierre-louis.bossart@linux.intel.com are
queue-5.10/asoc-sof-intel-broadwell-fix-mutual-exclusion-with-catpt-driver.patch
participants (3)
-
Greg Kroah-Hartman -
gregkh＠linuxfoundation.org
-
Pierre-Louis Bossart