cAVS updates #31127
Merged
cAVS updates #31127
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
lyakh
requested review from
andrewboie,
andyross,
dcpleung,
mbolivar-nordic and
nashif
as code owners
lgirdwood
approved these changes
Jan 6, 2021
mbolivar-nordic
suggested changes
Jan 6, 2021
scripts/west_commands/sign.py
Outdated
|
|
||
| if not args.quiet: | ||
| log.inf('Signing with tool {}'.format(tool_path)) | ||
|
|
||
| s = pathlib.Path(os.environ.get('ZEPHYR_BASE')) |
There was a problem hiding this comment.
Use from zephyr_ext_common import ZEPHYR_BASE at top of file instead.
scripts/west_commands/sign.py
Outdated
| bootloader = str(b / 'zephyr' / 'bootloader.elf.mod') | ||
| kernel = str(b / 'zephyr' / 'zephyr.elf.mod') | ||
| out_bin = str(b / 'zephyr' / 'zephyr.ri') | ||
| out_xman = str(b / 'zephyr' / 'zephyr.ri.xman') | ||
| out_tmp = str(b / 'zephyr' / 'zephyr.rix') | ||
| conf_path = str(s / '..' / 'modules' / 'audio' / 'sof' / 'rimage' / 'config' / conf) |
There was a problem hiding this comment.
Hard-coding the module location like this isn't so nice. How about something like storing its location in the cmake cache instead?
There was a problem hiding this comment.
@mbolivar-nordic thanks! Is this version better? It requires thesofproject/sof#3733 to go with it
There was a problem hiding this comment.
thesofproject/sof#3733 has been merged
nashif
requested changes
Jan 8, 2021
| @@ -18,8 +18,8 @@ | |||
| #define L2_SRAM_SIZE (DT_REG_SIZE(DT_NODELABEL(sram0))) | |||
|
|
|||
| #ifdef CONFIG_BOOTLOADER_MCUBOOT | |||
There was a problem hiding this comment.
hmm, why do we have mcuboot here in the first place, we never use mcuboot with those platforms, I would just remove the whole thing.
rimage dropped its "-m" parameter and switched over to using "-c" for a configuration file, including a target name. Add support for extended manifest for all cAVS versions. Signed-off-by: Guennadi Liakhovetski <[email protected]>
On cAVS 1.5, 2.0 and 2.5 platforms the correct manifest address is 0xB0032000. Signed-off-by: Guennadi Liakhovetski <[email protected]>
1. SOF doesn't have to be built in .bin format 2. don't include soc.c and soc_mp.c twice in cmake 3. remove an unused mailbox.h header Signed-off-by: Guennadi Liakhovetski <[email protected]>
Some interrupts can be enabled by the ROM, e.g. the timer interrupt. When then in Zephyr the interrupt controller is enabled, before individual interrupts are configured, interrupts can arrive and lead to the spurious interrupt handler being invoked. Fix thid by disabling all child interrupts when configuring cAVS interrupt controllers. Signed-off-by: Guennadi Liakhovetski <[email protected]>
The current unused memory calculation is broken because it doesn't take into account the stack area, allocated at the top of HP SRAM. Until this is fixed disable powering down unused RAM. Signed-off-by: Guennadi Liakhovetski <[email protected]>
Shim register location on cAVS 1.5 is different than on 1.8 and up, fix it. Signed-off-by: Guennadi Liakhovetski <[email protected]>
A configuration with CONFIG_MP_NUM_CPUS > 1 and CONFIG_IPM_CAVS_IDC not defined is valid if COMFIG_SMP is disabled. Signed-off-by: Guennadi Liakhovetski <[email protected]>
1. don't use "inline" in .c, let the compiler decide 2. remove superfluous parentheses 3. simplify a function by directly returning the result of a boolean operation Signed-off-by: Guennadi Liakhovetski <[email protected]>
RAM window layout differs between cAVS versions. Fix apparent copy-paste definition blocks to match cAVS 1.8, 2.0 and 2.5. Signed-off-by: Guennadi Liakhovetski <[email protected]>
Tigerlake H has less RAM and fewer cores. Both should be supported, selectable at the board level. For now use the H configuration as more readily available for testing. Signed-off-by: Guennadi Liakhovetski <[email protected]>
shim.h on cAVS 2.5 contains register definitions, copy-pasted from other architectures. Fix them to correct values. Signed-off-by: Guennadi Liakhovetski <[email protected]>
CONFIG_BOOTLOADER_MCUBOOT is never used in cAVS builds, remove code, supposedly supporting it. Signed-off-by: Guennadi Liakhovetski <[email protected]>
On cAVS 1.8, 2.0 and 2.5 LSPGISTS and LSPGCTL are located in a different shim register range, they cannot be accessed, using the usual SHIM_BASE offset. Signed-off-by: Guennadi Liakhovetski <[email protected]>
LPRAM_BASE and LPRAM_SIZE are duplicates of LP_SRAM_BASE and LP_SRAM_SIZE respectively. Remove them and use LP_SRAM_* consistently everywhere. Signed-off-by: Guennadi Liakhovetski <[email protected]>
Use the existing ceiling_fraction() function instead of open- coding it. Signed-off-by: Guennadi Liakhovetski <[email protected]>
zephyrbot
added
area: Interrupt Controller
area: Xtensa
This was referenced Jan 8, 2021
Closed
nashif
approved these changes
Jan 8, 2021
|
@nashif @mbolivar-nordic what's the procedure in Zephyr - should I dismiss the remaining "changes requested" review or do I have to wait for the author's acknowledgement of the fix? |
lets give @mbolivar-nordic a chance to review. |
nashif
requested changes
Jan 11, 2021
nashif
approved these changes
Jan 11, 2021
mbolivar-nordic
approved these changes
Jan 11, 2021
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.
Now that SOF base is in "master," nashif#10 is replaced with this one. The commits are identical.