ASoC: Intel: Skylake: stop probe if HDaudio capabilities don't exist

Check immediately if required HDaudio capabilities can't be found (no
PPCAP or no streams exposed in GCAP), and move all DMA inits after the
error tests.

PPCAP and GCAP are not reliable indicators of DSP presence, but if
they don't exist then the driver will not work.

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 41a084b3d48fdca310b07b1d5fef36e0ef31941a..72e366bbba3399faf80e6b1cde304d7ef37a0f05 100644 (file)
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -946,6 +946,12 @@ static int skl_first_init(struct hdac_bus *bus)
 
        snd_hdac_bus_parse_capabilities(bus);
 
+       /* check if PPCAP exists */
+       if (!bus->ppcap) {
+               dev_err(bus->dev, "bus ppcap not set, HDaudio or DSP not present?\n");
+               return -ENODEV;
+       }
+
        if (skl_acquire_irq(bus, 0) < 0)
                return -EBUSY;
 
@@ -955,23 +961,25 @@ static int skl_first_init(struct hdac_bus *bus)
        gcap = snd_hdac_chip_readw(bus, GCAP);
        dev_dbg(bus->dev, "chipset global capabilities = 0x%x\n", gcap);
 
-       /* allow 64bit DMA address if supported by H/W */
-       if (!dma_set_mask(bus->dev, DMA_BIT_MASK(64))) {
-               dma_set_coherent_mask(bus->dev, DMA_BIT_MASK(64));
-       } else {
-               dma_set_mask(bus->dev, DMA_BIT_MASK(32));
-               dma_set_coherent_mask(bus->dev, DMA_BIT_MASK(32));
-       }
-
        /* read number of streams from GCAP register */
        cp_streams = (gcap >> 8) & 0x0f;
        pb_streams = (gcap >> 12) & 0x0f;
 
-       if (!pb_streams && !cp_streams)
+       if (!pb_streams && !cp_streams) {
+               dev_err(bus->dev, "no streams found in GCAP definitions?\n");
                return -EIO;
+       }
 
        bus->num_streams = cp_streams + pb_streams;
 
+       /* allow 64bit DMA address if supported by H/W */
+       if (!dma_set_mask(bus->dev, DMA_BIT_MASK(64))) {
+               dma_set_coherent_mask(bus->dev, DMA_BIT_MASK(64));
+       } else {
+               dma_set_mask(bus->dev, DMA_BIT_MASK(32));
+               dma_set_coherent_mask(bus->dev, DMA_BIT_MASK(32));
+       }
+
        /* initialize streams */
        snd_hdac_ext_stream_init_all
                (bus, 0, cp_streams, SNDRV_PCM_STREAM_CAPTURE);