Unverified Commit 60b7c1ba authored by Karol Trzcinski's avatar Karol Trzcinski Committed by Mark Brown
Browse files

ASoC: SOF: ext_manifest: Parse debug ABI version 



The debug ABI 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>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200825235854.1588034-4-ranjani.sridharan@linux.intel.com


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

include/sound/sof/ext_manifest.h

+7 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 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,

	SOF_EXT_MAN_ELEM_DBG_ABI		= SOF_IPC_EXT_USER_ABI_INFO,

};



/* extended manifest element header */
@@ -92,4 +93,10 @@ struct sof_ext_man_cc_version { 
	struct sof_ipc_cc_version cc_version;

} __packed;



struct ext_man_dbg_abi {

	struct sof_ext_man_elem_header hdr;

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

	struct sof_ipc_user_abi_version dbg_abi;

} __packed;



#endif /* __SOF_FIRMWARE_EXT_MANIFEST_H__ */

sound/soc/sof/loader.c

+19 −0
Original line number Diff line number Diff line
@@ -176,6 +176,22 @@ static int ext_man_get_cc_info(struct snd_sof_dev *sdev, 
	return get_cc_info(sdev, &cc->cc_version.ext_hdr);

}



static int ext_man_get_dbg_abi_info(struct snd_sof_dev *sdev,

				    const struct sof_ext_man_elem_header *hdr)

{

	const struct ext_man_dbg_abi *dbg_abi =

		container_of(hdr, struct ext_man_dbg_abi, hdr);



	if (sdev->first_boot)

		dev_dbg(sdev->dev,

			"Firmware: DBG_ABI %d:%d:%d\n",

			SOF_ABI_VERSION_MAJOR(dbg_abi->dbg_abi.abi_dbg_version),

			SOF_ABI_VERSION_MINOR(dbg_abi->dbg_abi.abi_dbg_version),

			SOF_ABI_VERSION_PATCH(dbg_abi->dbg_abi.abi_dbg_version));



	return 0;

}



static ssize_t snd_sof_ext_man_size(const struct firmware *fw)

{

	const struct sof_ext_man_header *head;
@@ -255,6 +271,9 @@ static int snd_sof_fw_ext_man_parse(struct snd_sof_dev *sdev, 
		case SOF_EXT_MAN_ELEM_CC_VERSION:

			ret = ext_man_get_cc_info(sdev, elem_hdr);

			break;

		case SOF_EXT_MAN_ELEM_DBG_ABI:

			ret = ext_man_get_dbg_abi_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);