ALSA: HD-Audio: SKL+: force HDaudio legacy or SKL+ driver selection

For HDaudio and Skylake drivers, add module parameter "pci_binding"

When pci_binding == 0 (AUTO), the PCI class/subclass info is used to
select drivers based on the presence of the DSP.

pci_binding == 1 (LEGACY) forces the use of the HDAudio legacy driver,
even if the DSP is present.

pci_binding == 2 (ASOC) forces the use of the ASOC driver. The
information on the DSP presence is bypassed.

The value for the module parameter needs to be identical for both
drivers. This parameter is intended as a back-up solution if the
automatic detection fails or when the DSP usage fails. Such cases
should be reported on the alsa-devel mailing list for analysis.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index f9b2b6330d27a1c4f0e4fadb0e20646f5b67cb2e..b4fa1c7752510b5216a92f6d663d4fc0d1da3b39 100644 (file)
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -98,6 +98,12 @@ enum {
        HDA_DEV_ASOC,
 };
 
+enum {
+       SND_SKL_PCI_BIND_AUTO,  /* automatic selection based on pci class */
+       SND_SKL_PCI_BIND_LEGACY,/* bind only with legacy driver */
+       SND_SKL_PCI_BIND_ASOC   /* bind only with ASoC driver */
+};
+
 /* direction */
 enum {
        HDA_INPUT, HDA_OUTPUT

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 2ec9c896ebc089e437d33aed7cfbe0d64fa133c2..e42cc22309771c5ccca02437cc2f6d911abbacd9 100644 (file)
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -172,6 +172,9 @@ module_param_array(beep_mode, bool, NULL, 0444);
 MODULE_PARM_DESC(beep_mode, "Select HDA Beep registration mode "
                            "(0=off, 1=on) (default=1).");
 #endif
+static int skl_pci_binding;
+module_param_named(pci_binding, skl_pci_binding, int, 0444);
+MODULE_PARM_DESC(pci_binding, "PCI binding (0=auto, 1=only legacy, 2=only asoc");
 
 #ifdef CONFIG_PM
 static int param_set_xint(const char *val, const struct kernel_param *kp);
@@ -2050,9 +2053,26 @@ static int azx_probe(struct pci_dev *pci,
        int err;
 
        /* check if this driver can be used on SKL+ Intel platforms */
-       if ((pci_id->driver_data & AZX_DCAPS_INTEL_SHARED) &&
-           pci->class != 0x040300)
-               return -ENODEV;
+       if (pci_id->driver_data & AZX_DCAPS_INTEL_SHARED) {
+               switch (skl_pci_binding) {
+               case SND_SKL_PCI_BIND_AUTO:
+                       if (pci->class != 0x040300) {
+                               dev_info(&pci->dev, "The DSP is enabled on this platform, aborting probe\n");
+                               return -ENODEV;
+                       }
+                       dev_info(&pci->dev, "No DSP detected, continuing HDaudio legacy probe\n");
+                       break;
+               case SND_SKL_PCI_BIND_LEGACY:
+                       dev_info(&pci->dev, "Module parameter forced binding with HDaudio legacy, bypassed detection logic\n");
+                       break;
+               case SND_SKL_PCI_BIND_ASOC:
+                       dev_info(&pci->dev, "Module parameter forced binding with SKL+ ASoC driver, aborting probe\n");
+                       return -ENODEV;
+               default:
+                       dev_err(&pci->dev, "invalid value for skl_pci_binding module parameter, ignored\n");
+                       break;
+               }
+       }
 
        if (dev >= SNDRV_CARDS)
                return -ENODEV;

diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 29d9b0eb83ea1589af77912a7767034e3aeda3c3..60c94836bf5bc93bb3dde46a237c21abf77e5b6c 100644 (file)
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -40,6 +40,9 @@
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC)
 #include "../../../soc/codecs/hdac_hda.h"
 #endif
+static int skl_pci_binding;
+module_param_named(pci_binding, skl_pci_binding, int, 0444);
+MODULE_PARM_DESC(pci_binding, "PCI binding (0=auto, 1=only legacy, 2=only asoc");
 
 /*
  * initialize the PCI registers
@@ -896,21 +899,6 @@ static int skl_first_init(struct hdac_bus *bus)
        unsigned short gcap;
        int cp_streams, pb_streams, start_idx;
 
-       /*
-        * detect DSP by checking class/subclass/prog-id information
-        * class=04 subclass 03 prog-if 00: no DSP, legacy driver needs to be used
-        * class=04 subclass 01 prog-if 00: DSP is present (and may be required e.g. for DMIC or SSP support)
-        * class=04 subclass 03 prog-if 80: either of DSP or legacy mode can be used
-        */
-       if (pci->class == 0x040300) {
-               dev_err(bus->dev, "The DSP is not enabled on this platform, aborting probe\n");
-               return -ENODEV;
-       } else if (pci->class != 0x040100 && pci->class != 0x040380) {
-               dev_err(bus->dev, "Unknown PCI class/subclass/prog-if information (0x%06x) found, aborting probe\n", pci->class);
-               return -ENODEV;
-       }
-       dev_info(bus->dev, "DSP detected with PCI class/subclass/prog-if info 0x%06x\n", pci->class);
-
        err = pci_request_regions(pci, "Skylake HD audio");
        if (err < 0)
                return err;
@@ -984,6 +972,36 @@ static int skl_probe(struct pci_dev *pci,
        struct hdac_bus *bus = NULL;
        int err;
 
+       switch (skl_pci_binding) {
+       case SND_SKL_PCI_BIND_AUTO:
+               /*
+                * detect DSP by checking class/subclass/prog-id information
+                * class=04 subclass 03 prog-if 00: no DSP, use legacy driver
+                * class=04 subclass 01 prog-if 00: DSP is present
+                *   (and may be required e.g. for DMIC or SSP support)
+                * class=04 subclass 03 prog-if 80: use DSP or legacy mode
+                */
+               if (pci->class == 0x040300) {
+                       dev_info(&pci->dev, "The DSP is not enabled on this platform, aborting probe\n");
+                       return -ENODEV;
+               }
+               if (pci->class != 0x040100 && pci->class != 0x040380) {
+                       dev_err(&pci->dev, "Unknown PCI class/subclass/prog-if information (0x%06x) found, aborting probe\n", pci->class);
+                       return -ENODEV;
+               }
+               dev_info(&pci->dev, "DSP detected with PCI class/subclass/prog-if info 0x%06x\n", pci->class);
+               break;
+       case SND_SKL_PCI_BIND_LEGACY:
+               dev_info(&pci->dev, "Module parameter forced binding with HDaudio legacy, aborting probe\n");
+               return -ENODEV;
+       case SND_SKL_PCI_BIND_ASOC:
+               dev_info(&pci->dev, "Module parameter forced binding with SKL driver, bypassed detection logic\n");
+               break;
+       default:
+               dev_err(&pci->dev, "invalid value for skl_pci_binding module parameter, ignored\n");
+               break;
+       }
+
        /* we use ext core ops, so provide NULL for ops here */
        err = skl_create(pci, NULL, &skl);
        if (err < 0)