Unverified Commit dde9ad0e authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: Intel: hda: Cleanups for local function uses" from... 

Merge series "ASoC: SOF: Intel: hda: Cleanups for local function uses" from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

Hi,

Small cleanups regarding to HDA function locations and dropping of definitions
of not implemented functions.

Regards,
Peter
---
Peter Ujfalusi (3):
  ASoC: SOF: Intel: hda-dsp: Declare locally used functions as static
  ASoC: SOF: Intel: hda: Remove boot_firmware skl and iccmax_icl
    declarations
  ASoC: SOF: Intel: hda: Relocate inline definitions from hda.h to hda.c
    for sdw

 sound/soc/sof/intel/hda-dsp.c | 61 +++++++++++++++++------------------
 sound/soc/sof/intel/hda.c     | 33 ++++++++++++++++++-
 sound/soc/sof/intel/hda.h     | 41 -----------------------
 3 files changed, 62 insertions(+), 73 deletions(-)

--
2.33.0
parents f4056969 3e9d5b09

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.c

+32 −1
Original line number Diff line number Diff line
@@ -294,7 +294,38 @@ void hda_sdw_process_wakeen(struct snd_sof_dev *sdev) 
	sdw_intel_process_wakeen_event(hdev->sdw);

}



#endif

#else /* IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE) */

static inline int hda_sdw_acpi_scan(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline int hda_sdw_probe(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline int hda_sdw_exit(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline bool hda_dsp_check_sdw_irq(struct snd_sof_dev *sdev)

{

	return false;

}



static inline irqreturn_t hda_dsp_sdw_thread(int irq, void *context)

{

	return IRQ_HANDLED;

}



static inline bool hda_sdw_check_wakeen_irq(struct snd_sof_dev *sdev)

{

	return false;

}



#endif /* IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE) */



/*

 * Debug

sound/soc/sof/intel/hda.h

+0 −41
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);
@@ -619,8 +610,6 @@ int hda_dsp_ipc_cmd_done(struct snd_sof_dev *sdev, int dir); 
 */

int hda_dsp_cl_boot_firmware(struct snd_sof_dev *sdev);

int hda_dsp_cl_boot_firmware_iccmax(struct snd_sof_dev *sdev);

int hda_dsp_cl_boot_firmware_iccmax_icl(struct snd_sof_dev *sdev);

int hda_dsp_cl_boot_firmware_skl(struct snd_sof_dev *sdev);



/* pre and post fw run ops */

int hda_dsp_pre_fw_run(struct snd_sof_dev *sdev);
@@ -695,45 +684,15 @@ bool hda_common_check_sdw_irq(struct snd_sof_dev *sdev); 


#else



static inline int hda_sdw_acpi_scan(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline int hda_sdw_probe(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline int hda_sdw_startup(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline int hda_sdw_exit(struct snd_sof_dev *sdev)

{

	return 0;

}



static inline void hda_sdw_int_enable(struct snd_sof_dev *sdev, bool enable)

{

}



static inline bool hda_dsp_check_sdw_irq(struct snd_sof_dev *sdev)

{

	return false;

}



static inline irqreturn_t hda_dsp_sdw_thread(int irq, void *context)

{

	return IRQ_HANDLED;

}



static inline bool hda_sdw_check_wakeen_irq(struct snd_sof_dev *sdev)

{

	return false;

}



static inline void hda_sdw_process_wakeen(struct snd_sof_dev *sdev)

{

}