Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b235c43 authored by Vinod Koul's avatar Vinod Koul Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Generate topology name for NHLT table header 

NHLT table [1] header has fields like oem_id, oem_table_id and
oem_revision. Use that to load a unique topology binary specific
to that platform

NHLT Table is documented at:
[1]: https://01.org/blogs/2016/intel-smart-sound-technology-audio-dsp



Signed-off-by: default avatarYang A Fang <yang.a.fang@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2d1419a3

sound/soc/intel/skylake/skl-nhlt.c

+34 −0
Original line number Diff line number Diff line
@@ -145,3 +145,37 @@ struct nhlt_specific_cfg 


	return NULL;

}



static void skl_nhlt_trim_space(struct skl *skl)

{

	char *s = skl->tplg_name;

	int cnt;

	int i;



	cnt = 0;

	for (i = 0; s[i]; i++) {

		if (!isspace(s[i]))

			s[cnt++] = s[i];

	}



	s[cnt] = '\0';

}



int skl_nhlt_update_topology_bin(struct skl *skl)

{

	struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt;

	struct hdac_bus *bus = ebus_to_hbus(&skl->ebus);

	struct device *dev = bus->dev;



	dev_dbg(dev, "oem_id %.6s, oem_table_id %8s oem_revision %d\n",

		nhlt->header.oem_id, nhlt->header.oem_table_id,

		nhlt->header.oem_revision);



	snprintf(skl->tplg_name, sizeof(skl->tplg_name), "%x-%.6s-%.8s-%d%s",

		skl->pci_id, nhlt->header.oem_id, nhlt->header.oem_table_id,

		nhlt->header.oem_revision, "-tplg.bin");



	skl_nhlt_trim_space(skl);



	return 0;

}

sound/soc/intel/skylake/skl-topology.c

+8 −3
Original line number Diff line number Diff line
@@ -1716,12 +1716,17 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus) 
	struct hdac_bus *bus = ebus_to_hbus(ebus);

	struct skl *skl = ebus_to_skl(ebus);



	ret = request_firmware(&fw, "dfw_sst.bin", bus->dev);

	ret = request_firmware(&fw, skl->tplg_name, bus->dev);

	if (ret < 0) {

		dev_err(bus->dev, "tplg fw %s load failed with %d\n",

				skl->tplg_name, ret);

		ret = request_firmware(&fw, "dfw_sst.bin", bus->dev);

		if (ret < 0) {

			dev_err(bus->dev, "Fallback tplg fw %s load failed with %d\n",

					"dfw_sst.bin", ret);

			return ret;

		}

	}



	/*

	 * The complete tplg for SKL is loaded as index 0, we don't use

sound/soc/intel/skylake/skl.c

+4 −0
Original line number Diff line number Diff line
@@ -573,11 +573,15 @@ static int skl_probe(struct pci_dev *pci, 
	if (err < 0)

		goto out_free;



	skl->pci_id = pci->device;



	skl->nhlt = skl_nhlt_init(bus->dev);



	if (skl->nhlt == NULL)

		goto out_free;



	skl_nhlt_update_topology_bin(skl);



	pci_set_drvdata(skl->pci, ebus);



	/* check if dsp is there */

sound/soc/intel/skylake/skl.h

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ struct skl { 
	struct list_head ppl_list;



	const char *fw_name;

	char tplg_name[64];

	unsigned short pci_id;

	const struct firmware *tplg;



	int supend_active;
@@ -96,6 +98,7 @@ void skl_nhlt_free(void *addr); 
struct nhlt_specific_cfg *skl_get_ep_blob(struct skl *skl, u32 instance,

			u8 link_type, u8 s_fmt, u8 no_ch, u32 s_rate, u8 dirn);



int skl_nhlt_update_topology_bin(struct skl *skl);

int skl_init_dsp(struct skl *skl);

void skl_free_dsp(struct skl *skl);

int skl_suspend_dsp(struct skl *skl);