mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
soundwire: generic_bandwidth_allocation: select data lane
If a peripheral supports multi-lane, we can use data lane x to extend the bandwidth. The patch suggests to select data lane x where x > 0 when bandwidth is not enough on data lane 0. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Link: https://lore.kernel.org/r/20241218080155.102405-12-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Bard Liao
Vinod Koul
parent
4a7927d54d
commit
7a30292ffa
2 changed files with 146 additions and 7 deletions
|
|
@ -336,6 +336,82 @@ static bool is_clock_scaling_supported(struct sdw_bus *bus)
|
|||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* is_lane_connected_to_all_peripherals: Check if the given manager lane connects to all peripherals
|
||||
* So that all peripherals can use the manager lane.
|
||||
*
|
||||
* @m_rt: Manager runtime
|
||||
* @lane: Lane number
|
||||
*/
|
||||
static bool is_lane_connected_to_all_peripherals(struct sdw_master_runtime *m_rt, unsigned int lane)
|
||||
{
|
||||
struct sdw_slave_prop *slave_prop;
|
||||
struct sdw_slave_runtime *s_rt;
|
||||
int i;
|
||||
|
||||
list_for_each_entry(s_rt, &m_rt->slave_rt_list, m_rt_node) {
|
||||
slave_prop = &s_rt->slave->prop;
|
||||
for (i = 1; i < SDW_MAX_LANES; i++) {
|
||||
if (slave_prop->lane_maps[i] == lane) {
|
||||
dev_dbg(&s_rt->slave->dev,
|
||||
"M lane %d is connected to P lane %d\n",
|
||||
lane, i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i == SDW_MAX_LANES) {
|
||||
dev_dbg(&s_rt->slave->dev, "M lane %d is not connected\n", lane);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
static int get_manager_lane(struct sdw_bus *bus, struct sdw_master_runtime *m_rt,
|
||||
struct sdw_slave_runtime *s_rt, unsigned int curr_dr_freq)
|
||||
{
|
||||
struct sdw_slave_prop *slave_prop = &s_rt->slave->prop;
|
||||
struct sdw_port_runtime *m_p_rt;
|
||||
unsigned int required_bandwidth;
|
||||
int m_lane;
|
||||
int l;
|
||||
|
||||
for (l = 1; l < SDW_MAX_LANES; l++) {
|
||||
if (!slave_prop->lane_maps[l])
|
||||
continue;
|
||||
|
||||
required_bandwidth = 0;
|
||||
list_for_each_entry(m_p_rt, &m_rt->port_list, port_node) {
|
||||
required_bandwidth += m_rt->stream->params.rate *
|
||||
hweight32(m_p_rt->ch_mask) *
|
||||
m_rt->stream->params.bps;
|
||||
}
|
||||
if (required_bandwidth <=
|
||||
curr_dr_freq - bus->lane_used_bandwidth[l]) {
|
||||
/* Check if m_lane is connected to all Peripherals */
|
||||
if (!is_lane_connected_to_all_peripherals(m_rt,
|
||||
slave_prop->lane_maps[l])) {
|
||||
dev_dbg(bus->dev,
|
||||
"Not all Peripherals are connected to M lane %d\n",
|
||||
slave_prop->lane_maps[l]);
|
||||
continue;
|
||||
}
|
||||
m_lane = slave_prop->lane_maps[l];
|
||||
dev_dbg(&s_rt->slave->dev, "M lane %d is used\n", m_lane);
|
||||
bus->lane_used_bandwidth[l] += required_bandwidth;
|
||||
/*
|
||||
* Use non-zero manager lane, subtract the lane 0
|
||||
* bandwidth that is already calculated
|
||||
*/
|
||||
bus->params.bandwidth -= required_bandwidth;
|
||||
return m_lane;
|
||||
}
|
||||
}
|
||||
|
||||
/* No available multi lane found, only lane 0 can be used */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* sdw_compute_bus_params: Compute bus parameters
|
||||
*
|
||||
|
|
@ -343,10 +419,16 @@ static bool is_clock_scaling_supported(struct sdw_bus *bus)
|
|||
*/
|
||||
static int sdw_compute_bus_params(struct sdw_bus *bus)
|
||||
{
|
||||
unsigned int curr_dr_freq = 0;
|
||||
struct sdw_master_prop *mstr_prop = &bus->prop;
|
||||
int i, clk_values, ret;
|
||||
struct sdw_slave_prop *slave_prop;
|
||||
struct sdw_port_runtime *m_p_rt;
|
||||
struct sdw_port_runtime *s_p_rt;
|
||||
struct sdw_master_runtime *m_rt;
|
||||
struct sdw_slave_runtime *s_rt;
|
||||
unsigned int curr_dr_freq = 0;
|
||||
int i, l, clk_values, ret;
|
||||
bool is_gear = false;
|
||||
int m_lane = 0;
|
||||
u32 *clk_buf;
|
||||
|
||||
if (mstr_prop->num_clk_gears) {
|
||||
|
|
@ -373,11 +455,26 @@ static int sdw_compute_bus_params(struct sdw_bus *bus)
|
|||
(bus->params.max_dr_freq >> clk_buf[i]) :
|
||||
clk_buf[i] * SDW_DOUBLE_RATE_FACTOR;
|
||||
|
||||
if (curr_dr_freq * (mstr_prop->default_col - 1) <
|
||||
if (curr_dr_freq * (mstr_prop->default_col - 1) >=
|
||||
bus->params.bandwidth * mstr_prop->default_col)
|
||||
continue;
|
||||
break;
|
||||
|
||||
break;
|
||||
list_for_each_entry(m_rt, &bus->m_rt_list, bus_node) {
|
||||
/*
|
||||
* Get the first s_rt that will be used to find the available lane that
|
||||
* can be used. No need to check all Peripherals because we can't use
|
||||
* multi-lane if we can't find any available lane for the first Peripheral.
|
||||
*/
|
||||
s_rt = list_first_entry(&m_rt->slave_rt_list,
|
||||
struct sdw_slave_runtime, m_rt_node);
|
||||
|
||||
/*
|
||||
* Find the available Manager lane that connected to the first Peripheral.
|
||||
*/
|
||||
m_lane = get_manager_lane(bus, m_rt, s_rt, curr_dr_freq);
|
||||
if (m_lane > 0)
|
||||
goto out;
|
||||
}
|
||||
|
||||
/*
|
||||
* TODO: Check all the Slave(s) port(s) audio modes and find
|
||||
|
|
@ -391,6 +488,32 @@ static int sdw_compute_bus_params(struct sdw_bus *bus)
|
|||
__func__, bus->params.bandwidth);
|
||||
return -EINVAL;
|
||||
}
|
||||
out:
|
||||
/* multilane can be used */
|
||||
if (m_lane > 0) {
|
||||
/* Set Peripheral lanes */
|
||||
list_for_each_entry(s_rt, &m_rt->slave_rt_list, m_rt_node) {
|
||||
slave_prop = &s_rt->slave->prop;
|
||||
for (l = 1; l < SDW_MAX_LANES; l++) {
|
||||
if (slave_prop->lane_maps[l] == m_lane) {
|
||||
list_for_each_entry(s_p_rt, &s_rt->port_list, port_node) {
|
||||
s_p_rt->lane = l;
|
||||
dev_dbg(&s_rt->slave->dev,
|
||||
"Set P lane %d for port %d\n",
|
||||
l, s_p_rt->num);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Set Manager lanes. Configure the last m_rt in bus->m_rt_list only since
|
||||
* we don't want to touch other m_rts that are already working.
|
||||
*/
|
||||
list_for_each_entry(m_p_rt, &m_rt->port_list, port_node) {
|
||||
m_p_rt->lane = m_lane;
|
||||
}
|
||||
}
|
||||
|
||||
if (!mstr_prop->default_frame_rate || !mstr_prop->default_row)
|
||||
return -EINVAL;
|
||||
|
|
|
|||
|
|
@ -1678,6 +1678,9 @@ EXPORT_SYMBOL(sdw_disable_stream);
|
|||
static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream)
|
||||
{
|
||||
struct sdw_master_runtime *m_rt;
|
||||
struct sdw_port_runtime *p_rt;
|
||||
unsigned int multi_lane_bandwidth;
|
||||
unsigned int bandwidth;
|
||||
struct sdw_bus *bus;
|
||||
int state = stream->state;
|
||||
int ret = 0;
|
||||
|
|
@ -1699,9 +1702,22 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream)
|
|||
return ret;
|
||||
}
|
||||
|
||||
multi_lane_bandwidth = 0;
|
||||
|
||||
list_for_each_entry(p_rt, &m_rt->port_list, port_node) {
|
||||
if (!p_rt->lane)
|
||||
continue;
|
||||
|
||||
bandwidth = m_rt->stream->params.rate * hweight32(p_rt->ch_mask) *
|
||||
m_rt->stream->params.bps;
|
||||
multi_lane_bandwidth += bandwidth;
|
||||
bus->lane_used_bandwidth[p_rt->lane] -= bandwidth;
|
||||
if (!bus->lane_used_bandwidth[p_rt->lane])
|
||||
p_rt->lane = 0;
|
||||
}
|
||||
/* TODO: Update this during Device-Device support */
|
||||
bus->params.bandwidth -= m_rt->stream->params.rate *
|
||||
m_rt->ch_count * m_rt->stream->params.bps;
|
||||
bandwidth = m_rt->stream->params.rate * m_rt->ch_count * m_rt->stream->params.bps;
|
||||
bus->params.bandwidth -= bandwidth - multi_lane_bandwidth;
|
||||
|
||||
/* Compute params */
|
||||
if (bus->compute_params) {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue