Skip to content

soundwire: stream: Prepare ports in parallel to reduce stream start l… #5613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rfvirgil wants to merge 1 commit into
base: topic/sof-dev
Choose a base branch
from
Draft

soundwire: stream: Prepare ports in parallel to reduce stream start l… #5613

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 78 additions & 17 deletions drivers/soundwire/stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,14 +451,12 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,
struct sdw_port_runtime *p_rt,
bool prep)
{
struct completion *port_ready;
struct sdw_dpn_prop *dpn_prop;
struct sdw_prepare_ch prep_ch;
u32 imp_def_interrupts;
bool simple_ch_prep_sm;
u32 ch_prep_timeout;
bool intr = false;
int ret = 0, val;
int ret = 0;
u32 addr;

prep_ch.num = p_rt->num;
Expand All @@ -474,7 +472,6 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,

imp_def_interrupts = dpn_prop->imp_def_interrupts;
simple_ch_prep_sm = dpn_prop->simple_ch_prep_sm;
ch_prep_timeout = dpn_prop->ch_prep_timeout;
} else {
struct sdw_dp0_prop *dp0_prop = s_rt->slave->prop.dp0_prop;

Expand All @@ -485,7 +482,6 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,
}
imp_def_interrupts = dp0_prop->imp_def_interrupts;
simple_ch_prep_sm = dp0_prop->simple_ch_prep_sm;
ch_prep_timeout = dp0_prop->ch_prep_timeout;
}

prep_ch.prepare = prep;
Expand Down Expand Up @@ -526,27 +522,81 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,
return ret;
}

/* Wait for completion on port ready */
port_ready = &s_rt->slave->port_ready[prep_ch.num];
wait_for_completion_timeout(port_ready,
msecs_to_jiffies(ch_prep_timeout));
/*
* Defer wait for completion to allow all peripherals to
* prepare in parallel.
*/
} else {
/* Inform slaves about ports prepared */
sdw_do_port_prep(s_rt, prep_ch,
prep ? SDW_OPS_PORT_POST_PREP : SDW_OPS_PORT_POST_DEPREP);
}

/* Disable interrupt after Port de-prepare */
if (!prep && intr)
ret = sdw_configure_dpn_intr(s_rt->slave, p_rt->num, prep,
imp_def_interrupts);

return ret;
}

static int sdw_wait_prep_slave_ports(struct sdw_bus *bus,
struct sdw_slave_runtime *s_rt,
struct sdw_port_runtime *p_rt)
{
struct completion *port_ready;
struct sdw_dpn_prop *dpn_prop;
struct sdw_dp0_prop *dp0_prop;
struct sdw_prepare_ch prep_ch;
bool simple_ch_prep_sm;
u32 ch_prep_timeout;
int ret, val;

if (p_rt->num) {
dpn_prop = sdw_get_slave_dpn_prop(s_rt->slave, s_rt->direction, p_rt->num);
simple_ch_prep_sm = dpn_prop->simple_ch_prep_sm;
ch_prep_timeout = dpn_prop->ch_prep_timeout;
} else {
dp0_prop = s_rt->slave->prop.dp0_prop;
simple_ch_prep_sm = dp0_prop->simple_ch_prep_sm;
ch_prep_timeout = dp0_prop->ch_prep_timeout;
}

if (simple_ch_prep_sm)
return 0;

/*
* Check if already prepared. Avoid overhead of waiting for interrupt
* and port_ready completion if we don't need to.
*/
val = sdw_read_no_pm(s_rt->slave, SDW_DPN_PREPARESTATUS(p_rt->num));
if (val < 0) {
ret = val;
goto err;
}

if (val & p_rt->ch_mask) {
/* Wait for completion on port ready */
port_ready = &s_rt->slave->port_ready[p_rt->num];
wait_for_completion_timeout(port_ready, msecs_to_jiffies(ch_prep_timeout));
val = sdw_read_no_pm(s_rt->slave, SDW_DPN_PREPARESTATUS(p_rt->num));
if ((val < 0) || (val & p_rt->ch_mask)) {
ret = (val < 0) ? val : -ETIMEDOUT;
dev_err(&s_rt->slave->dev,
"Chn prep failed for port %d: %d\n", prep_ch.num, ret);
return ret;
goto err;
}
}

/* Inform slaves about ports prepared */
sdw_do_port_prep(s_rt, prep_ch, prep ? SDW_OPS_PORT_POST_PREP : SDW_OPS_PORT_POST_DEPREP);
prep_ch.num = p_rt->num;
prep_ch.ch_mask = p_rt->ch_mask;
prep_ch.prepare = true;
prep_ch.bank = bus->params.next_bank;
sdw_do_port_prep(s_rt, prep_ch, SDW_OPS_PORT_POST_PREP);

/* Disable interrupt after Port de-prepare */
if (!prep && intr)
ret = sdw_configure_dpn_intr(s_rt->slave, p_rt->num, prep,
imp_def_interrupts);
return 0;

err:
dev_err(&s_rt->slave->dev, "Chn prep failed for port %d: %d\n", p_rt->num, ret);

return ret;
}
Expand Down Expand Up @@ -602,6 +652,17 @@ static int sdw_prep_deprep_ports(struct sdw_master_runtime *m_rt, bool prep)
}
}

/* Wait for parallel CP_SM prepare completion */
if (prep) {
list_for_each_entry(s_rt, &m_rt->slave_rt_list, m_rt_node) {
list_for_each_entry(p_rt, &s_rt->port_list, port_node) {
ret = sdw_wait_prep_slave_ports(m_rt->bus, s_rt, p_rt);
if (ret < 0)
return ret;
}
}
}

/* Prepare/De-prepare Master port(s) */
list_for_each_entry(p_rt, &m_rt->port_list, port_node) {
ret = sdw_prep_deprep_master_ports(m_rt, p_rt, prep);
Expand Down
Loading