Fix SoundWire randconfig issues
Subsystems (5)
cover Fix SoundWire randconfig issues
Moving all the waiting for soundwire devices to enumerate into the core code [1] has caused some randconfig issues. This is the second attempt to fix this after there were some short coming in [2].
Sorry for sending during the merge window, but people are keen to see a solution posted.
Thanks,
Charles
[1] https://lore.kernel.org/linux-sound/[email protected]/
[2] https://lore.kernel.org/lkml/[email protected]/
Charles Keepax (5):
soundwire: Move wait for initialisation helper to header
ASoC: es9356: Add back local call to sdw_show_ping_status()
ASoC: max98373: Add back local call to sdw_show_ping_status()
ASoC: ti: Add back local call to sdw_show_ping_status()
ASoC: realtek: Add back local call to sdw_show_ping_status()
drivers/soundwire/bus.c | 28 ---------------------- include/linux/soundwire/sdw.h | 37 +++++++++++++++++++++++------- sound/soc/codecs/es9356.c | 4 +++- sound/soc/codecs/max98373-sdw.c | 4 +++- sound/soc/codecs/rt1017-sdca-sdw.c | 4 +++- sound/soc/codecs/rt1308-sdw.c | 4 +++- sound/soc/codecs/rt1316-sdw.c | 4 +++- sound/soc/codecs/rt5682-sdw.c | 4 +++- sound/soc/codecs/rt700-sdw.c | 4 +++- sound/soc/codecs/rt711-sdca-sdw.c | 4 +++- sound/soc/codecs/rt712-sdca-dmic.c | 4 +++- sound/soc/codecs/rt712-sdca-sdw.c | 4 +++- sound/soc/codecs/rt715-sdca-sdw.c | 4 +++- sound/soc/codecs/rt715-sdw.c | 4 +++- sound/soc/codecs/rt721-sdca-sdw.c | 4 +++- sound/soc/codecs/rt722-sdca-sdw.c | 4 +++- sound/soc/codecs/tac5xx2-sdw.c | 4 +++- sound/soc/codecs/tas2783-sdw.c | 4 +++- 18 files changed, 77 insertions(+), 52 deletions(-)
Signature · 1 line
2.47.3
PATCH 1/5 soundwire: Move wait for initialisation helper to header
As SoundWire devices tend to enumerate on the bus after probe, drivers frequently need to wait for the device to initialise from common driver code. The common system is to split drivers into a core module and then a module for each communication bus. These two facts tend to cause Kconfig issues, the issue tends to be when SOUNDWIRE=m and DRIVER_I2C=y, this usually selects DRIVER=y. The driver code then wants to call sdw_slave_wait_for_init(), but this results in calling a module function from built in code. A depends on SOUNDWIRE | !SOUNDWIRE could be added to the end driver but this seems slightly off as it adds a lot of counter intuitive depends.
A simpler solution is to make sdw_slave_wait_for_init() a static inline function. As part of doing this add a check for the slave device being NULL acknowledging that this is likely called from code that is shared between control buses. It does require dropping the call to sdw_show_ping_status() but this can be added back in end drivers that used it originally.
Currently this is causing rand config issues on RT5682 and will soon also cause similar problems on cs42l43.
--- drivers/soundwire/bus.c | 28 -------------------------- include/linux/soundwire/sdw.h | 37 +++++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 36 deletions(-)
drivers/soundwire/bus.c +0 -28
@@ -1372,34 +1372,6 @@ int sdw_slave_get_current_bank(struct sdw_slave *slave) }EXPORT_SYMBOL_GPL (sdw_slave_get_current_bank); -/** -* sdw_slave_wait_for_init - Wait for device initialisation -* @slave: Pointer to the SoundWire peripheral. -* @timeout_ms: Timeout in milliseconds. -* -* Wait for a peripheral device to enumerate and be initialised by the -* SoundWire core. -* -* Return: Zero on success, and a negative error code on failure. -*/ -int sdw_slave_wait_for_init (struct sdw_slave *slave,int timeout_ms) -{ -unsigned long time; - - time =wait_for_completion_timeout (&slave->initialization_complete, -msecs_to_jiffies (timeout_ms)); -if (!time) { -dev_err (&slave->dev,"Initialization not complete\n" ); -sdw_show_ping_status (slave->bus, true); -return -ETIMEDOUT ; - } - - slave->unattach_request =0 ; - -return 0 ; -} -EXPORT_SYMBOL_GPL (sdw_slave_wait_for_init); -static int sdw_slave_set_frequency (struct sdw_slave *slave) {int scale_index;
include/linux/soundwire/sdw.h +29 -8
@@ -1093,8 +1093,6 @@ int sdw_slave_get_current_bank(struct sdw_slave *sdev);int sdw_slave_get_scale_index (struct sdw_slave *slave,u8 *base); -int sdw_slave_wait_for_init (struct sdw_slave *slave,int timeout_ms); -/* messaging and data APIs */ int sdw_read (struct sdw_slave *slave,u32 addr);int sdw_write (struct sdw_slave *slave,u32 addr,u8 value);
@@ -1138,12 +1136,6 @@ static inline int sdw_slave_get_current_bank(struct sdw_slave *sdev)return -EINVAL ; } -static inline int sdw_slave_wait_for_init (struct sdw_slave *slave,int timeout_ms) -{ -WARN_ONCE (1 ,"SoundWire API is disabled" ); -return -EINVAL ; -} -/* messaging and data APIs */ static inline int sdw_read (struct sdw_slave *slave,u32 addr) {
@@ -1207,4 +1199,33 @@ static inline int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u#endif /* CONFIG_SOUNDWIRE */ +/** +* sdw_slave_wait_for_init - Wait for device initialisation +* @slave: Pointer to the SoundWire peripheral. +* @timeout_ms: Timeout in milliseconds. +* +* Wait for a peripheral device to enumerate and be initialised by the +* SoundWire core. +* +* Return: Zero on success, and a negative error code on failure. +*/ +static inline int sdw_slave_wait_for_init (struct sdw_slave *slave,int timeout_ms) +{ +unsigned long time; + +if (!slave) +return 0 ; + + time =wait_for_completion_timeout (&slave->initialization_complete, +msecs_to_jiffies (timeout_ms)); +if (!time) { +dev_err (&slave->dev,"Initialization not complete\n" ); +return -ETIMEDOUT ; + } + + slave->unattach_request =0 ; + +return 0 ; +} +#endif /* __SOUNDWIRE_H */
Signature · 1 line
2.47.3
Re: [PATCH 1/5] soundwire: Move wait for initialisation helper to header
Quoted 18 lines · Charles Keepax
As SoundWire devices tend to enumerate on the bus after probe, drivers frequently need to wait for the device to initialise from common driver code. The common system is to split drivers into a core module and then a module for each communication bus. These two facts tend to cause
Kconfigissues, the issue tends to be when SOUNDWIRE=m and DRIVER_I2C=y, this usually selects DRIVER=y. The driver code then wants to callsdw_slave_wait_for_init(), but this results in calling a module function from built in code. A depends on SOUNDWIRE | !SOUNDWIRE could be added to the end driver but this seems slightly off as it adds a lot of counter intuitive depends.A simpler solution is to make
sdw_slave_wait_for_init()a static inline function. As part of doing this add a check for the slave device being NULL acknowledging that this is likely called from code that is shared between control buses. It does require dropping the call tosdw_show_ping_status()but this can be added back in end drivers that used it originally.
Quoted 2 lines
Currently this is causing rand config issues on RT5682 and will soon also cause similar problems on cs42l43.
Signature · 1 line
~Vinod
Mark Brown
maintainerRe: [PATCH 1/5] soundwire: Move wait for initialisation helper to header
In reply to Charles Keepaxinclude/linux/soundwire/sdw.h static inline int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u · line 1220
Quoted 13 lines · Charles Keepax
As SoundWire devices tend to enumerate on the bus after probe, drivers frequently need to wait for the device to initialise from common driver code. The common system is to split drivers into a core module and then
include/linux/soundwire/sdw.h +9
-0+static inline int sdw_slave_wait_for_init (struct sdw_slave *slave,int timeout_ms) +{ +unsigned long time; + +if (!slave) +return 0 ; + + time =wait_for_completion_timeout (&slave->initialization_complete, +msecs_to_jiffies (timeout_ms));
You need to add an include of linux/jiffies.h for msecs_to_jiffies() otherwise we might get build breaks.
Re: [PATCH 1/5] soundwire: Move wait for initialisation helper to header
Quoted 6 lines · Mark Brown
Quoted 3 lines · Charles Keepax
As SoundWire devices tend to enumerate on the bus after probe, drivers frequently need to wait for the device to initialise from common driver code. The common system is to split drivers into a core module and then
Quoted 12 lines
include/linux/soundwire/sdw.h static inline int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u · line 1220
Quoted 9 lines
include/linux/soundwire/sdw.h +9
-0+static inline int sdw_slave_wait_for_init (struct sdw_slave *slave,int timeout_ms) +{ +unsigned long time; + +if (!slave) +return 0 ; + + time =wait_for_completion_timeout (&slave->initialization_complete, +msecs_to_jiffies (timeout_ms));You need to add an include of
linux/jiffies.hformsecs_to_jiffies()otherwise we might get build breaks.
Good shout thanks I will do a respin.
Thanks,
Charles
PATCH 2/5 ASoC: es9356: Add back local call to sdw_show_ping_status()
In reply to Charles KeepaxAs the core no longer calls this debug helper add it back to the drivers that originally called it.
--- sound/soc/codecs/es9356.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/codecs/es9356.c +3 -1
@@ -1111,8 +1111,10 @@ static int es9356_sdca_dev_resume(struct device *dev) es9356->disable_irq = false; ret =sdw_slave_wait_for_init (slave, es9356_PROBE_TIMEOUT); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (es9356->regmap, false);regcache_sync (es9356->regmap);
Signature · 1 line
2.47.3
PATCH 3/5 ASoC: max98373: Add back local call to sdw_show_ping_status()
In reply to Charles KeepaxAs the core no longer calls this debug helper add it back to the drivers that originally called it.
--- sound/soc/codecs/max98373-sdw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/codecs/max98373-sdw.c +3 -1
@@ -272,8 +272,10 @@ static int max98373_resume(struct device *dev)return 0 ; ret =sdw_slave_wait_for_init (slave,MAX98373_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (max98373->regmap, false);regcache_sync (max98373->regmap);
Signature · 1 line
2.47.3
PATCH 4/5 ASoC: ti: Add back local call to sdw_show_ping_status()
In reply to Charles KeepaxAs the core no longer calls this debug helper add it back to the drivers that originally called it.
--- sound/soc/codecs/tac5xx2-sdw.c | 4 +++- sound/soc/codecs/tas2783-sdw.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
sound/soc/codecs/tac5xx2-sdw.c +3 -1
@@ -1445,8 +1445,10 @@ static s32 tac5xx2_sdca_dev_resume(struct device *dev) } ret =sdw_slave_wait_for_init (slave,TAC5XX2_PROBE_TIMEOUT_MS ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (tac_dev->regmap, false);regcache_mark_dirty (tac_dev->regmap);
sound/soc/codecs/tas2783-sdw.c +3 -1
@@ -1083,8 +1083,10 @@ static s32 tas2783_sdca_dev_resume(struct device *dev)int ret; ret =sdw_slave_wait_for_init (slave,TAS2783_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (tas_dev->regmap, false);regcache_sync (tas_dev->regmap);
Signature · 1 line
2.47.3
PATCH 5/5 ASoC: realtek: Add back local call to sdw_show_ping_status()
In reply to Charles KeepaxAs the core no longer calls this debug helper add it back to the drivers that originally called it.
--- sound/soc/codecs/rt1017-sdca-sdw.c | 4 +++- sound/soc/codecs/rt1308-sdw.c | 4 +++- sound/soc/codecs/rt1316-sdw.c | 4 +++- sound/soc/codecs/rt5682-sdw.c | 4 +++- sound/soc/codecs/rt700-sdw.c | 4 +++- sound/soc/codecs/rt711-sdca-sdw.c | 4 +++- sound/soc/codecs/rt712-sdca-dmic.c | 4 +++- sound/soc/codecs/rt712-sdca-sdw.c | 4 +++- sound/soc/codecs/rt715-sdca-sdw.c | 4 +++- sound/soc/codecs/rt715-sdw.c | 4 +++- sound/soc/codecs/rt721-sdca-sdw.c | 4 +++- sound/soc/codecs/rt722-sdca-sdw.c | 4 +++- 12 files changed, 36 insertions(+), 12 deletions(-)
sound/soc/codecs/rt1017-sdca-sdw.c +3 -1
@@ -779,8 +779,10 @@ static int rt1017_sdca_dev_resume(struct device *dev)return 0 ; ret =sdw_slave_wait_for_init (slave,RT1017_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt1017->regmap, false);regcache_sync (rt1017->regmap);
sound/soc/codecs/rt1308-sdw.c +3 -1
@@ -774,8 +774,10 @@ static int rt1308_dev_resume(struct device *dev)return 0 ; ret =sdw_slave_wait_for_init (slave,RT1308_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt1308->regmap, false);regcache_sync_region (rt1308->regmap,0xc000 ,0xcfff );
sound/soc/codecs/rt1316-sdw.c +3 -1
@@ -751,8 +751,10 @@ static int rt1316_dev_resume(struct device *dev)return 0 ; ret =sdw_slave_wait_for_init (slave,RT1316_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt1316->regmap, false);regcache_sync (rt1316->regmap);
sound/soc/codecs/rt5682-sdw.c +3 -1
@@ -769,8 +769,10 @@ static int rt5682_dev_resume(struct device *dev) } ret =sdw_slave_wait_for_init (slave,RT5682_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt5682->sdw_regmap, false);regcache_cache_only (rt5682->regmap, false);
sound/soc/codecs/rt700-sdw.c +3 -1
@@ -528,8 +528,10 @@ static int rt700_dev_resume(struct device *dev)return 0 ; ret =sdw_slave_wait_for_init (slave,RT700_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt700->regmap, false);regcache_sync_region (rt700->regmap,0x3000 ,0x8fff );
sound/soc/codecs/rt711-sdca-sdw.c +3 -1
@@ -454,8 +454,10 @@ static int rt711_sdca_dev_resume(struct device *dev) } ret =sdw_slave_wait_for_init (slave,RT711_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt711->regmap, false);regcache_sync (rt711->regmap);
sound/soc/codecs/rt712-sdca-dmic.c +3 -1
@@ -911,8 +911,10 @@ static int rt712_sdca_dmic_dev_resume(struct device *dev)return 0 ; ret =sdw_slave_wait_for_init (slave,RT712_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt712->regmap, false);regcache_sync (rt712->regmap);
sound/soc/codecs/rt712-sdca-sdw.c +3 -1
@@ -467,8 +467,10 @@ static int rt712_sdca_dev_resume(struct device *dev) } ret =sdw_slave_wait_for_init (slave,RT712_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt712->regmap, false);regcache_sync (rt712->regmap);
sound/soc/codecs/rt715-sdca-sdw.c +3 -1
@@ -230,8 +230,10 @@ static int rt715_dev_resume(struct device *dev)return 0 ; ret =sdw_slave_wait_for_init (slave,RT715_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt715->regmap, false); regcache_sync_region(rt715->regmap,
sound/soc/codecs/rt715-sdw.c +3 -1
@@ -507,8 +507,10 @@ static int rt715_dev_resume(struct device *dev)return 0 ; ret =sdw_slave_wait_for_init (slave,RT715_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt715->regmap, false);regcache_sync_region (rt715->regmap,0x3000 ,0x8fff );
sound/soc/codecs/rt721-sdca-sdw.c +3 -1
@@ -505,8 +505,10 @@ static int rt721_sdca_dev_resume(struct device *dev) } ret =sdw_slave_wait_for_init (slave,RT721_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt721->regmap, false);regcache_sync (rt721->regmap);
sound/soc/codecs/rt722-sdca-sdw.c +3 -1
@@ -552,8 +552,10 @@ static int rt722_sdca_dev_resume(struct device *dev) } ret =sdw_slave_wait_for_init (slave,RT722_PROBE_TIMEOUT ); -if (ret) +if (ret) { +sdw_show_ping_status (slave->bus, true);return ret; + }regcache_cache_only (rt722->regmap, false);regcache_sync (rt722->regmap);
Signature · 1 line
2.47.3
Quoted 6 lines · Charles Keepax
Moving all the waiting for soundwire devices to enumerate into the core code [1] has caused some randconfig issues. This is the second attempt to fix this after there were some short coming in [2].
Sorry for sending during the merge window, but people are keen to see a solution posted.
Looks good to me,