From: Cezary Rojewski <cezary.rojewski@intel.com>
To: alsa-devel@alsa-project.org
Cc: pierre-louis.bossart@linux.intel.com,
"Cezary Rojewski" <cezary.rojewski@intel.com>,
lgirdwood@gmail.com, tiwai@suse.com, broonie@kernel.org,
"Amadeusz Sławiński" <amadeuszx.slawinski@intel.com>
Subject: [PATCH 5/7] ASoC: Intel: Skylake: Do not disable FW notifications
Date: Thu, 4 Jul 2019 22:01:04 +0200 [thread overview]
Message-ID: <20190704200106.11289-6-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20190704200106.11289-1-cezary.rojewski@intel.com>
From: Amadeusz Sławiński <amadeuszx.slawinski@intel.com>
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>
---
sound/soc/intel/skylake/skl-messages.c | 20 --------------------
sound/soc/intel/skylake/skl-pcm.c | 1 -
sound/soc/intel/skylake/skl-sst-dsp.h | 1 -
sound/soc/intel/skylake/skl-topology.h | 5 -----
4 files changed, 27 deletions(-)
diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index f604d9c6824d..07762543fb13 100644
--- 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 2ae5d09d7228..7f287424af9b 100644
--- 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 ed968f1042c7..cdfec0fca577 100644
--- 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 0a4d89cdaa4c..e2a2fc5c5545 100644
--- 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;
--
2.17.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-07-04 20:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 20:00 [PATCH 0/7] ASoC: Intel: Skylake: Driver fundaments overhaul Cezary Rojewski
2019-07-04 20:01 ` [PATCH 1/7] ASoC: Intel: Skylake: Merge skl_sst and skl into skl_dev struct Cezary Rojewski
2019-07-04 20:01 ` [PATCH 2/7] ASoC: Intel: Skylake: Combine snd_soc_skl_ipc and snd_soc_skl Cezary Rojewski
2019-07-04 20:01 ` [PATCH 3/7] ASoC: Intel: Skylake: Remove MCPS available check Cezary Rojewski
2019-07-04 20:01 ` [PATCH 4/7] ASoC: Intel: Skylake: Remove memory " Cezary Rojewski
2019-07-04 20:01 ` Cezary Rojewski [this message]
2019-07-04 20:01 ` [PATCH 6/7] ASoC: Intel: Skylake: Make MCPS and CPS params obsolete Cezary Rojewski
2019-07-04 20:01 ` [PATCH 7/7] ASoC: Intel: Skylake: Cleanup skl_module_cfg declaration Cezary Rojewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190704200106.11289-6-cezary.rojewski@intel.com \
--to=cezary.rojewski@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=amadeuszx.slawinski@intel.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox