| Message ID | 20220825122241.273090-3-rf@opensource.cirrus.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | soundwire: Fixes for spurious and missing UNATTACH | expand |
On 8/25/22 14:22, Richard Fitzgerald wrote: > Ensure that if sdw_handle_slave_status() sees a peripheral > has dropped off the bus it reports it to the client driver. > > If there are any devices reporting on address 0 it bails out > after programming the device IDs. So it never reaches the second > loop that calls sdw_update_slave_status(). > > If the missing device is one that is now showing as unenumerated > it has been given a device ID so will report as attached next > time sdw_handle_slave_status() runs. > > With the previous code the client driver would only see another > ATTACHED notification because the UNATTACHED state was lost when > sdw_handle_slave_status() bailed out after programming the > device ID. > > This shows up most when the peripheral has to be reset after > downloading updated firmware and there are multiple of these > peripherals on the bus. They will all return to unenumerated state > after the reset, and then there is a mix of unattached, attached > and unenumerated PING states from the peripherals, as each is reset > and they reboot. > > Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> > --- > drivers/soundwire/bus.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c > index 704f75c0bae2..bb8ce26c68b3 100644 > --- a/drivers/soundwire/bus.c > +++ b/drivers/soundwire/bus.c > @@ -1756,6 +1756,11 @@ int sdw_handle_slave_status(struct sdw_bus *bus, > dev_warn(&slave->dev, "Slave %d state check1: UNATTACHED, status was %d\n", > i, slave->status); > sdw_modify_slave_status(slave, SDW_SLAVE_UNATTACHED); > + > + /* Ensure driver knows that peripheral unattached */ > + ret = sdw_update_slave_status(slave, status[i]); > + if (ret < 0) > + dev_warn(&slave->dev, "Update Slave status failed:%d\n", ret); This is indeed a good fix, this will make sure the driver will re-initialize the device when it reports as ATTACHED again. The codec driver needs to keep track on the UNATTACHED change though. This is the case in all codec drivers except rt715 and rt715-sdca. Something to change in a follow-up patch (cc: Jack Yu). Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > } > } >
diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 704f75c0bae2..bb8ce26c68b3 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -1756,6 +1756,11 @@ int sdw_handle_slave_status(struct sdw_bus *bus, dev_warn(&slave->dev, "Slave %d state check1: UNATTACHED, status was %d\n", i, slave->status); sdw_modify_slave_status(slave, SDW_SLAVE_UNATTACHED); + + /* Ensure driver knows that peripheral unattached */ + ret = sdw_update_slave_status(slave, status[i]); + if (ret < 0) + dev_warn(&slave->dev, "Update Slave status failed:%d\n", ret); } }
Ensure that if sdw_handle_slave_status() sees a peripheral has dropped off the bus it reports it to the client driver. If there are any devices reporting on address 0 it bails out after programming the device IDs. So it never reaches the second loop that calls sdw_update_slave_status(). If the missing device is one that is now showing as unenumerated it has been given a device ID so will report as attached next time sdw_handle_slave_status() runs. With the previous code the client driver would only see another ATTACHED notification because the UNATTACHED state was lost when sdw_handle_slave_status() bailed out after programming the device ID. This shows up most when the peripheral has to be reset after downloading updated firmware and there are multiple of these peripherals on the bus. They will all return to unenumerated state after the reset, and then there is a mix of unattached, attached and unenumerated PING states from the peripherals, as each is reset and they reboot. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> --- drivers/soundwire/bus.c | 5 +++++ 1 file changed, 5 insertions(+)