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

ASoC: SOF: amd: update mach params subsystem_rev variable 

Add pci_rev variable in acp sof driver private data structure and assign
this value to mach_params structure subsystem_rev variable.

Link: https://github.com/thesofproject/linux/pull/5068


Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801111821.18076-10-Vijendar.Mukunda@amd.com


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

sound/soc/sof/amd/acp-common.c

+3 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ static struct snd_soc_acpi_mach *amd_sof_sdw_machine_select(struct snd_sof_dev * 
				break;

		}

		if (mach && mach->link_mask) {

			mach->mach_params.subsystem_rev = acp_data->pci_rev;

			mach->mach_params.links = mach->links;

			mach->mach_params.link_mask = mach->link_mask;

			mach->mach_params.platform = dev_name(sdev->dev);
@@ -173,6 +174,7 @@ static struct snd_soc_acpi_mach *amd_sof_sdw_machine_select(struct snd_sof_dev * 
struct snd_soc_acpi_mach *amd_sof_machine_select(struct snd_sof_dev *sdev)

{

	struct snd_sof_pdata *sof_pdata = sdev->pdata;

	struct acp_dev_data *acp_data = sdev->pdata->hw_pdata;

	const struct sof_dev_desc *desc = sof_pdata->desc;

	struct snd_soc_acpi_mach *mach = NULL;
@@ -186,6 +188,7 @@ struct snd_soc_acpi_mach *amd_sof_machine_select(struct snd_sof_dev *sdev) 
		}

	}



	mach->mach_params.subsystem_rev = acp_data->pci_rev;

	sof_pdata->tplg_filename = mach->sof_tplg_filename;

	sof_pdata->fw_filename = mach->fw_filename;

sound/soc/sof/amd/acp.c

+1 −0
Original line number Diff line number Diff line
@@ -695,6 +695,7 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev) 
	pci_set_master(pci);

	adata->addr = addr;

	adata->reg_range = chip->reg_end_addr - chip->reg_start_addr;

	adata->pci_rev = pci->revision;

	mutex_init(&adata->acp_lock);

	sdev->pdata->hw_pdata = adata;

	adata->smn_dev = pci_get_device(PCI_VENDOR_ID_AMD, chip->host_bridge_id, NULL);

sound/soc/sof/amd/acp.h

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ struct acp_dev_data { 
	bool is_dram_in_use;

	bool is_sram_in_use;

	bool sdw_en_stat;

	unsigned int pci_rev;

};



void memcpy_to_scratch(struct snd_sof_dev *sdev, u32 offset, unsigned int *src, size_t bytes);