Commit e9600bc1 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: Intel: Make ADSP memory block allocation more generic 



Current block allocation is tied to block type and requestor type. Make the
allocation more generic by removing the struct module parameter and adding
a generic block allocator structure. Also pass in the list that the blocks
have to be added too in order to remove dependence on block requestor type.

ASoC: Intel: update scratch allocator to use generic block allocator

Update the scratch allocator to use the generic block allocator and calculate
total scratch buffer size.

ASoC: Intel: Add call to calculate offsets internally within the DSP.

A call to calculate internal DSP memory addresses used to allocate persistent
and scartch buffers.

ASoC: Intel: Add runtime module support.

Add support for runtime module objects that can be created for every FW
module that is parsed from the FW file. This gives a 1:N mapping between
the FW module from file and the runtime instantiations of that module.

We also need to make sure we remove every module and runtime module when
we unload the FW.

ASoC: Intel: Add DMA firmware loading support

Add support for DMA to load firmware modules to the DSP memory blocks.
Two DMA engines are supported, DesignWare and Intel MID.

ASoC: Intel: Add runtime module lookup API call

Add an API to allow quick lookup of runtime modules based on ID.

ASoC: Intel: Provide streams with dynamic module information

Remove the hard coded module paramaters and provide each module with
dynamically generated buffer information for scratch and persistent
buffers.

Signed-off-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9a80e8f5

sound/soc/intel/sst-baytrail-dsp.c

+9 −15
Original line number Diff line number Diff line
@@ -67,17 +67,12 @@ static int sst_byt_parse_module(struct sst_dsp *dsp, struct sst_fw *fw, 
{

	struct dma_block_info *block;

	struct sst_module *mod;

	struct sst_module_data block_data;

	struct sst_module_template template;

	int count;



	memset(&template, 0, sizeof(template));

	template.id = module->type;

	template.entry = module->entry_point;

	template.p.type = SST_MEM_DRAM;

	template.p.data_type = SST_DATA_P;

	template.s.type = SST_MEM_DRAM;

	template.s.data_type = SST_DATA_S;



	mod = sst_module_new(fw, &template, NULL);

	if (mod == NULL)
@@ -94,19 +89,19 @@ static int sst_byt_parse_module(struct sst_dsp *dsp, struct sst_fw *fw, 


		switch (block->type) {

		case SST_BYT_IRAM:

			block_data.offset = block->ram_offset +

			mod->offset = block->ram_offset +

					    dsp->addr.iram_offset;

			block_data.type = SST_MEM_IRAM;

			mod->type = SST_MEM_IRAM;

			break;

		case SST_BYT_DRAM:

			block_data.offset = block->ram_offset +

			mod->offset = block->ram_offset +

					    dsp->addr.dram_offset;

			block_data.type = SST_MEM_DRAM;

			mod->type = SST_MEM_DRAM;

			break;

		case SST_BYT_CACHE:

			block_data.offset = block->ram_offset +

			mod->offset = block->ram_offset +

					    (dsp->addr.fw_ext - dsp->addr.lpe);

			block_data.type = SST_MEM_CACHE;

			mod->type = SST_MEM_CACHE;

			break;

		default:

			dev_err(dsp->dev, "wrong ram type 0x%x in block0x%x\n",
@@ -114,11 +109,10 @@ static int sst_byt_parse_module(struct sst_dsp *dsp, struct sst_fw *fw, 
			return -EINVAL;

		}



		block_data.size = block->size;

		block_data.data_type = SST_DATA_M;

		block_data.data = (void *)block + sizeof(*block);

		mod->size = block->size;

		mod->data = (void *)block + sizeof(*block);



		sst_module_insert_fixed_block(mod, &block_data);

		sst_module_alloc_blocks(mod);



		block = (void *)block + sizeof(*block) + block->size;

	}

sound/soc/intel/sst-dsp-priv.h

+89 −44
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ struct sst_mem_block; 
struct sst_module;

struct sst_fw;



/* do we need to remove or keep */

#define DSP_DRAM_ADDR_OFFSET		0x400000



/*

 * DSP Operations exported by platform Audio DSP driver.

 */
@@ -67,6 +70,8 @@ struct sst_addr { 
	u32 shim_offset;

	u32 iram_offset;

	u32 dram_offset;

	u32 dsp_iram_offset;

	u32 dsp_dram_offset;

	void __iomem *lpe;

	void __iomem *shim;

	void __iomem *pci_cfg;
@@ -83,15 +88,6 @@ struct sst_mailbox { 
	size_t out_size;

};



/*

 * Audio DSP Firmware data types.

 */

enum sst_data_type {

	SST_DATA_M	= 0, /* module block data */

	SST_DATA_P	= 1, /* peristant data (text, data) */

	SST_DATA_S	= 2, /* scratch data (usually buffers) */

};



/*

 * Audio DSP memory block types.

 */
@@ -124,23 +120,6 @@ struct sst_fw { 
	void *private;			/* core doesn't touch this */

};



/*

 * Audio DSP Generic Module data.

 *

 * This is used to dsecribe any sections of persistent (text and data) and

 * scratch (buffers) of module data in ADSP memory space.

 */

struct sst_module_data {



	enum sst_mem_type type;		/* destination memory type */

	enum sst_data_type data_type;	/* type of module data */



	u32 size;		/* size in bytes */

	int32_t offset;		/* offset in FW file */

	u32 data_offset;	/* offset in ADSP memory space */

	void *data;		/* module data */

};



/*

 * Audio DSP Generic Module Template.

 *
@@ -150,15 +129,52 @@ struct sst_module_data { 
struct sst_module_template {

	u32 id;

	u32 entry;			/* entry point */

	struct sst_module_data s;	/* scratch data */

	struct sst_module_data p;	/* peristant data */

	u32 scratch_size;

	u32 persistent_size;

};



/*

 * Block Allocator - Used to allocate blocks of DSP memory.

 */

struct sst_block_allocator {

	u32 id;

	u32 offset;

	int size;

	enum sst_mem_type type;

};



/*

 * Runtime Module Instance - A module object can be instanciated multiple

 * times within the DSP FW.

 */

struct sst_module_runtime {

	struct sst_dsp *dsp;

	int id;

	struct sst_module *module;	/* parent module we belong too */



	u32 persistent_offset;		/* private memory offset */

	void *private;



	struct list_head list;

	struct list_head block_list;	/* list of blocks used */

};



/*

 * Runtime Module Context - The runtime context must be manually stored by the

 * driver prior to enter S3 and restored after leaving S3. This should really be

 * part of the memory context saved by the enter D3 message IPC ???

 */

struct sst_module_runtime_context {

	dma_addr_t dma_buffer;

	u32 *buffer;

};



/*

 * Audio DSP Generic Module.

 *

 * Each Firmware file can consist of 1..N modules. A module can span multiple

 * ADSP memory blocks. The simplest FW will be a file with 1 module.

 * ADSP memory blocks. The simplest FW will be a file with 1 module. A module

 * can be instanciated multiple times in the DSP.

 */

struct sst_module {

	struct sst_dsp *dsp;
@@ -167,10 +183,13 @@ struct sst_module { 
	/* module configuration */

	u32 id;

	u32 entry;			/* module entry point */

	u32 offset;			/* module offset in firmware file */

	s32 offset;			/* module offset in firmware file */

	u32 size;			/* module size */

	struct sst_module_data s;	/* scratch data */

	struct sst_module_data p;	/* peristant data */

	u32 scratch_size;		/* global scratch memory required */

	u32 persistent_size;		/* private memory required */

	enum sst_mem_type type;		/* destination memory type */

	u32 data_offset;		/* offset in ADSP memory space */

	void *data;			/* module data */



	/* runtime */

	u32 usage_count;		/* can be unloaded if count == 0 */
@@ -180,6 +199,7 @@ struct sst_module { 
	struct list_head block_list;	/* Module list of blocks in use */

	struct list_head list;		/* DSP list of modules */

	struct list_head list_fw;	/* FW list of modules */

	struct list_head runtime_list;	/* list of runtime module objects*/

};



/*
@@ -208,7 +228,6 @@ struct sst_mem_block { 
	struct sst_block_ops *ops;	/* block operations, if any */



	/* block status */

	enum sst_data_type data_type;	/* data type held in this block */

	u32 bytes_used;			/* bytes in use by modules */

	void *private;			/* generic core does not touch this */

	int users;			/* number of modules using this block */
@@ -253,6 +272,11 @@ struct sst_dsp { 
	struct list_head module_list;

	struct list_head fw_list;



	/* scratch buffer */

	struct list_head scratch_block_list;

	u32 scratch_offset;

	u32 scratch_size;



	/* platform data */

	struct sst_pdata *pdata;
@@ -290,18 +314,33 @@ void sst_fw_unload(struct sst_fw *sst_fw); 
/* Create/Free firmware modules */

struct sst_module *sst_module_new(struct sst_fw *sst_fw,

	struct sst_module_template *template, void *private);

void sst_module_free(struct sst_module *sst_module);

int sst_module_insert(struct sst_module *sst_module);

int sst_module_remove(struct sst_module *sst_module);

int sst_module_insert_fixed_block(struct sst_module *module,

	struct sst_module_data *data);

void sst_module_free(struct sst_module *module);

struct sst_module *sst_module_get_from_id(struct sst_dsp *dsp, u32 id);



/* allocate/free pesistent/scratch memory regions managed by drv */

struct sst_module *sst_mem_block_alloc_scratch(struct sst_dsp *dsp);

void sst_mem_block_free_scratch(struct sst_dsp *dsp,

	struct sst_module *scratch);

int sst_block_module_remove(struct sst_module *module);

int sst_module_alloc_blocks(struct sst_module *module);

int sst_module_free_blocks(struct sst_module *module);



/* Create/Free firmware module runtime instances */

struct sst_module_runtime *sst_module_runtime_new(struct sst_module *module,

	int id, void *private);

void sst_module_runtime_free(struct sst_module_runtime *runtime);

struct sst_module_runtime *sst_module_runtime_get_from_id(

	struct sst_module *module, u32 id);

int sst_module_runtime_alloc_blocks(struct sst_module_runtime *runtime,

	int offset);

int sst_module_runtime_free_blocks(struct sst_module_runtime *runtime);

int sst_module_runtime_save(struct sst_module_runtime *runtime,

	struct sst_module_runtime_context *context);

int sst_module_runtime_restore(struct sst_module_runtime *runtime,

	struct sst_module_runtime_context *context);



/* generic block allocation */

int sst_alloc_blocks(struct sst_dsp *dsp, struct sst_block_allocator *ba,

	struct list_head *block_list);

int sst_free_blocks(struct sst_dsp *dsp, struct list_head *block_list);



/* scratch allocation */

int sst_block_alloc_scratch(struct sst_dsp *dsp);

void sst_block_free_scratch(struct sst_dsp *dsp);



/* Register the DSPs memory blocks - would be nice to read from ACPI */

struct sst_mem_block *sst_mem_block_register(struct sst_dsp *dsp, u32 offset,
@@ -309,4 +348,10 @@ struct sst_mem_block *sst_mem_block_register(struct sst_dsp *dsp, u32 offset, 
	void *private);

void sst_mem_block_unregister_all(struct sst_dsp *dsp);



/* Create/Free DMA resources */

int sst_dma_new(struct sst_dsp *sst);

void sst_dma_free(struct sst_dma *dma);



u32 sst_dsp_get_offset(struct sst_dsp *dsp, u32 offset,

	enum sst_mem_type type);

#endif

sound/soc/intel/sst-dsp.c

+8 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ struct sst_dsp *sst_dsp_new(struct device *dev, 
	INIT_LIST_HEAD(&sst->free_block_list);

	INIT_LIST_HEAD(&sst->module_list);

	INIT_LIST_HEAD(&sst->fw_list);

	INIT_LIST_HEAD(&sst->scratch_block_list);



	/* Initialise SST Audio DSP */

	if (sst->ops->init) {
@@ -366,6 +367,10 @@ struct sst_dsp *sst_dsp_new(struct device *dev, 
	if (err)

		goto irq_err;



	err = sst_dma_new(sst);

	if (err)

		dev_warn(dev, "sst_dma_new failed %d\n", err);



	return sst;



irq_err:
@@ -381,6 +386,9 @@ void sst_dsp_free(struct sst_dsp *sst) 
	free_irq(sst->irq, sst);

	if (sst->ops->free)

		sst->ops->free(sst);



	if (sst->dma)

		sst_dma_free(sst->dma);

}

EXPORT_SYMBOL_GPL(sst_dsp_free);

sound/soc/intel/sst-dsp.h

+7 −0
Original line number Diff line number Diff line
@@ -245,6 +245,13 @@ void sst_memcpy_fromio_32(struct sst_dsp *sst, 
/* DSP reset & boot */

void sst_dsp_reset(struct sst_dsp *sst);

int sst_dsp_boot(struct sst_dsp *sst);

/* DMA */

int sst_dsp_dma_get_channel(struct sst_dsp *dsp, int chan_id);

void sst_dsp_dma_put_channel(struct sst_dsp *dsp);

int sst_dsp_dma_copyfrom(struct sst_dsp *sst, dma_addr_t dest_addr,

	dma_addr_t src_addr, size_t size);

int sst_dsp_dma_copyto(struct sst_dsp *sst, dma_addr_t dest_addr,

	dma_addr_t src_addr, size_t size);



/* Msg IO */

void sst_dsp_ipc_msg_tx(struct sst_dsp *dsp, u32 msg);

sound/soc/intel/sst-firmware.c

+757 −172

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE