Skip to content

Commit 108df32

Browse files
RanderWangkv2019i
authored andcommitted
TigerLake: disable memory windows setting on sof side
Memory windows is set on zephyr side, so remove it and also remove xsram_window for memory windows to save memory since it is not used by ipc4. Signed-off-by: Rander Wang <[email protected]>
1 parent ff717ae commit 108df32

File tree

2 files changed

+0
-77
lines changed

2 files changed

+0
-77
lines changed

src/platform/Kconfig

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ config TIGERLAKE
1515
select DMA_GW
1616
select DW
1717
select DW_DMA if !ZEPHYR_NATIVE_DRIVERS
18-
select MEM_WND
1918
select DMA_HW_LLI
2019
select DW_DMA_AGGREGATED_IRQ
2120
select DMA_FIFO_PARTITION

src/platform/intel/cavs/platform.c

-76
Original file line numberDiff line numberDiff line change
@@ -81,79 +81,8 @@ static const struct sof_ipc_fw_ready ready
8181
#endif
8282
};
8383

84-
#if CONFIG_MEM_WND
8584
#define SRAM_WINDOW_HOST_OFFSET(x) (0x80000 + x * 0x20000)
8685

87-
#define NUM_WINDOWS 7
88-
89-
const struct ext_man_windows xsram_window
90-
__aligned(EXT_MAN_ALIGN) __section(".fw_metadata") __unused = {
91-
.hdr = {
92-
.type = EXT_MAN_ELEM_WINDOW,
93-
.elem_size = ALIGN_UP_COMPILE(sizeof(struct ext_man_windows), EXT_MAN_ALIGN),
94-
},
95-
.window = {
96-
.ext_hdr = {
97-
.hdr.cmd = SOF_IPC_FW_READY,
98-
.hdr.size = sizeof(struct sof_ipc_window),
99-
.type = SOF_IPC_EXT_WINDOW,
100-
},
101-
.num_windows = NUM_WINDOWS,
102-
.window = {
103-
{
104-
.type = SOF_IPC_REGION_REGS,
105-
.id = 0, /* map to host window 0 */
106-
.flags = 0, // TODO: set later
107-
.size = MAILBOX_SW_REG_SIZE,
108-
.offset = 0,
109-
},
110-
{
111-
.type = SOF_IPC_REGION_UPBOX,
112-
.id = 0, /* map to host window 0 */
113-
.flags = 0, // TODO: set later
114-
.size = MAILBOX_DSPBOX_SIZE,
115-
.offset = MAILBOX_SW_REG_SIZE,
116-
},
117-
{
118-
.type = SOF_IPC_REGION_DOWNBOX,
119-
.id = 1, /* map to host window 1 */
120-
.flags = 0, // TODO: set later
121-
.size = MAILBOX_HOSTBOX_SIZE,
122-
.offset = 0,
123-
},
124-
{
125-
.type = SOF_IPC_REGION_DEBUG,
126-
.id = 2, /* map to host window 2 */
127-
.flags = 0, // TODO: set later
128-
.size = MAILBOX_DEBUG_SIZE,
129-
.offset = 0,
130-
},
131-
{
132-
.type = SOF_IPC_REGION_EXCEPTION,
133-
.id = 2, /* map to host window 2 */
134-
.flags = 0, // TODO: set later
135-
.size = MAILBOX_EXCEPTION_SIZE,
136-
.offset = MAILBOX_EXCEPTION_OFFSET,
137-
},
138-
{
139-
.type = SOF_IPC_REGION_STREAM,
140-
.id = 2, /* map to host window 2 */
141-
.flags = 0, // TODO: set later
142-
.size = MAILBOX_STREAM_SIZE,
143-
.offset = MAILBOX_STREAM_OFFSET,
144-
},
145-
{
146-
.type = SOF_IPC_REGION_TRACE,
147-
.id = 3, /* map to host window 3 */
148-
.flags = 0, // TODO: set later
149-
.size = MAILBOX_TRACE_SIZE,
150-
.offset = 0,
151-
},
152-
},
153-
},
154-
};
155-
#endif
156-
15786
#if CONFIG_TIGERLAKE
15887
#define CAVS_DEFAULT_RO SHIM_CLKCTL_RHROSCC
15988
#define CAVS_DEFAULT_RO_FOR_MEM SHIM_CLKCTL_OCS_HP_RING
@@ -355,11 +284,6 @@ int platform_init(struct sof *sof)
355284
trace_point(TRACE_BOOT_PLATFORM_IRQ);
356285
platform_interrupt_init();
357286

358-
#if CONFIG_MEM_WND
359-
trace_point(TRACE_BOOT_PLATFORM_MBOX);
360-
platform_memory_windows_init(MEM_WND_INIT_CLEAR);
361-
#endif
362-
363287
#ifndef __ZEPHYR__
364288
/* init timers, clocks and schedulers */
365289
trace_point(TRACE_BOOT_PLATFORM_TIMER);

0 commit comments

Comments
 (0)