ASoC: SOF: Fix build
Subsystems (3)
Mark Brown
maintainerPATCH 1/1 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.
--- include/uapi/sound/sof/ext_manifest.h | 91 ------------- sound/soc/sof/loader.c | 189 +------------------------- 2 files changed, 2 insertions(+), 278 deletions(-) delete mode 100644 include/uapi/sound/sof/ext_manifest.h
include/uapi/sound/sof/ext_manifest.h deleted +0 -91
@@ -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__ */
sound/soc/sof/loader.c +2 -187
235 lines not on this page · raw message
Signature · 1 line
2.20.1
Quoted 9 lines · Mark Brown
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 windowsto fix this.
Not sure what happened here, these patches were held for a rather long time in the SOF tree, I haven't seen any kbuild report or email on this? We'll fix 'this' but if there's a pointer on what configurations failed that would be nice to know.
Thanks
-Pierre
Mark Brown
maintainerQuoted 9 lines · Mark Brown
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[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.8
Thanks!
[1/1] ASoC: SOF: Fix build
commit: d8e25a10ef876bfb2e6ee611fbbb7f7c926a3309
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Mark Brown
maintainerQuoted 7 lines · Pierre-Louis Bossart
Quoted 2 lines · Mark Brown
The recent batch of SOF changes failed to build on some x86 configurations including an allmodconfig, revert the commits:
Not sure what happened here, these patches were held for a rather long time in the SOF tree, I haven't seen any kbuild report or email on this?
This was reported by Stephen:
https://lore.kernel.org/linux-next/[email protected]/
with you in CC and the failures have been visible on kernelci.
Quoted 2 lines
We'll fix 'this' but if there's a pointer on what configurations failed that would be nice to know.
As the above and Stephen's report said it shows up in allmodconfig, that's the one I tested. I'm guessing it should show up in most configurations where that code gets built.
Quoted 13 lines · Mark Brown
Quoted 7 lines · Pierre-Louis Bossart
Quoted 2 lines · Mark Brown
The recent batch of SOF changes failed to build on some x86 configurations including an allmodconfig, revert the commits:
Not sure what happened here, these patches were held for a rather long time in the SOF tree, I haven't seen any kbuild report or email on this?
This was reported by Stephen:
https://lore.kernel.org/linux-next/[email protected]/
Quoted 8 lines
with you in CC and the failures have been visible on kernelci.
Quoted 2 lines
We'll fix 'this' but if there's a pointer on what configurations failed that would be nice to know.
As the above and Stephen's report said it shows up in allmodconfig, that's the one I tested. I'm guessing it should show up in most configurations where that code gets built.
Gah, yes, I missed this report. I still don't get how this error went undetected for weeks on the SOF side, will look into this. We'll resubmit the whole thing.
Mark Brown
maintainerQuoted 9 lines · Pierre-Louis Bossart
Quoted 3 lines · Mark Brown
As the above and Stephen's report said it shows up in allmodconfig, that's the one I tested. I'm guessing it should show up in most configurations where that code gets built.
Gah, yes, I missed this report. I still don't get how this error went undetected for weeks on the SOF side, will look into this. We'll resubmit the whole thing.
It smells like there's a missing patch that got dropped during upstreaming.
Quoted 14 lines · Mark Brown
Quoted 7 lines · Pierre-Louis Bossart
Quoted 2 lines · Mark Brown
The recent batch of SOF changes failed to build on some x86 configurations including an allmodconfig, revert the commits:
Not sure what happened here, these patches were held for a rather long time in the SOF tree, I haven't seen any kbuild report or email on this?
This was reported by Stephen:
https://lore.kernel.org/linux-next/[email protected]/
Quoted 8 lines
with you in CC and the failures have been visible on kernelci.
Quoted 2 lines
We'll fix 'this' but if there's a pointer on what configurations failed that would be nice to know.
As the above and Stephen's report said it shows up in allmodconfig, that's the one I tested. I'm guessing it should show up in most configurations where that code gets built.
Through a quick glance, this seems to be the error from the user header installation. See the path shown "/usr/include/sound/..." in the error message.
If uapi header needs inclusion of another header file, it must be also present in uapi/*.
Takashi
Mark Brown
maintainerQuoted 6 lines · Takashi Iwai
Through a quick glance, this seems to be the error from the user header installation. See the path shown "
/usr/include/sound/..." in the error message.If uapi header needs inclusion of another header file, it must be also present in uapi/*.
Yes, that's the patch I'm guessing is missing - we need a new UAPI header.
Quoted 7 lines · Mark Brown
Quoted 5 lines · Pierre-Louis Bossart
Quoted 3 lines · Mark Brown
As the above and Stephen's report said it shows up in allmodconfig, that's the one I tested. I'm guessing it should show up in most configurations where that code gets built.
Quoted 6 lines
Quoted 3 lines
Gah, yes, I missed this report. I still don't get how this error went undetected for weeks on the SOF side, will look into this. We'll resubmit the whole thing.
It smells like there's a missing patch that got dropped during upstreaming.
No, this breaks with the SOF tree as well. Clearly our CI setup is not good enough.