Skip to content

Add Init config type for modules #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 3 commits into from
Feb 9, 2023
Merged

Add Init config type for modules #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6948fba
src: adsp_config: Use reserved bits for module init config
ranj063 Feb 8, 2023
c1c04f1
config: tgl-cavs: set init_config for smart test
ranj063 Feb 8, 2023
587603e
config: mtl: Set init_config for smart amp
ranj063 Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/mtl.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ count = 16
instance_count = "1"
domain_types = "0"
load_type = "0"
init_config = "1"
module_type = "13"
auto_start = "0"
sched_caps = [1, 0x00008000]
Expand Down
1 change: 1 addition & 0 deletions config/tgl-cavs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ count = 12
domain_types = "0"
load_type = "0"
module_type = "13"
init_config = "1"
auto_start = "0"
sched_caps = [1, 0x00008000]

Expand Down
5 changes: 5 additions & 0 deletions src/adsp_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2193,6 +2193,11 @@ static int parse_module(const toml_table_t *toml, struct parse_ctx *pctx,
if (ret < 0)
return err_key_parse("load_type", NULL);

mod_man->type.init_config = parse_uint32_hex_key(mod_entry, &ctx_entry,
"init_config", 1, &ret);
if (ret < 0)
return err_key_parse("init_config", NULL);

mod_man->type.auto_start = parse_uint32_hex_key(mod_entry, &ctx_entry,
"auto_start", 1, &ret);
if (ret < 0)
Expand Down
7 changes: 6 additions & 1 deletion src/include/rimage/sof/user/manifest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,18 @@
#define SOF_MAN_MOD_TYPE_BUILTIN 0
#define SOF_MAN_MOD_TYPE_MODULE 1

/* module init config */
#define SOF_MAN_MOD_INIT_CONFIG_BASE_CFG 0 /* Base config only */
#define SOF_MAN_MOD_INIT_CONFIG_BASE_CFG_WITH_EXT 1 /* Base config with extension */

struct sof_man_module_type {
uint32_t load_type:4; /* SOF_MAN_MOD_TYPE_ */
uint32_t auto_start:1;
uint32_t domain_ll:1;
uint32_t domain_dp:1;
uint32_t lib_code:1;
uint32_t rsvd_:24;
uint32_t init_config:4; /* SOF_MAN_MOD_INIT_CONFIG_ */
uint32_t rsvd_:20;
Copy link
Contributor

@kv2019i kv2019i Feb 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be added to sof-docs as well (follow-up to thesofproject/sof-docs#451 ).

Copy link
Member

@lgirdwood lgirdwood Feb 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ack - lets get it in the docs.

};

/* segment flags.type */
Expand Down