5 files changed, 106 insertions, 81 deletions

diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index 3a8c4d954a91..1866e31b6c29 100644
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -89,11 +89,6 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
                 if (ret)
                         dev_err(card->dev, "failed to stop PLL: %d\n", ret);
         } else if(SND_SOC_DAPM_EVENT_ON(event)) {
-                ret = snd_soc_dai_set_sysclk(codec_dai,
-                        DA7219_CLKSRC_MCLK, 19200000, SND_SOC_CLOCK_IN);
-                if (ret)
-                        dev_err(card->dev, "can't set codec sysclk configuration\n");
-
                 ret = snd_soc_dai_set_pll(codec_dai, 0,
                         DA7219_SYSCLK_PLL_SRM, 0, DA7219_PLL_FREQ_OUT_98304);
                 if (ret)
@@ -187,8 +182,17 @@ static int broxton_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
 static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd)
 {
         int ret;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_codec *codec = rtd->codec;
 
+        /* Configure sysclk for codec */
+        ret = snd_soc_dai_set_sysclk(codec_dai, DA7219_CLKSRC_MCLK, 19200000,
+                                     SND_SOC_CLOCK_IN);
+        if (ret) {
+                dev_err(rtd->dev, "can't set codec sysclk configuration\n");
+                return ret;
+        }
+
         /*
          * Headset buttons map to the google Reference headset.
          * These can be configured by userspace.
diff --git a/sound/soc/intel/skylake/skl-sst-ipc.c b/sound/soc/intel/skylake/skl-sst-ipc.c
index 58c525096a7c..498b15345b1a 100644
--- a/sound/soc/intel/skylake/skl-sst-ipc.c
+++ b/sound/soc/intel/skylake/skl-sst-ipc.c
@@ -413,8 +413,11 @@ static void skl_ipc_process_reply(struct sst_generic_ipc *ipc,
         u32 reply = header.primary & IPC_GLB_REPLY_STATUS_MASK;
         u64 *ipc_header = (u64 *)(&header);
         struct skl_sst *skl = container_of(ipc, struct skl_sst, ipc);
+        unsigned long flags;
 
+        spin_lock_irqsave(&ipc->dsp->spinlock, flags);
         msg = skl_ipc_reply_get_msg(ipc, *ipc_header);
+        spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
         if (msg == NULL) {
                 dev_dbg(ipc->dev, "ipc: rx list is empty\n");
                 return;
@@ -456,8 +459,10 @@ static void skl_ipc_process_reply(struct sst_generic_ipc *ipc,
                 }
         }
 
+        spin_lock_irqsave(&ipc->dsp->spinlock, flags);
         list_del(&msg->list);
         sst_ipc_tx_msg_reply_complete(ipc, msg);
+        spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
 }
 
 irqreturn_t skl_dsp_irq_thread_handler(int irq, void *context)
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 3a99712e44a8..64a0f8ed33e1 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -2502,7 +2502,7 @@ static int skl_tplg_get_manifest_tkn(struct device *dev,
 
                         if (ret < 0)
                                 return ret;
-                        tkn_count += ret;
+                        tkn_count = ret;
 
                         tuple_size += tkn_count *
                                 sizeof(struct snd_soc_tplg_vendor_string_elem);
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 6df3b317a476..4c9b5781282b 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -410,7 +410,7 @@ static int skl_free(struct hdac_ext_bus *ebus)
         struct skl *skl  = ebus_to_skl(ebus);
         struct hdac_bus *bus = ebus_to_hbus(ebus);
 
-        skl->init_failed = 1; /* to be sure */
+        skl->init_done = 0; /* to be sure */
 
         snd_hdac_ext_stop_streams(ebus);
 
@@ -428,8 +428,10 @@ static int skl_free(struct hdac_ext_bus *ebus)
 
         snd_hdac_ext_bus_exit(ebus);
 
+        cancel_work_sync(&skl->probe_work);
         if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))
                 snd_hdac_i915_exit(&ebus->bus);
+
         return 0;
 }
 
@@ -566,6 +568,84 @@ static const struct hdac_bus_ops bus_core_ops = {
         .get_response = snd_hdac_bus_get_response,
 };
 
+static int skl_i915_init(struct hdac_bus *bus)
+{
+        int err;
+
+        /*
+         * The HDMI codec is in GPU so we need to ensure that it is powered
+         * up and ready for probe
+         */
+        err = snd_hdac_i915_init(bus);
+        if (err < 0)
+                return err;
+
+        err = snd_hdac_display_power(bus, true);
+        if (err < 0)
+                dev_err(bus->dev, "Cannot turn on display power on i915\n");
+
+        return err;
+}
+
+static void skl_probe_work(struct work_struct *work)
+{
+        struct skl *skl = container_of(work, struct skl, probe_work);
+        struct hdac_ext_bus *ebus = &skl->ebus;
+        struct hdac_bus *bus = ebus_to_hbus(ebus);
+        struct hdac_ext_link *hlink = NULL;
+        int err;
+
+        if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {
+                err = skl_i915_init(bus);
+                if (err < 0)
+                        return;
+        }
+
+        err = skl_init_chip(bus, true);
+        if (err < 0) {
+                dev_err(bus->dev, "Init chip failed with err: %d\n", err);
+                goto out_err;
+        }
+
+        /* codec detection */
+        if (!bus->codec_mask)
+                dev_info(bus->dev, "no hda codecs found!\n");
+
+        /* create codec instances */
+        err = skl_codec_create(ebus);
+        if (err < 0)
+                goto out_err;
+
+        if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {
+                err = snd_hdac_display_power(bus, false);
+                if (err < 0) {
+                        dev_err(bus->dev, "Cannot turn off display power on i915\n");
+                        return;
+                }
+        }
+
+        /* register platform dai and controls */
+        err = skl_platform_register(bus->dev);
+        if (err < 0)
+                return;
+        /*
+         * we are done probing so decrement link counts
+         */
+        list_for_each_entry(hlink, &ebus->hlink_list, list)
+                snd_hdac_ext_bus_link_put(ebus, hlink);
+
+        /* configure PM */
+        pm_runtime_put_noidle(bus->dev);
+        pm_runtime_allow(bus->dev);
+        skl->init_done = 1;
+
+        return;
+
+out_err:
+        if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))
+                err = snd_hdac_display_power(bus, false);
+}
+
 /*
  * constructor
  */
@@ -593,6 +673,7 @@ static int skl_create(struct pci_dev *pci,
         snd_hdac_ext_bus_init(ebus, &pci->dev, &bus_core_ops, io_ops);
         ebus->bus.use_posbuf = 1;
         skl->pci = pci;
+        INIT_WORK(&skl->probe_work, skl_probe_work);
 
         ebus->bus.bdl_pos_adj = 0;
 
@@ -601,27 +682,6 @@ static int skl_create(struct pci_dev *pci,
         return 0;
 }
 
-static int skl_i915_init(struct hdac_bus *bus)
-{
-        int err;
-
-        /*
-         * The HDMI codec is in GPU so we need to ensure that it is powered
-         * up and ready for probe
-         */
-        err = snd_hdac_i915_init(bus);
-        if (err < 0)
-                return err;
-
-        err = snd_hdac_display_power(bus, true);
-        if (err < 0) {
-                dev_err(bus->dev, "Cannot turn on display power on i915\n");
-                return err;
-        }
-
-        return err;
-}
-
 static int skl_first_init(struct hdac_ext_bus *ebus)
 {
         struct skl *skl = ebus_to_skl(ebus);
@@ -684,20 +744,7 @@ static int skl_first_init(struct hdac_ext_bus *ebus)
         /* initialize chip */
         skl_init_pci(skl);
 
-        if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {
-                err = skl_i915_init(bus);
-                if (err < 0)
-                        return err;
-        }
-
-        skl_init_chip(bus, true);
-
-        /* codec detection */
-        if (!bus->codec_mask) {
-                dev_info(bus->dev, "no hda codecs found!\n");
-        }
-
-        return 0;
+        return skl_init_chip(bus, true);
 }
 
 static int skl_probe(struct pci_dev *pci,
@@ -706,7 +753,6 @@ static int skl_probe(struct pci_dev *pci,
         struct skl *skl;
         struct hdac_ext_bus *ebus = NULL;
         struct hdac_bus *bus = NULL;
-        struct hdac_ext_link *hlink = NULL;
         int err;
 
         /* we use ext core ops, so provide NULL for ops here */
@@ -729,7 +775,7 @@ static int skl_probe(struct pci_dev *pci,
 
         if (skl->nhlt == NULL) {
                 err = -ENODEV;
-                goto out_display_power_off;
+                goto out_free;
         }
 
         err = skl_nhlt_create_sysfs(skl);
@@ -760,56 +806,24 @@ static int skl_probe(struct pci_dev *pci,
         if (bus->mlcap)
                 snd_hdac_ext_bus_get_ml_capabilities(ebus);
 
+        snd_hdac_bus_stop_chip(bus);
+
         /* create device for soc dmic */
         err = skl_dmic_device_register(skl);
         if (err < 0)
                 goto out_dsp_free;
 
-        /* register platform dai and controls */
-        err = skl_platform_register(bus->dev);
-        if (err < 0)
-                goto out_dmic_free;
-
-        /* create codec instances */
-        err = skl_codec_create(ebus);
-        if (err < 0)
-                goto out_unregister;
-
-        if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {
-                err = snd_hdac_display_power(bus, false);
-                if (err < 0) {
-                        dev_err(bus->dev, "Cannot turn off display power on i915\n");
-                        return err;
-                }
-        }
-
-        /*
-         * we are done probling so decrement link counts
-         */
-        list_for_each_entry(hlink, &ebus->hlink_list, list)
-                snd_hdac_ext_bus_link_put(ebus, hlink);
-
-        /* configure PM */
-        pm_runtime_put_noidle(bus->dev);
-        pm_runtime_allow(bus->dev);
+        schedule_work(&skl->probe_work);
 
         return 0;
 
-out_unregister:
-        skl_platform_unregister(bus->dev);
-out_dmic_free:
-        skl_dmic_device_unregister(skl);
 out_dsp_free:
         skl_free_dsp(skl);
 out_mach_free:
         skl_machine_device_unregister(skl);
 out_nhlt_free:
         skl_nhlt_free(skl->nhlt);
-out_display_power_off:
-        if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))
-                snd_hdac_display_power(bus, false);
 out_free:
-        skl->init_failed = 1;
         skl_free(ebus);
 
         return err;
@@ -828,7 +842,7 @@ static void skl_shutdown(struct pci_dev *pci)
 
         skl = ebus_to_skl(ebus);
 
-        if (skl->init_failed)
+        if (!skl->init_done)
                 return;
 
         snd_hdac_ext_stop_streams(ebus);
diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index a454f6035f3e..2a630fcb7f08 100644
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -46,7 +46,7 @@ struct skl {
         struct hdac_ext_bus ebus;
         struct pci_dev *pci;
 
-        unsigned int init_failed:1; /* delayed init failed */
+        unsigned int init_done:1; /* delayed init status */
         struct platform_device *dmic_dev;
         struct platform_device *i2s_dev;
         struct snd_soc_platform *platform;
@@ -64,6 +64,8 @@ struct skl {
         const struct firmware *tplg;
 
         int supend_active;
+
+        struct work_struct probe_work;
 };
 
 #define skl_to_ebus(s)  (&(s)->ebus)