OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ext_man: Remove dictionary elements counter from ABI for ext_man_config_data 

This value shouldn't be included in any ABI header, because it may
vary between firmware configurations.
This change makes header file more similar to version provided by kernel.

Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
This commit is contained in:
Karol Trzcinski 2020-12-15 16:48:41 +01:00 committed by Liam Girdwood
parent d6b9f1f795
commit 28d06341bc
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/kernel/ext_manifest.h
View File

@ -95,7 +95,7 @@ struct ext_man_dbg_abi {
struct ext_man_config_data { struct ext_man_config_data {
struct ext_man_elem_header hdr; struct ext_man_elem_header hdr;
struct config_elem elems[EXT_MAN_CONFIG_LAST_ELEM]; struct config_elem elems[];
} __packed; } __packed;
#endif /* __KERNEL_EXT_MANIFEST_H__ */ #endif /* __KERNEL_EXT_MANIFEST_H__ */

6
src/init/ext_manifest.c
View File

@ -85,10 +85,14 @@ const struct ext_man_dbg_abi ext_man_dbg_info
}, },
}; };
/* increment this value after adding any element to ext_man_config dictionary */
#define CONFIG_ELEM_CNT (EXT_MAN_CONFIG_LAST_ELEM - 1)
const struct ext_man_config_data ext_man_config const struct ext_man_config_data ext_man_config
__aligned(EXT_MAN_ALIGN) __section(".fw_metadata") = { __aligned(EXT_MAN_ALIGN) __section(".fw_metadata") = {
.hdr.type = EXT_MAN_ELEM_CONFIG_DATA, .hdr.type = EXT_MAN_ELEM_CONFIG_DATA,
.hdr.elem_size = ALIGN_UP(sizeof(struct ext_man_config_data), .hdr.elem_size = ALIGN_UP(sizeof(struct ext_man_config_data) +
sizeof(struct config_elem) * CONFIG_ELEM_CNT,
EXT_MAN_ALIGN), EXT_MAN_ALIGN),
.elems = { .elems = {
{EXT_MAN_CONFIG_IPC_MSG_SIZE, SOF_IPC_MSG_MAX_SIZE}, {EXT_MAN_CONFIG_IPC_MSG_SIZE, SOF_IPC_MSG_MAX_SIZE},