ASoC: Intel: Skylake: Do not disable FW notifications

As per FW team recommendation we should not disable notifications.
By default, all notifications are enabled in DSP firmware. These
notifications provide a vital information whenever an error occurs.

Currently, driver disables them during boot sequences. By doing so,
Skylake may silently ignore severe stream errors.
Correct that by removing permissive code.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20190723145854.8527-6-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index f604d9c6824dfcbee4e42d38d9d1fae458a0967e..07762543fb139090a781a212ba58afde57ecce5a 100644 (file)
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -58,24 +58,6 @@ void skl_dsp_set_astate_cfg(struct skl_dev *skl, u32 cnt, void *data)
        skl_ipc_set_large_config(&skl->ipc, &msg, data);
 }
 
-#define NOTIFICATION_PARAM_ID 3
-#define NOTIFICATION_MASK 0xf
-
-/* disable notfication for underruns/overruns from firmware module */
-void skl_dsp_enable_notification(struct skl_dev *skl, bool enable)
-{
-       struct notification_mask mask;
-       struct skl_ipc_large_config_msg msg = {0};
-
-       mask.notify = NOTIFICATION_MASK;
-       mask.enable = enable;
-
-       msg.large_param_id = NOTIFICATION_PARAM_ID;
-       msg.param_data_size = sizeof(mask);
-
-       skl_ipc_set_large_config(&skl->ipc, &msg, (u32 *)&mask);
-}
-
 static int skl_dsp_setup_spib(struct device *dev, unsigned int size,
                                int stream_tag, int enable)
 {
@@ -436,8 +418,6 @@ int skl_resume_dsp(struct skl_dev *skl)
        if (ret < 0)
                return ret;
 
-       skl_dsp_enable_notification(skl, false);
-
        if (skl->cfg.astate_cfg != NULL) {
                skl_dsp_set_astate_cfg(skl, skl->cfg.astate_cfg->count,
                                        skl->cfg.astate_cfg);

diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index 2ae5d09d7228c9681882cb5dc8a38eedad797cf7..7f287424af9b788035366546edaef7c9366260ef 100644 (file)
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -1445,7 +1445,6 @@ static int skl_platform_soc_probe(struct snd_soc_component *component)
                }
                skl_populate_modules(skl);
                skl->update_d0i3c = skl_update_d0i3c;
-               skl_dsp_enable_notification(skl, false);
 
                if (skl->cfg.astate_cfg != NULL) {
                        skl_dsp_set_astate_cfg(skl,

diff --git a/sound/soc/intel/skylake/skl-sst-dsp.h b/sound/soc/intel/skylake/skl-sst-dsp.h
index ed968f1042c723944bff925c7e1f37ee2521ba98..cdfec0fca5773d36f4db12e0e4217fbafdcb1a3e 100644 (file)
--- a/sound/soc/intel/skylake/skl-sst-dsp.h
+++ b/sound/soc/intel/skylake/skl-sst-dsp.h
@@ -240,7 +240,6 @@ int skl_get_pvt_instance_id_map(struct skl_dev *skl,
 void skl_freeup_uuid_list(struct skl_dev *skl);
 
 int skl_dsp_strip_extended_manifest(struct firmware *fw);
-void skl_dsp_enable_notification(struct skl_dev *skl, bool enable);
 
 void skl_dsp_set_astate_cfg(struct skl_dev *skl, u32 cnt, void *data);
 

diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 0a4d89cdaa4cb8c833a6453779b3b06cbb88d0f2..e2a2fc5c5545c93d392a6b015f024f0d518e2460 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -140,11 +140,6 @@ struct skl_src_module_cfg {
        enum skl_s_freq src_cfg;
 } __packed;
 
-struct notification_mask {
-       u32 notify;
-       u32 enable;
-} __packed;
-
 struct skl_up_down_mixer_cfg {
        struct skl_base_cfg base_cfg;
        enum skl_ch_cfg out_ch_cfg;