Commit 8e8c0dfc authored by Bard Liao's avatar Bard Liao Committed by Vinod Koul

soundwire: generic_bandwidth_allocation: change port_bo parameter to pointer

Currently, we do port_bo += bps * ch in both inside and outside
sdw_compute_master_ports(). We can pass port_bo as a pointer and only
calculate port_bo in sdw_compute_master_ports().
Besides, different port could use different lanes and we can't just
add port_bo based on total channels in a manager.
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20240617121350.14074-1-yung-chuan.liao@linux.intel.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent b96f16bd
...@@ -83,7 +83,7 @@ EXPORT_SYMBOL(sdw_compute_slave_ports); ...@@ -83,7 +83,7 @@ EXPORT_SYMBOL(sdw_compute_slave_ports);
static void sdw_compute_master_ports(struct sdw_master_runtime *m_rt, static void sdw_compute_master_ports(struct sdw_master_runtime *m_rt,
struct sdw_group_params *params, struct sdw_group_params *params,
int port_bo, int hstop) int *port_bo, int hstop)
{ {
struct sdw_transport_data t_data = {0}; struct sdw_transport_data t_data = {0};
struct sdw_port_runtime *p_rt; struct sdw_port_runtime *p_rt;
...@@ -108,7 +108,7 @@ static void sdw_compute_master_ports(struct sdw_master_runtime *m_rt, ...@@ -108,7 +108,7 @@ static void sdw_compute_master_ports(struct sdw_master_runtime *m_rt,
sdw_fill_xport_params(&p_rt->transport_params, p_rt->num, sdw_fill_xport_params(&p_rt->transport_params, p_rt->num,
false, SDW_BLK_GRP_CNT_1, sample_int, false, SDW_BLK_GRP_CNT_1, sample_int,
port_bo, port_bo >> 8, hstart, hstop, *port_bo, (*port_bo) >> 8, hstart, hstop,
SDW_BLK_PKG_PER_PORT, 0x0); SDW_BLK_PKG_PER_PORT, 0x0);
sdw_fill_port_params(&p_rt->port_params, sdw_fill_port_params(&p_rt->port_params,
...@@ -120,15 +120,15 @@ static void sdw_compute_master_ports(struct sdw_master_runtime *m_rt, ...@@ -120,15 +120,15 @@ static void sdw_compute_master_ports(struct sdw_master_runtime *m_rt,
if (!(p_rt == list_first_entry(&m_rt->port_list, if (!(p_rt == list_first_entry(&m_rt->port_list,
struct sdw_port_runtime, struct sdw_port_runtime,
port_node))) { port_node))) {
port_bo += bps * ch; (*port_bo) += bps * ch;
continue; continue;
} }
t_data.hstart = hstart; t_data.hstart = hstart;
t_data.hstop = hstop; t_data.hstop = hstop;
t_data.block_offset = port_bo; t_data.block_offset = *port_bo;
t_data.sub_block_offset = 0; t_data.sub_block_offset = 0;
port_bo += bps * ch; (*port_bo) += bps * ch;
} }
sdw_compute_slave_ports(m_rt, &t_data); sdw_compute_slave_ports(m_rt, &t_data);
...@@ -146,9 +146,7 @@ static void _sdw_compute_port_params(struct sdw_bus *bus, ...@@ -146,9 +146,7 @@ static void _sdw_compute_port_params(struct sdw_bus *bus,
port_bo = 1; port_bo = 1;
list_for_each_entry(m_rt, &bus->m_rt_list, bus_node) { list_for_each_entry(m_rt, &bus->m_rt_list, bus_node) {
sdw_compute_master_ports(m_rt, &params[i], port_bo, hstop); sdw_compute_master_ports(m_rt, &params[i], &port_bo, hstop);
port_bo += m_rt->ch_count * m_rt->stream->params.bps;
} }
hstop = hstop - params[i].hwidth; hstop = hstop - params[i].hwidth;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment