Unverified Commit 7c024b94 authored by Karol Trzcinski's avatar Karol Trzcinski Committed by Mark Brown
Browse files

ASoC: SOF: ext_manifest: parse compiler version 



The compiler version and description can be extracted from the
extended manifest content. This information known at build time
does not need to be provided in a mailbox.

Signed-off-by: default avatarKarol Trzcinski <karolx.trzcinski@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200415202816.934-8-pierre-louis.bossart@linux.intel.com


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

include/uapi/sound/sof/ext_manifest.h

+8 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ struct sof_ext_man_header { 
enum sof_ext_man_elem_type {

	SOF_EXT_MAN_ELEM_FW_VERSION		= 0,

	SOF_EXT_MAN_ELEM_WINDOW			= SOF_IPC_EXT_WINDOW,

	SOF_EXT_MAN_ELEM_CC_VERSION		= SOF_IPC_EXT_CC_INFO,

};



/* extended manifest element header */
@@ -80,4 +81,11 @@ struct sof_ext_man_window { 
	struct sof_ipc_window ipc_window;

} __packed;



/* Used C compiler description */

struct sof_ext_man_cc_version {

	struct sof_ext_man_elem_header hdr;

	/* use sof_ipc struct because of code re-use */

	struct sof_ipc_cc_version cc_version;

} __packed;



#endif /* __SOF_FIRMWARE_EXT_MANIFEST_H__ */

sound/soc/sof/loader.c

+23 −0
Original line number Diff line number Diff line
@@ -49,6 +49,14 @@ static int get_cc_info(struct snd_sof_dev *sdev, 
	const struct sof_ipc_cc_version *cc =

		container_of(ext_hdr, struct sof_ipc_cc_version, ext_hdr);



	if (sdev->cc_version) {

		if (memcmp(sdev->cc_version, cc, cc->ext_hdr.hdr.size)) {

			dev_err(sdev->dev, "error: receive diverged cc_version descriptions");

			return -EINVAL;

		}

		return 0;

	}



	dev_dbg(sdev->dev, "Firmware info: used compiler %s %d:%d:%d%s used optimization flags %s\n",

		cc->name, cc->major, cc->minor, cc->micro, cc->desc,

		cc->optim);
@@ -161,6 +169,18 @@ static int ext_man_get_windows(struct snd_sof_dev *sdev, 
	return get_ext_windows(sdev, w_ipc);

}



static int ext_man_get_cc_info(struct snd_sof_dev *sdev,

			       const struct sof_ext_man_elem_header *hdr)

{

	const struct sof_ext_man_cc_version *cc;

	const struct sof_ipc_ext_data_hdr *cc_version;



	cc = container_of(hdr, struct sof_ext_man_cc_version, hdr);

	cc_version = (const struct sof_ipc_ext_data_hdr *)&cc->cc_version;



	return get_cc_info(sdev, cc_version);

}



static ssize_t snd_sof_ext_man_size(const struct firmware *fw)

{

	const struct sof_ext_man_header *head = (void *)fw->data;
@@ -241,6 +261,9 @@ static int snd_sof_fw_ext_man_parse(struct snd_sof_dev *sdev, 
		case SOF_EXT_MAN_ELEM_WINDOW:

			ret = ext_man_get_windows(sdev, elem_hdr);

			break;

		case SOF_EXT_MAN_ELEM_CC_VERSION:

			ret = ext_man_get_cc_info(sdev, elem_hdr);

			break;

		default:

			dev_warn(sdev->dev, "warning: unknown sof_ext_man header type %d size 0x%X\n",

				 elem_hdr->type, elem_hdr->size);

CRA Git | Maintained and supported by SUSTech CRA and CCSE