Unverified Commit 4a5883a5 authored by Mark Brown's avatar Mark Brown
Browse files

cs35l56: Log tuning unique identifiers during firmware 

Merge series from Simon Trimmer <simont@opensource.cirrus.com>:

These two patches introduce a log message when provisioning the cs35l56
family of devices that uniquely identifies the firmware tuning.
parents dd4eb861 db13e3d5

include/sound/cs35l56.h

+1 −0
Original line number Diff line number Diff line
@@ -360,6 +360,7 @@ void cs35l56_init_cs_dsp(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_ds 
int cs35l56_get_calibration(struct cs35l56_base *cs35l56_base);

int cs35l56_read_prot_status(struct cs35l56_base *cs35l56_base,

			     bool *fw_missing, unsigned int *fw_version);

void cs35l56_log_tuning(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp);

int cs35l56_hw_init(struct cs35l56_base *cs35l56_base);

int cs35l56_get_speaker_id(struct cs35l56_base *cs35l56_base);

int cs35l56_get_bclk_freq_id(unsigned int freq);

sound/pci/hda/cs35l56_hda.c

+2 −0
Original line number Diff line number Diff line
@@ -676,6 +676,8 @@ static void cs35l56_hda_fw_load(struct cs35l56_hda *cs35l56) 
	if (ret)

		cs_dsp_stop(&cs35l56->cs_dsp);



	cs35l56_log_tuning(&cs35l56->base, &cs35l56->cs_dsp);



err_powered_up:

	if (!cs35l56->base.fw_patched)

		cs_dsp_power_down(&cs35l56->cs_dsp);

sound/soc/codecs/cs35l56-shared.c

+28 −0
Original line number Diff line number Diff line
@@ -909,6 +909,33 @@ int cs35l56_read_prot_status(struct cs35l56_base *cs35l56_base, 
}

EXPORT_SYMBOL_NS_GPL(cs35l56_read_prot_status, "SND_SOC_CS35L56_SHARED");



void cs35l56_log_tuning(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp)

{

	__be32 pid, sid, tid;

	int ret;



	scoped_guard(mutex, &cs_dsp->pwr_lock) {

		ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(cs_dsp, "AS_PRJCT_ID",

							    WMFW_ADSP2_XM, 0x9f212),

					     0, &pid, sizeof(pid));

		if (!ret)

			ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(cs_dsp, "AS_CHNNL_ID",

								    WMFW_ADSP2_XM, 0x9f212),

						     0, &sid, sizeof(sid));

		if (!ret)

			ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(cs_dsp, "AS_SNPSHT_ID",

								    WMFW_ADSP2_XM, 0x9f212),

						     0, &tid, sizeof(tid));

	}



	if (ret)

		dev_warn(cs35l56_base->dev, "Can't read tuning IDs");

	else

		dev_info(cs35l56_base->dev, "Tuning PID: %#x, SID: %#x, TID: %#x\n",

			 be32_to_cpu(pid), be32_to_cpu(sid), be32_to_cpu(tid));

}

EXPORT_SYMBOL_NS_GPL(cs35l56_log_tuning, "SND_SOC_CS35L56_SHARED");



int cs35l56_hw_init(struct cs35l56_base *cs35l56_base)

{

	int ret;
@@ -1249,3 +1276,4 @@ MODULE_AUTHOR("Richard Fitzgerald <rf@opensource.cirrus.com>"); 
MODULE_AUTHOR("Simon Trimmer <simont@opensource.cirrus.com>");

MODULE_LICENSE("GPL");

MODULE_IMPORT_NS("SND_SOC_CS_AMP_LIB");

MODULE_IMPORT_NS("FW_CS_DSP");

sound/soc/codecs/cs35l56.c

+1 −0
Original line number Diff line number Diff line
@@ -847,6 +847,7 @@ static void cs35l56_dsp_work(struct work_struct *work) 
	else

		cs35l56_patch(cs35l56, firmware_missing);



	cs35l56_log_tuning(&cs35l56->base, &cs35l56->dsp.cs_dsp);

err:

	pm_runtime_mark_last_busy(cs35l56->base.dev);

	pm_runtime_put_autosuspend(cs35l56->base.dev);