Commit 76f56fae authored by Rakesh Ughreja's avatar Rakesh Ughreja Committed by Takashi Iwai
Browse files

ALSA: hdac: Remove usage of struct hdac_ext_bus and use hdac_bus instead 



This patch removes the hdac_ext_bus structure. The legacy and
enhanced HDaudio capabilities can be handled in a backward-compatible
way without separate definitions.

Follow-up patches in this series handle the driver definition.

Signed-off-by: default avatarRakesh Ughreja <rakesh.a.ughreja@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3787a398

include/sound/hdaudio.h

+15 −0
Original line number Diff line number Diff line
@@ -250,6 +250,11 @@ struct hdac_rb { 
 * @mlcap: MultiLink capabilities pointer

 * @gtscap: gts capabilities pointer

 * @drsmcap: dma resume capabilities pointer

 * @num_streams: streams supported

 * @idx: HDA link index

 * @hlink_list: link list of HDA links

 * @lock: lock for link mgmt

 * @cmd_dma_state: state of cmd DMAs: CORB and RIRB

 */

struct hdac_bus {

	struct device *dev;
@@ -317,6 +322,16 @@ struct hdac_bus { 
	/* i915 component interface */

	struct i915_audio_component *audio_component;

	int i915_power_refcount;



	/* parameters required for enhanced capabilities */

	int num_streams;

	int idx;



	struct list_head hlink_list;



	struct mutex lock;

	bool cmd_dma_state;



};



int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev,

include/sound/hdaudio_ext.h

+24 −50
Original line number Diff line number Diff line
@@ -4,38 +4,14 @@ 


#include <sound/hdaudio.h>



/**

 * hdac_ext_bus: HDAC extended bus for extended HDA caps

 *

 * @bus: hdac bus

 * @num_streams: streams supported

 * @hlink_list: link list of HDA links

 * @lock: lock for link mgmt

 * @cmd_dma_state: state of cmd DMAs: CORB and RIRB

 */

struct hdac_ext_bus {

	struct hdac_bus bus;

	int num_streams;

	int idx;



	struct list_head hlink_list;



	struct mutex lock;

	bool cmd_dma_state;

};



int snd_hdac_ext_bus_init(struct hdac_ext_bus *sbus, struct device *dev,

int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,

		      const struct hdac_bus_ops *ops,

		      const struct hdac_io_ops *io_ops);



void snd_hdac_ext_bus_exit(struct hdac_ext_bus *sbus);

int snd_hdac_ext_bus_device_init(struct hdac_ext_bus *sbus, int addr);

void snd_hdac_ext_bus_exit(struct hdac_bus *bus);

int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr);

void snd_hdac_ext_bus_device_exit(struct hdac_device *hdev);

void snd_hdac_ext_bus_device_remove(struct hdac_ext_bus *ebus);



#define ebus_to_hbus(ebus)	(&(ebus)->bus)

#define hbus_to_ebus(_bus) \

	container_of(_bus, struct hdac_ext_bus, bus)

void snd_hdac_ext_bus_device_remove(struct hdac_bus *bus);



#define HDA_CODEC_REV_EXT_ENTRY(_vid, _rev, _name, drv_data) \

	{ .vendor_id = (_vid), .rev_id = (_rev), .name = (_name), \
@@ -44,14 +20,14 @@ void snd_hdac_ext_bus_device_remove(struct hdac_ext_bus *ebus); 
#define HDA_CODEC_EXT_ENTRY(_vid, _revid, _name, _drv_data) \

	HDA_CODEC_REV_EXT_ENTRY(_vid, _revid, _name, _drv_data)



void snd_hdac_ext_bus_ppcap_enable(struct hdac_ext_bus *chip, bool enable);

void snd_hdac_ext_bus_ppcap_int_enable(struct hdac_ext_bus *chip, bool enable);

void snd_hdac_ext_bus_ppcap_enable(struct hdac_bus *chip, bool enable);

void snd_hdac_ext_bus_ppcap_int_enable(struct hdac_bus *chip, bool enable);



void snd_hdac_ext_stream_spbcap_enable(struct hdac_ext_bus *chip,

void snd_hdac_ext_stream_spbcap_enable(struct hdac_bus *chip,

				 bool enable, int index);



int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_ext_bus *bus);

struct hdac_ext_link *snd_hdac_ext_bus_get_link(struct hdac_ext_bus *bus,

int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_bus *bus);

struct hdac_ext_link *snd_hdac_ext_bus_get_link(struct hdac_bus *bus,

						const char *codec_name);



enum hdac_ext_stream_type {
@@ -100,28 +76,28 @@ struct hdac_ext_stream { 
#define stream_to_hdac_ext_stream(s) \

	container_of(s, struct hdac_ext_stream, hstream)



void snd_hdac_ext_stream_init(struct hdac_ext_bus *bus,

void snd_hdac_ext_stream_init(struct hdac_bus *bus,

				struct hdac_ext_stream *stream, int idx,

				int direction, int tag);

int snd_hdac_ext_stream_init_all(struct hdac_ext_bus *ebus, int start_idx,

int snd_hdac_ext_stream_init_all(struct hdac_bus *bus, int start_idx,

		int num_stream, int dir);

void snd_hdac_stream_free_all(struct hdac_ext_bus *ebus);

void snd_hdac_link_free_all(struct hdac_ext_bus *ebus);

struct hdac_ext_stream *snd_hdac_ext_stream_assign(struct hdac_ext_bus *bus,

void snd_hdac_stream_free_all(struct hdac_bus *bus);

void snd_hdac_link_free_all(struct hdac_bus *bus);

struct hdac_ext_stream *snd_hdac_ext_stream_assign(struct hdac_bus *bus,

					   struct snd_pcm_substream *substream,

					   int type);

void snd_hdac_ext_stream_release(struct hdac_ext_stream *azx_dev, int type);

void snd_hdac_ext_stream_decouple(struct hdac_ext_bus *bus,

void snd_hdac_ext_stream_decouple(struct hdac_bus *bus,

				struct hdac_ext_stream *azx_dev, bool decouple);

void snd_hdac_ext_stop_streams(struct hdac_ext_bus *sbus);

void snd_hdac_ext_stop_streams(struct hdac_bus *bus);



int snd_hdac_ext_stream_set_spib(struct hdac_ext_bus *ebus,

int snd_hdac_ext_stream_set_spib(struct hdac_bus *bus,

				 struct hdac_ext_stream *stream, u32 value);

int snd_hdac_ext_stream_get_spbmaxfifo(struct hdac_ext_bus *ebus,

int snd_hdac_ext_stream_get_spbmaxfifo(struct hdac_bus *bus,

				 struct hdac_ext_stream *stream);

void snd_hdac_ext_stream_drsm_enable(struct hdac_ext_bus *ebus,

void snd_hdac_ext_stream_drsm_enable(struct hdac_bus *bus,

				bool enable, int index);

int snd_hdac_ext_stream_set_dpibr(struct hdac_ext_bus *ebus,

int snd_hdac_ext_stream_set_dpibr(struct hdac_bus *bus,

				struct hdac_ext_stream *stream, u32 value);

int snd_hdac_ext_stream_set_lpib(struct hdac_ext_stream *stream, u32 value);
@@ -144,17 +120,15 @@ struct hdac_ext_link { 


int snd_hdac_ext_bus_link_power_up(struct hdac_ext_link *link);

int snd_hdac_ext_bus_link_power_down(struct hdac_ext_link *link);

int snd_hdac_ext_bus_link_power_up_all(struct hdac_ext_bus *ebus);

int snd_hdac_ext_bus_link_power_down_all(struct hdac_ext_bus *ebus);

int snd_hdac_ext_bus_link_power_up_all(struct hdac_bus *bus);

int snd_hdac_ext_bus_link_power_down_all(struct hdac_bus *bus);

void snd_hdac_ext_link_set_stream_id(struct hdac_ext_link *link,

				 int stream);

void snd_hdac_ext_link_clear_stream_id(struct hdac_ext_link *link,

				 int stream);



int snd_hdac_ext_bus_link_get(struct hdac_ext_bus *ebus,

				struct hdac_ext_link *link);

int snd_hdac_ext_bus_link_put(struct hdac_ext_bus *ebus,

				struct hdac_ext_link *link);

int snd_hdac_ext_bus_link_get(struct hdac_bus *bus, struct hdac_ext_link *link);

int snd_hdac_ext_bus_link_put(struct hdac_bus *bus, struct hdac_ext_link *link);



/* update register macro */

#define snd_hdac_updatel(addr, reg, mask, val)		\

sound/hda/ext/hdac_ext_bus.c

+13 −14
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static const struct hdac_io_ops hdac_ext_default_io = { 
 *

 * Returns 0 if successful, or a negative error code.

 */

int snd_hdac_ext_bus_init(struct hdac_ext_bus *ebus, struct device *dev,

int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,

			const struct hdac_bus_ops *ops,

			const struct hdac_io_ops *io_ops)

{
@@ -98,15 +98,15 @@ int snd_hdac_ext_bus_init(struct hdac_ext_bus *ebus, struct device *dev, 
	if (io_ops == NULL)

		io_ops = &hdac_ext_default_io;



	ret = snd_hdac_bus_init(&ebus->bus, dev, ops, io_ops);

	ret = snd_hdac_bus_init(bus, dev, ops, io_ops);

	if (ret < 0)

		return ret;



	INIT_LIST_HEAD(&ebus->hlink_list);

	ebus->idx = idx++;

	INIT_LIST_HEAD(&bus->hlink_list);

	bus->idx = idx++;



	mutex_init(&ebus->lock);

	ebus->cmd_dma_state = true;

	mutex_init(&bus->lock);

	bus->cmd_dma_state = true;



	return 0;

}
@@ -116,10 +116,10 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_init); 
 * snd_hdac_ext_bus_exit - clean up a HD-audio extended bus

 * @ebus: the pointer to extended bus object

 */

void snd_hdac_ext_bus_exit(struct hdac_ext_bus *ebus)

void snd_hdac_ext_bus_exit(struct hdac_bus *bus)

{

	snd_hdac_bus_exit(&ebus->bus);

	WARN_ON(!list_empty(&ebus->hlink_list));

	snd_hdac_bus_exit(bus);

	WARN_ON(!list_empty(&bus->hlink_list));

}

EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_exit);
@@ -135,10 +135,9 @@ static void default_release(struct device *dev) 
 *

 * Returns zero for success or a negative error code.

 */

int snd_hdac_ext_bus_device_init(struct hdac_ext_bus *ebus, int addr)

int snd_hdac_ext_bus_device_init(struct hdac_bus *bus, int addr)

{

	struct hdac_device *hdev = NULL;

	struct hdac_bus *bus = ebus_to_hbus(ebus);

	char name[15];

	int ret;
@@ -148,7 +147,7 @@ int snd_hdac_ext_bus_device_init(struct hdac_ext_bus *ebus, int addr) 


	hdev->bus = bus;



	snprintf(name, sizeof(name), "ehdaudio%dD%d", ebus->idx, addr);

	snprintf(name, sizeof(name), "ehdaudio%dD%d", bus->idx, addr);



	ret  = snd_hdac_device_init(hdev, bus, name, addr);

	if (ret < 0) {
@@ -185,14 +184,14 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_device_exit); 
 *

 * @ebus: HD-audio extended bus

 */

void snd_hdac_ext_bus_device_remove(struct hdac_ext_bus *ebus)

void snd_hdac_ext_bus_device_remove(struct hdac_bus *bus)

{

	struct hdac_device *codec, *__codec;

	/*

	 * we need to remove all the codec devices objects created in the

	 * snd_hdac_ext_bus_device_init

	 */

	list_for_each_entry_safe(codec, __codec, &ebus->bus.codec_list, list) {

	list_for_each_entry_safe(codec, __codec, &bus->codec_list, list) {

		snd_hdac_device_unregister(codec);

		put_device(&codec->dev);

	}

sound/hda/ext/hdac_ext_controller.c

+26 −29
Original line number Diff line number Diff line
@@ -39,9 +39,8 @@ 
 * @ebus: HD-audio extended core bus

 * @enable: flag to turn on/off the capability

 */

void snd_hdac_ext_bus_ppcap_enable(struct hdac_ext_bus *ebus, bool enable)

void snd_hdac_ext_bus_ppcap_enable(struct hdac_bus *bus, bool enable)

{

	struct hdac_bus *bus = &ebus->bus;



	if (!bus->ppcap) {

		dev_err(bus->dev, "Address of PP capability is NULL");
@@ -60,9 +59,8 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_ppcap_enable); 
 * @ebus: HD-audio extended core bus

 * @enable: flag to enable/disable interrupt

 */

void snd_hdac_ext_bus_ppcap_int_enable(struct hdac_ext_bus *ebus, bool enable)

void snd_hdac_ext_bus_ppcap_int_enable(struct hdac_bus *bus, bool enable)

{

	struct hdac_bus *bus = &ebus->bus;



	if (!bus->ppcap) {

		dev_err(bus->dev, "Address of PP capability is NULL\n");
@@ -89,12 +87,11 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_ppcap_int_enable); 
 * in hlink_list of extended hdac bus

 * Note: this will be freed on bus exit by driver

 */

int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_ext_bus *ebus)

int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_bus *bus)

{

	int idx;

	u32 link_count;

	struct hdac_ext_link *hlink;

	struct hdac_bus *bus = &ebus->bus;



	link_count = readl(bus->mlcap + AZX_REG_ML_MLCD) + 1;
@@ -114,7 +111,7 @@ int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_ext_bus *ebus) 
		/* since link in On, update the ref */

		hlink->ref_count = 1;



		list_add_tail(&hlink->list, &ebus->hlink_list);

		list_add_tail(&hlink->list, &bus->hlink_list);

	}



	return 0;
@@ -127,12 +124,12 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_get_ml_capabilities); 
 * @ebus: HD-audio ext core bus

 */



void snd_hdac_link_free_all(struct hdac_ext_bus *ebus)

void snd_hdac_link_free_all(struct hdac_bus *bus)

{

	struct hdac_ext_link *l;



	while (!list_empty(&ebus->hlink_list)) {

		l = list_first_entry(&ebus->hlink_list, struct hdac_ext_link, list);

	while (!list_empty(&bus->hlink_list)) {

		l = list_first_entry(&bus->hlink_list, struct hdac_ext_link, list);

		list_del(&l->list);

		kfree(l);

	}
@@ -144,7 +141,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_link_free_all); 
 * @ebus: HD-audio extended core bus

 * @codec_name: codec name

 */

struct hdac_ext_link *snd_hdac_ext_bus_get_link(struct hdac_ext_bus *ebus,

struct hdac_ext_link *snd_hdac_ext_bus_get_link(struct hdac_bus *bus,

						 const char *codec_name)

{

	int i;
@@ -153,10 +150,10 @@ struct hdac_ext_link *snd_hdac_ext_bus_get_link(struct hdac_ext_bus *ebus, 


	if (sscanf(codec_name, "ehdaudio%dD%d", &bus_idx, &addr) != 2)

		return NULL;

	if (ebus->idx != bus_idx)

	if (bus->idx != bus_idx)

		return NULL;



	list_for_each_entry(hlink, &ebus->hlink_list, list) {

	list_for_each_entry(hlink, &bus->hlink_list, list) {

		for (i = 0; i < HDA_MAX_CODECS; i++) {

			if (hlink->lsdiid & (0x1 << addr))

				return hlink;
@@ -219,12 +216,12 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_down); 
 * snd_hdac_ext_bus_link_power_up_all -power up all hda link

 * @ebus: HD-audio extended bus

 */

int snd_hdac_ext_bus_link_power_up_all(struct hdac_ext_bus *ebus)

int snd_hdac_ext_bus_link_power_up_all(struct hdac_bus *bus)

{

	struct hdac_ext_link *hlink = NULL;

	int ret;



	list_for_each_entry(hlink, &ebus->hlink_list, list) {

	list_for_each_entry(hlink, &bus->hlink_list, list) {

		snd_hdac_updatel(hlink->ml_addr,

				AZX_REG_ML_LCTL, 0, AZX_MLCTL_SPA);

		ret = check_hdac_link_power_active(hlink, true);
@@ -240,12 +237,12 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_up_all); 
 * snd_hdac_ext_bus_link_power_down_all -power down all hda link

 * @ebus: HD-audio extended bus

 */

int snd_hdac_ext_bus_link_power_down_all(struct hdac_ext_bus *ebus)

int snd_hdac_ext_bus_link_power_down_all(struct hdac_bus *bus)

{

	struct hdac_ext_link *hlink = NULL;

	int ret;



	list_for_each_entry(hlink, &ebus->hlink_list, list) {

	list_for_each_entry(hlink, &bus->hlink_list, list) {

		snd_hdac_updatel(hlink->ml_addr, AZX_REG_ML_LCTL, AZX_MLCTL_SPA, 0);

		ret = check_hdac_link_power_active(hlink, false);

		if (ret < 0)
@@ -256,39 +253,39 @@ int snd_hdac_ext_bus_link_power_down_all(struct hdac_ext_bus *ebus) 
}

EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_down_all);



int snd_hdac_ext_bus_link_get(struct hdac_ext_bus *ebus,

int snd_hdac_ext_bus_link_get(struct hdac_bus *bus,

				struct hdac_ext_link *link)

{

	int ret = 0;



	mutex_lock(&ebus->lock);

	mutex_lock(&bus->lock);



	/*

	 * if we move from 0 to 1, count will be 1 so power up this link

	 * as well, also check the dma status and trigger that

	 */

	if (++link->ref_count == 1) {

		if (!ebus->cmd_dma_state) {

			snd_hdac_bus_init_cmd_io(&ebus->bus);

			ebus->cmd_dma_state = true;

		if (!bus->cmd_dma_state) {

			snd_hdac_bus_init_cmd_io(bus);

			bus->cmd_dma_state = true;

		}



		ret = snd_hdac_ext_bus_link_power_up(link);

	}



	mutex_unlock(&ebus->lock);

	mutex_unlock(&bus->lock);

	return ret;

}

EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_get);



int snd_hdac_ext_bus_link_put(struct hdac_ext_bus *ebus,

int snd_hdac_ext_bus_link_put(struct hdac_bus *bus,

				struct hdac_ext_link *link)

{

	int ret = 0;

	struct hdac_ext_link *hlink;

	bool link_up = false;



	mutex_lock(&ebus->lock);

	mutex_lock(&bus->lock);



	/*

	 * if we move from 1 to 0, count will be 0
@@ -301,7 +298,7 @@ int snd_hdac_ext_bus_link_put(struct hdac_ext_bus *ebus, 
		 * now check if all links are off, if so turn off

		 * cmd dma as well

		 */

		list_for_each_entry(hlink, &ebus->hlink_list, list) {

		list_for_each_entry(hlink, &bus->hlink_list, list) {

			if (hlink->ref_count) {

				link_up = true;

				break;
@@ -309,12 +306,12 @@ int snd_hdac_ext_bus_link_put(struct hdac_ext_bus *ebus, 
		}



		if (!link_up) {

			snd_hdac_bus_stop_cmd_io(&ebus->bus);

			ebus->cmd_dma_state = false;

			snd_hdac_bus_stop_cmd_io(bus);

			bus->cmd_dma_state = false;

		}

	}



	mutex_unlock(&ebus->lock);

	mutex_unlock(&bus->lock);

	return ret;

}

EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_put);

sound/hda/ext/hdac_ext_stream.c

+45 −59
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


/**

 * snd_hdac_ext_stream_init - initialize each stream (aka device)

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 * @stream: HD-audio ext core stream object to initialize

 * @idx: stream index number

 * @direction: stream direction (SNDRV_PCM_STREAM_PLAYBACK or SNDRV_PCM_STREAM_CAPTURE)
@@ -34,18 +34,16 @@ 
 * initialize the stream, if ppcap is enabled then init those and then

 * invoke hdac stream initialization routine

 */

void snd_hdac_ext_stream_init(struct hdac_ext_bus *ebus,

void snd_hdac_ext_stream_init(struct hdac_bus *bus,

				struct hdac_ext_stream *stream,

				int idx, int direction, int tag)

{

	struct hdac_bus *bus = &ebus->bus;



	if (bus->ppcap) {

		stream->pphc_addr = bus->ppcap + AZX_PPHC_BASE +

				AZX_PPHC_INTERVAL * idx;



		stream->pplc_addr = bus->ppcap + AZX_PPLC_BASE +

				AZX_PPLC_MULTI * ebus->num_streams +

				AZX_PPLC_MULTI * bus->num_streams +

				AZX_PPLC_INTERVAL * idx;

	}
@@ -71,12 +69,12 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_init); 
/**

 * snd_hdac_ext_stream_init_all - create and initialize the stream objects

 *   for an extended hda bus

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 * @start_idx: start index for streams

 * @num_stream: number of streams to initialize

 * @dir: direction of streams

 */

int snd_hdac_ext_stream_init_all(struct hdac_ext_bus *ebus, int start_idx,

int snd_hdac_ext_stream_init_all(struct hdac_bus *bus, int start_idx,

		int num_stream, int dir)

{

	int stream_tag = 0;
@@ -88,7 +86,7 @@ int snd_hdac_ext_stream_init_all(struct hdac_ext_bus *ebus, int start_idx, 
		if (!stream)

			return -ENOMEM;

		tag = ++stream_tag;

		snd_hdac_ext_stream_init(ebus, stream, idx, dir, tag);

		snd_hdac_ext_stream_init(bus, stream, idx, dir, tag);

		idx++;

	}
@@ -100,17 +98,16 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_init_all); 
/**

 * snd_hdac_stream_free_all - free hdac extended stream objects

 *

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 */

void snd_hdac_stream_free_all(struct hdac_ext_bus *ebus)

void snd_hdac_stream_free_all(struct hdac_bus *bus)

{

	struct hdac_stream *s, *_s;

	struct hdac_ext_stream *stream;

	struct hdac_bus *bus = ebus_to_hbus(ebus);



	list_for_each_entry_safe(s, _s, &bus->stream_list, list) {

		stream = stream_to_hdac_ext_stream(s);

		snd_hdac_ext_stream_decouple(ebus, stream, false);

		snd_hdac_ext_stream_decouple(bus, stream, false);

		list_del(&s->list);

		kfree(stream);

	}
@@ -119,15 +116,14 @@ EXPORT_SYMBOL_GPL(snd_hdac_stream_free_all); 


/**

 * snd_hdac_ext_stream_decouple - decouple the hdac stream

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 * @stream: HD-audio ext core stream object to initialize

 * @decouple: flag to decouple

 */

void snd_hdac_ext_stream_decouple(struct hdac_ext_bus *ebus,

void snd_hdac_ext_stream_decouple(struct hdac_bus *bus,

				struct hdac_ext_stream *stream, bool decouple)

{

	struct hdac_stream *hstream = &stream->hstream;

	struct hdac_bus *bus = &ebus->bus;

	u32 val;

	int mask = AZX_PPCTL_PROCEN(hstream->index);
@@ -251,19 +247,18 @@ void snd_hdac_ext_link_clear_stream_id(struct hdac_ext_link *link, 
EXPORT_SYMBOL_GPL(snd_hdac_ext_link_clear_stream_id);



static struct hdac_ext_stream *

hdac_ext_link_stream_assign(struct hdac_ext_bus *ebus,

hdac_ext_link_stream_assign(struct hdac_bus *bus,

				struct snd_pcm_substream *substream)

{

	struct hdac_ext_stream *res = NULL;

	struct hdac_stream *stream = NULL;

	struct hdac_bus *hbus = &ebus->bus;



	if (!hbus->ppcap) {

		dev_err(hbus->dev, "stream type not supported\n");

	if (!bus->ppcap) {

		dev_err(bus->dev, "stream type not supported\n");

		return NULL;

	}



	list_for_each_entry(stream, &hbus->stream_list, list) {

	list_for_each_entry(stream, &bus->stream_list, list) {

		struct hdac_ext_stream *hstream = container_of(stream,

						struct hdac_ext_stream,

						hstream);
@@ -277,34 +272,33 @@ hdac_ext_link_stream_assign(struct hdac_ext_bus *ebus, 
		}



		if (!hstream->link_locked) {

			snd_hdac_ext_stream_decouple(ebus, hstream, true);

			snd_hdac_ext_stream_decouple(bus, hstream, true);

			res = hstream;

			break;

		}

	}

	if (res) {

		spin_lock_irq(&hbus->reg_lock);

		spin_lock_irq(&bus->reg_lock);

		res->link_locked = 1;

		res->link_substream = substream;

		spin_unlock_irq(&hbus->reg_lock);

		spin_unlock_irq(&bus->reg_lock);

	}

	return res;

}



static struct hdac_ext_stream *

hdac_ext_host_stream_assign(struct hdac_ext_bus *ebus,

hdac_ext_host_stream_assign(struct hdac_bus *bus,

				struct snd_pcm_substream *substream)

{

	struct hdac_ext_stream *res = NULL;

	struct hdac_stream *stream = NULL;

	struct hdac_bus *hbus = &ebus->bus;



	if (!hbus->ppcap) {

		dev_err(hbus->dev, "stream type not supported\n");

	if (!bus->ppcap) {

		dev_err(bus->dev, "stream type not supported\n");

		return NULL;

	}



	list_for_each_entry(stream, &hbus->stream_list, list) {

	list_for_each_entry(stream, &bus->stream_list, list) {

		struct hdac_ext_stream *hstream = container_of(stream,

						struct hdac_ext_stream,

						hstream);
@@ -313,17 +307,17 @@ hdac_ext_host_stream_assign(struct hdac_ext_bus *ebus, 


		if (!stream->opened) {

			if (!hstream->decoupled)

				snd_hdac_ext_stream_decouple(ebus, hstream, true);

				snd_hdac_ext_stream_decouple(bus, hstream, true);

			res = hstream;

			break;

		}

	}

	if (res) {

		spin_lock_irq(&hbus->reg_lock);

		spin_lock_irq(&bus->reg_lock);

		res->hstream.opened = 1;

		res->hstream.running = 0;

		res->hstream.substream = substream;

		spin_unlock_irq(&hbus->reg_lock);

		spin_unlock_irq(&bus->reg_lock);

	}



	return res;
@@ -331,7 +325,7 @@ hdac_ext_host_stream_assign(struct hdac_ext_bus *ebus, 


/**

 * snd_hdac_ext_stream_assign - assign a stream for the PCM

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 * @substream: PCM substream to assign

 * @type: type of stream (coupled, host or link stream)

 *
@@ -346,27 +340,26 @@ hdac_ext_host_stream_assign(struct hdac_ext_bus *ebus, 
 * the same stream object when it's used beforehand.  when a stream is

 * decoupled, it becomes a host stream and link stream.

 */

struct hdac_ext_stream *snd_hdac_ext_stream_assign(struct hdac_ext_bus *ebus,

struct hdac_ext_stream *snd_hdac_ext_stream_assign(struct hdac_bus *bus,

					   struct snd_pcm_substream *substream,

					   int type)

{

	struct hdac_ext_stream *hstream = NULL;

	struct hdac_stream *stream = NULL;

	struct hdac_bus *hbus = &ebus->bus;



	switch (type) {

	case HDAC_EXT_STREAM_TYPE_COUPLED:

		stream = snd_hdac_stream_assign(hbus, substream);

		stream = snd_hdac_stream_assign(bus, substream);

		if (stream)

			hstream = container_of(stream,

					struct hdac_ext_stream, hstream);

		return hstream;



	case HDAC_EXT_STREAM_TYPE_HOST:

		return hdac_ext_host_stream_assign(ebus, substream);

		return hdac_ext_host_stream_assign(bus, substream);



	case HDAC_EXT_STREAM_TYPE_LINK:

		return hdac_ext_link_stream_assign(ebus, substream);

		return hdac_ext_link_stream_assign(bus, substream);



	default:

		return NULL;
@@ -384,7 +377,6 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_assign); 
void snd_hdac_ext_stream_release(struct hdac_ext_stream *stream, int type)

{

	struct hdac_bus *bus = stream->hstream.bus;

	struct hdac_ext_bus *ebus = hbus_to_ebus(bus);



	switch (type) {

	case HDAC_EXT_STREAM_TYPE_COUPLED:
@@ -393,13 +385,13 @@ void snd_hdac_ext_stream_release(struct hdac_ext_stream *stream, int type) 


	case HDAC_EXT_STREAM_TYPE_HOST:

		if (stream->decoupled && !stream->link_locked)

			snd_hdac_ext_stream_decouple(ebus, stream, false);

			snd_hdac_ext_stream_decouple(bus, stream, false);

		snd_hdac_stream_release(&stream->hstream);

		break;



	case HDAC_EXT_STREAM_TYPE_LINK:

		if (stream->decoupled && !stream->hstream.opened)

			snd_hdac_ext_stream_decouple(ebus, stream, false);

			snd_hdac_ext_stream_decouple(bus, stream, false);

		spin_lock_irq(&bus->reg_lock);

		stream->link_locked = 0;

		stream->link_substream = NULL;
@@ -415,16 +407,15 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_release); 


/**

 * snd_hdac_ext_stream_spbcap_enable - enable SPIB for a stream

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 * @enable: flag to enable/disable SPIB

 * @index: stream index for which SPIB need to be enabled

 */

void snd_hdac_ext_stream_spbcap_enable(struct hdac_ext_bus *ebus,

void snd_hdac_ext_stream_spbcap_enable(struct hdac_bus *bus,

				 bool enable, int index)

{

	u32 mask = 0;

	u32 register_mask = 0;

	struct hdac_bus *bus = &ebus->bus;



	if (!bus->spbcap) {

		dev_err(bus->dev, "Address of SPB capability is NULL\n");
@@ -446,14 +437,13 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_spbcap_enable); 


/**

 * snd_hdac_ext_stream_set_spib - sets the spib value of a stream

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 * @stream: hdac_ext_stream

 * @value: spib value to set

 */

int snd_hdac_ext_stream_set_spib(struct hdac_ext_bus *ebus,

int snd_hdac_ext_stream_set_spib(struct hdac_bus *bus,

				 struct hdac_ext_stream *stream, u32 value)

{

	struct hdac_bus *bus = &ebus->bus;



	if (!bus->spbcap) {

		dev_err(bus->dev, "Address of SPB capability is NULL\n");
@@ -468,15 +458,14 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_set_spib); 


/**

 * snd_hdac_ext_stream_get_spbmaxfifo - gets the spib value of a stream

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 * @stream: hdac_ext_stream

 *

 * Return maxfifo for the stream

 */

int snd_hdac_ext_stream_get_spbmaxfifo(struct hdac_ext_bus *ebus,

int snd_hdac_ext_stream_get_spbmaxfifo(struct hdac_bus *bus,

				 struct hdac_ext_stream *stream)

{

	struct hdac_bus *bus = &ebus->bus;



	if (!bus->spbcap) {

		dev_err(bus->dev, "Address of SPB capability is NULL\n");
@@ -490,11 +479,10 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_get_spbmaxfifo); 


/**

 * snd_hdac_ext_stop_streams - stop all stream if running

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 */

void snd_hdac_ext_stop_streams(struct hdac_ext_bus *ebus)

void snd_hdac_ext_stop_streams(struct hdac_bus *bus)

{

	struct hdac_bus *bus = ebus_to_hbus(ebus);

	struct hdac_stream *stream;



	if (bus->chip_init) {
@@ -507,16 +495,15 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stop_streams); 


/**

 * snd_hdac_ext_stream_drsm_enable - enable DMA resume for a stream

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 * @enable: flag to enable/disable DRSM

 * @index: stream index for which DRSM need to be enabled

 */

void snd_hdac_ext_stream_drsm_enable(struct hdac_ext_bus *ebus,

void snd_hdac_ext_stream_drsm_enable(struct hdac_bus *bus,

				bool enable, int index)

{

	u32 mask = 0;

	u32 register_mask = 0;

	struct hdac_bus *bus = &ebus->bus;



	if (!bus->drsmcap) {

		dev_err(bus->dev, "Address of DRSM capability is NULL\n");
@@ -538,14 +525,13 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_drsm_enable); 


/**

 * snd_hdac_ext_stream_set_dpibr - sets the dpibr value of a stream

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 * @stream: hdac_ext_stream

 * @value: dpib value to set

 */

int snd_hdac_ext_stream_set_dpibr(struct hdac_ext_bus *ebus,

int snd_hdac_ext_stream_set_dpibr(struct hdac_bus *bus,

				 struct hdac_ext_stream *stream, u32 value)

{

	struct hdac_bus *bus = &ebus->bus;



	if (!bus->drsmcap) {

		dev_err(bus->dev, "Address of DRSM capability is NULL\n");
@@ -560,7 +546,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_set_dpibr); 


/**

 * snd_hdac_ext_stream_set_lpib - sets the lpib value of a stream

 * @ebus: HD-audio ext core bus

 * @bus: HD-audio core bus

 * @stream: hdac_ext_stream

 * @value: lpib value to set

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE