Repository navigation
[not upstream] ASoC: SOF: amd: fix upstream-20261015 merge for load_f… - #5995
Merged
bardliao merged 1 commit intoOct 22, 2026
Conversation
…irmware op The upstream-20261015 merge (ec69dd1) brought in commit cec3598 ("ASoC: SOF: amd: add ASP carveout firmware loading for ACP7.B/7.F"), which adds acp7x_load_firmware_carveout() using the upstream one-argument load_firmware op signature: int (*load_firmware)(struct snd_sof_dev *sof_dev); In sof-dev the op signature has been changed by commit 651b1da ("ASoC: SOF: Modify the signature of load_firmware op") to take the firmware filename as well. That change is not upstream, so the merge applied cleanly, but the result fails to build: sound/soc/sof/amd/acp7x.c: In function 'sof_acp7x_ops_init': sound/soc/sof/amd/acp7x.c:180:45: error: assignment to 'int (*)(struct snd_sof_dev *, const char *)' from incompatible pointer type 'int (*)(struct snd_sof_dev *)' [-Wincompatible-pointer-types] Add the fw_name parameter to acp7x_load_firmware_carveout() to match the sof-dev op signature. Like acp_sof_load_signed_firmware(), the parameter is unused, as the code and data binary names are taken from adata->fw_code_bin and adata->fw_data_bin. This patch is needed only in sof-dev for as long as the load_firmware op signature change is not upstream. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
There was a problem hiding this comment.
🟢 Approval recommended
The matching signature updates resolve the callback type mismatch without changing runtime behavior.
No open issues 🎉
What changed in this PR
Fixes the sof-dev merge build failure by aligning the AMD carveout firmware loader with the two-argument load_firmware callback.
Changes:
- Adds
const char *fw_nameto the loader declaration and definition. - Preserves firmware-loading behavior; the new parameter is intentionally unused.
| File | Description |
|---|---|
| sound/soc/sof/amd/acp.h | Updates the loader declaration. |
| sound/soc/sof/amd/acp_asp_mailbox.c | Updates the loader definition to match. |
Review effort: Balanced
bardliao
approved these changes
Oct 22, 2026
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
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.
…irmware op
The upstream-20261015 merge (ec69dd1) brought in commit cec3598 ("ASoC: SOF: amd: add ASP carveout firmware loading for ACP7.B/7.F"), which adds acp7x_load_firmware_carveout() using the upstream one-argument load_firmware op signature:
int (*load_firmware)(struct snd_sof_dev *sof_dev);
In sof-dev the op signature has been changed by
commit 651b1da ("ASoC: SOF: Modify the signature of load_firmware op") to take the firmware filename as well. That change is not upstream, so the merge applied cleanly, but the result fails to build:
sound/soc/sof/amd/acp7x.c: In function 'sof_acp7x_ops_init':
sound/soc/sof/amd/acp7x.c:180:45: error: assignment to 'int (*)(struct snd_sof_dev *, const char )' from incompatible pointer type 'int ()(struct snd_sof_dev *)' [-Wincompatible-pointer-types]
Add the fw_name parameter to acp7x_load_firmware_carveout() to match the sof-dev op signature. Like acp_sof_load_signed_firmware(), the parameter is unused, as the code and data binary names are taken from adata->fw_code_bin and adata->fw_data_bin.
This patch is needed only in sof-dev for as long as the load_firmware op signature change is not upstream.