common.h: restore basic ALIGN() macro compatible with assembly #3747
Conversation
This file contains hidden or 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
commit 39266ca ("core: assure alignment is only done on power of 2 values") changed the alignment macros, they now use C code to perform a sanity check. This broke ALIGN() usage in platform/suecreek/include/platform/lib/memory.h in two different ways: 1. it broke static initializers in platform/suecreek/base_module.c because these can't use statement-expressions. This could have been fixed by simply switching to ALIGN_UP_COMPILE(), BUT: 2. memory.h files are also included in assembly. Also note memory.h values are copied unprocessed to linker scripts that require the ALIGN() spelling. For these reasons ALIGN() needs to be switched back to a "dumb" macro. Preserve the sanity checks just added in alloc.c and pm_memory.c by switching them to the new and smarter ALIGN_UP() macro. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
marc-hb
requested review from
dbaluta,
lbetlej,
lgirdwood,
libinyang,
mmaka1 and
plbossart
as code owners
lyakh
approved these changes
Jan 15, 2021
Member
|
@marc-hb thanks, probably a result of travis CI being ignored when out of resources now. What is the ETA for travis build checks on Jenkins now ? |
lgirdwood
approved these changes
Jan 15, 2021
Collaborator
Author
|
Travis doesn't build sue creek, not sure why not. Sue creek was the only platform using ALIGN() in assembly, not sure why either. |
Collaborator
Author
|
This removed checks in (at least) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
commit 39266ca ("core: assure alignment is only done on power of 2
values") changed the alignment macros, they now use C code to perform a
sanity check. This broke ALIGN() usage in
platform/suecreek/include/platform/lib/memory.h in two different ways:
it broke static initializers in platform/suecreek/base_module.c
because these can't use statement-expressions. This could have been
fixed by simply switching to ALIGN_UP_COMPILE(), BUT:
memory.h files are also included in assembly.
Also note memory.h values are copied unprocessed to linker scripts that
require the ALIGN() spelling.
For these reasons ALIGN() needs to be switched back to a "dumb" macro.
Preserve the sanity checks just added in alloc.c and pm_memory.c by
switching them to the new and smarter ALIGN_UP() macro.
Signed-off-by: Marc Herbert marc.herbert@intel.com