Skip to content

soundwire: fix restore_params to recover all buses on prepare failure #5829

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

Closed
Copilot wants to merge 3 commits into from
Closed

soundwire: fix restore_params to recover all buses on prepare failure #5829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a65266
Initial plan
Copilot Jun 26, 2026
5a0be1b
Fix restore_params to restore all buses in multi-link streams
Copilot Jun 26, 2026
054c3ac
Improve bpt_hstop field documentation in sdw_bus
Copilot Jun 26, 2026
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
2 changes: 2 additions & 0 deletions drivers/soundwire/bus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ struct sdw_master_runtime {
struct list_head port_list;
struct list_head stream_node;
struct list_head bus_node;
struct sdw_bus_params saved_params;
int saved_bpt_hstop;
};

struct sdw_transport_data {
Expand Down
15 changes: 12 additions & 3 deletions drivers/soundwire/stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,14 +1479,19 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream,
struct sdw_master_runtime *m_rt;
struct sdw_bus *bus;
struct sdw_master_prop *prop;
struct sdw_bus_params params;
int ret;

/* Pre-save all buses' params before making any changes, for error recovery */
list_for_each_entry(m_rt, &stream->master_list, stream_node) {
bus = m_rt->bus;
memcpy(&m_rt->saved_params, &bus->params, sizeof(bus->params));
m_rt->saved_bpt_hstop = bus->bpt_hstop;
}

/* Prepare Master(s) and Slave(s) port(s) associated with stream */
list_for_each_entry(m_rt, &stream->master_list, stream_node) {
bus = m_rt->bus;
prop = &bus->prop;
memcpy(&params, &bus->params, sizeof(params));

/* TODO: Support Asynchronous mode */
if ((prop->max_clk_freq % stream->params.rate) != 0) {
Expand Down Expand Up @@ -1542,7 +1547,11 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream,
return ret;

restore_params:
memcpy(&bus->params, &params, sizeof(params));
list_for_each_entry(m_rt, &stream->master_list, stream_node) {
bus = m_rt->bus;
memcpy(&bus->params, &m_rt->saved_params, sizeof(bus->params));
bus->bpt_hstop = m_rt->saved_bpt_hstop;
}
return ret;
}

Expand Down
4 changes: 4 additions & 0 deletions include/linux/soundwire/sdw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,9 @@ struct sdw_stream_runtime {
* @stream_refcount: number of streams currently using this bus
* @bpt_stream_refcount: number of BTP streams currently using this bus (should
* be zero or one, multiple streams per link is not supported).
* @bpt_hstop: The column stop index (hstop) used by the BPT stream's DP0 port.
* This value determines the last column allocated to the BPT data path on
* lane 0, allowing audio streams to use the remaining columns.
* @bpt_stream: pointer stored to handle BTP streams.
* @ops: Master callback ops
* @port_ops: Master port callback ops
Expand Down Expand Up @@ -1043,6 +1046,7 @@ struct sdw_bus {
struct sdw_bus_params params;
int stream_refcount;
int bpt_stream_refcount;
int bpt_hstop;
struct sdw_stream_runtime *bpt_stream;
const struct sdw_master_ops *ops;
const struct sdw_master_port_ops *port_ops;
Expand Down