Unverified Commit 189bf1de authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-dsp: Declare locally used functions as static 



The following functions can be made static as they are only used locally:
hda_dsp_core_reset_enter
hda_dsp_core_reset_leave
hda_dsp_core_stall_reset
hda_dsp_core_power_up
hda_dsp_core_power_down
hda_dsp_core_is_enabled

The hda_dsp_ipc_int_disable is also only used within hda-dsp.c, but for
symmetry for hda_dsp_ipc_int_enable (used by hda-loader.c) leave it as it
is.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210915071805.5704-2-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/intel/hda-dsp.c

+30 −31
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ MODULE_PARM_DESC(enable_trace_D0I3_S0, 
 * DSP Core control.

 */



int hda_dsp_core_reset_enter(struct snd_sof_dev *sdev, unsigned int core_mask)

static int hda_dsp_core_reset_enter(struct snd_sof_dev *sdev, unsigned int core_mask)

{

	u32 adspcs;

	u32 reset;
@@ -73,7 +73,7 @@ int hda_dsp_core_reset_enter(struct snd_sof_dev *sdev, unsigned int core_mask) 
	return ret;

}



int hda_dsp_core_reset_leave(struct snd_sof_dev *sdev, unsigned int core_mask)

static int hda_dsp_core_reset_leave(struct snd_sof_dev *sdev, unsigned int core_mask)

{

	unsigned int crst;

	u32 adspcs;
@@ -113,7 +113,7 @@ int hda_dsp_core_reset_leave(struct snd_sof_dev *sdev, unsigned int core_mask) 
	return ret;

}



int hda_dsp_core_stall_reset(struct snd_sof_dev *sdev, unsigned int core_mask)

static int hda_dsp_core_stall_reset(struct snd_sof_dev *sdev, unsigned int core_mask)

{

	/* stall core */

	snd_sof_dsp_update_bits_unlocked(sdev, HDA_DSP_BAR,
@@ -125,6 +125,31 @@ int hda_dsp_core_stall_reset(struct snd_sof_dev *sdev, unsigned int core_mask) 
	return hda_dsp_core_reset_enter(sdev, core_mask);

}



static bool hda_dsp_core_is_enabled(struct snd_sof_dev *sdev, unsigned int core_mask)

{

	int val;

	bool is_enable;



	val = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPCS);



#define MASK_IS_EQUAL(v, m, field) ({	\

	u32 _m = field(m);		\

	((v) & _m) == _m;		\

})



	is_enable = MASK_IS_EQUAL(val, core_mask, HDA_DSP_ADSPCS_CPA_MASK) &&

		MASK_IS_EQUAL(val, core_mask, HDA_DSP_ADSPCS_SPA_MASK) &&

		!(val & HDA_DSP_ADSPCS_CRST_MASK(core_mask)) &&

		!(val & HDA_DSP_ADSPCS_CSTALL_MASK(core_mask));



#undef MASK_IS_EQUAL



	dev_dbg(sdev->dev, "DSP core(s) enabled? %d : core_mask %x\n",

		is_enable, core_mask);



	return is_enable;

}



int hda_dsp_core_run(struct snd_sof_dev *sdev, unsigned int core_mask)

{

	int ret;
@@ -156,7 +181,7 @@ int hda_dsp_core_run(struct snd_sof_dev *sdev, unsigned int core_mask) 
 * Power Management.

 */



int hda_dsp_core_power_up(struct snd_sof_dev *sdev, unsigned int core_mask)

static int hda_dsp_core_power_up(struct snd_sof_dev *sdev, unsigned int core_mask)

{

	unsigned int cpa;

	u32 adspcs;
@@ -195,7 +220,7 @@ int hda_dsp_core_power_up(struct snd_sof_dev *sdev, unsigned int core_mask) 
	return ret;

}



int hda_dsp_core_power_down(struct snd_sof_dev *sdev, unsigned int core_mask)

static int hda_dsp_core_power_down(struct snd_sof_dev *sdev, unsigned int core_mask)

{

	u32 adspcs;

	int ret;
@@ -218,32 +243,6 @@ int hda_dsp_core_power_down(struct snd_sof_dev *sdev, unsigned int core_mask) 
	return ret;

}



bool hda_dsp_core_is_enabled(struct snd_sof_dev *sdev,

			     unsigned int core_mask)

{

	int val;

	bool is_enable;



	val = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPCS);



#define MASK_IS_EQUAL(v, m, field) ({	\

	u32 _m = field(m);		\

	((v) & _m) == _m;		\

})



	is_enable = MASK_IS_EQUAL(val, core_mask, HDA_DSP_ADSPCS_CPA_MASK) &&

		MASK_IS_EQUAL(val, core_mask, HDA_DSP_ADSPCS_SPA_MASK) &&

		!(val & HDA_DSP_ADSPCS_CRST_MASK(core_mask)) &&

		!(val & HDA_DSP_ADSPCS_CSTALL_MASK(core_mask));



#undef MASK_IS_EQUAL



	dev_dbg(sdev->dev, "DSP core(s) enabled? %d : core_mask %x\n",

		is_enable, core_mask);



	return is_enable;

}



int hda_dsp_enable_core(struct snd_sof_dev *sdev, unsigned int core_mask)

{

	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;

sound/soc/sof/intel/hda.h

+0 −9
Original line number Diff line number Diff line
@@ -492,17 +492,8 @@ struct sof_intel_hda_stream { 
 */

int hda_dsp_probe(struct snd_sof_dev *sdev);

int hda_dsp_remove(struct snd_sof_dev *sdev);

int hda_dsp_core_reset_enter(struct snd_sof_dev *sdev,

			     unsigned int core_mask);

int hda_dsp_core_reset_leave(struct snd_sof_dev *sdev,

			     unsigned int core_mask);

int hda_dsp_core_stall_reset(struct snd_sof_dev *sdev, unsigned int core_mask);

int hda_dsp_core_run(struct snd_sof_dev *sdev, unsigned int core_mask);

int hda_dsp_core_power_up(struct snd_sof_dev *sdev, unsigned int core_mask);

int hda_dsp_enable_core(struct snd_sof_dev *sdev, unsigned int core_mask);

int hda_dsp_core_power_down(struct snd_sof_dev *sdev, unsigned int core_mask);

bool hda_dsp_core_is_enabled(struct snd_sof_dev *sdev,

			     unsigned int core_mask);

int hda_dsp_core_reset_power_down(struct snd_sof_dev *sdev,

				  unsigned int core_mask);

void hda_dsp_ipc_int_enable(struct snd_sof_dev *sdev);