p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: SOF: ipc: replace fw ready bitfield with explicit bit ordering 

Previously the structure used bitfields, which do not guarantee bit
ordering.

This change makes sure the order is clearly defined.  It also renames
and repurposes the field for general use.

Signed-off-by: Slawomir Blauciak <slawomir.blauciak@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Slawomir Blauciak 2019-06-03 11:20:32 -05:00 committed by Mark Brown
parent f865883023
commit 347d1c4b07
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/sound/sof/info.h
View File

@ -18,6 +18,14 @@
#define SOF_IPC_MAX_ELEMS 16 #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 */ /* extended data types that can be appended onto end of sof_ipc_fw_ready */
enum sof_ipc_ext_data { enum sof_ipc_ext_data {
SOF_IPC_EXT_DMA_BUFFER = 0, SOF_IPC_EXT_DMA_BUFFER = 0,
@ -49,16 +57,8 @@ struct sof_ipc_fw_ready {
uint32_t hostbox_size; uint32_t hostbox_size;
struct sof_ipc_fw_version version; struct sof_ipc_fw_version version;
/* Miscellaneous debug flags showing build/debug features enabled */ /* Miscellaneous flags */
union { uint64_t flags;
uint64_t reserved;
struct {
uint64_t build:1;
uint64_t locks:1;
uint64_t locks_verbose:1;
uint64_t gdb:1;
} bits;
} debug;
/* reserved for future use */ /* reserved for future use */
uint32_t reserved[4]; uint32_t reserved[4];

11
sound/soc/sof/ipc.c
View File

@ -763,16 +763,19 @@ int snd_sof_ipc_valid(struct snd_sof_dev *sdev)
} }
} }
if (ready->debug.bits.build) { if (ready->flags & SOF_IPC_INFO_BUILD) {
dev_info(sdev->dev, dev_info(sdev->dev,
"Firmware debug build %d on %s-%s - options:\n" "Firmware debug build %d on %s-%s - options:\n"
" GDB: %s\n" " GDB: %s\n"
" lock debug: %s\n" " lock debug: %s\n"
" lock vdebug: %s\n", " lock vdebug: %s\n",
v->build, v->date, v->time, v->build, v->date, v->time,
ready->debug.bits.gdb ? "enabled" : "disabled", ready->flags & SOF_IPC_INFO_GDB ?
ready->debug.bits.locks ? "enabled" : "disabled", "enabled" : "disabled",
ready->debug.bits.locks_verbose ? "enabled" : "disabled"); ready->flags & SOF_IPC_INFO_LOCKS ?
"enabled" : "disabled",
ready->flags & SOF_IPC_INFO_LOCKSV ?
"enabled" : "disabled");
} }
/* copy the fw_version into debugfs at first boot */ /* copy the fw_version into debugfs at first boot */