Skip to content

ipc: replace fw ready bitfield with explicit bit ordering #1418

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
jajanusz merged 1 commit into from
May 14, 2019
Merged

ipc: replace fw ready bitfield with explicit bit ordering #1418

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
31 changes: 13 additions & 18 deletions src/include/sof/debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,13 @@

#ifdef CONFIG_DEBUG

#define DEBUG_SET_FW_READY_FLAGS \
{ \
.bits = { \
.build = 1, \
.locks = DEBUG_LOCKS, \
.locks_verbose = DEBUG_LOCKS_VERBOSE, \
.gdb = DEBUG_GDB, \
}, \
}
#define DEBUG_SET_FW_READY_FLAGS \
( \
SOF_IPC_INFO_BUILD | \
(DEBUG_LOCKS ? SOF_IPC_INFO_LOCKS : 0) | \
(DEBUG_LOCKS_VERBOSE ? SOF_IPC_INFO_LOCKSV : 0) | \
(DEBUG_GDB ? SOF_IPC_INFO_GDB : 0) \
)

/* dump file and line to start of mailbox or shared memory */
#define dbg() \
Expand Down Expand Up @@ -140,15 +138,12 @@

#else

#define DEBUG_SET_FW_READY_FLAGS \
{ \
.bits = { \
.build = 0, \
.locks = DEBUG_LOCKS, \
.locks_verbose = DEBUG_LOCKS_VERBOSE, \
.gdb = DEBUG_GDB, \
}, \
}
#define DEBUG_SET_FW_READY_FLAGS \
( \
(DEBUG_LOCKS ? SOF_IPC_INFO_LOCKS : 0) | \
(DEBUG_LOCKS_VERBOSE ? SOF_IPC_INFO_LOCKSV : 0) | \
(DEBUG_GDB ? SOF_IPC_INFO_GDB : 0) \
)

#define dbg()
#define dbg_at(__x)
Expand Down
20 changes: 10 additions & 10 deletions src/include/uapi/ipc/info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@

#define SOF_IPC_MAX_ELEMS 16

/*
* Firmware boot info flag bits (64-bit)
*/
#define SOF_IPC_INFO_BUILD BIT(0)
#define SOF_IPC_INFO_LOCKS BIT(1)
#define SOF_IPC_INFO_LOCKSV BIT(2)
#define SOF_IPC_INFO_GDB BIT(3)

/* extended data types that can be appended onto end of sof_ipc_fw_ready */
enum sof_ipc_ext_data {
SOF_IPC_EXT_DMA_BUFFER = 0,
Expand Down Expand Up @@ -79,16 +87,8 @@ struct sof_ipc_fw_ready {
uint32_t hostbox_size;
struct sof_ipc_fw_version version;

/* Miscellaneous debug flags showing build/debug features enabled */
union {
uint64_t reserved;
struct {
uint64_t build:1;
uint64_t locks:1;
uint64_t locks_verbose:1;
uint64_t gdb:1;
} bits;
} debug;
/* Miscellaneous flags */
uint64_t flags;

/* reserved for future use */
uint32_t reserved[4];
Expand Down
2 changes: 1 addition & 1 deletion src/platform/baytrail/platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ static const struct sof_ipc_fw_ready ready
.tag = SOF_TAG,
.abi_version = SOF_ABI_VERSION,
},
.debug = DEBUG_SET_FW_READY_FLAGS
.flags = DEBUG_SET_FW_READY_FLAGS
};

#define NUM_BYT_WINDOWS 6
Expand Down
2 changes: 1 addition & 1 deletion src/platform/haswell/platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ static const struct sof_ipc_fw_ready ready
.tag = SOF_TAG,
.abi_version = SOF_ABI_VERSION,
},
.debug = DEBUG_SET_FW_READY_FLAGS,
.flags = DEBUG_SET_FW_READY_FLAGS,
};

#define NUM_HSW_WINDOWS 6
Expand Down
2 changes: 1 addition & 1 deletion src/platform/intel/cavs/platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static const struct sof_ipc_fw_ready ready
.tag = SOF_TAG,
.abi_version = SOF_ABI_VERSION,
},
.debug = DEBUG_SET_FW_READY_FLAGS,
.flags = DEBUG_SET_FW_READY_FLAGS,
};

#if defined(CONFIG_MEM_WND)
Expand Down