| Message ID | 20200108175438.13121-7-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | soundwire: stream: fix state machines and transitions | expand |
On 08-01-20, 11:54, Pierre-Louis Bossart wrote: > From: Rander Wang <rander.wang@intel.com> > > In the Intel QA multi-pipelines test case, there are two pipelines for > playback and capture on the same bus. The test fails with an error > when setting port params: > > [ 599.224812] rt711 sdw:0:25d:711:0: invalid dpn_prop direction 1 port_num 0 > [ 599.224815] sdw_program_slave_port_params failed -22 > [ 599.224819] intel-sdw sdw-master-0: Program transport params failed: -22 > [ 599.224822] intel-sdw sdw-master-0: Program params failed: -22 side note, one of these above err logs should be removed :) > [ 599.224828] sdw_enable_stream: SDW0 Pin2-Playback: done > > This problem is root-caused to the programming of the capture stream > ports while it is not yet prepared, the calling sequence is: > > (1) hw_params for playback. The playback stream provide the port > information to Bus. > (2) stream_prepare for playback, Transport and port parameters > are computed for playback. > (3) hw_params for capture. The capture stream provide the port > information to Bus, but it has not been prepared so is not > accounted for in the bandwidth allocation. > (4) stream_enable for playback. Program transport and port parameters > for all masters and slaves. Since the transport and port parameters > are not computed for capture stream, sdw_program_slave_port_params > will generate a error when setting port params for capture. > > in step (4), we should only program the ports for the stream that have > been prepared. A stream that is only in CONFIGURED state should be > ignored, its ports will be programmed when it becomes PREPARED. > > Tested on Comet Lake. > > GitHub issue: https://github.com/thesofproject/linux/issues/1637 This is not relevant for kernel, pls remove > Signed-off-by: Rander Wang <rander.wang@intel.com> > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > drivers/soundwire/stream.c | 21 ++++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c > index da10f38298c0..198372977187 100644 > --- a/drivers/soundwire/stream.c > +++ b/drivers/soundwire/stream.c > @@ -604,12 +604,23 @@ static int sdw_notify_config(struct sdw_master_runtime *m_rt) > * > * @bus: SDW bus instance > */ > -static int sdw_program_params(struct sdw_bus *bus) > +static int sdw_program_params(struct sdw_bus *bus, bool prepare) > { > struct sdw_master_runtime *m_rt; > int ret = 0; > > list_for_each_entry(m_rt, &bus->m_rt_list, bus_node) { > + > + /* > + * this loop walks through all master runtimes for a > + * bus, but the ports can only be configured while > + * explicitly preparing a stream or handling an > + * already-prepared stream otherwise. we can go upto 80 chars, make sure you align the above comment block as such > + */ > + if (!prepare && > + m_rt->stream->state == SDW_STREAM_CONFIGURED) > + continue; > + > ret = sdw_program_port_params(m_rt); > if (ret < 0) { > dev_err(bus->dev, > @@ -1502,7 +1513,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream, > > program_params: > /* Program params */ > - ret = sdw_program_params(bus); > + ret = sdw_program_params(bus, true); > if (ret < 0) { > dev_err(bus->dev, "Program params failed: %d\n", ret); > goto restore_params; > @@ -1602,7 +1613,7 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream) > bus = m_rt->bus; > > /* Program params */ > - ret = sdw_program_params(bus); > + ret = sdw_program_params(bus, false); > if (ret < 0) { > dev_err(bus->dev, "Program params failed: %d\n", ret); > return ret; > @@ -1687,7 +1698,7 @@ static int _sdw_disable_stream(struct sdw_stream_runtime *stream) > struct sdw_bus *bus = m_rt->bus; > > /* Program params */ > - ret = sdw_program_params(bus); > + ret = sdw_program_params(bus, false); Can you do a converse test as well, when the streams are running and concurrently two stream are stopped, it would be good to get it confirmed... > if (ret < 0) { > dev_err(bus->dev, "Program params failed: %d\n", ret); > return ret; > @@ -1769,7 +1780,7 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream) > m_rt->ch_count * m_rt->stream->params.bps; > > /* Program params */ > - ret = sdw_program_params(bus); > + ret = sdw_program_params(bus, false); > if (ret < 0) { > dev_err(bus->dev, "Program params failed: %d\n", ret); > return ret; > -- > 2.20.1
>> GitHub issue: https://github.com/thesofproject/linux/issues/1637 > > This is not relevant for kernel, pls remove Why? it's not uncommon to have bugzilla links, why would we lose the publicly-available information because GitHub is used? >> list_for_each_entry(m_rt, &bus->m_rt_list, bus_node) { >> + >> + /* >> + * this loop walks through all master runtimes for a >> + * bus, but the ports can only be configured while >> + * explicitly preparing a stream or handling an >> + * already-prepared stream otherwise. > > we can go upto 80 chars, make sure you align the above comment block as > such this is formatted by emacs, and with long words you get spaces at the end. >> /* Program params */ >> - ret = sdw_program_params(bus); >> + ret = sdw_program_params(bus, false); > > Can you do a converse test as well, when the streams are running and > concurrently two stream are stopped, it would be good to get it confirmed... we cannot concurrently stop two streams since we take a bus lock. That's a problem but it'll have to be addressed separately. the problem with multiple streams addressed here is when one is CONFIGURED, which does not require a bus lock.
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index da10f38298c0..198372977187 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -604,12 +604,23 @@ static int sdw_notify_config(struct sdw_master_runtime *m_rt) * * @bus: SDW bus instance */ -static int sdw_program_params(struct sdw_bus *bus) +static int sdw_program_params(struct sdw_bus *bus, bool prepare) { struct sdw_master_runtime *m_rt; int ret = 0; list_for_each_entry(m_rt, &bus->m_rt_list, bus_node) { + + /* + * this loop walks through all master runtimes for a + * bus, but the ports can only be configured while + * explicitly preparing a stream or handling an + * already-prepared stream otherwise. + */ + if (!prepare && + m_rt->stream->state == SDW_STREAM_CONFIGURED) + continue; + ret = sdw_program_port_params(m_rt); if (ret < 0) { dev_err(bus->dev, @@ -1502,7 +1513,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream, program_params: /* Program params */ - ret = sdw_program_params(bus); + ret = sdw_program_params(bus, true); if (ret < 0) { dev_err(bus->dev, "Program params failed: %d\n", ret); goto restore_params; @@ -1602,7 +1613,7 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream) bus = m_rt->bus; /* Program params */ - ret = sdw_program_params(bus); + ret = sdw_program_params(bus, false); if (ret < 0) { dev_err(bus->dev, "Program params failed: %d\n", ret); return ret; @@ -1687,7 +1698,7 @@ static int _sdw_disable_stream(struct sdw_stream_runtime *stream) struct sdw_bus *bus = m_rt->bus; /* Program params */ - ret = sdw_program_params(bus); + ret = sdw_program_params(bus, false); if (ret < 0) { dev_err(bus->dev, "Program params failed: %d\n", ret); return ret; @@ -1769,7 +1780,7 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream) m_rt->ch_count * m_rt->stream->params.bps; /* Program params */ - ret = sdw_program_params(bus); + ret = sdw_program_params(bus, false); if (ret < 0) { dev_err(bus->dev, "Program params failed: %d\n", ret); return ret;