Unverified Commit afae0942 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: clarify bus_init and bus_exit sequences 



The dependencies are on SND_SOC_SOF_HDA_AUDIO_CODEC and the bus_exit
sequence should be well identified.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20221027193540.259520-17-pierre-louis.bossart@linux.intel.com


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

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

+15 −8
Original line number Diff line number Diff line
@@ -18,11 +18,7 @@ 
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

#include "../../codecs/hdac_hda.h"

#define sof_hda_ext_ops	snd_soc_hdac_hda_get_ops()

#else

#define sof_hda_ext_ops	NULL

#endif



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

static void update_codec_wake_enable(struct hdac_bus *bus, unsigned int addr, bool link_power)

{

	unsigned int mask = snd_hdac_chip_readw(bus, WAKEEN);
@@ -70,11 +66,13 @@ static const struct hdac_bus_ops bus_core_ops = { 
/*

 * This can be used for both with/without hda link support.

 */

void sof_hda_bus_init(struct hdac_bus *bus, struct device *dev)

void sof_hda_bus_init(struct snd_sof_dev *sdev, struct device *dev)

{

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	struct hdac_bus *bus = sof_to_bus(sdev);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

	snd_hdac_ext_bus_init(bus, dev, &bus_core_ops, sof_hda_ext_ops);

#else /* CONFIG_SND_SOC_SOF_HDA */

#else /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */

	memset(bus, 0, sizeof(*bus));

	bus->dev = dev;
@@ -89,5 +87,14 @@ void sof_hda_bus_init(struct hdac_bus *bus, struct device *dev) 
	bus->idx = 0;



	spin_lock_init(&bus->reg_lock);

#endif /* CONFIG_SND_SOC_SOF_HDA */

#endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */

}



void sof_hda_bus_exit(struct snd_sof_dev *sdev)

{

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

	struct hdac_bus *bus = sof_to_bus(sdev);



	snd_hdac_ext_bus_exit(bus);

#endif

}

sound/soc/sof/intel/hda.c

+3 −4
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ static int hda_init(struct snd_sof_dev *sdev) 
	bus = sof_to_bus(sdev);



	/* HDA bus init */

	sof_hda_bus_init(bus, &pci->dev);

	sof_hda_bus_init(sdev, &pci->dev);



	if (sof_hda_position_quirk == SOF_HDA_POSITION_QUIRK_USE_DPIB_REGISTERS)

		bus->use_posbuf = 0;
@@ -1208,9 +1208,8 @@ int hda_dsp_remove(struct snd_sof_dev *sdev) 
	iounmap(sdev->bar[HDA_DSP_BAR]);

	iounmap(bus->remap_addr);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	snd_hdac_ext_bus_exit(bus);

#endif

	sof_hda_bus_exit(sdev);



	hda_codec_i915_exit(sdev);



	return 0;

sound/soc/sof/intel/hda.h

+2 −1
Original line number Diff line number Diff line
@@ -708,7 +708,8 @@ void hda_dsp_ctrl_stop_chip(struct snd_sof_dev *sdev); 
/*

 * HDA bus operations.

 */

void sof_hda_bus_init(struct hdac_bus *bus, struct device *dev);

void sof_hda_bus_init(struct snd_sof_dev *sdev, struct device *dev);

void sof_hda_bus_exit(struct snd_sof_dev *sdev);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

/*