Unverified Commit 8527ecc6 authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: amd: acp: modify config flag read logic 



Modify acp config flag read logic from ACP v7.0 onwards.
Instead of reading from DMI table match entry, read the
config flag value from BIOS ACPI table.
This will remove updating DMI table when new platform support
is added.
Use FLAG_AMD_LEGACY_ONLY_DMIC flag as default one.

Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://lore.kernel.org/r/20231207045505.1519151-1-Vijendar.Mukunda@amd.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ce17aa4c

sound/soc/amd/acp-config.c

+21 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include "../sof/amd/acp.h"

#include "mach-config.h"



#define ACP_7_0_REV	0x70



static int acp_quirk_data;



static const struct config_entry config_table[] = {
@@ -145,15 +147,33 @@ static const struct config_entry config_table[] = { 
	},

};



static int snd_amd_acp_acpi_find_config(struct pci_dev *pci)

{

	const union acpi_object *obj;

	int acp_flag = FLAG_AMD_LEGACY_ONLY_DMIC;



	if (!acpi_dev_get_property(ACPI_COMPANION(&pci->dev), "acp-audio-config-flag",

				   ACPI_TYPE_INTEGER, &obj))

		acp_flag = obj->integer.value;



	return acp_flag;

}



int snd_amd_acp_find_config(struct pci_dev *pci)

{

	const struct config_entry *table = config_table;

	u16 device = pci->device;

	int i;



	/* Do not enable FLAGS on older platforms with Rev id zero */

	/* Do not enable FLAGS on older platforms with Rev Id zero

	 * For platforms which has ACP 7.0 or higher, read the acp

	 * config flag from BIOS ACPI table and for older platforms

	 * read it from DMI tables.

	 */

	if (!pci->revision)

		return 0;

	else if (pci->revision >= ACP_7_0_REV)

		return snd_amd_acp_acpi_find_config(pci);



	for (i = 0; i < ARRAY_SIZE(config_table); i++, table++) {

		if (table->device != device)