Unverified Commit e984f3ef authored by Fred Oh's avatar Fred Oh Committed by Mark Brown
Browse files

ASoC: SOF: ops: add parse_platform_ext_manifest() op 



Add parse_platform_ext_manifest() op to parse platform-specific config
data in the extended manifest.

Signed-off-by: default avatarFred Oh <fred.oh@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20201127164022.2498406-2-kai.vehmanen@linux.intel.com


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

include/sound/sof/ext_manifest.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ enum sof_ext_man_elem_type { 
	SOF_EXT_MAN_ELEM_CC_VERSION		= SOF_IPC_EXT_CC_INFO,

	SOF_EXT_MAN_ELEM_DBG_ABI		= SOF_IPC_EXT_USER_ABI_INFO,

	SOF_EXT_MAN_ELEM_CONFIG_DATA		= 5, /**< ABI3.17 */

	SOF_EXT_MAN_ELEM_PLATFORM_CONFIG_DATA   = 6,

};



/* extended manifest element header */

sound/soc/sof/loader.c

+3 −0
Original line number Diff line number Diff line
@@ -330,6 +330,9 @@ static int snd_sof_fw_ext_man_parse(struct snd_sof_dev *sdev, 
		case SOF_EXT_MAN_ELEM_CONFIG_DATA:

			ret = ext_man_get_config_data(sdev, elem_hdr);

			break;

		case SOF_EXT_MAN_ELEM_PLATFORM_CONFIG_DATA:

			ret = snd_sof_dsp_parse_platform_ext_manifest(sdev, elem_hdr);

			break;

		default:

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

				 elem_hdr->type, elem_hdr->size);

sound/soc/sof/ops.h

+10 −0
Original line number Diff line number Diff line
@@ -100,6 +100,16 @@ static inline int snd_sof_dsp_post_fw_run(struct snd_sof_dev *sdev) 
	return 0;

}



/* parse platform specific extended manifest */

static inline int snd_sof_dsp_parse_platform_ext_manifest(struct snd_sof_dev *sdev,

							  const struct sof_ext_man_elem_header *hdr)

{

	if (sof_ops(sdev)->parse_platform_ext_manifest)

		return sof_ops(sdev)->parse_platform_ext_manifest(sdev, hdr);



	return 0;

}



/* misc */



/**

sound/soc/sof/sof-priv.h

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <sound/sof/pm.h>

#include <sound/sof/trace.h>

#include <uapi/sound/sof/fw.h>

#include <sound/sof/ext_manifest.h>



/* debug flags */

#define SOF_DBG_ENABLE_TRACE	BIT(0)
@@ -208,6 +209,10 @@ struct snd_sof_dsp_ops { 
	int (*pre_fw_run)(struct snd_sof_dev *sof_dev); /* optional */

	int (*post_fw_run)(struct snd_sof_dev *sof_dev); /* optional */



	/* parse platform specific extended manifest, optional */

	int (*parse_platform_ext_manifest)(struct snd_sof_dev *sof_dev,

					   const struct sof_ext_man_elem_header *hdr);



	/* DSP PM */

	int (*suspend)(struct snd_sof_dev *sof_dev,

		       u32 target_state); /* optional */