Unverified Commit 991e74d1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: Intel/SOF: extend run-time driver selection to ACPI... 

Merge series "ASoC: Intel/SOF: extend run-time driver selection to ACPI devices" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

The module snd-intel-dspcfg, suggested by Jaroslav last year,
currently provide the means to select a PCI driver at run-time, based
on quirks, recommendations or user selection via a kernel
parameter. This capability removed a lot of confusions in
distributions and removed the need for recompilations to select legacy
HDaudio, SST or SOF drivers.

This patchset extends the concept to ACPI devices. This was driven by
the desire to at some point deprecate the Atom/SST driver for Baytrail
and Cherrytrail, which is no longer maintained by Intel. By having the
SOF driver enabled by distributions for Baytrail/Cherrytrail, we can
enable more end-user tests and make the transition easier for
distributions (likely in 2021 at this point).

This patchset provides the same solution for Broadwell, mainly to have
a single build for all Intel platforms. SOF on Broadwell remains an
option not recommended for distributions, as long as the 'catpt'
driver is maintained there is no burning desire to make SOF the
default on the three Broadwell-based platforms with the DSP
enabled.

Pierre-Louis Bossart (14):
  ASoC: Intel: broadwell: add missing pm_ops
  ASoC: Intel: bdw-rt5677: add missing pm_ops
  ALSA: hda: intel-dsp-config: add helper for ACPI DSP driver selection
  ASoC: soc-acpi: add helper to identify parent driver.
  ASoC: Intel: boards: byt/cht: set card and driver name at run time
  ASoC: Intel: byt/cht: set pm ops dynamically
  ASoC: SOF: acpi: add dynamic selection of DSP driver
  ASoC: Intel: Atom: add dynamic selection of DSP driver
  ASoC: SOF: Intel: allow for coexistence between SOF and Atom/SST
    drivers
  ALSA: hda: intel-dsp-config: add Broadwell ACPI DSP driver selection
  ASoC: Intel: broadwell: set card and driver name dynamically
  ASoC: Intel: catpt: add dynamic selection of DSP driver
  ASoC: SOF: Intel: allow for coexistence between SOF and catpt drivers
  ALSA: hda: intel-dsp-config: ignore dsp_driver parameter for PCI
    legacy devices

 include/sound/intel-dsp-config.h             |   7 ++
 include/sound/soc-acpi.h                     |   6 +
 sound/hda/intel-dsp-config.c                 | 111 +++++++++++++++++++
 sound/soc/intel/Kconfig                      |   2 +
 sound/soc/intel/atom/sst/sst_acpi.c          |   8 ++
 sound/soc/intel/boards/bdw-rt5650.c          |  17 ++-
 sound/soc/intel/boards/bdw-rt5677.c          |  18 ++-
 sound/soc/intel/boards/broadwell.c           |  20 ++--
 sound/soc/intel/boards/bytcht_cx2072x.c      |  27 +++--
 sound/soc/intel/boards/bytcht_da7213.c       |  27 +++--
 sound/soc/intel/boards/bytcht_es8316.c       |  29 +++--
 sound/soc/intel/boards/bytcr_rt5640.c        |  30 +++--
 sound/soc/intel/boards/bytcr_rt5651.c        |  27 +++--
 sound/soc/intel/boards/cht_bsw_max98090_ti.c |  29 +++--
 sound/soc/intel/boards/cht_bsw_nau8824.c     |  29 +++--
 sound/soc/intel/boards/cht_bsw_rt5645.c      |  38 ++++---
 sound/soc/intel/boards/cht_bsw_rt5672.c      |  29 +++--
 sound/soc/intel/catpt/device.c               |  12 ++
 sound/soc/sof/intel/Kconfig                  |  33 +++---
 sound/soc/sof/sof-acpi-dev.c                 |  14 ++-
 20 files changed, 392 insertions(+), 121 deletions(-)

--
2.25.1
parents ddf1c4b3 d512ef22

include/sound/intel-dsp-config.h

+7 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ enum { 
#if IS_ENABLED(CONFIG_SND_INTEL_DSP_CONFIG)



int snd_intel_dsp_driver_probe(struct pci_dev *pci);

int snd_intel_acpi_dsp_driver_probe(struct device *dev, const u8 acpi_hid[ACPI_ID_LEN]);



#else
@@ -29,6 +30,12 @@ static inline int snd_intel_dsp_driver_probe(struct pci_dev *pci) 
	return SND_INTEL_DSP_DRIVER_ANY;

}



static inline

int snd_intel_acpi_dsp_driver_probe(struct device *dev, const u8 acpi_hid[ACPI_ID_LEN])

{

	return SND_INTEL_DSP_DRIVER_ANY;

}



#endif



#endif

include/sound/soc-acpi.h

+6 −0
Original line number Diff line number Diff line
@@ -171,4 +171,10 @@ struct snd_soc_acpi_codecs { 
	u8 codecs[SND_SOC_ACPI_MAX_CODECS][ACPI_ID_LEN];

};



static inline bool snd_soc_acpi_sof_parent(struct device *dev)

{

	return dev->parent && dev->parent->driver && dev->parent->driver->name &&

		!strcmp(dev->parent->driver->name, "sof-audio-acpi");

}



#endif

sound/hda/intel-dsp-config.c

+111 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ MODULE_PARM_DESC(dsp_driver, "Force the DSP driver for Intel DSP (0=auto, 1=lega 
struct config_entry {

	u32 flags;

	u16 device;

	u8 acpi_hid[ACPI_ID_LEN];

	const struct dmi_system_id *dmi_table;

};
@@ -378,6 +379,20 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci) 
	if (pci->vendor != 0x8086)

		return SND_INTEL_DSP_DRIVER_ANY;



	/*

	 * Legacy devices don't have a PCI-based DSP and use HDaudio

	 * for HDMI/DP support, ignore kernel parameter

	 */

	switch (pci->device) {

	case 0x160c: /* Broadwell */

	case 0x0a0c: /* Haswell */

	case 0x0c0c:

	case 0x0d0c:

	case 0x0f04: /* Baytrail */

	case 0x2284: /* Braswell */

		return SND_INTEL_DSP_DRIVER_ANY;

	}



	if (dsp_driver > 0 && dsp_driver <= SND_INTEL_DSP_DRIVER_LAST)

		return dsp_driver;
@@ -433,6 +448,102 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci) 
}

EXPORT_SYMBOL_GPL(snd_intel_dsp_driver_probe);



/*

 * configuration table

 * - the order of similar ACPI ID entries is important!

 * - the first successful match will win

 */

static const struct config_entry acpi_config_table[] = {

/* BayTrail */

#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI)

	{

		.flags = FLAG_SST,

		.acpi_hid = "80860F28",

	},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)

	{

		.flags = FLAG_SOF,

		.acpi_hid = "80860F28",

	},

#endif

/* CherryTrail */

#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI)

	{

		.flags = FLAG_SST,

		.acpi_hid = "808622A8",

	},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)

	{

		.flags = FLAG_SOF,

		.acpi_hid = "808622A8",

	},

#endif

/* Broadwell */

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_CATPT)

	{

		.flags = FLAG_SST,

		.acpi_hid = "INT3438"

	},

#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)

	{

		.flags = FLAG_SOF,

		.acpi_hid = "INT3438"

	},

#endif

/* Haswell - not supported by SOF but added for consistency */

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_CATPT)

	{

		.flags = FLAG_SST,

		.acpi_hid = "INT33C8"

	},

#endif

};



static const struct config_entry *snd_intel_acpi_dsp_find_config(const u8 acpi_hid[ACPI_ID_LEN],

								 const struct config_entry *table,

								 u32 len)

{

	for (; len > 0; len--, table++) {

		if (memcmp(table->acpi_hid, acpi_hid, ACPI_ID_LEN))

			continue;

		if (table->dmi_table && !dmi_check_system(table->dmi_table))

			continue;

		return table;

	}

	return NULL;

}



int snd_intel_acpi_dsp_driver_probe(struct device *dev, const u8 acpi_hid[ACPI_ID_LEN])

{

	const struct config_entry *cfg;



	if (dsp_driver > SND_INTEL_DSP_DRIVER_LEGACY && dsp_driver <= SND_INTEL_DSP_DRIVER_LAST)

		return dsp_driver;



	if (dsp_driver == SND_INTEL_DSP_DRIVER_LEGACY) {

		dev_warn(dev, "dsp_driver parameter %d not supported, using automatic detection\n",

			 SND_INTEL_DSP_DRIVER_LEGACY);

	}



	/* find the configuration for the specific device */

	cfg = snd_intel_acpi_dsp_find_config(acpi_hid,  acpi_config_table,

					     ARRAY_SIZE(acpi_config_table));

	if (!cfg)

		return SND_INTEL_DSP_DRIVER_ANY;



	if (cfg->flags & FLAG_SST)

		return SND_INTEL_DSP_DRIVER_SST;



	if (cfg->flags & FLAG_SOF)

		return SND_INTEL_DSP_DRIVER_SOF;



	return SND_INTEL_DSP_DRIVER_SST;

}

EXPORT_SYMBOL_GPL(snd_intel_acpi_dsp_driver_probe);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Intel DSP config driver");

MODULE_IMPORT_NS(SOUNDWIRE_INTEL_INIT);

sound/soc/intel/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ config SND_SOC_INTEL_CATPT 
	select DW_DMAC_CORE

	select SND_SOC_ACPI_INTEL_MATCH

	select WANT_DEV_COREDUMP

	select SND_INTEL_DSP_CONFIG

	help

	  Enable support for Intel(R) Haswell and Broadwell platforms

	  with I2S codec present. This is a recommended option.
@@ -56,6 +57,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI 
	depends on X86 && ACPI && PCI

	select SND_SST_ATOM_HIFI2_PLATFORM

	select SND_SOC_ACPI_INTEL_MATCH

	select SND_INTEL_DSP_CONFIG

	select IOSF_MBI

	help

	  If you have a Intel Baytrail or Cherrytrail platform with an I2S

sound/soc/intel/atom/sst/sst_acpi.c

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/acpi.h>

#include <asm/platform_sst_audio.h>

#include <sound/core.h>

#include <sound/intel-dsp-config.h>

#include <sound/soc.h>

#include <sound/compress_driver.h>

#include <acpi/acbuffer.h>
@@ -246,6 +247,13 @@ static int sst_acpi_probe(struct platform_device *pdev) 
	id = acpi_match_device(dev->driver->acpi_match_table, dev);

	if (!id)

		return -ENODEV;



	ret = snd_intel_acpi_dsp_driver_probe(dev, id->id);

	if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SST) {

		dev_dbg(dev, "SST ACPI driver not selected, aborting probe\n");

		return -ENODEV;

	}



	dev_dbg(dev, "for %s\n", id->id);



	mach = (struct snd_soc_acpi_mach *)id->driver_data;

CRA Git | Maintained and supported by SUSTech CRA and CCSE