Skip to content

Commit 2436222

Browse files
Sivasubramanian678Sivasubramanian678
committed
Zephyr: Add changes for ACP 6.0 non native zephyr support
This adds changes for ACP 6.0 non native zephyr support. Signed-off-by: Sivasubramanian <sravisar@amd.com>
1 parent 7a699f4 commit 2436222

File tree

8 files changed

+36
-30
lines changed

8 files changed

+36
-30
lines changed

‎src/drivers/amd/common/acp_bt_dai.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
//
3-
//Copyright(c) 2023 AMD. All rights reserved.
3+
//Copyright(c) 2023, 2026 AMD. All rights reserved.
44
//
55
//Author: Basavaraj Hiregoudar <basavaraj.hiregoudar@amd.com>
66
// SaiSurya, Ch <saisurya.chakkaveeravenkatanaga@amd.com>
7+
// Sivasubramanian <sravisar@amd.com>
78

89
#include <sof/audio/component.h>
910
#include <sof/drivers/acp_dai_dma.h>
@@ -79,8 +80,8 @@ const struct dai_driver acp_btdai_driver = {
7980
.type = SOF_DAI_AMD_BT,
8081
.uid = SOF_UUID(btdai_uuid),
8182
.tctx = &btdai_tr,
82-
.dma_dev = DMA_DEV_BT,
83-
.dma_caps = DMA_CAP_BT,
83+
.dma_dev = SOF_DMA_DEV_BT,
84+
.dma_caps = SOF_DMA_CAP_BT,
8485
.ops = {
8586
.trigger = btdai_trigger,
8687
.set_config = btdai_set_config,

‎src/drivers/amd/common/acp_dmic_dai.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
//
3-
//Copyright(c) 2023 AMD. All rights reserved.
3+
//Copyright(c) 2023, 2026 AMD. All rights reserved.
44
//
55
// Author: Basavaraj Hiregoudar <basavaraj.hiregoudar@amd.com>
66
// SaiSurya, Ch <saisurya.chakkaveeravenkatanaga@amd.com>
7+
// Sivasubramanian <sravisar@amd.com>
78

89
#include <sof/audio/component.h>
910
#include <sof/drivers/acp_dai_dma.h>
@@ -157,8 +158,8 @@ const struct dai_driver acp_dmic_dai_driver = {
157158
.type = SOF_DAI_AMD_DMIC,
158159
.uid = SOF_UUID(acp_dmic_dai_uuid),
159160
.tctx = &acp_dmic_dai_tr,
160-
.dma_dev = DMA_DEV_DMIC,
161-
.dma_caps = DMA_CAP_DMIC,
161+
.dma_dev = SOF_DMA_DEV_DMIC,
162+
.dma_caps = SOF_DMA_CAP_DMIC,
162163
.ops = {
163164
.trigger = acp_dmic_dai_trigger,
164165
.set_config = acp_dmic_dai_set_config,

‎src/drivers/amd/rembrandt/acp_hs_dai.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
//
3-
//Copyright(c) 2022 AMD. All rights reserved.
3+
//Copyright(c) 2022, 2026 AMD. All rights reserved.
44
//
55
//Author: Basavaraj Hiregoudar <basavaraj.hiregoudar@amd.com>
66
// Bala Kishore <balakishore.pati@amd.com>
7+
// Sivasubramanian <sravisar@amd.com>
78

89
#include <sof/audio/component.h>
910
#include <sof/drivers/acp_dai_dma.h>
@@ -193,8 +194,8 @@ const struct dai_driver acp_hsdai_driver = {
193194
.type = SOF_DAI_AMD_HS,
194195
.uid = SOF_UUID(hsdai_uuid),
195196
.tctx = &hsdai_tr,
196-
.dma_dev = DMA_DEV_SP,
197-
.dma_caps = DMA_CAP_SP,
197+
.dma_dev = SOF_DMA_DEV_SP,
198+
.dma_caps = SOF_DMA_CAP_SP,
198199
.ops = {
199200
.trigger = hsdai_trigger,
200201
.set_config = hsdai_set_config,

‎src/drivers/amd/rembrandt/acp_sp_dai.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
//
3-
//Copyright(c) 2022 AMD. All rights reserved.
3+
//Copyright(c) 2022, 2026 AMD. All rights reserved.
44
//
55
//Author: Basavaraj Hiregoudar <basavaraj.hiregoudar@amd.com>
66
// Bala Kishore <balakishore.pati@amd.com>
7+
// Sivasubramanian <sravisar@amd.com>
78

89
#include <sof/audio/component.h>
910
#include <sof/drivers/acp_dai_dma.h>
@@ -79,8 +80,8 @@ const struct dai_driver acp_spdai_driver = {
7980
.type = SOF_DAI_AMD_SP,
8081
.uid = SOF_UUID(spdai_uuid),
8182
.tctx = &spdai_tr,
82-
.dma_dev = DMA_DEV_SP,
83-
.dma_caps = DMA_CAP_SP,
83+
.dma_dev = SOF_DMA_DEV_SP,
84+
.dma_caps = SOF_DMA_CAP_SP,
8485
.ops = {
8586
.trigger = spdai_trigger,
8687
.set_config = spdai_set_config,

‎src/platform/amd/rembrandt/include/arch/xtensa/config/tie-asm.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
.ifeq (XTHAL_SAS_TIE | XTHAL_SAS_NOCC | XTHAL_SAS_CALR) & ~(\select)
167167
xchal_sa_align \ptr, 0, 0, 16, 16
168168
ae_s64.i aed0, \ptr, .Lxchal_ofs_+56
169-
addi.a \ptr, \ptr, 64
169+
addi \ptr, \ptr, 64
170170
ae_s64.i aed1, \ptr, .Lxchal_ofs_+0
171171
ae_s64.i aed2, \ptr, .Lxchal_ofs_+8
172172
ae_s64.i aed3, \ptr, .Lxchal_ofs_+16
@@ -175,7 +175,7 @@
175175
ae_s64.i aed6, \ptr, .Lxchal_ofs_+40
176176
ae_s64.i aed7, \ptr, .Lxchal_ofs_+48
177177
ae_s64.i aed8, \ptr, .Lxchal_ofs_+56
178-
addi.a \ptr, \ptr, 64
178+
addi \ptr, \ptr, 64
179179
ae_s64.i aed9, \ptr, .Lxchal_ofs_+0
180180
ae_s64.i aed10, \ptr, .Lxchal_ofs_+8
181181
ae_s64.i aed11, \ptr, .Lxchal_ofs_+16
@@ -184,7 +184,7 @@
184184
ae_s64.i aed14, \ptr, .Lxchal_ofs_+40
185185
ae_s64.i aed15, \ptr, .Lxchal_ofs_+48
186186
ae_s64.i aed16, \ptr, .Lxchal_ofs_+56
187-
addi.a \ptr, \ptr, 64
187+
addi \ptr, \ptr, 64
188188
ae_s64.i aed17, \ptr, .Lxchal_ofs_+0
189189
ae_s64.i aed18, \ptr, .Lxchal_ofs_+8
190190
ae_s64.i aed19, \ptr, .Lxchal_ofs_+16
@@ -193,7 +193,7 @@
193193
ae_s64.i aed22, \ptr, .Lxchal_ofs_+40
194194
ae_s64.i aed23, \ptr, .Lxchal_ofs_+48
195195
ae_s64.i aed24, \ptr, .Lxchal_ofs_+56
196-
addi.a \ptr, \ptr, 64
196+
addi \ptr, \ptr, 64
197197
ae_s64.i aed25, \ptr, .Lxchal_ofs_+0
198198
ae_s64.i aed26, \ptr, .Lxchal_ofs_+8
199199
ae_s64.i aed27, \ptr, .Lxchal_ofs_+16
@@ -209,12 +209,12 @@
209209
s8i \at1, \ptr, .Lxchal_ofs_+58
210210
ae_movae \at1, aep3
211211
s8i \at1, \ptr, .Lxchal_ofs_+59
212-
addi.a \ptr, \ptr, 64
212+
addi \ptr, \ptr, 64
213213
ae_salign128.i u0, \ptr, .Lxchal_ofs_+0
214214
ae_salign128.i u1, \ptr, .Lxchal_ofs_+16
215215
ae_salign128.i u2, \ptr, .Lxchal_ofs_+32
216216
ae_salign128.i u3, \ptr, .Lxchal_ofs_+48
217-
addi.a \ptr, \ptr, -320
217+
addi \ptr, \ptr, -320
218218
ae_movdrzbvc aed0 // ureg AE_ZBIASV8C
219219
ae_s64.i aed0, \ptr, .Lxchal_ofs_+0 + 0
220220
ae_movvfcrfsr aed0 // ureg FCR_FSR
@@ -286,7 +286,7 @@
286286
l32i \at1, \ptr, .Lxchal_ofs_+52
287287
wur.ae_cend2 \at1 // ureg 251
288288
ae_l64.i aed0, \ptr, .Lxchal_ofs_+56
289-
addi.a \ptr, \ptr, 64
289+
addi \ptr, \ptr, 64
290290
ae_l64.i aed1, \ptr, .Lxchal_ofs_+0
291291
ae_l64.i aed2, \ptr, .Lxchal_ofs_+8
292292
ae_l64.i aed3, \ptr, .Lxchal_ofs_+16
@@ -295,7 +295,7 @@
295295
ae_l64.i aed6, \ptr, .Lxchal_ofs_+40
296296
ae_l64.i aed7, \ptr, .Lxchal_ofs_+48
297297
ae_l64.i aed8, \ptr, .Lxchal_ofs_+56
298-
addi.a \ptr, \ptr, 64
298+
addi \ptr, \ptr, 64
299299
ae_l64.i aed9, \ptr, .Lxchal_ofs_+0
300300
ae_l64.i aed10, \ptr, .Lxchal_ofs_+8
301301
ae_l64.i aed11, \ptr, .Lxchal_ofs_+16
@@ -304,7 +304,7 @@
304304
ae_l64.i aed14, \ptr, .Lxchal_ofs_+40
305305
ae_l64.i aed15, \ptr, .Lxchal_ofs_+48
306306
ae_l64.i aed16, \ptr, .Lxchal_ofs_+56
307-
addi.a \ptr, \ptr, 64
307+
addi \ptr, \ptr, 64
308308
ae_l64.i aed17, \ptr, .Lxchal_ofs_+0
309309
ae_l64.i aed18, \ptr, .Lxchal_ofs_+8
310310
ae_l64.i aed19, \ptr, .Lxchal_ofs_+16
@@ -313,15 +313,15 @@
313313
ae_l64.i aed22, \ptr, .Lxchal_ofs_+40
314314
ae_l64.i aed23, \ptr, .Lxchal_ofs_+48
315315
ae_l64.i aed24, \ptr, .Lxchal_ofs_+56
316-
addi.a \ptr, \ptr, 64
316+
addi \ptr, \ptr, 64
317317
ae_l64.i aed25, \ptr, .Lxchal_ofs_+0
318318
ae_l64.i aed26, \ptr, .Lxchal_ofs_+8
319319
ae_l64.i aed27, \ptr, .Lxchal_ofs_+16
320320
ae_l64.i aed28, \ptr, .Lxchal_ofs_+24
321321
ae_l64.i aed29, \ptr, .Lxchal_ofs_+32
322322
ae_l64.i aed30, \ptr, .Lxchal_ofs_+40
323323
ae_l64.i aed31, \ptr, .Lxchal_ofs_+48
324-
addi.a \ptr, \ptr, 56
324+
addi \ptr, \ptr, 56
325325
l8ui \at1, \ptr, .Lxchal_ofs_+0
326326
ae_movea aep0, \at1
327327
l8ui \at1, \ptr, .Lxchal_ofs_+1
@@ -330,7 +330,7 @@
330330
ae_movea aep2, \at1
331331
l8ui \at1, \ptr, .Lxchal_ofs_+3
332332
ae_movea aep3, \at1
333-
addi.a \ptr, \ptr, 8
333+
addi \ptr, \ptr, 8
334334
ae_lalign128.i u0, \ptr, .Lxchal_ofs_+0
335335
ae_lalign128.i u1, \ptr, .Lxchal_ofs_+16
336336
ae_lalign128.i u2, \ptr, .Lxchal_ofs_+32

‎src/platform/amd/rembrandt/lib/dma.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// SPDX-License-Identifier: BSD-3-Clause
22
//
3-
//Copyright(c) 2022 AMD. All rights reserved.
3+
//Copyright(c) 2022, 2026 AMD. All rights reserved.
44
//
55
//Author: Basavaraj Hiregoudar <basavaraj.hiregoudar@amd.com>
66
// Bala Kishore <balakishore.pati@amd.com>
7+
// Sivasubramanian <sravisar@amd.com>
78

89
#include <sof/common.h>
910
#include <platform/fw_scratch_mem.h>
@@ -41,8 +42,8 @@ SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = {
4142
.plat_data = {
4243
.id = DMA_ID_DAI_DMIC,
4344
.dir = DMA_DIR_DEV_TO_MEM,
44-
.devs = DMA_DEV_DMIC,
45-
.caps = DMA_CAP_DMIC,
45+
.devs = SOF_DMA_DEV_DMIC,
46+
.caps = SOF_DMA_CAP_DMIC,
4647
.base = DMA0_BASE,
4748
.chan_size = DMA0_SIZE,
4849
.channels = 8,
@@ -54,8 +55,8 @@ SHARED_DATA struct dma dma[PLATFORM_NUM_DMACS] = {
5455
.plat_data = {
5556
.id = DMA_ID_DAI_HS,
5657
.dir = DMA_DIR_DEV_TO_MEM | DMA_DIR_MEM_TO_DEV,
57-
.devs = DMA_DEV_SP,
58-
.caps = DMA_CAP_SP,
58+
.devs = SOF_DMA_DEV_SP,
59+
.caps = SOF_DMA_CAP_SP,
5960
.base = DMA0_BASE,
6061
.chan_size = DMA0_SIZE,
6162
.channels = 8,

‎zephyr/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,6 @@ if (CONFIG_SOC_ACP_6_0)
448448
${SOF_PLATFORM_PATH}/amd/rembrandt/lib/clk.c
449449
${SOF_PLATFORM_PATH}/amd/rembrandt/lib/dai.c
450450
${SOF_PLATFORM_PATH}/amd/rembrandt/lib/dma.c
451-
${SOF_PLATFORM_PATH}/amd/rembrandt/lib/memory.c
452451
)
453452

454453
# SOF core infrastructure - runs on top of Zephyr

‎zephyr/include/sof/lib/dma.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,9 @@ int dmac_init(struct sof *sof);
270270
* Need to use sof_dma.h to avoid "syscalls/dma.h" name conflict
271271
* with Zephyr autogenerated headers for syscall support.
272272
*/
273+
#if !defined(CONFIG_SOC_ACP_6_0)
273274
#include "sof_dma.h"
275+
#endif
274276

275277
#ifndef CONFIG_ZEPHYR_NATIVE_DRIVERS
276278
#include "dma-legacy.h"

0 commit comments

Comments
 (0)