pm: use braces for .pm_base inside anonymous union initializer #69270
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes commit 25173f7 ("pm: device_runtime: Extend with synchronous runtime PM") Fixes compilation with gcc 4.2-based toolchain used by SOF for TGL generation products. As seen in the error message below, that gcc version requires braces for initialization of anonymous unions: ``` zephyr/soc/xtensa/intel_adsp/common/mem_window.c:62: error: unknown field ‘pm_base’ specified in initializer warning: missing braces around initializer warning: (near initialization for ‘__device_dts_ord_66.<anonymous>’) ``` This is a well-known and recurring issue, see past example(s) in zephyrproject-rtos#68118 As the Zephyr build is deterministic, I could easily verify that this commit makes zero .obj difference (when using the Zephyr SDK). Signed-off-by: Marc Herbert <[email protected]>
zephyrbot
added
area: Device Model
Trivial
marc-hb
added
bug
|
Tentative P1 because this is a compilation failure and it blocks SOF from upgrading Zephyr thesofproject/sof#8818 |
marc-hb
requested review from
dbaluta,
teburd,
lyakh,
lgirdwood and
iuliana-prodan
gmarull
approved these changes
Feb 21, 2024
nordic-krch
approved these changes
Feb 21, 2024
henrikbrixandersen
approved these changes
Feb 21, 2024
stephanosio
approved these changes
Feb 21, 2024
jhedberg
approved these changes
Feb 21, 2024
henrikbrixandersen
added
Release Blocker
|
Raising priority to Release Blocker as this block SOF, a key consumer of the Zephyr project. |
marc-hb
commented
Mar 19, 2024
| @@ -906,7 +906,7 @@ static inline bool z_impl_device_is_ready(const struct device *dev) | |||
| .state = (state_), \ | |||
| .data = (data_), \ | |||
| IF_ENABLED(CONFIG_DEVICE_DEPS, (.deps = (deps_),)) /**/ \ | |||
| IF_ENABLED(CONFIG_PM_DEVICE, (.pm_base = (pm_),)) /**/ \ | |||
| IF_ENABLED(CONFIG_PM_DEVICE, ({ .pm_base = (pm_),)}) /**/ \ | |||
There was a problem hiding this comment.
I got ), ) } ) in the wrong order, should have been ), } ))!
Amazingly, no compiler cares!? @keith-packard any idea why?
Fix (and more) submitted in
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes commit 25173f7 ("pm: device_runtime: Extend with synchronous runtime PM")
Fixes compilation with gcc 4.2-based toolchain used by SOF for TGL generation products. As seen in the error message below, that gcc version requires braces for initialization of anonymous unions:
This is a well-known and recurring issue, see past example(s) in #68118
As the Zephyr build is deterministic, I could easily verify that this commit makes zero .obj difference (when using the Zephyr SDK).