mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 14:44:12 +00:00
soundwire: stream: group sdw_stream_ functions
Group all exported functions prior to split of add in alloc/config stages necessary for support of multiple calls to hw_params() by ALSA/ASoC core. Pure code move, no functionality change. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Rander Wang <rander.wang@intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20220126011715.28204-14-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Pierre-Louis Bossart
Vinod Koul
parent
edd5cf99a7
commit
7a908906d0
1 changed files with 264 additions and 264 deletions
|
|
@ -1015,45 +1015,6 @@ static int sdw_master_port_config(struct sdw_master_runtime *m_rt,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* sdw_release_stream() - Free the assigned stream runtime
|
||||
*
|
||||
* @stream: SoundWire stream runtime
|
||||
*
|
||||
* sdw_release_stream should be called only once per stream
|
||||
*/
|
||||
void sdw_release_stream(struct sdw_stream_runtime *stream)
|
||||
{
|
||||
kfree(stream);
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_release_stream);
|
||||
|
||||
/**
|
||||
* sdw_alloc_stream() - Allocate and return stream runtime
|
||||
*
|
||||
* @stream_name: SoundWire stream name
|
||||
*
|
||||
* Allocates a SoundWire stream runtime instance.
|
||||
* sdw_alloc_stream should be called only once per stream. Typically
|
||||
* invoked from ALSA/ASoC machine/platform driver.
|
||||
*/
|
||||
struct sdw_stream_runtime *sdw_alloc_stream(const char *stream_name)
|
||||
{
|
||||
struct sdw_stream_runtime *stream;
|
||||
|
||||
stream = kzalloc(sizeof(*stream), GFP_KERNEL);
|
||||
if (!stream)
|
||||
return NULL;
|
||||
|
||||
stream->name = stream_name;
|
||||
INIT_LIST_HEAD(&stream->master_list);
|
||||
stream->state = SDW_STREAM_ALLOCATED;
|
||||
stream->m_rt_count = 0;
|
||||
|
||||
return stream;
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_alloc_stream);
|
||||
|
||||
/**
|
||||
* sdw_slave_rt_alloc() - Allocate a Slave runtime handle.
|
||||
*
|
||||
|
|
@ -1210,62 +1171,6 @@ static void sdw_release_master_stream(struct sdw_master_runtime *m_rt,
|
|||
kfree(m_rt);
|
||||
}
|
||||
|
||||
/**
|
||||
* sdw_stream_remove_master() - Remove master from sdw_stream
|
||||
*
|
||||
* @bus: SDW Bus instance
|
||||
* @stream: SoundWire stream
|
||||
*
|
||||
* This removes and frees port_rt and master_rt from a stream
|
||||
*/
|
||||
int sdw_stream_remove_master(struct sdw_bus *bus,
|
||||
struct sdw_stream_runtime *stream)
|
||||
{
|
||||
struct sdw_master_runtime *m_rt, *_m_rt;
|
||||
|
||||
mutex_lock(&bus->bus_lock);
|
||||
|
||||
list_for_each_entry_safe(m_rt, _m_rt,
|
||||
&stream->master_list, stream_node) {
|
||||
if (m_rt->bus != bus)
|
||||
continue;
|
||||
|
||||
sdw_master_port_free(m_rt);
|
||||
sdw_release_master_stream(m_rt, stream);
|
||||
stream->m_rt_count--;
|
||||
}
|
||||
|
||||
if (list_empty(&stream->master_list))
|
||||
stream->state = SDW_STREAM_RELEASED;
|
||||
|
||||
mutex_unlock(&bus->bus_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_stream_remove_master);
|
||||
|
||||
/**
|
||||
* sdw_stream_remove_slave() - Remove slave from sdw_stream
|
||||
*
|
||||
* @slave: SDW Slave instance
|
||||
* @stream: SoundWire stream
|
||||
*
|
||||
* This removes and frees port_rt and slave_rt from a stream
|
||||
*/
|
||||
int sdw_stream_remove_slave(struct sdw_slave *slave,
|
||||
struct sdw_stream_runtime *stream)
|
||||
{
|
||||
mutex_lock(&slave->bus->bus_lock);
|
||||
|
||||
sdw_slave_port_free(slave, stream);
|
||||
sdw_release_slave_stream(slave, stream);
|
||||
|
||||
mutex_unlock(&slave->bus->bus_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_stream_remove_slave);
|
||||
|
||||
/**
|
||||
* sdw_config_stream() - Configure the allocated stream
|
||||
*
|
||||
|
|
@ -1312,175 +1217,6 @@ static int sdw_config_stream(struct device *dev,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* sdw_stream_add_master() - Allocate and add master runtime to a stream
|
||||
*
|
||||
* @bus: SDW Bus instance
|
||||
* @stream_config: Stream configuration for audio stream
|
||||
* @port_config: Port configuration for audio stream
|
||||
* @num_ports: Number of ports
|
||||
* @stream: SoundWire stream
|
||||
*/
|
||||
int sdw_stream_add_master(struct sdw_bus *bus,
|
||||
struct sdw_stream_config *stream_config,
|
||||
struct sdw_port_config *port_config,
|
||||
unsigned int num_ports,
|
||||
struct sdw_stream_runtime *stream)
|
||||
{
|
||||
struct sdw_master_runtime *m_rt;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&bus->bus_lock);
|
||||
|
||||
/*
|
||||
* For multi link streams, add the second master only if
|
||||
* the bus supports it.
|
||||
* Check if bus->multi_link is set
|
||||
*/
|
||||
if (!bus->multi_link && stream->m_rt_count > 0) {
|
||||
dev_err(bus->dev,
|
||||
"Multilink not supported, link %d\n", bus->link_id);
|
||||
ret = -EINVAL;
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
/*
|
||||
* check if Master is already allocated (e.g. as a result of Slave adding
|
||||
* it first), if so skip allocation and go to configuration
|
||||
*/
|
||||
m_rt = sdw_master_rt_find(bus, stream);
|
||||
if (m_rt)
|
||||
goto skip_alloc_master_rt;
|
||||
|
||||
m_rt = sdw_master_rt_alloc(bus, stream);
|
||||
if (!m_rt) {
|
||||
dev_err(bus->dev, "Master runtime alloc failed for stream:%s\n", stream->name);
|
||||
ret = -ENOMEM;
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
ret = sdw_master_rt_config(m_rt, stream_config);
|
||||
if (ret < 0)
|
||||
goto unlock;
|
||||
|
||||
skip_alloc_master_rt:
|
||||
ret = sdw_config_stream(bus->dev, stream, stream_config, false);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
ret = sdw_master_port_alloc(m_rt, num_ports);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
ret = sdw_master_port_config(m_rt, port_config);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
stream->m_rt_count++;
|
||||
|
||||
goto unlock;
|
||||
|
||||
stream_error:
|
||||
sdw_release_master_stream(m_rt, stream);
|
||||
unlock:
|
||||
mutex_unlock(&bus->bus_lock);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_stream_add_master);
|
||||
|
||||
/**
|
||||
* sdw_stream_add_slave() - Allocate and add master/slave runtime to a stream
|
||||
*
|
||||
* @slave: SDW Slave instance
|
||||
* @stream_config: Stream configuration for audio stream
|
||||
* @stream: SoundWire stream
|
||||
* @port_config: Port configuration for audio stream
|
||||
* @num_ports: Number of ports
|
||||
*
|
||||
* It is expected that Slave is added before adding Master
|
||||
* to the Stream.
|
||||
*
|
||||
*/
|
||||
int sdw_stream_add_slave(struct sdw_slave *slave,
|
||||
struct sdw_stream_config *stream_config,
|
||||
struct sdw_port_config *port_config,
|
||||
unsigned int num_ports,
|
||||
struct sdw_stream_runtime *stream)
|
||||
{
|
||||
struct sdw_slave_runtime *s_rt;
|
||||
struct sdw_master_runtime *m_rt;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&slave->bus->bus_lock);
|
||||
|
||||
/*
|
||||
* check if Master is already allocated, if so skip allocation
|
||||
* and go to configuration
|
||||
*/
|
||||
m_rt = sdw_master_rt_find(slave->bus, stream);
|
||||
if (m_rt)
|
||||
goto skip_alloc_master_rt;
|
||||
|
||||
/*
|
||||
* If this API is invoked by Slave first then m_rt is not valid.
|
||||
* So, allocate m_rt and add Slave to it.
|
||||
*/
|
||||
m_rt = sdw_master_rt_alloc(slave->bus, stream);
|
||||
if (!m_rt) {
|
||||
dev_err(&slave->dev, "Master runtime alloc failed for stream:%s\n", stream->name);
|
||||
ret = -ENOMEM;
|
||||
goto error;
|
||||
}
|
||||
ret = sdw_master_rt_config(m_rt, stream_config);
|
||||
if (ret < 0)
|
||||
goto stream_error;
|
||||
|
||||
skip_alloc_master_rt:
|
||||
s_rt = sdw_slave_rt_alloc(slave);
|
||||
if (!s_rt) {
|
||||
dev_err(&slave->dev, "Slave runtime alloc failed for stream:%s\n", stream->name);
|
||||
ret = -ENOMEM;
|
||||
goto stream_error;
|
||||
}
|
||||
list_add_tail(&s_rt->m_rt_node, &m_rt->slave_rt_list);
|
||||
|
||||
ret = sdw_slave_rt_config(s_rt, stream_config);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
ret = sdw_config_stream(&slave->dev, stream, stream_config, true);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
ret = sdw_slave_port_alloc(slave, s_rt, num_ports);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
ret = sdw_slave_port_config(slave, s_rt, port_config);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
/*
|
||||
* Change stream state to CONFIGURED on first Slave add.
|
||||
* Bus is not aware of number of Slave(s) in a stream at this
|
||||
* point so cannot depend on all Slave(s) to be added in order to
|
||||
* change stream state to CONFIGURED.
|
||||
*/
|
||||
stream->state = SDW_STREAM_CONFIGURED;
|
||||
goto error;
|
||||
|
||||
stream_error:
|
||||
/*
|
||||
* we hit error so cleanup the stream, release all Slave(s) and
|
||||
* Master runtime
|
||||
*/
|
||||
sdw_release_master_stream(m_rt, stream);
|
||||
error:
|
||||
mutex_unlock(&slave->bus->bus_lock);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_stream_add_slave);
|
||||
|
||||
/**
|
||||
* sdw_get_slave_dpn_prop() - Get Slave port capabilities
|
||||
*
|
||||
|
|
@ -1939,6 +1675,32 @@ static int set_stream(struct snd_pcm_substream *substream,
|
|||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* sdw_alloc_stream() - Allocate and return stream runtime
|
||||
*
|
||||
* @stream_name: SoundWire stream name
|
||||
*
|
||||
* Allocates a SoundWire stream runtime instance.
|
||||
* sdw_alloc_stream should be called only once per stream. Typically
|
||||
* invoked from ALSA/ASoC machine/platform driver.
|
||||
*/
|
||||
struct sdw_stream_runtime *sdw_alloc_stream(const char *stream_name)
|
||||
{
|
||||
struct sdw_stream_runtime *stream;
|
||||
|
||||
stream = kzalloc(sizeof(*stream), GFP_KERNEL);
|
||||
if (!stream)
|
||||
return NULL;
|
||||
|
||||
stream->name = stream_name;
|
||||
INIT_LIST_HEAD(&stream->master_list);
|
||||
stream->state = SDW_STREAM_ALLOCATED;
|
||||
stream->m_rt_count = 0;
|
||||
|
||||
return stream;
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_alloc_stream);
|
||||
|
||||
/**
|
||||
* sdw_startup_stream() - Startup SoundWire stream
|
||||
*
|
||||
|
|
@ -2015,3 +1777,241 @@ void sdw_shutdown_stream(void *sdw_substream)
|
|||
set_stream(substream, NULL);
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_shutdown_stream);
|
||||
|
||||
/**
|
||||
* sdw_release_stream() - Free the assigned stream runtime
|
||||
*
|
||||
* @stream: SoundWire stream runtime
|
||||
*
|
||||
* sdw_release_stream should be called only once per stream
|
||||
*/
|
||||
void sdw_release_stream(struct sdw_stream_runtime *stream)
|
||||
{
|
||||
kfree(stream);
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_release_stream);
|
||||
|
||||
/**
|
||||
* sdw_stream_add_master() - Allocate and add master runtime to a stream
|
||||
*
|
||||
* @bus: SDW Bus instance
|
||||
* @stream_config: Stream configuration for audio stream
|
||||
* @port_config: Port configuration for audio stream
|
||||
* @num_ports: Number of ports
|
||||
* @stream: SoundWire stream
|
||||
*/
|
||||
int sdw_stream_add_master(struct sdw_bus *bus,
|
||||
struct sdw_stream_config *stream_config,
|
||||
struct sdw_port_config *port_config,
|
||||
unsigned int num_ports,
|
||||
struct sdw_stream_runtime *stream)
|
||||
{
|
||||
struct sdw_master_runtime *m_rt;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&bus->bus_lock);
|
||||
|
||||
/*
|
||||
* For multi link streams, add the second master only if
|
||||
* the bus supports it.
|
||||
* Check if bus->multi_link is set
|
||||
*/
|
||||
if (!bus->multi_link && stream->m_rt_count > 0) {
|
||||
dev_err(bus->dev,
|
||||
"Multilink not supported, link %d\n", bus->link_id);
|
||||
ret = -EINVAL;
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
/*
|
||||
* check if Master is already allocated (e.g. as a result of Slave adding
|
||||
* it first), if so skip allocation and go to configuration
|
||||
*/
|
||||
m_rt = sdw_master_rt_find(bus, stream);
|
||||
if (m_rt)
|
||||
goto skip_alloc_master_rt;
|
||||
|
||||
m_rt = sdw_master_rt_alloc(bus, stream);
|
||||
if (!m_rt) {
|
||||
dev_err(bus->dev, "Master runtime alloc failed for stream:%s\n", stream->name);
|
||||
ret = -ENOMEM;
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
ret = sdw_master_rt_config(m_rt, stream_config);
|
||||
if (ret < 0)
|
||||
goto unlock;
|
||||
|
||||
skip_alloc_master_rt:
|
||||
ret = sdw_config_stream(bus->dev, stream, stream_config, false);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
ret = sdw_master_port_alloc(m_rt, num_ports);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
ret = sdw_master_port_config(m_rt, port_config);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
stream->m_rt_count++;
|
||||
|
||||
goto unlock;
|
||||
|
||||
stream_error:
|
||||
sdw_release_master_stream(m_rt, stream);
|
||||
unlock:
|
||||
mutex_unlock(&bus->bus_lock);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_stream_add_master);
|
||||
|
||||
/**
|
||||
* sdw_stream_remove_master() - Remove master from sdw_stream
|
||||
*
|
||||
* @bus: SDW Bus instance
|
||||
* @stream: SoundWire stream
|
||||
*
|
||||
* This removes and frees port_rt and master_rt from a stream
|
||||
*/
|
||||
int sdw_stream_remove_master(struct sdw_bus *bus,
|
||||
struct sdw_stream_runtime *stream)
|
||||
{
|
||||
struct sdw_master_runtime *m_rt, *_m_rt;
|
||||
|
||||
mutex_lock(&bus->bus_lock);
|
||||
|
||||
list_for_each_entry_safe(m_rt, _m_rt,
|
||||
&stream->master_list, stream_node) {
|
||||
if (m_rt->bus != bus)
|
||||
continue;
|
||||
|
||||
sdw_master_port_free(m_rt);
|
||||
sdw_release_master_stream(m_rt, stream);
|
||||
stream->m_rt_count--;
|
||||
}
|
||||
|
||||
if (list_empty(&stream->master_list))
|
||||
stream->state = SDW_STREAM_RELEASED;
|
||||
|
||||
mutex_unlock(&bus->bus_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_stream_remove_master);
|
||||
|
||||
/**
|
||||
* sdw_stream_add_slave() - Allocate and add master/slave runtime to a stream
|
||||
*
|
||||
* @slave: SDW Slave instance
|
||||
* @stream_config: Stream configuration for audio stream
|
||||
* @stream: SoundWire stream
|
||||
* @port_config: Port configuration for audio stream
|
||||
* @num_ports: Number of ports
|
||||
*
|
||||
* It is expected that Slave is added before adding Master
|
||||
* to the Stream.
|
||||
*
|
||||
*/
|
||||
int sdw_stream_add_slave(struct sdw_slave *slave,
|
||||
struct sdw_stream_config *stream_config,
|
||||
struct sdw_port_config *port_config,
|
||||
unsigned int num_ports,
|
||||
struct sdw_stream_runtime *stream)
|
||||
{
|
||||
struct sdw_slave_runtime *s_rt;
|
||||
struct sdw_master_runtime *m_rt;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&slave->bus->bus_lock);
|
||||
|
||||
/*
|
||||
* check if Master is already allocated, if so skip allocation
|
||||
* and go to configuration
|
||||
*/
|
||||
m_rt = sdw_master_rt_find(slave->bus, stream);
|
||||
if (m_rt)
|
||||
goto skip_alloc_master_rt;
|
||||
|
||||
/*
|
||||
* If this API is invoked by Slave first then m_rt is not valid.
|
||||
* So, allocate m_rt and add Slave to it.
|
||||
*/
|
||||
m_rt = sdw_master_rt_alloc(slave->bus, stream);
|
||||
if (!m_rt) {
|
||||
dev_err(&slave->dev, "Master runtime alloc failed for stream:%s\n", stream->name);
|
||||
ret = -ENOMEM;
|
||||
goto error;
|
||||
}
|
||||
ret = sdw_master_rt_config(m_rt, stream_config);
|
||||
if (ret < 0)
|
||||
goto stream_error;
|
||||
|
||||
skip_alloc_master_rt:
|
||||
s_rt = sdw_slave_rt_alloc(slave);
|
||||
if (!s_rt) {
|
||||
dev_err(&slave->dev, "Slave runtime alloc failed for stream:%s\n", stream->name);
|
||||
ret = -ENOMEM;
|
||||
goto stream_error;
|
||||
}
|
||||
list_add_tail(&s_rt->m_rt_node, &m_rt->slave_rt_list);
|
||||
|
||||
ret = sdw_slave_rt_config(s_rt, stream_config);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
ret = sdw_config_stream(&slave->dev, stream, stream_config, true);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
ret = sdw_slave_port_alloc(slave, s_rt, num_ports);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
ret = sdw_slave_port_config(slave, s_rt, port_config);
|
||||
if (ret)
|
||||
goto stream_error;
|
||||
|
||||
/*
|
||||
* Change stream state to CONFIGURED on first Slave add.
|
||||
* Bus is not aware of number of Slave(s) in a stream at this
|
||||
* point so cannot depend on all Slave(s) to be added in order to
|
||||
* change stream state to CONFIGURED.
|
||||
*/
|
||||
stream->state = SDW_STREAM_CONFIGURED;
|
||||
goto error;
|
||||
|
||||
stream_error:
|
||||
/*
|
||||
* we hit error so cleanup the stream, release all Slave(s) and
|
||||
* Master runtime
|
||||
*/
|
||||
sdw_release_master_stream(m_rt, stream);
|
||||
error:
|
||||
mutex_unlock(&slave->bus->bus_lock);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_stream_add_slave);
|
||||
|
||||
/**
|
||||
* sdw_stream_remove_slave() - Remove slave from sdw_stream
|
||||
*
|
||||
* @slave: SDW Slave instance
|
||||
* @stream: SoundWire stream
|
||||
*
|
||||
* This removes and frees port_rt and slave_rt from a stream
|
||||
*/
|
||||
int sdw_stream_remove_slave(struct sdw_slave *slave,
|
||||
struct sdw_stream_runtime *stream)
|
||||
{
|
||||
mutex_lock(&slave->bus->bus_lock);
|
||||
|
||||
sdw_slave_port_free(slave, stream);
|
||||
sdw_release_slave_stream(slave, stream);
|
||||
|
||||
mutex_unlock(&slave->bus->bus_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(sdw_stream_remove_slave);
|
||||
|
|
|
|||
Loading…
Reference in a new issue