| Message ID | 20211118153014.349222-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 28c916ade1bd4205958f74bb817fd3a05dbb7afc |
| Headers | show |
| Series | [5.16,regression,fix] ASoC: soc-acpi: Set mach->id field on comp_ids matches | expand |
On 11/18/21 9:30 AM, Hans de Goede wrote: > Commit dac7cbd55dca ("ASoC: Intel: soc-acpi-byt: shrink tables using > compatible IDs") and commit 959ae8215a9e ("ASoC: Intel: soc-acpi-cht: > shrink tables using compatible IDs") simplified the match tables in > soc-acpi-intel-byt-match.c and soc-acpi-intel-cht-match.c by merging > identical entries using the new .comp_ids snd_soc_acpi_mach field to > point a single entry to multiple ACPI HIDs and clearing the previously > unique per entry .id field. > > But various machine drivers from sound/soc/intel/boards rely on mach->id > in one or more ways, e.g. some drivers contain the following snippets: > > adev = acpi_dev_get_first_match_dev(mach->id, NULL, -1); > > pkg_found = snd_soc_acpi_find_package_from_hid(mach->id, ... > > if (!strncmp(snd_soc_cards[i].codec_id, mach->id, 8)) { ... > > All of which are broken by the match table shrinking. > > Make the snd_soc_acpi_mach.id field non const (the storage for the tables > already is non const) and on a comps_ids match copy the matching HID to > the id field to fix this. > > Fixes: dac7cbd55dca ("ASoC: Intel: soc-acpi-byt: shrink tables using compatible IDs") > Fixes: 959ae8215a9e ("ASoC: Intel: soc-acpi-cht: shrink tables using compatible IDs") > Suggested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Cc: Brent Lu <brent.lu@intel.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Thanks Hans for reporting and fixing this, much appreciated. Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
On Thu, 18 Nov 2021 16:30:14 +0100, Hans de Goede wrote: > Commit dac7cbd55dca ("ASoC: Intel: soc-acpi-byt: shrink tables using > compatible IDs") and commit 959ae8215a9e ("ASoC: Intel: soc-acpi-cht: > shrink tables using compatible IDs") simplified the match tables in > soc-acpi-intel-byt-match.c and soc-acpi-intel-cht-match.c by merging > identical entries using the new .comp_ids snd_soc_acpi_mach field to > point a single entry to multiple ACPI HIDs and clearing the previously > unique per entry .id field. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-linus Thanks! [1/1] ASoC: soc-acpi: Set mach->id field on comp_ids matches commit: 28c916ade1bd4205958f74bb817fd3a05dbb7afc All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h index 31f4c4f9aeea..ac0893df9c76 100644 --- a/include/sound/soc-acpi.h +++ b/include/sound/soc-acpi.h @@ -147,7 +147,7 @@ struct snd_soc_acpi_link_adr { */ /* Descriptor for SST ASoC machine driver */ struct snd_soc_acpi_mach { - const u8 id[ACPI_ID_LEN]; + u8 id[ACPI_ID_LEN]; const struct snd_soc_acpi_codecs *comp_ids; const u32 link_mask; const struct snd_soc_acpi_link_adr *links; diff --git a/sound/soc/soc-acpi.c b/sound/soc/soc-acpi.c index 2ae99b49d3f5..cbd7ea48837b 100644 --- a/sound/soc/soc-acpi.c +++ b/sound/soc/soc-acpi.c @@ -20,8 +20,10 @@ static bool snd_soc_acpi_id_present(struct snd_soc_acpi_mach *machine) if (comp_ids) { for (i = 0; i < comp_ids->num_codecs; i++) { - if (acpi_dev_present(comp_ids->codecs[i], NULL, -1)) + if (acpi_dev_present(comp_ids->codecs[i], NULL, -1)) { + strscpy(machine->id, comp_ids->codecs[i], ACPI_ID_LEN); return true; + } } }
Commit dac7cbd55dca ("ASoC: Intel: soc-acpi-byt: shrink tables using compatible IDs") and commit 959ae8215a9e ("ASoC: Intel: soc-acpi-cht: shrink tables using compatible IDs") simplified the match tables in soc-acpi-intel-byt-match.c and soc-acpi-intel-cht-match.c by merging identical entries using the new .comp_ids snd_soc_acpi_mach field to point a single entry to multiple ACPI HIDs and clearing the previously unique per entry .id field. But various machine drivers from sound/soc/intel/boards rely on mach->id in one or more ways, e.g. some drivers contain the following snippets: adev = acpi_dev_get_first_match_dev(mach->id, NULL, -1); pkg_found = snd_soc_acpi_find_package_from_hid(mach->id, ... if (!strncmp(snd_soc_cards[i].codec_id, mach->id, 8)) { ... All of which are broken by the match table shrinking. Make the snd_soc_acpi_mach.id field non const (the storage for the tables already is non const) and on a comps_ids match copy the matching HID to the id field to fix this. Fixes: dac7cbd55dca ("ASoC: Intel: soc-acpi-byt: shrink tables using compatible IDs") Fixes: 959ae8215a9e ("ASoC: Intel: soc-acpi-cht: shrink tables using compatible IDs") Suggested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Brent Lu <brent.lu@intel.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- include/sound/soc-acpi.h | 2 +- sound/soc/soc-acpi.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)