ASoC: Intel: Skylake: Harden DSP detection with PCI class/subclass info

The existing PPCAP and GCAP fields cannot be used reliably to
determine if the DSP is enabled by the BIOS. Instead rely on the
class/subclass information to find out if this driver can run or
not. The values in the code don't seem to be documented in publicly
available documents but are part of recommendations made to BIOS
writers and have been verified to be accurate on a number of
platforms.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index df36b8fe6d5e38b004148380221d9d666635439f..41a084b3d48fdca310b07b1d5fef36e0ef31941a 100644 (file)
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -916,6 +916,21 @@ 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;