-
Notifications
You must be signed in to change notification settings - Fork 358
acp: add native Zephyr drivers for AMD ACP 7.X #10777
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
f7c7956
scripts: add support for ACP_7_X platform
sneha-voona 0ddd1d4
src: arch: xtensa: configs: add ACP_7_X defconfig
sneha-voona de2b148
tools: topology: add ACP_7_X topology support for native Zephyr
sneha-voona d24bafc
rimage: config: add acp_7_x toml file to support acp_7_x build
sneha-voona 9040080
amd: acp_7_x: add build support for ACP_7_X
sneha-voona 2be9e8b
platform: add ACP_7_X platform support for native Zephyr
sneha-voona 8cc4ed0
dai: acp_7_x: add SDW DMA and DAI support for ACP_7_X
sneha-voona c0867a5
volume: fix scaling function reset after max volume
sneha-voona d52f73f
acp_7_x: defconfig: enable volume component
sneha-voona 75dcc90
tools: topology: add ACP_7_X SDW volume topology
sneha-voona 48685cb
pcm_converter: add S24_4LE_MSB conversion support for IPC3
sneha-voona 686cb0d
ipc3: dai: override S24_4LE to S24_4LE_MSB for AMD SDW DAI
sneha-voona 03cf70b
acp_7_x: board: enable S24_4LE_MSB PCM converter format
sneha-voona b22582f
tools: topology: add ACP_7_X SDW 24-bit topology
sneha-voona e57b2d7
schedule: amd: set LL timer period to 500us for AMD ACP platforms
sneha-voona File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| CONFIG_ACP_7_X=y | ||
| CONFIG_HAVE_AGENT=n | ||
| CONFIG_DCACHE_LINE_SIZE_DETECT=n | ||
| CONFIG_DCACHE_LINE_SIZE=128 | ||
| CONFIG_DYNAMIC_INTERRUPTS=y | ||
| CONFIG_SHARED_INTERRUPTS=n | ||
| CONFIG_ZEPHYR_LOG=y | ||
| CONFIG_LOG_MODE_DEFERRED=n | ||
| CONFIG_LOG_MODE_MINIMAL=y | ||
| CONFIG_DMA=y | ||
| CONFIG_DMA_DOMAIN=n | ||
| CONFIG_ZEPHYR_NATIVE_DRIVERS=y | ||
| CONFIG_INTC_AMD_ACP=y | ||
| CONFIG_DMA_AMD_ACP_HOST=y | ||
| CONFIG_DMA_AMD_ACP_SDW=y | ||
| CONFIG_DMA_AMD_ACP_SDW_CHANNEL_COUNT=64 | ||
| CONFIG_DAI_AMD_SDW=y | ||
| CONFIG_AMS=n | ||
| CONFIG_WRAP_ACTUAL_POSITION=y | ||
| CONFIG_TRACE=n | ||
| CONFIG_COMP_VOLUME=y | ||
| CONFIG_COMP_SRC=n | ||
| CONFIG_COMP_FIR=n | ||
| CONFIG_COMP_IIR=n | ||
| CONFIG_COMP_DCBLOCK=n | ||
| CONFIG_COMP_CROSSOVER=n | ||
| CONFIG_COMP_DRC=n | ||
| CONFIG_COMP_MULTIBAND_DRC=n | ||
| CONFIG_COMP_TONE=n | ||
| CONFIG_COMP_KPB=n | ||
| CONFIG_MAXIM_DSM=n | ||
| CONFIG_COMP_ASRC=n | ||
| CONFIG_COMP_IGO_NR=n | ||
| CONFIG_COMP_COPIER=n | ||
| CONFIG_COMP_RTNR=n | ||
| CONFIG_COMP_ARIA=n | ||
| CONFIG_COMP_BASEFW_IPC4=n | ||
| CONFIG_COMP_UP_DOWN_MIXER=n | ||
| CONFIG_COMP_TDFB=n | ||
| CONFIG_COMP_SEL=n | ||
| CONFIG_COMP_MIXER=n | ||
| CONFIG_ASRC_SUPPORT_CONVERSION_24000_TO_08000=n | ||
| CONFIG_ASRC_SUPPORT_CONVERSION_24000_TO_16000=n | ||
| CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_08000=n | ||
| CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_11025=n | ||
| CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_12000=n | ||
| CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_16000=n | ||
| CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_22050=n | ||
| CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_24000=n | ||
| CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_32000=n | ||
| CONFIG_ASRC_SUPPORT_CONVERSION_48000_TO_44100=n | ||
| CONFIG_CORE_COUNT=1 | ||
| CONFIG_FORMAT_CONVERT_HIFI3=n |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| CONFIG_ACP_7_X=y | ||
| CONFIG_RIMAGE_SIGNING_SCHEMA="acp_7_3" | ||
| CONFIG_TRACE_CHANNEL=7 | ||
| CONFIG_WRAP_ACTUAL_POSITION=y | ||
| CONFIG_CORE_COUNT=1 | ||
| CONFIG_FORMAT_CONVERT_HIFI3=n | ||
| CONFIG_LP_SRAM=n | ||
| CONFIG_HAVE_AGENT=n | ||
| CONFIG_COMP_VOLUME=n | ||
| CONFIG_COMP_SRC=n | ||
| CONFIG_COMP_FIR=n | ||
| CONFIG_COMP_IIR=n | ||
| CONFIG_COMP_DCBLOCK=n | ||
| CONFIG_COMP_CROSSOVER=n | ||
| CONFIG_COMP_DRC=n | ||
| CONFIG_COMP_MULTIBAND_DRC=n | ||
| CONFIG_COMP_TONE=n | ||
| CONFIG_COMP_SWITCH=n | ||
| CONFIG_COMP_KPB=n | ||
| CONFIG_MAXIM_DSM=n | ||
| CONFIG_COMP_ASRC=n | ||
| CONFIG_COMP_IGO_NR=n | ||
| CONFIG_COMP_COPIER=n | ||
| CONFIG_COMP_RTNR=n | ||
| CONFIG_COMP_ARIA=n | ||
| CONFIG_COMP_BASEFW_IPC4=n | ||
| CONFIG_COMP_UP_DOWN_MIXER=n | ||
| CONFIG_COMP_TDFB=n | ||
| CONFIG_COMP_MUX=n | ||
| CONFIG_COMP_SEL=n | ||
| CONFIG_COMP_MIXER=n | ||
| CONFIG_PROBE=n |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -219,6 +219,11 @@ int volume_set_config(struct processing_module *mod, uint32_t config_id, | |
| volume_set_ramp_channel_counter(cd, cd->channels); | ||
|
|
||
| volume_ramp_check(mod); | ||
| /* Update function pointer after all volume changes */ | ||
| if (comp_dev_get_first_data_consumer(dev) != NULL) { | ||
| cd->is_passthrough = false; | ||
| set_volume_process(cd, dev, false); | ||
| } | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this isn't specific to ACP 7.x? @singalsu could you check?
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It looks like a fix for a generic issue. I think it's OK. |
||
| break; | ||
|
|
||
| case SOF_CTRL_CMD_SWITCH: | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,13 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
| add_subdirectory(common) | ||
| if(CONFIG_RENOIR OR CONFIG_VANGOGH OR CONFIG_REMBRANDT OR CONFIG_ACP_6_3 OR CONFIG_ACP_7_0) | ||
| add_subdirectory(common) | ||
| endif() | ||
| if(CONFIG_RENOIR) | ||
| add_subdirectory(renoir) | ||
| elseif(CONFIG_REMBRANDT OR CONFIG_ACP_6_3 OR CONFIG_ACP_7_0) | ||
| add_subdirectory(rembrandt) | ||
| elseif(CONFIG_VANGOGH) | ||
| add_subdirectory(vangogh) | ||
| elseif(CONFIG_ACP_7_X) | ||
| add_subdirectory(acp_7_x) | ||
| endif() |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| add_local_sources(sof | ||
| ipc.c | ||
| ) |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in latest push.
Updated XCHAL_CORE_ID in core-isa.h to "ACP73x_HiFi5_NNE_PROD" to match XTENSA_CORE. The core-isa.h value was incorrect, not the build script.