| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20251124152956.2293218-1-rf@opensource.cirrus.com>
Date: Mon, 24 Nov 2025 15:29:56 +0000
From: Richard Fitzgerald <rf@...nsource.cirrus.com>
To: vkoul@...nel.org, yung-chuan.liao@...ux.intel.com,
pierre-louis.bossart@...ux.dev
Cc: linux-sound@...r.kernel.org, linux-kernel@...r.kernel.org,
patches@...nsource.cirrus.com
Subject: [PATCH] soundwire: stream: Prepare ports in parallel to reduce stream start latency
Issue DP prepare to all ports that use full CP_SM. Then wait for the
prepare to complete. This allow all the DP to prepare in parallel to
reduce the latency of starting an audio stream.
On a system with six CS35L56 amps, this reduces the startup latency,
from runtime_resume to all amps ready to play, from ~160 ms to ~60 ms.
(Test hardware: UpXtreme i14, BIOS v1.2, Core Ultra 7 155H, 3x CS35L56
on link 0, 3x CS35L56 on link 1).
An initial read of DPn_PREPARESTATUS is done before dropping into the wait,
so that a quick exit can be made if the port is already prepared. Currently
this is essential because the wait deadlocks - the stream setup takes
bus_lock, which blocks the interrupt handler - so the wait for completion
will always timeout.
However, an experiment of removing the bus_lock from stream setup, so that
the interrupt will work, shows that wait for completion takes ~700..800 us
but the quick-exit read takes 50..200 us. So the quick exit is still
valuable even if the stream.c code was rewritten to allow the completion
interrupt to work. Rewriting the code so it doesn't take bus_lock is risky.
The deadlock only lasts until the wait times out so it's not a serious
problem now that the DP prepare happens in parallel.
Signed-off-by: Richard Fitzgerald <rf@...nsource.cirrus.com>
---
drivers/soundwire/stream.c | 100 +++++++++++++++++++++++++++++--------
1 file changed, 80 insertions(+), 20 deletions(-)
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index 38c9dbd35606..cc469a4a0bb6 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -443,14 +443,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;
@@ -466,7 +464,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;
@@ -477,7 +474,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;
@@ -518,23 +514,16 @@ 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));
-
- 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;
- }
+ /*
+ * 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);
}
- /* 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,
@@ -543,6 +532,66 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,
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 {
+ simple_ch_prep_sm = s_rt->slave->prop.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;
+ goto err;
+ }
+ }
+
+ /* Inform slaves about ports prepared */
+ 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);
+
+ return 0;
+
+err:
+ dev_err(&s_rt->slave->dev, "Chn prep failed for port %d: %d\n", p_rt->num, ret);
+
+ return ret;
+}
+
static int sdw_prep_deprep_master_ports(struct sdw_master_runtime *m_rt,
struct sdw_port_runtime *p_rt,
bool prep)
@@ -594,6 +643,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);
--
2.47.3
Powered by blists - more mailing lists