Split the "ASoC: SOF: Intel: use sof_sdw as default SDW machine driver" commit#5535
Merged
bardliao merged 4 commits intothesofproject:topic/sof-devfrom Oct 2, 2025
Merged
Conversation
This reverts commit 5f38e11. To split the commit into 2 commits. One to skip checking dummy topology and the other to use sof_sdw as default SDW machine driver.
ujfalusi
reviewed
Sep 30, 2025
sound/soc/sof/topology.c
Outdated
| if (!tplg_cnt) { | ||
| if (strstr(file, "dummy")) { | ||
| dev_err(scomp->dev, | ||
| "Function topology is required, please upgrade sof-bin\n"); |
Collaborator
There was a problem hiding this comment.
in other fail paths we refer to 'sof-firmware' package, we should use it here as well.
Monolithic topology is not needed if function topology is used. Instead of creating a dummy topology in the file system, we can skip the existence check in the kernel. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
If there is no SoundWire machine matches the existing acpi match table, get the required machine data from the acpi table and construct the link adrs and endpoints. Pass the data to the default Intel SoundWire machine driver. And we don't need to add new item to the acpi match table in common cases. We will construct a dummy topology name. The dummy topology is just used to extract the platform name for function topology and should not be used. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
bardliao
force-pushed
the
skip-dummy-tplg-check
branch
from
cc4e80e to
fce518b
Compare
ujfalusi
previously approved these changes
Sep 30, 2025
We can't use default SDW machine driver if links[link_index].adr_d is null. Also, add a paranoid check to avoid kernel NULL pointer dereference. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
ujfalusi
reviewed
Oct 1, 2025
ujfalusi
reviewed
Oct 1, 2025
ujfalusi
approved these changes
Oct 1, 2025
simontrimmer
approved these changes
Oct 1, 2025
Collaborator
Author
|
SOFCI TEST |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
To extract the skip checking dummy topology part from the "ASoC: SOF: Intel: use sof_sdw as default SDW machine driver" commit. So that we can submit the "ASoC: SOF: don't check the existence of dummy topology" commit first and use a dummy topology in the acpi match table. And no need to create an unused topology,
No code change in this PR.