Skip to content

Commit 1515627

Browse files
committed
ASoC: SOF: make sof_ipc_cc_version to fixed length
Align struct sof_ipc_cc_version to firmware definition in SOF ABI 3.15.0. The struct definition was changed due to errors in FW build. The Cadence XCC compiler produces incorrect linkage section sizes, when a variable length array is used in the compiler version struct. The firmware definition was changed to a fixed 32 byte compiler description string. This length covers all released firmware binaries and thus only a minor ABI change is needed. As the same structure is used in IPC messages between driver and firmware, the kernel needs to be aligned to firmware change. Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
1 parent 8fc1902 commit 1515627

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

include/sound/sof/info.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ struct sof_ipc_cc_version {
112112

113113
uint8_t name[16]; /* null terminated compiler name */
114114
uint8_t optim[4]; /* null terminated compiler -O flag value */
115-
uint8_t desc[]; /* null terminated compiler description */
115+
uint8_t desc[32]; /* null terminated compiler description */
116116
} __packed;
117117

118118
/* extended data: Probe setup */

include/uapi/sound/sof/abi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
/* SOF ABI version major, minor and patch numbers */
2828
#define SOF_ABI_MAJOR 3
29-
#define SOF_ABI_MINOR 14
29+
#define SOF_ABI_MINOR 15
3030
#define SOF_ABI_PATCH 0
3131

3232
/* SOF ABI version number. Format within 32bit word is MMmmmppp */

0 commit comments

Comments
 (0)