Skip to content

fixup! ASoC: SOF: Intel: wait and verifies the presence of SoundWire peripherals #6024

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

Open
bardliao wants to merge 1 commit into
base: topic/sof-dev
Choose a base branch
from
Open

fixup! ASoC: SOF: Intel: wait and verifies the presence of SoundWire peripherals #6024

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 11 additions & 16 deletions sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,8 +1320,9 @@ static struct snd_soc_acpi_mach *hda_sdw_machine_select(struct snd_sof_dev *sdev
struct snd_soc_acpi_mach *mach;
struct sof_intel_hda_dev *hdev;
struct sdw_slave *slave;
unsigned long deadline;
int link_index, link_num;
unsigned long time;
long remaining;
int amp_index = 1;
u32 link_mask = 0;
int i;
Expand Down Expand Up @@ -1428,28 +1429,22 @@ static struct snd_soc_acpi_mach *hda_sdw_machine_select(struct snd_sof_dev *sdev
* not enumerated
*/
link_mask = 0;
/* One timeout budget shared by all peripherals */
deadline = jiffies + msecs_to_jiffies(SDW_ENUM_TIMEOUT_MS);
/* Generate snd_soc_acpi_link_adr struct for each peripheral reported by the ACPI table */
for (i = 0; i < peripherals->num_peripherals; i++) {
slave = peripherals->array[i];

if (slave->dev_num_sticky)
goto skip_wait_link_enumeration;

time = wait_for_completion_timeout(&slave->enumeration_complete,
msecs_to_jiffies(SDW_ENUM_TIMEOUT_MS));
if (!time) {
dev_warn(&slave->dev, "The peripheral is not present\n");
continue;
}

/* Check if the SoundWire peripheral is present */
if (!slave->dev_num_sticky) {
dev_warn(&slave->dev, "SoundWire peripheral is not present\n");
continue;
remaining = max_t(long, (long)(deadline - jiffies), 0);
if (!wait_for_completion_timeout(&slave->enumeration_complete,
remaining) ||
!slave->dev_num_sticky) {
dev_warn(&slave->dev, "SoundWire peripheral is not present\n");
continue;
}
}

skip_wait_link_enumeration:

/* link_index = the number of used links below the current link */
link_index = hweight32(link_mask & (BIT(slave->bus->link_id) - 1));
links[link_index].adr_d = find_acpi_adr_device(sdev->dev, slave,
Expand Down
Loading