Unverified Commit d4e23b7c authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown
Browse files

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: default avatarAmadeusz Sławiński <amadeuszx.slawinski@intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20190723145854.8527-6-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e5c29dc5

sound/soc/intel/skylake/skl-messages.c

+0 −20
Original line number Diff line number Diff line
@@ -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);

sound/soc/intel/skylake/skl-pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

sound/soc/intel/skylake/skl-sst-dsp.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/intel/skylake/skl-topology.h

+0 −5
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE