Skip to content

ext_manifest: Add sof_ipc_user_abi_version content #3003

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 1 commit into from
Aug 10, 2020
Merged

ext_manifest: Add sof_ipc_user_abi_version content #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions src/include/kernel/ext_manifest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ enum ext_man_elem_type {
EXT_MAN_ELEM_WINDOW = SOF_IPC_EXT_WINDOW,
EXT_MAN_ELEM_CC_VERSION = SOF_IPC_EXT_CC_INFO,
EXT_MAN_ELEM_PROBE_INFO = SOF_IPC_EXT_PROBE_INFO,
EXT_MAN_ELEM_DBG_ABI = SOF_IPC_EXT_USER_ABI_INFO,
};

/* FW version */
Expand Down Expand Up @@ -80,4 +81,10 @@ struct ext_man_probe_support {
struct sof_ipc_probe_support probe;
} __packed;

struct ext_man_dbg_abi {
struct ext_man_elem_header hdr;
/* use sof_ipc struct because of code re-use */
struct sof_ipc_user_abi_version dbg_abi;
} __packed;

#endif /* __KERNEL_EXT_MANIFEST_H__ */
15 changes: 14 additions & 1 deletion src/init/ext_manifest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <sof/debug/debug.h>
#include <kernel/abi.h>
#include <kernel/ext_manifest.h>

#include <user/abi_dbg.h>
#include <version.h>

const struct ext_man_fw_version ext_man_fw_ver
Expand Down Expand Up @@ -70,3 +70,16 @@ const struct ext_man_probe_support ext_man_probe
#endif
},
};

const struct ext_man_dbg_abi ext_man_dbg_info
__aligned(EXT_MAN_ALIGN) __section(".fw_metadata") = {
.hdr.type = EXT_MAN_ELEM_DBG_ABI,
.hdr.elem_size = ALIGN_UP(sizeof(struct ext_man_dbg_abi),
EXT_MAN_ALIGN),
.dbg_abi = {
.ext_hdr.hdr.size = sizeof(struct sof_ipc_user_abi_version),
.ext_hdr.hdr.cmd = SOF_IPC_FW_READY,
.ext_hdr.type = SOF_IPC_EXT_USER_ABI_INFO,
.abi_dbg_version = SOF_ABI_DBG_VERSION,
},
};