Skip to content

Revert "ASoC: Realtek codecs: wait codec init in hw_params" #5479

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

Merged
bardliao merged 17 commits into from
Jul 3, 2025
Merged

Revert "ASoC: Realtek codecs: wait codec init in hw_params" #5479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a9b281c
Revert "ASoC: rt1017: wait codec init in hw_params"
bardliao Jul 2, 2025
af56fa5
Revert "ASoC: rt5682: wait codec init in hw_params"
bardliao Jul 2, 2025
07b2048
Revert "ASoC: rt1308: wait codec init in hw_params"
bardliao Jul 2, 2025
bbdf28f
Revert "ASoC: rt1318: wait codec init in hw_params"
bardliao Jul 2, 2025
a7f01af
Revert "ASoC: rt1316: wait codec init in hw_params"
bardliao Jul 2, 2025
48126ca
Revert "ASoC: rt700: wait codec init in hw_params"
bardliao Jul 2, 2025
fa7d3aa
Revert "ASoC: rt715: wait codec init in hw_params"
bardliao Jul 2, 2025
702ce00
Revert "ASoC: rt711: wait codec init in hw_params"
bardliao Jul 2, 2025
b06aeb3
Revert "ASoC: rt711-sdca: wait codec init in hw_params"
bardliao Jul 2, 2025
c84a1ec
Revert "fixup! ASoC: rt715-sdca: wait codec init in hw_params"
bardliao Jul 2, 2025
286ecfd
Revert "ASoC: rt715-sdca: wait codec init in hw_params"
bardliao Jul 2, 2025
38786f1
Revert "ASoC: rt721: wait codec init in hw_params"
bardliao Jul 2, 2025
76e9b83
Revert "ASoC: rt1320: wait codec init in hw_params"
bardliao Jul 2, 2025
bac4841
Revert "ASoC: rt712: wait codec init in hw_params"
bardliao Jul 2, 2025
7bbde8f
Revert "ASoC: rt722: wait codec init in hw_params"
bardliao Jul 2, 2025
4eb2b60
Revert "fixup! soundwire: add sdw_slave_wait_for_initialization helper"
bardliao Jul 2, 2025
6347038
Revert "soundwire: add sdw_slave_wait_for_initialization helper"
bardliao Jul 2, 2025
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
17 changes: 0 additions & 17 deletions drivers/soundwire/slave.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,23 +104,6 @@ int sdw_slave_add(struct sdw_bus *bus,
}
EXPORT_SYMBOL(sdw_slave_add);

int sdw_slave_wait_for_initialization(struct sdw_slave *slave, unsigned int timeout)
{
unsigned long time;

time = wait_for_completion_timeout(&slave->initialization_complete,
msecs_to_jiffies(timeout));
if (!time) {
dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__);
sdw_show_ping_status(slave->bus, true);

return -ETIMEDOUT;
}

return 0;
}
EXPORT_SYMBOL(sdw_slave_wait_for_initialization);

#if IS_ENABLED(CONFIG_ACPI)

static bool find_slave(struct sdw_bus *bus,
Expand Down
1 change: 0 additions & 1 deletion include/linux/soundwire/sdw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,6 @@ int sdw_stream_remove_slave(struct sdw_slave *slave,
struct sdw_stream_runtime *stream);

int sdw_slave_get_scale_index(struct sdw_slave *slave, u8 *base);
int sdw_slave_wait_for_initialization(struct sdw_slave *slave, unsigned int timeout);

/* messaging and data APIs */
int sdw_read(struct sdw_slave *slave, u32 addr);
Expand Down
32 changes: 12 additions & 20 deletions sound/soc/codecs/rt1017-sdca-sdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@ static int rt1017_sdca_update_status(struct sdw_slave *slave,
enum sdw_slave_status status)
{
struct rt1017_sdca_priv *rt1017 = dev_get_drvdata(&slave->dev);
int ret;

if (status == SDW_SLAVE_UNATTACHED)
rt1017->hw_init = false;
Expand All @@ -386,18 +385,7 @@ static int rt1017_sdca_update_status(struct sdw_slave *slave,
return 0;

/* perform I/O transfers required for Slave initialization */
ret = rt1017_sdca_io_init(&slave->dev, slave);
if (ret < 0) {
dev_err(&slave->dev, "IO init failed: %d\n", ret);
return ret;
}

if (slave->unattach_request) {
regcache_cache_only(rt1017->regmap, false);
regcache_sync(rt1017->regmap);
}

return ret;
return rt1017_sdca_io_init(&slave->dev, slave);
}

static const char * const rt1017_rx_data_ch_select[] = {
Expand Down Expand Up @@ -581,8 +569,6 @@ static void rt1017_sdca_shutdown(struct snd_pcm_substream *substream,
snd_soc_dai_set_dma_data(dai, substream, NULL);
}

#define RT1017_PROBE_TIMEOUT 5000

static int rt1017_sdca_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai)
Expand Down Expand Up @@ -630,10 +616,6 @@ static int rt1017_sdca_pcm_hw_params(struct snd_pcm_substream *substream,
params_rate(params), num_channels, snd_pcm_format_width(params_format(params)),
direction, ch_mask, port);

retval = sdw_slave_wait_for_initialization(rt1017->sdw_slave, RT1017_PROBE_TIMEOUT);
if (retval < 0)
return retval;

retval = sdw_stream_add_slave(rt1017->sdw_slave, &stream_config,
&port_config, 1, sdw_stream);
if (retval) {
Expand Down Expand Up @@ -788,18 +770,28 @@ static int rt1017_sdca_dev_suspend(struct device *dev)
return 0;
}

#define RT1017_PROBE_TIMEOUT 5000

static int rt1017_sdca_dev_resume(struct device *dev)
{
struct sdw_slave *slave = dev_to_sdw_dev(dev);
struct rt1017_sdca_priv *rt1017 = dev_get_drvdata(dev);
unsigned long time;

if (!rt1017->first_hw_init)
return 0;

if (!slave->unattach_request)
goto regmap_sync;

return 0;
time = wait_for_completion_timeout(&slave->initialization_complete,
msecs_to_jiffies(RT1017_PROBE_TIMEOUT));
if (!time) {
dev_err(&slave->dev, "Initialization not complete, timed out\n");
sdw_show_ping_status(slave->bus, true);

return -ETIMEDOUT;
}

regmap_sync:
slave->unattach_request = 0;
Expand Down
32 changes: 12 additions & 20 deletions sound/soc/codecs/rt1308-sdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ static int rt1308_update_status(struct sdw_slave *slave,
enum sdw_slave_status status)
{
struct rt1308_sdw_priv *rt1308 = dev_get_drvdata(&slave->dev);
int ret;

if (status == SDW_SLAVE_UNATTACHED)
rt1308->hw_init = false;
Expand All @@ -316,18 +315,7 @@ static int rt1308_update_status(struct sdw_slave *slave,
return 0;

/* perform I/O transfers required for Slave initialization */
ret = rt1308_io_init(&slave->dev, slave);
if (ret < 0) {
dev_err(&slave->dev, "IO init failed %d\n", ret);
return ret;
}

if (slave->unattach_request) {
regcache_cache_only(rt1308->regmap, false);
regcache_sync_region(rt1308->regmap, 0xc000, 0xcfff);
}

return ret;
return rt1308_io_init(&slave->dev, slave);
}

static int rt1308_bus_config(struct sdw_slave *slave,
Expand Down Expand Up @@ -538,8 +526,6 @@ static int rt1308_sdw_set_tdm_slot(struct snd_soc_dai *dai,
return 0;
}

#define RT1308_PROBE_TIMEOUT 5000

static int rt1308_sdw_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
{
Expand Down Expand Up @@ -574,10 +560,6 @@ static int rt1308_sdw_hw_params(struct snd_pcm_substream *substream,
port_config.ch_mask = rt1308->rx_mask;
}

retval = sdw_slave_wait_for_initialization(rt1308->sdw_slave, RT1308_PROBE_TIMEOUT);
if (retval < 0)
return retval;

retval = sdw_stream_add_slave(rt1308->sdw_slave, &stream_config,
&port_config, 1, sdw_stream);
if (retval) {
Expand Down Expand Up @@ -783,18 +765,28 @@ static int rt1308_dev_suspend(struct device *dev)
return 0;
}

#define RT1308_PROBE_TIMEOUT 5000

static int rt1308_dev_resume(struct device *dev)
{
struct sdw_slave *slave = dev_to_sdw_dev(dev);
struct rt1308_sdw_priv *rt1308 = dev_get_drvdata(dev);
unsigned long time;

if (!rt1308->first_hw_init)
return 0;

if (!slave->unattach_request)
goto regmap_sync;

return 0;
time = wait_for_completion_timeout(&slave->initialization_complete,
msecs_to_jiffies(RT1308_PROBE_TIMEOUT));
if (!time) {
dev_err(&slave->dev, "Initialization not complete, timed out\n");
sdw_show_ping_status(slave->bus, true);

return -ETIMEDOUT;
}

regmap_sync:
slave->unattach_request = 0;
Expand Down
32 changes: 12 additions & 20 deletions sound/soc/codecs/rt1316-sdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ static int rt1316_update_status(struct sdw_slave *slave,
enum sdw_slave_status status)
{
struct rt1316_sdw_priv *rt1316 = dev_get_drvdata(&slave->dev);
int ret;

if (status == SDW_SLAVE_UNATTACHED)
rt1316->hw_init = false;
Expand All @@ -326,18 +325,7 @@ static int rt1316_update_status(struct sdw_slave *slave,
return 0;

/* perform I/O transfers required for Slave initialization */
ret = rt1316_io_init(&slave->dev, slave);
if (ret < 0) {
dev_err(&slave->dev, "%s: I/O init failed: %d\n", __func__, ret);
return ret;
}

if (slave->unattach_request) {
regcache_cache_only(rt1316->regmap, false);
regcache_sync(rt1316->regmap);
}

return ret;
return rt1316_io_init(&slave->dev, slave);
}

static int rt1316_classd_event(struct snd_soc_dapm_widget *w,
Expand Down Expand Up @@ -517,8 +505,6 @@ static void rt1316_sdw_shutdown(struct snd_pcm_substream *substream,
snd_soc_dai_set_dma_data(dai, substream, NULL);
}

#define RT1316_PROBE_TIMEOUT 5000

static int rt1316_sdw_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
{
Expand Down Expand Up @@ -548,10 +534,6 @@ static int rt1316_sdw_hw_params(struct snd_pcm_substream *substream,
else
port_config.num = 2;

retval = sdw_slave_wait_for_initialization(rt1316->sdw_slave, RT1316_PROBE_TIMEOUT);
if (retval < 0)
return retval;

retval = sdw_stream_add_slave(rt1316->sdw_slave, &stream_config,
&port_config, 1, sdw_stream);
if (retval) {
Expand Down Expand Up @@ -760,18 +742,28 @@ static int rt1316_dev_suspend(struct device *dev)
return 0;
}

#define RT1316_PROBE_TIMEOUT 5000

static int rt1316_dev_resume(struct device *dev)
{
struct sdw_slave *slave = dev_to_sdw_dev(dev);
struct rt1316_sdw_priv *rt1316 = dev_get_drvdata(dev);
unsigned long time;

if (!rt1316->first_hw_init)
return 0;

if (!slave->unattach_request)
goto regmap_sync;

return 0;
time = wait_for_completion_timeout(&slave->initialization_complete,
msecs_to_jiffies(RT1316_PROBE_TIMEOUT));
if (!time) {
dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__);
sdw_show_ping_status(slave->bus, true);

return -ETIMEDOUT;
}

regmap_sync:
slave->unattach_request = 0;
Expand Down
30 changes: 10 additions & 20 deletions sound/soc/codecs/rt1318-sdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,6 @@ static int rt1318_update_status(struct sdw_slave *slave,
enum sdw_slave_status status)
{
struct rt1318_sdw_priv *rt1318 = dev_get_drvdata(&slave->dev);
int ret;

if (status == SDW_SLAVE_UNATTACHED)
rt1318->hw_init = false;
Expand All @@ -458,18 +457,7 @@ static int rt1318_update_status(struct sdw_slave *slave,
return 0;

/* perform I/O transfers required for Slave initialization */
ret = rt1318_io_init(&slave->dev, slave);
if (ret < 0) {
dev_err(&slave->dev, "%s: I/O init failed: %d\n", __func__, ret);
return ret;
}

if (slave->unattach_request) {
regcache_cache_only(rt1318->regmap, false);
regcache_sync(rt1318->regmap);
}

return ret;
return rt1318_io_init(&slave->dev, slave);
}

static int rt1318_classd_event(struct snd_soc_dapm_widget *w,
Expand Down Expand Up @@ -572,8 +560,6 @@ static void rt1318_sdw_shutdown(struct snd_pcm_substream *substream,
snd_soc_dai_set_dma_data(dai, substream, NULL);
}

#define RT1318_PROBE_TIMEOUT 5000

static int rt1318_sdw_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
{
Expand Down Expand Up @@ -617,10 +603,6 @@ static int rt1318_sdw_hw_params(struct snd_pcm_substream *substream,
port_config.ch_mask = ch_mask;
port_config.num = port;

retval = sdw_slave_wait_for_initialization(rt1318->sdw_slave, RT1318_PROBE_TIMEOUT);
if (retval < 0)
return retval;

retval = sdw_stream_add_slave(rt1318->sdw_slave, &stream_config,
&port_config, 1, sdw_stream);
if (retval) {
Expand Down Expand Up @@ -836,18 +818,26 @@ static int rt1318_dev_suspend(struct device *dev)
return 0;
}

#define RT1318_PROBE_TIMEOUT 5000

static int rt1318_dev_resume(struct device *dev)
{
struct sdw_slave *slave = dev_to_sdw_dev(dev);
struct rt1318_sdw_priv *rt1318 = dev_get_drvdata(dev);
unsigned long time;

if (!rt1318->first_hw_init)
return 0;

if (!slave->unattach_request)
goto regmap_sync;

return 0;
time = wait_for_completion_timeout(&slave->initialization_complete,
msecs_to_jiffies(RT1318_PROBE_TIMEOUT));
if (!time) {
dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__);
return -ETIMEDOUT;
}

regmap_sync:
slave->unattach_request = 0;
Expand Down
Loading
Loading