summaryrefslogtreecommitdiff
path: root/include/uapi/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-04-22 12:07:10 +0100
committerMark Brown <broonie@kernel.org>2020-04-22 12:23:51 +0100
commitd8e25a10ef876bfb2e6ee611fbbb7f7c926a3309 (patch)
tree95f9e41cb31f8cac316823c6ff39fed6cfab54ca /include/uapi/sound
parent5bf73b1b1deca46c7459cb4d732ba8bad6da93c5 (diff)
downloadlwn-d8e25a10ef876bfb2e6ee611fbbb7f7c926a3309.tar.gz
lwn-d8e25a10ef876bfb2e6ee611fbbb7f7c926a3309.zip
ASoC: SOF: Fix build
The recent batch of SOF changes failed to build on some x86 configurations including an allmodconfig, revert the commits: e150ef4169a76 ASoC: SOF: Introduce extended manifest 371091417864b ASoC: SOF: ext_manifest: parse firmware version 7c024b948c206 ASoC: SOF: ext_manifest: parse compiler version 9e72f13ee541c ASoC: SOF: ext_manifest: parse windows to fix this. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/uapi/sound')
-rw-r--r--include/uapi/sound/sof/ext_manifest.h91
1 files changed, 0 insertions, 91 deletions
diff --git a/include/uapi/sound/sof/ext_manifest.h b/include/uapi/sound/sof/ext_manifest.h
deleted file mode 100644
index d49c47d08c7f..000000000000
--- a/include/uapi/sound/sof/ext_manifest.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
-/*
- * This file is provided under a dual BSD/GPLv2 license. When using or
- * redistributing this file, you may do so under either license.
- *
- * Copyright(c) 2020 Intel Corporation. All rights reserved.
- */
-
-/*
- * Extended manifest is a place to store metadata about firmware, known during
- * compilation time - for example firmware version or used compiler.
- * Given information are read on host side before firmware startup.
- * This part of output binary is not signed.
- */
-
-#ifndef __SOF_FIRMWARE_EXT_MANIFEST_H__
-#define __SOF_FIRMWARE_EXT_MANIFEST_H__
-
-#include <linux/const.h>
-#include <sound/sof/info.h>
-
-/* In ASCII `XMan` */
-#define SOF_EXT_MAN_MAGIC_NUMBER 0x6e614d58
-
-/* Build u32 number in format MMmmmppp */
-#define SOF_EXT_MAN_BUILD_VERSION(MAJOR, MINOR, PATH) ((uint32_t)( \
- ((MAJOR) << 24) | \
- ((MINOR) << 12) | \
- (PATH)))
-
-/* check extended manifest version consistency */
-#define SOF_EXT_MAN_VERSION_INCOMPATIBLE(host_ver, cli_ver) ( \
- ((host_ver) & GENMASK(31, 24)) != \
- ((cli_ver) & GENMASK(31, 24)))
-
-/* used extended manifest header version */
-#define SOF_EXT_MAN_VERSION SOF_EXT_MAN_BUILD_VERSION(1, 0, 0)
-
-/* extended manifest header, deleting any field breaks backward compatibility */
-struct sof_ext_man_header {
- uint32_t magic; /*< identification number, */
- /*< EXT_MAN_MAGIC_NUMBER */
- uint32_t full_size; /*< [bytes] full size of ext_man, */
- /*< (header + content + padding) */
- uint32_t header_size; /*< [bytes] makes header extensionable, */
- /*< after append new field to ext_man header */
- /*< then backward compatible won't be lost */
- uint32_t header_version; /*< value of EXT_MAN_VERSION */
- /*< not related with following content */
- uint8_t elements[]; /*< list of ext_man_elem_* elements */
-} __packed;
-
-/* Now define extended manifest elements */
-
-/* Extended manifest elements types */
-enum sof_ext_man_elem_type {
- SOF_EXT_MAN_ELEM_FW_VERSION = 0,
- SOF_EXT_MAN_ELEM_WINDOW = SOF_IPC_EXT_WINDOW,
- SOF_EXT_MAN_ELEM_CC_VERSION = SOF_IPC_EXT_CC_INFO,
-};
-
-/* extended manifest element header */
-struct sof_ext_man_elem_header {
- uint32_t type; /*< SOF_EXT_MAN_ELEM_ */
- uint32_t size; /*< in bytes, including header size */
- uint8_t blob[]; /*< type dependent content */
-} __packed;
-
-/* FW version */
-struct sof_ext_man_fw_version {
- struct sof_ext_man_elem_header hdr;
- /* use sof_ipc struct because of code re-use */
- struct sof_ipc_fw_version version;
- uint32_t flags;
-} __packed;
-
-/* extended data memory windows for IPC, trace and debug */
-struct sof_ext_man_window {
- struct sof_ext_man_elem_header hdr;
- /* use sof_ipc struct because of code re-use */
- struct sof_ipc_window ipc_window;
-} __packed;
-
-/* Used C compiler description */
-struct sof_ext_man_cc_version {
- struct sof_ext_man_elem_header hdr;
- /* use sof_ipc struct because of code re-use */
- struct sof_ipc_cc_version cc_version;
-} __packed;
-
-#endif /* __SOF_FIRMWARE_EXT_MANIFEST_H__ */